mirror of https://gitee.com/openkylin/libvirt.git
libxl: Drop support for parsing sxpr format in libxlConnectDomainXMLFromNative
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:
parent
640a4f132c
commit
1b37b50a6a
|
@ -58,8 +58,7 @@ xen+ssh://root@example.com/system (remote access, SSH tunnelled)
|
|||
original Xen virtual machine config format used by the legacy
|
||||
xm/xend toolstack. The second, known as <code>xen-sxpr</code>,
|
||||
is also one of the original formats that was used by xend's
|
||||
legacy HTTP RPC service. For compatibility, import and export
|
||||
of these legacy formats is supported by the libxl driver.
|
||||
legacy HTTP RPC service (<span class='removed'>removed in 5.6.0</span>)
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
#include "libxl_capabilities.h"
|
||||
#include "libxl_migration.h"
|
||||
#include "xen_xm.h"
|
||||
#include "xen_sxpr.h"
|
||||
#include "xen_xl.h"
|
||||
#include "virtypedparam.h"
|
||||
#include "viruri.h"
|
||||
|
@ -2702,16 +2701,9 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn,
|
|||
driver->xmlopt)))
|
||||
goto cleanup;
|
||||
} else if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_SEXPR)) {
|
||||
/* only support latest xend config format */
|
||||
if (!(def = xenParseSxprString(nativeConfig,
|
||||
NULL,
|
||||
-1,
|
||||
cfg->caps,
|
||||
driver->xmlopt))) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("parsing sxpr config failed"));
|
||||
goto cleanup;
|
||||
}
|
||||
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
|
||||
_("conversion from 'xen-sxpr' format is no longer supported"));
|
||||
goto cleanup;
|
||||
} else {
|
||||
virReportError(VIR_ERR_INVALID_ARG,
|
||||
_("unsupported config type %s"), nativeFormat);
|
||||
|
|
Loading…
Reference in New Issue