Fix and cleanup xenguest.h
v2 cover Fix and cleanup xenguest.h
This series fixes builds of libxenguest users outside the Xen build system and it cleans up the xenguest.h header merging xenctrl_dom.h into it.
Juergen Gross (3):
tools/libs: merge xenctrl_dom.h into xenguest.h tools/libxenguest: make xc_dom_loader interface private to libxenguest tools/lixenguest: hide struct elf_dom_parms layout from users
stubdom/grub/kexec.c | 20 +- tools/helpers/init-xenstore-domain.c | 2 +- tools/libs/ctrl/Makefile | 2 +- tools/libs/ctrl/include/xenctrl_dom.h | 455 -------------------- tools/libs/ctrl/xc_private.c | 1 - tools/libs/guest/include/xenguest.h | 400 ++++++++++++++++- tools/libs/guest/xg_dom_arm.c | 1 - tools/libs/guest/xg_dom_armzimageloader.c | 1 - tools/libs/guest/xg_dom_binloader.c | 1 - tools/libs/guest/xg_dom_boot.c | 1 - tools/libs/guest/xg_dom_compat_linux.c | 1 - tools/libs/guest/xg_dom_core.c | 86 +++- tools/libs/guest/xg_dom_decompress.h | 4 +- tools/libs/guest/xg_dom_decompress_unsafe.h | 2 - tools/libs/guest/xg_dom_elfloader.c | 1 - tools/libs/guest/xg_dom_hvmloader.c | 1 - tools/libs/guest/xg_dom_x86.c | 1 - tools/libs/guest/xg_offline_page.c | 1 - tools/libs/guest/xg_private.h | 14 + tools/libs/guest/xg_sr_common.h | 1 - tools/libxl/libxl_arm.c | 1 - tools/libxl/libxl_arm.h | 2 - tools/libxl/libxl_create.c | 1 - tools/libxl/libxl_dm.c | 1 - tools/libxl/libxl_dom.c | 1 - tools/libxl/libxl_internal.h | 1 - tools/libxl/libxl_vnuma.c | 2 - tools/libxl/libxl_x86.c | 2 - tools/libxl/libxl_x86_acpi.c | 7 +- tools/python/xen/lowlevel/xc/xc.c | 2 +- 30 files changed, 496 insertions(+), 520 deletions(-) delete mode 100644 tools/libs/ctrl/include/xenctrl_dom.h
Signature · 1 line
2.26.2
PATCH v2 1/3 tools/libs: merge xenctrl_dom.h into xenguest.h
Today xenctrl_dom.h is part of libxenctrl as it is included by xc_private.c. This seems not to be needed, so merge xenctrl_dom.h into xenguest.h where its contents really should be.
Replace all #includes of xenctrl_dom.h by xenguest.h ones or drop them if xenguest.h is already included.
--- stubdom/grub/kexec.c | 2 +- tools/helpers/init-xenstore-domain.c | 2 +- tools/libs/ctrl/Makefile | 2 +- tools/libs/ctrl/include/xenctrl_dom.h | 455 -------------------- tools/libs/ctrl/xc_private.c | 1 - tools/libs/guest/include/xenguest.h | 426 +++++++++++++++++- tools/libs/guest/xg_dom_arm.c | 1 - tools/libs/guest/xg_dom_armzimageloader.c | 1 - tools/libs/guest/xg_dom_binloader.c | 1 - tools/libs/guest/xg_dom_boot.c | 1 - tools/libs/guest/xg_dom_compat_linux.c | 1 - tools/libs/guest/xg_dom_core.c | 1 - tools/libs/guest/xg_dom_decompress.h | 4 +- tools/libs/guest/xg_dom_decompress_unsafe.h | 2 - tools/libs/guest/xg_dom_elfloader.c | 1 - tools/libs/guest/xg_dom_hvmloader.c | 1 - tools/libs/guest/xg_dom_x86.c | 1 - tools/libs/guest/xg_offline_page.c | 1 - tools/libs/guest/xg_sr_common.h | 1 - tools/libxl/libxl_arm.c | 1 - tools/libxl/libxl_arm.h | 2 - tools/libxl/libxl_create.c | 1 - tools/libxl/libxl_dm.c | 1 - tools/libxl/libxl_dom.c | 1 - tools/libxl/libxl_internal.h | 1 - tools/libxl/libxl_vnuma.c | 2 - tools/libxl/libxl_x86.c | 2 - tools/libxl/libxl_x86_acpi.c | 2 - tools/python/xen/lowlevel/xc/xc.c | 2 +- 29 files changed, 430 insertions(+), 490 deletions(-) delete mode 100644 tools/libs/ctrl/include/xenctrl_dom.h
stubdom/grub/kexec.c +1 -1
@@ -20,7 +20,7 @@#include <sys/mman.h> #include <xenctrl.h> -#include <xenctrl_dom.h> +#include <xenguest.h> #include <kernel.h> #include <console.h>
tools/helpers/init-xenstore-domain.c +1 -1
@@ -8,7 +8,7 @@#include <sys/ioctl.h> #include <sys/mman.h> #include <xenctrl.h> -#include <xenctrl_dom.h> +#include <xenguest.h> #include <xenstore.h> #include <xen/sys/xenbus_dev.h> #include <xen-xsm/flask/flask.h>
tools/libs/ctrl/Makefile +1 -1
@@ -49,7 +49,7 @@ CFLAGS += -include $(XEN_ROOT)/tools/config.h # Needed for posix_fadvise64() in xc_linux.c CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE -LIBHEADER := xenctrl.h xenctrl_compat.h xenctrl_dom.h +LIBHEADER := xenctrl.h xenctrl_compat.h PKG_CONFIG := xencontrol.pc PKG_CONFIG_NAME := Xencontrol
tools/libs/ctrl/include/xenctrl_dom.h deleted +0 -455
455 lines not on this page · raw message
tools/libs/ctrl/xc_private.c +0 -1
@@ -18,7 +18,6 @@*/ #include "xc_private.h" -#include "xenctrl_dom.h" #include <stdarg.h> #include <stdlib.h> #include <unistd.h>
tools/libs/guest/include/xenguest.h +425 -1
438 lines not on this page · raw message
tools/libs/guest/xg_dom_arm.c +0 -1
@@ -24,7 +24,6 @@#include <xen-tools/libs.h> #include "xg_private.h" -#include "xenctrl_dom.h" #define NR_MAGIC_PAGES 4#define CONSOLE_PFN_OFFSET 0
tools/libs/guest/xg_dom_armzimageloader.c +0 -1
@@ -25,7 +25,6 @@#include <inttypes.h> #include "xg_private.h" -#include "xenctrl_dom.h" #include <arpa/inet.h> /* XXX ntohl is not the right function... */
tools/libs/guest/xg_dom_binloader.c +0 -1
@@ -83,7 +83,6 @@#include <inttypes.h> #include "xg_private.h" -#include "xenctrl_dom.h" #define round_pgup (_p) (((_p)+(PAGE_SIZE_X86-1))&PAGE_MASK_X86)#define round_pgdown (_p) ((_p)&PAGE_MASK_X86)
tools/libs/guest/xg_dom_boot.c +0 -1
@@ -31,7 +31,6 @@#include <zlib.h> #include "xg_private.h" -#include "xenctrl_dom.h" #include "xc_core.h" #include <xen/hvm/params.h> #include <xen/grant_table.h>
tools/libs/guest/xg_dom_compat_linux.c +0 -1
@@ -30,7 +30,6 @@#include "xenctrl.h" #include "xg_private.h" -#include "xenctrl_dom.h" /* ------------------------------------------------------------------------ */
tools/libs/guest/xg_dom_core.c +0 -1
@@ -32,7 +32,6 @@#include <assert.h> #include "xg_private.h" -#include "xenctrl_dom.h" #include "_paths.h" /* ------------------------------------------------------------------------ */
tools/libs/guest/xg_dom_decompress.h +1 -3
@@ -1,6 +1,4 @@ -#ifndef __MINIOS__ -# include "xenctrl_dom.h" -#else +#ifdef __MINIOS__# include "xg_dom_decompress_unsafe.h" #endif
tools/libs/guest/xg_dom_decompress_unsafe.h +0 -2
@@ -1,5 +1,3 @@ -#include "xenctrl_dom.h" - typedef int decompress_fn(unsigned char *inbuf, unsigned int len, int (*fill)(void*, unsigned int), int (*flush)(void*, unsigned int),
tools/libs/guest/xg_dom_elfloader.c +0 -1
@@ -26,7 +26,6 @@#include <inttypes.h> #include "xg_private.h" -#include "xenctrl_dom.h" #include "xc_bitops.h" #define XEN_VER "xen-3.0"
tools/libs/guest/xg_dom_hvmloader.c +0 -1
@@ -26,7 +26,6 @@#include <assert.h> #include "xg_private.h" -#include "xenctrl_dom.h" #include "xc_bitops.h" /* ------------------------------------------------------------------------ */
tools/libs/guest/xg_dom_x86.c +0 -1
@@ -38,7 +38,6 @@#include <xen-tools/libs.h> #include "xg_private.h" -#include "xenctrl_dom.h" #include "xenctrl.h" /* ------------------------------------------------------------------------ */
tools/libs/guest/xg_offline_page.c +0 -1
@@ -28,7 +28,6 @@#include <xc_core.h> #include "xc_private.h" -#include "xenctrl_dom.h" #include "xg_private.h" #include "xg_save_restore.h"
tools/libs/guest/xg_sr_common.h +0 -1
@@ -5,7 +5,6 @@#include "xg_private.h" #include "xg_save_restore.h" -#include "xenctrl_dom.h" #include "xc_bitops.h" #include "xg_sr_stream_format.h"
tools/libxl/libxl_arm.c +0 -1
@@ -3,7 +3,6 @@#include "libxl_libfdt_compat.h" #include "libxl_arm.h" -#include <xenctrl_dom.h> #include <stdbool.h> #include <libfdt.h> #include <assert.h>
tools/libxl/libxl_arm.h +0 -2
@@ -17,8 +17,6 @@#include "libxl_internal.h" #include "libxl_arch.h" -#include <xenctrl_dom.h> -_hidden int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info,struct xc_dom_image *dom);
tools/libxl/libxl_create.c +0 -1
@@ -20,7 +20,6 @@#include "libxl_internal.h" #include "libxl_arch.h" -#include <xenctrl_dom.h> #include <xenguest.h> #include <xen/hvm/hvm_info_table.h> #include <xen/hvm/e820.h>
tools/libxl/libxl_dm.c +0 -1
@@ -19,7 +19,6 @@#include "libxl_internal.h" -#include <xenctrl_dom.h> #include <xen/hvm/e820.h> #include <sys/types.h> #include <pwd.h>
tools/libxl/libxl_dom.c +0 -1
@@ -20,7 +20,6 @@#include "libxl_internal.h" #include "libxl_arch.h" -#include <xenctrl_dom.h> #include <xen/hvm/hvm_info_table.h> #include <xen/hvm/hvm_xs_strings.h> #include <xen/hvm/e820.h>
tools/libxl/libxl_internal.h +0 -1
@@ -57,7 +57,6 @@#include <xenctrl.h> #include <xenguest.h> #include <xenhypfs.h> -#include <xenctrl_dom.h> #include <xen-tools/libs.h>
tools/libxl/libxl_vnuma.c +0 -2
@@ -17,8 +17,6 @@#include "libxl_arch.h" #include <stdlib.h> -#include <xenctrl_dom.h> -bool libxl__vnuma_configured (const libxl_domain_build_info *b_info) {return b_info->num_vnuma_nodes !=0 ;
tools/libxl/libxl_x86.c +0 -2
@@ -1,8 +1,6 @@#include "libxl_internal.h" #include "libxl_arch.h" -#include <xenctrl_dom.h> -int libxl__arch_domain_prepare_config (libxl__gc *gc,libxl_domain_config *d_config,struct xen_domctl_createdomain *config)
tools/libxl/libxl_x86_acpi.c +0 -2
@@ -18,8 +18,6 @@#include <xen/hvm/e820.h> #include "libacpi/libacpi.h" -#include <xenctrl_dom.h> -/* Number of pages holding ACPI tables */ #define NUM_ACPI_PAGES 16
tools/python/xen/lowlevel/xc/xc.c +1 -1
@@ -7,6 +7,7 @@#include <Python.h> #define XC_WANT_COMPAT_MAP_FOREIGN_API #include <xenctrl.h> +#include <xenguest.h> #include <fcntl.h> #include <netinet/in.h> #include <netinet/tcp.h>
@@ -17,7 +18,6 @@#include <arpa/inet.h> #include <xen/elfnote.h> -#include "xenctrl_dom.h" #include <xen/hvm/hvm_info_table.h> #include <xen/hvm/params.h>
Signature · 1 line
2.26.2
PATCH v2 2/3 tools/libxenguest: make xc_dom_loader interface private to libxenguest
In reply to Juergen GrossThe pluggable kernel loader interface is used only internally of libxenguest, so make it private. This removes a dependency on the Xen internal header xen/libelf/libelf.h from xenguest.h.
--- tools/libs/guest/include/xenguest.h | 15 --------------- tools/libs/guest/xg_private.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 15 deletions(-)
tools/libs/guest/include/xenguest.h +0 -15
@@ -247,21 +247,6 @@ struct xc_dom_image {unsigned int max_vcpus; }; -/* --- pluggable kernel loader ------------------------------------- */ - -struct xc_dom_loader { -char *name; -/* Sadly the error returns from these functions are not consistent: */ -elf_negerrnoval (*probe) (struct xc_dom_image * dom); -elf_negerrnoval (*parser) (struct xc_dom_image * dom); -elf_errorstatus (*loader) (struct xc_dom_image * dom); - -struct xc_dom_loader *next; -}; - -#define __init __attribute__ ((constructor)) -void xc_dom_register_loader (struct xc_dom_loader *loader); -/* --- arch specific hooks ----------------------------------------- */ struct xc_dom_arch {
tools/libs/guest/xg_private.h +13 -0
@@ -41,6 +41,19 @@#endif #endif +struct xc_dom_loader { +char *name; +/* Sadly the error returns from these functions are not consistent: */ +elf_negerrnoval (*probe) (struct xc_dom_image * dom); +elf_negerrnoval (*parser) (struct xc_dom_image * dom); +elf_errorstatus (*loader) (struct xc_dom_image * dom); + +struct xc_dom_loader *next; +}; + +#define __init __attribute__ ((constructor)) +void xc_dom_register_loader (struct xc_dom_loader *loader); +char *xc_read_image (xc_interface *xch,const char *filename,unsigned long *size); char *xc_inflate_buffer(xc_interface *xch,
Signature · 1 line
2.26.2
PATCH v2 3/3 tools/lixenguest: hide struct elf_dom_parms layout from users
In reply to Juergen GrossDon't include struct elf_dom_parms in struct xc_dom_image, but rather use a pointer to reference it. Together with adding accessor functions for the externally needed elements this enables to drop including the Xen private header xen/libelf/libelf.h from xenguest.h.
--- stubdom/grub/kexec.c | 18 +++--- tools/libs/guest/include/xenguest.h | 29 +++------- tools/libs/guest/xg_dom_core.c | 85 +++++++++++++++++++++++------ tools/libs/guest/xg_private.h | 1 + tools/libxl/libxl_x86_acpi.c | 5 +- 5 files changed, 88 insertions(+), 50 deletions(-)
stubdom/grub/kexec.c +10 -8
@@ -222,6 +222,7 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, charchar features[] ="" ;struct mmu_update *m2p_updates;unsigned long nr_m2p_updates; +uint64_t virt_base;DEBUG ("booting with cmdline %s\n" , cmdline); xc_handle =xc_interface_open (0 ,0 ,0 );
@@ -294,10 +295,11 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char goto out; } + virt_base =xc_dom_virt_base (dom);/* copy hypercall page */ /* TODO: domctl instead, but requires privileges */ -if (dom->parms.virt_hypercall !=-1 ) { - pfn =PHYS_PFN (dom->parms.virt_hypercall - dom->parms.virt_base); +if (xc_dom_virt_hypercall (dom) !=-1 ) { + pfn =PHYS_PFN (xc_dom_virt_hypercall (dom) - virt_base);memcpy ((void *) pages[pfn], hypercall_page,PAGE_SIZE ); }
@@ -313,11 +315,11 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char/* Move current console, xenstore and boot MFNs to the allocated place */ do_exchange (dom, dom->console_pfn, start_info.console.domU.mfn);do_exchange (dom, dom->xenstore_pfn, start_info.store_mfn); -DEBUG ("virt base at %llx\n" , dom->parms.virt_base); +DEBUG ("virt base at %llx\n" , virt_base);DEBUG ("bootstack_pfn %lx\n" , dom->bootstack_pfn); - _boot_target = dom->parms.virt_base +PFN_PHYS (dom->bootstack_pfn); + _boot_target = virt_base +PFN_PHYS (dom->bootstack_pfn);DEBUG ("_boot_target %lx\n" , _boot_target); -do_exchange (dom,PHYS_PFN (_boot_target - dom->parms.virt_base), +do_exchange (dom,PHYS_PFN (_boot_target - virt_base),virt_to_mfn (&_boot_page));if ( dom->arch_hooks->setup_pgtables )
@@ -373,13 +375,13 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char _boot_oldpdmfn =virt_to_mfn (start_info.pt_base);DEBUG ("boot old pd mfn %lx\n" , _boot_oldpdmfn);DEBUG ("boot pd virt %lx\n" , dom->pgtables_seg.vstart); - _boot_pdmfn = dom->pv_p2m[PHYS_PFN (dom->pgtables_seg.vstart - dom->parms.virt_base)]; + _boot_pdmfn = dom->pv_p2m[PHYS_PFN (dom->pgtables_seg.vstart - virt_base)];DEBUG ("boot pd mfn %lx\n" , _boot_pdmfn); _boot_stack = _boot_target +PAGE_SIZE ;DEBUG ("boot stack %lx\n" , _boot_stack); - _boot_start_info = dom->parms.virt_base +PFN_PHYS (dom->start_info_pfn); + _boot_start_info = virt_base +PFN_PHYS (dom->start_info_pfn);DEBUG ("boot start info %lx\n" , _boot_start_info); - _boot_start = dom->parms.virt_entry; + _boot_start =xc_dom_virt_entry (dom);DEBUG ("boot start %lx\n" , _boot_start);/* Keep only useful entries */
tools/libs/guest/include/xenguest.h +8 -21
@@ -22,8 +22,6 @@#ifndef XENGUEST_H #define XENGUEST_H -#include <xen/libelf/libelf.h> -#define XC_NUMA_NO_NODE (~0U)#define XCFLAGS_LIVE (1 << 0)
@@ -109,7 +107,7 @@ struct xc_dom_image {uint32_t f_requested[XENFEAT_NR_SUBMAPS ];/* info from (elf) kernel image */ -struct elf_dom_parms parms; +struct elf_dom_parms *parms;char *guest_type;/* memory layout */
@@ -390,6 +388,13 @@ void *xc_dom_pfn_to_ptr_retcount(struct xc_dom_image *dom, xen_pfn_t first, xen_pfn_t count, xen_pfn_t *count_out);void xc_dom_unmap_one (struct xc_dom_image *dom,xen_pfn_t pfn);void xc_dom_unmap_all (struct xc_dom_image *dom); +void *xc_dom_vaddr_to_ptr (struct xc_dom_image *dom, +xen_vaddr_t vaddr,size_t *safe_region_out); +uint64_t xc_dom_virt_base (struct xc_dom_image *dom); +uint64_t xc_dom_virt_entry (struct xc_dom_image *dom); +uint64_t xc_dom_virt_hypercall (struct xc_dom_image *dom); +char *xc_dom_guest_os (struct xc_dom_image *dom); +bool xc_dom_feature_get (struct xc_dom_image *dom,unsigned int nr); static inline void *xc_dom_seg_to_ptr_pages(struct xc_dom_image *dom, struct xc_dom_seg *seg,
@@ -411,24 +416,6 @@ static inline void *xc_dom_seg_to_ptr(struct xc_dom_image *dom,return xc_dom_seg_to_ptr_pages (dom, seg, &dummy); } -static inline void *xc_dom_vaddr_to_ptr (struct xc_dom_image *dom, -xen_vaddr_t vaddr, -size_t *safe_region_out) -{ -unsigned int page_size =XC_DOM_PAGE_SIZE (dom); -xen_pfn_t page = (vaddr - dom->parms.virt_base) / page_size; -unsigned int offset = (vaddr - dom->parms.virt_base) % page_size; -xen_pfn_t safe_region_count; -void *ptr; - - *safe_region_out =0 ; - ptr =xc_dom_pfn_to_ptr_retcount (dom, page,0 , &safe_region_count); -if ( ptr ==NULL ) -return ptr; - *safe_region_out = (safe_region_count <<XC_DOM_PAGE_SHIFT (dom)) - offset; -return ptr + offset; -} -static inline xen_pfn_t xc_dom_p2m (struct xc_dom_image *dom,xen_pfn_t pfn) {if (xc_dom_translated (dom) )
tools/libs/guest/xg_dom_core.c +67 -18
148 lines not on this page · raw message
tools/libs/guest/xg_private.h +1 -0
@@ -31,6 +31,7 @@#include <xen/memory.h> #include <xen/elfnote.h> +#include <xen/libelf/libelf.h> #ifndef ELFSIZE #include <limits.h>
tools/libxl/libxl_x86_acpi.c +2 -3
@@ -220,9 +220,8 @@ int libxl__dom_load_acpi(libxl__gc *gc,* and so we need to put RSDP in location that can be discovered by ACPI's * standard search method, in R-O BIOS memory (we chose last 64 bytes) */ -if (strcmp (dom->parms.guest_os,"linux" ) || -elf_xen_feature_get (XENFEAT_linux_rsdp_unrestricted, - dom->parms.f_supported)) +if (strcmp (xc_dom_guest_os (dom),"linux" ) || +xc_dom_feature_get (dom, XENFEAT_linux_rsdp_unrestricted)) dom->acpi_modules[0 ].guest_addr_out =ACPI_INFO_PHYSICAL_ADDRESS + (1 + acpi_pages_num) * libxl_ctxt.page_size;else
Signature · 1 line
2.26.2
Re: [PATCH v2 3/3] tools/lixenguest: hide struct elf_dom_parms layout from users
Hi Juergen,
Quoted 6 lines · Juergen Gross
Don't include struct
elf_dom_parmsin structxc_dom_image, but rather use a pointer to reference it. Together with adding accessor functions for the externally needed elements this enables to drop including the Xen private headerxen/libelf/libelf.hfromxenguest.h.
There are several places in xg_dom_elfloader.c, xg_dom_arm.c and xg_dom_armzimageloader.c which would need to be fixed as they are using dom->parms.
Cheers
Bertrand
Quoted 324 lines
Fixes 7e0165c19387 ("tools/libxc: untangle libxenctrl from libxenguest")Signed-off-by Juergen Gross <[email protected]>---
stubdom/grub/kexec.c | 18 +++--- tools/libs/guest/include/xenguest.h | 29 +++------- tools/libs/guest/xg_dom_core.c | 85 +++++++++++++++++++++++------ tools/libs/guest/xg_private.h | 1 + tools/libxl/libxl_x86_acpi.c | 5 +- 5 files changed, 88 insertions(+), 50 deletions(-)stubdom/grub/kexec.c +10
-8@@ -222,6 +222,7 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, charchar features[] ="" ;struct mmu_update *m2p_updates;unsigned long nr_m2p_updates; +uint64_t virt_base;DEBUG ("booting with cmdline %s\n" , cmdline); xc_handle =xc_interface_open (0 ,0 ,0 );@@ -294,10 +295,11 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char goto out; } + virt_base =xc_dom_virt_base (dom);/* copy hypercall page */ /* TODO: domctl instead, but requires privileges */ -if (dom->parms.virt_hypercall !=-1 ) { - pfn =PHYS_PFN (dom->parms.virt_hypercall - dom->parms.virt_base); +if (xc_dom_virt_hypercall (dom) !=-1 ) { + pfn =PHYS_PFN (xc_dom_virt_hypercall (dom) - virt_base);memcpy ((void *) pages[pfn], hypercall_page,PAGE_SIZE ); }@@ -313,11 +315,11 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char/* Move current console, xenstore and boot MFNs to the allocated place */ do_exchange (dom, dom->console_pfn, start_info.console.domU.mfn);do_exchange (dom, dom->xenstore_pfn, start_info.store_mfn); -DEBUG ("virt base at %llx\n" , dom->parms.virt_base); +DEBUG ("virt base at %llx\n" , virt_base);DEBUG ("bootstack_pfn %lx\n" , dom->bootstack_pfn); - _boot_target = dom->parms.virt_base +PFN_PHYS (dom->bootstack_pfn); + _boot_target = virt_base +PFN_PHYS (dom->bootstack_pfn);DEBUG ("_boot_target %lx\n" , _boot_target); -do_exchange (dom,PHYS_PFN (_boot_target - dom->parms.virt_base), +do_exchange (dom,PHYS_PFN (_boot_target - virt_base),virt_to_mfn (&_boot_page));if ( dom->arch_hooks->setup_pgtables )@@ -373,13 +375,13 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char _boot_oldpdmfn =virt_to_mfn (start_info.pt_base);DEBUG ("boot old pd mfn %lx\n" , _boot_oldpdmfn);DEBUG ("boot pd virt %lx\n" , dom->pgtables_seg.vstart); - _boot_pdmfn = dom->pv_p2m[PHYS_PFN (dom->pgtables_seg.vstart - dom->parms.virt_base)]; + _boot_pdmfn = dom->pv_p2m[PHYS_PFN (dom->pgtables_seg.vstart - virt_base)];DEBUG ("boot pd mfn %lx\n" , _boot_pdmfn); _boot_stack = _boot_target +PAGE_SIZE ;DEBUG ("boot stack %lx\n" , _boot_stack); - _boot_start_info = dom->parms.virt_base +PFN_PHYS (dom->start_info_pfn); + _boot_start_info = virt_base +PFN_PHYS (dom->start_info_pfn);DEBUG ("boot start info %lx\n" , _boot_start_info); - _boot_start = dom->parms.virt_entry; + _boot_start =xc_dom_virt_entry (dom);DEBUG ("boot start %lx\n" , _boot_start);/* Keep only useful entries */ tools/libs/guest/include/xenguest.h +8
-21@@ -22,8 +22,6 @@#ifndef XENGUEST_H #define XENGUEST_H -#include <xen/libelf/libelf.h> -#define XC_NUMA_NO_NODE (~0U)#define XCFLAGS_LIVE (1 << 0)@@ -109,7 +107,7 @@ struct xc_dom_image {uint32_t f_requested[XENFEAT_NR_SUBMAPS ];/* info from (elf) kernel image */ -struct elf_dom_parms parms; +struct elf_dom_parms *parms;char *guest_type;/* memory layout */ @@ -390,6 +388,13 @@ void *xc_dom_pfn_to_ptr_retcount(struct xc_dom_image *dom, xen_pfn_t first, xen_pfn_t count, xen_pfn_t *count_out);void xc_dom_unmap_one (struct xc_dom_image *dom,xen_pfn_t pfn);void xc_dom_unmap_all (struct xc_dom_image *dom); +void *xc_dom_vaddr_to_ptr (struct xc_dom_image *dom, +xen_vaddr_t vaddr,size_t *safe_region_out); +uint64_t xc_dom_virt_base (struct xc_dom_image *dom); +uint64_t xc_dom_virt_entry (struct xc_dom_image *dom); +uint64_t xc_dom_virt_hypercall (struct xc_dom_image *dom); +char *xc_dom_guest_os (struct xc_dom_image *dom); +bool xc_dom_feature_get (struct xc_dom_image *dom,unsigned int nr); static inline void *xc_dom_seg_to_ptr_pages(struct xc_dom_image *dom, struct xc_dom_seg *seg,@@ -411,24 +416,6 @@ static inline void *xc_dom_seg_to_ptr(struct xc_dom_image *dom,return xc_dom_seg_to_ptr_pages (dom, seg, &dummy); } -static inline void *xc_dom_vaddr_to_ptr (struct xc_dom_image *dom, -xen_vaddr_t vaddr, -size_t *safe_region_out) -{ -unsigned int page_size =XC_DOM_PAGE_SIZE (dom); -xen_pfn_t page = (vaddr - dom->parms.virt_base) / page_size; -unsigned int offset = (vaddr - dom->parms.virt_base) % page_size; -xen_pfn_t safe_region_count; -void *ptr; - - *safe_region_out =0 ; - ptr =xc_dom_pfn_to_ptr_retcount (dom, page,0 , &safe_region_count); -if ( ptr ==NULL ) -return ptr; - *safe_region_out = (safe_region_count <<XC_DOM_PAGE_SHIFT (dom)) - offset; -return ptr + offset; -} -static inline xen_pfn_t xc_dom_p2m (struct xc_dom_image *dom,xen_pfn_t pfn) {if (xc_dom_translated (dom) )tools/libs/guest/xg_dom_core.c +67
-18@@ -735,6 +735,7 @@ void xc_dom_release(struct xc_dom_image *dom)xc_dom_unmap_all (dom);xc_dom_free_all (dom);free (dom->arch_private); +free (dom->parms);free (dom); }@@ -753,6 +754,12 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch,memset (dom,0 ,sizeof (*dom)); dom->xch = xch; + dom->parms =malloc (sizeof (*dom->parms)); +if (!dom->parms) + goto err; +memset (dom->parms,0 ,sizeof (*dom->parms)); + dom->alloc_malloc +=sizeof (*dom->parms); + dom->max_kernel_size =XC_DOM_DECOMPRESS_MAX ; dom->max_module_size =XC_DOM_DECOMPRESS_MAX ; dom->max_devicetree_size =XC_DOM_DECOMPRESS_MAX ;@@ -762,12 +769,12 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch,if ( features )elf_xen_parse_features (features, dom->f_requested,NULL ); - dom->parms.virt_base =UNSET_ADDR ; - dom->parms.virt_entry =UNSET_ADDR ; - dom->parms.virt_hypercall =UNSET_ADDR ; - dom->parms.virt_hv_start_low =UNSET_ADDR ; - dom->parms.elf_paddr_offset =UNSET_ADDR ; - dom->parms.p2m_base =UNSET_ADDR ; + dom->parms->virt_base =UNSET_ADDR ; + dom->parms->virt_entry =UNSET_ADDR ; + dom->parms->virt_hypercall =UNSET_ADDR ; + dom->parms->virt_hv_start_low =UNSET_ADDR ; + dom->parms->elf_paddr_offset =UNSET_ADDR ; + dom->parms->p2m_base =UNSET_ADDR ; dom->flags =SIF_VIRT_P2M_4TOOLS ;@@ -920,8 +927,8 @@ int xc_dom_parse_image(struct xc_dom_image *dom)for ( i =0 ; i <XENFEAT_NR_SUBMAPS ; i++ ) { dom->f_active[i] |= dom->f_requested[i];/* cmd line */ - dom->f_active[i] |= dom->parms.f_required[i];/* kernel */ -if ( (dom->f_active[i] & dom->parms.f_supported[i]) != + dom->f_active[i] |= dom->parms->f_required[i];/* kernel */ +if ( (dom->f_active[i] & dom->parms->f_supported[i]) != dom->f_active[i] ) { xc_dom_panic(dom->xch, XC_INVALID_PARAM,@@ -1142,8 +1149,8 @@ int xc_dom_build_image(struct xc_dom_image *dom) goto err; } page_size =XC_DOM_PAGE_SIZE (dom); -if ( dom->parms.virt_base !=UNSET_ADDR ) - dom->virt_alloc_end = dom->parms.virt_base; +if ( dom->parms->virt_base !=UNSET_ADDR ) + dom->virt_alloc_end = dom->parms->virt_base;/* load kernel */ if ( xc_dom_alloc_segment(dom, &dom->kernel_seg, "kernel",@@ -1157,7 +1164,7 @@ int xc_dom_build_image(struct xc_dom_image *dom)/* Don't load ramdisk / other modules now if no initial mapping required. */ for ( mod =0 ; mod < dom->num_modules; mod++ ) { - unmapped_initrd = (dom->parms.unmapped_initrd && + unmapped_initrd = (dom->parms->unmapped_initrd && !dom->modules[mod].seg.vstart);if ( dom->modules[mod].blob && !unmapped_initrd )@@ -1199,10 +1206,10 @@ int xc_dom_build_image(struct xc_dom_image *dom)/* allocate other pages */ if ( !dom->arch_hooks->p2m_base_supported || - dom->parms.p2m_base >= dom->parms.virt_base || - (dom->parms.p2m_base & (XC_DOM_PAGE_SIZE (dom) -1 )) ) - dom->parms.p2m_base =UNSET_ADDR ; -if ( dom->arch_hooks->alloc_p2m_list && dom->parms.p2m_base ==UNSET_ADDR && + dom->parms->p2m_base >= dom->parms->virt_base || + (dom->parms->p2m_base & (XC_DOM_PAGE_SIZE (dom) -1 )) ) + dom->parms->p2m_base =UNSET_ADDR ; +if ( dom->arch_hooks->alloc_p2m_list && dom->parms->p2m_base ==UNSET_ADDR && dom->arch_hooks->alloc_p2m_list (dom) !=0 ) goto err;if ( dom->arch_hooks->alloc_magic_pages (dom) !=0 )@@ -1228,7 +1235,7 @@ int xc_dom_build_image(struct xc_dom_image *dom)for ( mod =0 ; mod < dom->num_modules; mod++ ) { - unmapped_initrd = (dom->parms.unmapped_initrd && + unmapped_initrd = (dom->parms->unmapped_initrd && !dom->modules[mod].seg.vstart);/* Load ramdisk / other modules if no initial mapping required. */ @@ -1247,11 +1254,11 @@ int xc_dom_build_image(struct xc_dom_image *dom) }/* Allocate p2m list if outside of initial kernel mapping. */ -if ( dom->arch_hooks->alloc_p2m_list && dom->parms.p2m_base !=UNSET_ADDR ) +if ( dom->arch_hooks->alloc_p2m_list && dom->parms->p2m_base !=UNSET_ADDR ) {if ( dom->arch_hooks->alloc_p2m_list (dom) !=0 ) goto err; - dom->p2m_seg.vstart = dom->parms.p2m_base; + dom->p2m_seg.vstart = dom->parms->p2m_base; }return 0 ;@@ -1260,6 +1267,48 @@ int xc_dom_build_image(struct xc_dom_image *dom)return -1 ; } +void *xc_dom_vaddr_to_ptr (struct xc_dom_image *dom, +xen_vaddr_t vaddr,size_t *safe_region_out) +{ +unsigned int page_size =XC_DOM_PAGE_SIZE (dom); +xen_pfn_t page = (vaddr - dom->parms->virt_base) / page_size; +unsigned int offset = (vaddr - dom->parms->virt_base) % page_size; +xen_pfn_t safe_region_count; +void *ptr; + + *safe_region_out =0 ; + ptr =xc_dom_pfn_to_ptr_retcount (dom, page,0 , &safe_region_count); +if ( ptr ==NULL ) +return ptr; + *safe_region_out = (safe_region_count <<XC_DOM_PAGE_SHIFT (dom)) - offset; +return ptr + offset; +} + +uint64_t xc_dom_virt_base (struct xc_dom_image *dom) +{ +return dom->parms->virt_base; +} + +uint64_t xc_dom_virt_entry (struct xc_dom_image *dom) +{ +return dom->parms->virt_entry; +} + +uint64_t xc_dom_virt_hypercall (struct xc_dom_image *dom) +{ +return dom->parms->virt_hypercall; +} + +char *xc_dom_guest_os (struct xc_dom_image *dom) +{ +return dom->parms->guest_os; +} + +bool xc_dom_feature_get (struct xc_dom_image *dom,unsigned int nr) +{ +return elf_xen_feature_get (nr, dom->parms->f_supported); +} +/* * Local variables: * mode: C tools/libs/guest/xg_private.h +1
-0@@ -31,6 +31,7 @@#include <xen/memory.h> #include <xen/elfnote.h> +#include <xen/libelf/libelf.h> #ifndef ELFSIZE #include <limits.h> tools/libxl/libxl_x86_acpi.c +2
-3@@ -220,9 +220,8 @@ int libxl__dom_load_acpi(libxl__gc *gc,* and so we need to put RSDP in location that can be discovered by ACPI's * standard search method, in R-O BIOS memory (we chose last 64 bytes) */ -if (strcmp (dom->parms.guest_os,"linux" ) || -elf_xen_feature_get (XENFEAT_linux_rsdp_unrestricted, - dom->parms.f_supported)) +if (strcmp (xc_dom_guest_os (dom),"linux" ) || +xc_dom_feature_get (dom, XENFEAT_linux_rsdp_unrestricted)) dom->acpi_modules[0 ].guest_addr_out =ACPI_INFO_PHYSICAL_ADDRESS + (1 + acpi_pages_num) * libxl_ctxt.page_size;else Signature · 1 line
2.26.2
Quoted 8 lines · Juergen Gross
This series fixes builds of libxenguest users outside the Xen build system and it cleans up the
xenguest.hheader mergingxenctrl_dom.hinto it.Juergen Gross (3):
tools/libs: mergexenctrl_dom.hintoxenguest.htools/libxenguest: makexc_dom_loaderinterface private to libxenguesttools/lixenguest: hide structelf_dom_parmslayout from users