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: Stop virQEMUCaps propagation into qemuHostdevPreparePCIDevices()

Browse Source 
After previous cleanups, qemuHostdevPreparePCIDevices() no longer
needs virQEMUCaps. Drop its passing from callers.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Michal Privoznik 2023-04-24 10:20:52 +02:00
parent 430fc2ec26
commit 4644aba0b0
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_hostdev.c
View File

@ -181,7 +181,6 @@ qemuHostdevPreparePCIDevices(virQEMUDriver *driver,
const unsigned char *uuid, const unsigned char *uuid,
virDomainHostdevDef **hostdevs, virDomainHostdevDef **hostdevs,
int nhostdevs, int nhostdevs,
virQEMUCaps *qemuCaps G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
return virHostdevPreparePCIDevices(driver->hostdevMgr, return virHostdevPreparePCIDevices(driver->hostdevMgr,
@ -261,7 +260,6 @@ qemuHostdevPrepareMediatedDevices(virQEMUDriver *driver,
int int
qemuHostdevPrepareDomainDevices(virQEMUDriver *driver, qemuHostdevPrepareDomainDevices(virQEMUDriver *driver,
virDomainDef *def, virDomainDef *def,
virQEMUCaps *qemuCaps,
unsigned int flags) unsigned int flags)
{ {
if (!def->nhostdevs && !def->ndisks) if (!def->nhostdevs && !def->ndisks)
@ -271,8 +269,7 @@ qemuHostdevPrepareDomainDevices(virQEMUDriver *driver,
return -1; return -1;
if (qemuHostdevPreparePCIDevices(driver, def->name, def->uuid, if (qemuHostdevPreparePCIDevices(driver, def->name, def->uuid,
def->hostdevs, def->nhostdevs, def->hostdevs, def->nhostdevs, flags) < 0)
qemuCaps, flags) < 0)
return -1; return -1;
if (qemuHostdevPrepareUSBDevices(driver, def->name, if (qemuHostdevPrepareUSBDevices(driver, def->name,

2
src/qemu/qemu_hostdev.h
View File

@ -52,7 +52,6 @@ int qemuHostdevPreparePCIDevices(virQEMUDriver *driver,
const unsigned char *uuid, const unsigned char *uuid,
virDomainHostdevDef **hostdevs, virDomainHostdevDef **hostdevs,
int nhostdevs, int nhostdevs,
virQEMUCaps *qemuCaps,
unsigned int flags); unsigned int flags);
int qemuHostdevPrepareUSBDevices(virQEMUDriver *driver, int qemuHostdevPrepareUSBDevices(virQEMUDriver *driver,
const char *name, const char *name,
@ -73,7 +72,6 @@ int qemuHostdevPrepareMediatedDevices(virQEMUDriver *driver,
int nhostdevs); int nhostdevs);
int qemuHostdevPrepareDomainDevices(virQEMUDriver *driver, int qemuHostdevPrepareDomainDevices(virQEMUDriver *driver,
virDomainDef *def, virDomainDef *def,
virQEMUCaps *qemuCaps,
unsigned int flags); unsigned int flags);
void qemuHostdevReAttachOneNVMeDisk(virQEMUDriver *driver, void qemuHostdevReAttachOneNVMeDisk(virQEMUDriver *driver,

4
src/qemu/qemu_hotplug.c
View File

@ -1490,8 +1490,8 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
if (!cfg->relaxedACS) if (!cfg->relaxedACS)
flags |= VIR_HOSTDEV_STRICT_ACS_CHECK; flags |= VIR_HOSTDEV_STRICT_ACS_CHECK;
if (qemuHostdevPreparePCIDevices(driver, vm->def->name, vm->def->uuid, if (qemuHostdevPreparePCIDevices(driver, vm->def->name,
&hostdev, 1, priv->qemuCaps, flags) < 0) vm->def->uuid, &hostdev, 1, flags) < 0)
return -1; return -1;
if (qemuDomainAdjustMaxMemLockHostdev(vm, hostdev) < 0) if (qemuDomainAdjustMaxMemLockHostdev(vm, hostdev) < 0)

3
src/qemu/qemu_process.c
View File

@ -7164,8 +7164,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver,
hostdev_flags |= VIR_HOSTDEV_STRICT_ACS_CHECK; hostdev_flags |= VIR_HOSTDEV_STRICT_ACS_CHECK;
if (flags & VIR_QEMU_PROCESS_START_NEW) if (flags & VIR_QEMU_PROCESS_START_NEW)
hostdev_flags |= VIR_HOSTDEV_COLD_BOOT; hostdev_flags |= VIR_HOSTDEV_COLD_BOOT;
if (qemuHostdevPrepareDomainDevices(driver, vm->def, priv->qemuCaps, if (qemuHostdevPrepareDomainDevices(driver, vm->def, hostdev_flags) < 0)
hostdev_flags) < 0)
return -1; return -1;
VIR_DEBUG("Preparing chr device backends"); VIR_DEBUG("Preparing chr device backends");