# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Node ID aaa0870863b457be3c243640e10f0097bfc83296
# Parent 156a0963a1aed529e5c5517e7153b0ad64d99276
[ppc] match upstream changes
- define and use the 'xen_pfn_t' type
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
tools/domctrl/console.c | 2 +-
tools/domctrl/create.c | 12 ++++++------
tools/domctrl/domctrl.c | 8 ++++----
tools/domctrl/domctrl.h | 4 ++--
tools/domctrl/mem.c | 2 +-
xen/arch/ppc/dom0_ops.c | 2 +-
xen/include/public/arch-ppc64.h | 3 +++
7 files changed, 18 insertions(+), 15 deletions(-)
diff -r 156a0963a1ae -r aaa0870863b4 tools/domctrl/console.c
--- a/tools/domctrl/console.c Tue Jun 06 13:25:31 2006 -0500
+++ b/tools/domctrl/console.c Tue Jun 06 14:37:46 2006 -0500
@@ -22,7 +22,7 @@ int console(char *argv[], int argc)
int console(char *argv[], int argc)
{
struct xencons_interface volatile *intf;
- unsigned long *page_array;
+ xen_pfn_t *page_array;
unsigned long domid;
unsigned long console_pfn;
unsigned long console_mfn;
diff -r 156a0963a1ae -r aaa0870863b4 tools/domctrl/create.c
--- a/tools/domctrl/create.c Tue Jun 06 13:25:31 2006 -0500
+++ b/tools/domctrl/create.c Tue Jun 06 14:37:46 2006 -0500
@@ -139,7 +139,7 @@ static int init_boot_vcpu(
return rc;
}
-static int install_image(int domid, unsigned long *page_array, uint8_t *img,
+static int install_image(int domid, xen_pfn_t *page_array, uint8_t *img,
unsigned long paddr, unsigned long size)
{
int i;
@@ -170,7 +170,7 @@ static int load_dtb(
const char *dtb_path,
unsigned long dtb_addr,
struct domain_setup_info *dsi,
- unsigned long *page_array)
+ xen_pfn_t *page_array)
{
uint8_t *img;
unsigned long dtb_size;
@@ -223,7 +223,7 @@ static int load_kernel(
int domid,
const char *kernel_path,
struct domain_setup_info *dsi,
- unsigned long *page_array)
+ xen_pfn_t *page_array)
{
struct load_funcs load_funcs;
uint8_t *kernel_img;
@@ -272,7 +272,7 @@ out:
#ifdef INITRD
static int load_initrd(
int domid,
- unsigned long *page_array,
+ xen_pfn_t *page_array,
const char *initrd_path,
unsigned long *base,
unsigned long *len)
@@ -302,7 +302,7 @@ static int load_start_info(
int domid,
start_info_t *si,
unsigned long si_addr,
- unsigned long *page_array)
+ xen_pfn_t *page_array)
{
int rc;
@@ -362,7 +362,7 @@ int create(char *argv[], int argc)
int create(char *argv[], int argc)
{
struct domain_setup_info dsi;
- unsigned long *page_array;
+ xen_pfn_t *page_array;
unsigned long kern_addr;
unsigned long dtb_addr;
unsigned long si_addr;
diff -r 156a0963a1ae -r aaa0870863b4 tools/domctrl/domctrl.c
--- a/tools/domctrl/domctrl.c Tue Jun 06 13:25:31 2006 -0500
+++ b/tools/domctrl/domctrl.c Tue Jun 06 14:37:46 2006 -0500
@@ -37,7 +37,7 @@ void usage(void)
" regs <domid.vcpu>\n");
}
-int domain_copy(int domid, unsigned long *page_array, void *buffer,
+int domain_copy(int domid, xen_pfn_t *page_array, void *buffer,
unsigned long paddr, unsigned long size, int direction)
{
long remaining = size;
@@ -75,9 +75,9 @@ int domain_copy(int domid, unsigned long
return 0;
}
-int get_page_array(int domid, unsigned long **page_array_ptr)
+int get_page_array(int domid, xen_pfn_t **page_array_ptr)
{
- unsigned long *page_array = NULL;
+ xen_pfn_t *page_array = NULL;
int nr_pages;
int rc;
int i;
@@ -86,7 +86,7 @@ int get_page_array(int domid, unsigned l
nr_pages = xc_get_tot_pages(xc_handle, domid);
DEBUG(printf(" 0x%x\n", nr_pages));
- page_array = malloc(nr_pages * sizeof(unsigned long));
+ page_array = malloc(nr_pages * sizeof(xen_pfn_t));
if (page_array == NULL) {
perror("malloc");
return -1;
diff -r 156a0963a1ae -r aaa0870863b4 tools/domctrl/domctrl.h
--- a/tools/domctrl/domctrl.h Tue Jun 06 13:25:31 2006 -0500
+++ b/tools/domctrl/domctrl.h Tue Jun 06 14:37:46 2006 -0500
@@ -28,8 +28,8 @@ extern int console(char *argv[], int arg
extern int console(char *argv[], int argc);
extern int version(char *argv[], int argc);
-extern int get_page_array(int domid, unsigned long **page_array_ptr);
-extern int domain_copy(int domid, unsigned long *page_array, void *buffer,
+extern int get_page_array(int domid, xen_pfn_t **page_array_ptr);
+extern int domain_copy(int domid, xen_pfn_t *page_array, void *buffer,
unsigned long paddr, unsigned long size, int direction);
#endif
diff -r 156a0963a1ae -r aaa0870863b4 tools/domctrl/mem.c
--- a/tools/domctrl/mem.c Tue Jun 06 13:25:31 2006 -0500
+++ b/tools/domctrl/mem.c Tue Jun 06 14:37:46 2006 -0500
@@ -33,7 +33,7 @@ static void display_buf(unsigned long pa
int mem(char *argv[], int argc)
{
- unsigned long *page_array;
+ xen_pfn_t *page_array;
uint8_t *buf;
unsigned long domid;
unsigned long paddr;
diff -r 156a0963a1ae -r aaa0870863b4 xen/arch/ppc/dom0_ops.c
--- a/xen/arch/ppc/dom0_ops.c Tue Jun 06 13:25:31 2006 -0500
+++ b/xen/arch/ppc/dom0_ops.c Tue Jun 06 14:37:46 2006 -0500
@@ -48,7 +48,7 @@ long arch_do_dom0_op(struct dom0_op *op,
int i;
for (i = 0; (i < max_pfns) && (i < domain_pfns); i++) {
- unsigned long mfn = (((domid + 1) * memsize) >> 12) + i;
+ xen_pfn_t mfn = (((domid + 1) * memsize) >> 12) + i;
if (copy_to_guest_offset(op->u.getmemlist.buffer, i, &mfn, 1)) {
ret = -EFAULT;
break;
diff -r 156a0963a1ae -r aaa0870863b4 xen/include/public/arch-ppc64.h
--- a/xen/include/public/arch-ppc64.h Tue Jun 06 13:25:31 2006 -0500
+++ b/xen/include/public/arch-ppc64.h Tue Jun 06 14:37:46 2006 -0500
@@ -44,6 +44,9 @@ DEFINE_XEN_GUEST_HANDLE(int);
DEFINE_XEN_GUEST_HANDLE(int);
DEFINE_XEN_GUEST_HANDLE(long);
DEFINE_XEN_GUEST_HANDLE(void);
+
+typedef unsigned long long xen_pfn_t;
+DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
#endif
/*
_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel
|
Home