From: Luyao Huang <lhuang@redhat.com>
Date: Fri, 12 Dec 2014 02:32:53 +0000 (+0800)
Subject: conf: Ignore device address for model=none usb controller and memballon
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f6f4bd10b2fcfddad59affe33ba9962dcdd98ff3;p=libvirt.git

conf: Ignore device address for model=none usb controller and memballon

It make no sense at all to have it there.

Signed-off-by: Luyao Huang <lhuang@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index defa44058b..d4ac301d6d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6684,8 +6684,12 @@ virDomainControllerDefParseXML(xmlNodePtr node,
         goto error;
     }
 
-    if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
+        def->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) {
+        VIR_DEBUG("Ignoring device address for none model usb controller");
+    } else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) {
         goto error;
+    }
 
     switch (def->type) {
     case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: {
@@ -9990,7 +9994,9 @@ virDomainMemballoonDefParseXML(xmlNodePtr node,
         goto error;
     }
 
-    if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0)
+    if (def->model == VIR_DOMAIN_MEMBALLOON_MODEL_NONE)
+        VIR_DEBUG("Ignoring device address for none model Memballoon");
+    else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0)
         goto error;
 
  cleanup: