ia64/xen-unstable

changeset 11568:ebb1982c03a1

[qemu patches] Update patches for changeset 11554:39aaa54756db.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author Christian Limpach <Christian.Limpach@xensource.com>
date Thu Sep 21 18:58:17 2006 +0100 (2006-09-21)
parents 449dcaff2551
children 317e8516d464
files tools/ioemu/patches/qemu-target-i386-dm
line diff
     1.1 --- a/tools/ioemu/patches/qemu-target-i386-dm	Thu Sep 21 18:29:48 2006 +0100
     1.2 +++ b/tools/ioemu/patches/qemu-target-i386-dm	Thu Sep 21 18:58:17 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: ioemu/Makefile.target
     1.5  ===================================================================
     1.6 ---- ioemu.orig/Makefile.target	2006-08-08 11:24:33.479955101 +0100
     1.7 -+++ ioemu/Makefile.target	2006-08-08 11:24:39.008338255 +0100
     1.8 +--- ioemu.orig/Makefile.target	2006-09-21 11:30:11.000000000 +0100
     1.9 ++++ ioemu/Makefile.target	2006-09-21 18:54:22.000000000 +0100
    1.10  @@ -62,6 +62,8 @@
    1.11   QEMU_SYSTEM=qemu-fast
    1.12   endif
    1.13 @@ -32,8 +32,8 @@ Index: ioemu/Makefile.target
    1.14   DEFINES += -DHAS_AUDIO
    1.15  Index: ioemu/configure
    1.16  ===================================================================
    1.17 ---- ioemu.orig/configure	2006-08-08 11:24:33.480954990 +0100
    1.18 -+++ ioemu/configure	2006-08-08 11:24:38.122437102 +0100
    1.19 +--- ioemu.orig/configure	2006-09-21 11:30:11.000000000 +0100
    1.20 ++++ ioemu/configure	2006-09-21 18:54:21.000000000 +0100
    1.21  @@ -373,6 +373,8 @@
    1.22       if [ "$user" = "yes" ] ; then
    1.23           target_list="i386-user arm-user armeb-user sparc-user ppc-user mips-user mipsel-user $target_list"
    1.24 @@ -45,8 +45,8 @@ Index: ioemu/configure
    1.25   fi
    1.26  Index: ioemu/monitor.c
    1.27  ===================================================================
    1.28 ---- ioemu.orig/monitor.c	2006-08-08 11:24:33.484954543 +0100
    1.29 -+++ ioemu/monitor.c	2006-08-08 11:24:39.253310921 +0100
    1.30 +--- ioemu.orig/monitor.c	2006-09-21 11:30:11.000000000 +0100
    1.31 ++++ ioemu/monitor.c	2006-09-21 18:54:23.000000000 +0100
    1.32  @@ -1262,6 +1262,10 @@
    1.33         "", "show profiling information", },
    1.34       { "capture", "", do_info_capture,
    1.35 @@ -60,8 +60,8 @@ Index: ioemu/monitor.c
    1.36   
    1.37  Index: ioemu/vl.c
    1.38  ===================================================================
    1.39 ---- ioemu.orig/vl.c	2006-08-08 11:24:33.486954320 +0100
    1.40 -+++ ioemu/vl.c	2006-08-08 11:24:39.454288496 +0100
    1.41 +--- ioemu.orig/vl.c	2006-09-21 11:30:11.000000000 +0100
    1.42 ++++ ioemu/vl.c	2006-09-21 18:54:23.000000000 +0100
    1.43  @@ -87,7 +87,7 @@
    1.44   
    1.45   #include "exec-all.h"
    1.46 @@ -98,8 +98,8 @@ Index: ioemu/vl.c
    1.47   {
    1.48  Index: ioemu/vl.h
    1.49  ===================================================================
    1.50 ---- ioemu.orig/vl.h	2006-08-08 11:24:31.082222636 +0100
    1.51 -+++ ioemu/vl.h	2006-08-08 11:24:39.454288496 +0100
    1.52 +--- ioemu.orig/vl.h	2006-09-21 11:30:11.000000000 +0100
    1.53 ++++ ioemu/vl.h	2006-09-21 18:54:23.000000000 +0100
    1.54  @@ -37,6 +37,8 @@
    1.55   #include <unistd.h>
    1.56   #include <fcntl.h>
    1.57 @@ -132,7 +132,7 @@ Index: ioemu/vl.h
    1.58  Index: ioemu/target-i386-dm/cpu.h
    1.59  ===================================================================
    1.60  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.61 -+++ ioemu/target-i386-dm/cpu.h	2006-08-08 11:24:39.099328102 +0100
    1.62 ++++ ioemu/target-i386-dm/cpu.h	2006-09-21 18:54:22.000000000 +0100
    1.63  @@ -0,0 +1,86 @@
    1.64  +/*
    1.65  + * i386 virtual CPU header
    1.66 @@ -223,7 +223,7 @@ Index: ioemu/target-i386-dm/cpu.h
    1.67  Index: ioemu/target-i386-dm/exec-dm.c
    1.68  ===================================================================
    1.69  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.70 -+++ ioemu/target-i386-dm/exec-dm.c	2006-08-08 11:24:39.099328102 +0100
    1.71 ++++ ioemu/target-i386-dm/exec-dm.c	2006-09-21 18:54:22.000000000 +0100
    1.72  @@ -0,0 +1,516 @@
    1.73  +/*
    1.74  + *  virtual page mapping and translated block handling
    1.75 @@ -744,7 +744,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
    1.76  Index: ioemu/target-i386-dm/helper2.c
    1.77  ===================================================================
    1.78  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.79 -+++ ioemu/target-i386-dm/helper2.c	2006-08-08 11:24:44.888682140 +0100
    1.80 ++++ ioemu/target-i386-dm/helper2.c	2006-09-21 18:55:31.000000000 +0100
    1.81  @@ -0,0 +1,469 @@
    1.82  +/*
    1.83  + *  i386 helpers (without register variable usage)
    1.84 @@ -1205,8 +1205,8 @@ Index: ioemu/target-i386-dm/helper2.c
    1.85  +                break;
    1.86  +        }
    1.87  +
    1.88 -+        /* Wait up to 10 msec. */
    1.89 -+        main_loop_wait(10);
    1.90 ++        /* Wait up to 100 msec. */
    1.91 ++        main_loop_wait(100);
    1.92  +
    1.93  +        if (env->send_event) {
    1.94  +            env->send_event = 0;
    1.95 @@ -1218,7 +1218,7 @@ Index: ioemu/target-i386-dm/helper2.c
    1.96  Index: ioemu/target-i386-dm/i8259-dm.c
    1.97  ===================================================================
    1.98  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.99 -+++ ioemu/target-i386-dm/i8259-dm.c	2006-08-08 11:24:33.505952200 +0100
   1.100 ++++ ioemu/target-i386-dm/i8259-dm.c	2006-09-21 11:30:11.000000000 +0100
   1.101  @@ -0,0 +1,107 @@
   1.102  +/* Xen 8259 stub for interrupt controller emulation
   1.103  + * 
   1.104 @@ -1330,7 +1330,7 @@ Index: ioemu/target-i386-dm/i8259-dm.c
   1.105  Index: ioemu/target-i386-dm/qemu-dm.debug
   1.106  ===================================================================
   1.107  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   1.108 -+++ ioemu/target-i386-dm/qemu-dm.debug	2006-08-08 11:24:33.505952200 +0100
   1.109 ++++ ioemu/target-i386-dm/qemu-dm.debug	2006-09-21 11:30:11.000000000 +0100
   1.110  @@ -0,0 +1,5 @@
   1.111  +#!/bin/sh
   1.112  +
   1.113 @@ -1340,7 +1340,7 @@ Index: ioemu/target-i386-dm/qemu-dm.debu
   1.114  Index: ioemu/target-i386-dm/qemu-ifup
   1.115  ===================================================================
   1.116  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   1.117 -+++ ioemu/target-i386-dm/qemu-ifup	2006-08-08 11:24:33.505952200 +0100
   1.118 ++++ ioemu/target-i386-dm/qemu-ifup	2006-09-21 11:30:11.000000000 +0100
   1.119  @@ -0,0 +1,10 @@
   1.120  +#!/bin/sh
   1.121  +