ia64/xen-unstable

changeset 11139:6dcd85ea232e

[qemu patches] Update patches for changeset 11117:60eacb336e35.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Tue Aug 15 13:54:09 2006 +0100 (2006-08-15)
parents 60eacb336e35
children 2ff86cd7bda1 e86343be4730
files tools/ioemu/patches/ioemu-ia64
line diff
     1.1 --- a/tools/ioemu/patches/ioemu-ia64	Tue Aug 15 13:53:18 2006 +0100
     1.2 +++ b/tools/ioemu/patches/ioemu-ia64	Tue Aug 15 13:54:09 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-08-06 01:55:03.240628184 +0100
     1.7 -+++ ioemu/hw/iommu.c	2006-08-06 02:18:54.843126039 +0100
     1.8 +--- ioemu.orig/hw/iommu.c	2006-08-15 13:51:31.425498388 +0100
     1.9 ++++ ioemu/hw/iommu.c	2006-08-15 13:51:35.834011166 +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-08-06 02:17:09.392881406 +0100
    1.18 -+++ ioemu/cpu-all.h	2006-08-06 02:18:54.844125928 +0100
    1.19 +--- ioemu.orig/cpu-all.h	2006-08-15 13:51:35.772018017 +0100
    1.20 ++++ ioemu/cpu-all.h	2006-08-15 13:51:35.835011055 +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-08-06 02:18:45.608155528 +0100
    1.29 -+++ ioemu/vl.c	2006-08-06 02:18:54.847125593 +0100
    1.30 +--- ioemu.orig/vl.c	2006-08-15 13:51:35.824012271 +0100
    1.31 ++++ ioemu/vl.c	2006-08-15 13:51:46.770802425 +0100
    1.32  @@ -6140,6 +6140,11 @@
    1.33       /* init the memory */
    1.34       phys_ram_size = ram_size + vga_ram_size + bios_size;
    1.35 @@ -118,8 +118,8 @@ Index: ioemu/vl.c
    1.36       phys_ram_base = qemu_vmalloc(phys_ram_size);
    1.37  Index: ioemu/target-i386-dm/exec-dm.c
    1.38  ===================================================================
    1.39 ---- ioemu.orig/target-i386-dm/exec-dm.c	2006-08-06 02:15:01.776108064 +0100
    1.40 -+++ ioemu/target-i386-dm/exec-dm.c	2006-08-06 02:18:54.848125482 +0100
    1.41 +--- ioemu.orig/target-i386-dm/exec-dm.c	2006-08-15 13:51:35.705025421 +0100
    1.42 ++++ ioemu/target-i386-dm/exec-dm.c	2006-08-15 13:51:51.987225890 +0100
    1.43  @@ -341,6 +341,23 @@
    1.44       return io_mem_read[io_index >> IO_MEM_SHIFT];
    1.45   }
    1.46 @@ -144,20 +144,20 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.47   /* physical memory access (slow version, mainly for debug) */
    1.48   #if defined(CONFIG_USER_ONLY)
    1.49   void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, 
    1.50 -@@ -456,6 +473,9 @@
    1.51 -                 ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + 
    1.52 -                     (addr & ~TARGET_PAGE_MASK);
    1.53 -                 memcpy(buf, ptr, l);
    1.54 +@@ -432,6 +449,9 @@
    1.55 +                 /* RAM case */
    1.56 +                 ptr = phys_ram_base + addr1;
    1.57 +                 memcpy(ptr, buf, l);
    1.58  +#ifdef __ia64__
    1.59  +                sync_icache((unsigned long)ptr, l);
    1.60  +#endif 
    1.61 -             } else {
    1.62 -                 /* unreported MMIO space */
    1.63 -                 memset(buf, 0xff, len);
    1.64 +             }
    1.65 +         } else {
    1.66 +             if (io_index) {
    1.67  Index: ioemu/exec-all.h
    1.68  ===================================================================
    1.69 ---- ioemu.orig/exec-all.h	2006-08-06 02:14:09.796902750 +0100
    1.70 -+++ ioemu/exec-all.h	2006-08-06 02:18:54.848125482 +0100
    1.71 +--- ioemu.orig/exec-all.h	2006-08-15 13:51:35.682027963 +0100
    1.72 ++++ ioemu/exec-all.h	2006-08-15 13:51:35.839010613 +0100
    1.73  @@ -462,12 +462,13 @@
    1.74   }
    1.75   #endif
    1.76 @@ -177,8 +177,8 @@ Index: ioemu/exec-all.h
    1.77   
    1.78  Index: ioemu/target-i386-dm/cpu.h
    1.79  ===================================================================
    1.80 ---- ioemu.orig/target-i386-dm/cpu.h	2006-08-06 02:15:01.776108064 +0100
    1.81 -+++ ioemu/target-i386-dm/cpu.h	2006-08-06 02:18:54.848125482 +0100
    1.82 +--- ioemu.orig/target-i386-dm/cpu.h	2006-08-15 13:51:35.704025531 +0100
    1.83 ++++ ioemu/target-i386-dm/cpu.h	2006-08-15 13:51:35.839010613 +0100
    1.84  @@ -80,7 +80,11 @@
    1.85   /* helper2.c */
    1.86   int main_loop(void);
    1.87 @@ -194,7 +194,7 @@ Index: ioemu/target-i386-dm/cpu.h
    1.88  Index: ioemu/ia64_intrinsic.h
    1.89  ===================================================================
    1.90  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.91 -+++ ioemu/ia64_intrinsic.h	2006-08-06 02:18:54.849125370 +0100
    1.92 ++++ ioemu/ia64_intrinsic.h	2006-08-15 13:51:35.840010502 +0100
    1.93  @@ -0,0 +1,276 @@
    1.94  +#ifndef IA64_INTRINSIC_H
    1.95  +#define IA64_INTRINSIC_H