The values are already available in dom->{console,xenstore}_pfn, just like on
the PV side of things. No need to ask Xen.
Signed-off-by: Andrew Cooper <[email protected]>
---
CC: Wei Liu <[email protected]>
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>
---
tools/libs/light/libxl_dom.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c
index c9c24666cd04..03841243ab47 100644
--- a/tools/libs/light/libxl_dom.c
+++ b/tools/libs/light/libxl_dom.c
@@ -722,13 +722,10 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid,
}
static int hvm_build_set_params(xc_interface *handle, uint32_t domid,
- libxl_domain_build_info *info,
- unsigned long *store_mfn,
- unsigned long *console_mfn)
+ libxl_domain_build_info *info)
{
struct hvm_info_table *va_hvm;
uint8_t *va_map, sum;
- uint64_t str_mfn, cons_mfn;
int i;
if (info->type == LIBXL_DOMAIN_TYPE_HVM) {
@@ -749,12 +746,6 @@ static int hvm_build_set_params(xc_interface *handle,
uint32_t domid,
munmap(va_map, XC_PAGE_SIZE);
}
- xc_hvm_param_get(handle, domid, HVM_PARAM_STORE_PFN, &str_mfn);
- xc_hvm_param_get(handle, domid, HVM_PARAM_CONSOLE_PFN, &cons_mfn);
-
- *store_mfn = str_mfn;
- *console_mfn = cons_mfn;
-
return 0;
}
@@ -1168,12 +1159,14 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid,
if (rc != 0)
goto out;
- rc = hvm_build_set_params(ctx->xch, domid, info, &state->store_mfn,
- &state->console_mfn);
+ rc = hvm_build_set_params(ctx->xch, domid, info);
if (rc != 0) {
LOG(ERROR, "hvm build set params failed");
goto out;
}
+
+ state->console_mfn = dom->console_pfn;
+ state->store_mfn = dom->xenstore_pfn;
state->vuart_gfn = dom->vuart_gfn;
rc = hvm_build_set_xs_values(gc, domid, dom, info);
--
2.11.0
