External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-02 19:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Wrap controllers code into dummy loop

Browse Source 
which just re-indent code and prepare it for next patch.
(cherry picked from commit 77b93dbc3e)
This commit is contained in:
Michal Privoznik 2012-11-05 11:42:51 +01:00 committed by Cole Robinson
parent 77b780f581
commit a2e51ac038
1 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/qemu/qemu_command.c
View File

@ -4456,7 +4456,7 @@ qemuBuildCommandLine(virConnectPtr conn,
virDomainSnapshotObjPtr snapshot, virDomainSnapshotObjPtr snapshot,
enum virNetDevVPortProfileOp vmop) enum virNetDevVPortProfileOp vmop)
{ {
int i; int i, j;
struct utsname ut; struct utsname ut;
int disableKQEMU = 0; int disableKQEMU = 0;
int enableKQEMU = 0; int enableKQEMU = 0;
@ -5051,61 +5051,63 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
if (qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { if (qemuCapsGet(caps, QEMU_CAPS_DEVICE)) {
for (i = 0 ; i < def->ncontrollers ; i++) { for (j = 0; j < 1; j++) {
virDomainControllerDefPtr cont = def->controllers[i]; for (i = 0; i < def->ncontrollers; i++) {
virDomainControllerDefPtr cont = def->controllers[i];
/* We don't add an explicit IDE or FD controller because the /* We don't add an explicit IDE or FD controller because the
* provided PIIX4 device already includes one. It isn't possible to * provided PIIX4 device already includes one. It isn't possible to
* remove the PIIX4. */ * remove the PIIX4. */
if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE || if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE ||
cont->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC) cont->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC)
continue; continue;
/* Also, skip USB controllers with type none.*/ /* Also, skip USB controllers with type none.*/
if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) {
usbcontroller = -1; /* mark we don't want a controller */ usbcontroller = -1; /* mark we don't want a controller */
continue; continue;
} }
/* Only recent QEMU implements a SATA (AHCI) controller */ /* Only recent QEMU implements a SATA (AHCI) controller */
if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) {
if (!qemuCapsGet(caps, QEMU_CAPS_ICH9_AHCI)) { if (!qemuCapsGet(caps, QEMU_CAPS_ICH9_AHCI)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("SATA is not supported with this " _("SATA is not supported with this "
"QEMU binary")); "QEMU binary"));
goto error; goto error;
} else {
char *devstr;
virCommandAddArg(cmd, "-device");
if (!(devstr = qemuBuildControllerDevStr(def, cont,
caps, NULL)))
goto error;
virCommandAddArg(cmd, devstr);
VIR_FREE(devstr);
}
} else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
cont->model == -1 &&
!qemuCapsGet(caps, QEMU_CAPS_PIIX3_USB_UHCI)) {
if (usblegacy) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Multiple legacy USB controllers are "
"not supported"));
goto error;
}
usblegacy = true;
} else { } else {
char *devstr;
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(devstr = qemuBuildControllerDevStr(def, cont,
caps, NULL))) char *devstr;
if (!(devstr = qemuBuildControllerDevStr(def, cont, caps,
&usbcontroller)))
goto error; goto error;
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
VIR_FREE(devstr); VIR_FREE(devstr);
} }
} else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
cont->model == -1 &&
!qemuCapsGet(caps, QEMU_CAPS_PIIX3_USB_UHCI)) {
if (usblegacy) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Multiple legacy USB controllers are "
"not supported"));
goto error;
}
usblegacy = true;
} else {
virCommandAddArg(cmd, "-device");
char *devstr;
if (!(devstr = qemuBuildControllerDevStr(def, cont, caps,
&usbcontroller)))
goto error;
virCommandAddArg(cmd, devstr);
VIR_FREE(devstr);
} }
} }
} }
@ -5581,7 +5583,6 @@ qemuBuildCommandLine(virConnectPtr conn,
virDomainSmartcardDefPtr smartcard = def->smartcards[0]; virDomainSmartcardDefPtr smartcard = def->smartcards[0];
char *devstr; char *devstr;
virBuffer opt = VIR_BUFFER_INITIALIZER; virBuffer opt = VIR_BUFFER_INITIALIZER;
int j;
const char *database; const char *database;
if (def->nsmartcards > 1 || if (def->nsmartcards > 1 ||