ia64/xen-unstable

changeset 11208:a7dcafb540be

[qemu patches] Update patches for changeset 11186:078bfd250677.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author Christian Limpach <Christian.Limpach@xensource.com>
date Thu Aug 17 20:31:47 2006 +0100 (2006-08-17)
parents 078bfd250677
children d40dfbef8e5d
files tools/ioemu/patches/acpi-poweroff-support tools/ioemu/patches/acpi-support tools/ioemu/patches/acpi-timer-support tools/ioemu/patches/domain-destroy tools/ioemu/patches/domain-reset tools/ioemu/patches/domain-timeoffset tools/ioemu/patches/hypervisor-pit tools/ioemu/patches/ide-hd-multithread tools/ioemu/patches/ioemu-ia64 tools/ioemu/patches/qemu-allow-disable-sdl tools/ioemu/patches/qemu-fix-memset-args tools/ioemu/patches/qemu-fix-write-to-disk-synchronous tools/ioemu/patches/serial-non-block tools/ioemu/patches/shadow-vram tools/ioemu/patches/shared-vram tools/ioemu/patches/support-xm-console tools/ioemu/patches/vnc-access-monitor-vt tools/ioemu/patches/vnc-cleanup tools/ioemu/patches/vnc-display-find-unused tools/ioemu/patches/vnc-fixes tools/ioemu/patches/vnc-start-vncviewer tools/ioemu/patches/vnc-title-domain-name tools/ioemu/patches/xen-mm tools/ioemu/patches/xen-platform-device tools/ioemu/patches/xen-support-buffered-ioreqs tools/ioemu/patches/xenstore-block-device-config tools/ioemu/patches/xenstore-write-vnc-port
line diff
     1.1 --- a/tools/ioemu/patches/acpi-poweroff-support	Thu Aug 17 20:31:13 2006 +0100
     1.2 +++ b/tools/ioemu/patches/acpi-poweroff-support	Thu Aug 17 20:31:47 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: ioemu/hw/piix4acpi.c
     1.5  ===================================================================
     1.6 ---- ioemu.orig/hw/piix4acpi.c	2006-08-06 02:30:29.288761563 +0100
     1.7 -+++ ioemu/hw/piix4acpi.c	2006-08-06 02:30:42.131331446 +0100
     1.8 +--- ioemu.orig/hw/piix4acpi.c	2006-08-17 19:50:05.060576667 +0100
     1.9 ++++ ioemu/hw/piix4acpi.c	2006-08-17 19:50:07.563300039 +0100
    1.10  @@ -45,6 +45,10 @@
    1.11   #define GBL_RLS           (1 << 2)
    1.12   #define SLP_EN            (1 << 13)
     2.1 --- a/tools/ioemu/patches/acpi-support	Thu Aug 17 20:31:13 2006 +0100
     2.2 +++ b/tools/ioemu/patches/acpi-support	Thu Aug 17 20:31:47 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  Index: ioemu/Makefile.target
     2.5  ===================================================================
     2.6 ---- ioemu.orig/Makefile.target	2006-08-09 19:54:26.055548240 +0100
     2.7 -+++ ioemu/Makefile.target	2006-08-09 21:29:37.834611244 +0100
     2.8 +--- ioemu.orig/Makefile.target	2006-08-17 19:49:50.228216099 +0100
     2.9 ++++ ioemu/Makefile.target	2006-08-17 19:50:02.405870095 +0100
    2.10  @@ -357,6 +357,7 @@
    2.11   VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
    2.12   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
    2.13 @@ -12,8 +12,8 @@ Index: ioemu/Makefile.target
    2.14   ifeq ($(TARGET_BASE_ARCH), ppc)
    2.15  Index: ioemu/hw/pc.c
    2.16  ===================================================================
    2.17 ---- ioemu.orig/hw/pc.c	2006-08-09 19:54:26.133539447 +0100
    2.18 -+++ ioemu/hw/pc.c	2006-08-09 21:30:30.188733212 +0100
    2.19 +--- ioemu.orig/hw/pc.c	2006-08-17 19:49:59.312212039 +0100
    2.20 ++++ ioemu/hw/pc.c	2006-08-17 19:50:02.406869984 +0100
    2.21  @@ -874,13 +874,19 @@
    2.22   
    2.23       cmos_init(ram_size, boot_device, bs_table, timeoffset);
    2.24 @@ -49,7 +49,7 @@ Index: ioemu/hw/pc.c
    2.25  Index: ioemu/hw/piix4acpi.c
    2.26  ===================================================================
    2.27  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    2.28 -+++ ioemu/hw/piix4acpi.c	2006-08-09 21:32:04.400129788 +0100
    2.29 ++++ ioemu/hw/piix4acpi.c	2006-08-17 19:50:02.407869874 +0100
    2.30  @@ -0,0 +1,388 @@
    2.31  +/*
    2.32  + * PIIX4 ACPI controller emulation
    2.33 @@ -441,8 +441,8 @@ Index: ioemu/hw/piix4acpi.c
    2.34  +}
    2.35  Index: ioemu/vl.c
    2.36  ===================================================================
    2.37 ---- ioemu.orig/vl.c	2006-08-09 19:54:26.135539222 +0100
    2.38 -+++ ioemu/vl.c	2006-08-09 21:29:38.067585110 +0100
    2.39 +--- ioemu.orig/vl.c	2006-08-17 19:49:59.315211708 +0100
    2.40 ++++ ioemu/vl.c	2006-08-17 19:50:02.410869542 +0100
    2.41  @@ -156,7 +156,7 @@
    2.42   #else
    2.43   #define MAX_CPUS 1
    2.44 @@ -488,9 +488,9 @@ Index: ioemu/vl.c
    2.45       }
    2.46  Index: ioemu/vl.h
    2.47  ===================================================================
    2.48 ---- ioemu.orig/vl.h	2006-08-09 19:54:26.136539109 +0100
    2.49 -+++ ioemu/vl.h	2006-08-09 21:31:21.772931536 +0100
    2.50 -@@ -167,6 +167,7 @@
    2.51 +--- ioemu.orig/vl.h	2006-08-17 19:49:59.316211597 +0100
    2.52 ++++ ioemu/vl.h	2006-08-17 19:50:02.411869432 +0100
    2.53 +@@ -168,6 +168,7 @@
    2.54   extern int kqemu_allowed;
    2.55   extern int win2k_install_hack;
    2.56   extern int usb_enabled;
    2.57 @@ -498,7 +498,7 @@ Index: ioemu/vl.h
    2.58   extern int smp_cpus;
    2.59   
    2.60   /* XXX: make it dynamic */
    2.61 -@@ -922,6 +923,9 @@
    2.62 +@@ -923,6 +924,9 @@
    2.63   void piix4_pm_init(PCIBus *bus, int devfn);
    2.64   void acpi_bios_init(void);
    2.65   
    2.66 @@ -510,8 +510,8 @@ Index: ioemu/vl.h
    2.67   extern QEMUMachine isapc_machine;
    2.68  Index: ioemu/hw/piix_pci.c
    2.69  ===================================================================
    2.70 ---- ioemu.orig/hw/piix_pci.c	2006-08-09 19:54:19.636318228 +0100
    2.71 -+++ ioemu/hw/piix_pci.c	2006-08-09 19:54:26.152537305 +0100
    2.72 +--- ioemu.orig/hw/piix_pci.c	2006-08-17 19:38:05.806252180 +0100
    2.73 ++++ ioemu/hw/piix_pci.c	2006-08-17 19:50:02.411869432 +0100
    2.74  @@ -241,7 +241,7 @@
    2.75   static uint32_t pci_bios_io_addr;
    2.76   static uint32_t pci_bios_mem_addr;
     3.1 --- a/tools/ioemu/patches/acpi-timer-support	Thu Aug 17 20:31:13 2006 +0100
     3.2 +++ b/tools/ioemu/patches/acpi-timer-support	Thu Aug 17 20:31:47 2006 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  Index: ioemu/hw/piix4acpi.c
     3.5  ===================================================================
     3.6 ---- ioemu.orig/hw/piix4acpi.c	2006-08-09 20:00:56.118008198 +0100
     3.7 -+++ ioemu/hw/piix4acpi.c	2006-08-09 20:04:54.375299065 +0100
     3.8 +--- ioemu.orig/hw/piix4acpi.c	2006-08-17 19:50:02.407869874 +0100
     3.9 ++++ ioemu/hw/piix4acpi.c	2006-08-17 19:50:05.060576667 +0100
    3.10  @@ -24,31 +24,30 @@
    3.11    */
    3.12   
    3.13 @@ -184,7 +184,7 @@ Index: ioemu/hw/piix4acpi.c
    3.14   }
    3.15  -													
    3.16   
    3.17 - /* PIIX4 acpi pci configuration space, func 3 */
    3.18 + /* PIIX4 acpi pci configuration space, func 2 */
    3.19   void pci_piix4_acpi_init(PCIBus *bus, int devfn)
    3.20  @@ -384,5 +383,5 @@
    3.21       pci_register_io_region((PCIDevice *)d, 4, 0x10,
     4.1 --- a/tools/ioemu/patches/domain-destroy	Thu Aug 17 20:31:13 2006 +0100
     4.2 +++ b/tools/ioemu/patches/domain-destroy	Thu Aug 17 20:31:47 2006 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  Index: ioemu/monitor.c
     4.5  ===================================================================
     4.6 ---- ioemu.orig/monitor.c	2006-08-08 11:27:48.555190337 +0100
     4.7 -+++ ioemu/monitor.c	2006-08-08 11:27:53.984584612 +0100
     4.8 +--- ioemu.orig/monitor.c	2006-08-17 19:37:36.489509621 +0100
     4.9 ++++ ioemu/monitor.c	2006-08-17 19:49:44.491850141 +0100
    4.10  @@ -308,6 +308,7 @@
    4.11   
    4.12   static void do_quit(void)
    4.13 @@ -12,8 +12,8 @@ Index: ioemu/monitor.c
    4.14   
    4.15  Index: ioemu/target-i386-dm/helper2.c
    4.16  ===================================================================
    4.17 ---- ioemu.orig/target-i386-dm/helper2.c	2006-08-08 11:27:53.063687351 +0100
    4.18 -+++ ioemu/target-i386-dm/helper2.c	2006-08-08 11:27:54.011581601 +0100
    4.19 +--- ioemu.orig/target-i386-dm/helper2.c	2006-08-17 19:49:40.116333768 +0100
    4.20 ++++ ioemu/target-i386-dm/helper2.c	2006-08-17 19:49:44.491850141 +0100
    4.21  @@ -488,5 +488,25 @@
    4.22               xc_evtchn_notify(xce_handle, ioreq_local_port[send_vcpu]);
    4.23           }
    4.24 @@ -42,9 +42,9 @@ Index: ioemu/target-i386-dm/helper2.c
    4.25  +}
    4.26  Index: ioemu/vl.h
    4.27  ===================================================================
    4.28 ---- ioemu.orig/vl.h	2006-08-08 11:27:53.067686905 +0100
    4.29 -+++ ioemu/vl.h	2006-08-08 11:27:54.061576023 +0100
    4.30 -@@ -1189,4 +1189,7 @@
    4.31 +--- ioemu.orig/vl.h	2006-08-17 19:49:40.120333326 +0100
    4.32 ++++ ioemu/vl.h	2006-08-17 19:49:44.492850031 +0100
    4.33 +@@ -1190,4 +1190,7 @@
    4.34   void kqemu_record_dump(void);
    4.35   
    4.36   extern char domain_name[];
     5.1 --- a/tools/ioemu/patches/domain-reset	Thu Aug 17 20:31:13 2006 +0100
     5.2 +++ b/tools/ioemu/patches/domain-reset	Thu Aug 17 20:31:47 2006 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  Index: ioemu/target-i386-dm/helper2.c
     5.5  ===================================================================
     5.6 ---- ioemu.orig/target-i386-dm/helper2.c	2006-08-08 11:27:45.566523765 +0100
     5.7 -+++ ioemu/target-i386-dm/helper2.c	2006-08-08 11:27:53.063687351 +0100
     5.8 +--- ioemu.orig/target-i386-dm/helper2.c	2006-08-17 19:37:36.530505066 +0100
     5.9 ++++ ioemu/target-i386-dm/helper2.c	2006-08-17 19:49:40.116333768 +0100
    5.10  @@ -127,6 +127,25 @@
    5.11   /* called from main_cpu_reset */
    5.12   void cpu_reset(CPUX86State *env)
    5.13 @@ -41,8 +41,8 @@ Index: ioemu/target-i386-dm/helper2.c
    5.14           /* Wait up to 10 msec. */
    5.15  Index: ioemu/vl.c
    5.16  ===================================================================
    5.17 ---- ioemu.orig/vl.c	2006-08-08 11:27:52.994695048 +0100
    5.18 -+++ ioemu/vl.c	2006-08-08 11:27:53.066687017 +0100
    5.19 +--- ioemu.orig/vl.c	2006-08-17 19:49:39.442408257 +0100
    5.20 ++++ ioemu/vl.c	2006-08-17 19:49:40.119333436 +0100
    5.21  @@ -4948,7 +4948,7 @@
    5.22   } QEMUResetEntry;
    5.23   
    5.24 @@ -54,9 +54,9 @@ Index: ioemu/vl.c
    5.25   
    5.26  Index: ioemu/vl.h
    5.27  ===================================================================
    5.28 ---- ioemu.orig/vl.h	2006-08-08 11:27:48.757167803 +0100
    5.29 -+++ ioemu/vl.h	2006-08-08 11:27:53.067686905 +0100
    5.30 -@@ -130,6 +130,7 @@
    5.31 +--- ioemu.orig/vl.h	2006-08-17 19:47:32.680418959 +0100
    5.32 ++++ ioemu/vl.h	2006-08-17 19:49:40.120333326 +0100
    5.33 +@@ -131,6 +131,7 @@
    5.34   
    5.35   void qemu_register_reset(QEMUResetHandler *func, void *opaque);
    5.36   void qemu_system_reset_request(void);
    5.37 @@ -64,7 +64,7 @@ Index: ioemu/vl.h
    5.38   void qemu_system_shutdown_request(void);
    5.39   void qemu_system_powerdown_request(void);
    5.40   #if !defined(TARGET_SPARC)
    5.41 -@@ -139,6 +140,8 @@
    5.42 +@@ -140,6 +141,8 @@
    5.43   void qemu_system_powerdown(void);
    5.44   #endif
    5.45   
     6.1 --- a/tools/ioemu/patches/domain-timeoffset	Thu Aug 17 20:31:13 2006 +0100
     6.2 +++ b/tools/ioemu/patches/domain-timeoffset	Thu Aug 17 20:31:47 2006 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  Index: ioemu/hw/mc146818rtc.c
     6.5  ===================================================================
     6.6 ---- ioemu.orig/hw/mc146818rtc.c	2006-08-09 21:32:18.709516404 +0100
     6.7 -+++ ioemu/hw/mc146818rtc.c	2006-08-09 21:32:24.723838065 +0100
     6.8 +--- ioemu.orig/hw/mc146818rtc.c	2006-08-17 19:58:03.222720593 +0100
     6.9 ++++ ioemu/hw/mc146818rtc.c	2006-08-17 19:58:08.528134087 +0100
    6.10  @@ -178,10 +178,27 @@
    6.11       }
    6.12   }
    6.13 @@ -46,8 +46,8 @@ Index: ioemu/hw/mc146818rtc.c
    6.14   static void rtc_copy_date(RTCState *s)
    6.15  Index: ioemu/hw/pc.c
    6.16  ===================================================================
    6.17 ---- ioemu.orig/hw/pc.c	2006-08-09 21:32:24.449868968 +0100
    6.18 -+++ ioemu/hw/pc.c	2006-08-09 21:32:24.724837952 +0100
    6.19 +--- ioemu.orig/hw/pc.c	2006-08-17 19:58:08.252164595 +0100
    6.20 ++++ ioemu/hw/pc.c	2006-08-17 19:58:08.529133976 +0100
    6.21  @@ -159,7 +159,7 @@
    6.22   }
    6.23   
    6.24 @@ -117,8 +117,8 @@ Index: ioemu/hw/pc.c
    6.25   QEMUMachine pc_machine = {
    6.26  Index: ioemu/vl.c
    6.27  ===================================================================
    6.28 ---- ioemu.orig/vl.c	2006-08-09 21:32:24.591852952 +0100
    6.29 -+++ ioemu/vl.c	2006-08-09 21:32:24.727837614 +0100
    6.30 +--- ioemu.orig/vl.c	2006-08-17 19:58:08.395148788 +0100
    6.31 ++++ ioemu/vl.c	2006-08-17 19:58:08.532133645 +0100
    6.32  @@ -163,6 +163,8 @@
    6.33   
    6.34   int xc_handle;
    6.35 @@ -162,7 +162,7 @@ Index: ioemu/vl.c
    6.36               }
    6.37           }
    6.38       }
    6.39 -@@ -6489,7 +6497,8 @@
    6.40 +@@ -6507,7 +6515,8 @@
    6.41   
    6.42       machine->init(ram_size, vga_ram_size, boot_device,
    6.43                     ds, fd_filename, snapshot,
    6.44 @@ -174,9 +174,9 @@ Index: ioemu/vl.c
    6.45       if (usb_enabled) {
    6.46  Index: ioemu/vl.h
    6.47  ===================================================================
    6.48 ---- ioemu.orig/vl.h	2006-08-09 21:32:24.454868404 +0100
    6.49 -+++ ioemu/vl.h	2006-08-09 21:32:24.728837501 +0100
    6.50 -@@ -575,7 +575,7 @@
    6.51 +--- ioemu.orig/vl.h	2006-08-17 19:58:08.257164042 +0100
    6.52 ++++ ioemu/vl.h	2006-08-17 19:58:08.532133645 +0100
    6.53 +@@ -576,7 +576,7 @@
    6.54                                    int boot_device,
    6.55                DisplayState *ds, const char **fd_filename, int snapshot,
    6.56                const char *kernel_filename, const char *kernel_cmdline,
     7.1 --- a/tools/ioemu/patches/hypervisor-pit	Thu Aug 17 20:31:13 2006 +0100
     7.2 +++ b/tools/ioemu/patches/hypervisor-pit	Thu Aug 17 20:31:47 2006 +0100
     7.3 @@ -1,7 +1,7 @@
     7.4  Index: ioemu/Makefile.target
     7.5  ===================================================================
     7.6 ---- ioemu.orig/Makefile.target	2006-08-06 02:22:26.380544784 +0100
     7.7 -+++ ioemu/Makefile.target	2006-08-06 02:23:23.059226607 +0100
     7.8 +--- ioemu.orig/Makefile.target	2006-08-17 19:49:33.813030472 +0100
     7.9 ++++ ioemu/Makefile.target	2006-08-17 19:49:50.228216099 +0100
    7.10  @@ -354,7 +354,7 @@
    7.11   ifeq ($(TARGET_BASE_ARCH), i386)
    7.12   # Hardware support
    7.13 @@ -13,8 +13,8 @@ Index: ioemu/Makefile.target
    7.14   DEFINES += -DHAS_AUDIO
    7.15  Index: ioemu/hw/pc.c
    7.16  ===================================================================
    7.17 ---- ioemu.orig/hw/pc.c	2006-08-06 02:22:35.588518336 +0100
    7.18 -+++ ioemu/hw/pc.c	2006-08-06 02:23:07.875919141 +0100
    7.19 +--- ioemu.orig/hw/pc.c	2006-08-17 19:49:35.507843144 +0100
    7.20 ++++ ioemu/hw/pc.c	2006-08-17 19:49:50.229215988 +0100
    7.21  @@ -38,7 +38,9 @@
    7.22   
    7.23   static fdctrl_t *floppy_controller;
    7.24 @@ -38,8 +38,8 @@ Index: ioemu/hw/pc.c
    7.25           pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic);
    7.26  Index: ioemu/vl.c
    7.27  ===================================================================
    7.28 ---- ioemu.orig/vl.c	2006-08-06 02:23:05.216215627 +0100
    7.29 -+++ ioemu/vl.c	2006-08-06 02:23:07.878918807 +0100
    7.30 +--- ioemu.orig/vl.c	2006-08-17 19:49:48.566399780 +0100
    7.31 ++++ ioemu/vl.c	2006-08-17 19:49:50.231215767 +0100
    7.32  @@ -5570,6 +5570,7 @@
    7.33   
    7.34   #ifdef HAS_AUDIO
     8.1 --- a/tools/ioemu/patches/ide-hd-multithread	Thu Aug 17 20:31:13 2006 +0100
     8.2 +++ b/tools/ioemu/patches/ide-hd-multithread	Thu Aug 17 20:31:47 2006 +0100
     8.3 @@ -1,7 +1,7 @@
     8.4  Index: ioemu/hw/ide.c
     8.5  ===================================================================
     8.6 ---- ioemu.orig/hw/ide.c	2006-08-06 02:03:50.520919718 +0100
     8.7 -+++ ioemu/hw/ide.c	2006-08-06 02:23:41.153209614 +0100
     8.8 +--- ioemu.orig/hw/ide.c	2006-08-17 19:37:36.267534285 +0100
     8.9 ++++ ioemu/hw/ide.c	2006-08-17 19:49:57.830375828 +0100
    8.10  @@ -22,6 +22,7 @@
    8.11    * THE SOFTWARE.
    8.12    */
     9.1 --- a/tools/ioemu/patches/ioemu-ia64	Thu Aug 17 20:31:13 2006 +0100
     9.2 +++ b/tools/ioemu/patches/ioemu-ia64	Thu Aug 17 20:31:47 2006 +0100
     9.3 @@ -1,7 +1,7 @@
     9.4  Index: ioemu/hw/iommu.c
     9.5  ===================================================================
     9.6 ---- ioemu.orig/hw/iommu.c	2006-08-15 13:51:31.425498388 +0100
     9.7 -+++ ioemu/hw/iommu.c	2006-08-15 13:51:35.834011166 +0100
     9.8 +--- ioemu.orig/hw/iommu.c	2006-08-17 19:37:36.791476068 +0100
     9.9 ++++ ioemu/hw/iommu.c	2006-08-17 19:48:27.357375720 +0100
    9.10  @@ -82,7 +82,11 @@
    9.11   #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
    9.12   #define IOPTE_WAZ           0x00000001 /* Write as zeros */
    9.13 @@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
    9.14   
    9.15  Index: ioemu/cpu-all.h
    9.16  ===================================================================
    9.17 ---- ioemu.orig/cpu-all.h	2006-08-15 13:51:35.772018017 +0100
    9.18 -+++ ioemu/cpu-all.h	2006-08-15 13:51:35.835011055 +0100
    9.19 +--- ioemu.orig/cpu-all.h	2006-08-17 19:37:36.791476068 +0100
    9.20 ++++ ioemu/cpu-all.h	2006-08-17 19:48:27.358375609 +0100
    9.21  @@ -835,6 +835,31 @@
    9.22                   :"=m" (*(volatile long *)addr)
    9.23                   :"dIr" (nr));
    9.24 @@ -52,21 +52,21 @@ Index: ioemu/cpu-all.h
    9.25   /* memory API */
    9.26  Index: ioemu/vl.c
    9.27  ===================================================================
    9.28 ---- ioemu.orig/vl.c	2006-08-15 13:51:35.824012271 +0100
    9.29 -+++ ioemu/vl.c	2006-08-15 13:51:46.770802425 +0100
    9.30 -@@ -6140,6 +6140,11 @@
    9.31 -     /* init the memory */
    9.32 -     phys_ram_size = ram_size + vga_ram_size + bios_size;
    9.33 +--- ioemu.orig/vl.c	2006-08-17 19:47:08.538087284 +0100
    9.34 ++++ ioemu/vl.c	2006-08-17 19:57:50.666108706 +0100
    9.35 +@@ -6144,6 +6144,11 @@
    9.36 + 
    9.37 +     xc_handle = xc_interface_open();
    9.38   
    9.39  +#if defined (__ia64__)
    9.40  +    if (ram_size > MMIO_START)
    9.41 -+	ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */
    9.42 ++        ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */
    9.43  +#endif
    9.44  +
    9.45 - #ifdef CONFIG_DM
    9.46 +     nr_pages = ram_size/PAGE_SIZE;
    9.47 +     tmp_nr_pages = nr_pages;
    9.48   
    9.49 -     nr_pages = ram_size/PAGE_SIZE;
    9.50 -@@ -6151,6 +6156,7 @@
    9.51 +@@ -6161,6 +6166,7 @@
    9.52           exit(-1);
    9.53       }
    9.54   
    9.55 @@ -74,7 +74,7 @@ Index: ioemu/vl.c
    9.56       if (xc_get_pfn_list(xc_handle, domid, page_array, nr_pages) != nr_pages) {
    9.57           fprintf(logfile, "xc_get_pfn_list returned error %d\n", errno);
    9.58           exit(-1);
    9.59 -@@ -6173,6 +6179,41 @@
    9.60 +@@ -6191,6 +6197,41 @@
    9.61   
    9.62       free(page_array);
    9.63   
    9.64 @@ -100,9 +100,9 @@ Index: ioemu/vl.c
    9.65  +    }
    9.66  +
    9.67  +    if (ram_size > MMIO_START) {	
    9.68 -+	for (i = 0 ; i < MEM_G >> PAGE_SHIFT; i++)
    9.69 -+	    page_array[MMIO_START >> PAGE_SHIFT + i] =
    9.70 -+		page_array[IO_PAGE_START >> PAGE_SHIFT + 1];
    9.71 ++        for (i = 0 ; i < MEM_G >> PAGE_SHIFT; i++)
    9.72 ++            page_array[MMIO_START >> PAGE_SHIFT + i] =
    9.73 ++                page_array[IO_PAGE_START >> PAGE_SHIFT + 1];
    9.74  +    }
    9.75  +
    9.76  +    phys_ram_base = xc_map_foreign_batch(xc_handle, domid,
    9.77 @@ -118,8 +118,8 @@ Index: ioemu/vl.c
    9.78       phys_ram_base = qemu_vmalloc(phys_ram_size);
    9.79  Index: ioemu/target-i386-dm/exec-dm.c
    9.80  ===================================================================
    9.81 ---- ioemu.orig/target-i386-dm/exec-dm.c	2006-08-15 13:51:35.705025421 +0100
    9.82 -+++ ioemu/target-i386-dm/exec-dm.c	2006-08-15 13:51:51.987225890 +0100
    9.83 +--- ioemu.orig/target-i386-dm/exec-dm.c	2006-08-17 19:37:36.792475957 +0100
    9.84 ++++ ioemu/target-i386-dm/exec-dm.c	2006-08-17 19:48:27.361375278 +0100
    9.85  @@ -341,6 +341,23 @@
    9.86       return io_mem_read[io_index >> IO_MEM_SHIFT];
    9.87   }
    9.88 @@ -156,8 +156,8 @@ Index: ioemu/target-i386-dm/exec-dm.c
    9.89               if (io_index) {
    9.90  Index: ioemu/exec-all.h
    9.91  ===================================================================
    9.92 ---- ioemu.orig/exec-all.h	2006-08-15 13:51:35.682027963 +0100
    9.93 -+++ ioemu/exec-all.h	2006-08-15 13:51:35.839010613 +0100
    9.94 +--- ioemu.orig/exec-all.h	2006-08-17 19:37:36.791476068 +0100
    9.95 ++++ ioemu/exec-all.h	2006-08-17 19:48:27.362375167 +0100
    9.96  @@ -462,12 +462,13 @@
    9.97   }
    9.98   #endif
    9.99 @@ -177,8 +177,8 @@ Index: ioemu/exec-all.h
   9.100   
   9.101  Index: ioemu/target-i386-dm/cpu.h
   9.102  ===================================================================
   9.103 ---- ioemu.orig/target-i386-dm/cpu.h	2006-08-15 13:51:35.704025531 +0100
   9.104 -+++ ioemu/target-i386-dm/cpu.h	2006-08-15 13:51:35.839010613 +0100
   9.105 +--- ioemu.orig/target-i386-dm/cpu.h	2006-08-17 19:37:36.792475957 +0100
   9.106 ++++ ioemu/target-i386-dm/cpu.h	2006-08-17 19:48:27.362375167 +0100
   9.107  @@ -80,7 +80,11 @@
   9.108   /* helper2.c */
   9.109   int main_loop(void);
   9.110 @@ -194,7 +194,7 @@ Index: ioemu/target-i386-dm/cpu.h
   9.111  Index: ioemu/ia64_intrinsic.h
   9.112  ===================================================================
   9.113  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   9.114 -+++ ioemu/ia64_intrinsic.h	2006-08-15 13:51:35.840010502 +0100
   9.115 ++++ ioemu/ia64_intrinsic.h	2006-08-17 19:48:27.363375057 +0100
   9.116  @@ -0,0 +1,276 @@
   9.117  +#ifndef IA64_INTRINSIC_H
   9.118  +#define IA64_INTRINSIC_H
    10.1 --- a/tools/ioemu/patches/qemu-allow-disable-sdl	Thu Aug 17 20:31:13 2006 +0100
    10.2 +++ b/tools/ioemu/patches/qemu-allow-disable-sdl	Thu Aug 17 20:31:47 2006 +0100
    10.3 @@ -1,7 +1,7 @@
    10.4  Index: ioemu/configure
    10.5  ===================================================================
    10.6 ---- ioemu.orig/configure	2006-08-06 02:15:01.771108621 +0100
    10.7 -+++ ioemu/configure	2006-08-06 02:42:26.213918476 +0100
    10.8 +--- ioemu.orig/configure	2006-08-17 19:37:35.772589281 +0100
    10.9 ++++ ioemu/configure	2006-08-17 19:50:24.735401975 +0100
   10.10  @@ -228,8 +228,6 @@
   10.11     ;;
   10.12     --enable-cocoa) cocoa="yes" ; coreaudio="yes" ; sdl="no"
    11.1 --- a/tools/ioemu/patches/qemu-fix-memset-args	Thu Aug 17 20:31:13 2006 +0100
    11.2 +++ b/tools/ioemu/patches/qemu-fix-memset-args	Thu Aug 17 20:31:47 2006 +0100
    11.3 @@ -1,7 +1,7 @@
    11.4  Index: ioemu/audio/audio.c
    11.5  ===================================================================
    11.6 ---- ioemu.orig/audio/audio.c	2006-08-06 02:03:50.013976165 +0100
    11.7 -+++ ioemu/audio/audio.c	2006-08-06 02:42:28.991609008 +0100
    11.8 +--- ioemu.orig/audio/audio.c	2006-08-17 19:37:35.755591169 +0100
    11.9 ++++ ioemu/audio/audio.c	2006-08-17 19:50:26.867166346 +0100
   11.10  @@ -605,11 +605,11 @@
   11.11       }
   11.12   
    12.1 --- a/tools/ioemu/patches/qemu-fix-write-to-disk-synchronous	Thu Aug 17 20:31:13 2006 +0100
    12.2 +++ b/tools/ioemu/patches/qemu-fix-write-to-disk-synchronous	Thu Aug 17 20:31:47 2006 +0100
    12.3 @@ -1,7 +1,7 @@
    12.4  Index: ioemu/block-vmdk.c
    12.5  ===================================================================
    12.6 ---- ioemu.orig/block-vmdk.c	2006-08-06 02:03:45.756450226 +0100
    12.7 -+++ ioemu/block-vmdk.c	2006-08-06 02:42:31.884286728 +0100
    12.8 +--- ioemu.orig/block-vmdk.c	2006-08-17 19:37:35.737593169 +0100
    12.9 ++++ ioemu/block-vmdk.c	2006-08-17 19:50:28.884943317 +0100
   12.10  @@ -96,7 +96,7 @@
   12.11       uint32_t magic;
   12.12       int l1_size;
   12.13 @@ -13,8 +13,8 @@ Index: ioemu/block-vmdk.c
   12.14           if (fd < 0)
   12.15  Index: ioemu/block-qcow.c
   12.16  ===================================================================
   12.17 ---- ioemu.orig/block-qcow.c	2006-08-06 02:03:45.754450449 +0100
   12.18 -+++ ioemu/block-qcow.c	2006-08-06 02:42:31.885286616 +0100
   12.19 +--- ioemu.orig/block-qcow.c	2006-08-17 19:37:35.737593169 +0100
   12.20 ++++ ioemu/block-qcow.c	2006-08-17 19:50:28.885943206 +0100
   12.21  @@ -95,7 +95,7 @@
   12.22       int fd, len, i, shift;
   12.23       QCowHeader header;
   12.24 @@ -26,8 +26,8 @@ Index: ioemu/block-qcow.c
   12.25           if (fd < 0)
   12.26  Index: ioemu/block-bochs.c
   12.27  ===================================================================
   12.28 ---- ioemu.orig/block-bochs.c	2006-08-06 01:55:02.225741179 +0100
   12.29 -+++ ioemu/block-bochs.c	2006-08-06 02:42:31.885286616 +0100
   12.30 +--- ioemu.orig/block-bochs.c	2006-08-17 19:37:35.737593169 +0100
   12.31 ++++ ioemu/block-bochs.c	2006-08-17 19:50:28.885943206 +0100
   12.32  @@ -91,7 +91,7 @@
   12.33       int fd, i;
   12.34       struct bochs_header bochs;
   12.35 @@ -39,8 +39,8 @@ Index: ioemu/block-bochs.c
   12.36           if (fd < 0)
   12.37  Index: ioemu/block.c
   12.38  ===================================================================
   12.39 ---- ioemu.orig/block.c	2006-08-06 02:42:18.880735483 +0100
   12.40 -+++ ioemu/block.c	2006-08-06 02:42:31.886286505 +0100
   12.41 +--- ioemu.orig/block.c	2006-08-17 19:50:18.872050063 +0100
   12.42 ++++ ioemu/block.c	2006-08-17 19:50:28.885943206 +0100
   12.43  @@ -685,7 +685,7 @@
   12.44       int rv;
   12.45   #endif
   12.46 @@ -52,8 +52,8 @@ Index: ioemu/block.c
   12.47           if (fd < 0)
   12.48  Index: ioemu/block-cow.c
   12.49  ===================================================================
   12.50 ---- ioemu.orig/block-cow.c	2006-08-06 02:03:45.751450783 +0100
   12.51 -+++ ioemu/block-cow.c	2006-08-06 02:42:31.886286505 +0100
   12.52 +--- ioemu.orig/block-cow.c	2006-08-17 19:37:35.738593058 +0100
   12.53 ++++ ioemu/block-cow.c	2006-08-17 19:50:28.886943095 +0100
   12.54  @@ -69,7 +69,7 @@
   12.55       struct cow_header_v2 cow_header;
   12.56       int64_t size;
   12.57 @@ -65,8 +65,8 @@ Index: ioemu/block-cow.c
   12.58           if (fd < 0)
   12.59  Index: ioemu/block-cloop.c
   12.60  ===================================================================
   12.61 ---- ioemu.orig/block-cloop.c	2006-08-06 01:55:02.226741067 +0100
   12.62 -+++ ioemu/block-cloop.c	2006-08-06 02:42:31.886286505 +0100
   12.63 +--- ioemu.orig/block-cloop.c	2006-08-17 19:37:35.737593169 +0100
   12.64 ++++ ioemu/block-cloop.c	2006-08-17 19:50:28.886943095 +0100
   12.65  @@ -55,7 +55,7 @@
   12.66       BDRVCloopState *s = bs->opaque;
   12.67       uint32_t offsets_size,max_compressed_block_size=1,i;
    13.1 --- a/tools/ioemu/patches/serial-non-block	Thu Aug 17 20:31:13 2006 +0100
    13.2 +++ b/tools/ioemu/patches/serial-non-block	Thu Aug 17 20:31:47 2006 +0100
    13.3 @@ -1,7 +1,7 @@
    13.4  Index: ioemu/vl.c
    13.5  ===================================================================
    13.6 ---- ioemu.orig/vl.c	2006-08-06 02:23:29.827472129 +0100
    13.7 -+++ ioemu/vl.c	2006-08-06 02:23:36.856688561 +0100
    13.8 +--- ioemu.orig/vl.c	2006-08-17 19:49:52.162002356 +0100
    13.9 ++++ ioemu/vl.c	2006-08-17 19:49:56.273547905 +0100
   13.10  @@ -1175,19 +1175,34 @@
   13.11   
   13.12   static int unix_write(int fd, const uint8_t *buf, int len1)
    14.1 --- a/tools/ioemu/patches/shadow-vram	Thu Aug 17 20:31:13 2006 +0100
    14.2 +++ b/tools/ioemu/patches/shadow-vram	Thu Aug 17 20:31:47 2006 +0100
    14.3 @@ -1,7 +1,7 @@
    14.4  Index: ioemu/hw/vga.c
    14.5  ===================================================================
    14.6 ---- ioemu.orig/hw/vga.c	2006-08-06 02:23:29.824472464 +0100
    14.7 -+++ ioemu/hw/vga.c	2006-08-06 02:23:33.873021159 +0100
    14.8 +--- ioemu.orig/hw/vga.c	2006-08-17 19:49:52.159002688 +0100
    14.9 ++++ ioemu/hw/vga.c	2006-08-17 19:49:54.575735565 +0100
   14.10  @@ -1359,6 +1359,105 @@
   14.11       }
   14.12   }
   14.13 @@ -137,8 +137,8 @@ Index: ioemu/hw/vga.c
   14.14       s->vram_size = vga_ram_size;
   14.15  Index: ioemu/hw/vga_int.h
   14.16  ===================================================================
   14.17 ---- ioemu.orig/hw/vga_int.h	2006-08-06 02:23:29.824472464 +0100
   14.18 -+++ ioemu/hw/vga_int.h	2006-08-06 02:23:33.874021048 +0100
   14.19 +--- ioemu.orig/hw/vga_int.h	2006-08-17 19:49:52.159002688 +0100
   14.20 ++++ ioemu/hw/vga_int.h	2006-08-17 19:49:54.575735565 +0100
   14.21  @@ -79,6 +79,7 @@
   14.22   
   14.23   #define VGA_STATE_COMMON                                                \
    15.1 --- a/tools/ioemu/patches/shared-vram	Thu Aug 17 20:31:13 2006 +0100
    15.2 +++ b/tools/ioemu/patches/shared-vram	Thu Aug 17 20:31:47 2006 +0100
    15.3 @@ -1,7 +1,7 @@
    15.4  Index: ioemu/hw/cirrus_vga.c
    15.5  ===================================================================
    15.6 ---- ioemu.orig/hw/cirrus_vga.c	2006-08-06 01:55:02.822674718 +0100
    15.7 -+++ ioemu/hw/cirrus_vga.c	2006-08-06 02:23:29.822472686 +0100
    15.8 +--- ioemu.orig/hw/cirrus_vga.c	2006-08-17 19:37:36.372522620 +0100
    15.9 ++++ ioemu/hw/cirrus_vga.c	2006-08-17 19:49:52.157002909 +0100
   15.10  @@ -28,6 +28,9 @@
   15.11    */
   15.12   #include "vl.h"
   15.13 @@ -176,8 +176,8 @@ Index: ioemu/hw/cirrus_vga.c
   15.14   }
   15.15  Index: ioemu/hw/pc.c
   15.16  ===================================================================
   15.17 ---- ioemu.orig/hw/pc.c	2006-08-06 02:23:07.875919141 +0100
   15.18 -+++ ioemu/hw/pc.c	2006-08-06 02:23:29.823472575 +0100
   15.19 +--- ioemu.orig/hw/pc.c	2006-08-17 19:49:50.229215988 +0100
   15.20 ++++ ioemu/hw/pc.c	2006-08-17 19:49:52.158002799 +0100
   15.21  @@ -790,14 +790,14 @@
   15.22       if (cirrus_vga_enabled) {
   15.23           if (pci_enabled) {
   15.24 @@ -198,8 +198,8 @@ Index: ioemu/hw/pc.c
   15.25   
   15.26  Index: ioemu/hw/vga.c
   15.27  ===================================================================
   15.28 ---- ioemu.orig/hw/vga.c	2006-08-06 02:22:46.606290142 +0100
   15.29 -+++ ioemu/hw/vga.c	2006-08-06 02:23:29.824472464 +0100
   15.30 +--- ioemu.orig/hw/vga.c	2006-08-17 19:49:37.764593706 +0100
   15.31 ++++ ioemu/hw/vga.c	2006-08-17 19:49:52.159002688 +0100
   15.32  @@ -1858,6 +1858,7 @@
   15.33       /* TODO: add vbe support if enabled */
   15.34   }
   15.35 @@ -251,8 +251,8 @@ Index: ioemu/hw/vga.c
   15.36   
   15.37  Index: ioemu/hw/vga_int.h
   15.38  ===================================================================
   15.39 ---- ioemu.orig/hw/vga_int.h	2006-08-06 02:14:09.797902638 +0100
   15.40 -+++ ioemu/hw/vga_int.h	2006-08-06 02:23:29.824472464 +0100
   15.41 +--- ioemu.orig/hw/vga_int.h	2006-08-17 19:37:36.372522620 +0100
   15.42 ++++ ioemu/hw/vga_int.h	2006-08-17 19:49:52.159002688 +0100
   15.43  @@ -169,5 +169,6 @@
   15.44                                unsigned int color0, unsigned int color1,
   15.45                                unsigned int color_xor);
   15.46 @@ -262,8 +262,8 @@ Index: ioemu/hw/vga_int.h
   15.47   extern const uint8_t gr_mask[16];
   15.48  Index: ioemu/vl.c
   15.49  ===================================================================
   15.50 ---- ioemu.orig/vl.c	2006-08-06 02:23:07.878918807 +0100
   15.51 -+++ ioemu/vl.c	2006-08-06 02:23:29.827472129 +0100
   15.52 +--- ioemu.orig/vl.c	2006-08-17 19:49:50.231215767 +0100
   15.53 ++++ ioemu/vl.c	2006-08-17 19:49:52.162002356 +0100
   15.54  @@ -5693,6 +5693,78 @@
   15.55   
   15.56   #define MAX_NET_CLIENTS 32
   15.57 @@ -345,9 +345,9 @@ Index: ioemu/vl.c
   15.58   #ifdef CONFIG_GDBSTUB
   15.59  Index: ioemu/vl.h
   15.60  ===================================================================
   15.61 ---- ioemu.orig/vl.h	2006-08-06 02:23:02.271543880 +0100
   15.62 -+++ ioemu/vl.h	2006-08-06 02:23:29.828472018 +0100
   15.63 -@@ -144,6 +144,13 @@
   15.64 +--- ioemu.orig/vl.h	2006-08-17 19:49:44.492850031 +0100
   15.65 ++++ ioemu/vl.h	2006-08-17 19:49:52.163002246 +0100
   15.66 +@@ -145,6 +145,13 @@
   15.67   
   15.68   void main_loop_wait(int timeout);
   15.69   
    16.1 --- a/tools/ioemu/patches/support-xm-console	Thu Aug 17 20:31:13 2006 +0100
    16.2 +++ b/tools/ioemu/patches/support-xm-console	Thu Aug 17 20:31:47 2006 +0100
    16.3 @@ -1,7 +1,7 @@
    16.4  Index: ioemu/vl.c
    16.5  ===================================================================
    16.6 ---- ioemu.orig/vl.c	2006-08-06 02:22:59.254880158 +0100
    16.7 -+++ ioemu/vl.c	2006-08-06 02:23:05.216215627 +0100
    16.8 +--- ioemu.orig/vl.c	2006-08-17 19:49:40.119333436 +0100
    16.9 ++++ ioemu/vl.c	2006-08-17 19:49:48.566399780 +0100
   16.10  @@ -1536,26 +1536,65 @@
   16.11       return chr;
   16.12   }
    17.1 --- a/tools/ioemu/patches/vnc-access-monitor-vt	Thu Aug 17 20:31:13 2006 +0100
    17.2 +++ b/tools/ioemu/patches/vnc-access-monitor-vt	Thu Aug 17 20:31:47 2006 +0100
    17.3 @@ -1,7 +1,7 @@
    17.4  Index: ioemu/vnc.c
    17.5  ===================================================================
    17.6 ---- ioemu.orig/vnc.c	2006-08-07 17:44:33.084748631 +0100
    17.7 -+++ ioemu/vnc.c	2006-08-07 17:44:33.224733389 +0100
    17.8 +--- ioemu.orig/vnc.c	2006-08-17 19:50:14.623519661 +0100
    17.9 ++++ ioemu/vnc.c	2006-08-17 19:50:15.956372339 +0100
   17.10  @@ -32,6 +32,10 @@
   17.11   #include "vnc_keysym.h"
   17.12   #include "keymaps.c"
    18.1 --- a/tools/ioemu/patches/vnc-cleanup	Thu Aug 17 20:31:13 2006 +0100
    18.2 +++ b/tools/ioemu/patches/vnc-cleanup	Thu Aug 17 20:31:47 2006 +0100
    18.3 @@ -1,7 +1,7 @@
    18.4  Index: ioemu/vnc.c
    18.5  ===================================================================
    18.6 ---- ioemu.orig/vnc.c	2006-08-07 17:42:21.888055419 +0100
    18.7 -+++ ioemu/vnc.c	2006-08-07 17:42:28.001363557 +0100
    18.8 +--- ioemu.orig/vnc.c	2006-08-17 19:37:36.091553839 +0100
    18.9 ++++ ioemu/vnc.c	2006-08-17 19:50:10.313996001 +0100
   18.10  @@ -143,13 +143,16 @@
   18.11   static void vnc_dpy_update(DisplayState *ds, int x, int y, int w, int h)
   18.12   {
   18.13 @@ -65,8 +65,8 @@ Index: ioemu/vnc.c
   18.14   static void vnc_timer_init(VncState *vs)
   18.15  Index: ioemu/vl.c
   18.16  ===================================================================
   18.17 ---- ioemu.orig/vl.c	2006-08-07 17:42:27.807385506 +0100
   18.18 -+++ ioemu/vl.c	2006-08-07 17:42:28.004363230 +0100
   18.19 +--- ioemu.orig/vl.c	2006-08-17 19:50:02.410869542 +0100
   18.20 ++++ ioemu/vl.c	2006-08-17 19:50:10.316995669 +0100
   18.21  @@ -5120,10 +5120,10 @@
   18.22           /* XXX: better handling of removal */
   18.23           for(ioh = first_io_handler; ioh != NULL; ioh = ioh_next) {
    19.1 --- a/tools/ioemu/patches/vnc-display-find-unused	Thu Aug 17 20:31:13 2006 +0100
    19.2 +++ b/tools/ioemu/patches/vnc-display-find-unused	Thu Aug 17 20:31:47 2006 +0100
    19.3 @@ -1,7 +1,7 @@
    19.4  Index: ioemu/vnc.c
    19.5  ===================================================================
    19.6 ---- ioemu.orig/vnc.c	2006-08-09 14:44:44.721942535 +0100
    19.7 -+++ ioemu/vnc.c	2006-08-09 14:52:37.262165292 +0100
    19.8 +--- ioemu.orig/vnc.c	2006-08-17 19:50:15.956372339 +0100
    19.9 ++++ ioemu/vnc.c	2006-08-17 19:50:17.083247783 +0100
   19.10  @@ -1183,7 +1183,7 @@
   19.11       }
   19.12   }
   19.13 @@ -50,8 +50,8 @@ Index: ioemu/vnc.c
   19.14   int vnc_start_viewer(int port)
   19.15  Index: ioemu/vl.c
   19.16  ===================================================================
   19.17 ---- ioemu.orig/vl.c	2006-08-09 14:44:44.721942535 +0100
   19.18 -+++ ioemu/vl.c	2006-08-09 14:52:06.783905832 +0100
   19.19 +--- ioemu.orig/vl.c	2006-08-17 19:50:13.152682236 +0100
   19.20 ++++ ioemu/vl.c	2006-08-17 19:50:17.086247452 +0100
   19.21  @@ -121,6 +121,7 @@
   19.22   static DisplayState display_state;
   19.23   int nographic;
   19.24 @@ -104,7 +104,7 @@ Index: ioemu/vl.c
   19.25               }
   19.26           }
   19.27       }
   19.28 -@@ -6465,7 +6475,7 @@
   19.29 +@@ -6483,7 +6493,7 @@
   19.30       if (nographic) {
   19.31           dumb_display_init(ds);
   19.32       } else if (vnc_display != -1) {
   19.33 @@ -115,9 +115,9 @@ Index: ioemu/vl.c
   19.34       } else {
   19.35  Index: ioemu/vl.h
   19.36  ===================================================================
   19.37 ---- ioemu.orig/vl.h	2006-08-09 14:44:44.721942535 +0100
   19.38 -+++ ioemu/vl.h	2006-08-09 14:52:06.783905832 +0100
   19.39 -@@ -784,7 +784,7 @@
   19.40 +--- ioemu.orig/vl.h	2006-08-17 19:50:13.153682125 +0100
   19.41 ++++ ioemu/vl.h	2006-08-17 19:50:17.087247341 +0100
   19.42 +@@ -785,7 +785,7 @@
   19.43   void cocoa_display_init(DisplayState *ds, int full_screen);
   19.44   
   19.45   /* vnc.c */
    20.1 --- a/tools/ioemu/patches/vnc-fixes	Thu Aug 17 20:31:13 2006 +0100
    20.2 +++ b/tools/ioemu/patches/vnc-fixes	Thu Aug 17 20:31:47 2006 +0100
    20.3 @@ -1,8 +1,8 @@
    20.4  Index: ioemu/vl.c
    20.5  ===================================================================
    20.6 ---- ioemu.orig/vl.c	2006-08-07 17:42:28.004363230 +0100
    20.7 -+++ ioemu/vl.c	2006-08-07 17:43:16.361100898 +0100
    20.8 -@@ -6516,8 +6516,10 @@
    20.9 +--- ioemu.orig/vl.c	2006-08-17 19:50:10.316995669 +0100
   20.10 ++++ ioemu/vl.c	2006-08-17 19:50:12.100798502 +0100
   20.11 +@@ -6534,8 +6534,10 @@
   20.12           }
   20.13       }
   20.14   
   20.15 @@ -17,8 +17,8 @@ Index: ioemu/vl.c
   20.16       if (use_gdbstub) {
   20.17  Index: ioemu/vnc.c
   20.18  ===================================================================
   20.19 ---- ioemu.orig/vnc.c	2006-08-07 17:42:28.001363557 +0100
   20.20 -+++ ioemu/vnc.c	2006-08-07 17:43:33.593225293 +0100
   20.21 +--- ioemu.orig/vnc.c	2006-08-17 19:50:10.313996001 +0100
   20.22 ++++ ioemu/vnc.c	2006-08-17 19:50:12.101798392 +0100
   20.23  @@ -3,6 +3,7 @@
   20.24    * 
   20.25    * Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws>
   20.26 @@ -524,9 +524,9 @@ Index: ioemu/vnc.c
   20.27   }
   20.28  Index: ioemu/vl.h
   20.29  ===================================================================
   20.30 ---- ioemu.orig/vl.h	2006-08-07 17:42:27.807385506 +0100
   20.31 -+++ ioemu/vl.h	2006-08-07 17:43:16.361100898 +0100
   20.32 -@@ -318,6 +318,7 @@
   20.33 +--- ioemu.orig/vl.h	2006-08-17 19:50:02.411869432 +0100
   20.34 ++++ ioemu/vl.h	2006-08-17 19:50:12.102798281 +0100
   20.35 +@@ -319,6 +319,7 @@
   20.36   int is_graphic_console(void);
   20.37   CharDriverState *text_console_init(DisplayState *ds);
   20.38   void console_select(unsigned int index);
    21.1 --- a/tools/ioemu/patches/vnc-start-vncviewer	Thu Aug 17 20:31:13 2006 +0100
    21.2 +++ b/tools/ioemu/patches/vnc-start-vncviewer	Thu Aug 17 20:31:47 2006 +0100
    21.3 @@ -1,7 +1,7 @@
    21.4  Index: ioemu/vnc.c
    21.5  ===================================================================
    21.6 ---- ioemu.orig/vnc.c	2006-08-07 17:44:32.852773890 +0100
    21.7 -+++ ioemu/vnc.c	2006-08-07 17:44:32.915767031 +0100
    21.8 +--- ioemu.orig/vnc.c	2006-08-17 19:50:12.101798392 +0100
    21.9 ++++ ioemu/vnc.c	2006-08-17 19:50:13.149682567 +0100
   21.10  @@ -1175,3 +1175,25 @@
   21.11   
   21.12       vnc_dpy_resize(vs->ds, 640, 400);
   21.13 @@ -30,8 +30,8 @@ Index: ioemu/vnc.c
   21.14  +}
   21.15  Index: ioemu/vl.c
   21.16  ===================================================================
   21.17 ---- ioemu.orig/vl.c	2006-08-07 17:44:32.851773999 +0100
   21.18 -+++ ioemu/vl.c	2006-08-07 17:44:32.918766704 +0100
   21.19 +--- ioemu.orig/vl.c	2006-08-17 19:50:12.100798502 +0100
   21.20 ++++ ioemu/vl.c	2006-08-17 19:50:13.152682236 +0100
   21.21  @@ -120,6 +120,7 @@
   21.22   int bios_size;
   21.23   static DisplayState display_state;
   21.24 @@ -82,7 +82,7 @@ Index: ioemu/vl.c
   21.25               }
   21.26           }
   21.27       }
   21.28 -@@ -6458,6 +6466,8 @@
   21.29 +@@ -6476,6 +6484,8 @@
   21.30           dumb_display_init(ds);
   21.31       } else if (vnc_display != -1) {
   21.32   	vnc_display_init(ds, vnc_display);
   21.33 @@ -93,9 +93,9 @@ Index: ioemu/vl.c
   21.34           sdl_display_init(ds, full_screen);
   21.35  Index: ioemu/vl.h
   21.36  ===================================================================
   21.37 ---- ioemu.orig/vl.h	2006-08-07 17:44:32.853773781 +0100
   21.38 -+++ ioemu/vl.h	2006-08-07 17:44:32.919766595 +0100
   21.39 -@@ -785,6 +785,7 @@
   21.40 +--- ioemu.orig/vl.h	2006-08-17 19:50:12.102798281 +0100
   21.41 ++++ ioemu/vl.h	2006-08-17 19:50:13.153682125 +0100
   21.42 +@@ -786,6 +786,7 @@
   21.43   
   21.44   /* vnc.c */
   21.45   void vnc_display_init(DisplayState *ds, int display);
    22.1 --- a/tools/ioemu/patches/vnc-title-domain-name	Thu Aug 17 20:31:13 2006 +0100
    22.2 +++ b/tools/ioemu/patches/vnc-title-domain-name	Thu Aug 17 20:31:47 2006 +0100
    22.3 @@ -1,7 +1,7 @@
    22.4  Index: ioemu/vnc.c
    22.5  ===================================================================
    22.6 ---- ioemu.orig/vnc.c	2006-08-07 17:44:32.915767031 +0100
    22.7 -+++ ioemu/vnc.c	2006-08-07 17:44:33.084748631 +0100
    22.8 +--- ioemu.orig/vnc.c	2006-08-17 19:50:13.149682567 +0100
    22.9 ++++ ioemu/vnc.c	2006-08-17 19:50:14.623519661 +0100
   22.10  @@ -1014,6 +1014,7 @@
   22.11   
   22.12   static int protocol_client_init(VncState *vs, char *data, size_t len)
    23.1 --- a/tools/ioemu/patches/xen-mm	Thu Aug 17 20:31:13 2006 +0100
    23.2 +++ b/tools/ioemu/patches/xen-mm	Thu Aug 17 20:31:47 2006 +0100
    23.3 @@ -1,7 +1,7 @@
    23.4  Index: ioemu/hw/pc.c
    23.5  ===================================================================
    23.6 ---- ioemu.orig/hw/pc.c	2006-08-06 02:15:39.708879311 +0100
    23.7 -+++ ioemu/hw/pc.c	2006-08-06 02:18:18.875135656 +0100
    23.8 +--- ioemu.orig/hw/pc.c	2006-08-17 19:36:00.588166019 +0100
    23.9 ++++ ioemu/hw/pc.c	2006-08-17 19:37:36.704485734 +0100
   23.10  @@ -646,7 +646,9 @@
   23.11       }
   23.12   
   23.13 @@ -25,8 +25,8 @@ Index: ioemu/hw/pc.c
   23.14       isa_bios_size = bios_size;
   23.15  Index: ioemu/vl.c
   23.16  ===================================================================
   23.17 ---- ioemu.orig/vl.c	2006-08-06 02:18:12.550840673 +0100
   23.18 -+++ ioemu/vl.c	2006-08-06 02:18:45.608155528 +0100
   23.19 +--- ioemu.orig/vl.c	2006-08-17 19:36:00.667157242 +0100
   23.20 ++++ ioemu/vl.c	2006-08-17 19:47:08.538087284 +0100
   23.21  @@ -158,6 +158,8 @@
   23.22   int acpi_enabled = 1;
   23.23   int fd_bootchk = 1;
   23.24 @@ -40,7 +40,7 @@ Index: ioemu/vl.c
   23.25       QEMUMachine *machine;
   23.26       char usb_devices[MAX_USB_CMDLINE][128];
   23.27       int usb_devices_index;
   23.28 -+    unsigned long nr_pages;
   23.29 ++    unsigned long nr_pages, tmp_nr_pages, shared_page_nr;
   23.30  +    xen_pfn_t *page_array;
   23.31  +    extern void *shared_page;
   23.32   
   23.33 @@ -60,16 +60,26 @@ Index: ioemu/vl.c
   23.34                   break;
   23.35               case QEMU_OPTION_l:
   23.36                   {
   23.37 -@@ -6133,12 +6140,49 @@
   23.38 +@@ -6133,12 +6140,67 @@
   23.39       /* init the memory */
   23.40       phys_ram_size = ram_size + vga_ram_size + bios_size;
   23.41   
   23.42  +#ifdef CONFIG_DM
   23.43  +
   23.44 -+    nr_pages = ram_size/PAGE_SIZE;
   23.45  +    xc_handle = xc_interface_open();
   23.46  +
   23.47 -+    page_array = (xen_pfn_t *)malloc(nr_pages * sizeof(xen_pfn_t));
   23.48 ++    nr_pages = ram_size/PAGE_SIZE;
   23.49 ++    tmp_nr_pages = nr_pages;
   23.50 ++
   23.51 ++#if defined(__i386__) || defined(__x86_64__)
   23.52 ++    if (ram_size > HVM_BELOW_4G_RAM_END) {
   23.53 ++        tmp_nr_pages += HVM_BELOW_4G_MMIO_LENGTH >> PAGE_SHIFT;
   23.54 ++        shared_page_nr = (HVM_BELOW_4G_RAM_END >> PAGE_SHIFT) - 1;
   23.55 ++    } else
   23.56 ++        shared_page_nr = nr_pages - 1;
   23.57 ++#endif
   23.58 ++
   23.59 ++    page_array = (xen_pfn_t *)malloc(tmp_nr_pages * sizeof(xen_pfn_t));
   23.60  +    if (page_array == NULL) {
   23.61  +        fprintf(logfile, "malloc returned error %d\n", errno);
   23.62  +        exit(-1);
   23.63 @@ -80,20 +90,28 @@ Index: ioemu/vl.c
   23.64  +        exit(-1);
   23.65  +    }
   23.66  +
   23.67 ++    if (ram_size > HVM_BELOW_4G_RAM_END)
   23.68 ++        for (i = 0; i < nr_pages - (HVM_BELOW_4G_RAM_END >> PAGE_SHIFT); i++)
   23.69 ++            page_array[tmp_nr_pages - 1 - i] = page_array[nr_pages - 1 - i];
   23.70 ++
   23.71  +    phys_ram_base = xc_map_foreign_batch(xc_handle, domid,
   23.72  +                                         PROT_READ|PROT_WRITE, page_array,
   23.73 -+                                         nr_pages - 1);
   23.74 -+    if (phys_ram_base == 0) {
   23.75 -+        fprintf(logfile, "xc_map_foreign_batch returned error %d\n", errno);
   23.76 ++                                         tmp_nr_pages);
   23.77 ++    if (phys_ram_base == NULL) {
   23.78 ++        fprintf(logfile, "batch map guest memory returned error %d\n", errno);
   23.79  +        exit(-1);
   23.80  +    }
   23.81  +
   23.82  +    shared_page = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
   23.83  +                                       PROT_READ|PROT_WRITE,
   23.84 -+                                       page_array[nr_pages - 1]);
   23.85 ++                                       page_array[shared_page_nr]);
   23.86 ++    if (shared_page == NULL) {
   23.87 ++        fprintf(logfile, "map shared IO page returned error %d\n", errno);
   23.88 ++        exit(-1);
   23.89 ++    }
   23.90  +
   23.91 -+    fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n", nr_pages - 1,
   23.92 -+            (uint64_t)(page_array[nr_pages - 1]));
   23.93 ++    fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n",
   23.94 ++            shared_page_nr, (uint64_t)(page_array[shared_page_nr]));
   23.95  +
   23.96  +    free(page_array);
   23.97  +
   23.98 @@ -110,3 +128,28 @@ Index: ioemu/vl.c
   23.99       /* we always create the cdrom drive, even if no disk is there */
  23.100       bdrv_init();
  23.101       if (cdrom_index >= 0) {
  23.102 +Index: ioemu/hw/piix_pci.c
  23.103 +===================================================================
  23.104 +--- ioemu.orig/hw/piix_pci.c	2006-08-17 19:37:36.189542951 +0100
  23.105 ++++ ioemu/hw/piix_pci.c	2006-08-17 19:38:05.806252180 +0100
  23.106 +@@ -399,7 +399,7 @@
  23.107 +     uint8_t elcr[2];
  23.108 + 
  23.109 +     pci_bios_io_addr = 0xc000;
  23.110 +-    pci_bios_mem_addr = 0xf0000000;
  23.111 ++    pci_bios_mem_addr = HVM_BELOW_4G_MMIO_START;
  23.112 + 
  23.113 +     /* activate IRQ mappings */
  23.114 +     elcr[0] = 0x00;
  23.115 +Index: ioemu/vl.h
  23.116 +===================================================================
  23.117 +--- ioemu.orig/vl.h	2006-08-17 19:37:36.529505177 +0100
  23.118 ++++ ioemu/vl.h	2006-08-17 19:47:32.680418959 +0100
  23.119 +@@ -39,6 +39,7 @@
  23.120 + #include <sys/stat.h>
  23.121 + #include "xenctrl.h"
  23.122 + #include "xs.h"
  23.123 ++#include <xen/hvm/e820.h>
  23.124 + 
  23.125 + #ifndef O_LARGEFILE
  23.126 + #define O_LARGEFILE 0
    24.1 --- a/tools/ioemu/patches/xen-platform-device	Thu Aug 17 20:31:13 2006 +0100
    24.2 +++ b/tools/ioemu/patches/xen-platform-device	Thu Aug 17 20:31:47 2006 +0100
    24.3 @@ -3,8 +3,8 @@ will come later.
    24.4  
    24.5  Index: ioemu/Makefile.target
    24.6  ===================================================================
    24.7 ---- ioemu.orig/Makefile.target	2006-08-17 11:37:49.910902700 +0100
    24.8 -+++ ioemu/Makefile.target	2006-08-17 11:42:15.196191649 +0100
    24.9 +--- ioemu.orig/Makefile.target	2006-08-17 19:50:18.866050726 +0100
   24.10 ++++ ioemu/Makefile.target	2006-08-17 19:55:35.776020218 +0100
   24.11  @@ -359,6 +359,7 @@
   24.12   VL_OBJS+= usb-uhci.o
   24.13   VL_OBJS+= piix4acpi.o
   24.14 @@ -15,8 +15,8 @@ Index: ioemu/Makefile.target
   24.15   ifeq ($(TARGET_BASE_ARCH), ppc)
   24.16  Index: ioemu/hw/pc.c
   24.17  ===================================================================
   24.18 ---- ioemu.orig/hw/pc.c	2006-08-17 11:37:49.794915697 +0100
   24.19 -+++ ioemu/hw/pc.c	2006-08-17 11:43:11.818853900 +0100
   24.20 +--- ioemu.orig/hw/pc.c	2006-08-17 19:50:02.406869984 +0100
   24.21 ++++ ioemu/hw/pc.c	2006-08-17 19:55:35.777020107 +0100
   24.22  @@ -823,6 +823,9 @@
   24.23       }
   24.24   #endif /* !CONFIG_DM */
   24.25 @@ -30,7 +30,7 @@ Index: ioemu/hw/pc.c
   24.26  Index: ioemu/hw/xen_platform.c
   24.27  ===================================================================
   24.28  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   24.29 -+++ ioemu/hw/xen_platform.c	2006-08-17 11:56:16.043076969 +0100
   24.30 ++++ ioemu/hw/xen_platform.c	2006-08-17 19:55:35.777020107 +0100
   24.31  @@ -0,0 +1,138 @@
   24.32  +/*
   24.33  + * XEN platform fake pci device, formerly known as the event channel device
   24.34 @@ -172,9 +172,9 @@ Index: ioemu/hw/xen_platform.c
   24.35  +}
   24.36  Index: ioemu/vl.h
   24.37  ===================================================================
   24.38 ---- ioemu.orig/vl.h	2006-08-17 11:37:49.932900235 +0100
   24.39 -+++ ioemu/vl.h	2006-08-17 11:44:59.487739984 +0100
   24.40 -@@ -1208,6 +1208,9 @@
   24.41 +--- ioemu.orig/vl.h	2006-08-17 19:50:22.278673522 +0100
   24.42 ++++ ioemu/vl.h	2006-08-17 19:55:35.778019997 +0100
   24.43 +@@ -1209,6 +1209,9 @@
   24.44   void xenstore_check_new_media_present(int timeout);
   24.45   void xenstore_write_vncport(int vnc_display);
   24.46   
    25.1 --- a/tools/ioemu/patches/xen-support-buffered-ioreqs	Thu Aug 17 20:31:13 2006 +0100
    25.2 +++ b/tools/ioemu/patches/xen-support-buffered-ioreqs	Thu Aug 17 20:31:47 2006 +0100
    25.3 @@ -1,38 +1,38 @@
    25.4  Index: ioemu/vl.c
    25.5  ===================================================================
    25.6 ---- ioemu.orig/vl.c	2006-08-09 15:04:25.583508863 +0100
    25.7 -+++ ioemu/vl.c	2006-08-09 15:04:26.034465993 +0100
    25.8 +--- ioemu.orig/vl.c	2006-08-17 19:50:22.277673633 +0100
    25.9 ++++ ioemu/vl.c	2006-08-17 19:55:21.878556486 +0100
   25.10  @@ -5838,6 +5838,7 @@
   25.11 -     unsigned long nr_pages;
   25.12 +     unsigned long nr_pages, tmp_nr_pages, shared_page_nr;
   25.13       xen_pfn_t *page_array;
   25.14       extern void *shared_page;
   25.15  +    extern void *buffered_io_page;
   25.16   
   25.17       char qemu_dm_logfilename[64];
   25.18   
   25.19 -@@ -6388,12 +6389,17 @@
   25.20 - 
   25.21 -     phys_ram_base = xc_map_foreign_batch(xc_handle, domid,
   25.22 -                                          PROT_READ|PROT_WRITE, page_array,
   25.23 --                                         nr_pages - 1);
   25.24 -+                                         nr_pages - 3);
   25.25 -     if (phys_ram_base == 0) {
   25.26 -         fprintf(logfile, "xc_map_foreign_batch returned error %d\n", errno);
   25.27 -         exit(-1);
   25.28 -     }
   25.29 +@@ -6419,6 +6420,18 @@
   25.30 +     fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n",
   25.31 +             shared_page_nr, (uint64_t)(page_array[shared_page_nr]));
   25.32   
   25.33  +    /* not yet add for IA64 */
   25.34  +    buffered_io_page = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
   25.35 -+                                       PROT_READ|PROT_WRITE,
   25.36 -+                                       page_array[nr_pages - 3]);
   25.37 ++                                            PROT_READ|PROT_WRITE,
   25.38 ++                                            page_array[shared_page_nr - 2]);
   25.39 ++    if (buffered_io_page == NULL) {
   25.40 ++        fprintf(logfile, "map buffered IO page returned error %d\n", errno);
   25.41 ++        exit(-1);
   25.42 ++    }
   25.43  +
   25.44 -     shared_page = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
   25.45 -                                        PROT_READ|PROT_WRITE,
   25.46 -                                        page_array[nr_pages - 1]);
   25.47 ++    fprintf(logfile, "buffered io page at pfn:%lx, mfn: %"PRIx64"\n",
   25.48 ++            shared_page_nr - 2, (uint64_t)(page_array[shared_page_nr - 2]));
   25.49 ++
   25.50 +     free(page_array);
   25.51 + 
   25.52 + #elif defined(__ia64__)
   25.53  Index: ioemu/target-i386-dm/helper2.c
   25.54  ===================================================================
   25.55 ---- ioemu.orig/target-i386-dm/helper2.c	2006-08-09 15:04:24.105649313 +0100
   25.56 -+++ ioemu/target-i386-dm/helper2.c	2006-08-09 15:04:26.040465422 +0100
   25.57 +--- ioemu.orig/target-i386-dm/helper2.c	2006-08-17 19:49:44.491850141 +0100
   25.58 ++++ ioemu/target-i386-dm/helper2.c	2006-08-17 19:50:41.490549986 +0100
   25.59  @@ -76,6 +76,10 @@
   25.60   
   25.61   shared_iopage_t *shared_page = NULL;
    26.1 --- a/tools/ioemu/patches/xenstore-block-device-config	Thu Aug 17 20:31:13 2006 +0100
    26.2 +++ b/tools/ioemu/patches/xenstore-block-device-config	Thu Aug 17 20:31:47 2006 +0100
    26.3 @@ -1,7 +1,7 @@
    26.4  Index: ioemu/Makefile.target
    26.5  ===================================================================
    26.6 ---- ioemu.orig/Makefile.target	2006-08-09 21:32:24.915816410 +0100
    26.7 -+++ ioemu/Makefile.target	2006-08-09 21:32:25.500750429 +0100
    26.8 +--- ioemu.orig/Makefile.target	2006-08-17 19:50:02.405870095 +0100
    26.9 ++++ ioemu/Makefile.target	2006-08-17 19:50:18.866050726 +0100
   26.10  @@ -358,6 +358,7 @@
   26.11   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
   26.12   VL_OBJS+= usb-uhci.o
   26.13 @@ -13,7 +13,7 @@ Index: ioemu/Makefile.target
   26.14  Index: ioemu/xenstore.c
   26.15  ===================================================================
   26.16  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   26.17 -+++ ioemu/xenstore.c	2006-08-09 21:32:25.501750317 +0100
   26.18 ++++ ioemu/xenstore.c	2006-08-17 19:50:18.867050616 +0100
   26.19  @@ -0,0 +1,187 @@
   26.20  +/*
   26.21  + * This file is subject to the terms and conditions of the GNU General
   26.22 @@ -204,8 +204,8 @@ Index: ioemu/xenstore.c
   26.23  +}
   26.24  Index: ioemu/vl.c
   26.25  ===================================================================
   26.26 ---- ioemu.orig/vl.c	2006-08-09 21:32:25.438757422 +0100
   26.27 -+++ ioemu/vl.c	2006-08-09 21:32:25.504749978 +0100
   26.28 +--- ioemu.orig/vl.c	2006-08-17 19:50:17.086247452 +0100
   26.29 ++++ ioemu/vl.c	2006-08-17 19:50:18.870050284 +0100
   26.30  @@ -5243,9 +5243,11 @@
   26.31              "Standard options:\n"
   26.32              "-M machine      select emulated machine (-M ? for list)\n"
   26.33 @@ -359,7 +359,7 @@ Index: ioemu/vl.c
   26.34   
   26.35       setvbuf(stdout, NULL, _IOLBF, 0);
   26.36       
   26.37 -@@ -6417,6 +6448,7 @@
   26.38 +@@ -6435,6 +6466,7 @@
   26.39   
   26.40   #endif /* !CONFIG_DM */
   26.41   
   26.42 @@ -367,7 +367,7 @@ Index: ioemu/vl.c
   26.43       /* we always create the cdrom drive, even if no disk is there */
   26.44       bdrv_init();
   26.45       if (cdrom_index >= 0) {
   26.46 -@@ -6443,6 +6475,7 @@
   26.47 +@@ -6461,6 +6493,7 @@
   26.48               }
   26.49           }
   26.50       }
   26.51 @@ -375,7 +375,7 @@ Index: ioemu/vl.c
   26.52   
   26.53       /* we always create at least one floppy disk */
   26.54       fd_table[0] = bdrv_new("fda");
   26.55 -@@ -6521,6 +6554,8 @@
   26.56 +@@ -6539,6 +6572,8 @@
   26.57           }
   26.58       }
   26.59   
   26.60 @@ -386,8 +386,8 @@ Index: ioemu/vl.c
   26.61                     kernel_filename, kernel_cmdline, initrd_filename,
   26.62  Index: ioemu/monitor.c
   26.63  ===================================================================
   26.64 ---- ioemu.orig/monitor.c	2006-08-09 21:32:24.238892765 +0100
   26.65 -+++ ioemu/monitor.c	2006-08-09 21:32:25.505749865 +0100
   26.66 +--- ioemu.orig/monitor.c	2006-08-17 19:49:44.491850141 +0100
   26.67 ++++ ioemu/monitor.c	2006-08-17 19:50:18.871050174 +0100
   26.68  @@ -24,6 +24,7 @@
   26.69   #include "vl.h"
   26.70   #include "disas.h"
   26.71 @@ -416,8 +416,8 @@ Index: ioemu/monitor.c
   26.72       int i;
   26.73  Index: ioemu/block.c
   26.74  ===================================================================
   26.75 ---- ioemu.orig/block.c	2006-08-09 21:32:18.339558126 +0100
   26.76 -+++ ioemu/block.c	2006-08-09 21:32:25.506749753 +0100
   26.77 +--- ioemu.orig/block.c	2006-08-17 19:37:35.865578948 +0100
   26.78 ++++ ioemu/block.c	2006-08-17 19:50:18.872050063 +0100
   26.79  @@ -758,6 +758,7 @@
   26.80   static void raw_close(BlockDriverState *bs)
   26.81   {
   26.82 @@ -428,9 +428,9 @@ Index: ioemu/block.c
   26.83   
   26.84  Index: ioemu/vl.h
   26.85  ===================================================================
   26.86 ---- ioemu.orig/vl.h	2006-08-09 21:32:25.439757309 +0100
   26.87 -+++ ioemu/vl.h	2006-08-09 21:32:25.506749753 +0100
   26.88 -@@ -1187,6 +1187,8 @@
   26.89 +--- ioemu.orig/vl.h	2006-08-17 19:50:17.087247341 +0100
   26.90 ++++ ioemu/vl.h	2006-08-17 19:50:18.872050063 +0100
   26.91 +@@ -1188,6 +1188,8 @@
   26.92   void term_print_help(void);
   26.93   void monitor_readline(const char *prompt, int is_password,
   26.94                         char *buf, int buf_size);
   26.95 @@ -439,7 +439,7 @@ Index: ioemu/vl.h
   26.96   
   26.97   /* readline.c */
   26.98   typedef void ReadLineFunc(void *opaque, const char *str);
   26.99 -@@ -1199,6 +1201,13 @@
  26.100 +@@ -1200,6 +1202,13 @@
  26.101   void readline_start(const char *prompt, int is_password,
  26.102                       ReadLineFunc *readline_func, void *opaque);
  26.103   
  26.104 @@ -455,8 +455,8 @@ Index: ioemu/vl.h
  26.105   extern char domain_name[];
  26.106  Index: ioemu/hw/ide.c
  26.107  ===================================================================
  26.108 ---- ioemu.orig/hw/ide.c	2006-08-09 21:32:24.658845396 +0100
  26.109 -+++ ioemu/hw/ide.c	2006-08-09 21:32:25.508749527 +0100
  26.110 +--- ioemu.orig/hw/ide.c	2006-08-17 19:49:57.830375828 +0100
  26.111 ++++ ioemu/hw/ide.c	2006-08-17 19:50:18.874049842 +0100
  26.112  @@ -1158,6 +1158,7 @@
  26.113           } else {
  26.114               ide_atapi_cmd_error(s, SENSE_NOT_READY, 
    27.1 --- a/tools/ioemu/patches/xenstore-write-vnc-port	Thu Aug 17 20:31:13 2006 +0100
    27.2 +++ b/tools/ioemu/patches/xenstore-write-vnc-port	Thu Aug 17 20:31:47 2006 +0100
    27.3 @@ -1,7 +1,7 @@
    27.4  Index: ioemu/xenstore.c
    27.5  ===================================================================
    27.6 ---- ioemu.orig/xenstore.c	2006-08-09 21:32:25.501750317 +0100
    27.7 -+++ ioemu/xenstore.c	2006-08-09 21:32:25.706727195 +0100
    27.8 +--- ioemu.orig/xenstore.c	2006-08-17 19:50:18.867050616 +0100
    27.9 ++++ ioemu/xenstore.c	2006-08-17 19:50:22.274673964 +0100
   27.10  @@ -185,3 +185,31 @@
   27.11       free(image);
   27.12       free(vec);
   27.13 @@ -36,9 +36,9 @@ Index: ioemu/xenstore.c
   27.14  +}
   27.15  Index: ioemu/vl.c
   27.16  ===================================================================
   27.17 ---- ioemu.orig/vl.c	2006-08-09 21:32:25.504749978 +0100
   27.18 -+++ ioemu/vl.c	2006-08-09 21:32:25.709726857 +0100
   27.19 -@@ -6511,6 +6511,7 @@
   27.20 +--- ioemu.orig/vl.c	2006-08-17 19:50:18.870050284 +0100
   27.21 ++++ ioemu/vl.c	2006-08-17 19:50:22.277673633 +0100
   27.22 +@@ -6529,6 +6529,7 @@
   27.23   	vnc_display = vnc_display_init(ds, vnc_display, vncunused);
   27.24   	if (vncviewer)
   27.25   	    vnc_start_viewer(vnc_display);
   27.26 @@ -48,9 +48,9 @@ Index: ioemu/vl.c
   27.27           sdl_display_init(ds, full_screen);
   27.28  Index: ioemu/vl.h
   27.29  ===================================================================
   27.30 ---- ioemu.orig/vl.h	2006-08-09 21:32:25.506749753 +0100
   27.31 -+++ ioemu/vl.h	2006-08-09 21:32:25.710726744 +0100
   27.32 -@@ -1206,6 +1206,7 @@
   27.33 +--- ioemu.orig/vl.h	2006-08-17 19:50:18.872050063 +0100
   27.34 ++++ ioemu/vl.h	2006-08-17 19:50:22.278673522 +0100
   27.35 +@@ -1207,6 +1207,7 @@
   27.36   int xenstore_fd(void);
   27.37   void xenstore_process_event(void *opaque);
   27.38   void xenstore_check_new_media_present(int timeout);