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

qemuDomainEnsurePCIAddress: Don't pass virQEMUDriver explicitly

Browse Source 
The function is already getting 'virDomainObj' which has already the
driver pointer present.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-11-18 14:50:28 +01:00
parent b04ebc1626
commit b01183a9b9
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_domain_address.c
View File

@ -3034,8 +3034,7 @@ qemuAssignMemoryDeviceSlot(virDomainMemoryDef *mem,
int int
qemuDomainAssignMemoryDeviceSlot(virQEMUDriver *driver, qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm,
virDomainObj *vm,
virDomainMemoryDef *mem) virDomainMemoryDef *mem)
{ {
g_autoptr(virBitmap) slotmap = NULL; g_autoptr(virBitmap) slotmap = NULL;
@ -3052,7 +3051,7 @@ qemuDomainAssignMemoryDeviceSlot(virQEMUDriver *driver,
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
return qemuDomainEnsurePCIAddress(vm, &dev, driver); return qemuDomainEnsurePCIAddress(vm, &dev);
break; break;
case VIR_DOMAIN_MEMORY_MODEL_NONE: case VIR_DOMAIN_MEMORY_MODEL_NONE:
@ -3232,8 +3231,7 @@ qemuDomainAssignAddresses(virDomainDef *def,
*/ */
int int
qemuDomainEnsurePCIAddress(virDomainObj *obj, qemuDomainEnsurePCIAddress(virDomainObj *obj,
virDomainDeviceDef *dev, virDomainDeviceDef *dev)
virQEMUDriver *driver)
{ {
qemuDomainObjPrivate *priv = obj->privateData; qemuDomainObjPrivate *priv = obj->privateData;
virDomainDeviceInfo *info = virDomainDeviceGetInfo(dev); virDomainDeviceInfo *info = virDomainDeviceGetInfo(dev);
@ -3241,7 +3239,7 @@ qemuDomainEnsurePCIAddress(virDomainObj *obj,
if (!info) if (!info)
return 0; return 0;
qemuDomainFillDevicePCIConnectFlags(obj->def, dev, priv->qemuCaps, driver); qemuDomainFillDevicePCIConnectFlags(obj->def, dev, priv->qemuCaps, priv->driver);
qemuDomainFillDevicePCIExtensionFlags(dev, info, priv->qemuCaps); qemuDomainFillDevicePCIExtensionFlags(dev, info, priv->qemuCaps);
@ -3272,7 +3270,6 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr,
virDomainDeviceInfo *info = virDomainDeviceGetInfo(dev); virDomainDeviceInfo *info = virDomainDeviceGetInfo(dev);
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
virDomainCCWAddressSet *ccwaddrs = NULL; virDomainCCWAddressSet *ccwaddrs = NULL;
virQEMUDriver *driver = priv->driver;
int ret = -1; int ret = -1;
if (!info->type) { if (!info->type) {
@ -3289,7 +3286,7 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr,
goto cleanup; goto cleanup;
} else if (!info->type || } else if (!info->type ||
info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
if (qemuDomainEnsurePCIAddress(vm, dev, driver) < 0) if (qemuDomainEnsurePCIAddress(vm, dev) < 0)
goto cleanup; goto cleanup;
*releaseAddr = true; *releaseAddr = true;
} }

8
src/qemu/qemu_domain_address.h
View File

@ -45,9 +45,8 @@ int qemuDomainAssignAddresses(virDomainDef *def,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
int qemuDomainEnsurePCIAddress(virDomainObj *obj, int qemuDomainEnsurePCIAddress(virDomainObj *obj,
virDomainDeviceDef *dev, virDomainDeviceDef *dev)
virQEMUDriver *driver) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
void qemuDomainFillDeviceIsolationGroup(virDomainDef *def, void qemuDomainFillDeviceIsolationGroup(virDomainDef *def,
virDomainDeviceDef *dev) virDomainDeviceDef *dev)
@ -56,8 +55,7 @@ void qemuDomainFillDeviceIsolationGroup(virDomainDef *def,
void qemuDomainReleaseDeviceAddress(virDomainObj *vm, void qemuDomainReleaseDeviceAddress(virDomainObj *vm,
virDomainDeviceInfo *info); virDomainDeviceInfo *info);
int qemuDomainAssignMemoryDeviceSlot(virQEMUDriver *driver, int qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm,
virDomainObj *vm,
virDomainMemoryDef *mem); virDomainMemoryDef *mem);
void qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm, void qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm,

21
src/qemu/qemu_hotplug.c
View File

@ -1254,7 +1254,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
if (virDomainCCWAddressAssign(&net->info, ccwaddrs, if (virDomainCCWAddressAssign(&net->info, ccwaddrs,
!net->info.addr.ccw.assigned) < 0) !net->info.addr.ccw.assigned) < 0)
goto cleanup; goto cleanup;
} else if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) { } else if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) {
goto cleanup; goto cleanup;
} }
@ -1706,7 +1706,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
/* Isolation groups are only relevant for pSeries guests */ /* Isolation groups are only relevant for pSeries guests */
qemuDomainFillDeviceIsolationGroup(vm->def, &dev); qemuDomainFillDeviceIsolationGroup(vm->def, &dev);
if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) if (qemuDomainEnsurePCIAddress(vm, &dev) < 0)
goto error; goto error;
releaseaddr = true; releaseaddr = true;
@ -2131,8 +2131,7 @@ qemuDomainChrRemove(virDomainDef *vmdef,
*/ */
static int static int
qemuDomainAttachChrDeviceAssignAddr(virDomainObj *vm, qemuDomainAttachChrDeviceAssignAddr(virDomainObj *vm,
virDomainChrDef *chr, virDomainChrDef *chr)
virQEMUDriver *driver)
{ {
virDomainDef *def = vm->def; virDomainDef *def = vm->def;
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
@ -2146,7 +2145,7 @@ qemuDomainAttachChrDeviceAssignAddr(virDomainObj *vm,
} else if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && } else if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI) { chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI) {
if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) if (qemuDomainEnsurePCIAddress(vm, &dev) < 0)
return -1; return -1;
return 1; return 1;
@ -2204,7 +2203,7 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver,
if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0) if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0)
goto cleanup; goto cleanup;
if ((rc = qemuDomainAttachChrDeviceAssignAddr(vm, chr, driver)) < 0) if ((rc = qemuDomainAttachChrDeviceAssignAddr(vm, chr)) < 0)
goto cleanup; goto cleanup;
if (rc == 1) if (rc == 1)
need_release = true; need_release = true;
@ -2442,7 +2441,7 @@ qemuDomainAttachMemory(virQEMUDriver *driver,
if (qemuDomainDefValidateMemoryHotplug(vm->def, mem) < 0) if (qemuDomainDefValidateMemoryHotplug(vm->def, mem) < 0)
goto cleanup; goto cleanup;
if (qemuDomainAssignMemoryDeviceSlot(driver, vm, mem) < 0) if (qemuDomainAssignMemoryDeviceSlot(vm, mem) < 0)
goto cleanup; goto cleanup;
releaseaddr = true; releaseaddr = true;
@ -2777,7 +2776,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriver *driver,
if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE ||
hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) if (qemuDomainEnsurePCIAddress(vm, &dev) < 0)
goto cleanup; goto cleanup;
} else if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { } else if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
if (!(ccwaddrs = virDomainCCWAddressSetCreateFromDomain(vm->def))) if (!(ccwaddrs = virDomainCCWAddressSetCreateFromDomain(vm->def)))
@ -2870,7 +2869,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver,
switch (hostdev->source.subsys.u.mdev.model) { switch (hostdev->source.subsys.u.mdev.model) {
case VIR_MDEV_MODEL_TYPE_VFIO_PCI: case VIR_MDEV_MODEL_TYPE_VFIO_PCI:
if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) if (qemuDomainEnsurePCIAddress(vm, &dev) < 0)
return -1; return -1;
break; break;
case VIR_MDEV_MODEL_TYPE_VFIO_CCW: { case VIR_MDEV_MODEL_TYPE_VFIO_CCW: {
@ -3039,7 +3038,7 @@ qemuDomainAttachShmemDevice(virQEMUDriver *driver,
if ((shmem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || if ((shmem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE ||
shmem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && shmem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) &&
(qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)) (qemuDomainEnsurePCIAddress(vm, &dev) < 0))
return -1; return -1;
if (!(devProps = qemuBuildShmemDevProps(vm->def, shmem))) if (!(devProps = qemuBuildShmemDevProps(vm->def, shmem)))
@ -3136,7 +3135,7 @@ qemuDomainAttachWatchdog(virQEMUDriver *driver,
return -1; return -1;
if (watchdog->model == VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB) { if (watchdog->model == VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB) {
if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) if (qemuDomainEnsurePCIAddress(vm, &dev) < 0)
goto cleanup; goto cleanup;
releaseAddress = true; releaseAddress = true;
} else { } else {