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: Directly report bus type in qemuBuildDriveStrValidate

Browse Source 
All of the error message are already in a conditional block with known
bus type. Inline the bus type rather than formatting it from a separate
variable.
This commit is contained in:
Peter Krempa 2017-11-01 11:02:41 +01:00
parent dfd300a71d
commit f15ed22757
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_command.c
View File

@ -1467,8 +1467,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk,
static int static int
qemuBuildDriveStrValidate(virDomainDiskDefPtr disk, qemuBuildDriveStrValidate(virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps)
const char *bus)
{ {
switch (disk->bus) { switch (disk->bus) {
case VIR_DOMAIN_DISK_BUS_SCSI: case VIR_DOMAIN_DISK_BUS_SCSI:
@ -1496,8 +1495,8 @@ qemuBuildDriveStrValidate(virDomainDiskDefPtr disk,
} }
/* We can only have 1 IDE controller (currently) */ /* We can only have 1 IDE controller (currently) */
if (disk->info.addr.drive.controller != 0) { if (disk->info.addr.drive.controller != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Only 1 %s controller is supported"), bus); _("Only 1 IDE controller is supported"));
return -1; return -1;
} }
break; break;
@ -1510,14 +1509,14 @@ qemuBuildDriveStrValidate(virDomainDiskDefPtr disk,
} }
/* We can only have 1 FDC controller (currently) */ /* We can only have 1 FDC controller (currently) */
if (disk->info.addr.drive.controller != 0) { if (disk->info.addr.drive.controller != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Only 1 %s controller is supported"), bus); _("Only 1 fdc controller is supported"));
return -1; return -1;
} }
/* We can only have 1 FDC bus (currently) */ /* We can only have 1 FDC bus (currently) */
if (disk->info.addr.drive.bus != 0) { if (disk->info.addr.drive.bus != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Only 1 %s bus is supported"), bus); _("Only 1 fdc bus is supported"));
return -1; return -1;
} }
if (disk->info.addr.drive.target != 0) { if (disk->info.addr.drive.target != 0) {
@ -1628,12 +1627,11 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer opt = VIR_BUFFER_INITIALIZER; virBuffer opt = VIR_BUFFER_INITIALIZER;
const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus);
const char *trans = const char *trans =
virDomainDiskGeometryTransTypeToString(disk->geometry.trans); virDomainDiskGeometryTransTypeToString(disk->geometry.trans);
bool emitDeviceSyntax = qemuDiskBusNeedsDeviceArg(disk->bus); bool emitDeviceSyntax = qemuDiskBusNeedsDeviceArg(disk->bus);
if (qemuBuildDriveStrValidate(disk, qemuCaps, bus) < 0) if (qemuBuildDriveStrValidate(disk, qemuCaps) < 0)
goto error; goto error;
if (qemuBuildDriveSourceStr(disk, cfg, &opt, qemuCaps) < 0) if (qemuBuildDriveSourceStr(disk, cfg, &opt, qemuCaps) < 0)
@ -1642,7 +1640,8 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
if (emitDeviceSyntax) if (emitDeviceSyntax)
virBufferAddLit(&opt, "if=none"); virBufferAddLit(&opt, "if=none");
else else
virBufferAsprintf(&opt, "if=%s", bus); virBufferAsprintf(&opt, "if=%s",
virDomainDiskQEMUBusTypeToString(disk->bus));
if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {