From patchwork Tue Apr 17 18:40:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 133581 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp5037801ljb; Tue, 17 Apr 2018 11:40:21 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/TALXEyw0xMCf7eXfzrQ5WInuCXi5pbzwqAAROndpbc/6y40WOjHG7mXQKa3RaGZFei8Kx X-Received: by 2002:a9d:5f87:: with SMTP id g7-v6mr1867797oti.139.1523990420971; Tue, 17 Apr 2018 11:40:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523990420; cv=none; d=google.com; s=arc-20160816; b=ZSKEr1Biuq1UjS+8BHCz0VNWKalo7tOFFk8eqXdd7I0YDQ6ZrS3aAgIEL1fDUZEw9F JCEt8KHH0GGnsSKqxggscVimsAC6qSxAhs3UPvE+Bwg5POI35N7J86XFwDsZFEZE9im/ ZZ5CrL7s0+bdCxjDls/qUsYVRumCDparoVQh4FcP9fcwo+E8fIHzPZcb0bR2yYs20rkh xIj2Ur7vFlYYYhqhS3mwE3xQh5kUYGQZrCewld8JGIBN3tj3GeYkwlbWirZM9H2HLJOY J40UlnEkpIpHbbLQ0gOgbUQqkSvhe3fiWRUUi8g0m8PCkZ8xtygGI/8LkqDnQm/pyAO7 Un/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=FyVxhqFxmciOZlJw9QAxma25WBVTtz3BASJhze548pc=; b=GSpJbMAG+rGJuDeOeYgV1xP0SC/WzThne4503cNft6oVnGVr/nc5qfwW76ErMjtzab 1BcmVAKFPNq/x67KwrO/0uVHE48kiDPAfBUBrWCWwR+p/mMBaAcn8C4diOMJTrz/2jSY HnB1vHo+MiAFJVsJrPrh0HGTaHkXA6YTsVANL+n4xPeLPYZ+c94VCL3ajHXPhatVe0Oo aHt+4tZ6rJD/zVo5LhEuMRUq/VGcX+P4Ayxz0YyIJKeKbn8OwTJQg1LeLwNpt68dPCnt FLcRZ+Df4NqIiQUR1kh4Rdm6khgpLY1iytZsWu8vz4uDokW9QlgfA0zLc+8+7z+nBNcS s/uw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id a10-v6si5591555oth.45.2018.04.17.11.40.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 11:40:20 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6A143164228; Tue, 17 Apr 2018 18:40:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 32A961899A; Tue, 17 Apr 2018 18:40:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B6C1C4CA9C; Tue, 17 Apr 2018 18:40:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3HIeF1l031793 for ; Tue, 17 Apr 2018 14:40:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8214F2023235; Tue, 17 Apr 2018 18:40:15 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.bos.redhat.com (dhcp-17-157.bos.redhat.com [10.18.17.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53EFD2023227; Tue, 17 Apr 2018 18:40:15 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 17 Apr 2018 14:40:10 -0400 Message-Id: <97094e3df1ef092f1b1aa2c19a118f3fd91837e2.1523989580.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Subject: [libvirt] [PATCH 1/3] conf: format/parse as tristate X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 17 Apr 2018 18:40:20 +0000 (UTC) is a bare boolean XML property. We don't really use this format anymore and instead prefer tristate since it's required for modeling on/off/default. If for example future qemu started enabling vmcoreinfo by default we wouldn't have any way for the user to turn this off. Convert it to tristate. For writing XML this is semanticly the same, is processed as . For apps reading guest XML this is technically an API change, as they might misinterpret , however this has only been present in libvirt since 3.10.0 and I don't think any apps are dependent on this yet Signed-off-by: Cole Robinson --- src/conf/domain_conf.c | 4 ++-- tests/qemuxml2xmloutdata/vmcoreinfo.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: John Ferlan diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4dad8e3b2..648057ad4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19281,7 +19281,6 @@ virDomainDefParseXML(xmlDocPtr xml, case VIR_DOMAIN_FEATURE_VIRIDIAN: case VIR_DOMAIN_FEATURE_PRIVNET: case VIR_DOMAIN_FEATURE_HYPERV: - case VIR_DOMAIN_FEATURE_VMCOREINFO: case VIR_DOMAIN_FEATURE_KVM: def->features[val] = VIR_TRISTATE_SWITCH_ON; break; @@ -19300,6 +19299,7 @@ virDomainDefParseXML(xmlDocPtr xml, } break; + case VIR_DOMAIN_FEATURE_VMCOREINFO: case VIR_DOMAIN_FEATURE_HAP: case VIR_DOMAIN_FEATURE_PMU: case VIR_DOMAIN_FEATURE_PVSPINLOCK: @@ -26870,7 +26870,6 @@ virDomainDefFormatInternal(virDomainDefPtr def, case VIR_DOMAIN_FEATURE_ACPI: case VIR_DOMAIN_FEATURE_PAE: case VIR_DOMAIN_FEATURE_VIRIDIAN: - case VIR_DOMAIN_FEATURE_VMCOREINFO: case VIR_DOMAIN_FEATURE_PRIVNET: switch ((virTristateSwitch) def->features[i]) { case VIR_TRISTATE_SWITCH_ABSENT: @@ -26891,6 +26890,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, break; + case VIR_DOMAIN_FEATURE_VMCOREINFO: case VIR_DOMAIN_FEATURE_HAP: case VIR_DOMAIN_FEATURE_PMU: case VIR_DOMAIN_FEATURE_PVSPINLOCK: diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml b/tests/qemuxml2xmloutdata/vmcoreinfo.xml index d0cd2f2ce..48b75d7d4 100644 --- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml +++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml @@ -9,7 +9,7 @@ - + destroy