External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: snapshot: Rename external disk snapshot handling functions

Browse Source 
Fix and unify the naming of external snapshot preparation functions.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-08-28 17:20:36 +02:00
parent e1b61f2cd5
commit 0d1622a1f4
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/qemu/qemu_driver.c
View File

@ -15266,10 +15266,10 @@ typedef qemuDomainSnapshotDiskData *qemuDomainSnapshotDiskDataPtr;
static void static void
qemuDomainSnapshotDiskDataCleanup(qemuDomainSnapshotDiskDataPtr data, qemuDomainSnapshotDiskCleanup(qemuDomainSnapshotDiskDataPtr data,
size_t ndata, size_t ndata,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,
virDomainObjPtr vm) virDomainObjPtr vm)
{ {
virErrorPtr orig_err; virErrorPtr orig_err;
size_t i; size_t i;
@ -15281,7 +15281,7 @@ qemuDomainSnapshotDiskDataCleanup(qemuDomainSnapshotDiskDataPtr data,
for (i = 0; i < ndata; i++) { for (i = 0; i < ndata; i++) {
/* on success of the snapshot the 'src' and 'persistsrc' properties will /* on success of the snapshot the 'src' and 'persistsrc' properties will
* be set to NULL by qemuDomainSnapshotUpdateDiskSources */ * be set to NULL by qemuDomainSnapshotDiskUpdateSource */
if (data[i].src) { if (data[i].src) {
if (data[i].created && if (data[i].created &&
virStorageFileUnlink(data[i].src) < 0) { virStorageFileUnlink(data[i].src) < 0) {
@ -15307,12 +15307,12 @@ qemuDomainSnapshotDiskDataCleanup(qemuDomainSnapshotDiskDataPtr data,
static int static int
qemuDomainSnapshotDiskDataCollectOne(virQEMUDriverPtr driver, qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
virDomainSnapshotDiskDefPtr snapdisk, virDomainSnapshotDiskDefPtr snapdisk,
qemuDomainSnapshotDiskDataPtr dd, qemuDomainSnapshotDiskDataPtr dd,
bool reuse) bool reuse)
{ {
char *backingStoreStr; char *backingStoreStr;
virDomainDiskDefPtr persistdisk; virDomainDiskDefPtr persistdisk;
@ -15366,18 +15366,18 @@ qemuDomainSnapshotDiskDataCollectOne(virQEMUDriverPtr driver,
/** /**
* qemuDomainSnapshotDiskDataCollect: * qemuDomainSnapshotDiskPrepare:
* *
* Collects and prepares a list of structures that hold information about disks * Collects and prepares a list of structures that hold information about disks
* that are selected for the snapshot. * that are selected for the snapshot.
*/ */
static int static int
qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr driver, qemuDomainSnapshotDiskPrepare(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainMomentObjPtr snap, virDomainMomentObjPtr snap,
bool reuse, bool reuse,
qemuDomainSnapshotDiskDataPtr *rdata, qemuDomainSnapshotDiskDataPtr *rdata,
size_t *rndata) size_t *rndata)
{ {
size_t i; size_t i;
qemuDomainSnapshotDiskDataPtr data; qemuDomainSnapshotDiskDataPtr data;
@ -15392,9 +15392,9 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr driver,
if (snapdef->disks[i].snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) if (snapdef->disks[i].snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE)
continue; continue;
if (qemuDomainSnapshotDiskDataCollectOne(driver, vm, vm->def->disks[i], if (qemuDomainSnapshotDiskPrepareOne(driver, vm, vm->def->disks[i],
snapdef->disks + i, snapdef->disks + i,
data + ndata++, reuse) < 0) data + ndata++, reuse) < 0)
goto cleanup; goto cleanup;
} }
@ -15403,13 +15403,13 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
qemuDomainSnapshotDiskDataCleanup(data, ndata, driver, vm); qemuDomainSnapshotDiskCleanup(data, ndata, driver, vm);
return ret; return ret;
} }
static void static void
qemuDomainSnapshotUpdateDiskSourcesRenumber(virStorageSourcePtr src) qemuDomainSnapshotDiskUpdateSourceRenumber(virStorageSourcePtr src)
{ {
virStorageSourcePtr next; virStorageSourcePtr next;
unsigned int idx = 1; unsigned int idx = 1;
@ -15420,7 +15420,7 @@ qemuDomainSnapshotUpdateDiskSourcesRenumber(virStorageSourcePtr src)
/** /**
* qemuDomainSnapshotUpdateDiskSources: * qemuDomainSnapshotDiskUpdateSource:
* @driver: QEMU driver * @driver: QEMU driver
* @vm: domain object * @vm: domain object
* @dd: snapshot disk data object * @dd: snapshot disk data object
@ -15428,9 +15428,9 @@ qemuDomainSnapshotUpdateDiskSourcesRenumber(virStorageSourcePtr src)
* Updates disk definition after a successful snapshot. * Updates disk definition after a successful snapshot.
*/ */
static void static void
qemuDomainSnapshotUpdateDiskSources(virQEMUDriverPtr driver, qemuDomainSnapshotDiskUpdateSource(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
qemuDomainSnapshotDiskDataPtr dd) qemuDomainSnapshotDiskDataPtr dd)
{ {
/* storage driver access won'd be needed */ /* storage driver access won'd be needed */
if (dd->initialized) if (dd->initialized)
@ -15454,7 +15454,7 @@ qemuDomainSnapshotUpdateDiskSources(virQEMUDriverPtr driver,
VIR_STEAL_PTR(dd->disk->src, dd->src); VIR_STEAL_PTR(dd->disk->src, dd->src);
/* fix numbering of disks */ /* fix numbering of disks */
qemuDomainSnapshotUpdateDiskSourcesRenumber(dd->disk->src); qemuDomainSnapshotDiskUpdateSourceRenumber(dd->disk->src);
if (dd->persistdisk) { if (dd->persistdisk) {
VIR_STEAL_PTR(dd->persistsrc->backingStore, dd->persistdisk->src); VIR_STEAL_PTR(dd->persistsrc->backingStore, dd->persistdisk->src);
@ -15519,8 +15519,8 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
/* prepare a list of objects to use in the vm definition so that we don't /* prepare a list of objects to use in the vm definition so that we don't
* have to roll back later */ * have to roll back later */
if (qemuDomainSnapshotDiskDataCollect(driver, vm, snap, reuse, if (qemuDomainSnapshotDiskPrepare(driver, vm, snap, reuse,
&diskdata, &ndiskdata) < 0) &diskdata, &ndiskdata) < 0)
goto cleanup; goto cleanup;
/* check whether there's anything to do */ /* check whether there's anything to do */
@ -15554,7 +15554,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", rc >= 0); virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", rc >= 0);
if (rc == 0) if (rc == 0)
qemuDomainSnapshotUpdateDiskSources(driver, vm, dd); qemuDomainSnapshotDiskUpdateSource(driver, vm, dd);
} }
if (rc < 0) if (rc < 0)
@ -15568,7 +15568,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
qemuDomainSnapshotDiskDataCleanup(diskdata, ndiskdata, driver, vm); qemuDomainSnapshotDiskCleanup(diskdata, ndiskdata, driver, vm);
return ret; return ret;
} }