External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Rename qemuDiskBusNeedsDriveArg to qemuDiskBusIsSD

Browse Source 
The function effectively boils down to whether the disk is 'SD'. Since
we'll need to make more decisions based on the fact whether the disk is
on the SD bus, rename the function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-05-04 15:44:43 +02:00
parent 514822dbbd
commit cc4a277db2
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_command.c
View File

@ -1141,7 +1141,7 @@ qemuCheckFips(void)
/**
* qemuDiskBusNeedsDriveArg:
* qemuDiskBusIsSD:
* @bus: disk bus
*
* Unfortunately it is not possible to use -device for SD devices.
@ -1149,7 +1149,7 @@ qemuCheckFips(void)
* without -device.
*/
bool
qemuDiskBusNeedsDriveArg(int bus)
qemuDiskBusIsSD(int bus)
{
return bus == VIR_DOMAIN_DISK_BUS_SD;
}
@ -1441,7 +1441,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0)
return NULL;
if (!qemuDiskBusNeedsDriveArg(disk->bus)) {
if (!qemuDiskBusIsSD(disk->bus)) {
g_autofree char *drivealias = qemuAliasDiskDriveFromDisk(disk);
if (!drivealias)
return NULL;
@ -2158,7 +2158,7 @@ qemuBuildDiskCommandLine(virCommandPtr cmd,
if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps) < 0)
return -1;
if (!qemuDiskBusNeedsDriveArg(disk->bus)) {
if (!qemuDiskBusIsSD(disk->bus)) {
if (disk->bus != VIR_DOMAIN_DISK_BUS_FDC ||
virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
if (qemuCommandAddExtDevice(cmd, &disk->info) < 0)

2
src/qemu/qemu_command.h
View File

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

2
src/qemu/qemu_hotplug.c
View File

@ -1072,7 +1072,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriverPtr driver,
case VIR_DOMAIN_DISK_BUS_SD:
/* Note that SD card hotplug support should be added only once
* they support '-device' (don't require -drive only).
* See also: qemuDiskBusNeedsDriveArg */
* See also: qemuDiskBusIsSD */
case VIR_DOMAIN_DISK_BUS_LAST:
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("disk bus '%s' cannot be hotplugged."),

2
src/qemu/qemu_process.c
View File

@ -5499,7 +5499,7 @@ qemuProcessPrepareQEMUCaps(virDomainObjPtr vm,
/* clear the 'blockdev' capability for VMs which have disks that need -drive */
for (i = 0; i < vm->def->ndisks; i++) {
if (qemuDiskBusNeedsDriveArg(vm->def->disks[i]->bus)) {
if (qemuDiskBusIsSD(vm->def->disks[i]->bus)) {
virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
break;
}