[libvirt] [PATCH] Ignore 'uri' parameter in lockd driver

From: "Daniel P. Berrange" <berrange@redhat.com> 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 4d0cd74..8077105 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -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"), -- 1.8.1.4

On 05/03/2013 07:24 AM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
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 | 2 ++ 1 file changed, 2 insertions(+)
ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Daniel P. Berrange
-
Eric Blake