[libvirt] [PATCH 0/2] Two almost trivial fixes
Any review appreciated. Michal Privoznik (2): storageVolLookupData: Drop conn struct member storageDriverAutostart: Drop unused @conn src/storage/storage_driver.c | 9 ++------- src/test/test_driver.c | 5 ++--- 2 files changed, 4 insertions(+), 10 deletions(-) -- 2.16.1
Since its introduction in 5d5c732d748d64 it has been never used. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/storage/storage_driver.c | 5 ++--- src/test/test_driver.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index d5e38af5aa..6ddead1b95 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1520,7 +1520,6 @@ storageVolLookupByName(virStoragePoolPtr pool, struct storageVolLookupData { - virConnectPtr conn; const char *key; char *cleanpath; const char *path; @@ -1547,7 +1546,7 @@ storageVolLookupByKey(virConnectPtr conn, virStoragePoolObjPtr obj; virStoragePoolDefPtr def; struct storageVolLookupData data = { - .conn = conn, .key = key, .voldef = NULL }; + .key = key, .voldef = NULL }; virStorageVolPtr vol = NULL; if ((obj = virStoragePoolObjListSearch(driver->pools, @@ -1627,7 +1626,7 @@ storageVolLookupByPath(virConnectPtr conn, virStoragePoolObjPtr obj; virStoragePoolDefPtr def; struct storageVolLookupData data = { - .conn = conn, .path = path, .voldef = NULL }; + .path = path, .voldef = NULL }; virStorageVolPtr vol = NULL; if (!(data.cleanpath = virFileSanitizePath(path))) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5e39ae574c..856869c9d3 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5026,7 +5026,6 @@ testStorageVolLookupByName(virStoragePoolPtr pool, struct storageVolLookupData { - virConnectPtr conn; const char *key; const char *path; virStorageVolDefPtr voldef; @@ -5053,7 +5052,7 @@ testStorageVolLookupByKey(virConnectPtr conn, virStoragePoolObjPtr obj; virStoragePoolDefPtr def; struct storageVolLookupData data = { - .conn = conn, .key = key, .voldef = NULL }; + .key = key, .voldef = NULL }; virStorageVolPtr vol = NULL; testDriverLock(privconn); @@ -5097,7 +5096,7 @@ testStorageVolLookupByPath(virConnectPtr conn, virStoragePoolObjPtr obj; virStoragePoolDefPtr def; struct storageVolLookupData data = { - .conn = conn, .path = path, .voldef = NULL }; + .path = path, .voldef = NULL }; virStorageVolPtr vol = NULL; testDriverLock(privconn); -- 2.16.1
This variable is not actually used in the function. Especially after 31869efe2a8. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/storage/storage_driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 6ddead1b95..173b91b61b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -218,13 +218,9 @@ storageDriverAutostartCallback(virStoragePoolObjPtr obj, static void storageDriverAutostart(void) { - virConnectPtr conn = NULL; - virStoragePoolObjListForEach(driver->pools, storageDriverAutostartCallback, NULL); - - virObjectUnref(conn); } /** -- 2.16.1
On Fri, Apr 06, 2018 at 02:22:45PM +0200, Michal Privoznik wrote:
Any review appreciated.
Michal Privoznik (2): storageVolLookupData: Drop conn struct member storageDriverAutostart: Drop unused @conn
src/storage/storage_driver.c | 9 ++------- src/test/test_driver.c | 5 ++--- 2 files changed, 4 insertions(+), 10 deletions(-)
ACK Jano
participants (2)
-
Ján Tomko -
Michal Privoznik