qemu: simplify addition of USB controller in qemuParseCommandLine

virDomainDefAddUSBController() does everything that the multiple lines
of code were doing.
This commit is contained in:
Laine Stump 2016-05-10 12:07:54 -04:00
parent 4aeb1d5158
commit 9cdac8afc9

View File

@ -2371,14 +2371,8 @@ qemuParseCommandLine(virCapsPtr caps,
WANT_VALUE(); WANT_VALUE();
/* ignore, generted on the fly */ /* ignore, generted on the fly */
} else if (STREQ(arg, "-usb")) { } else if (STREQ(arg, "-usb")) {
virDomainControllerDefPtr ctldef; if (virDomainDefAddUSBController(def, -1, -1) < 0)
ctldef = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB);
if (!ctldef)
goto error; goto error;
if (virDomainControllerInsert(def, ctldef) < 0) {
virDomainControllerDefFree(ctldef);
goto error;
}
} else if (STREQ(arg, "-pidfile")) { } else if (STREQ(arg, "-pidfile")) {
WANT_VALUE(); WANT_VALUE();
if (pidfile) if (pidfile)