From d03044717dd8f41991bb0eb959e7aa5fba3de79a Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 3 Sep 2014 15:39:59 +0200 Subject: [PATCH] qemu: snapshot: Fix snapshot function header formatting and spacing --- src/qemu/qemu_driver.c | 70 ++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8c222cc391..56874895b1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12185,6 +12185,7 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver, return frozen < 0 ? -2 : frozen; } + /* Return -1 on error, otherwise number of thawed filesystems. */ static int qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver, @@ -12230,6 +12231,7 @@ qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver, return thawed; } + /* The domain is expected to be locked and inactive. */ static int qemuDomainSnapshotCreateInactiveInternal(virQEMUDriverPtr driver, @@ -12239,6 +12241,7 @@ qemuDomainSnapshotCreateInactiveInternal(virQEMUDriverPtr driver, return qemuDomainSnapshotForEachQcow2(driver, vm, snap, "-c", false); } + /* The domain is expected to be locked and inactive. */ static int qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, @@ -12420,6 +12423,7 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn, return ret; } + static int qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk) { @@ -12825,6 +12829,7 @@ qemuDomainSnapshotPrepare(virConnectPtr conn, return ret; } + /* The domain is expected to hold monitor lock. */ static int qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, @@ -12943,6 +12948,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, return ret; } + /* The domain is expected to hold monitor lock. This is the * counterpart to qemuDomainSnapshotCreateSingleDiskActive, called * only on a failed transaction. */ @@ -12981,6 +12987,7 @@ qemuDomainSnapshotUndoSingleDiskActive(virQEMUDriverPtr driver, } } + /* The domain is expected to be locked and active. */ static int qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, @@ -13586,9 +13593,12 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, return snapshot; } -static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, - int nameslen, - unsigned int flags) + +static int +qemuDomainSnapshotListNames(virDomainPtr domain, + char **names, + int nameslen, + unsigned int flags) { virDomainObjPtr vm = NULL; int n = -1; @@ -13611,8 +13621,10 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, return n; } -static int qemuDomainSnapshotNum(virDomainPtr domain, - unsigned int flags) + +static int +qemuDomainSnapshotNum(virDomainPtr domain, + unsigned int flags) { virDomainObjPtr vm = NULL; int n = -1; @@ -13634,8 +13646,10 @@ static int qemuDomainSnapshotNum(virDomainPtr domain, return n; } + static int -qemuDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, +qemuDomainListAllSnapshots(virDomainPtr domain, + virDomainSnapshotPtr **snaps, unsigned int flags) { virDomainObjPtr vm = NULL; @@ -13658,6 +13672,7 @@ qemuDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, return n; } + static int qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, char **names, @@ -13689,6 +13704,7 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, return n; } + static int qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, unsigned int flags) @@ -13717,6 +13733,7 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, return n; } + static int qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, virDomainSnapshotPtr **snaps, @@ -13747,9 +13764,11 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, return n; } -static virDomainSnapshotPtr qemuDomainSnapshotLookupByName(virDomainPtr domain, - const char *name, - unsigned int flags) + +static virDomainSnapshotPtr +qemuDomainSnapshotLookupByName(virDomainPtr domain, + const char *name, + unsigned int flags) { virDomainObjPtr vm; virDomainSnapshotObjPtr snap = NULL; @@ -13774,8 +13793,10 @@ static virDomainSnapshotPtr qemuDomainSnapshotLookupByName(virDomainPtr domain, return snapshot; } -static int qemuDomainHasCurrentSnapshot(virDomainPtr domain, - unsigned int flags) + +static int +qemuDomainHasCurrentSnapshot(virDomainPtr domain, + unsigned int flags) { virDomainObjPtr vm; int ret = -1; @@ -13796,6 +13817,7 @@ static int qemuDomainHasCurrentSnapshot(virDomainPtr domain, return ret; } + static virDomainSnapshotPtr qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, unsigned int flags) @@ -13830,8 +13852,10 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, return parent; } -static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, - unsigned int flags) + +static virDomainSnapshotPtr +qemuDomainSnapshotCurrent(virDomainPtr domain, + unsigned int flags) { virDomainObjPtr vm; virDomainSnapshotPtr snapshot = NULL; @@ -13858,8 +13882,10 @@ static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, return snapshot; } -static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, - unsigned int flags) + +static char * +qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, + unsigned int flags) { virDomainObjPtr vm = NULL; char *xml = NULL; @@ -13887,6 +13913,7 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, return xml; } + static int qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, unsigned int flags) @@ -13946,6 +13973,7 @@ qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, return ret; } + /* The domain is expected to be locked and inactive. */ static int qemuDomainSnapshotRevertInactive(virQEMUDriverPtr driver, @@ -13957,8 +13985,10 @@ qemuDomainSnapshotRevertInactive(virQEMUDriverPtr driver, return ret > 0 ? -1 : ret; } -static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, - unsigned int flags) + +static int +qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, + unsigned int flags) { virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL; @@ -14329,6 +14359,7 @@ struct _virQEMUSnapReparent { virDomainSnapshotObjPtr last; }; + static void qemuDomainSnapshotReparentChildren(void *payload, const void *name ATTRIBUTE_UNUSED, @@ -14358,8 +14389,9 @@ qemuDomainSnapshotReparentChildren(void *payload, } -static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, - unsigned int flags) +static int +qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, + unsigned int flags) { virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virDomainObjPtr vm = NULL;