[xen staging] Revert "tools/xl: Add altp2m_count parameter"

[patchbot@xxxxxxx]

commit 05c574feeb00990b31bb472ef93b43a30a07fd33
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Jul 7 16:24:04 2025 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jul 7 16:24:04 2025 +0200

    Revert "tools/xl: Add altp2m_count parameter"
    
    This reverts commit 3ce6f7bacc9c0f490f30cbb8ecea2795b0fc129c, for
    breaking CI.
---
 tools/golang/xenlight/helpers.gen.go | 2 --
 tools/golang/xenlight/types.gen.go   | 1 -
 tools/include/libxl.h                | 7 -------
 tools/libs/light/libxl_create.c      | 9 ---------
 tools/libs/light/libxl_internal.h    | 1 -
 tools/libs/light/libxl_types.idl     | 1 -
 tools/xl/xl_parse.c                  | 9 ---------
 7 files changed, 30 deletions(-)

diff --git a/tools/golang/xenlight/helpers.gen.go 
b/tools/golang/xenlight/helpers.gen.go
index b43aad7d00..c45df1005f 100644
--- a/tools/golang/xenlight/helpers.gen.go
+++ b/tools/golang/xenlight/helpers.gen.go
@@ -1167,7 +1167,6 @@ if err := 
x.ArchX86.MsrRelaxed.fromC(&xc.arch_x86.msr_relaxed);err != nil {
 return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err)
 }
 x.Altp2M = Altp2MMode(xc.altp2m)
-x.Altp2MCount = uint32(xc.altp2m_count)
 x.VmtraceBufKb = int(xc.vmtrace_buf_kb)
 if err := x.Vpmu.fromC(&xc.vpmu);err != nil {
 return fmt.Errorf("converting field Vpmu: %v", err)
@@ -1702,7 +1701,6 @@ if err := 
x.ArchX86.MsrRelaxed.toC(&xc.arch_x86.msr_relaxed); err != nil {
 return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err)
 }
 xc.altp2m = C.libxl_altp2m_mode(x.Altp2M)
-xc.altp2m_count = C.uint32_t(x.Altp2MCount)
 xc.vmtrace_buf_kb = C.int(x.VmtraceBufKb)
 if err := x.Vpmu.toC(&xc.vpmu); err != nil {
 return fmt.Errorf("converting field Vpmu: %v", err)
diff --git a/tools/golang/xenlight/types.gen.go 
b/tools/golang/xenlight/types.gen.go
index 4777f528b5..61e322f20a 100644
--- a/tools/golang/xenlight/types.gen.go
+++ b/tools/golang/xenlight/types.gen.go
@@ -604,7 +604,6 @@ ArchX86 struct {
 MsrRelaxed Defbool
 }
 Altp2M Altp2MMode
-Altp2MCount uint32
 VmtraceBufKb int
 Vpmu Defbool
 TrapUnmappedAccesses Defbool
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index d6b6e5d2dd..a8704e0268 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -1257,13 +1257,6 @@ typedef struct libxl__ctx libxl_ctx;
  */
 #define LIBXL_HAVE_ALTP2M 1
 
-/*
- * LIBXL_HAVE_ALTP2M_COUNT
- * If this is defined, then libxl supports setting the maximum number of
- * alternate p2m tables.
- */
-#define LIBXL_HAVE_ALTP2M_COUNT 1
-
 /*
  * LIBXL_HAVE_REMUS
  * If this is defined, then libxl supports remus.
diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c
index acf7fd9837..8a85fba1cf 100644
--- a/tools/libs/light/libxl_create.c
+++ b/tools/libs/light/libxl_create.c
@@ -421,15 +421,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
         return -ERROR_INVAL;
     }
 
-    if (b_info->altp2m_count == LIBXL_ALTP2M_COUNT_DEFAULT) {
-        if ((libxl_defbool_val(b_info->u.hvm.altp2m) ||
-            b_info->altp2m != LIBXL_ALTP2M_MODE_DISABLED))
-            /* Reflect the default legacy count */
-            b_info->altp2m_count = 10;
-        else
-            b_info->altp2m_count = 0;
-    }
-
     /* Assume that providing a bootloader user implies enabling restrict. */
     libxl_defbool_setdefault(&b_info->bootloader_restrict,
                              !!b_info->bootloader_user);
diff --git a/tools/libs/light/libxl_internal.h 
b/tools/libs/light/libxl_internal.h
index 2a5b233caa..75bb0b94cf 100644
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
@@ -111,7 +111,6 @@
 #define LIBXL_MIN_DOM0_MEM (128*1024)
 #define LIBXL_INVALID_GFN (~(uint64_t)0)
 #define LIBXL_VGA_HOLE_SIZE 0x20
-#define LIBXL_ALTP2M_COUNT_DEFAULT (~(uint32_t)0)
 /* use 0 as the domid of the toolstack domain for now */
 #define LIBXL_TOOLSTACK_DOMID 0
 #define QEMU_SIGNATURE "DeviceModelRecord0002"
diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl
index fe251649f3..a3a79d12b2 100644
--- a/tools/libs/light/libxl_types.idl
+++ b/tools/libs/light/libxl_types.idl
@@ -731,7 +731,6 @@ libxl_domain_build_info = Struct("domain_build_info",[
     # Alternate p2m is not bound to any architecture or guest type, as it is
     # supported by x86 HVM and ARM support is planned.
     ("altp2m", libxl_altp2m_mode),
-    ("altp2m_count", uint32, {'init_val': 'LIBXL_ALTP2M_COUNT_DEFAULT'}),
 
     # Size of preallocated vmtrace trace buffers (in KBYTES).
     # Use zero value to disable this feature.
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index 28cdbf07c2..7e11c62ba0 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -2099,15 +2099,6 @@ void parse_config_data(const char *config_source,
         }
     }
 
-    if (!xlu_cfg_get_long(config, "altp2m_count", &l, 1)) {
-        if (l != (uint16_t)l) {
-            fprintf(stderr, "ERROR: invalid value %ld for \"altp2m_count\"\n", 
l);
-            exit (1);
-        }
-
-        b_info->altp2m_count = l;
-    }
-
     if (!xlu_cfg_get_long(config, "vmtrace_buf_kb", &l, 1) && l) {
         b_info->vmtrace_buf_kb = l;
     }
--
generated by git-patchbot for /home/xen/git/xen.git#staging