|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v4 2/4] libxl/x86: Build e820 map earlier for HVM/PVH guests
From: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
Since hvm_start_info has now been expanded to include memory map (i.e.
e820) we need to know size of this map by the time we create
dom->start_info_seg in alloc_magic_pages_hvm().
To do so we have to call libxl__arch_domain_construct_memmap() earlier,
before xc_dom_build_image(). And since libxl__arch_domain_construct_memmap()
is only used by for x86 we can make this call from x86's
libxl__arch_domain_finalise_hw_description(), at the same time removing
its NOP definition from ARM code and renaming and making it static in
libxl_x86.c
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
---
tools/libxl/libxl_arch.h | 9 ++------
tools/libxl/libxl_arm.c | 10 ++-------
tools/libxl/libxl_create.c | 2 +-
tools/libxl/libxl_dom.c | 16 ++++++---------
tools/libxl/libxl_internal.h | 1 +
tools/libxl/libxl_x86.c | 49 +++++++++++++++++++++++++++-----------------
6 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h
index 784ec7f..9be06fa 100644
--- a/tools/libxl/libxl_arch.h
+++ b/tools/libxl/libxl_arch.h
@@ -41,6 +41,8 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc,
/* finalize arch specific hardware description. */
_hidden
int libxl__arch_domain_finalise_hw_description(libxl__gc *gc,
+ uint32_t domid,
+ libxl_domain_config *d_config,
libxl_domain_build_info *info,
struct xc_dom_image *dom);
@@ -62,13 +64,6 @@ int libxl__arch_vnuma_build_vmemrange(libxl__gc *gc,
_hidden
int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t domid, int irq);
-/* arch specific to construct memory mapping function */
-_hidden
-int libxl__arch_domain_construct_memmap(libxl__gc *gc,
- libxl_domain_config *d_config,
- uint32_t domid,
- struct xc_dom_image *dom);
-
_hidden
void libxl__arch_domain_build_info_acpi_setdefault(
libxl_domain_build_info *b_info);
diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
index 3e46554..13a8347 100644
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -1046,6 +1046,8 @@ static void finalise_one_node(libxl__gc *gc, void *fdt,
const char *uname,
}
int libxl__arch_domain_finalise_hw_description(libxl__gc *gc,
+ uint32_t domid,
+ libxl_domain_config *d_config,
libxl_domain_build_info *info,
struct xc_dom_image *dom)
{
@@ -1140,14 +1142,6 @@ int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t
domid, int irq)
return xc_domain_bind_pt_spi_irq(CTX->xch, domid, irq, irq);
}
-int libxl__arch_domain_construct_memmap(libxl__gc *gc,
- libxl_domain_config *d_config,
- uint32_t domid,
- struct xc_dom_image *dom)
-{
- return 0;
-}
-
void libxl__arch_domain_build_info_acpi_setdefault(
libxl_domain_build_info *b_info)
{
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index c498135..5dce3df 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -488,7 +488,7 @@ int libxl__domain_build(libxl__gc *gc,
break;
case LIBXL_DOMAIN_TYPE_PV:
- ret = libxl__build_pv(gc, domid, info, state);
+ ret = libxl__build_pv(gc, domid, d_config, info, state);
if (ret)
goto out;
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index 2e29b52..e83aeb9 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -698,6 +698,7 @@ static int set_vnuma_info(libxl__gc *gc, uint32_t domid,
}
static int libxl__build_dom(libxl__gc *gc, uint32_t domid,
+ libxl_domain_config *d_config,
libxl_domain_build_info *info, libxl__domain_build_state *state,
struct xc_dom_image *dom)
{
@@ -733,7 +734,8 @@ static int libxl__build_dom(libxl__gc *gc, uint32_t domid,
LOGE(ERROR, "xc_dom_boot_mem_init failed");
goto out;
}
- if ( (ret = libxl__arch_domain_finalise_hw_description(gc, info, dom)) !=
0 ) {
+ if ( (ret = libxl__arch_domain_finalise_hw_description(gc, domid, d_config,
+ info, dom)) != 0 ) {
LOGE(ERROR, "libxl__arch_domain_finalise_hw_description failed");
goto out;
}
@@ -758,7 +760,7 @@ out:
return ret != 0 ? ERROR_FAIL : 0;
}
-int libxl__build_pv(libxl__gc *gc, uint32_t domid,
+int libxl__build_pv(libxl__gc *gc, uint32_t domid, libxl_domain_config
*d_config,
libxl_domain_build_info *info, libxl__domain_build_state *state)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -847,7 +849,7 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid,
dom->vnode_to_pnode[i] = info->vnuma_nodes[i].pnode;
}
- ret = libxl__build_dom(gc, domid, info, state, dom);
+ ret = libxl__build_dom(gc, domid, d_config, info, state, dom);
if (ret != 0)
goto out;
@@ -1293,16 +1295,10 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid,
dom->vnode_to_pnode[i] = info->vnuma_nodes[i].pnode;
}
- rc = libxl__build_dom(gc, domid, info, state, dom);
+ rc = libxl__build_dom(gc, domid, d_config, info, state, dom);
if (rc != 0)
goto out;
- rc = libxl__arch_domain_construct_memmap(gc, d_config, domid, dom);
- if (rc != 0) {
- LOG(ERROR, "setting domain memory map failed");
- goto out;
- }
-
rc = hvm_build_set_params(ctx->xch, domid, info, state->store_port,
&state->store_mfn, state->console_port,
&state->console_mfn, state->store_domid,
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 506687f..914df23 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1159,6 +1159,7 @@ _hidden int libxl__build_post(libxl__gc *gc, uint32_t
domid,
char **vms_ents, char **local_ents);
_hidden int libxl__build_pv(libxl__gc *gc, uint32_t domid,
+ libxl_domain_config *const d_config,
libxl_domain_build_info *info, libxl__domain_build_state *state);
_hidden int libxl__build_hvm(libxl__gc *gc, uint32_t domid,
libxl_domain_config *d_config,
diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c
index d82013f..7cbbfd0 100644
--- a/tools/libxl/libxl_x86.c
+++ b/tools/libxl/libxl_x86.c
@@ -377,21 +377,6 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc,
return 0;
}
-int libxl__arch_domain_finalise_hw_description(libxl__gc *gc,
- libxl_domain_build_info *info,
- struct xc_dom_image *dom)
-{
- int rc = 0;
-
- if (info->type == LIBXL_DOMAIN_TYPE_PVH) {
- rc = libxl__dom_load_acpi(gc, info, dom);
- if (rc != 0)
- LOGE(ERROR, "libxl_dom_load_acpi failed");
- }
-
- return rc;
-}
-
int libxl__arch_build_dom_finish(libxl__gc *gc,
libxl_domain_build_info *info,
struct xc_dom_image *dom,
@@ -510,10 +495,10 @@ int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t
domid, int irq)
* to adjust them. Please refer to libxl__domain_device_construct_rdm().
*/
#define GUEST_LOW_MEM_START_DEFAULT 0x100000
-int libxl__arch_domain_construct_memmap(libxl__gc *gc,
- libxl_domain_config *d_config,
- uint32_t domid,
- struct xc_dom_image *dom)
+static int domain_construct_memmap(libxl__gc *gc,
+ libxl_domain_config *d_config,
+ uint32_t domid,
+ struct xc_dom_image *dom)
{
int rc = 0;
unsigned int nr = 0, i;
@@ -601,6 +586,32 @@ out:
return rc;
}
+int libxl__arch_domain_finalise_hw_description(libxl__gc *gc,
+ uint32_t domid,
+ libxl_domain_config *d_config,
+ libxl_domain_build_info *info,
+ struct xc_dom_image *dom)
+{
+ int rc;
+
+ if (info->type == LIBXL_DOMAIN_TYPE_PV)
+ return 0;
+
+ if (info->type == LIBXL_DOMAIN_TYPE_PVH) {
+ rc = libxl__dom_load_acpi(gc, info, dom);
+ if (rc != 0) {
+ LOGE(ERROR, "libxl_dom_load_acpi failed");
+ return rc;
+ }
+ }
+
+ rc = domain_construct_memmap(gc, d_config, domid, dom);
+ if (rc != 0)
+ LOGE(ERROR, "setting domain memory map failed");
+
+ return rc;
+}
+
void libxl__arch_domain_build_info_acpi_setdefault(
libxl_domain_build_info *b_info)
{
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |