From: Han Han <hhan@redhat.com>
Date: Tue, 19 Jul 2022 07:02:20 +0000 (+0800)
Subject: schemas: Update ref acpi for devices
X-Git-Tag: v8.6.0-rc1~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b28561c8572509fe6ecd045d45779078eb7f5a9;p=thirdparty%2Flibvirt.git

schemas: Update ref acpi for devices

According to a9fe9569ab, the <acpi index='NNN'/> is only for PCI
devices. Remove the ref acpi from devices channel, smartcard, tpm,
redirdev, panic, hub because none of them has PCI address. And add the
ref acpi to iommu device.

Fixes: a9fe9569ab
Signed-off-by: Han Han <hhan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index faa2561665..2f07c25430 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -5409,9 +5409,6 @@
         <optional>
           <ref name="alias"/>
         </optional>
-        <optional>
-          <ref name="acpi"/>
-        </optional>
         <optional>
           <ref name="address"/>
         </optional>
@@ -5453,9 +5450,6 @@
           </interleave>
         </group>
       </choice>
-      <optional>
-        <ref name="alias"/>
-      </optional>
       <optional>
         <ref name="acpi"/>
       </optional>
@@ -5486,9 +5480,6 @@
       <optional>
         <ref name="alias"/>
       </optional>
-      <optional>
-        <ref name="acpi"/>
-      </optional>
       <optional>
         <ref name="address"/>
       </optional>
@@ -5661,6 +5652,9 @@
             </optional>
           </element>
         </optional>
+        <optional>
+          <ref name="acpi"/>
+        </optional>
         <optional>
           <ref name="address"/>
         </optional>
@@ -5772,9 +5766,6 @@
         <optional>
           <ref name="alias"/>
         </optional>
-        <optional>
-          <ref name="acpi"/>
-        </optional>
         <optional>
           <ref name="address"/>
         </optional>
@@ -5794,9 +5785,6 @@
         <optional>
           <ref name="alias"/>
         </optional>
-        <optional>
-          <ref name="acpi"/>
-        </optional>
         <optional>
           <ref name="address"/>
         </optional>
@@ -8048,9 +8036,6 @@
         <optional>
           <ref name="alias"/>
         </optional>
-        <optional>
-          <ref name="acpi"/>
-        </optional>
         <optional>
           <ref name="address"/>
         </optional>