External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: Drop support for parsing sxpr format in libxlConnectDomainXMLFromNative

Browse Source 
We've dropped old xend support over a year ago. At this point we can
also drop support for parsing very old configs.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-07-03 08:16:47 +02:00
parent 640a4f132c
commit 1b37b50a6a
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/drvxen.html.in
View File

@ -58,8 +58,7 @@ xen+ssh://root@example.com/system (remote access, SSH tunnelled)
original Xen virtual machine config format used by the legacy original Xen virtual machine config format used by the legacy
xm/xend toolstack. The second, known as <code>xen-sxpr</code>, xm/xend toolstack. The second, known as <code>xen-sxpr</code>,
is also one of the original formats that was used by xend's is also one of the original formats that was used by xend's
legacy HTTP RPC service. For compatibility, import and export legacy HTTP RPC service (<span class='removed'>removed in 5.6.0</span>)
of these legacy formats is supported by the libxl driver.
</p> </p>
<p> <p>

14
src/libxl/libxl_driver.c
View File

@ -45,7 +45,6 @@
#include "libxl_capabilities.h" #include "libxl_capabilities.h"
#include "libxl_migration.h" #include "libxl_migration.h"
#include "xen_xm.h" #include "xen_xm.h"
#include "xen_sxpr.h"
#include "xen_xl.h" #include "xen_xl.h"
#include "virtypedparam.h" #include "virtypedparam.h"
#include "viruri.h" #include "viruri.h"
@ -2702,16 +2701,9 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn,
driver->xmlopt))) driver->xmlopt)))
goto cleanup; goto cleanup;
} else if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_SEXPR)) { } else if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_SEXPR)) {
/* only support latest xend config format */ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
if (!(def = xenParseSxprString(nativeConfig, _("conversion from 'xen-sxpr' format is no longer supported"));
NULL, goto cleanup;
-1,
cfg->caps,
driver->xmlopt))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("parsing sxpr config failed"));
goto cleanup;
}
} else { } else {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("unsupported config type %s"), nativeFormat); _("unsupported config type %s"), nativeFormat);