mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
locking: Use virDomainLockImage[Attach|Detach] instead of *Disk
Use the functions designed to deal with single images as the *Disk functions were just wrappers. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
93a1659171
commit
083b74cd20
@ -1294,8 +1294,6 @@ virStreamInData;
|
||||
|
||||
|
||||
# locking/domain_lock.h
|
||||
virDomainLockDiskAttach;
|
||||
virDomainLockDiskDetach;
|
||||
virDomainLockImageAttach;
|
||||
virDomainLockImageDetach;
|
||||
virDomainLockLeaseAttach;
|
||||
|
@ -3051,9 +3051,9 @@ libxlDomainAttachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev)
|
||||
if (libxlMakeDisk(l_disk, &x_disk) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainLockDiskAttach(libxl_driver->lockManager,
|
||||
"xen:///system",
|
||||
vm, l_disk) < 0)
|
||||
if (virDomainLockImageAttach(libxl_driver->lockManager,
|
||||
"xen:///system",
|
||||
vm, l_disk->src) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if ((ret = libxl_device_disk_add(cfg->ctx, vm->def->id,
|
||||
@ -3061,8 +3061,8 @@ libxlDomainAttachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev)
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("libxenlight failed to attach disk '%s'"),
|
||||
l_disk->dst);
|
||||
if (virDomainLockDiskDetach(libxl_driver->lockManager,
|
||||
vm, l_disk) < 0) {
|
||||
if (virDomainLockImageDetach(libxl_driver->lockManager,
|
||||
vm, l_disk->src) < 0) {
|
||||
VIR_WARN("Unable to release lock on %s",
|
||||
virDomainDiskGetSource(l_disk));
|
||||
}
|
||||
@ -3350,8 +3350,8 @@ libxlDomainDetachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev)
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (virDomainLockDiskDetach(libxl_driver->lockManager,
|
||||
vm, l_disk) < 0)
|
||||
if (virDomainLockImageDetach(libxl_driver->lockManager,
|
||||
vm, l_disk->src) < 0)
|
||||
VIR_WARN("Unable to release lock on %s",
|
||||
virDomainDiskGetSource(l_disk));
|
||||
|
||||
|
@ -281,15 +281,6 @@ int virDomainLockImageAttach(virLockManagerPluginPtr plugin,
|
||||
}
|
||||
|
||||
|
||||
int virDomainLockDiskAttach(virLockManagerPluginPtr plugin,
|
||||
const char *uri,
|
||||
virDomainObjPtr dom,
|
||||
virDomainDiskDefPtr disk)
|
||||
{
|
||||
return virDomainLockImageAttach(plugin, uri, dom, disk->src);
|
||||
}
|
||||
|
||||
|
||||
int virDomainLockImageDetach(virLockManagerPluginPtr plugin,
|
||||
virDomainObjPtr dom,
|
||||
virStorageSourcePtr src)
|
||||
@ -317,14 +308,6 @@ int virDomainLockImageDetach(virLockManagerPluginPtr plugin,
|
||||
}
|
||||
|
||||
|
||||
int virDomainLockDiskDetach(virLockManagerPluginPtr plugin,
|
||||
virDomainObjPtr dom,
|
||||
virDomainDiskDefPtr disk)
|
||||
{
|
||||
return virDomainLockImageDetach(plugin, dom, disk->src);
|
||||
}
|
||||
|
||||
|
||||
int virDomainLockLeaseAttach(virLockManagerPluginPtr plugin,
|
||||
const char *uri,
|
||||
virDomainObjPtr dom,
|
||||
|
@ -42,14 +42,6 @@ int virDomainLockProcessInquire(virLockManagerPluginPtr plugin,
|
||||
virDomainObjPtr dom,
|
||||
char **state);
|
||||
|
||||
int virDomainLockDiskAttach(virLockManagerPluginPtr plugin,
|
||||
const char *uri,
|
||||
virDomainObjPtr dom,
|
||||
virDomainDiskDefPtr disk);
|
||||
int virDomainLockDiskDetach(virLockManagerPluginPtr plugin,
|
||||
virDomainObjPtr dom,
|
||||
virDomainDiskDefPtr disk);
|
||||
|
||||
int virDomainLockImageAttach(virLockManagerPluginPtr plugin,
|
||||
const char *uri,
|
||||
virDomainObjPtr dom,
|
||||
|
@ -106,8 +106,8 @@ qemuHotplugPrepareDiskAccess(virQEMUDriverPtr driver,
|
||||
goto rollback_cgroup;
|
||||
}
|
||||
|
||||
if (virDomainLockDiskAttach(driver->lockManager, cfg->uri,
|
||||
vm, disk) < 0)
|
||||
if (virDomainLockImageAttach(driver->lockManager, cfg->uri,
|
||||
vm, disk->src) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (qemuDomainNamespaceSetupDisk(vm, disk->src) < 0)
|
||||
@ -137,7 +137,7 @@ qemuHotplugPrepareDiskAccess(virQEMUDriverPtr driver,
|
||||
NULLSTR(virDomainDiskGetSource(disk)));
|
||||
|
||||
rollback_lock:
|
||||
if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0)
|
||||
if (virDomainLockImageDetach(driver->lockManager, vm, disk->src) < 0)
|
||||
VIR_WARN("Unable to release lock on %s",
|
||||
NULLSTR(virDomainDiskGetSource(disk)));
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user