ia64/xen-unstable

changeset 10904:acccec7e213a

Update patch to reflect changes from 10867:edf7a25fdc43.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Wed Aug 02 09:54:32 2006 +0100 (2006-08-02)
parents 822c39808e62
children 3aad3abca993
files tools/ioemu/patches/ioemu-ia64
line diff
     1.1 --- a/tools/ioemu/patches/ioemu-ia64	Wed Aug 02 09:52:03 2006 +0100
     1.2 +++ b/tools/ioemu/patches/ioemu-ia64	Wed Aug 02 09:54:32 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: ioemu/hw/iommu.c
     1.5  ===================================================================
     1.6 ---- ioemu.orig/hw/iommu.c	2006-07-28 09:56:58.571272016 +0100
     1.7 -+++ ioemu/hw/iommu.c	2006-07-28 10:02:10.171049510 +0100
     1.8 +--- ioemu.orig/hw/iommu.c	2006-08-02 09:46:38.774790244 +0100
     1.9 ++++ ioemu/hw/iommu.c	2006-08-02 09:46:39.030761544 +0100
    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-28 09:58:38.815935452 +0100
    1.18 -+++ ioemu/cpu-all.h	2006-07-28 10:02:10.171049510 +0100
    1.19 +--- ioemu.orig/cpu-all.h	2006-08-02 09:46:38.969768383 +0100
    1.20 ++++ ioemu/cpu-all.h	2006-08-02 09:46:39.030761544 +0100
    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-28 09:58:59.672577418 +0100
    1.29 -+++ ioemu/vl.c	2006-07-28 10:02:10.174049171 +0100
    1.30 +--- ioemu.orig/vl.c	2006-08-02 09:46:39.020762665 +0100
    1.31 ++++ ioemu/vl.c	2006-08-02 09:47:02.896085814 +0100
    1.32  @@ -5578,6 +5578,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-28 09:58:22.882736989 +0100
    1.58 -+++ ioemu/target-i386-dm/exec-dm.c	2006-07-28 10:03:19.972165675 +0100
    1.59 +--- ioemu.orig/target-i386-dm/exec-dm.c	2006-08-02 09:46:38.903775782 +0100
    1.60 ++++ ioemu/target-i386-dm/exec-dm.c	2006-08-02 09:46:39.034761096 +0100
    1.61  @@ -341,6 +341,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                   memset(buf, 0xff, len);
    1.66  Index: ioemu/exec-all.h
    1.67  ===================================================================
    1.68 ---- ioemu.orig/exec-all.h	2006-07-28 09:56:58.572271903 +0100
    1.69 -+++ ioemu/exec-all.h	2006-07-28 10:02:10.175049059 +0100
    1.70 +--- ioemu.orig/exec-all.h	2006-08-02 09:46:38.881778248 +0100
    1.71 ++++ ioemu/exec-all.h	2006-08-02 09:46:39.034761096 +0100
    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-28 09:56:58.572271903 +0100
    1.80 -+++ ioemu/target-i386-dm/cpu.h	2006-07-28 10:02:10.175049059 +0100
    1.81 +--- ioemu.orig/target-i386-dm/cpu.h	2006-08-02 09:46:38.902775894 +0100
    1.82 ++++ ioemu/target-i386-dm/cpu.h	2006-08-02 09:46:39.034761096 +0100
    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-28 10:02:10.176048946 +0100
    1.91 ++++ ioemu/ia64_intrinsic.h	2006-08-02 09:46:39.035760983 +0100
    1.92  @@ -0,0 +1,276 @@
    1.93  +#ifndef IA64_INTRINSIC_H
    1.94  +#define IA64_INTRINSIC_H