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: Rename and export qemuDiskBusNeedsDeviceArg

Browse Source 
Change the semantics to exactly opposite and rename it to
qemuDiskBusNeedsDriveArg. This will be necessary as some devices can't
be used with -blockdev.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-06-07 12:01:24 +02:00
parent d60c17b3d7
commit aa624c3bfb
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qemu/qemu_command.c
View File

@ -1330,15 +1330,18 @@ qemuCheckFips(void)
} }
/* Unfortunately it is not possible to use /**
-device for floppies, or SD * qemuDiskBusNeedsDriveArg:
devices. Fortunately, those don't need * @bus: disk bus
static PCI addresses, so we don't really *
care that we can't use -device */ * Unfortunately it is not possible to use -device for SD devices.
static bool * Fortunately, those don't need static PCI addresses, so we can use -drive
qemuDiskBusNeedsDeviceArg(int bus) * without -device.
*/
bool
qemuDiskBusNeedsDriveArg(int bus)
{ {
return bus != VIR_DOMAIN_DISK_BUS_SD; return bus == VIR_DOMAIN_DISK_BUS_SD;
} }
@ -1636,7 +1639,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0) if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0)
goto error; goto error;
if (qemuDiskBusNeedsDeviceArg(disk->bus)) { if (!qemuDiskBusNeedsDriveArg(disk->bus)) {
char *drivealias = qemuAliasDiskDriveFromDisk(disk); char *drivealias = qemuAliasDiskDriveFromDisk(disk);
if (!drivealias) if (!drivealias)
goto error; goto error;
@ -2250,7 +2253,7 @@ qemuBuildDiskCommandLine(virCommandPtr cmd,
qemuBlockStorageSourceAttachDataFree(data); qemuBlockStorageSourceAttachDataFree(data);
if (qemuDiskBusNeedsDeviceArg(disk->bus)) { if (!qemuDiskBusNeedsDriveArg(disk->bus)) {
if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) { if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) {
if (qemuBuildFloppyCommandLineOptions(cmd, def, disk, if (qemuBuildFloppyCommandLineOptions(cmd, def, disk,
bootindex) < 0) bootindex) < 0)

1
src/qemu/qemu_command.h
View File

@ -99,6 +99,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk); char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk);
bool qemuDiskBusNeedsDriveArg(int bus);
qemuBlockStorageSourceAttachDataPtr qemuBlockStorageSourceAttachDataPtr
qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk,