NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu_command: Fix some indentation and a typo

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Luyao Huang 2015-03-17 10:34:26 +08:00 committed by Michal Privoznik
parent 373973206a
commit 4acd2bce26
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qemu/qemu_command.c
View File

@ -1683,8 +1683,8 @@ qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
* *
*/ */
if (nbuses > 0) if (nbuses > 0)
virDomainPCIAddressBusSetModel(&addrs->buses[0], virDomainPCIAddressBusSetModel(&addrs->buses[0],
VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT); VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT);
for (i = 1; i < nbuses; i++) { for (i = 1; i < nbuses; i++) {
virDomainPCIAddressBusSetModel(&addrs->buses[i], virDomainPCIAddressBusSetModel(&addrs->buses[i],
VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE); VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE);
@ -4761,7 +4761,7 @@ qemuBuildMemoryBackendStr(unsigned long long size,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("this qemu doesn't support the " _("this qemu doesn't support the "
"memory-backend-ram object")); "memory-backend-ram object"));
goto cleanup; goto cleanup;
} }
/* report back that using the new backend is not necessary to achieve /* report back that using the new backend is not necessary to achieve
@ -4967,7 +4967,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0)
goto error; goto error;
if (qemuBuildRomStr(&buf, &net->info, qemuCaps) < 0) if (qemuBuildRomStr(&buf, &net->info, qemuCaps) < 0)
goto error; goto error;
if (bootindex && virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX)) if (bootindex && virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX))
virBufferAsprintf(&buf, ",bootindex=%d", bootindex); virBufferAsprintf(&buf, ",bootindex=%d", bootindex);
@ -5512,7 +5512,7 @@ qemuBuildPCIHostdevDevStr(virDomainDefPtr def,
if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
goto error; goto error;
if (qemuBuildRomStr(&buf, dev->info, qemuCaps) < 0) if (qemuBuildRomStr(&buf, dev->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferCheckError(&buf) < 0) if (virBufferCheckError(&buf) < 0)
goto error; goto error;
@ -5577,8 +5577,7 @@ qemuBuildRedirdevDevStr(virDomainDefPtr def,
} }
virBufferAsprintf(&buf, "usb-redir,chardev=char%s,id=%s", virBufferAsprintf(&buf, "usb-redir,chardev=char%s,id=%s",
dev->info.alias, dev->info.alias, dev->info.alias);
dev->info.alias);
if (redirfilter && redirfilter->nusbdevs) { if (redirfilter && redirfilter->nusbdevs) {
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR_FILTER)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR_FILTER)) {
@ -9610,7 +9609,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} else { } else {
virCommandAddArg(cmd, "-parallel"); virCommandAddArg(cmd, "-parallel");
if (!(devstr = qemuBuildChrArgStr(&parallel->source, NULL))) if (!(devstr = qemuBuildChrArgStr(&parallel->source, NULL)))
goto error; goto error;
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
VIR_FREE(devstr); VIR_FREE(devstr);
} }
@ -10558,7 +10557,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:
if (serial->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { if (serial->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("no addresses are suported for isa-serial")); _("no addresses are supported for isa-serial"));
goto error; goto error;
} }
break; break;
@ -10611,7 +10610,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr,
case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO:
if (!(*deviceStr = qemuBuildVirtioSerialPortDevStr(chr, qemuCaps))) if (!(*deviceStr = qemuBuildVirtioSerialPortDevStr(chr, qemuCaps)))
goto cleanup; goto cleanup;
break; break;
case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE:
@ -11467,7 +11466,7 @@ qemuParseCommandLinePCI(const char *val)
virDomainHostdevDefPtr def = virDomainHostdevDefAlloc(); virDomainHostdevDefPtr def = virDomainHostdevDefAlloc();
if (!def) if (!def)
goto error; goto error;
if (!STRPREFIX(val, "host=")) { if (!STRPREFIX(val, "host=")) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -11521,7 +11520,7 @@ qemuParseCommandLineUSB(const char *val)
char *end; char *end;
if (!def) if (!def)
goto error; goto error;
usbsrc = &def->source.subsys.u.usb; usbsrc = &def->source.subsys.u.usb;
if (!STRPREFIX(val, "host:")) { if (!STRPREFIX(val, "host:")) {