提交 5cc402a9 编写于 作者: P Peter Krempa

qemu: driver: Remove support for native->XML conversion

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.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
上级 953b88fc
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "qemu_conf.h" #include "qemu_conf.h"
#include "qemu_capabilities.h" #include "qemu_capabilities.h"
#include "qemu_command.h" #include "qemu_command.h"
#include "qemu_parse_command.h"
#include "qemu_cgroup.h" #include "qemu_cgroup.h"
#include "qemu_hostdev.h" #include "qemu_hostdev.h"
#include "qemu_hotplug.h" #include "qemu_hotplug.h"
...@@ -7318,45 +7317,20 @@ static char ...@@ -7318,45 +7317,20 @@ static char
} }
static char *qemuConnectDomainXMLFromNative(virConnectPtr conn, static char *
const char *format, qemuConnectDomainXMLFromNative(virConnectPtr conn,
const char *config, const char *format ATTRIBUTE_UNUSED,
unsigned int flags) const char *config ATTRIBUTE_UNUSED,
unsigned int flags)
{ {
virQEMUDriverPtr driver = conn->privateData;
virDomainDefPtr def = NULL;
char *xml = NULL;
virCapsPtr caps = NULL;
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
if (virConnectDomainXMLFromNativeEnsureACL(conn) < 0) if (virConnectDomainXMLFromNativeEnsureACL(conn) < 0)
goto cleanup; return NULL;
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);
cleanup: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
virDomainDefFree(def); _("converting arbitrary QEMU command lines to libvirt domain XML is no longer supported"));
virObjectUnref(caps); return NULL;
return xml;
} }
static char *qemuConnectDomainXMLToNative(virConnectPtr conn, static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
...@@ -22298,7 +22272,7 @@ static virHypervisorDriver qemuHypervisorDriver = { ...@@ -22298,7 +22272,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
.domainGetSecurityLabelList = qemuDomainGetSecurityLabelList, /* 0.10.0 */ .domainGetSecurityLabelList = qemuDomainGetSecurityLabelList, /* 0.10.0 */
.nodeGetSecurityModel = qemuNodeGetSecurityModel, /* 0.6.1 */ .nodeGetSecurityModel = qemuNodeGetSecurityModel, /* 0.6.1 */
.domainGetXMLDesc = qemuDomainGetXMLDesc, /* 0.2.0 */ .domainGetXMLDesc = qemuDomainGetXMLDesc, /* 0.2.0 */
.connectDomainXMLFromNative = qemuConnectDomainXMLFromNative, /* 0.6.4 */ .connectDomainXMLFromNative = qemuConnectDomainXMLFromNative, /* 0.6.4 (deprecated: 5.5.0) */
.connectDomainXMLToNative = qemuConnectDomainXMLToNative, /* 0.6.4 */ .connectDomainXMLToNative = qemuConnectDomainXMLToNative, /* 0.6.4 */
.connectListDefinedDomains = qemuConnectListDefinedDomains, /* 0.2.0 */ .connectListDefinedDomains = qemuConnectListDefinedDomains, /* 0.2.0 */
.connectNumOfDefinedDomains = qemuConnectNumOfDefinedDomains, /* 0.2.0 */ .connectNumOfDefinedDomains = qemuConnectNumOfDefinedDomains, /* 0.2.0 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册