ia64/xen-unstable

changeset 10813:0f6baad3b842

[IA64][qemu] add changes lost from xen-ia64 cset 10570

This adds back changes from xen-ia64-unstable.hg cset:

10570:8dc4af3f192c7c1ef3cd6921196997b903d25add

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author awilliam@xenbuild.aw
date Thu Jul 27 09:15:01 2006 -0600 (2006-07-27)
parents a59843bb699e
children e917cda4b0a8
files tools/ioemu/patches/ioemu-ia64 tools/ioemu/vl.c
line diff
     1.1 --- a/tools/ioemu/patches/ioemu-ia64	Thu Jul 27 08:47:39 2006 -0600
     1.2 +++ b/tools/ioemu/patches/ioemu-ia64	Thu Jul 27 09:15:01 2006 -0600
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: ioemu/hw/iommu.c
     1.5  ===================================================================
     1.6 ---- ioemu.orig/hw/iommu.c	2006-07-26 15:17:35.639762285 +0100
     1.7 -+++ ioemu/hw/iommu.c	2006-07-26 15:17:39.078387722 +0100
     1.8 +--- ioemu.orig/hw/iommu.c	2006-07-27 09:04:53.000000000 -0600
     1.9 ++++ ioemu/hw/iommu.c	2006-07-27 09:05:01.000000000 -0600
    1.10  @@ -82,7 +82,11 @@
    1.11   #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
    1.12   #define IOPTE_WAZ           0x00000001 /* Write as zeros */
    1.13 @@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
    1.14   
    1.15  Index: ioemu/cpu-all.h
    1.16  ===================================================================
    1.17 ---- ioemu.orig/cpu-all.h	2006-07-26 15:17:38.728425843 +0100
    1.18 -+++ ioemu/cpu-all.h	2006-07-26 15:17:39.079387613 +0100
    1.19 +--- ioemu.orig/cpu-all.h	2006-07-27 09:05:01.000000000 -0600
    1.20 ++++ ioemu/cpu-all.h	2006-07-27 09:05:01.000000000 -0600
    1.21  @@ -835,6 +835,31 @@
    1.22                   :"=m" (*(volatile long *)addr)
    1.23                   :"dIr" (nr));
    1.24 @@ -52,8 +52,8 @@ Index: ioemu/cpu-all.h
    1.25   /* memory API */
    1.26  Index: ioemu/vl.c
    1.27  ===================================================================
    1.28 ---- ioemu.orig/vl.c	2006-07-26 15:17:39.011395020 +0100
    1.29 -+++ ioemu/vl.c	2006-07-26 21:11:35.957492161 +0100
    1.30 +--- ioemu.orig/vl.c	2006-07-27 09:05:01.000000000 -0600
    1.31 ++++ ioemu/vl.c	2006-07-27 09:09:29.000000000 -0600
    1.32  @@ -5577,6 +5577,7 @@
    1.33           exit(-1);
    1.34       }
    1.35 @@ -82,7 +82,7 @@ Index: ioemu/vl.c
    1.36  +    }
    1.37  +
    1.38  +    if (xc_ia64_get_pfn_list(xc_handle, domid, page_array,
    1.39 -+                             nr_pages + (GFW_SIZE >> PAGE_SHIFT), 1)!= 1){
    1.40 ++                             IO_PAGE_START >> PAGE_SHIFT, 1) != 1) {
    1.41  +        fprintf(logfile, "xc_ia64_get_pfn_list returned error %d\n", errno);
    1.42  +        exit(-1);
    1.43  +    }
    1.44 @@ -91,7 +91,7 @@ Index: ioemu/vl.c
    1.45  +                                       PROT_READ|PROT_WRITE,
    1.46  +                                       page_array[0]);
    1.47  +
    1.48 -+    fprintf(logfile, "shared page at pfn:%lx, mfn: %l016x\n",
    1.49 ++    fprintf(logfile, "shared page at pfn:%lx, mfn: %016lx\n",
    1.50  +            IO_PAGE_START >> PAGE_SHIFT, page_array[0]);
    1.51  +#endif
    1.52   #else  /* !CONFIG_DM */
    1.53 @@ -99,8 +99,8 @@ Index: ioemu/vl.c
    1.54   #ifdef CONFIG_SOFTMMU
    1.55  Index: ioemu/target-i386-dm/exec-dm.c
    1.56  ===================================================================
    1.57 ---- ioemu.orig/target-i386-dm/exec-dm.c	2006-07-26 15:17:38.283474311 +0100
    1.58 -+++ ioemu/target-i386-dm/exec-dm.c	2006-07-26 15:17:39.081387395 +0100
    1.59 +--- ioemu.orig/target-i386-dm/exec-dm.c	2006-07-27 09:05:01.000000000 -0600
    1.60 ++++ ioemu/target-i386-dm/exec-dm.c	2006-07-27 09:05:01.000000000 -0600
    1.61  @@ -340,6 +340,23 @@
    1.62       return io_mem_read[io_index >> IO_MEM_SHIFT];
    1.63   }
    1.64 @@ -137,8 +137,8 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.65           len -= l;
    1.66  Index: ioemu/exec-all.h
    1.67  ===================================================================
    1.68 ---- ioemu.orig/exec-all.h	2006-07-26 15:17:38.200483351 +0100
    1.69 -+++ ioemu/exec-all.h	2006-07-26 21:11:41.262898983 +0100
    1.70 +--- ioemu.orig/exec-all.h	2006-07-27 09:05:01.000000000 -0600
    1.71 ++++ ioemu/exec-all.h	2006-07-27 09:05:01.000000000 -0600
    1.72  @@ -462,12 +462,13 @@
    1.73   }
    1.74   #endif
    1.75 @@ -158,8 +158,8 @@ Index: ioemu/exec-all.h
    1.76   
    1.77  Index: ioemu/target-i386-dm/cpu.h
    1.78  ===================================================================
    1.79 ---- ioemu.orig/target-i386-dm/cpu.h	2006-07-26 15:17:38.282474420 +0100
    1.80 -+++ ioemu/target-i386-dm/cpu.h	2006-07-26 15:17:39.082387287 +0100
    1.81 +--- ioemu.orig/target-i386-dm/cpu.h	2006-07-27 09:05:01.000000000 -0600
    1.82 ++++ ioemu/target-i386-dm/cpu.h	2006-07-27 09:05:01.000000000 -0600
    1.83  @@ -80,7 +80,11 @@
    1.84   /* helper2.c */
    1.85   int main_loop(void);
    1.86 @@ -175,7 +175,7 @@ Index: ioemu/target-i386-dm/cpu.h
    1.87  Index: ioemu/ia64_intrinsic.h
    1.88  ===================================================================
    1.89  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.90 -+++ ioemu/ia64_intrinsic.h	2006-07-26 15:17:39.083387178 +0100
    1.91 ++++ ioemu/ia64_intrinsic.h	2006-07-27 09:05:01.000000000 -0600
    1.92  @@ -0,0 +1,276 @@
    1.93  +#ifndef IA64_INTRINSIC_H
    1.94  +#define IA64_INTRINSIC_H
     2.1 --- a/tools/ioemu/vl.c	Thu Jul 27 08:47:39 2006 -0600
     2.2 +++ b/tools/ioemu/vl.c	Thu Jul 27 09:15:01 2006 -0600
     2.3 @@ -5791,7 +5791,7 @@ int main(int argc, char **argv)
     2.4      }
     2.5  
     2.6      if (xc_ia64_get_pfn_list(xc_handle, domid, page_array,
     2.7 -                             nr_pages + (GFW_SIZE >> PAGE_SHIFT), 1)!= 1){
     2.8 +                             IO_PAGE_START >> PAGE_SHIFT, 1) != 1) {
     2.9          fprintf(logfile, "xc_ia64_get_pfn_list returned error %d\n", errno);
    2.10          exit(-1);
    2.11      }
    2.12 @@ -5800,7 +5800,7 @@ int main(int argc, char **argv)
    2.13                                         PROT_READ|PROT_WRITE,
    2.14                                         page_array[0]);
    2.15  
    2.16 -    fprintf(logfile, "shared page at pfn:%lx, mfn: %l016x\n",
    2.17 +    fprintf(logfile, "shared page at pfn:%lx, mfn: %016lx\n",
    2.18              IO_PAGE_START >> PAGE_SHIFT, page_array[0]);
    2.19  #endif
    2.20  #else  /* !CONFIG_DM */