[libvirt] [RFC PATCH 3/5] qemu: driver: Remove support for native->XML conversion

Peter Krempa pkrempa at redhat.com
Fri Jun 14 13:30:25 UTC 2019


This code is really neglected and does not at all work reliably. It
can't even be used for converting our own commandline back.

Since this was mostly useful for aiding migration from manually run qemu
to libvirt and will not work for this puspose in many cases it's not
worth having in my opinion.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index bb6ba97c7a..7279b20d2e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7319,44 +7319,18 @@ static char


 static char *qemuConnectDomainXMLFromNative(virConnectPtr conn,
-                                            const char *format,
-                                            const char *config,
+                                            const char *format ATTRIBUTE_UNUSED,
+                                            const char *config ATTRIBUTE_UNUSED,
                                             unsigned int flags)
 {
-    virQEMUDriverPtr driver = conn->privateData;
-    virDomainDefPtr def = NULL;
-    char *xml = NULL;
-    virCapsPtr caps = NULL;
-
     virCheckFlags(0, NULL);

     if (virConnectDomainXMLFromNativeEnsureACL(conn) < 0)
-        goto cleanup;
-
-    if (STRNEQ(format, QEMU_CONFIG_FORMAT_ARGV)) {
-        virReportError(VIR_ERR_INVALID_ARG,
-                       _("unsupported config type %s"), format);
-        goto cleanup;
-    }
-
-    if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
-        goto cleanup;
-
-    def = qemuParseCommandLineString(driver->qemuCapsCache,
-                                     caps, driver->xmlopt, config,
-                                     NULL, NULL, NULL);
-    if (!def)
-        goto cleanup;
-
-    if (!def->name && VIR_STRDUP(def->name, "unnamed") < 0)
-        goto cleanup;
-
-    xml = qemuDomainDefFormatXML(driver, def, VIR_DOMAIN_XML_INACTIVE);
+        return NULL;

- cleanup:
-    virDomainDefFree(def);
-    virObjectUnref(caps);
-    return xml;
+    virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+                   _("qemu driver no longer supports native to XML conversion"));
+    return NULL;
 }

 static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
-- 
2.21.0




More information about the libvir-list mailing list