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: hostdev: Unify naming for qemuHostdevPrepare*Devices()

Browse Source 
Adopt the same names used for virHostdevPrepare*Devices() for
consistency's sake and to make it easier to jump between the two.

No functional changes.
This commit is contained in:
Andrea Bolognani 2015-10-20 14:10:16 +02:00
parent 2ab52f4af7
commit c074a64251
4 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/qemu/qemu_hostdev.c
View File

@ -156,9 +156,9 @@ qemuHostdevHostSupportsPassthroughLegacy(void)
static bool static bool
qemuPrepareHostdevPCICheckSupport(virDomainHostdevDefPtr *hostdevs, qemuHostdevPreparePCIDevicesCheckSupport(virDomainHostdevDefPtr *hostdevs,
size_t nhostdevs, size_t nhostdevs,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
bool supportsPassthroughKVM = qemuHostdevHostSupportsPassthroughLegacy(); bool supportsPassthroughKVM = qemuHostdevHostSupportsPassthroughLegacy();
bool supportsPassthroughVFIO = qemuHostdevHostSupportsPassthroughVFIO(); bool supportsPassthroughVFIO = qemuHostdevHostSupportsPassthroughVFIO();
@ -219,7 +219,7 @@ qemuPrepareHostdevPCICheckSupport(virDomainHostdevDefPtr *hostdevs,
} }
int int
qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver, qemuHostdevPreparePCIDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
const unsigned char *uuid, const unsigned char *uuid,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
@ -230,7 +230,7 @@ qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
int ret = -1; int ret = -1;
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
if (!qemuPrepareHostdevPCICheckSupport(hostdevs, nhostdevs, qemuCaps)) if (!qemuHostdevPreparePCIDevicesCheckSupport(hostdevs, nhostdevs, qemuCaps))
goto out; goto out;
ret = virHostdevPreparePCIDevices(hostdev_mgr, QEMU_DRIVER_NAME, ret = virHostdevPreparePCIDevices(hostdev_mgr, QEMU_DRIVER_NAME,
@ -241,11 +241,11 @@ qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
} }
int int
qemuPrepareHostUSBDevices(virQEMUDriverPtr driver, qemuHostdevPrepareUSBDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs, int nhostdevs,
unsigned int flags) unsigned int flags)
{ {
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
@ -254,7 +254,7 @@ qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
} }
int int
qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver, qemuHostdevPrepareSCSIDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
@ -284,24 +284,24 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver,
int int
qemuPrepareHostDevices(virQEMUDriverPtr driver, qemuHostdevPrepareDomainDevices(virQEMUDriverPtr driver,
virDomainDefPtr def, virDomainDefPtr def,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
unsigned int flags) unsigned int flags)
{ {
if (!def->nhostdevs) if (!def->nhostdevs)
return 0; return 0;
if (qemuPrepareHostdevPCIDevices(driver, def->name, def->uuid, if (qemuHostdevPreparePCIDevices(driver, def->name, def->uuid,
def->hostdevs, def->nhostdevs, def->hostdevs, def->nhostdevs,
qemuCaps, flags) < 0) qemuCaps, flags) < 0)
return -1; return -1;
if (qemuPrepareHostUSBDevices(driver, def->name, if (qemuHostdevPrepareUSBDevices(driver, def->name,
def->hostdevs, def->nhostdevs, flags) < 0) def->hostdevs, def->nhostdevs, flags) < 0)
return -1; return -1;
if (qemuPrepareHostdevSCSIDevices(driver, def->name, if (qemuHostdevPrepareSCSIDevices(driver, def->name,
def->hostdevs, def->nhostdevs) < 0) def->hostdevs, def->nhostdevs) < 0)
return -1; return -1;

24
src/qemu/qemu_hostdev.h
View File

@ -35,27 +35,27 @@ int qemuUpdateActiveSCSIHostdevs(virQEMUDriverPtr driver,
virDomainDefPtr def); virDomainDefPtr def);
bool qemuHostdevHostSupportsPassthroughLegacy(void); bool qemuHostdevHostSupportsPassthroughLegacy(void);
bool qemuHostdevHostSupportsPassthroughVFIO(void); bool qemuHostdevHostSupportsPassthroughVFIO(void);
int qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
int qemuHostdevPreparePCIDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
const unsigned char *uuid, const unsigned char *uuid,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs, int nhostdevs,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
unsigned int flags); unsigned int flags);
int int qemuHostdevPrepareUSBDevices(virQEMUDriverPtr driver,
qemuPrepareHostUSBDevices(virQEMUDriverPtr driver, const char *name,
const char *name, virDomainHostdevDefPtr *hostdevs,
virDomainHostdevDefPtr *hostdevs, int nhostdevs,
int nhostdevs, unsigned int flags);
unsigned int flags); int qemuHostdevPrepareSCSIDevices(virQEMUDriverPtr driver,
int qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs); int nhostdevs);
int qemuPrepareHostDevices(virQEMUDriverPtr driver, int qemuHostdevPrepareDomainDevices(virQEMUDriverPtr driver,
virDomainDefPtr def, virDomainDefPtr def,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
unsigned int flags); unsigned int flags);
void void
qemuDomainReAttachHostUSBDevices(virQEMUDriverPtr driver, qemuDomainReAttachHostUSBDevices(virQEMUDriverPtr driver,
const char *name, const char *name,

8
src/qemu/qemu_hotplug.c
View File

@ -1263,11 +1263,11 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
if (!cfg->relaxedACS) if (!cfg->relaxedACS)
flags |= VIR_HOSTDEV_STRICT_ACS_CHECK; flags |= VIR_HOSTDEV_STRICT_ACS_CHECK;
if (qemuPrepareHostdevPCIDevices(driver, vm->def->name, vm->def->uuid, if (qemuHostdevPreparePCIDevices(driver, vm->def->name, vm->def->uuid,
&hostdev, 1, priv->qemuCaps, flags) < 0) &hostdev, 1, priv->qemuCaps, flags) < 0)
goto cleanup; goto cleanup;
/* this could have been changed by qemuPrepareHostdevPCIDevices */ /* this could have been changed by qemuHostdevPreparePCIDevices */
backend = hostdev->source.subsys.u.pci.backend; backend = hostdev->source.subsys.u.pci.backend;
switch ((virDomainHostdevSubsysPCIBackendType) backend) { switch ((virDomainHostdevSubsysPCIBackendType) backend) {
@ -1885,7 +1885,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver,
bool teardownlabel = false; bool teardownlabel = false;
int ret = -1; int ret = -1;
if (qemuPrepareHostUSBDevices(driver, vm->def->name, &hostdev, 1, 0) < 0) if (qemuHostdevPrepareUSBDevices(driver, vm->def->name, &hostdev, 1, 0) < 0)
goto cleanup; goto cleanup;
added = true; added = true;
@ -1968,7 +1968,7 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn,
if (!cont) if (!cont)
return -1; return -1;
if (qemuPrepareHostdevSCSIDevices(driver, vm->def->name, if (qemuHostdevPrepareSCSIDevices(driver, vm->def->name,
&hostdev, 1)) { &hostdev, 1)) {
virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi;
if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {

4
src/qemu/qemu_process.c
View File

@ -4490,8 +4490,8 @@ int qemuProcessStart(virConnectPtr conn,
hostdev_flags |= VIR_HOSTDEV_STRICT_ACS_CHECK; hostdev_flags |= VIR_HOSTDEV_STRICT_ACS_CHECK;
if (!migrateFrom) if (!migrateFrom)
hostdev_flags |= VIR_HOSTDEV_COLD_BOOT; hostdev_flags |= VIR_HOSTDEV_COLD_BOOT;
if (qemuPrepareHostDevices(driver, vm->def, priv->qemuCaps, if (qemuHostdevPrepareDomainDevices(driver, vm->def, priv->qemuCaps,
hostdev_flags) < 0) hostdev_flags) < 0)
goto cleanup; goto cleanup;
VIR_DEBUG("Preparing chr devices"); VIR_DEBUG("Preparing chr devices");