Revert "lock_driver: Introduce new VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON"

This reverts commit 22baf6e0.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>

src/locking/lock_driver.h

@@ -42,8 +42,6 @@ typedef enum {
 typedef enum {
     /* The managed object is a virtual guest domain */
     VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN = 0,
-    /* The managed object is a daemon (e.g. libvirtd) */
-    VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON = 1,
 } virLockManagerObjectType;
 
 typedef enum {

src/locking/lock_driver_lockd.c

@@ -56,21 +56,10 @@ struct _virLockManagerLockDaemonResource {
 };
 
 struct _virLockManagerLockDaemonPrivate {
-    virLockManagerObjectType type;
-    union {
-        struct {
     unsigned char uuid[VIR_UUID_BUFLEN];
     char *name;
     int id;
     pid_t pid;
-        } dom;
-
-        struct {
-            unsigned char uuid[VIR_UUID_BUFLEN];
-            char *name;
-            pid_t pid;
-        } daemon;
-    } t;
 
     size_t nresources;
     virLockManagerLockDaemonResourcePtr resources;
@@ -167,30 +156,10 @@ virLockManagerLockDaemonConnectionRegister(virLockManagerPtr lock,
     memset(&args, 0, sizeof(args));
 
     args.flags = 0;
-
-    switch (priv->type) {
-    case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN:
-        memcpy(args.owner.uuid, priv->t.dom.uuid, VIR_UUID_BUFLEN);
-        args.owner.name = priv->t.dom.name;
-        args.owner.id = priv->t.dom.id;
-        args.owner.pid = priv->t.dom.pid;
-        break;
-
-    case VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON:
-        memcpy(args.owner.uuid, priv->t.daemon.uuid, VIR_UUID_BUFLEN);
-        args.owner.name = priv->t.daemon.name;
-        args.owner.pid = priv->t.daemon.pid;
-        /* This one should not be needed. However, virtlockd
-         * checks for ID because not every domain has a PID. */
-        args.owner.id = priv->t.daemon.pid;
-        break;
-
-    default:
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Unknown lock manager object type %d"),
-                       priv->type);
-        return -1;
-    }
+    memcpy(args.owner.uuid, priv->uuid, VIR_UUID_BUFLEN);
+    args.owner.name = priv->name;
+    args.owner.id = priv->id;
+    args.owner.pid = priv->pid;
 
     if (virNetClientProgramCall(program,
                                 client,
@@ -422,18 +391,7 @@ virLockManagerLockDaemonPrivateFree(virLockManagerLockDaemonPrivatePtr priv)
     }
     VIR_FREE(priv->resources);
 
-    switch (priv->type) {
-    case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN:
-        VIR_FREE(priv->t.dom.name);
-        break;
-
-    case VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON:
-        VIR_FREE(priv->t.daemon.name);
-        break;
-
-    default:
-        break;
-    }
+    VIR_FREE(priv->name);
     VIR_FREE(priv);
 }
 
@@ -462,82 +420,46 @@ static int virLockManagerLockDaemonNew(virLockManagerPtr lock,
     if (VIR_ALLOC(priv) < 0)
         return -1;
 
-    priv->type = type;
-
-    switch ((virLockManagerObjectType) type) {
+    switch (type) {
     case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN:
         for (i = 0; i < nparams; i++) {
             if (STREQ(params[i].key, "uuid")) {
-                memcpy(priv->t.dom.uuid, params[i].value.uuid, VIR_UUID_BUFLEN);
+                memcpy(priv->uuid, params[i].value.uuid, VIR_UUID_BUFLEN);
             } else if (STREQ(params[i].key, "name")) {
-                if (VIR_STRDUP(priv->t.dom.name, params[i].value.str) < 0)
+                if (VIR_STRDUP(priv->name, params[i].value.str) < 0)
                     goto cleanup;
             } else if (STREQ(params[i].key, "id")) {
-                priv->t.dom.id = params[i].value.iv;
+                priv->id = params[i].value.iv;
             } else if (STREQ(params[i].key, "pid")) {
-                priv->t.dom.pid = params[i].value.iv;
+                priv->pid = params[i].value.iv;
             } else if (STREQ(params[i].key, "uri")) {
                 /* ignored */
             } else {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("Unexpected parameter %s for domain object"),
+                               _("Unexpected parameter %s for object"),
                                params[i].key);
                 goto cleanup;
             }
         }
-        if (priv->t.dom.id == 0) {
+        if (priv->id == 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("Missing ID parameter for domain object"));
             goto cleanup;
         }
-        if (priv->t.dom.pid == 0)
+        if (priv->pid == 0)
             VIR_DEBUG("Missing PID parameter for domain object");
-        if (!priv->t.dom.name) {
+        if (!priv->name) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("Missing name parameter for domain object"));
             goto cleanup;
         }
-        if (!virUUIDIsValid(priv->t.dom.uuid)) {
+        if (!virUUIDIsValid(priv->uuid)) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("Missing UUID parameter for domain object"));
             goto cleanup;
         }
         break;
 
-    case VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON:
-        for (i = 0; i < nparams; i++) {
-            if (STREQ(params[i].key, "uuid")) {
-                memcpy(priv->t.daemon.uuid, params[i].value.uuid, VIR_UUID_BUFLEN);
-            } else if (STREQ(params[i].key, "name")) {
-                if (VIR_STRDUP(priv->t.daemon.name, params[i].value.str) < 0)
-                    goto cleanup;
-            } else if (STREQ(params[i].key, "pid")) {
-                priv->t.daemon.pid = params[i].value.iv;
-            } else {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("Unexpected parameter %s for daemon object"),
-                               params[i].key);
-                goto cleanup;
-            }
-        }
-
-        if (!virUUIDIsValid(priv->t.daemon.uuid)) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("Missing UUID parameter for daemon object"));
-            goto cleanup;
-        }
-        if (!priv->t.daemon.name) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("Missing name parameter for daemon object"));
-            goto cleanup;
-        }
-        if (priv->t.daemon.pid == 0) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("Missing PID parameter for daemon object"));
-            goto cleanup;
-        }
-        break;
-
     default:
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unknown lock manager object type %d"),
@@ -572,9 +494,6 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
     if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY)
         return 0;
 
