[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] Revert "Fix libvirtd restart for domains with PCI passthrough devices"



This reverts commit cdc42d0a4865199a941d330dbb6ca1ef426323ae.
As DanB pointed out, this patch is actually wrong.  The real
bug that was causing me to see this problem is a bug
introduced in a RHEL-5 libvirt snapshot, and I'm going to
fix the real bug there.

Signed-off-by: Chris Lalancette <clalance redhat com>
---
 src/conf/domain_conf.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6d0e2dc..e548d1d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2876,7 +2876,7 @@ static int
 virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn,
                                      const xmlNodePtr node,
                                      virDomainHostdevDefPtr def,
-                                     int flags ATTRIBUTE_UNUSED) {
+                                     int flags) {
 
     int ret = -1;
     xmlNodePtr cur;
@@ -2890,7 +2890,8 @@ virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn,
 
                 if (virDomainDevicePCIAddressParseXML(conn, cur, addr) < 0)
                     goto out;
-            } else if (xmlStrEqual(cur->name, BAD_CAST "state")) {
+            } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) &&
+                       xmlStrEqual(cur->name, BAD_CAST "state")) {
                 /* Legacy back-compat. Don't add any more attributes here */
                 char *devaddr = virXMLPropString(cur, "devaddr");
                 if (devaddr &&
-- 
1.6.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]