External/libvirt
1
0
Fork 0
Code

qemu: conf: Split out code to retrieve hostdev key and reuse it

Browse Source 
Both addition and removal of a shared hostdev share the code to generate
the hostdev key. Split it out into a separate function and refactor
them.
This commit is contained in:
Peter Krempa 2014-08-07 18:16:38 +02:00
parent f05de1ef27
commit d49e27a3ed
1 changed files with 32 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/qemu/qemu_conf.c
View File

@ -992,24 +992,14 @@ qemuAddSharedDisk(virQEMUDriverPtr driver,
} }
static int static char *
qemuAddSharedHostdev(virQEMUDriverPtr driver, qemuGetSharedHostdevKey(virDomainHostdevDefPtr hostdev)
virDomainHostdevDefPtr hostdev,
const char *name)
{ {
virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi;
virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host;
char *dev_name = NULL; char *dev_name = NULL;
char *dev_path = NULL; char *dev_path = NULL;
char *key = NULL; char *key = NULL;
int ret = -1;
if (!hostdev->shareable ||
!(hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI))
return 0;
qemuDriverLock(driver);
if (!(dev_name = virSCSIDeviceGetDevName(NULL, if (!(dev_name = virSCSIDeviceGetDevName(NULL,
scsihostsrc->adapter, scsihostsrc->adapter,
@ -1024,15 +1014,33 @@ qemuAddSharedHostdev(virQEMUDriverPtr driver,
if (!(key = qemuGetSharedDeviceKey(dev_path))) if (!(key = qemuGetSharedDeviceKey(dev_path)))
goto cleanup; goto cleanup;
if (qemuSharedDeviceEntryInsert(driver, key, name) < 0)
goto cleanup;
ret = 0;
cleanup: cleanup:
qemuDriverUnlock(driver);
VIR_FREE(dev_name); VIR_FREE(dev_name);
VIR_FREE(dev_path); VIR_FREE(dev_path);
return key;
}
static int
qemuAddSharedHostdev(virQEMUDriverPtr driver,
virDomainHostdevDefPtr hostdev,
const char *name)
{
char *key = NULL;
int ret = -1;
if (!hostdev->shareable ||
!(hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI))
return 0;
if (!(key = qemuGetSharedHostdevKey(hostdev)))
return -1;
qemuDriverLock(driver);
ret = qemuSharedDeviceEntryInsert(driver, key, name);
qemuDriverUnlock(driver);
VIR_FREE(key); VIR_FREE(key);
return ret; return ret;
} }
@ -1121,41 +1129,21 @@ qemuRemoveSharedHostdev(virQEMUDriverPtr driver,
virDomainHostdevDefPtr hostdev, virDomainHostdevDefPtr hostdev,
const char *name) const char *name)
{ {
virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi;
virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host;
char *key = NULL; char *key = NULL;
char *dev_name = NULL; int ret;
char *dev_path = NULL;
int ret = -1;
if (!hostdev->shareable || if (!hostdev->shareable ||
!(hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && !(hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI)) hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI))
return 0; return 0;
if (!(key = qemuGetSharedHostdevKey(hostdev)))
return -1;
qemuDriverLock(driver); qemuDriverLock(driver);
ret = qemuSharedDeviceEntryRemove(driver, key, name);
if (!(dev_name = virSCSIDeviceGetDevName(NULL,
scsihostsrc->adapter,
scsihostsrc->bus,
scsihostsrc->target,
scsihostsrc->unit)))
goto cleanup;
if (virAsprintf(&dev_path, "/dev/%s", dev_name) < 0)
goto cleanup;
if (!(key = qemuGetSharedDeviceKey(dev_path)))
goto cleanup;
if (qemuSharedDeviceEntryRemove(driver, key, name) < 0)
goto cleanup;
ret = 0;
cleanup:
qemuDriverUnlock(driver); qemuDriverUnlock(driver);
VIR_FREE(dev_name);
VIR_FREE(dev_path);
VIR_FREE(key); VIR_FREE(key);
return ret; return ret;
} }