-    switch (priv->type) {
-    case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN:
-
     switch (type) {
     case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK:
         if (params || nparams) {
@@ -676,15 +595,6 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
             goto cleanup;
 
     }   break;
-        default:
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("Unknown lock manager object type %d for domain lock object"),
-                           type);
-            goto cleanup;
-        }
-        break;
-
-    case VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON:
     default:
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unknown lock manager object type %d"),
@@ -729,8 +639,7 @@ static int virLockManagerLockDaemonAcquire(virLockManagerPtr lock,
     virCheckFlags(VIR_LOCK_MANAGER_ACQUIRE_REGISTER_ONLY |
                   VIR_LOCK_MANAGER_ACQUIRE_RESTRICT, -1);
 
-    if (priv->type == VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN &&
-        priv->nresources == 0 &&
+    if (priv->nresources == 0 &&
         priv->hasRWDisks &&
         driver->requireLeaseForDisks) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

src/locking/lock_driver_sanlock.c

@@ -509,8 +509,6 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock,
 
     priv->flags = flags;
 
-    switch ((virLockManagerObjectType) type) {
-    case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN:
     for (i = 0; i < nparams; i++) {
         param = &params[i];
 
@@ -527,15 +525,6 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock,
             priv->vm_uri = param->value.cstr;
         }
     }
-        break;
-
-    case VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON:
-    default:
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Unknown lock manager object type %d"),
-                       type);
-        goto error;
-    }
 
     /* Sanlock needs process registration, but the only way how to probe
      * whether a process has been registered is to inquire the lock.  If