[libvirt] [PATCH 0/2] bhyve: tiny cleanup and fix
Maxim Nestratov (2): bhyve: cleanup unnecessary variables bhyve: fix invalid hostsysinfo freeing src/bhyve/bhyve_driver.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.4.3
--- src/bhyve/bhyve_driver.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 9219890..4d341b5 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1187,8 +1187,6 @@ bhyveStateInitialize(bool privileged, virStateInhibitCallback callback ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { - virConnectPtr conn = NULL; - if (!privileged) { VIR_INFO("Not running privileged, disabling driver"); return 0; @@ -1259,12 +1257,9 @@ bhyveStateInitialize(bool privileged, virBhyveProcessReconnectAll(bhyve_driver); - virObjectUnref(conn); - return 0; cleanup: - virObjectUnref(conn); bhyveStateCleanup(); return -1; } -- 2.4.3
On Tue, Mar 29, 2016 at 03:20:55PM +0300, Maxim Nestratov wrote:
--- src/bhyve/bhyve_driver.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 9219890..4d341b5 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1187,8 +1187,6 @@ bhyveStateInitialize(bool privileged, virStateInhibitCallback callback ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { - virConnectPtr conn = NULL; - if (!privileged) { VIR_INFO("Not running privileged, disabling driver"); return 0; @@ -1259,12 +1257,9 @@ bhyveStateInitialize(bool privileged,
virBhyveProcessReconnectAll(bhyve_driver);
- virObjectUnref(conn); - return 0;
cleanup: - virObjectUnref(conn); bhyveStateCleanup(); return -1; }
ACK Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--- src/bhyve/bhyve_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4d341b5..5526bb0 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1172,7 +1172,7 @@ bhyveStateCleanup(void) virObjectUnref(bhyve_driver->domains); virObjectUnref(bhyve_driver->caps); virObjectUnref(bhyve_driver->xmlopt); - virObjectUnref(bhyve_driver->hostsysinfo); + virSysinfoDefFree(bhyve_driver->hostsysinfo); virObjectUnref(bhyve_driver->closeCallbacks); virObjectEventStateFree(bhyve_driver->domainEventState); -- 2.4.3
On Tue, Mar 29, 2016 at 03:20:56PM +0300, Maxim Nestratov wrote:
--- src/bhyve/bhyve_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4d341b5..5526bb0 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1172,7 +1172,7 @@ bhyveStateCleanup(void) virObjectUnref(bhyve_driver->domains); virObjectUnref(bhyve_driver->caps); virObjectUnref(bhyve_driver->xmlopt); - virObjectUnref(bhyve_driver->hostsysinfo); + virSysinfoDefFree(bhyve_driver->hostsysinfo); virObjectUnref(bhyve_driver->closeCallbacks); virObjectEventStateFree(bhyve_driver->domainEventState);
ACK Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
29.03.2016 15:29, Daniel P. Berrange пишет:
On Tue, Mar 29, 2016 at 03:20:56PM +0300, Maxim Nestratov wrote:
--- src/bhyve/bhyve_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4d341b5..5526bb0 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1172,7 +1172,7 @@ bhyveStateCleanup(void) virObjectUnref(bhyve_driver->domains); virObjectUnref(bhyve_driver->caps); virObjectUnref(bhyve_driver->xmlopt); - virObjectUnref(bhyve_driver->hostsysinfo); + virSysinfoDefFree(bhyve_driver->hostsysinfo); virObjectUnref(bhyve_driver->closeCallbacks); virObjectEventStateFree(bhyve_driver->domainEventState); ACK
Regards, Daniel Thanks, pushed. Maxim
participants (2)
-
Daniel P. Berrange -
Maxim Nestratov