1.1 --- a/tools/ioemu/patches/domain-timeoffset	Fri Aug 04 10:57:13 2006 +0100
     1.2 +++ b/tools/ioemu/patches/domain-timeoffset	Fri Aug 04 10:57:34 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: ioemu/hw/mc146818rtc.c
     1.5  ===================================================================
     1.6 ---- ioemu.orig/hw/mc146818rtc.c	2006-08-04 10:52:55.914499631 +0100
     1.7 -+++ ioemu/hw/mc146818rtc.c	2006-08-04 10:53:03.701599955 +0100
     1.8 +--- ioemu.orig/hw/mc146818rtc.c	2006-08-04 10:57:22.049787220 +0100
     1.9 ++++ ioemu/hw/mc146818rtc.c	2006-08-04 10:57:28.677023336 +0100
    1.10  @@ -178,10 +178,27 @@
    1.11       }
    1.12   }
    1.13 @@ -46,8 +46,8 @@ Index: ioemu/hw/mc146818rtc.c
    1.14   static void rtc_copy_date(RTCState *s)
    1.15  Index: ioemu/hw/pc.c
    1.16  ===================================================================
    1.17 ---- ioemu.orig/hw/pc.c	2006-08-04 10:53:03.431631144 +0100
    1.18 -+++ ioemu/hw/pc.c	2006-08-04 10:53:03.701599955 +0100
    1.19 +--- ioemu.orig/hw/pc.c	2006-08-04 10:57:28.406054568 +0100
    1.20 ++++ ioemu/hw/pc.c	2006-08-04 10:57:28.678023221 +0100
    1.21  @@ -151,7 +151,7 @@
    1.22   }
    1.23   
    1.24 @@ -117,8 +117,8 @@ Index: ioemu/hw/pc.c
    1.25   QEMUMachine pc_machine = {
    1.26  Index: ioemu/vl.c
    1.27  ===================================================================
    1.28 ---- ioemu.orig/vl.c	2006-08-04 10:53:03.571614972 +0100
    1.29 -+++ ioemu/vl.c	2006-08-04 10:53:03.704599608 +0100
    1.30 +--- ioemu.orig/vl.c	2006-08-04 10:57:28.545038549 +0100
    1.31 ++++ ioemu/vl.c	2006-08-04 10:57:28.680022990 +0100
    1.32  @@ -164,6 +164,8 @@
    1.33   
    1.34   int xc_handle;
    1.35 @@ -162,7 +162,7 @@ Index: ioemu/vl.c
    1.36               }
    1.37           }
    1.38       }
    1.39 -@@ -6005,7 +6013,8 @@
    1.40 +@@ -6007,7 +6015,8 @@
    1.41   
    1.42       machine->init(ram_size, vga_ram_size, boot_device,
    1.43                     ds, fd_filename, snapshot,
    1.44 @@ -174,8 +174,8 @@ Index: ioemu/vl.c
    1.45       qemu_mod_timer(gui_timer, qemu_get_clock(rt_clock));
    1.46  Index: ioemu/vl.h
    1.47  ===================================================================
    1.48 ---- ioemu.orig/vl.h	2006-08-04 10:53:03.436630567 +0100
    1.49 -+++ ioemu/vl.h	2006-08-04 10:53:03.705599493 +0100
    1.50 +--- ioemu.orig/vl.h	2006-08-04 10:57:28.411053992 +0100
    1.51 ++++ ioemu/vl.h	2006-08-04 10:57:28.681022875 +0100
    1.52  @@ -556,7 +556,7 @@
    1.53                                    int boot_device,
    1.54                DisplayState *ds, const char **fd_filename, int snapshot,

     2.1 --- a/tools/ioemu/patches/ioemu-ia64	Fri Aug 04 10:57:13 2006 +0100
     2.2 +++ b/tools/ioemu/patches/ioemu-ia64	Fri Aug 04 10:57:34 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  Index: ioemu/hw/iommu.c
     2.5  ===================================================================
     2.6 ---- ioemu.orig/hw/iommu.c	2006-08-04 10:42:20.772886174 +0100
     2.7 -+++ ioemu/hw/iommu.c	2006-08-04 10:42:25.397351756 +0100
     2.8 +--- ioemu.orig/hw/iommu.c	2006-08-04 10:57:22.606723023 +0100
     2.9 ++++ ioemu/hw/iommu.c	2006-08-04 10:57:27.489160251 +0100
    2.10  @@ -82,7 +82,11 @@
    2.11   #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
    2.12   #define IOPTE_WAZ           0x00000001 /* Write as zeros */
    2.13 @@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
    2.14   
    2.15  Index: ioemu/cpu-all.h
    2.16  ===================================================================
    2.17 ---- ioemu.orig/cpu-all.h	2006-08-04 10:42:25.029394277 +0100
    2.18 -+++ ioemu/cpu-all.h	2006-08-04 10:42:25.398351640 +0100
    2.19 +--- ioemu.orig/cpu-all.h	2006-08-04 10:57:27.123202432 +0100
    2.20 ++++ ioemu/cpu-all.h	2006-08-04 10:57:27.490160136 +0100
    2.21  @@ -835,6 +835,31 @@
    2.22                   :"=m" (*(volatile long *)addr)
    2.23                   :"dIr" (nr));
    2.24 @@ -52,8 +52,8 @@ Index: ioemu/cpu-all.h
    2.25   /* memory API */
    2.26  Index: ioemu/vl.c
    2.27  ===================================================================
    2.28 ---- ioemu.orig/vl.c	2006-08-04 10:42:25.326359960 +0100
    2.29 -+++ ioemu/vl.c	2006-08-04 10:51:21.239442976 +0100
    2.30 +--- ioemu.orig/vl.c	2006-08-04 10:57:27.419168318 +0100
    2.31 ++++ ioemu/vl.c	2006-08-04 10:57:27.493159790 +0100
    2.32  @@ -5567,6 +5567,11 @@
    2.33       /* init the memory */
    2.34       phys_ram_size = ram_size + vga_ram_size + bios_size;
    2.35 @@ -74,9 +74,9 @@ Index: ioemu/vl.c
    2.36       if (xc_get_pfn_list(xc_handle, domid, page_array, nr_pages) != nr_pages) {
    2.37           fprintf(logfile, "xc_get_pfn_list returned error %d\n", errno);
    2.38           exit(-1);
    2.39 -@@ -5598,6 +5604,41 @@
    2.40 -     fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n", nr_pages - 1,
    2.41 -             (uint64_t)(page_array[nr_pages - 1]));
    2.42 +@@ -5600,6 +5606,41 @@
    2.43 + 
    2.44 +     free(page_array);
    2.45   
    2.46  +#elif defined(__ia64__)
    2.47  +  
    2.48 @@ -118,8 +118,8 @@ Index: ioemu/vl.c
    2.49   #ifdef CONFIG_SOFTMMU
    2.50  Index: ioemu/target-i386-dm/exec-dm.c
    2.51  ===================================================================
    2.52 ---- ioemu.orig/target-i386-dm/exec-dm.c	2006-08-04 10:42:24.647438417 +0100
    2.53 -+++ ioemu/target-i386-dm/exec-dm.c	2006-08-04 10:42:25.401351294 +0100
    2.54 +--- ioemu.orig/target-i386-dm/exec-dm.c	2006-08-04 10:57:26.738246803 +0100
    2.55 ++++ ioemu/target-i386-dm/exec-dm.c	2006-08-04 10:57:27.493159790 +0100
    2.56  @@ -341,6 +341,23 @@
    2.57       return io_mem_read[io_index >> IO_MEM_SHIFT];
    2.58   }
    2.59 @@ -156,8 +156,8 @@ Index: ioemu/target-i386-dm/exec-dm.c
    2.60                   memset(buf, 0xff, len);
    2.61  Index: ioemu/exec-all.h
    2.62  ===================================================================
    2.63 ---- ioemu.orig/exec-all.h	2006-08-04 10:42:24.518453323 +0100
    2.64 -+++ ioemu/exec-all.h	2006-08-04 10:42:25.401351294 +0100
    2.65 +--- ioemu.orig/exec-all.h	2006-08-04 10:57:26.651256830 +0100
    2.66 ++++ ioemu/exec-all.h	2006-08-04 10:57:27.494159675 +0100
    2.67  @@ -462,12 +462,13 @@
    2.68   }
    2.69   #endif
    2.70 @@ -177,8 +177,8 @@ Index: ioemu/exec-all.h
    2.71   
    2.72  Index: ioemu/target-i386-dm/cpu.h
    2.73  ===================================================================
    2.74 ---- ioemu.orig/target-i386-dm/cpu.h	2006-08-04 10:42:24.647438417 +0100
    2.75 -+++ ioemu/target-i386-dm/cpu.h	2006-08-04 10:42:25.401351294 +0100
    2.76 +--- ioemu.orig/target-i386-dm/cpu.h	2006-08-04 10:57:26.737246918 +0100
    2.77 ++++ ioemu/target-i386-dm/cpu.h	2006-08-04 10:57:27.494159675 +0100
    2.78  @@ -80,7 +80,11 @@
    2.79   /* helper2.c */
    2.80   int main_loop(void);
    2.81 @@ -194,7 +194,7 @@ Index: ioemu/target-i386-dm/cpu.h
    2.82  Index: ioemu/ia64_intrinsic.h
    2.83  ===================================================================
    2.84  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    2.85 -+++ ioemu/ia64_intrinsic.h	2006-08-04 10:42:25.402351178 +0100
    2.86 ++++ ioemu/ia64_intrinsic.h	2006-08-04 10:57:27.495159560 +0100
    2.87  @@ -0,0 +1,276 @@
    2.88  +#ifndef IA64_INTRINSIC_H
    2.89  +#define IA64_INTRINSIC_H

     3.1 --- a/tools/ioemu/patches/vnc-fixes	Fri Aug 04 10:57:13 2006 +0100
     3.2 +++ b/tools/ioemu/patches/vnc-fixes	Fri Aug 04 10:57:34 2006 +0100
     3.3 @@ -1,8 +1,8 @@
     3.4  Index: ioemu/vl.c
     3.5  ===================================================================
     3.6 ---- ioemu.orig/vl.c	2006-08-04 10:53:04.142549012 +0100
     3.7 -+++ ioemu/vl.c	2006-08-04 10:53:04.206541619 +0100
     3.8 -@@ -6024,8 +6024,10 @@
     3.9 +--- ioemu.orig/vl.c	2006-08-04 10:57:29.116972627 +0100
    3.10 ++++ ioemu/vl.c	2006-08-04 10:57:29.186964560 +0100
    3.11 +@@ -6026,8 +6026,10 @@
    3.12                     kernel_filename, kernel_cmdline, initrd_filename,
    3.13                     timeoffset);
    3.14   
    3.15 @@ -17,8 +17,8 @@ Index: ioemu/vl.c
    3.16       if (use_gdbstub) {
    3.17  Index: ioemu/vnc.c
    3.18  ===================================================================
    3.19 ---- ioemu.orig/vnc.c	2006-08-04 10:53:04.139549358 +0100
    3.20 -+++ ioemu/vnc.c	2006-08-04 10:53:04.207541503 +0100
    3.21 +--- ioemu.orig/vnc.c	2006-08-04 10:57:29.114972858 +0100
    3.22 ++++ ioemu/vnc.c	2006-08-04 10:57:29.187964445 +0100
    3.23  @@ -3,6 +3,7 @@
    3.24    * 
    3.25    * Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws>
    3.26 @@ -493,8 +493,8 @@ Index: ioemu/vnc.c
    3.27   }
    3.28  Index: ioemu/vl.h
    3.29  ===================================================================
    3.30 ---- ioemu.orig/vl.h	2006-08-04 10:53:03.950571191 +0100
    3.31 -+++ ioemu/vl.h	2006-08-04 10:53:04.207541503 +0100
    3.32 +--- ioemu.orig/vl.h	2006-08-04 10:57:28.925994639 +0100
    3.33 ++++ ioemu/vl.h	2006-08-04 10:57:29.187964445 +0100
    3.34  @@ -302,6 +302,7 @@
    3.35   int is_graphic_console(void);
    3.36   CharDriverState *text_console_init(DisplayState *ds);

     4.1 --- a/tools/ioemu/patches/vnc-start-vncviewer	Fri Aug 04 10:57:13 2006 +0100
     4.2 +++ b/tools/ioemu/patches/vnc-start-vncviewer	Fri Aug 04 10:57:34 2006 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  Index: ioemu/vnc.c
     4.5  ===================================================================
     4.6 ---- ioemu.orig/vnc.c	2006-08-04 10:53:04.207541503 +0100
     4.7 -+++ ioemu/vnc.c	2006-08-04 10:53:04.370522674 +0100
     4.8 +--- ioemu.orig/vnc.c	2006-08-04 10:57:29.187964445 +0100
     4.9 ++++ ioemu/vnc.c	2006-08-04 10:57:29.351945544 +0100
    4.10  @@ -1002,3 +1002,25 @@
    4.11   
    4.12       vnc_dpy_resize(vs->ds, 640, 400);
    4.13 @@ -30,8 +30,8 @@ Index: ioemu/vnc.c
    4.14  +}
    4.15  Index: ioemu/vl.c
    4.16  ===================================================================
    4.17 ---- ioemu.orig/vl.c	2006-08-04 10:53:04.206541619 +0100
    4.18 -+++ ioemu/vl.c	2006-08-04 10:53:04.373522328 +0100
    4.19 +--- ioemu.orig/vl.c	2006-08-04 10:57:29.186964560 +0100
    4.20 ++++ ioemu/vl.c	2006-08-04 10:57:29.354945198 +0100
    4.21  @@ -121,6 +121,7 @@
    4.22   int bios_size;
    4.23   static DisplayState display_state;
    4.24 @@ -82,7 +82,7 @@ Index: ioemu/vl.c
    4.25               case QEMU_OPTION_domainname:
    4.26                   strncat(domain_name, optarg, sizeof(domain_name) - 20);
    4.27                   break;
    4.28 -@@ -5931,6 +5939,8 @@
    4.29 +@@ -5933,6 +5941,8 @@
    4.30           dumb_display_init(ds);
    4.31       } else if (vnc_display != -1) {
    4.32   	vnc_display_init(ds, vnc_display);
    4.33 @@ -93,8 +93,8 @@ Index: ioemu/vl.c
    4.34           sdl_display_init(ds, full_screen);
    4.35  Index: ioemu/vl.h
    4.36  ===================================================================
    4.37 ---- ioemu.orig/vl.h	2006-08-04 10:53:04.207541503 +0100
    4.38 -+++ ioemu/vl.h	2006-08-04 10:53:04.374522212 +0100
    4.39 +--- ioemu.orig/vl.h	2006-08-04 10:57:29.187964445 +0100
    4.40 ++++ ioemu/vl.h	2006-08-04 10:57:29.355945083 +0100
    4.41  @@ -734,6 +734,7 @@
    4.42   
    4.43   /* vnc.c */

     5.1 --- a/tools/ioemu/patches/xenstore-block-device-config	Fri Aug 04 10:57:13 2006 +0100
     5.2 +++ b/tools/ioemu/patches/xenstore-block-device-config	Fri Aug 04 10:57:34 2006 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  Index: ioemu/Makefile.target
     5.5  ===================================================================
     5.6 ---- ioemu.orig/Makefile.target	2006-08-04 10:53:03.944571884 +0100
     5.7 -+++ ioemu/Makefile.target	2006-08-04 10:53:04.659489290 +0100
     5.8 +--- ioemu.orig/Makefile.target	2006-08-04 10:57:28.920995216 +0100
     5.9 ++++ ioemu/Makefile.target	2006-08-04 10:57:29.641912123 +0100
    5.10  @@ -336,6 +336,7 @@
    5.11   VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
    5.12   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o
    5.13 @@ -13,7 +13,7 @@ Index: ioemu/Makefile.target
    5.14  Index: ioemu/xenstore.c
    5.15  ===================================================================
    5.16  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    5.17 -+++ ioemu/xenstore.c	2006-08-04 10:53:04.660489174 +0100
    5.18 ++++ ioemu/xenstore.c	2006-08-04 10:57:29.641912123 +0100
    5.19  @@ -0,0 +1,187 @@
    5.20  +/*
    5.21  + * This file is subject to the terms and conditions of the GNU General
    5.22 @@ -204,8 +204,8 @@ Index: ioemu/xenstore.c
    5.23  +}
    5.24  Index: ioemu/vl.c
    5.25  ===================================================================
    5.26 ---- ioemu.orig/vl.c	2006-08-04 10:53:04.373522328 +0100
    5.27 -+++ ioemu/vl.c	2006-08-04 10:53:04.663488828 +0100
    5.28 +--- ioemu.orig/vl.c	2006-08-04 10:57:29.354945198 +0100
    5.29 ++++ ioemu/vl.c	2006-08-04 10:57:29.644911777 +0100
    5.30  @@ -4711,9 +4711,11 @@
    5.31              "Standard options:\n"
    5.32              "-M machine      select emulated machine (-M ? for list)\n"
    5.33 @@ -359,7 +359,7 @@ Index: ioemu/vl.c
    5.34   
    5.35   #if !defined(CONFIG_SOFTMMU)
    5.36       /* must avoid mmap() usage of glibc by setting a buffer "by hand" */
    5.37 -@@ -5868,6 +5899,7 @@
    5.38 +@@ -5870,6 +5901,7 @@
    5.39   
    5.40   #endif /* !CONFIG_DM */
    5.41   
    5.42 @@ -367,7 +367,7 @@ Index: ioemu/vl.c
    5.43       /* we always create the cdrom drive, even if no disk is there */
    5.44       bdrv_init();
    5.45       if (cdrom_index >= 0) {
    5.46 -@@ -5894,6 +5926,7 @@
    5.47 +@@ -5896,6 +5928,7 @@
    5.48               }
    5.49           }
    5.50       }
    5.51 @@ -375,7 +375,7 @@ Index: ioemu/vl.c
    5.52   
    5.53       /* we always create at least one floppy disk */
    5.54       fd_table[0] = bdrv_new("fda");
    5.55 -@@ -6029,6 +6062,8 @@
    5.56 +@@ -6031,6 +6064,8 @@
    5.57   #endif
    5.58       init_timers();
    5.59   
    5.60 @@ -386,8 +386,8 @@ Index: ioemu/vl.c
    5.61                     kernel_filename, kernel_cmdline, initrd_filename,
    5.62  Index: ioemu/monitor.c
    5.63  ===================================================================
    5.64 ---- ioemu.orig/monitor.c	2006-08-04 10:53:03.222655287 +0100
    5.65 -+++ ioemu/monitor.c	2006-08-04 10:53:04.664488712 +0100
    5.66 +--- ioemu.orig/monitor.c	2006-08-04 10:57:28.195078886 +0100
    5.67 ++++ ioemu/monitor.c	2006-08-04 10:57:29.645911662 +0100
    5.68  @@ -24,6 +24,7 @@
    5.69   #include "vl.h"
    5.70   #include "disas.h"
    5.71 @@ -416,8 +416,8 @@ Index: ioemu/monitor.c
    5.72       int i;
    5.73  Index: ioemu/block.c
    5.74  ===================================================================
    5.75 ---- ioemu.orig/block.c	2006-08-04 10:52:55.582537986 +0100
    5.76 -+++ ioemu/block.c	2006-08-04 10:53:04.664488712 +0100
    5.77 +--- ioemu.orig/block.c	2006-08-04 10:57:21.718825369 +0100
    5.78 ++++ ioemu/block.c	2006-08-04 10:57:29.646911546 +0100
    5.79  @@ -750,6 +750,7 @@
    5.80   static void raw_close(BlockDriverState *bs)
    5.81   {
    5.82 @@ -428,8 +428,8 @@ Index: ioemu/block.c
    5.83   
    5.84  Index: ioemu/vl.h
    5.85  ===================================================================
    5.86 ---- ioemu.orig/vl.h	2006-08-04 10:53:04.374522212 +0100
    5.87 -+++ ioemu/vl.h	2006-08-04 10:53:04.665488597 +0100
    5.88 +--- ioemu.orig/vl.h	2006-08-04 10:57:29.355945083 +0100
    5.89 ++++ ioemu/vl.h	2006-08-04 10:57:29.647911431 +0100
    5.90  @@ -1093,6 +1093,8 @@
    5.91   void term_print_help(void);
    5.92   void monitor_readline(const char *prompt, int is_password,
    5.93 @@ -455,8 +455,8 @@ Index: ioemu/vl.h
    5.94   extern char domain_name[];
    5.95  Index: ioemu/hw/ide.c
    5.96  ===================================================================
    5.97 ---- ioemu.orig/hw/ide.c	2006-08-04 10:53:03.636607463 +0100
    5.98 -+++ ioemu/hw/ide.c	2006-08-04 10:53:04.666488481 +0100
    5.99 +--- ioemu.orig/hw/ide.c	2006-08-04 10:57:28.612030827 +0100
   5.100 ++++ ioemu/hw/ide.c	2006-08-04 10:57:29.648911316 +0100
   5.101  @@ -1279,6 +1279,7 @@
   5.102           } else {
   5.103               ide_atapi_cmd_error(s, SENSE_NOT_READY, 

     6.1 --- a/tools/ioemu/patches/xenstore-write-vnc-port	Fri Aug 04 10:57:13 2006 +0100
     6.2 +++ b/tools/ioemu/patches/xenstore-write-vnc-port	Fri Aug 04 10:57:34 2006 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  Index: ioemu/xenstore.c
     6.5  ===================================================================
     6.6 ---- ioemu.orig/xenstore.c	2006-08-04 10:53:04.660489174 +0100
     6.7 -+++ ioemu/xenstore.c	2006-08-04 10:53:04.865465494 +0100
     6.8 +--- ioemu.orig/xenstore.c	2006-08-04 10:57:29.641912123 +0100
     6.9 ++++ ioemu/xenstore.c	2006-08-04 10:57:30.244842629 +0100
    6.10  @@ -185,3 +185,31 @@
    6.11       free(image);
    6.12       free(vec);
    6.13 @@ -36,9 +36,9 @@ Index: ioemu/xenstore.c
    6.14  +}
    6.15  Index: ioemu/vl.c
    6.16  ===================================================================
    6.17 ---- ioemu.orig/vl.c	2006-08-04 10:53:04.663488828 +0100
    6.18 -+++ ioemu/vl.c	2006-08-04 10:53:04.868465147 +0100
    6.19 -@@ -5974,6 +5974,7 @@
    6.20 +--- ioemu.orig/vl.c	2006-08-04 10:57:29.644911777 +0100
    6.21 ++++ ioemu/vl.c	2006-08-04 10:57:30.246842399 +0100
    6.22 +@@ -5976,6 +5976,7 @@
    6.23   	vnc_display_init(ds, vnc_display);
    6.24   	if (vncviewer)
    6.25   	    vnc_start_viewer(vnc_display);
    6.26 @@ -48,8 +48,8 @@ Index: ioemu/vl.c
    6.27           sdl_display_init(ds, full_screen);
    6.28  Index: ioemu/vl.h
    6.29  ===================================================================
    6.30 ---- ioemu.orig/vl.h	2006-08-04 10:53:04.665488597 +0100
    6.31 -+++ ioemu/vl.h	2006-08-04 10:53:04.869465032 +0100
    6.32 +--- ioemu.orig/vl.h	2006-08-04 10:57:29.647911431 +0100
    6.33 ++++ ioemu/vl.h	2006-08-04 10:57:30.247842283 +0100
    6.34  @@ -1112,6 +1112,7 @@
    6.35   int xenstore_fd(void);
    6.36   void xenstore_process_event(void *opaque);