From nobody Thu May  2 21:24:09 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 216.205.24.124 as permitted sender) client-ip=216.205.24.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com
	with SMTPS id 1629370233913131.35238650526753;
 Thu, 19 Aug 2021 03:50:33 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-403-6GE8PYLEOwaAWWBLTVNpUQ-1; Thu, 19 Aug 2021 06:50:31 -0400
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7588B107ACF5;
	Thu, 19 Aug 2021 10:50:26 +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 C88D11970F;
	Thu, 19 Aug 2021 10:50:25 +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 D67104BB7B;
	Thu, 19 Aug 2021 10:50:23 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
	[10.11.54.5])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 17JAoLHD032357 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 19 Aug 2021 06:50:22 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id C654DF9AAD; Thu, 19 Aug 2021 10:50:21 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id C18A0FC73A
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 10:50:21 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com
 [205.139.110.61])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A6A1518A01AF
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 10:50:21 +0000 (UTC)
Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com
	[209.85.210.170]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-88-AKZ92P6RNi6Z9H9TwhUBSA-1; Thu, 19 Aug 2021 06:50:19 -0400
Received: by mail-pf1-f170.google.com with SMTP id i21so5095089pfd.8
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 03:50:19 -0700 (PDT)
Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.234.32])
	by smtp.googlemail.com with ESMTPSA id
	t19sm3116552pfg.216.2021.08.19.03.50.16
	(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
	Thu, 19 Aug 2021 03:50:17 -0700 (PDT)
X-MC-Unique: 6GE8PYLEOwaAWWBLTVNpUQ-1
X-MC-Unique: AKZ92P6RNi6Z9H9TwhUBSA-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:mime-version:content-transfer-encoding;
	bh=yW0CCZX3DRcLMvdqfFevPDUD8kvSgep5mgInHWnS9Q4=;
	b=cpHeYernVvRM7I+zeTdxrQ7BlVFt1skMlVXTaBe3qD4ZD81AM7a3WBIrW924hL1cf9
	eB5e8uh0sXNowZeQaczPxfLV4obq6HruJpoIWAdzi9vB47Gn7mOl2LuOz275jzAcGXKj
	tpnz/hJ4sg8FbRHWqHsh2xw6XyV68AMLSSnpfJCJI8VN82++EFzl/QG1WhsYmtKHWKeI
	0eRdLYzl0gpdqB+dpJ7JBDlNXeNNTsWIfzVpVXsJ2wxTu43dVMgtmjGBTpM7FBVhSPcE
	wN8NXV3D0yeOpDujmCgx6cX4MMOx32xbRz6qKUANgDXGuG2PjlNvKoKcMg4yMypzRoo4
	DGMA==
X-Gm-Message-State: AOAM533GlX32ttcn1s+mqxEfRK0IspXffM8z+9qCv/dEXQapCOfIjdeo
	egaGZYMbaYYugxbeZPm/tFmaPwZNM4FIkQ==
X-Google-Smtp-Source: 
 ABdhPJyD1DQMx/mtEYCgzcXsU+eFCvJHpNp7d3OE5v2+M3ZhtxmUCqfU4qY0JEcQJ8wq6/tTNSldMg==
X-Received: by 2002:a62:1852:0:b0:3e1:43ea:c56b with SMTP id
	79-20020a621852000000b003e143eac56bmr14309269pfy.75.1629370217807;
	Thu, 19 Aug 2021 03:50:17 -0700 (PDT)
From: Ani Sinha <ani@anisinha.ca>
To: libvir-list@redhat.com
Subject: [PATCH v2 1/4] pm/i386: add support for two options that controls
	acpi hotplug on q35/i440fx
Date: Thu, 19 Aug 2021 16:20:01 +0530
Message-Id: <20210819105004.275239-2-ani@anisinha.ca>
In-Reply-To: <20210819105004.275239-1-ani@anisinha.ca>
References: <20210819105004.275239-1-ani@anisinha.ca>
MIME-Version: 1.0
X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection
	Definition; Similar Internal Domain=false;
	Similar Monitored External Domain=false;
	Custom External Domain=false; Mimecast External Domain=false;
	Newly Observed Domain=false; Internal User Name=false;
	Custom Display Name List=false; Reply-to Address Mismatch=false;
	Targeted Threat Dictionary=false;
	Mimecast Threat Dictionary=false; Custom Threat Dictionary=false
X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5
X-loop: libvir-list@redhat.com
Cc: Ani Sinha <ani@anisinha.ca>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://listman.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1629370358904100002
Content-Type: text/plain; charset="utf-8"

'acpi-pci-hotplug-with-bridge-support' and 'acpi-root-pci-hotplug' are two =
pm
options for i386 that governs acpi pci hotplug support for qemu. This patch=
 tries
to implement support for both these two global i386 pm options within libvi=
rt.

'acpi-pci-hotplug-with-bridge-support' applies both for q35 as well as i440=
fx
machine types. The 'acpi-root-pci-hotplug' only applies for i440fx machine =
type.

'acpi-pci-hotplug-with-bridge-support' can be turned off by providing the
following libvirt xml snippet:

<pm>
   <acpi-hotplug-bridge enabled=3D'no'>
</pm>

Similarly, 'acpi-root-pci-hotplug' can be turned off by providing the follo=
wing
libvirt xml snippet:

<pm>
   <acpi-root-hotplug enabled=3D'no'>
</pm>

Similarly for turning them on explicitly, they can pass " enabled=3D'yes' "=
 in
the above xml snippet.

Unit tests for this change will be added in subsequent patches.

Signed-off-by: Ani Sinha <ani@anisinha.ca>
---
 docs/schemas/domaincommon.rng                 | 17 +++++++++++
 src/conf/domain_conf.c                        | 21 +++++++++++++-
 src/conf/domain_conf.h                        |  2 ++
 src/qemu/qemu_capabilities.c                  |  8 ++++++
 src/qemu/qemu_capabilities.h                  |  5 ++++
 src/qemu/qemu_command.c                       | 28 +++++++++++++++++++
 src/qemu/qemu_validate.c                      | 21 ++++++++++++++
 .../caps_2.11.0.x86_64.xml                    |  1 +
 .../caps_2.12.0.x86_64.xml                    |  1 +
 .../caps_3.0.0.x86_64.xml                     |  1 +
 .../caps_3.1.0.x86_64.xml                     |  1 +
 .../caps_4.0.0.x86_64.xml                     |  1 +
 .../caps_4.1.0.x86_64.xml                     |  1 +
 .../caps_4.2.0.x86_64.xml                     |  1 +
 .../caps_5.0.0.x86_64.xml                     |  1 +
 .../caps_5.1.0.x86_64.xml                     |  1 +
 .../caps_5.2.0.x86_64.xml                     |  2 ++
 .../caps_6.0.0.x86_64.xml                     |  2 ++
 .../caps_6.1.0.x86_64.xml                     |  3 ++
 19 files changed, 117 insertions(+), 1 deletion(-)

changelog:
v1: initial version.
v2: added code to generate output xml correctly.

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 2442078969..e2d9bb336c 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4317,6 +4317,16 @@
             <ref name=3D"suspendChoices"/>
           </element>
         </optional>
+        <optional>
+          <element name=3D"acpi-hotplug-bridge">
+            <ref name=3D"acpiHotplugChoices"/>
+          </element>
+        </optional>
+        <optional>
+          <element name=3D"acpi-root-hotplug">
+            <ref name=3D"acpiHotplugChoices"/>
+          </element>
+        </optional>
       </interleave>
       <empty/>
     </element>
@@ -4328,6 +4338,13 @@
       </attribute>
     </optional>
   </define>
+  <define name=3D"acpiHotplugChoices">
+    <optional>
+      <attribute name=3D"enabled">
+        <ref name=3D"virYesNo"/>
+      </attribute>
+    </optional>
+  </define>
   <!--
       Specific setup for a qemu emulated character device.  Note: this
       definition doesn't fully specify the constraints on this node.
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 06c1fcf5e5..778a44e08e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -19351,6 +19351,16 @@ virDomainDefLifecycleParse(virDomainDef *def,
                                  &def->pm.s4) < 0)
         goto error;
