[PATCH v3 01/12] conf: Introduce virDomainInputDefRemove and fix memory leak

[Luke Yue <lukedyue@xxxxxxxxx>]

Signed-off-by: Luke Yue <lukedyue@xxxxxxxxx>
---
 src/conf/domain_conf.c   | 12 ++++++++++++
 src/conf/domain_conf.h   |  2 ++
 src/libvirt_private.syms |  1 +
 src/qemu/qemu_driver.c   |  3 ++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index da0c64b460..3193120b79 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16901,6 +16901,18 @@ virDomainInputDefFind(const virDomainDef *def,
 }
 
 
+virDomainInputDef *
+virDomainInputDefRemove(virDomainDef *def,
+                        size_t idx)
+{
+    virDomainInputDef *ret = def->inputs[idx];
+
+    VIR_DELETE_ELEMENT(def->inputs, idx, def->ninputs);
+
+    return ret;
+}
+
+
 bool
 virDomainVsockDefEquals(const virDomainVsockDef *a,
                         const virDomainVsockDef *b)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ab9a7d66f8..a089b0b3de 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3851,6 +3851,8 @@ virDomainShmemDef *virDomainShmemDefRemove(virDomainDef *def, size_t idx)
 ssize_t virDomainInputDefFind(const virDomainDef *def,
                               const virDomainInputDef *input)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
+virDomainInputDef *virDomainInputDefRemove(virDomainDef *def, size_t idx)
+    ATTRIBUTE_NONNULL(1);
 bool virDomainVsockDefEquals(const virDomainVsockDef *a,
                              const virDomainVsockDef *b)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 9ee8fda25f..000c9893f0 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -478,6 +478,7 @@ virDomainInputBusTypeToString;
 virDomainInputDefFind;
 virDomainInputDefFree;
 virDomainInputDefGetPath;
+virDomainInputDefRemove;
 virDomainInputSourceGrabToggleTypeFromString;
 virDomainInputSourceGrabToggleTypeToString;
 virDomainInputSourceGrabTypeFromString;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6a77d9f513..cf9407c358 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7678,7 +7678,8 @@ qemuDomainDetachDeviceConfig(virDomainDef *vmdef,
                            _("matching input device not found"));
             return -1;
         }
-        VIR_DELETE_ELEMENT(vmdef->inputs, idx, vmdef->ninputs);
+
+        virDomainInputDefFree(virDomainInputDefRemove(vmdef, idx));
         break;
 
     case VIR_DOMAIN_DEVICE_VSOCK:
-- 
2.33.1