提交 f6f4bd10 编写于 作者: L Luyao Huang 提交者: Martin Kletzander

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

It make no sense at all to have it there.
Signed-off-by: NLuyao Huang <lhuang@redhat.com>
上级 791fc05a
......@@ -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:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册