ia64/xen-unstable

changeset 10963:7e914d9cd7e6

[qemu patches] Refresh patches.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Fri Aug 04 10:43:02 2006 +0100 (2006-08-04)
parents 56b2a028dc7e
children a0b3cf802d99
files tools/ioemu/patches/domain-timeoffset tools/ioemu/patches/vnc-cleanup tools/ioemu/patches/vnc-fixes tools/ioemu/patches/vnc-start-vncviewer tools/ioemu/patches/xenstore-block-device-config tools/ioemu/patches/xenstore-write-vnc-port
line diff
     1.1 --- a/tools/ioemu/patches/domain-timeoffset	Fri Aug 04 10:42:02 2006 +0100
     1.2 +++ b/tools/ioemu/patches/domain-timeoffset	Fri Aug 04 10:43:02 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-07-27 11:17:18.007225084 +0100
     1.7 -+++ ioemu/hw/mc146818rtc.c	2006-07-27 11:17:48.250876949 +0100
     1.8 +--- ioemu.orig/hw/mc146818rtc.c	2006-08-04 10:42:19.796998954 +0100
     1.9 ++++ ioemu/hw/mc146818rtc.c	2006-08-04 10:42:26.456229392 +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-07-27 11:17:47.993905398 +0100
    1.18 -+++ ioemu/hw/pc.c	2006-07-27 11:17:48.251876839 +0100
    1.19 +--- ioemu.orig/hw/pc.c	2006-08-04 10:42:26.185260705 +0100
    1.20 ++++ ioemu/hw/pc.c	2006-08-04 10:42:26.457229276 +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-07-27 11:17:48.126890676 +0100
    1.29 -+++ ioemu/vl.c	2006-07-27 11:17:48.254876507 +0100
    1.30 +--- ioemu.orig/vl.c	2006-08-04 10:42:26.324244644 +0100
    1.31 ++++ ioemu/vl.c	2006-08-04 10:42:26.459229045 +0100
    1.32  @@ -164,6 +164,8 @@
    1.33   
    1.34   int xc_handle;
    1.35 @@ -174,8 +174,8 @@ Index: ioemu/vl.c
    1.36       qemu_mod_timer(gui_timer, qemu_get_clock(rt_clock));
    1.37  Index: ioemu/vl.h
    1.38  ===================================================================
    1.39 ---- ioemu.orig/vl.h	2006-07-27 11:17:47.998904845 +0100
    1.40 -+++ ioemu/vl.h	2006-07-27 11:17:48.254876507 +0100
    1.41 +--- ioemu.orig/vl.h	2006-08-04 10:42:26.190260127 +0100
    1.42 ++++ ioemu/vl.h	2006-08-04 10:42:26.460228930 +0100
    1.43  @@ -556,7 +556,7 @@
    1.44                                    int boot_device,
    1.45                DisplayState *ds, const char **fd_filename, int snapshot,
     2.1 --- a/tools/ioemu/patches/vnc-cleanup	Fri Aug 04 10:42:02 2006 +0100
     2.2 +++ b/tools/ioemu/patches/vnc-cleanup	Fri Aug 04 10:43:02 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  Index: ioemu/vnc.c
     2.5  ===================================================================
     2.6 ---- ioemu.orig/vnc.c	2006-07-27 11:16:52.783017443 +0100
     2.7 -+++ ioemu/vnc.c	2006-07-27 11:17:00.722138579 +0100
     2.8 +--- ioemu.orig/vnc.c	2006-08-04 10:42:19.575024607 +0100
     2.9 ++++ ioemu/vnc.c	2006-08-04 10:42:26.918176009 +0100
    2.10  @@ -83,13 +83,16 @@
    2.11   static void vnc_dpy_update(DisplayState *ds, int x, int y, int w, int h)
    2.12   {
    2.13 @@ -65,9 +65,9 @@ Index: ioemu/vnc.c
    2.14   static void vnc_timer_init(VncState *vs)
    2.15  Index: ioemu/vl.c
    2.16  ===================================================================
    2.17 ---- ioemu.orig/vl.c	2006-07-27 11:17:00.311184072 +0100
    2.18 -+++ ioemu/vl.c	2006-07-27 11:17:00.724138358 +0100
    2.19 -@@ -4587,10 +4587,10 @@
    2.20 +--- ioemu.orig/vl.c	2006-08-04 10:42:26.723198541 +0100
    2.21 ++++ ioemu/vl.c	2006-08-04 10:42:26.921175663 +0100
    2.22 +@@ -4589,10 +4589,10 @@
    2.23           /* XXX: better handling of removal */
    2.24           for(ioh = first_io_handler; ioh != NULL; ioh = ioh_next) {
    2.25               ioh_next = ioh->next;
     3.1 --- a/tools/ioemu/patches/vnc-fixes	Fri Aug 04 10:42:02 2006 +0100
     3.2 +++ b/tools/ioemu/patches/vnc-fixes	Fri Aug 04 10:43:02 2006 +0100
     3.3 @@ -1,8 +1,8 @@
     3.4  Index: ioemu/vl.c
     3.5  ===================================================================
     3.6 ---- ioemu.orig/vl.c	2006-07-27 11:17:00.724138358 +0100
     3.7 -+++ ioemu/vl.c	2006-07-27 11:17:00.874121755 +0100
     3.8 -@@ -6004,8 +6004,10 @@
     3.9 +--- ioemu.orig/vl.c	2006-08-04 10:42:26.921175663 +0100
    3.10 ++++ ioemu/vl.c	2006-08-04 10:42:27.107154171 +0100
    3.11 +@@ -6012,8 +6012,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-07-27 11:17:00.722138579 +0100
    3.20 -+++ ioemu/vnc.c	2006-07-27 11:17:00.875121644 +0100
    3.21 +--- ioemu.orig/vnc.c	2006-08-04 10:42:26.918176009 +0100
    3.22 ++++ ioemu/vnc.c	2006-08-04 10:42:27.108154056 +0100
    3.23  @@ -3,6 +3,7 @@
    3.24    * 
    3.25    * Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws>
    3.26 @@ -493,9 +493,9 @@ Index: ioemu/vnc.c
    3.27   }
    3.28  Index: ioemu/vl.h
    3.29  ===================================================================
    3.30 ---- ioemu.orig/vl.h	2006-07-27 11:17:00.311184072 +0100
    3.31 -+++ ioemu/vl.h	2006-07-27 11:17:00.875121644 +0100
    3.32 -@@ -301,6 +301,7 @@
    3.33 +--- ioemu.orig/vl.h	2006-08-04 10:42:26.724198425 +0100
    3.34 ++++ ioemu/vl.h	2006-08-04 10:42:27.108154056 +0100
    3.35 +@@ -302,6 +302,7 @@
    3.36   int is_graphic_console(void);
    3.37   CharDriverState *text_console_init(DisplayState *ds);
    3.38   void console_select(unsigned int index);
     4.1 --- a/tools/ioemu/patches/vnc-start-vncviewer	Fri Aug 04 10:42:02 2006 +0100
     4.2 +++ b/tools/ioemu/patches/vnc-start-vncviewer	Fri Aug 04 10:43:02 2006 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  Index: ioemu/vnc.c
     4.5  ===================================================================
     4.6 ---- ioemu.orig/vnc.c	2006-07-27 11:17:00.875121644 +0100
     4.7 -+++ ioemu/vnc.c	2006-07-27 11:17:01.032104266 +0100
     4.8 +--- ioemu.orig/vnc.c	2006-08-04 10:42:27.108154056 +0100
     4.9 ++++ ioemu/vnc.c	2006-08-04 10:42:27.272135106 +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-07-27 11:17:00.874121755 +0100
    4.18 -+++ ioemu/vl.c	2006-07-27 11:17:01.035103934 +0100
    4.19 +--- ioemu.orig/vl.c	2006-08-04 10:42:27.107154171 +0100
    4.20 ++++ ioemu/vl.c	2006-08-04 10:42:27.276134644 +0100
    4.21  @@ -121,6 +121,7 @@
    4.22   int bios_size;
    4.23   static DisplayState display_state;
    4.24 @@ -40,15 +40,15 @@ Index: ioemu/vl.c
    4.25   const char* keyboard_layout = NULL;
    4.26   int64_t ticks_per_sec;
    4.27   int boot_device = 'c';
    4.28 -@@ -4802,6 +4803,7 @@
    4.29 +@@ -4804,6 +4805,7 @@
    4.30   #endif
    4.31              "-loadvm file    start right away with a saved state (loadvm in monitor)\n"
    4.32   	   "-vnc display    start a VNC server on display\n"
    4.33  +           "-vncviewer      start a vncviewer process for this domain\n"
    4.34              "-timeoffset     time offset (in seconds) from local time\n"
    4.35 +            "-acpi           disable or enable ACPI of HVM domain \n"
    4.36              "\n"
    4.37 -            "During emulation, the following keys are useful:\n"
    4.38 -@@ -4890,6 +4892,7 @@
    4.39 +@@ -4893,6 +4895,7 @@
    4.40       QEMU_OPTION_usbdevice,
    4.41       QEMU_OPTION_smp,
    4.42       QEMU_OPTION_vnc,
    4.43 @@ -56,7 +56,7 @@ Index: ioemu/vl.c
    4.44   
    4.45       QEMU_OPTION_d,
    4.46       QEMU_OPTION_vcpus,
    4.47 -@@ -4965,6 +4968,7 @@
    4.48 +@@ -4969,6 +4972,7 @@
    4.49       { "usbdevice", HAS_ARG, QEMU_OPTION_usbdevice },
    4.50       { "smp", HAS_ARG, QEMU_OPTION_smp },
    4.51       { "vnc", HAS_ARG, QEMU_OPTION_vnc },
    4.52 @@ -64,7 +64,7 @@ Index: ioemu/vl.c
    4.53       
    4.54       /* temporary options */
    4.55       { "usb", 0, QEMU_OPTION_usb },
    4.56 -@@ -5295,6 +5299,7 @@
    4.57 +@@ -5300,6 +5304,7 @@
    4.58   #endif
    4.59       snapshot = 0;
    4.60       nographic = 0;
    4.61 @@ -72,7 +72,7 @@ Index: ioemu/vl.c
    4.62       kernel_filename = NULL;
    4.63       kernel_cmdline = "";
    4.64   #ifdef TARGET_PPC
    4.65 -@@ -5664,6 +5669,9 @@
    4.66 +@@ -5669,6 +5674,9 @@
    4.67   		    exit(1);
    4.68   		}
    4.69   		break;
    4.70 @@ -82,7 +82,7 @@ Index: ioemu/vl.c
    4.71               case QEMU_OPTION_domainname:
    4.72                   strncat(domain_name, optarg, sizeof(domain_name) - 20);
    4.73                   break;
    4.74 -@@ -5911,6 +5919,8 @@
    4.75 +@@ -5919,6 +5927,8 @@
    4.76           dumb_display_init(ds);
    4.77       } else if (vnc_display != -1) {
    4.78   	vnc_display_init(ds, vnc_display);
    4.79 @@ -93,9 +93,9 @@ Index: ioemu/vl.c
    4.80           sdl_display_init(ds, full_screen);
    4.81  Index: ioemu/vl.h
    4.82  ===================================================================
    4.83 ---- ioemu.orig/vl.h	2006-07-27 11:17:00.875121644 +0100
    4.84 -+++ ioemu/vl.h	2006-07-27 11:17:01.036103823 +0100
    4.85 -@@ -733,6 +733,7 @@
    4.86 +--- ioemu.orig/vl.h	2006-08-04 10:42:27.108154056 +0100
    4.87 ++++ ioemu/vl.h	2006-08-04 10:42:27.277134528 +0100
    4.88 +@@ -734,6 +734,7 @@
    4.89   
    4.90   /* vnc.c */
    4.91   void vnc_display_init(DisplayState *ds, int display);
     5.1 --- a/tools/ioemu/patches/xenstore-block-device-config	Fri Aug 04 10:42:02 2006 +0100
     5.2 +++ b/tools/ioemu/patches/xenstore-block-device-config	Fri Aug 04 10:43:02 2006 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  Index: ioemu/Makefile.target
     5.5  ===================================================================
     5.6 ---- ioemu.orig/Makefile.target	2006-08-03 17:57:38.861210420 +0100
     5.7 -+++ ioemu/Makefile.target	2006-08-03 17:58:02.317549891 +0100
     5.8 +--- ioemu.orig/Makefile.target	2006-08-04 10:42:26.718199119 +0100
     5.9 ++++ ioemu/Makefile.target	2006-08-04 10:42:27.563101483 +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-03 17:58:02.326548870 +0100
    5.18 ++++ ioemu/xenstore.c	2006-08-04 10:42:27.564101367 +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,9 +204,9 @@ Index: ioemu/xenstore.c
    5.23  +}
    5.24  Index: ioemu/vl.c
    5.25  ===================================================================
    5.26 ---- ioemu.orig/vl.c	2006-08-03 17:57:38.867209740 +0100
    5.27 -+++ ioemu/vl.c	2006-08-03 17:58:02.323549210 +0100
    5.28 -@@ -4709,9 +4709,11 @@
    5.29 +--- ioemu.orig/vl.c	2006-08-04 10:42:27.276134644 +0100
    5.30 ++++ ioemu/vl.c	2006-08-04 10:42:27.567101020 +0100
    5.31 +@@ -4711,9 +4711,11 @@
    5.32              "Standard options:\n"
    5.33              "-M machine      select emulated machine (-M ? for list)\n"
    5.34              "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n"
    5.35 @@ -218,7 +218,7 @@ Index: ioemu/vl.c
    5.36              "-boot [a|c|d]   boot on floppy (a), hard disk (c) or CD-ROM (d)\n"
    5.37   	   "-snapshot       write to temporary files instead of disk image files\n"
    5.38              "-m megs         set virtual RAM size to megs MB [default=%d]\n"
    5.39 -@@ -4841,11 +4843,13 @@
    5.40 +@@ -4844,11 +4846,13 @@
    5.41       QEMU_OPTION_M,
    5.42       QEMU_OPTION_fda,
    5.43       QEMU_OPTION_fdb,
    5.44 @@ -232,7 +232,7 @@ Index: ioemu/vl.c
    5.45       QEMU_OPTION_boot,
    5.46       QEMU_OPTION_snapshot,
    5.47       QEMU_OPTION_m,
    5.48 -@@ -4911,11 +4915,13 @@
    5.49 +@@ -4915,11 +4919,13 @@
    5.50       { "M", HAS_ARG, QEMU_OPTION_M },
    5.51       { "fda", HAS_ARG, QEMU_OPTION_fda },
    5.52       { "fdb", HAS_ARG, QEMU_OPTION_fdb },
    5.53 @@ -246,7 +246,7 @@ Index: ioemu/vl.c
    5.54       { "boot", HAS_ARG, QEMU_OPTION_boot },
    5.55       { "snapshot", 0, QEMU_OPTION_snapshot },
    5.56       { "m", HAS_ARG, QEMU_OPTION_m },
    5.57 -@@ -5250,10 +5256,16 @@
    5.58 +@@ -5255,10 +5261,16 @@
    5.59   #ifdef CONFIG_GDBSTUB
    5.60       int use_gdbstub, gdbstub_port;
    5.61   #endif
    5.62 @@ -265,7 +265,7 @@ Index: ioemu/vl.c
    5.63       const char *kernel_filename, *kernel_cmdline;
    5.64       DisplayState *ds = &display_state;
    5.65       int cyls, heads, secs, translation;
    5.66 -@@ -5288,8 +5300,10 @@
    5.67 +@@ -5293,8 +5305,10 @@
    5.68       initrd_filename = NULL;
    5.69       for(i = 0; i < MAX_FD; i++)
    5.70           fd_filename[i] = NULL;
    5.71 @@ -276,7 +276,7 @@ Index: ioemu/vl.c
    5.72       ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
    5.73       vga_ram_size = VGA_RAM_SIZE;
    5.74       bios_size = BIOS_SIZE;
    5.75 -@@ -5302,11 +5316,13 @@
    5.76 +@@ -5307,11 +5321,13 @@
    5.77       vncviewer = 0;
    5.78       kernel_filename = NULL;
    5.79       kernel_cmdline = "";
    5.80 @@ -290,7 +290,7 @@ Index: ioemu/vl.c
    5.81       cyls = heads = secs = 0;
    5.82       translation = BIOS_ATA_TRANSLATION_AUTO;
    5.83       pstrcpy(monitor_device, sizeof(monitor_device), "vc");
    5.84 -@@ -5339,7 +5355,11 @@
    5.85 +@@ -5344,7 +5360,11 @@
    5.86               break;
    5.87           r = argv[optind];
    5.88           if (r[0] != '-') {
    5.89 @@ -302,7 +302,7 @@ Index: ioemu/vl.c
    5.90           } else {
    5.91               const QEMUOption *popt;
    5.92   
    5.93 -@@ -5383,6 +5403,7 @@
    5.94 +@@ -5388,6 +5408,7 @@
    5.95               case QEMU_OPTION_initrd:
    5.96                   initrd_filename = optarg;
    5.97                   break;
    5.98 @@ -310,7 +310,7 @@ Index: ioemu/vl.c
    5.99               case QEMU_OPTION_hda:
   5.100               case QEMU_OPTION_hdb:
   5.101               case QEMU_OPTION_hdc:
   5.102 -@@ -5395,6 +5416,7 @@
   5.103 +@@ -5400,6 +5421,7 @@
   5.104                           cdrom_index = -1;
   5.105                   }
   5.106                   break;
   5.107 @@ -318,7 +318,7 @@ Index: ioemu/vl.c
   5.108               case QEMU_OPTION_snapshot:
   5.109                   snapshot = 1;
   5.110                   break;
   5.111 -@@ -5447,11 +5469,13 @@
   5.112 +@@ -5452,11 +5474,13 @@
   5.113               case QEMU_OPTION_append:
   5.114                   kernel_cmdline = optarg;
   5.115                   break;
   5.116 @@ -332,7 +332,7 @@ Index: ioemu/vl.c
   5.117               case QEMU_OPTION_boot:
   5.118                   boot_device = optarg[0];
   5.119                   if (boot_device != 'a' && 
   5.120 -@@ -5690,12 +5714,18 @@
   5.121 +@@ -5698,12 +5722,18 @@
   5.122           }
   5.123       }
   5.124   
   5.125 @@ -351,7 +351,7 @@ Index: ioemu/vl.c
   5.126       if (!linux_boot && 
   5.127           hd_filename[0] == '\0' && 
   5.128           (cdrom_index >= 0 && hd_filename[cdrom_index] == '\0') &&
   5.129 -@@ -5709,6 +5739,7 @@
   5.130 +@@ -5717,6 +5747,7 @@
   5.131           else
   5.132               boot_device = 'd';
   5.133       }
   5.134 @@ -359,7 +359,7 @@ Index: ioemu/vl.c
   5.135   
   5.136   #if !defined(CONFIG_SOFTMMU)
   5.137       /* must avoid mmap() usage of glibc by setting a buffer "by hand" */
   5.138 -@@ -5848,6 +5879,7 @@
   5.139 +@@ -5856,6 +5887,7 @@
   5.140   
   5.141   #endif /* !CONFIG_DM */
   5.142   
   5.143 @@ -367,7 +367,7 @@ Index: ioemu/vl.c
   5.144       /* we always create the cdrom drive, even if no disk is there */
   5.145       bdrv_init();
   5.146       if (cdrom_index >= 0) {
   5.147 -@@ -5874,6 +5906,7 @@
   5.148 +@@ -5882,6 +5914,7 @@
   5.149               }
   5.150           }
   5.151       }
   5.152 @@ -375,7 +375,7 @@ Index: ioemu/vl.c
   5.153   
   5.154       /* we always create at least one floppy disk */
   5.155       fd_table[0] = bdrv_new("fda");
   5.156 -@@ -6009,6 +6042,8 @@
   5.157 +@@ -6017,6 +6050,8 @@
   5.158   #endif
   5.159       init_timers();
   5.160   
   5.161 @@ -386,8 +386,8 @@ Index: ioemu/vl.c
   5.162                     kernel_filename, kernel_cmdline, initrd_filename,
   5.163  Index: ioemu/monitor.c
   5.164  ===================================================================
   5.165 ---- ioemu.orig/monitor.c	2006-08-03 17:57:38.864210080 +0100
   5.166 -+++ ioemu/monitor.c	2006-08-03 17:58:02.321549437 +0100
   5.167 +--- ioemu.orig/monitor.c	2006-08-04 10:42:25.965286125 +0100
   5.168 ++++ ioemu/monitor.c	2006-08-04 10:42:27.568100905 +0100
   5.169  @@ -24,6 +24,7 @@
   5.170   #include "vl.h"
   5.171   #include "disas.h"
   5.172 @@ -416,8 +416,8 @@ Index: ioemu/monitor.c
   5.173       int i;
   5.174  Index: ioemu/block.c
   5.175  ===================================================================
   5.176 ---- ioemu.orig/block.c	2006-08-03 17:57:38.861210420 +0100
   5.177 -+++ ioemu/block.c	2006-08-03 17:58:02.318549777 +0100
   5.178 +--- ioemu.orig/block.c	2006-08-04 10:42:19.406044135 +0100
   5.179 ++++ ioemu/block.c	2006-08-04 10:42:27.568100905 +0100
   5.180  @@ -750,6 +750,7 @@
   5.181   static void raw_close(BlockDriverState *bs)
   5.182   {
   5.183 @@ -428,9 +428,9 @@ Index: ioemu/block.c
   5.184   
   5.185  Index: ioemu/vl.h
   5.186  ===================================================================
   5.187 ---- ioemu.orig/vl.h	2006-08-03 17:57:38.868209627 +0100
   5.188 -+++ ioemu/vl.h	2006-08-03 17:58:02.324549097 +0100
   5.189 -@@ -1092,6 +1092,8 @@
   5.190 +--- ioemu.orig/vl.h	2006-08-04 10:42:27.277134528 +0100
   5.191 ++++ ioemu/vl.h	2006-08-04 10:42:27.569100789 +0100
   5.192 +@@ -1093,6 +1093,8 @@
   5.193   void term_print_help(void);
   5.194   void monitor_readline(const char *prompt, int is_password,
   5.195                         char *buf, int buf_size);
   5.196 @@ -439,7 +439,7 @@ Index: ioemu/vl.h
   5.197   
   5.198   /* readline.c */
   5.199   typedef void ReadLineFunc(void *opaque, const char *str);
   5.200 -@@ -1104,6 +1106,13 @@
   5.201 +@@ -1105,6 +1107,13 @@
   5.202   void readline_start(const char *prompt, int is_password,
   5.203                       ReadLineFunc *readline_func, void *opaque);
   5.204   
   5.205 @@ -455,8 +455,8 @@ Index: ioemu/vl.h
   5.206   extern char domain_name[];
   5.207  Index: ioemu/hw/ide.c
   5.208  ===================================================================
   5.209 ---- ioemu.orig/hw/ide.c	2006-08-03 17:57:38.863210194 +0100
   5.210 -+++ ioemu/hw/ide.c	2006-08-03 17:58:02.319549664 +0100
   5.211 +--- ioemu.orig/hw/ide.c	2006-08-04 10:42:26.391236902 +0100
   5.212 ++++ ioemu/hw/ide.c	2006-08-04 10:42:27.571100558 +0100
   5.213  @@ -1279,6 +1279,7 @@
   5.214           } else {
   5.215               ide_atapi_cmd_error(s, SENSE_NOT_READY, 
     6.1 --- a/tools/ioemu/patches/xenstore-write-vnc-port	Fri Aug 04 10:42:02 2006 +0100
     6.2 +++ b/tools/ioemu/patches/xenstore-write-vnc-port	Fri Aug 04 10:43:02 2006 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  Index: ioemu/xenstore.c
     6.5  ===================================================================
     6.6 ---- ioemu.orig/xenstore.c	2006-08-03 19:17:18.496119877 +0100
     6.7 -+++ ioemu/xenstore.c	2006-08-03 19:18:29.428258503 +0100
     6.8 +--- ioemu.orig/xenstore.c	2006-08-04 10:42:27.564101367 +0100
     6.9 ++++ ioemu/xenstore.c	2006-08-04 10:42:27.771077449 +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-03 19:17:18.499119544 +0100
    6.18 -+++ ioemu/vl.c	2006-08-03 19:18:29.427258614 +0100
    6.19 -@@ -5954,6 +5954,7 @@
    6.20 +--- ioemu.orig/vl.c	2006-08-04 10:42:27.567101020 +0100
    6.21 ++++ ioemu/vl.c	2006-08-04 10:42:27.774077103 +0100
    6.22 +@@ -5962,6 +5962,7 @@
    6.23   	vnc_display_init(ds, vnc_display);
    6.24   	if (vncviewer)
    6.25   	    vnc_start_viewer(vnc_display);
    6.26 @@ -48,9 +48,9 @@ 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-03 19:17:18.501119323 +0100
    6.31 -+++ ioemu/vl.h	2006-08-03 19:18:29.428258503 +0100
    6.32 -@@ -1111,6 +1111,7 @@
    6.33 +--- ioemu.orig/vl.h	2006-08-04 10:42:27.569100789 +0100
    6.34 ++++ ioemu/vl.h	2006-08-04 10:42:27.775076987 +0100
    6.35 +@@ -1112,6 +1112,7 @@
    6.36   int xenstore_fd(void);
    6.37   void xenstore_process_event(void *opaque);
    6.38   void xenstore_check_new_media_present(int timeout);