[PATCH 13/13] qemu: Delete old unused code for adding objects to qemu

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/libvirt_private.syms |  1 -
 src/qemu/qemu_monitor.c  | 34 ----------------------------------
 src/qemu/qemu_monitor.h  |  5 -----
 src/util/virqemu.c       | 22 ----------------------
 src/util/virqemu.h       |  4 ----
 5 files changed, 66 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 37922f8c84..6001635916 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2600,7 +2600,6 @@ virQEMUBuildCommandLineJSONArrayBitmap;
 virQEMUBuildCommandLineJSONArrayNumbered;
 virQEMUBuildDriveCommandlineFromJSON;
 virQEMUBuildObjectCommandlineFromJSON;
-virQEMUBuildObjectCommandlineFromJSONType;
 virQEMUBuildQemuImgKeySecretOpts;


diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index fe8fdfaf9a..876157437a 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3093,40 +3093,6 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
 }


-
-/**
- * qemuMonitorAddObjectType:
- * @mon: Pointer to monitor object
- * @type: Type name of object to add
- * @objalias: Alias of the new object
- * @props: Optional arguments for the given type. The object is consumed and
- *         should not be referenced by the caller after this function returns.
- *
- * Returns 0 on success -1 on error.
- */
-int
-qemuMonitorAddObjectType(qemuMonitorPtr mon,
-                         const char *type,
-                         const char *objalias,
-                         virJSONValuePtr props)
-{
-    virJSONValuePtr tmpprops = NULL;
-    int ret = -1;
-
-    VIR_DEBUG("type=%s objalias=%s props=%p", type, objalias, props);
-
-    if (!(tmpprops = qemuMonitorCreateObjectPropsWrap(type, objalias, &props)))
-        goto cleanup;
-
-    ret = qemuMonitorAddObject(mon, &tmpprops, NULL);
-
- cleanup:
-    virJSONValueFree(props);
-    virJSONValueFree(tmpprops);
-    return ret;
-}
-
-
 int
 qemuMonitorDelObject(qemuMonitorPtr mon,
                      const char *objalias)
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 0c13391520..d6e5a2239e 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -810,11 +810,6 @@ int qemuMonitorAddObject(qemuMonitorPtr mon,
                          virJSONValuePtr *props,
                          char **alias);

-int qemuMonitorAddObjectType(qemuMonitorPtr mon,
-                             const char *type,
-                             const char *objalias,
-                             virJSONValuePtr props);
-
 int qemuMonitorDelObject(qemuMonitorPtr mon,
                          const char *objalias);

diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index 1390b68b86..e16429d80d 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -264,28 +264,6 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
 }


-char *
-virQEMUBuildObjectCommandlineFromJSONType(const char *type,
-                                          const char *alias,
-                                          virJSONValuePtr props)
-{
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
-    char *ret = NULL;
-
-    if (virQEMUBuildObjectCommandlineFromJSONInternal(&buf, type, alias, props) < 0)
-        goto cleanup;
-
-    if (virBufferCheckError(&buf) < 0)
-        goto cleanup;
-
-    ret = virBufferContentAndReset(&buf);
-
- cleanup:
-    virBufferFreeAndReset(&buf);
-    return ret;
-}
-
-
 int
 virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
                                       virJSONValuePtr objprops)
diff --git a/src/util/virqemu.h b/src/util/virqemu.h
index 0a4f4468f2..309be45761 100644
--- a/src/util/virqemu.h
+++ b/src/util/virqemu.h
@@ -43,10 +43,6 @@ int virQEMUBuildCommandLineJSON(virJSONValuePtr value,
                                 virBufferPtr buf,
                                 virQEMUBuildCommandLineJSONArrayFormatFunc array);

-char *virQEMUBuildObjectCommandlineFromJSONType(const char *type,
-                                                const char *alias,
-                                                virJSONValuePtr props);
-
 int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
                                           virJSONValuePtr objprops);

-- 
2.16.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list