=20
+    if (virDomainPMStateParseXML(ctxt,
+                                 "string(./pm/acpi-hotplug-bridge/@enabled=
)",
+                                 &def->pm.acpi_hp_bridge) < 0)
+        goto error;
+
+    if (virDomainPMStateParseXML(ctxt,
+                                 "string(./pm/acpi-root-hotplug/@enabled)",
+                                 &def->pm.acpi_root_hp) < 0)
+        goto error;
+
     return 0;
=20
  error:
@@ -28179,7 +28189,8 @@ virDomainDefFormatInternalSetRootName(virDomainDef =
*def,
                                       virDomainLockFailureTypeToString) < =
0)
         return -1;
=20
-    if (def->pm.s3 || def->pm.s4) {
+    if (def->pm.s3 || def->pm.s4 || def->pm.acpi_hp_bridge ||
+        def->pm.acpi_root_hp) {
         virBufferAddLit(buf, "<pm>\n");
         virBufferAdjustIndent(buf, 2);
         if (def->pm.s3) {
@@ -28190,6 +28201,14 @@ virDomainDefFormatInternalSetRootName(virDomainDef=
 *def,
             virBufferAsprintf(buf, "<suspend-to-disk enabled=3D'%s'/>\n",
                               virTristateBoolTypeToString(def->pm.s4));
         }
+        if (def->pm.acpi_hp_bridge) {
+            virBufferAsprintf(buf, "<acpi-hotplug-bridge enabled=3D'%s'/>\=
n",
+                              virTristateBoolTypeToString(def->pm.acpi_hp_=
bridge));
+        }
+        if (def->pm.acpi_root_hp) {
+            virBufferAsprintf(buf, "<acpi-root-hotplug enabled=3D'%s'/>\n",
+                              virTristateBoolTypeToString(def->pm.acpi_roo=
t_hp));
+        }
         virBufferAdjustIndent(buf, -2);
         virBufferAddLit(buf, "</pm>\n");
     }
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ca21082624..94283cbb04 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2643,6 +2643,8 @@ struct _virDomainPowerManagement {
     /* These options are of type enum virTristateBool */
     int s3;
     int s4;
+    int acpi_hp_bridge;
+    int acpi_root_hp;
 };
=20
 struct _virDomainPerfDef {
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9558938866..ba0665474c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -637,6 +637,11 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "confidential-guest-support",
               "query-display-options",
               "s390-pv-guest",
+              "piix4-acpi-hotplug-bridge",
+              "piix4-acpi-root-hotplug-en",
+
+              /* 410 */
+              "ich9-acpi-hotplug-bridge",
     );
=20
=20
@@ -1467,6 +1472,8 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps=
DevicePropsIDEDrive[] =3D {
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] =
=3D {
     { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3, NULL },
     { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4, NULL },
+    { "acpi-pci-hotplug-with-bridge-support", QEMU_CAPS_PIIX_ACPI_HOTPLUG_=
BRIDGE, NULL },
+    { "acpi-root-pci-hotplug", QEMU_CAPS_PIIX_ACPI_ROOT_PCI_HOTPLUG, NULL =
},
 };
=20
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[]=
 =3D {
@@ -1519,6 +1526,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps=
DevicePropsVirtioGpu[] =3D {
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsICH9[] =3D=
 {
     { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3, NULL },
     { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4, NULL },
+    { "acpi-pci-hotplug-with-bridge-support", QEMU_CAPS_ICH9_ACPI_HOTPLUG_=
BRIDGE, NULL },
 };
=20
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBNECXHCI=
[] =3D {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 2b1bb57a49..e988527f39 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -617,6 +617,11 @@ typedef enum { /* virQEMUCapsFlags grouping marker for=
 syntax-check */
     QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT, /* -machine confidential-=
guest-support */
     QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp comman=
d present */
     QEMU_CAPS_S390_PV_GUEST, /* -object s390-pv-guest,... */
+    QEMU_CAPS_PIIX_ACPI_HOTPLUG_BRIDGE, /* -M pc PIIX4_PM.acpi-pci-hotplug=
-with-bridge-support */
+    QEMU_CAPS_PIIX_ACPI_ROOT_PCI_HOTPLUG, /* -M pc PIIX4_PM.acpi-root-pci-=
hotplug */
+
+    /* 410 */
+    QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE, /* -M q35 PIIX4_PM.acpi-pci-hotplu=
g-with-bridge-support */
=20
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 156af4caee..16c609202c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6171,6 +6171,34 @@ qemuBuildPMCommandLine(virCommand *cmd,
                                pm_object, def->pm.s4 =3D=3D VIR_TRISTATE_B=
OOL_NO);
     }
=20
+    if (def->pm.acpi_hp_bridge) {
+        const char *pm_object =3D "PIIX4_PM";
+        const char *switch_str =3D "on";
+
+        if (def->pm.acpi_hp_bridge =3D=3D VIR_TRISTATE_BOOL_NO)
+            switch_str =3D "off";
+
+        if (qemuDomainIsQ35(def) &&
+            virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE))
+            pm_object =3D "ICH9-LPC";
+
+        virCommandAddArg(cmd, "-global");
+        virCommandAddArgFormat(cmd, "%s.acpi-pci-hotplug-with-bridge-suppo=
rt=3D%s",
+                               pm_object, switch_str);
+    }
+
+    if (def->pm.acpi_root_hp) {
+        const char *pm_object =3D "PIIX4_PM";
+        const char *switch_str =3D "on";
+
+        if (def->pm.acpi_root_hp =3D=3D VIR_TRISTATE_BOOL_NO)
+            switch_str =3D "off";
+
+        virCommandAddArg(cmd, "-global");
+        virCommandAddArgFormat(cmd, "%s.acpi-root-pci-hotplug=3D%s",
+                               pm_object, switch_str);
+    }
+
     return 0;
 }
=20
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index a964c8593d..22403e6d01 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -560,6 +560,27 @@ qemuValidateDomainDefPM(const virDomainDef *def,
         }
     }
=20
+    if (def->pm.acpi_hp_bridge) {
+        bool q35ICH9_pcihpbr =3D q35Dom &&
+                                virQEMUCapsGet(qemuCaps,
+                                              QEMU_CAPS_ICH9_ACPI_HOTPLUG_=
BRIDGE);
+
+        if (!q35ICH9_pcihpbr && !virQEMUCapsGet(qemuCaps,
+                                                QEMU_CAPS_PIIX_ACPI_HOTPLU=
G_BRIDGE)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           "%s", _("setting ACPI hotplug bridge not suppor=
ted"));
+            return -1;
+        }
+    }
+
+    if (def->pm.acpi_root_hp) {
+        if (!q35Dom && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_ACPI_ROOT_=
PCI_HOTPLUG)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           "%s", _("setting ACPI root pci hotplug not supp=
orted"));
+            return -1;
+        }
+    }
+
     return 0;
 }
=20
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu=
capabilitiesdata/caps_2.11.0.x86_64.xml
index 37fb33e8e3..75ebb88dd8 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -196,6 +196,7 @@
   <flag name=3D'cpu-max'/>
   <flag name=3D'vnc-opts'/>
   <flag name=3D'input-linux'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100288</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu=
capabilitiesdata/caps_2.12.0.x86_64.xml
index 37aaabe0d3..dbf77b04a1 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -207,6 +207,7 @@
   <flag name=3D'cpu-max'/>
   <flag name=3D'vnc-opts'/>
   <flag name=3D'input-linux'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_3.0.0.x86_64.xml
index f45fd84aaa..9cde4a95a3 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -213,6 +213,7 @@
   <flag name=3D'cpu-max'/>
   <flag name=3D'vnc-opts'/>
   <flag name=3D'input-linux'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100239</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_3.1.0.x86_64.xml
index dcc5f6f137..5dcf3b5a08 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -217,6 +217,7 @@
   <flag name=3D'vnc-opts'/>
   <flag name=3D'input-linux'/>
   <flag name=3D'query-display-options'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
   <version>3000092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_4.0.0.x86_64.xml
index 7eff08235e..7ab188072d 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -225,6 +225,7 @@
   <flag name=3D'rotation-rate'/>
   <flag name=3D'input-linux'/>
   <flag name=3D'query-display-options'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_4.1.0.x86_64.xml
index 736b120547..bacb5f8dd2 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -232,6 +232,7 @@
   <flag name=3D'rotation-rate'/>
   <flag name=3D'input-linux'/>
   <flag name=3D'query-display-options'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
   <version>4001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_4.2.0.x86_64.xml
index 8352fd0200..e89655d209 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -243,6 +243,7 @@
   <flag name=3D'rotation-rate'/>
   <flag name=3D'input-linux'/>
   <flag name=3D'query-display-options'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
   <version>4002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_5.0.0.x86_64.xml
index 6a99f4e343..058c943716 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -250,6 +250,7 @@
   <flag name=3D'rotation-rate'/>
   <flag name=3D'input-linux'/>
   <flag name=3D'query-display-options'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_5.1.0.x86_64.xml
index 674d984432..85e9ba95d0 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -252,6 +252,7 @@
   <flag name=3D'rotation-rate'/>
   <flag name=3D'input-linux'/>
   <flag name=3D'query-display-options'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
   <version>5001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_5.2.0.x86_64.xml
index ec3384cab8..190e36719a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -253,6 +253,8 @@
   <flag name=3D'rotation-rate'/>
   <flag name=3D'input-linux'/>
   <flag name=3D'query-display-options'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
+  <flag name=3D'piix4-acpi-root-hotplug-en'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_6.0.0.x86_64.xml
index d6198c2479..cf9c06470d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -260,6 +260,8 @@
   <flag name=3D'input-linux'/>
   <flag name=3D'confidential-guest-support'/>
   <flag name=3D'query-display-options'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
+  <flag name=3D'piix4-acpi-root-hotplug-en'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_6.1.0.x86_64.xml
index 933b8eb2b5..e3a7d231ce 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -262,6 +262,9 @@
   <flag name=3D'virtio-vga-gl'/>
   <flag name=3D'confidential-guest-support'/>
   <flag name=3D'query-display-options'/>
+  <flag name=3D'piix4-acpi-hotplug-bridge'/>
+  <flag name=3D'piix4-acpi-root-hotplug-en'/>
+  <flag name=3D'ich9-acpi-hotplug-bridge'/>
   <version>6000090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
--=20
2.25.1

From nobody Thu May  2 21:24:09 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 216.205.24.124 as permitted sender) client-ip=216.205.24.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com
	with SMTPS id 162937023778924.69504410286595;
 Thu, 19 Aug 2021 03:50:37 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-31-L5fd06Z6N_q6NqyuEcEsDw-1; Thu, 19 Aug 2021 06:50:35 -0400
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
 [10.5.11.14])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14534801A92;
	Thu, 19 Aug 2021 10:50:30 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E43945D9D5;
	Thu, 19 Aug 2021 10:50:29 +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 AA766181A2A6;
	Thu, 19 Aug 2021 10:50:29 +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 17JAoSEO032386 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 19 Aug 2021 06:50:28 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5A7782089A0E; Thu, 19 Aug 2021 10:50:28 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 555032089A08
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 10:50:24 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
	bits)) (No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D05D9967602
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 10:50:24 +0000 (UTC)
Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com
	[209.85.216.44]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-587-KvGi4Tp3P_23LDVlfwvIQQ-1; Thu, 19 Aug 2021 06:50:22 -0400
Received: by mail-pj1-f44.google.com with SMTP id nt11so4666069pjb.2
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 03:50:22 -0700 (PDT)
Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.234.32])
	by smtp.googlemail.com with ESMTPSA id
	t19sm3116552pfg.216.2021.08.19.03.50.19
	(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
	Thu, 19 Aug 2021 03:50:20 -0700 (PDT)
X-MC-Unique: L5fd06Z6N_q6NqyuEcEsDw-1
X-MC-Unique: KvGi4Tp3P_23LDVlfwvIQQ-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:mime-version:content-transfer-encoding;
	bh=C/hNaHAkUfYHNFFb7Q1rPGGO0XvGP5jtXzJ7NkhebC8=;
	b=IdQN76slliJASYMqrSqiT6AfZar5iebEPpVpaningxm6EYDhb6s8mBjguiV/YG095P
	Rbzub5goGsphAEE+DLX9FSPqRYJEettu66MQideG8EhKFdvNc0UiBDjVr35LZQ50K3kL
	Lref3imkpjrhb/8Ii6w7bZJK1WZH6Molta92ZG8XS8rkdNGmxVE6VVgxL4YnOsdP+ckb
	UgyW6tlxP8IZPxEe1HUbj1b3ZW3Je9HVaXh5zDm3afVUP28hOOG5un04V2DNqpZzW5mz
	+QkOTRg5thb/RGk7BDdZv3YAGMmT9hB4WxSyJuSaiS7ljto9ASlxfjFyypYJGuTPaEoh
	KFfA==
X-Gm-Message-State: AOAM5305mtyJECEeu3ii1Xyagyt+i8OzVd4/vcdN7lnNvcOofz/heIHi
	V/l3WJx9ADcknyeFW7u+1JObqZQO2t+ZXA==
X-Google-Smtp-Source: 
 ABdhPJwu1GRVTAKAhCNlQf0CAhs1+ppxaWh3RbmH9qyPTP0AK/jDjF8UQyEr1B/4uccLgYrLkY68fA==
X-Received: by 2002:a17:90b:4b45:: with SMTP id
	mi5mr14274245pjb.43.1629370221264;
	Thu, 19 Aug 2021 03:50:21 -0700 (PDT)
From: Ani Sinha <ani@anisinha.ca>
To: libvir-list@redhat.com
Subject: [PATCH v2 2/4] tests: add positive xml2argv tests to exercize pm acpi
	hotplug options for i386
Date: Thu, 19 Aug 2021 16:20:02 +0530
Message-Id: <20210819105004.275239-3-ani@anisinha.ca>
In-Reply-To: <20210819105004.275239-1-ani@anisinha.ca>
References: <20210819105004.275239-1-ani@anisinha.ca>
MIME-Version: 1.0
X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection
	Definition; Similar Internal Domain=false;
	Similar Monitored External Domain=false;
	Custom External Domain=false; Mimecast External Domain=false;
	Newly Observed Domain=false; Internal User Name=false;
	Custom Display Name List=false; Reply-to Address Mismatch=false;
	Targeted Threat Dictionary=false;
	Mimecast Threat Dictionary=false; Custom Threat Dictionary=false
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4
X-loop: libvir-list@redhat.com
Cc: Ani Sinha <ani@anisinha.ca>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://listman.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1629370360813100005
Content-Type: text/plain; charset="utf-8"

This change adds positive xml2argv unit tests for the following change:
78ced83e3bb354 ("pm/i386: add support for two options that controls acpi ho=
tplug on q35/i440fx")

These tests ensure that libvirt generates the correct qemu commandline for a
given input xml.

Signed-off-by: Ani Sinha <ani@anisinha.ca>
---
 ...pc-i440fx-acpi-hotplug-bridge-disable.args | 28 +++++++++++++++++
 .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 17 +++++++++++
 .../pc-i440fx-acpi-hotplug-bridge-enable.args | 28 +++++++++++++++++
 .../pc-i440fx-acpi-hotplug-bridge-enable.xml  | 17 +++++++++++
 .../pc-i440fx-acpi-root-hotplug-disable.args  | 28 +++++++++++++++++
 .../pc-i440fx-acpi-root-hotplug-disable.xml   | 17 +++++++++++
 .../pc-i440fx-acpi-root-hotplug-enable.args   | 28 +++++++++++++++++
 .../pc-i440fx-acpi-root-hotplug-enable.xml    | 17 +++++++++++
 .../q35-acpi-hotplug-bridge-disable.args      | 30 +++++++++++++++++++
 .../q35-acpi-hotplug-bridge-disable.xml       | 17 +++++++++++
 .../q35-acpi-hotplug-bridge-enable.args       | 30 +++++++++++++++++++
 .../q35-acpi-hotplug-bridge-enable.xml        | 17 +++++++++++
 tests/qemuxml2argvtest.c                      | 30 +++++++++++++++++++
 13 files changed, 304 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-di=
sable.args
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-di=
sable.xml
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-en=
able.args
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-en=
able.xml
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disa=
ble.args
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disa=
ble.xml
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enab=
le.args
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enab=
le.xml
 create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.=
args
 create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.=
xml
 create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.a=
rgs
 create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x=
ml

changelog:
v1: initial patch.
v2: removed some capabilities from tests that were not needed.

diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.a=
rgs b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.args
new file mode 100644
index 0000000000..0bf95a023a
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.args
@@ -0,0 +1,28 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-i440fx \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-i440fx/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-i440fx/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name i440fx \
+-S \
+-machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 1024 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-i440fx/monitor.=
sock,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=3Doff \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2
diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x=
ml b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
new file mode 100644
index 0000000000..b96caa9b2d
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
@@ -0,0 +1,17 @@
+<domain type=3D'qemu'>
+  <name>i440fx</name>
+  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.5'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <pm>
+    <acpi-hotplug-bridge enabled=3D'no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.ar=
gs b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.args
new file mode 100644
index 0000000000..75c99b49d3
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.args
@@ -0,0 +1,28 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-i440fx \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-i440fx/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-i440fx/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name i440fx \
+-S \
+-machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 1024 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-i440fx/monitor.=
sock,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=3Don \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2
diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xm=
l b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
new file mode 100644
index 0000000000..40bda970ad
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml
@@ -0,0 +1,17 @@
+<domain type=3D'qemu'>
+  <name>i440fx</name>
+  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.5'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <pm>
+    <acpi-hotplug-bridge enabled=3D'yes'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.arg=
s b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args
new file mode 100644
index 0000000000..1fc19aa868
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args
@@ -0,0 +1,28 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-i440fx \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-i440fx/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-i440fx/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name i440fx \
+-S \
+-machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 1024 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-i440fx/monitor.=
sock,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-global PIIX4_PM.acpi-root-pci-hotplug=3Doff \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2
diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml=
 b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml
new file mode 100644
index 0000000000..ef563200bf
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml
@@ -0,0 +1,17 @@
+<domain type=3D'qemu'>
+  <name>i440fx</name>
+  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.5'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <pm>
+    <acpi-root-hotplug enabled=3D'no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.args=
 b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.args
new file mode 100644
index 0000000000..f9abb953e3
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.args
@@ -0,0 +1,28 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-i440fx \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-i440fx/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-i440fx/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name i440fx \
+-S \
+-machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 1024 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-i440fx/monitor.=
sock,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-global PIIX4_PM.acpi-root-pci-hotplug=3Don \
+-usb \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2
diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml =
b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml
new file mode 100644
index 0000000000..7767025c88
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml
@@ -0,0 +1,17 @@
+<domain type=3D'qemu'>
+  <name>i440fx</name>
+  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.5'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <pm>
+    <acpi-root-hotplug enabled=3D'yes'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args b/=
tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args
new file mode 100644
index 0000000000..250a479938
--- /dev/null
+++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args
@@ -0,0 +1,30 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-q35 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-q35/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-q35/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name q35 \
+-S \
+-machine pc-q35-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 1024 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-q35/monitor.soc=
k,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=3Doff \
+-device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \
+-device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \
+-device ioh3420,port=3D0x8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1
diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml b/t=
ests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml
new file mode 100644
index 0000000000..bb9e8d4ee2
--- /dev/null
+++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml
@@ -0,0 +1,17 @@
+<domain type=3D'qemu'>
+  <name>q35</name>
+  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-2.5'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <pm>
+    <acpi-hotplug-bridge enabled=3D'no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.args b/t=
ests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.args
new file mode 100644
index 0000000000..24a5d40b47
--- /dev/null
+++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.args
@@ -0,0 +1,30 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-q35 \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-q35/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-q35/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name q35 \
+-S \
+-machine pc-q35-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 1024 \
+-realtime mlock=3Doff \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-q35/monitor.soc=
k,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=3Don \
+-device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \
+-device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \
+-device ioh3420,port=3D0x8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1
diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml b/te=
sts/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml
new file mode 100644
index 0000000000..e9c4b09da2
--- /dev/null
+++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml
@@ -0,0 +1,17 @@
+<domain type=3D'qemu'>
+  <name>q35</name>
+  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-2.5'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <pm>
+    <acpi-hotplug-bridge enabled=3D'yes'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 67c056b887..75a7acdfe8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2622,6 +2622,36 @@ mymain(void)
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4);
+    DO_TEST("q35-acpi-hotplug-bridge-disable",
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI,
+            QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE);
+    DO_TEST("q35-acpi-hotplug-bridge-enable",
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI,
+            QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE);
+    DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable",
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+            QEMU_CAPS_PIIX_ACPI_HOTPLUG_BRIDGE);
+    DO_TEST("pc-i440fx-acpi-hotplug-bridge-enable",
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+            QEMU_CAPS_PIIX_ACPI_HOTPLUG_BRIDGE);
+    DO_TEST("pc-i440fx-acpi-root-hotplug-disable",
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+            QEMU_CAPS_PIIX_ACPI_ROOT_PCI_HOTPLUG);
+    DO_TEST("pc-i440fx-acpi-root-hotplug-enable",
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+            QEMU_CAPS_PIIX_ACPI_ROOT_PCI_HOTPLUG);
     DO_TEST("q35-usb2",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
--=20
2.25.1

From nobody Thu May  2 21:24:09 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 216.205.24.124 as permitted sender) client-ip=216.205.24.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com
	with SMTPS id 1629370245671925.7112187930419;
 Thu, 19 Aug 2021 03:50:45 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-487-qo0vhIgYPq2ct262gb0oYQ-1; Thu, 19 Aug 2021 06:50:43 -0400
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
 [10.5.11.14])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 381E587D541;
	Thu, 19 Aug 2021 10:50:38 +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 190B55D9D5;
	Thu, 19 Aug 2021 10:50:38 +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 D4FBC4A700;
	Thu, 19 Aug 2021 10:50:37 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
	[10.11.54.5])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 17JAoStT032385 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 19 Aug 2021 06:50:28 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 1DCA6FC733; Thu, 19 Aug 2021 10:50:28 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 18E42FC732
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 10:50:28 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[205.139.110.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 01FD789C5E3
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 10:50:28 +0000 (UTC)
Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com
	[209.85.210.176]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-342-ez_OFKnvOW6yhBwG-wBWDQ-1; Thu, 19 Aug 2021 06:50:25 -0400
Received: by mail-pf1-f176.google.com with SMTP id j187so5086618pfg.4
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 03:50:25 -0700 (PDT)
Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.234.32])
	by smtp.googlemail.com with ESMTPSA id
	t19sm3116552pfg.216.2021.08.19.03.50.22
	(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
	Thu, 19 Aug 2021 03:50:24 -0700 (PDT)
X-MC-Unique: qo0vhIgYPq2ct262gb0oYQ-1
X-MC-Unique: ez_OFKnvOW6yhBwG-wBWDQ-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:mime-version:content-transfer-encoding;
	bh=wzv2HtUyTB4O0O/0MMg0FZxr6lE4Tu3U90XVGqNhQQw=;
	b=SgxsGYrRpqbQvM4z4fV1lZeDLvNFnZNPzypVUBBMnhF3scO4EQ1ILSuMdxMyloyb7e
	omxCj/M9sYRzPpcubYcZ9PsTIwO+DBPbCJD6q1QoMxxQTGrY6lBiFmv5CVDzdnkLNKAm
	0ijkPvOoQjV5jf22mzVLcNr+AzG4CGS+w3ytht17ebmq9+1jf9vl61hP3rHuTHeggKJ3
	liQufErxUdPIHFAcD9cU5m/xD8xARp7BFjQmAHURmj/Fd1DgM3fVhi+DqHJbYo0k3do2
	1lPH1R8I6PdO6JuphWkZ3n/KgCzsU1zuiUqhaV2AwhnnOjokJuqR4oVqy+Ia6zyrcyEu
	a2GA==
X-Gm-Message-State: AOAM530+DkdEU3T9DoFyu72hJZyPFpgSPk+lZf4i39/SLloCYzOxR+lt
	/znMWMJVgq7ZuzH6xXjo0CmehVfVilWovg==
X-Google-Smtp-Source: 
 ABdhPJxK2rh+O8xV/HHwrc/3XpdDQShzuLHyAElZYiJvw5/dZT4g2VijaZErpvVeaNKAvARXPqBTvg==
X-Received: by 2002:a65:5a89:: with SMTP id c9mr13547720pgt.274.1629370224370;
	Thu, 19 Aug 2021 03:50:24 -0700 (PDT)
From: Ani Sinha <ani@anisinha.ca>
To: libvir-list@redhat.com
Subject: [PATCH v2 3/4] tests: add negative xml2argv tests to exercize pm acpi
	hotplug options for i386
Date: Thu, 19 Aug 2021 16:20:03 +0530
Message-Id: <20210819105004.275239-4-ani@anisinha.ca>
In-Reply-To: <20210819105004.275239-1-ani@anisinha.ca>
References: <20210819105004.275239-1-ani@anisinha.ca>
MIME-Version: 1.0
X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection
	Definition; Similar Internal Domain=false;
	Similar Monitored External Domain=false;
	Custom External Domain=false; Mimecast External Domain=false;
	Newly Observed Domain=false; Internal User Name=false;
	Custom Display Name List=false; Reply-to Address Mismatch=false;
	Targeted Threat Dictionary=false;
	Mimecast Threat Dictionary=false; Custom Threat Dictionary=false
X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5
X-loop: libvir-list@redhat.com
Cc: Ani Sinha <ani@anisinha.ca>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://listman.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1629370369088100001
Content-Type: text/plain; charset="utf-8"

This change adds negative argv2xml unit tests for the following change:
78ced83e3bb354 ("pm/i386: add support for two options that controls acpi ho=
tplug on q35/i440fx")

These tests ensure that libvirt produces the correct error when the qemu
capabilities required from an input xml are absent.

Signed-off-by: Ani Sinha <ani@anisinha.ca>
---
 .../qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.err  | 1 +
 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.err  | 1 +
 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.err      | 1 +
 tests/qemuxml2argvtest.c                                       | 3 +++
 4 files changed, 6 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-en=
able.err
 create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enab=
le.err
 create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.e=
rr

changelog:
v1: not present.
v2: added this new test.

diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.er=
r b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.err
new file mode 100644
index 0000000000..98211b726f
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.err
@@ -0,0 +1 @@
+unsupported configuration: setting ACPI hotplug bridge not supported
diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.err =
b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.err
new file mode 100644
index 0000000000..c5c9de8389
--- /dev/null
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.err
@@ -0,0 +1 @@
+unsupported configuration: setting ACPI root pci hotplug not supported
diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.err b/te=
sts/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.err
new file mode 100644
index 0000000000..98211b726f
--- /dev/null
+++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.err
@@ -0,0 +1 @@
+unsupported configuration: setting ACPI hotplug bridge not supported
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 75a7acdfe8..7d83937f48 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2652,6 +2652,9 @@ mymain(void)
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_PIIX_ACPI_ROOT_PCI_HOTPLUG);
+    DO_TEST_PARSE_ERROR("q35-acpi-hotplug-bridge-enable", NONE);
+    DO_TEST_PARSE_ERROR("pc-i440fx-acpi-hotplug-bridge-enable", NONE);
+    DO_TEST_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-enable", NONE);
     DO_TEST("q35-usb2",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
--=20
2.25.1

From nobody Thu May  2 21:24:09 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.133.124 as permitted sender) client-ip=170.10.133.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com
	with SMTPS id 1629370248363750.7455993504097;
 Thu, 19 Aug 2021 03:50:48 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-392-sEO02JTwNQuzfa_240VFWg-1; Thu, 19 Aug 2021 06:50:45 -0400
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C979107ACF5;
	Thu, 19 Aug 2021 10:50:39 +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 3FE7B60C04;
	Thu, 19 Aug 2021 10:50:39 +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 0A93D4A708;
	Thu, 19 Aug 2021 10:50:39 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
	[10.11.54.5])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 17JAoVKI032407 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 19 Aug 2021 06:50:31 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id ACBBDFC733; Thu, 19 Aug 2021 10:50:31 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A7F63F9AAD
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 10:50:31 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com
 [205.139.110.61])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 90F1F89C7DD
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 10:50:31 +0000 (UTC)
Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com
	[209.85.210.171]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-376-Uqsp37ZUMm-Q1AuB2PN5Tg-1; Thu, 19 Aug 2021 06:50:29 -0400
