libxc/migration: Drop unimplemented domain types

x86 PVH is completely obsolete - it was intended for legacy PVH before that
idea was abandoned.  There was an RFC series for ARM in 2015, but there is
plenty of outstanding work which hasn't been done yet.

No functional change.  New types can be (re)introduced with the code which
actually implements them.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Julien Grall <julien@xen.org>
Acked-by: Wei Liu <wl@xen.org>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/docs/specs/libxc-migration-stream.pandoc b/docs/specs/libxc-migration-stream.pandoc
index 313be3e80d83daf053cfc15c10ae28f489555abe..a7a8a089360472f48a473ac3ffcb82e4cdacad6d 100644 (file)
--- a/docs/specs/libxc-migration-stream.pandoc
+++ b/docs/specs/libxc-migration-stream.pandoc
@@ -160,11 +160,7 @@ type        0x0000: Reserved.
 
             0x0002: x86 HVM.
 
-            0x0003: x86 PVH.
-
-            0x0004: ARM.
-
-            0x0005 - 0xFFFFFFFF: Reserved.
+            0x0003 - 0xFFFFFFFF: Reserved.
 
 page_shift  Size of a guest page as a power of two.
 

diff --git a/tools/libxc/xc_sr_common.c b/tools/libxc/xc_sr_common.c
index 370d98d94a1ccb19c6636e8652ceb0134418e20c..46fd928de2efdc7608ce49175f50bbb010c38e8f 100644 (file)
--- a/tools/libxc/xc_sr_common.c
+++ b/tools/libxc/xc_sr_common.c
@@ -8,8 +8,6 @@ static const char *dhdr_types[] =
 {
     [DHDR_TYPE_X86_PV]  = "x86 PV",
     [DHDR_TYPE_X86_HVM] = "x86 HVM",
-    [DHDR_TYPE_X86_PVH] = "x86 PVH",
-    [DHDR_TYPE_ARM]     = "ARM",
 };
 
 const char *dhdr_type_to_str(uint32_t type)

diff --git a/tools/libxc/xc_sr_stream_format.h b/tools/libxc/xc_sr_stream_format.h
index 051afa7dcd8732107def8ed28e45e95ec80a18af..37a7da6eab670e6caf13efaa15107f98157c804b 100644 (file)
--- a/tools/libxc/xc_sr_stream_format.h
+++ b/tools/libxc/xc_sr_stream_format.h
@@ -43,8 +43,6 @@ struct xc_sr_dhdr
 
 #define DHDR_TYPE_X86_PV  0x00000001U
 #define DHDR_TYPE_X86_HVM 0x00000002U
-#define DHDR_TYPE_X86_PVH 0x00000003U
-#define DHDR_TYPE_ARM     0x00000004U
 
 /*
  * Record Header

diff --git a/tools/python/xen/migration/libxc.py b/tools/python/xen/migration/libxc.py
index 70bcb8d15b3c0a23353baa4a9b02d68f4a941bbe..432750c9fa23c8bfc9fe9ba39be879816b168908 100644 (file)
--- a/tools/python/xen/migration/libxc.py
+++ b/tools/python/xen/migration/libxc.py
@@ -32,14 +32,10 @@ DHDR_FORMAT = "IHHII"
 
 DHDR_TYPE_x86_pv  = 0x00000001
 DHDR_TYPE_x86_hvm = 0x00000002
-DHDR_TYPE_x86_pvh = 0x00000003
-DHDR_TYPE_arm     = 0x00000004
 
 dhdr_type_to_str = {
     DHDR_TYPE_x86_pv  : "x86 PV",
     DHDR_TYPE_x86_hvm : "x86 HVM",
-    DHDR_TYPE_x86_pvh : "x86 PVH",
-    DHDR_TYPE_arm     : "ARM",
 }
 
 # Records