diff options
author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-02-15 13:32:21 +0000 |
---|---|---|
committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-02-15 13:32:21 +0000 |
commit | c967d12820716b3836a0ea3c1076fa20dd3314ee (patch) | |
tree | 722a432d38c46bfe3f6cad4af78e82b6d6f7b377 /tools/libxc/xc_dom_arm.c | |
parent | 650ae1580c48498693513fa04df56a4b97bb5539 (diff) | |
download | xen-c967d12820716b3836a0ea3c1076fa20dd3314ee.tar.gz xen-c967d12820716b3836a0ea3c1076fa20dd3314ee.tar.bz2 xen-c967d12820716b3836a0ea3c1076fa20dd3314ee.zip |
libxc: fixes for the ARM platform
Make xc_dom_feature_translated an arch-dependent function.
alloc_magic_pages: save console and xenstore pfn's in xc_dom_image.
alloc_magic_pages: set HVM_PARAM_CONSOLE_EVTCHN and
HVM_PARAM_STORE_EVTCHN hvm_params using the event channels allocated by
the toolstack.
Call xc_dom_gnttab_hvm_seed instead of xc_dom_gnttab_seed in
xc_dom_gnttab_init for autotranslated guests.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxc/xc_dom_arm.c')
-rw-r--r-- | tools/libxc/xc_dom_arm.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index b743a6c32c..2d33203aee 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -51,7 +51,7 @@ static int setup_pgtables_arm(struct xc_dom_image *dom) static int alloc_magic_pages(struct xc_dom_image *dom) { int rc, i; - xen_pfn_t store_pfn, console_pfn, p2m[NR_MAGIC_PAGES]; + xen_pfn_t p2m[NR_MAGIC_PAGES]; DOMPRINTF_CALLED(dom->xch); @@ -64,15 +64,20 @@ static int alloc_magic_pages(struct xc_dom_image *dom) if ( rc < 0 ) return rc; - console_pfn = dom->rambase_pfn + dom->total_pages + CONSOLE_PFN_OFFSET; - store_pfn = dom->rambase_pfn + dom->total_pages + XENSTORE_PFN_OFFSET; + dom->console_pfn = dom->rambase_pfn + dom->total_pages + CONSOLE_PFN_OFFSET; + dom->xenstore_pfn = dom->rambase_pfn + dom->total_pages + XENSTORE_PFN_OFFSET; - xc_clear_domain_page(dom->xch, dom->guest_domid, console_pfn); - xc_clear_domain_page(dom->xch, dom->guest_domid, store_pfn); + xc_clear_domain_page(dom->xch, dom->guest_domid, dom->console_pfn); + xc_clear_domain_page(dom->xch, dom->guest_domid, dom->xenstore_pfn); xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_PFN, - console_pfn); + dom->console_pfn); xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_STORE_PFN, - store_pfn); + dom->xenstore_pfn); + /* allocated by toolstack */ + xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_EVTCHN, + dom->console_evtchn); + xc_set_hvm_param(dom->xch, dom->guest_domid, HVM_PARAM_STORE_EVTCHN, + dom->xenstore_evtchn); return 0; } @@ -196,6 +201,11 @@ int arch_setup_bootlate(struct xc_dom_image *dom) return 0; } +int xc_dom_feature_translated(struct xc_dom_image *dom) +{ + return 1; +} + /* * Local variables: * mode: C |