From b0a82f4abc9f4de3db965c84b926322846588278 Mon Sep 17 00:00:00 2001

Message-Id: <b0a82f4abc9f4de3db965c84b926322846588278@dist-git>

From: Peter Krempa <pkrempa@redhat.com>

Date: Thu, 22 Jan 2015 15:53:47 +0100

Subject: [PATCH] lib: Don't force the key argument when deleting metadata

https://bugzilla.redhat.com/show_bug.cgi?id=1184929

virDomainSetMetadata when operating on the metadata element was

requesting the @key argument to be passed even if @metadata was NULL

used to delete the corresponding metadata element. This is not needed as

the key is only used when adding the element and matching is done via

the XML namespace.

(cherry picked from commit 3b6784d119074e3be8861cc4c30630f299bde121)

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 src/libvirt.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libvirt.c b/src/libvirt.c

index cbcc24b..874304f 100644

--- a/src/libvirt.c

+++ b/src/libvirt.c

@@ -10812,7 +10812,8 @@ virDomainSetMetadata(virDomainPtr domain,

         break;

     case VIR_DOMAIN_METADATA_ELEMENT:

         virCheckNonNullArgGoto(uri, error);

-        virCheckNonNullArgGoto(key, error);

+        if (metadata)

+            virCheckNonNullArgGoto(key, error);

         break;

     default:

         /* For future expansion */

-- 

2.2.1