Received: by mail-pf1-f171.google.com with SMTP id t42so2524184pfg.12
	for <libvir-list@redhat.com>; Thu, 19 Aug 2021 03:50:28 -0700 (PDT)
Received: from anisinha-lenovo.ba.nuagenetworks.net ([203.163.234.32])
	by smtp.googlemail.com with ESMTPSA id
	t19sm3116552pfg.216.2021.08.19.03.50.26
	(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
	Thu, 19 Aug 2021 03:50:27 -0700 (PDT)
X-MC-Unique: sEO02JTwNQuzfa_240VFWg-1
X-MC-Unique: Uqsp37ZUMm-Q1AuB2PN5Tg-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:mime-version:content-transfer-encoding;
	bh=Zd2ANNFdypMsL2STB6OOTm3HHBDl1YLFktCBW5sVFas=;
	b=uVLJNMdPCAOtU5TRi3APR2dLtTMoiGTgtS7lWh91gzqPoLH4x11d7G5BfeG4ruz9BT
	ZA/4mMB3AE1WpA2u5DPNlrO+pFe0CDz/0ifM6Br9gciXkCVROE7r0i9D1igdqhiZ2Qq3
	1yCSS3b3oRAgRpr9cXJhpqkqCycPBrc8D82Qr6ZHVTDls1kA5gzAUhtFo83moWJ1VnAZ
	VSXcjDshO28VJjH3bdR2GRjGWgFVkQ3MRNQq4cR0YZeW1OXmjEscmIPtj/xjCWrtUuGj
	dVeyw7kXaYl2Io01WGqMBhELnF+4TNXU+WbDvjs6vgqXbNFKA1Z3vrjt+r4Qf7OlrrTL
	z+cw==
X-Gm-Message-State: AOAM532zjfVLb+0ylbf2iJpheWt/ACUCOAJwLhgoIbINNDZRipEYY0Kc
	0WH8rK80svc0EkpgQ8Zbcr6bRgcq0aeJ1Q==
X-Google-Smtp-Source: 
 ABdhPJwSa6UgzVU8Bc4BKUfiUSBBNBMPRC6J1vHuDxC3GlDRSjdCXImXOcZYNqPUWqnO9SrrheE6TQ==
X-Received: by 2002:a65:6883:: with SMTP id e3mr13522899pgt.90.1629370227608;
	Thu, 19 Aug 2021 03:50:27 -0700 (PDT)
From: Ani Sinha <ani@anisinha.ca>
To: libvir-list@redhat.com
Subject: [PATCH v2 4/4] tests: add xml2xml tests to exercize pm acpi hotplug
	options for i386
Date: Thu, 19 Aug 2021 16:20:04 +0530
Message-Id: <20210819105004.275239-5-ani@anisinha.ca>
In-Reply-To: <20210819105004.275239-1-ani@anisinha.ca>
References: <20210819105004.275239-1-ani@anisinha.ca>
MIME-Version: 1.0
X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection
	Definition; Similar Internal Domain=false;
	Similar Monitored External Domain=false;
	Custom External Domain=false; Mimecast External Domain=false;
	Newly Observed Domain=false; Internal User Name=false;
	Custom Display Name List=false; Reply-to Address Mismatch=false;
	Targeted Threat Dictionary=false;
	Mimecast Threat Dictionary=false; Custom Threat Dictionary=false
X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5
X-loop: libvir-list@redhat.com
Cc: Ani Sinha <ani@anisinha.ca>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://listman.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1629370372956100001
Content-Type: text/plain; charset="utf-8"

This change adds xml2xml unit tests for the following change:
78ced83e3bb354 ("pm/i386: add support for two options that controls acpi ho=
tplug on q35/i440fx")

This unit test ensures that libvirt generates the correct output xml with p=
roper
pm acpi hotplug options for a given input xml.

Signed-off-by: Ani Sinha <ani@anisinha.ca>
---
 .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 31 +++++++++++++
 .../pc-i440fx-acpi-root-hotplug-disable.xml   | 31 +++++++++++++
 .../q35-acpi-hotplug-bridge-disable.xml       | 45 +++++++++++++++++++
 tests/qemuxml2xmltest.c                       |  9 ++++
 4 files changed, 116 insertions(+)
 create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-=
disable.xml
 create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-di=
sable.xml
 create mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disabl=
e.xml

changelog:
v1: not present.
v2: added this new test.

diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable=
.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
new file mode 100644
index 0000000000..2534dc7e35
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml
@@ -0,0 +1,31 @@
+<domain type=3D'qemu'>
+  <name>i440fx</name>
+  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.5'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <acpi-hotplug-bridge enabled=3D'no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x=
ml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml
new file mode 100644
index 0000000000..0ee404ee46
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml
@@ -0,0 +1,31 @@
+<domain type=3D'qemu'>
+  <name>i440fx</name>
+  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.5'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <acpi-root-hotplug enabled=3D'no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml b=
/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml
new file mode 100644
index 0000000000..e8c6f82145
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>q35</name>
+  <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-2.5'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <acpi-hotplug-bridge enabled=3D'no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
+      <model name=3D'i82801b11-bridge'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
+      <model name=3D'pci-bridge'/>
+      <target chassisNr=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'ioh3420'/>
+      <target chassis=3D'3' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 983489af6c..31086214fc 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -427,6 +427,15 @@ mymain(void)
     DO_TEST("input-usbtablet", NONE);
     DO_TEST("misc-acpi", NONE);
     DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
+    DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable",
+            QEMU_CAPS_PIIX_ACPI_HOTPLUG_BRIDGE);
+    DO_TEST("q35-acpi-hotplug-bridge-disable",
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
+            QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE);
+    DO_TEST("pc-i440fx-acpi-root-hotplug-disable",
+            QEMU_CAPS_PIIX_ACPI_ROOT_PCI_HOTPLUG);
     DO_TEST("misc-disable-suspends",
             QEMU_CAPS_PIIX_DISABLE_S3,
             QEMU_CAPS_PIIX_DISABLE_S4);
--=20
2.25.1