[Xen-changelog] [xen staging] libxc/migration: Drop unimplemented domain types

[patchbot@xxxxxxx]

commit 279521aed9ad0f31d157450e66487665cfbe525f
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Tue Dec 17 17:49:47 2019 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Dec 24 14:59:04 2019 +0000

    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@xxxxxxxxxx>
    Acked-by: Julien Grall <julien@xxxxxxx>
    Acked-by: Wei Liu <wl@xxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 docs/specs/libxc-migration-stream.pandoc | 6 +-----
 tools/libxc/xc_sr_common.c               | 2 --
 tools/libxc/xc_sr_stream_format.h        | 2 --
 tools/python/xen/migration/libxc.py      | 4 ----
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/docs/specs/libxc-migration-stream.pandoc 
b/docs/specs/libxc-migration-stream.pandoc
index 313be3e80d..a7a8a08936 100644
--- 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 370d98d94a..46fd928de2 100644
--- 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 051afa7dcd..37a7da6eab 100644
--- 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 70bcb8d15b..432750c9fa 100644
--- 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
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog