Skip to contentSkip to conversation

tools/libxl: fix setting altp2m param broken by 1e9bc407cf0

PATCH Superseded Tamas K Lengyel 2 participants 3 messages May 29, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/libxl: fix setting altp2m param broken by 1e9bc407cf0

The patch 1e9bc407cf0 mistakenly converted the altp2m config option to a boolean. This is incorrect and breaks external-only usecases of altp2m that is set with a value of 2.

---
 tools/libxl/libxl_x86.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
tools/libxl/libxl_x86.c +1 -2
index f8bc828e62..272736850b 100644
@@ -391,7 +391,6 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid,
     libxl_ctx *ctx = libxl__gc_owner(gc);
     xc_interface *xch = ctx->xch;
     int ret = ERROR_FAIL;
-    bool altp2m = info->altp2m;
 
     switch(info->type) {
     case LIBXL_DOMAIN_TYPE_HVM:
@@ -433,7 +432,7 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid,
             LOG(ERROR, "Couldn't set HVM_PARAM_NESTEDHVM");
             goto out;
         }
-        if (xc_hvm_param_set(xch, domid, HVM_PARAM_ALTP2M, altp2m)) {
+        if (xc_hvm_param_set(xch, domid, HVM_PARAM_ALTP2M, info->altp2m)) {
             LOG(ERROR, "Couldn't set HVM_PARAM_ALTP2M");
             goto out;
         }
Signature · 1 line
2.26.2
#1 lore raw
Quoted 5 lines · Tamas K Lengyel

The patch 1e9bc407cf0 mistakenly converted the altp2m config option to a boolean. This is incorrect and breaks external-only usecases of altp2m that is set with a value of 2.

Urg yes.  Sorry.

However, this doesn't build because there is another use of the altp2m variable between the two hunks below, for compatiblity with the older altp2mhvm option.

I think changing its type just to int out to suffice?

~Andrew

Quoted 25 lines
---
 tools/libxl/libxl_x86.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
tools/libxl/libxl_x86.c +1 -2
index f8bc828e62..272736850b 100644
@@ -391,7 +391,6 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid,
     libxl_ctx *ctx = libxl__gc_owner(gc);
     xc_interface *xch = ctx->xch;
     int ret = ERROR_FAIL;
-    bool altp2m = info->altp2m;
 
     switch(info->type) {
     case LIBXL_DOMAIN_TYPE_HVM:
@@ -433,7 +432,7 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid,
             LOG(ERROR, "Couldn't set HVM_PARAM_NESTEDHVM");
             goto out;
         }
-        if (xc_hvm_param_set(xch, domid, HVM_PARAM_ALTP2M, altp2m)) {
+        if (xc_hvm_param_set(xch, domid, HVM_PARAM_ALTP2M, info->altp2m)) {
             LOG(ERROR, "Couldn't set HVM_PARAM_ALTP2M");
             goto out;
         }
#2 lore raw
Quoted 6 lines · Andrew Cooper
Quoted 4 lines · Tamas K Lengyel

The patch 1e9bc407cf0 mistakenly converted the altp2m config option to a boolean. This is incorrect and breaks external-only usecases of altp2m that is set with a value of 2.

Quoted 7 lines
Quoted 1 line

Urg yes. Sorry.

However, this doesn't build because there is another use of the altp2m variable between the two hunks below, for compatiblity with the older altp2mhvm option.

Eh, so much for hastily sending a patch with last minute changes.

Quoted 2 lines

I think changing its type just to int out to suffice?

Indeed, that would work as well. Let me just resend with that.

Tamas