External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-30 17:45:23 +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

7
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,7 +5051,8 @@ 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++) {
for (i = 0; i < def->ncontrollers; i++) {
virDomainControllerDefPtr cont = def->controllers[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
@ -5109,6 +5110,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
} }
} }
}
if (usbcontroller == 0) if (usbcontroller == 0)
virCommandAddArg(cmd, "-usb"); virCommandAddArg(cmd, "-usb");
@ -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 ||