diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9c9a0ed7e8..03716d42ea 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4429,6 +4429,8 @@ qemuBuildGraphicsCommandLine(struct qemud_driver *driver, qemuCapsPtr caps, virDomainGraphicsDefPtr graphics) { + int i; + if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { virBuffer opt = VIR_BUFFER_INITIALIZER; @@ -4685,7 +4687,7 @@ qemuBuildGraphicsCommandLine(struct qemud_driver *driver, break; } - for (int i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) { + for (i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) { int mode = graphics->data.spice.channels[i]; switch (mode) { case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3d7a5a054f..8743c60094 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2078,8 +2078,9 @@ qemuProcessInitPasswords(virConnectPtr conn, { int ret = 0; qemuDomainObjPrivatePtr priv = vm->privateData; + int i; - for (int i = 0 ; i < vm->def->ngraphics; ++i) { + for (i = 0 ; i < vm->def->ngraphics; ++i) { virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { ret = qemuDomainChangeGraphicsPasswords(driver, vm, @@ -2098,8 +2099,6 @@ qemuProcessInitPasswords(virConnectPtr conn, goto cleanup; if (qemuCapsGet(priv->caps, QEMU_CAPS_DEVICE)) { - int i; - for (i = 0 ; i < vm->def->ndisks ; i++) { char *secret; size_t secretLen;