]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Ignore 'uri' parameter in lockd driver
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 3 May 2013 13:23:03 +0000 (14:23 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 3 May 2013 14:36:15 +0000 (15:36 +0100)
A 'uri' parameter was added for the benefit of sanlock. This
causes a warning in the lockd driver though

2013-05-03 13:20:35.347+0000: 28403: error : virLockManagerLockDaemonNew:482 : internal error Unexpected parameter uri for object

Ignore this parameter, since lockd does not require it and it
is harmless if not used.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/locking/lock_driver_lockd.c

index 4d0cd743c49e107f309121e9c4070f7192ff5c74..807710584ac83c0c24f087bd9d4f1578e0f5ce9e 100644 (file)
@@ -476,6 +476,8 @@ static int virLockManagerLockDaemonNew(virLockManagerPtr lock,
                 priv->id = params[i].value.i;
             } else if (STREQ(params[i].key, "pid")) {
                 priv->pid = params[i].value.i;
+            } else if (STREQ(params[i].key, "uri")) {
+                /* ignored */
             } else {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("Unexpected parameter %s for object"),