From: John Ferlan Date: Fri, 5 May 2017 19:57:37 +0000 (-0400) Subject: test: Fix up formatting in storage test API's X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f51b78edd9212c5c05fe6e1bb5d01ab4d6b85162;p=libvirt.git test: Fix up formatting in storage test API's Fix some spacing/formatting in the storage pool/vol test driver code. Signed-off-by: John Ferlan --- diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 83ab9cc0b6..8bc5661a20 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1039,6 +1039,7 @@ testParseInterfaces(testDriverPtr privconn, return ret; } + static int testOpenVolumesForPool(const char *file, xmlXPathContextPtr ctxt, @@ -1095,6 +1096,7 @@ testOpenVolumesForPool(const char *file, return ret; } + static int testParseStorage(testDriverPtr privconn, const char *file, @@ -1147,6 +1149,7 @@ testParseStorage(testDriverPtr privconn, return ret; } + static int testParseNodedevs(testDriverPtr privconn, const char *file, @@ -4035,8 +4038,8 @@ testInterfaceDestroy(virInterfacePtr iface, * Storage Driver routines */ - -static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool) +static int +testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool) { pool->def->capacity = defaultPoolCap; @@ -4108,6 +4111,7 @@ testStoragePoolLookupByUUID(virConnectPtr conn, return ret; } + static virStoragePoolPtr testStoragePoolLookupByName(virConnectPtr conn, const char *name) @@ -4128,6 +4132,7 @@ testStoragePoolLookupByName(virConnectPtr conn, return ret; } + static virStoragePoolPtr testStoragePoolLookupByVolume(virStorageVolPtr vol) { @@ -4198,6 +4203,7 @@ testConnectListDefinedStoragePools(virConnectPtr conn, return n; } + static int testConnectListAllStoragePools(virConnectPtr conn, virStoragePoolPtr **pools, @@ -4216,7 +4222,9 @@ testConnectListAllStoragePools(virConnectPtr conn, return ret; } -static int testStoragePoolIsActive(virStoragePoolPtr pool) + +static int +testStoragePoolIsActive(virStoragePoolPtr pool) { testDriverPtr privconn = pool->conn->privateData; virStoragePoolObjPtr obj; @@ -4233,7 +4241,9 @@ static int testStoragePoolIsActive(virStoragePoolPtr pool) return ret; } -static int testStoragePoolIsPersistent(virStoragePoolPtr pool) + +static int +testStoragePoolIsPersistent(virStoragePoolPtr pool) { testDriverPtr privconn = pool->conn->privateData; virStoragePoolObjPtr obj; @@ -4251,7 +4261,6 @@ static int testStoragePoolIsPersistent(virStoragePoolPtr pool) } - static int testStoragePoolCreate(virStoragePoolPtr pool, unsigned int flags) @@ -4286,6 +4295,7 @@ testStoragePoolCreate(virStoragePoolPtr pool, return ret; } + static char * testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type, @@ -4440,6 +4450,7 @@ testStoragePoolCreateXML(virConnectPtr conn, return ret; } + static virStoragePoolPtr testStoragePoolDefineXML(virConnectPtr conn, const char *xml, @@ -4487,6 +4498,7 @@ testStoragePoolDefineXML(virConnectPtr conn, return ret; } + static int testStoragePoolUndefine(virStoragePoolPtr pool) { @@ -4519,6 +4531,7 @@ testStoragePoolUndefine(virStoragePoolPtr pool) return ret; } + static int testStoragePoolBuild(virStoragePoolPtr pool, unsigned int flags) @@ -4712,6 +4725,7 @@ testStoragePoolGetInfo(virStoragePoolPtr pool, return ret; } + static char * testStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) @@ -4733,6 +4747,7 @@ testStoragePoolGetXMLDesc(virStoragePoolPtr pool, return ret; } + static int testStoragePoolGetAutostart(virStoragePoolPtr pool, int *autostart) @@ -4757,6 +4772,7 @@ testStoragePoolGetAutostart(virStoragePoolPtr pool, return ret; } + static int testStoragePoolSetAutostart(virStoragePoolPtr pool, int autostart) @@ -4867,6 +4883,7 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj, return ret; } + static virStorageVolPtr testStorageVolLookupByName(virStoragePoolPtr pool, const char *name ATTRIBUTE_UNUSED) @@ -4940,6 +4957,7 @@ testStorageVolLookupByKey(virConnectPtr conn, return ret; } + static virStorageVolPtr testStorageVolLookupByPath(virConnectPtr conn, const char *path) @@ -4976,6 +4994,7 @@ testStorageVolLookupByPath(virConnectPtr conn, return ret; } + static virStorageVolPtr testStorageVolCreateXML(virStoragePoolPtr pool, const char *xmldesc, @@ -5042,6 +5061,7 @@ testStorageVolCreateXML(virStoragePoolPtr pool, return ret; } + static virStorageVolPtr testStorageVolCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, @@ -5119,6 +5139,7 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool, return ret; } + static int testStorageVolDelete(virStorageVolPtr vol, unsigned int flags) @@ -5171,7 +5192,8 @@ testStorageVolDelete(virStorageVolPtr vol, } -static int testStorageVolumeTypeForPool(int pooltype) +static int +testStorageVolumeTypeForPool(int pooltype) { switch (pooltype) { @@ -5184,6 +5206,7 @@ static int testStorageVolumeTypeForPool(int pooltype) } } + static int testStorageVolGetInfo(virStorageVolPtr vol, virStorageVolInfoPtr info) @@ -5223,6 +5246,7 @@ testStorageVolGetInfo(virStorageVolPtr vol, return ret; } + static char * testStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) @@ -5260,6 +5284,7 @@ testStorageVolGetXMLDesc(virStorageVolPtr vol, return ret; } + static char * testStorageVolGetPath(virStorageVolPtr vol) {