ia64/xen-unstable

changeset 11571:043f8799e68e

[qemu patches] Refresh.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author Christian Limpach <Christian.Limpach@xensource.com>
date Thu Sep 21 19:33:51 2006 +0100 (2006-09-21)
parents 7706696ff532
children 8c29bf7ede67
files tools/ioemu/patches/domain-timeoffset tools/ioemu/patches/qemu-bootorder tools/ioemu/patches/qemu-daemonize tools/ioemu/patches/vnc-access-monitor-vt tools/ioemu/patches/vnc-display-find-unused tools/ioemu/patches/vnc-title-domain-name 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/domain-timeoffset	Thu Sep 21 19:33:07 2006 +0100
     1.2 +++ b/tools/ioemu/patches/domain-timeoffset	Thu Sep 21 19:33:51 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-17 19:58:03.222720593 +0100
     1.7 -+++ ioemu/hw/mc146818rtc.c	2006-08-17 19:58:08.528134087 +0100
     1.8 +--- ioemu.orig/hw/mc146818rtc.c	2006-09-21 19:33:25.000000000 +0100
     1.9 ++++ ioemu/hw/mc146818rtc.c	2006-09-21 19:33:30.000000000 +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-17 19:58:08.252164595 +0100
    1.18 -+++ ioemu/hw/pc.c	2006-08-17 19:58:08.529133976 +0100
    1.19 +--- ioemu.orig/hw/pc.c	2006-09-21 19:33:30.000000000 +0100
    1.20 ++++ ioemu/hw/pc.c	2006-09-21 19:33:30.000000000 +0100
    1.21  @@ -159,7 +159,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-17 19:58:08.395148788 +0100
    1.29 -+++ ioemu/vl.c	2006-08-17 19:58:08.532133645 +0100
    1.30 +--- ioemu.orig/vl.c	2006-09-21 19:33:30.000000000 +0100
    1.31 ++++ ioemu/vl.c	2006-09-21 19:33:30.000000000 +0100
    1.32  @@ -163,6 +163,8 @@
    1.33   
    1.34   int xc_handle;
    1.35 @@ -174,8 +174,8 @@ Index: ioemu/vl.c
    1.36       if (usb_enabled) {
    1.37  Index: ioemu/vl.h
    1.38  ===================================================================
    1.39 ---- ioemu.orig/vl.h	2006-08-17 19:58:08.257164042 +0100
    1.40 -+++ ioemu/vl.h	2006-08-17 19:58:08.532133645 +0100
    1.41 +--- ioemu.orig/vl.h	2006-09-21 19:33:30.000000000 +0100
    1.42 ++++ ioemu/vl.h	2006-09-21 19:33:30.000000000 +0100
    1.43  @@ -576,7 +576,7 @@
    1.44                                    int boot_device,
    1.45                DisplayState *ds, const char **fd_filename, int snapshot,
     2.1 --- a/tools/ioemu/patches/qemu-bootorder	Thu Sep 21 19:33:07 2006 +0100
     2.2 +++ b/tools/ioemu/patches/qemu-bootorder	Thu Sep 21 19:33:51 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  Index: ioemu/vl.c
     2.5  ===================================================================
     2.6 ---- ioemu.orig/vl.c	2006-08-20 22:22:36.000000000 +0100
     2.7 -+++ ioemu/vl.c	2006-08-20 23:22:25.000000000 +0100
     2.8 +--- ioemu.orig/vl.c	2006-09-21 19:33:32.000000000 +0100
     2.9 ++++ ioemu/vl.c	2006-09-21 19:33:32.000000000 +0100
    2.10  @@ -124,7 +124,7 @@
    2.11   int vncunused;
    2.12   const char* keyboard_layout = NULL;
    2.13 @@ -11,7 +11,7 @@ Index: ioemu/vl.c
    2.14   uint64_t ram_size;
    2.15   int pit_min_timer_count = 0;
    2.16   int nb_nics;
    2.17 -@@ -6057,14 +6057,14 @@
    2.18 +@@ -6063,14 +6063,14 @@
    2.19                   break;
    2.20   #endif /* !CONFIG_DM */
    2.21               case QEMU_OPTION_boot:
    2.22 @@ -32,7 +32,7 @@ Index: ioemu/vl.c
    2.23                       exit(1);
    2.24                   }
    2.25                   break;
    2.26 -@@ -6328,6 +6328,7 @@
    2.27 +@@ -6334,6 +6334,7 @@
    2.28           fd_filename[0] == '\0')
    2.29           help();
    2.30       
    2.31 @@ -40,7 +40,7 @@ Index: ioemu/vl.c
    2.32       /* boot to cd by default if no hard disk */
    2.33       if (hd_filename[0] == '\0' && boot_device == 'c') {
    2.34           if (fd_filename[0] != '\0')
    2.35 -@@ -6335,6 +6336,7 @@
    2.36 +@@ -6341,6 +6342,7 @@
    2.37           else
    2.38               boot_device = 'd';
    2.39       }
    2.40 @@ -48,7 +48,7 @@ Index: ioemu/vl.c
    2.41   #endif /* !CONFIG_DM */
    2.42   
    2.43       setvbuf(stdout, NULL, _IOLBF, 0);
    2.44 -@@ -6593,6 +6595,7 @@
    2.45 +@@ -6599,6 +6601,7 @@
    2.46                     ds, fd_filename, snapshot,
    2.47                     kernel_filename, kernel_cmdline, initrd_filename,
    2.48                     timeoffset);
    2.49 @@ -58,9 +58,9 @@ Index: ioemu/vl.c
    2.50       if (usb_enabled) {
    2.51  Index: ioemu/vl.h
    2.52  ===================================================================
    2.53 ---- ioemu.orig/vl.h	2006-08-20 22:22:36.000000000 +0100
    2.54 -+++ ioemu/vl.h	2006-08-20 23:22:25.000000000 +0100
    2.55 -@@ -575,7 +575,7 @@
    2.56 +--- ioemu.orig/vl.h	2006-09-21 19:33:32.000000000 +0100
    2.57 ++++ ioemu/vl.h	2006-09-21 19:33:32.000000000 +0100
    2.58 +@@ -576,7 +576,7 @@
    2.59   #ifndef QEMU_TOOL
    2.60   
    2.61   typedef void QEMUMachineInitFunc(uint64_t ram_size, int vga_ram_size, 
    2.62 @@ -69,7 +69,7 @@ Index: ioemu/vl.h
    2.63                DisplayState *ds, const char **fd_filename, int snapshot,
    2.64                const char *kernel_filename, const char *kernel_cmdline,
    2.65                const char *initrd_filename, time_t timeoffset);
    2.66 -@@ -1020,7 +1020,7 @@
    2.67 +@@ -1021,7 +1021,7 @@
    2.68                       uint32_t start, uint32_t count);
    2.69   int PPC_NVRAM_set_params (m48t59_t *nvram, uint16_t NVRAM_size,
    2.70                             const unsigned char *arch,
    2.71 @@ -80,8 +80,8 @@ Index: ioemu/vl.h
    2.72                             uint32_t initrd_image, uint32_t initrd_size,
    2.73  Index: ioemu/hw/pc.c
    2.74  ===================================================================
    2.75 ---- ioemu.orig/hw/pc.c	2006-08-20 22:22:36.000000000 +0100
    2.76 -+++ ioemu/hw/pc.c	2006-08-20 23:27:55.000000000 +0100
    2.77 +--- ioemu.orig/hw/pc.c	2006-09-21 19:33:32.000000000 +0100
    2.78 ++++ ioemu/hw/pc.c	2006-09-21 19:33:32.000000000 +0100
    2.79  @@ -158,8 +158,23 @@
    2.80       rtc_set_memory(s, info_ofs + 8, sectors);
    2.81   }
     3.1 --- a/tools/ioemu/patches/qemu-daemonize	Thu Sep 21 19:33:07 2006 +0100
     3.2 +++ b/tools/ioemu/patches/qemu-daemonize	Thu Sep 21 19:33:51 2006 +0100
     3.3 @@ -2,9 +2,9 @@ Changes required because qemu-dm runs da
     3.4  
     3.5  Index: ioemu/vl.c
     3.6  ===================================================================
     3.7 ---- ioemu.orig/vl.c	2006-08-16 15:11:32.575865776 +0100
     3.8 -+++ ioemu/vl.c	2006-08-16 15:11:36.217465702 +0100
     3.9 -@@ -6036,10 +6036,11 @@
    3.10 +--- ioemu.orig/vl.c	2006-09-21 19:33:32.000000000 +0100
    3.11 ++++ ioemu/vl.c	2006-09-21 19:33:32.000000000 +0100
    3.12 +@@ -6042,10 +6042,11 @@
    3.13                   }
    3.14                   break;
    3.15               case QEMU_OPTION_nographic:
     4.1 --- a/tools/ioemu/patches/vnc-access-monitor-vt	Thu Sep 21 19:33:07 2006 +0100
     4.2 +++ b/tools/ioemu/patches/vnc-access-monitor-vt	Thu Sep 21 19:33:51 2006 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  Index: ioemu/vnc.c
     4.5  ===================================================================
     4.6 ---- ioemu.orig/vnc.c	2006-09-21 19:10:57.000000000 +0100
     4.7 -+++ ioemu/vnc.c	2006-09-21 19:11:00.000000000 +0100
     4.8 +--- ioemu.orig/vnc.c	2006-09-21 19:33:31.000000000 +0100
     4.9 ++++ ioemu/vnc.c	2006-09-21 19:33:31.000000000 +0100
    4.10  @@ -32,6 +32,10 @@
    4.11   #include "vnc_keysym.h"
    4.12   #include "keymaps.c"
    4.13 @@ -22,7 +22,7 @@ Index: ioemu/vnc.c
    4.14   };
    4.15   
    4.16   #define DIRTY_PIXEL_BITS 64
    4.17 -@@ -790,16 +796,80 @@
    4.18 +@@ -791,16 +797,80 @@
    4.19   
    4.20   static void do_key_event(VncState *vs, int down, uint32_t sym)
    4.21   {
     5.1 --- a/tools/ioemu/patches/vnc-display-find-unused	Thu Sep 21 19:33:07 2006 +0100
     5.2 +++ b/tools/ioemu/patches/vnc-display-find-unused	Thu Sep 21 19:33:51 2006 +0100
     5.3 @@ -1,8 +1,8 @@
     5.4  Index: ioemu/vnc.c
     5.5  ===================================================================
     5.6 ---- ioemu.orig/vnc.c	2006-09-21 19:11:00.000000000 +0100
     5.7 -+++ ioemu/vnc.c	2006-09-21 19:11:03.000000000 +0100
     5.8 -@@ -1181,7 +1181,7 @@
     5.9 +--- ioemu.orig/vnc.c	2006-09-21 19:33:31.000000000 +0100
    5.10 ++++ ioemu/vnc.c	2006-09-21 19:33:31.000000000 +0100
    5.11 +@@ -1182,7 +1182,7 @@
    5.12       }
    5.13   }
    5.14   
    5.15 @@ -11,7 +11,7 @@ Index: ioemu/vnc.c
    5.16   {
    5.17       struct sockaddr_in addr;
    5.18       int reuse_addr, ret;
    5.19 -@@ -1212,10 +1212,6 @@
    5.20 +@@ -1213,10 +1213,6 @@
    5.21   	exit(1);
    5.22       }
    5.23   
    5.24 @@ -22,7 +22,7 @@ Index: ioemu/vnc.c
    5.25       reuse_addr = 1;
    5.26       ret = setsockopt(vs->lsock, SOL_SOCKET, SO_REUSEADDR,
    5.27   		     (const char *)&reuse_addr, sizeof(reuse_addr));
    5.28 -@@ -1224,7 +1220,16 @@
    5.29 +@@ -1225,7 +1221,16 @@
    5.30   	exit(1);
    5.31       }
    5.32   
    5.33 @@ -39,7 +39,7 @@ Index: ioemu/vnc.c
    5.34   	fprintf(stderr, "bind() failed\n");
    5.35   	exit(1);
    5.36       }
    5.37 -@@ -1245,6 +1250,8 @@
    5.38 +@@ -1246,6 +1251,8 @@
    5.39       vs->ds->dpy_refresh = vnc_dpy_refresh;
    5.40   
    5.41       vnc_dpy_resize(vs->ds, 640, 400);
    5.42 @@ -50,8 +50,8 @@ Index: ioemu/vnc.c
    5.43   int vnc_start_viewer(int port)
    5.44  Index: ioemu/vl.c
    5.45  ===================================================================
    5.46 ---- ioemu.orig/vl.c	2006-09-21 19:10:53.000000000 +0100
    5.47 -+++ ioemu/vl.c	2006-09-21 19:11:03.000000000 +0100
    5.48 +--- ioemu.orig/vl.c	2006-09-21 19:33:31.000000000 +0100
    5.49 ++++ ioemu/vl.c	2006-09-21 19:33:31.000000000 +0100
    5.50  @@ -121,6 +121,7 @@
    5.51   static DisplayState display_state;
    5.52   int nographic;
    5.53 @@ -115,8 +115,8 @@ Index: ioemu/vl.c
    5.54       } else {
    5.55  Index: ioemu/vl.h
    5.56  ===================================================================
    5.57 ---- ioemu.orig/vl.h	2006-09-21 19:10:53.000000000 +0100
    5.58 -+++ ioemu/vl.h	2006-09-21 19:11:03.000000000 +0100
    5.59 +--- ioemu.orig/vl.h	2006-09-21 19:33:31.000000000 +0100
    5.60 ++++ ioemu/vl.h	2006-09-21 19:33:31.000000000 +0100
    5.61  @@ -785,7 +785,7 @@
    5.62   void cocoa_display_init(DisplayState *ds, int full_screen);
    5.63   
     6.1 --- a/tools/ioemu/patches/vnc-title-domain-name	Thu Sep 21 19:33:07 2006 +0100
     6.2 +++ b/tools/ioemu/patches/vnc-title-domain-name	Thu Sep 21 19:33:51 2006 +0100
     6.3 @@ -1,8 +1,8 @@
     6.4  Index: ioemu/vnc.c
     6.5  ===================================================================
     6.6 ---- ioemu.orig/vnc.c	2006-09-21 19:10:53.000000000 +0100
     6.7 -+++ ioemu/vnc.c	2006-09-21 19:10:57.000000000 +0100
     6.8 -@@ -1012,6 +1012,7 @@
     6.9 +--- ioemu.orig/vnc.c	2006-09-21 19:33:31.000000000 +0100
    6.10 ++++ ioemu/vnc.c	2006-09-21 19:33:31.000000000 +0100
    6.11 +@@ -1013,6 +1013,7 @@
    6.12   
    6.13   static int protocol_client_init(VncState *vs, char *data, size_t len)
    6.14   {
    6.15 @@ -10,7 +10,7 @@ Index: ioemu/vnc.c
    6.16       char pad[3] = { 0, 0, 0 };
    6.17   
    6.18       vs->width = vs->ds->width;
    6.19 -@@ -1057,8 +1058,10 @@
    6.20 +@@ -1058,8 +1059,10 @@
    6.21   	
    6.22       vnc_write(vs, pad, 3);           /* padding */
    6.23   
     7.1 --- a/tools/ioemu/patches/xen-platform-device	Thu Sep 21 19:33:07 2006 +0100
     7.2 +++ b/tools/ioemu/patches/xen-platform-device	Thu Sep 21 19:33:51 2006 +0100
     7.3 @@ -3,8 +3,8 @@ will come later.
     7.4  
     7.5  Index: ioemu/Makefile.target
     7.6  ===================================================================
     7.7 ---- ioemu.orig/Makefile.target	2006-09-21 11:30:11.000000000 +0100
     7.8 -+++ ioemu/Makefile.target	2006-09-21 11:30:12.000000000 +0100
     7.9 +--- ioemu.orig/Makefile.target	2006-09-21 19:33:31.000000000 +0100
    7.10 ++++ ioemu/Makefile.target	2006-09-21 19:33:32.000000000 +0100
    7.11  @@ -359,6 +359,7 @@
    7.12   VL_OBJS+= usb-uhci.o
    7.13   VL_OBJS+= piix4acpi.o
    7.14 @@ -15,8 +15,8 @@ Index: ioemu/Makefile.target
    7.15   ifeq ($(TARGET_BASE_ARCH), ppc)
    7.16  Index: ioemu/hw/pc.c
    7.17  ===================================================================
    7.18 ---- ioemu.orig/hw/pc.c	2006-09-21 11:30:11.000000000 +0100
    7.19 -+++ ioemu/hw/pc.c	2006-09-21 11:31:14.000000000 +0100
    7.20 +--- ioemu.orig/hw/pc.c	2006-09-21 19:33:31.000000000 +0100
    7.21 ++++ ioemu/hw/pc.c	2006-09-21 19:33:32.000000000 +0100
    7.22  @@ -823,6 +823,9 @@
    7.23       }
    7.24   #endif /* !CONFIG_DM */
    7.25 @@ -30,7 +30,7 @@ Index: ioemu/hw/pc.c
    7.26  Index: ioemu/hw/xen_platform.c
    7.27  ===================================================================
    7.28  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    7.29 -+++ ioemu/hw/xen_platform.c	2006-09-21 11:31:26.000000000 +0100
    7.30 ++++ ioemu/hw/xen_platform.c	2006-09-21 19:33:32.000000000 +0100
    7.31  @@ -0,0 +1,138 @@
    7.32  +/*
    7.33  + * XEN platform fake pci device, formerly known as the event channel device
    7.34 @@ -172,9 +172,9 @@ Index: ioemu/hw/xen_platform.c
    7.35  +}
    7.36  Index: ioemu/vl.h
    7.37  ===================================================================
    7.38 ---- ioemu.orig/vl.h	2006-09-21 11:30:11.000000000 +0100
    7.39 -+++ ioemu/vl.h	2006-09-21 11:31:14.000000000 +0100
    7.40 -@@ -1209,6 +1209,9 @@
    7.41 +--- ioemu.orig/vl.h	2006-09-21 19:33:32.000000000 +0100
    7.42 ++++ ioemu/vl.h	2006-09-21 19:33:32.000000000 +0100
    7.43 +@@ -1210,6 +1210,9 @@
    7.44   void xenstore_check_new_media_present(int timeout);
    7.45   void xenstore_write_vncport(int vnc_display);
    7.46   
     8.1 --- a/tools/ioemu/patches/xen-support-buffered-ioreqs	Thu Sep 21 19:33:07 2006 +0100
     8.2 +++ b/tools/ioemu/patches/xen-support-buffered-ioreqs	Thu Sep 21 19:33:51 2006 +0100
     8.3 @@ -1,8 +1,8 @@
     8.4  Index: ioemu/vl.c
     8.5  ===================================================================
     8.6 ---- ioemu.orig/vl.c	2006-08-17 19:50:22.277673633 +0100
     8.7 -+++ ioemu/vl.c	2006-08-17 19:55:21.878556486 +0100
     8.8 -@@ -5838,6 +5838,7 @@
     8.9 +--- ioemu.orig/vl.c	2006-09-21 19:33:32.000000000 +0100
    8.10 ++++ ioemu/vl.c	2006-09-21 19:33:32.000000000 +0100
    8.11 +@@ -5844,6 +5844,7 @@
    8.12       unsigned long nr_pages, tmp_nr_pages, shared_page_nr;
    8.13       xen_pfn_t *page_array;
    8.14       extern void *shared_page;
    8.15 @@ -10,7 +10,7 @@ Index: ioemu/vl.c
    8.16   
    8.17       char qemu_dm_logfilename[64];
    8.18   
    8.19 -@@ -6419,6 +6420,18 @@
    8.20 +@@ -6425,6 +6426,18 @@
    8.21       fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n",
    8.22               shared_page_nr, (uint64_t)(page_array[shared_page_nr]));
    8.23   
    8.24 @@ -31,8 +31,8 @@ Index: ioemu/vl.c
    8.25   #elif defined(__ia64__)
    8.26  Index: ioemu/target-i386-dm/helper2.c
    8.27  ===================================================================
    8.28 ---- ioemu.orig/target-i386-dm/helper2.c	2006-08-17 19:49:44.491850141 +0100
    8.29 -+++ ioemu/target-i386-dm/helper2.c	2006-08-17 19:50:41.490549986 +0100
    8.30 +--- ioemu.orig/target-i386-dm/helper2.c	2006-09-21 19:33:30.000000000 +0100
    8.31 ++++ ioemu/target-i386-dm/helper2.c	2006-09-21 19:33:32.000000000 +0100
    8.32  @@ -76,6 +76,10 @@
    8.33   
    8.34   shared_iopage_t *shared_page = NULL;
     9.1 --- a/tools/ioemu/patches/xenstore-block-device-config	Thu Sep 21 19:33:07 2006 +0100
     9.2 +++ b/tools/ioemu/patches/xenstore-block-device-config	Thu Sep 21 19:33:51 2006 +0100
     9.3 @@ -1,7 +1,7 @@
     9.4  Index: ioemu/Makefile.target
     9.5  ===================================================================
     9.6 ---- ioemu.orig/Makefile.target	2006-08-17 19:50:02.405870095 +0100
     9.7 -+++ ioemu/Makefile.target	2006-08-17 19:50:18.866050726 +0100
     9.8 +--- ioemu.orig/Makefile.target	2006-09-21 19:33:31.000000000 +0100
     9.9 ++++ ioemu/Makefile.target	2006-09-21 19:33:31.000000000 +0100
    9.10  @@ -358,6 +358,7 @@
    9.11   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
    9.12   VL_OBJS+= usb-uhci.o
    9.13 @@ -13,7 +13,7 @@ Index: ioemu/Makefile.target
    9.14  Index: ioemu/xenstore.c
    9.15  ===================================================================
    9.16  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    9.17 -+++ ioemu/xenstore.c	2006-08-17 19:50:18.867050616 +0100
    9.18 ++++ ioemu/xenstore.c	2006-09-21 19:33:31.000000000 +0100
    9.19  @@ -0,0 +1,187 @@
    9.20  +/*
    9.21  + * This file is subject to the terms and conditions of the GNU General
    9.22 @@ -204,9 +204,9 @@ Index: ioemu/xenstore.c
    9.23  +}
    9.24  Index: ioemu/vl.c
    9.25  ===================================================================
    9.26 ---- ioemu.orig/vl.c	2006-08-17 19:50:17.086247452 +0100
    9.27 -+++ ioemu/vl.c	2006-08-17 19:50:18.870050284 +0100
    9.28 -@@ -5243,9 +5243,11 @@
    9.29 +--- ioemu.orig/vl.c	2006-09-21 19:33:31.000000000 +0100
    9.30 ++++ ioemu/vl.c	2006-09-21 19:33:31.000000000 +0100
    9.31 +@@ -5249,9 +5249,11 @@
    9.32              "Standard options:\n"
    9.33              "-M machine      select emulated machine (-M ? for list)\n"
    9.34              "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n"
    9.35 @@ -218,7 +218,7 @@ Index: ioemu/vl.c
    9.36              "-boot [a|c|d]   boot on floppy (a), hard disk (c) or CD-ROM (d)\n"
    9.37   	   "-snapshot       write to temporary files instead of disk image files\n"
    9.38   #ifdef TARGET_I386
    9.39 -@@ -5372,11 +5374,13 @@
    9.40 +@@ -5378,11 +5380,13 @@
    9.41       QEMU_OPTION_M,
    9.42       QEMU_OPTION_fda,
    9.43       QEMU_OPTION_fdb,
    9.44 @@ -232,7 +232,7 @@ Index: ioemu/vl.c
    9.45       QEMU_OPTION_boot,
    9.46       QEMU_OPTION_snapshot,
    9.47   #ifdef TARGET_I386
    9.48 -@@ -5448,11 +5452,13 @@
    9.49 +@@ -5454,11 +5458,13 @@
    9.50       { "M", HAS_ARG, QEMU_OPTION_M },
    9.51       { "fda", HAS_ARG, QEMU_OPTION_fda },
    9.52       { "fdb", HAS_ARG, QEMU_OPTION_fdb },
    9.53 @@ -246,7 +246,7 @@ Index: ioemu/vl.c
    9.54       { "boot", HAS_ARG, QEMU_OPTION_boot },
    9.55       { "snapshot", 0, QEMU_OPTION_snapshot },
    9.56   #ifdef TARGET_I386
    9.57 -@@ -5801,10 +5807,16 @@
    9.58 +@@ -5807,10 +5813,16 @@
    9.59   #ifdef CONFIG_GDBSTUB
    9.60       int use_gdbstub, gdbstub_port;
    9.61   #endif
    9.62 @@ -265,7 +265,7 @@ Index: ioemu/vl.c
    9.63       const char *kernel_filename, *kernel_cmdline;
    9.64       DisplayState *ds = &display_state;
    9.65       int cyls, heads, secs, translation;
    9.66 -@@ -5865,8 +5877,10 @@
    9.67 +@@ -5871,8 +5883,10 @@
    9.68       initrd_filename = NULL;
    9.69       for(i = 0; i < MAX_FD; i++)
    9.70           fd_filename[i] = NULL;
    9.71 @@ -276,7 +276,7 @@ Index: ioemu/vl.c
    9.72       ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
    9.73       vga_ram_size = VGA_RAM_SIZE;
    9.74       bios_size = BIOS_SIZE;
    9.75 -@@ -5880,11 +5894,13 @@
    9.76 +@@ -5886,11 +5900,13 @@
    9.77       vncunused = 0;
    9.78       kernel_filename = NULL;
    9.79       kernel_cmdline = "";
    9.80 @@ -290,7 +290,7 @@ Index: ioemu/vl.c
    9.81       cyls = heads = secs = 0;
    9.82       translation = BIOS_ATA_TRANSLATION_AUTO;
    9.83       pstrcpy(monitor_device, sizeof(monitor_device), "vc");
    9.84 -@@ -5917,7 +5933,11 @@
    9.85 +@@ -5923,7 +5939,11 @@
    9.86               break;
    9.87           r = argv[optind];
    9.88           if (r[0] != '-') {
    9.89 @@ -302,7 +302,7 @@ Index: ioemu/vl.c
    9.90           } else {
    9.91               const QEMUOption *popt;
    9.92   
    9.93 -@@ -5961,6 +5981,7 @@
    9.94 +@@ -5967,6 +5987,7 @@
    9.95               case QEMU_OPTION_initrd:
    9.96                   initrd_filename = optarg;
    9.97                   break;
    9.98 @@ -310,7 +310,7 @@ Index: ioemu/vl.c
    9.99               case QEMU_OPTION_hda:
   9.100               case QEMU_OPTION_hdb:
   9.101               case QEMU_OPTION_hdc:
   9.102 -@@ -5973,6 +5994,7 @@
   9.103 +@@ -5979,6 +6000,7 @@
   9.104                           cdrom_index = -1;
   9.105                   }
   9.106                   break;
   9.107 @@ -318,7 +318,7 @@ Index: ioemu/vl.c
   9.108               case QEMU_OPTION_snapshot:
   9.109                   snapshot = 1;
   9.110                   break;
   9.111 -@@ -6025,11 +6047,13 @@
   9.112 +@@ -6031,11 +6053,13 @@
   9.113               case QEMU_OPTION_append:
   9.114                   kernel_cmdline = optarg;
   9.115                   break;
   9.116 @@ -332,7 +332,7 @@ Index: ioemu/vl.c
   9.117               case QEMU_OPTION_boot:
   9.118                   boot_device = optarg[0];
   9.119                   if (boot_device != 'a' && 
   9.120 -@@ -6284,12 +6308,18 @@
   9.121 +@@ -6290,12 +6314,18 @@
   9.122           }
   9.123       }
   9.124   
   9.125 @@ -351,7 +351,7 @@ Index: ioemu/vl.c
   9.126       if (!linux_boot && 
   9.127           hd_filename[0] == '\0' && 
   9.128           (cdrom_index >= 0 && hd_filename[cdrom_index] == '\0') &&
   9.129 -@@ -6303,6 +6333,7 @@
   9.130 +@@ -6309,6 +6339,7 @@
   9.131           else
   9.132               boot_device = 'd';
   9.133       }
   9.134 @@ -359,7 +359,7 @@ Index: ioemu/vl.c
   9.135   
   9.136       setvbuf(stdout, NULL, _IOLBF, 0);
   9.137       
   9.138 -@@ -6435,6 +6466,7 @@
   9.139 +@@ -6441,6 +6472,7 @@
   9.140   
   9.141   #endif /* !CONFIG_DM */
   9.142   
   9.143 @@ -367,7 +367,7 @@ Index: ioemu/vl.c
   9.144       /* we always create the cdrom drive, even if no disk is there */
   9.145       bdrv_init();
   9.146       if (cdrom_index >= 0) {
   9.147 -@@ -6461,6 +6493,7 @@
   9.148 +@@ -6467,6 +6499,7 @@
   9.149               }
   9.150           }
   9.151       }
   9.152 @@ -375,7 +375,7 @@ Index: ioemu/vl.c
   9.153   
   9.154       /* we always create at least one floppy disk */
   9.155       fd_table[0] = bdrv_new("fda");
   9.156 -@@ -6539,6 +6572,8 @@
   9.157 +@@ -6545,6 +6578,8 @@
   9.158           }
   9.159       }
   9.160   
   9.161 @@ -386,8 +386,8 @@ Index: ioemu/vl.c
   9.162                     kernel_filename, kernel_cmdline, initrd_filename,
   9.163  Index: ioemu/monitor.c
   9.164  ===================================================================
   9.165 ---- ioemu.orig/monitor.c	2006-08-17 19:49:44.491850141 +0100
   9.166 -+++ ioemu/monitor.c	2006-08-17 19:50:18.871050174 +0100
   9.167 +--- ioemu.orig/monitor.c	2006-09-21 19:33:30.000000000 +0100
   9.168 ++++ ioemu/monitor.c	2006-09-21 19:33:31.000000000 +0100
   9.169  @@ -24,6 +24,7 @@
   9.170   #include "vl.h"
   9.171   #include "disas.h"
   9.172 @@ -416,8 +416,8 @@ Index: ioemu/monitor.c
   9.173       int i;
   9.174  Index: ioemu/block.c
   9.175  ===================================================================
   9.176 ---- ioemu.orig/block.c	2006-08-17 19:37:35.865578948 +0100
   9.177 -+++ ioemu/block.c	2006-08-17 19:50:18.872050063 +0100
   9.178 +--- ioemu.orig/block.c	2006-09-21 19:33:25.000000000 +0100
   9.179 ++++ ioemu/block.c	2006-09-21 19:33:31.000000000 +0100
   9.180  @@ -758,6 +758,7 @@
   9.181   static void raw_close(BlockDriverState *bs)
   9.182   {
   9.183 @@ -428,9 +428,9 @@ Index: ioemu/block.c
   9.184   
   9.185  Index: ioemu/vl.h
   9.186  ===================================================================
   9.187 ---- ioemu.orig/vl.h	2006-08-17 19:50:17.087247341 +0100
   9.188 -+++ ioemu/vl.h	2006-08-17 19:50:18.872050063 +0100
   9.189 -@@ -1188,6 +1188,8 @@
   9.190 +--- ioemu.orig/vl.h	2006-09-21 19:33:31.000000000 +0100
   9.191 ++++ ioemu/vl.h	2006-09-21 19:33:31.000000000 +0100
   9.192 +@@ -1189,6 +1189,8 @@
   9.193   void term_print_help(void);
   9.194   void monitor_readline(const char *prompt, int is_password,
   9.195                         char *buf, int buf_size);
   9.196 @@ -439,7 +439,7 @@ Index: ioemu/vl.h
   9.197   
   9.198   /* readline.c */
   9.199   typedef void ReadLineFunc(void *opaque, const char *str);
   9.200 -@@ -1200,6 +1202,13 @@
   9.201 +@@ -1201,6 +1203,13 @@
   9.202   void readline_start(const char *prompt, int is_password,
   9.203                       ReadLineFunc *readline_func, void *opaque);
   9.204   
   9.205 @@ -455,8 +455,8 @@ Index: ioemu/vl.h
   9.206   extern char domain_name[];
   9.207  Index: ioemu/hw/ide.c
   9.208  ===================================================================
   9.209 ---- ioemu.orig/hw/ide.c	2006-08-17 19:49:57.830375828 +0100
   9.210 -+++ ioemu/hw/ide.c	2006-08-17 19:50:18.874049842 +0100
   9.211 +--- ioemu.orig/hw/ide.c	2006-09-21 19:33:30.000000000 +0100
   9.212 ++++ ioemu/hw/ide.c	2006-09-21 19:33:31.000000000 +0100
   9.213  @@ -1158,6 +1158,7 @@
   9.214           } else {
   9.215               ide_atapi_cmd_error(s, SENSE_NOT_READY, 
    10.1 --- a/tools/ioemu/patches/xenstore-write-vnc-port	Thu Sep 21 19:33:07 2006 +0100
    10.2 +++ b/tools/ioemu/patches/xenstore-write-vnc-port	Thu Sep 21 19:33:51 2006 +0100
    10.3 @@ -1,7 +1,7 @@
    10.4  Index: ioemu/xenstore.c
    10.5  ===================================================================
    10.6 ---- ioemu.orig/xenstore.c	2006-08-17 19:50:18.867050616 +0100
    10.7 -+++ ioemu/xenstore.c	2006-08-17 19:50:22.274673964 +0100
    10.8 +--- ioemu.orig/xenstore.c	2006-09-21 19:33:31.000000000 +0100
    10.9 ++++ ioemu/xenstore.c	2006-09-21 19:33:32.000000000 +0100
   10.10  @@ -185,3 +185,31 @@
   10.11       free(image);
   10.12       free(vec);
   10.13 @@ -36,9 +36,9 @@ Index: ioemu/xenstore.c
   10.14  +}
   10.15  Index: ioemu/vl.c
   10.16  ===================================================================
   10.17 ---- ioemu.orig/vl.c	2006-08-17 19:50:18.870050284 +0100
   10.18 -+++ ioemu/vl.c	2006-08-17 19:50:22.277673633 +0100
   10.19 -@@ -6529,6 +6529,7 @@
   10.20 +--- ioemu.orig/vl.c	2006-09-21 19:33:31.000000000 +0100
   10.21 ++++ ioemu/vl.c	2006-09-21 19:33:32.000000000 +0100
   10.22 +@@ -6535,6 +6535,7 @@
   10.23   	vnc_display = vnc_display_init(ds, vnc_display, vncunused);
   10.24   	if (vncviewer)
   10.25   	    vnc_start_viewer(vnc_display);
   10.26 @@ -48,9 +48,9 @@ Index: ioemu/vl.c
   10.27           sdl_display_init(ds, full_screen);
   10.28  Index: ioemu/vl.h
   10.29  ===================================================================
   10.30 ---- ioemu.orig/vl.h	2006-08-17 19:50:18.872050063 +0100
   10.31 -+++ ioemu/vl.h	2006-08-17 19:50:22.278673522 +0100
   10.32 -@@ -1207,6 +1207,7 @@
   10.33 +--- ioemu.orig/vl.h	2006-09-21 19:33:31.000000000 +0100
   10.34 ++++ ioemu/vl.h	2006-09-21 19:33:32.000000000 +0100
   10.35 +@@ -1208,6 +1208,7 @@
   10.36   int xenstore_fd(void);
   10.37   void xenstore_process_event(void *opaque);
   10.38   void xenstore_check_new_media_present(int timeout);