mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 09:55:55 +00:00
xen: build on ARM
Collection of fixes to build QEMU with Xen support on ARM: - use xenstore_read_fe_uint64 to retrieve the page-ref (xenfb); - use xen_pfn_t instead of unsigned long in xenfb; - unsigned long/xenpfn_t in xen_remove_from_physmap; - in xen-mapcache.c use HOST_LONG_BITS to check for QEMU's address space size. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
4aba9eb138
commit
643f593224
|
@ -93,10 +93,12 @@ struct XenFB {
|
||||||
|
|
||||||
static int common_bind(struct common *c)
|
static int common_bind(struct common *c)
|
||||||
{
|
{
|
||||||
int mfn;
|
uint64_t mfn;
|
||||||
|
|
||||||
if (xenstore_read_fe_int(&c->xendev, "page-ref", &mfn) == -1)
|
if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &mfn) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
assert(mfn == (xen_pfn_t)mfn);
|
||||||
|
|
||||||
if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1)
|
if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
@ -107,7 +109,7 @@ static int common_bind(struct common *c)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
xen_be_bind_evtchn(&c->xendev);
|
xen_be_bind_evtchn(&c->xendev);
|
||||||
xen_be_printf(&c->xendev, 1, "ring mfn %d, remote-port %d, local-port %d\n",
|
xen_be_printf(&c->xendev, 1, "ring mfn %"PRIx64", remote-port %d, local-port %d\n",
|
||||||
mfn, c->xendev.remote_port, c->xendev.local_port);
|
mfn, c->xendev.remote_port, c->xendev.local_port);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -409,7 +411,7 @@ static void input_event(struct XenDevice *xendev)
|
||||||
|
|
||||||
/* -------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------- */
|
||||||
|
|
||||||
static void xenfb_copy_mfns(int mode, int count, unsigned long *dst, void *src)
|
static void xenfb_copy_mfns(int mode, int count, xen_pfn_t *dst, void *src)
|
||||||
{
|
{
|
||||||
uint32_t *src32 = src;
|
uint32_t *src32 = src;
|
||||||
uint64_t *src64 = src;
|
uint64_t *src64 = src;
|
||||||
|
@ -424,8 +426,8 @@ static int xenfb_map_fb(struct XenFB *xenfb)
|
||||||
struct xenfb_page *page = xenfb->c.page;
|
struct xenfb_page *page = xenfb->c.page;
|
||||||
char *protocol = xenfb->c.xendev.protocol;
|
char *protocol = xenfb->c.xendev.protocol;
|
||||||
int n_fbdirs;
|
int n_fbdirs;
|
||||||
unsigned long *pgmfns = NULL;
|
xen_pfn_t *pgmfns = NULL;
|
||||||
unsigned long *fbmfns = NULL;
|
xen_pfn_t *fbmfns = NULL;
|
||||||
void *map, *pd;
|
void *map, *pd;
|
||||||
int mode, ret = -1;
|
int mode, ret = -1;
|
||||||
|
|
||||||
|
@ -483,8 +485,8 @@ static int xenfb_map_fb(struct XenFB *xenfb)
|
||||||
n_fbdirs = xenfb->fbpages * mode / 8;
|
n_fbdirs = xenfb->fbpages * mode / 8;
|
||||||
n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
|
n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE;
|
||||||
|
|
||||||
pgmfns = g_malloc0(sizeof(unsigned long) * n_fbdirs);
|
pgmfns = g_malloc0(sizeof(xen_pfn_t) * n_fbdirs);
|
||||||
fbmfns = g_malloc0(sizeof(unsigned long) * xenfb->fbpages);
|
fbmfns = g_malloc0(sizeof(xen_pfn_t) * xenfb->fbpages);
|
||||||
|
|
||||||
xenfb_copy_mfns(mode, n_fbdirs, pgmfns, pd);
|
xenfb_copy_mfns(mode, n_fbdirs, pgmfns, pd);
|
||||||
map = xc_map_foreign_pages(xen_xc, xenfb->c.xendev.dom,
|
map = xc_map_foreign_pages(xen_xc, xenfb->c.xendev.dom,
|
||||||
|
|
|
@ -390,7 +390,7 @@ static int xen_remove_from_physmap(XenIOState *state,
|
||||||
start_addr >>= TARGET_PAGE_BITS;
|
start_addr >>= TARGET_PAGE_BITS;
|
||||||
phys_offset >>= TARGET_PAGE_BITS;
|
phys_offset >>= TARGET_PAGE_BITS;
|
||||||
for (i = 0; i < size; i++) {
|
for (i = 0; i < size; i++) {
|
||||||
unsigned long idx = start_addr + i;
|
xen_pfn_t idx = start_addr + i;
|
||||||
xen_pfn_t gpfn = phys_offset + i;
|
xen_pfn_t gpfn = phys_offset + i;
|
||||||
|
|
||||||
rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn);
|
rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn);
|
||||||
|
|
|
@ -33,10 +33,10 @@
|
||||||
# define DPRINTF(fmt, ...) do { } while (0)
|
# define DPRINTF(fmt, ...) do { } while (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__i386__)
|
#if HOST_LONG_BITS == 32
|
||||||
# define MCACHE_BUCKET_SHIFT 16
|
# define MCACHE_BUCKET_SHIFT 16
|
||||||
# define MCACHE_MAX_SIZE (1UL<<31) /* 2GB Cap */
|
# define MCACHE_MAX_SIZE (1UL<<31) /* 2GB Cap */
|
||||||
#elif defined(__x86_64__)
|
#else
|
||||||
# define MCACHE_BUCKET_SHIFT 20
|
# define MCACHE_BUCKET_SHIFT 20
|
||||||
# define MCACHE_MAX_SIZE (1UL<<35) /* 32GB Cap */
|
# define MCACHE_MAX_SIZE (1UL<<35) /* 32GB Cap */
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue