]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
netcf: Don't complain when cleanup is called before init
authorChristophe Fergeau <cfergeau@redhat.com>
Thu, 17 Oct 2013 13:48:33 +0000 (15:48 +0200)
committerChristophe Fergeau <cfergeau@redhat.com>
Fri, 18 Oct 2013 12:31:51 +0000 (14:31 +0200)
netcfStateInitialize() initializes the driverState variable,
and when netcfStateCleanup is called, it will call virReportError()
if driverState is NULL.
This is not consistent with what other state objects are doing,
they return -1 without reporting an error in such cases.

See also
https://www.redhat.com/archives/libvir-list/2013-October/msg00809.html:

On Thu, Oct 17, 2013 at 01:40:19PM +0100, Daniel P. Berrange wrote:
> We don't want virStateCleanup to skip execution if virStateInitialize
> has failed though - every callback in virStateCleanup should be written
> to be safe if its corresponding init function hasn't run.

src/interface/interface_backend_netcf.c

index fac059defb4739b099b255e7627e5baec3032341..c4e18c4ebbddd0e3df1073dacbaeea00c4196649 100644 (file)
@@ -100,11 +100,8 @@ netcfStateInitialize(bool privileged ATTRIBUTE_UNUSED,
 static int
 netcfStateCleanup(void)
 {
-    if (!driverState) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("Attempt to close netcf state driver already closed"));
+    if (!driverState)
         return -1;
-    }
 
     if (virObjectUnref(driverState)) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",