ia64/xen-unstable

changeset 11030:15304ad81c50

[qemu patches] Update patches for changeset 10998:bd04004865ba.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Wed Aug 09 15:05:12 2006 +0100 (2006-08-09)
parents bd04004865ba
children fc6c3d866477 b60ea69932b1
files tools/ioemu/patches/domain-timeoffset tools/ioemu/patches/series tools/ioemu/patches/vnc-display-find-unused 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	Wed Aug 09 15:03:38 2006 +0100
     1.2 +++ b/tools/ioemu/patches/domain-timeoffset	Wed Aug 09 15:05:12 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-08 11:27:33.924822567 +0100
     1.7 -+++ ioemu/hw/mc146818rtc.c	2006-08-08 11:28:01.929698228 +0100
     1.8 +--- ioemu.orig/hw/mc146818rtc.c	2006-08-09 15:04:17.857242121 +0100
     1.9 ++++ ioemu/hw/mc146818rtc.c	2006-08-09 15:04:24.588603423 +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-08 11:27:58.117123572 +0100
    1.18 -+++ ioemu/hw/pc.c	2006-08-08 11:28:01.930698117 +0100
    1.19 +--- ioemu.orig/hw/pc.c	2006-08-09 15:04:24.316629266 +0100
    1.20 ++++ ioemu/hw/pc.c	2006-08-09 15:04:24.589603328 +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-08 11:28:01.787714069 +0100
    1.29 -+++ ioemu/vl.c	2006-08-08 11:28:01.933697782 +0100
    1.30 +--- ioemu.orig/vl.c	2006-08-09 15:04:24.457615869 +0100
    1.31 ++++ ioemu/vl.c	2006-08-09 15:04:24.592603043 +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-08 11:28:01.517744187 +0100
    1.40 -+++ ioemu/vl.h	2006-08-08 11:28:01.934697671 +0100
    1.41 +--- ioemu.orig/vl.h	2006-08-09 15:04:24.321628791 +0100
    1.42 ++++ ioemu/vl.h	2006-08-09 15:04:24.593602948 +0100
    1.43  @@ -575,7 +575,7 @@
    1.44                                    int boot_device,
    1.45                DisplayState *ds, const char **fd_filename, int snapshot,
     2.1 --- a/tools/ioemu/patches/series	Wed Aug 09 15:03:38 2006 +0100
     2.2 +++ b/tools/ioemu/patches/series	Wed Aug 09 15:05:12 2006 +0100
     2.3 @@ -34,6 +34,7 @@ vnc-fixes
     2.4  vnc-start-vncviewer
     2.5  vnc-title-domain-name
     2.6  vnc-access-monitor-vt
     2.7 +vnc-display-find-unused
     2.8  xenstore-block-device-config
     2.9  xenstore-write-vnc-port
    2.10  qemu-allow-disable-sdl
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/tools/ioemu/patches/vnc-display-find-unused	Wed Aug 09 15:05:12 2006 +0100
     3.3 @@ -0,0 +1,128 @@
     3.4 +Index: ioemu/vnc.c
     3.5 +===================================================================
     3.6 +--- ioemu.orig/vnc.c	2006-08-09 14:44:44.721942535 +0100
     3.7 ++++ ioemu/vnc.c	2006-08-09 14:52:37.262165292 +0100
     3.8 +@@ -1183,7 +1183,7 @@
     3.9 +     }
    3.10 + }
    3.11 + 
    3.12 +-void vnc_display_init(DisplayState *ds, int display)
    3.13 ++int vnc_display_init(DisplayState *ds, int display, int find_unused)
    3.14 + {
    3.15 +     struct sockaddr_in addr;
    3.16 +     int reuse_addr, ret;
    3.17 +@@ -1214,10 +1214,6 @@
    3.18 + 	exit(1);
    3.19 +     }
    3.20 + 
    3.21 +-    addr.sin_family = AF_INET;
    3.22 +-    addr.sin_port = htons(5900 + display);
    3.23 +-    memset(&addr.sin_addr, 0, sizeof(addr.sin_addr));
    3.24 +-
    3.25 +     reuse_addr = 1;
    3.26 +     ret = setsockopt(vs->lsock, SOL_SOCKET, SO_REUSEADDR,
    3.27 + 		     (const char *)&reuse_addr, sizeof(reuse_addr));
    3.28 +@@ -1226,7 +1222,16 @@
    3.29 + 	exit(1);
    3.30 +     }
    3.31 + 
    3.32 ++ retry:
    3.33 ++    addr.sin_family = AF_INET;
    3.34 ++    addr.sin_port = htons(5900 + display);
    3.35 ++    memset(&addr.sin_addr, 0, sizeof(addr.sin_addr));
    3.36 ++
    3.37 +     if (bind(vs->lsock, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
    3.38 ++	if (find_unused && errno == EADDRINUSE) {
    3.39 ++	    display++;
    3.40 ++	    goto retry;
    3.41 ++	}
    3.42 + 	fprintf(stderr, "bind() failed\n");
    3.43 + 	exit(1);
    3.44 +     }
    3.45 +@@ -1247,6 +1252,8 @@
    3.46 +     vs->ds->dpy_refresh = vnc_dpy_refresh;
    3.47 + 
    3.48 +     vnc_dpy_resize(vs->ds, 640, 400);
    3.49 ++
    3.50 ++    return display;
    3.51 + }
    3.52 + 
    3.53 + int vnc_start_viewer(int port)
    3.54 +Index: ioemu/vl.c
    3.55 +===================================================================
    3.56 +--- ioemu.orig/vl.c	2006-08-09 14:44:44.721942535 +0100
    3.57 ++++ ioemu/vl.c	2006-08-09 14:52:06.783905832 +0100
    3.58 +@@ -121,6 +121,7 @@
    3.59 + static DisplayState display_state;
    3.60 + int nographic;
    3.61 + int vncviewer;
    3.62 ++int vncunused;
    3.63 + const char* keyboard_layout = NULL;
    3.64 + int64_t ticks_per_sec;
    3.65 + int boot_device = 'c';
    3.66 +@@ -5342,6 +5343,7 @@
    3.67 +            "-loadvm file    start right away with a saved state (loadvm in monitor)\n"
    3.68 + 	   "-vnc display    start a VNC server on display\n"
    3.69 +            "-vncviewer      start a vncviewer process for this domain\n"
    3.70 ++           "-vncunused      bind the VNC server to an unused port\n"
    3.71 +            "-timeoffset     time offset (in seconds) from local time\n"
    3.72 +            "-acpi           disable or enable ACPI of HVM domain \n"
    3.73 +            "\n"
    3.74 +@@ -5431,6 +5433,7 @@
    3.75 +     QEMU_OPTION_timeoffset,
    3.76 +     QEMU_OPTION_acpi,
    3.77 +     QEMU_OPTION_vncviewer,
    3.78 ++    QEMU_OPTION_vncunused,
    3.79 + };
    3.80 + 
    3.81 + typedef struct QEMUOption {
    3.82 +@@ -5506,6 +5509,7 @@
    3.83 +     { "smp", HAS_ARG, QEMU_OPTION_smp },
    3.84 +     { "vnc", HAS_ARG, QEMU_OPTION_vnc },
    3.85 +     { "vncviewer", 0, QEMU_OPTION_vncviewer },
    3.86 ++    { "vncunused", 0, QEMU_OPTION_vncunused },
    3.87 +     
    3.88 +     /* temporary options */
    3.89 +     { "usb", 0, QEMU_OPTION_usb },
    3.90 +@@ -5873,6 +5877,7 @@
    3.91 +     snapshot = 0;
    3.92 +     nographic = 0;
    3.93 +     vncviewer = 0;
    3.94 ++    vncunused = 0;
    3.95 +     kernel_filename = NULL;
    3.96 +     kernel_cmdline = "";
    3.97 + #ifdef TARGET_PPC
    3.98 +@@ -6270,6 +6275,11 @@
    3.99 +             case QEMU_OPTION_vncviewer:
   3.100 +                 vncviewer++;
   3.101 +                 break;
   3.102 ++            case QEMU_OPTION_vncunused:
   3.103 ++                vncunused++;
   3.104 ++                if (vnc_display == -1)
   3.105 ++                    vnc_display = -2;
   3.106 ++                break;
   3.107 +             }
   3.108 +         }
   3.109 +     }
   3.110 +@@ -6465,7 +6475,7 @@
   3.111 +     if (nographic) {
   3.112 +         dumb_display_init(ds);
   3.113 +     } else if (vnc_display != -1) {
   3.114 +-	vnc_display_init(ds, vnc_display);
   3.115 ++	vnc_display = vnc_display_init(ds, vnc_display, vncunused);
   3.116 + 	if (vncviewer)
   3.117 + 	    vnc_start_viewer(vnc_display);
   3.118 +     } else {
   3.119 +Index: ioemu/vl.h
   3.120 +===================================================================
   3.121 +--- ioemu.orig/vl.h	2006-08-09 14:44:44.721942535 +0100
   3.122 ++++ ioemu/vl.h	2006-08-09 14:52:06.783905832 +0100
   3.123 +@@ -784,7 +784,7 @@
   3.124 + void cocoa_display_init(DisplayState *ds, int full_screen);
   3.125 + 
   3.126 + /* vnc.c */
   3.127 +-void vnc_display_init(DisplayState *ds, int display);
   3.128 ++int vnc_display_init(DisplayState *ds, int display, int find_unused);
   3.129 + int vnc_start_viewer(int port);
   3.130 + 
   3.131 + /* ide.c */
     4.1 --- a/tools/ioemu/patches/xen-support-buffered-ioreqs	Wed Aug 09 15:03:38 2006 +0100
     4.2 +++ b/tools/ioemu/patches/xen-support-buffered-ioreqs	Wed Aug 09 15:05:12 2006 +0100
     4.3 @@ -1,8 +1,8 @@
     4.4  Index: ioemu/vl.c
     4.5  ===================================================================
     4.6 ---- ioemu.orig/vl.c	2006-08-08 14:33:30.000000000 +0100
     4.7 -+++ ioemu/vl.c	2006-08-08 14:43:34.000000000 +0100
     4.8 -@@ -5834,6 +5834,7 @@
     4.9 +--- ioemu.orig/vl.c	2006-08-09 15:04:25.583508863 +0100
    4.10 ++++ ioemu/vl.c	2006-08-09 15:04:26.034465993 +0100
    4.11 +@@ -5838,6 +5838,7 @@
    4.12       unsigned long nr_pages;
    4.13       xen_pfn_t *page_array;
    4.14       extern void *shared_page;
    4.15 @@ -10,7 +10,7 @@ Index: ioemu/vl.c
    4.16   
    4.17       char qemu_dm_logfilename[64];
    4.18   
    4.19 -@@ -6378,12 +6379,17 @@
    4.20 +@@ -6388,12 +6389,17 @@
    4.21   
    4.22       phys_ram_base = xc_map_foreign_batch(xc_handle, domid,
    4.23                                            PROT_READ|PROT_WRITE, page_array,
    4.24 @@ -31,8 +31,8 @@ Index: ioemu/vl.c
    4.25                                          page_array[nr_pages - 1]);
    4.26  Index: ioemu/target-i386-dm/helper2.c
    4.27  ===================================================================
    4.28 ---- ioemu.orig/target-i386-dm/helper2.c	2006-08-08 14:33:30.000000000 +0100
    4.29 -+++ ioemu/target-i386-dm/helper2.c	2006-08-09 10:03:40.558744653 +0100
    4.30 +--- ioemu.orig/target-i386-dm/helper2.c	2006-08-09 15:04:24.105649313 +0100
    4.31 ++++ ioemu/target-i386-dm/helper2.c	2006-08-09 15:04:26.040465422 +0100
    4.32  @@ -76,6 +76,10 @@
    4.33   
    4.34   shared_iopage_t *shared_page = NULL;
     5.1 --- a/tools/ioemu/patches/xenstore-block-device-config	Wed Aug 09 15:03:38 2006 +0100
     5.2 +++ b/tools/ioemu/patches/xenstore-block-device-config	Wed Aug 09 15:05:12 2006 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  Index: ioemu/Makefile.target
     5.5  ===================================================================
     5.6 ---- ioemu.orig/Makefile.target	2006-08-07 17:42:27.802386071 +0100
     5.7 -+++ ioemu/Makefile.target	2006-08-07 17:42:28.683289358 +0100
     5.8 +--- ioemu.orig/Makefile.target	2006-08-09 15:04:24.795583755 +0100
     5.9 ++++ ioemu/Makefile.target	2006-08-09 15:04:25.373528824 +0100
    5.10  @@ -358,6 +358,7 @@
    5.11   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
    5.12   VL_OBJS+= usb-uhci.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-07 17:42:28.684289249 +0100
    5.18 ++++ ioemu/xenstore.c	2006-08-09 15:04:25.374528729 +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-07 17:42:28.393320909 +0100
    5.27 -+++ ioemu/vl.c	2006-08-07 17:42:28.687288922 +0100
    5.28 -@@ -5242,9 +5242,11 @@
    5.29 +--- ioemu.orig/vl.c	2006-08-09 15:04:25.312534622 +0100
    5.30 ++++ ioemu/vl.c	2006-08-09 15:04:25.377528443 +0100
    5.31 +@@ -5243,9 +5243,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   #ifdef TARGET_I386
    5.39 -@@ -5370,11 +5372,13 @@
    5.40 +@@ -5372,11 +5374,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   #ifdef TARGET_I386
    5.48 -@@ -5445,11 +5449,13 @@
    5.49 +@@ -5448,11 +5452,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   #ifdef TARGET_I386
    5.57 -@@ -5797,10 +5803,16 @@
    5.58 +@@ -5801,10 +5807,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 -@@ -5861,8 +5873,10 @@
    5.67 +@@ -5865,8 +5877,10 @@
    5.68       initrd_filename = NULL;
    5.69       for(i = 0; i < MAX_FD; i++)
    5.70           fd_filename[i] = NULL;
    5.71 @@ -276,8 +276,8 @@ 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 -@@ -5875,11 +5889,13 @@
    5.76 -     vncviewer = 0;
    5.77 +@@ -5880,11 +5894,13 @@
    5.78 +     vncunused = 0;
    5.79       kernel_filename = NULL;
    5.80       kernel_cmdline = "";
    5.81  +#ifndef CONFIG_DM
    5.82 @@ -290,7 +290,7 @@ Index: ioemu/vl.c
    5.83       cyls = heads = secs = 0;
    5.84       translation = BIOS_ATA_TRANSLATION_AUTO;
    5.85       pstrcpy(monitor_device, sizeof(monitor_device), "vc");
    5.86 -@@ -5912,7 +5928,11 @@
    5.87 +@@ -5917,7 +5933,11 @@
    5.88               break;
    5.89           r = argv[optind];
    5.90           if (r[0] != '-') {
    5.91 @@ -302,7 +302,7 @@ Index: ioemu/vl.c
    5.92           } else {
    5.93               const QEMUOption *popt;
    5.94   
    5.95 -@@ -5956,6 +5976,7 @@
    5.96 +@@ -5961,6 +5981,7 @@
    5.97               case QEMU_OPTION_initrd:
    5.98                   initrd_filename = optarg;
    5.99                   break;
   5.100 @@ -310,7 +310,7 @@ Index: ioemu/vl.c
   5.101               case QEMU_OPTION_hda:
   5.102               case QEMU_OPTION_hdb:
   5.103               case QEMU_OPTION_hdc:
   5.104 -@@ -5968,6 +5989,7 @@
   5.105 +@@ -5973,6 +5994,7 @@
   5.106                           cdrom_index = -1;
   5.107                   }
   5.108                   break;
   5.109 @@ -318,7 +318,7 @@ Index: ioemu/vl.c
   5.110               case QEMU_OPTION_snapshot:
   5.111                   snapshot = 1;
   5.112                   break;
   5.113 -@@ -6020,11 +6042,13 @@
   5.114 +@@ -6025,11 +6047,13 @@
   5.115               case QEMU_OPTION_append:
   5.116                   kernel_cmdline = optarg;
   5.117                   break;
   5.118 @@ -332,7 +332,7 @@ Index: ioemu/vl.c
   5.119               case QEMU_OPTION_boot:
   5.120                   boot_device = optarg[0];
   5.121                   if (boot_device != 'a' && 
   5.122 -@@ -6274,12 +6298,18 @@
   5.123 +@@ -6284,12 +6308,18 @@
   5.124           }
   5.125       }
   5.126   
   5.127 @@ -351,7 +351,7 @@ Index: ioemu/vl.c
   5.128       if (!linux_boot && 
   5.129           hd_filename[0] == '\0' && 
   5.130           (cdrom_index >= 0 && hd_filename[cdrom_index] == '\0') &&
   5.131 -@@ -6293,6 +6323,7 @@
   5.132 +@@ -6303,6 +6333,7 @@
   5.133           else
   5.134               boot_device = 'd';
   5.135       }
   5.136 @@ -359,7 +359,7 @@ Index: ioemu/vl.c
   5.137   
   5.138       setvbuf(stdout, NULL, _IOLBF, 0);
   5.139       
   5.140 -@@ -6407,6 +6438,7 @@
   5.141 +@@ -6417,6 +6448,7 @@
   5.142   
   5.143   #endif /* !CONFIG_DM */
   5.144   
   5.145 @@ -367,7 +367,7 @@ Index: ioemu/vl.c
   5.146       /* we always create the cdrom drive, even if no disk is there */
   5.147       bdrv_init();
   5.148       if (cdrom_index >= 0) {
   5.149 -@@ -6433,6 +6465,7 @@
   5.150 +@@ -6443,6 +6475,7 @@
   5.151               }
   5.152           }
   5.153       }
   5.154 @@ -375,7 +375,7 @@ Index: ioemu/vl.c
   5.155   
   5.156       /* we always create at least one floppy disk */
   5.157       fd_table[0] = bdrv_new("fda");
   5.158 -@@ -6511,6 +6544,8 @@
   5.159 +@@ -6521,6 +6554,8 @@
   5.160           }
   5.161       }
   5.162   
   5.163 @@ -386,8 +386,8 @@ Index: ioemu/vl.c
   5.164                     kernel_filename, kernel_cmdline, initrd_filename,
   5.165  Index: ioemu/monitor.c
   5.166  ===================================================================
   5.167 ---- ioemu.orig/monitor.c	2006-08-07 17:42:27.132461888 +0100
   5.168 -+++ ioemu/monitor.c	2006-08-07 17:42:28.688288814 +0100
   5.169 +--- ioemu.orig/monitor.c	2006-08-09 15:04:24.105649313 +0100
   5.170 ++++ ioemu/monitor.c	2006-08-09 15:04:25.379528253 +0100
   5.171  @@ -24,6 +24,7 @@
   5.172   #include "vl.h"
   5.173   #include "disas.h"
   5.174 @@ -416,8 +416,8 @@ Index: ioemu/monitor.c
   5.175       int i;
   5.176  Index: ioemu/block.c
   5.177  ===================================================================
   5.178 ---- ioemu.orig/block.c	2006-08-07 17:42:21.704076241 +0100
   5.179 -+++ ioemu/block.c	2006-08-07 17:42:28.689288705 +0100
   5.180 +--- ioemu.orig/block.c	2006-08-09 15:04:17.487277167 +0100
   5.181 ++++ ioemu/block.c	2006-08-09 15:04:25.379528253 +0100
   5.182  @@ -758,6 +758,7 @@
   5.183   static void raw_close(BlockDriverState *bs)
   5.184   {
   5.185 @@ -428,8 +428,8 @@ Index: ioemu/block.c
   5.186   
   5.187  Index: ioemu/vl.h
   5.188  ===================================================================
   5.189 ---- ioemu.orig/vl.h	2006-08-07 17:42:28.394320800 +0100
   5.190 -+++ ioemu/vl.h	2006-08-07 17:42:28.689288705 +0100
   5.191 +--- ioemu.orig/vl.h	2006-08-09 15:04:25.313534527 +0100
   5.192 ++++ ioemu/vl.h	2006-08-09 15:04:25.380528158 +0100
   5.193  @@ -1184,6 +1184,8 @@
   5.194   void term_print_help(void);
   5.195   void monitor_readline(const char *prompt, int is_password,
   5.196 @@ -455,8 +455,8 @@ Index: ioemu/vl.h
   5.197   extern char domain_name[];
   5.198  Index: ioemu/hw/ide.c
   5.199  ===================================================================
   5.200 ---- ioemu.orig/hw/ide.c	2006-08-07 17:42:27.552414361 +0100
   5.201 -+++ ioemu/hw/ide.c	2006-08-07 17:42:28.691288487 +0100
   5.202 +--- ioemu.orig/hw/ide.c	2006-08-09 15:04:24.524609503 +0100
   5.203 ++++ ioemu/hw/ide.c	2006-08-09 15:04:25.381528063 +0100
   5.204  @@ -1158,6 +1158,7 @@
   5.205           } else {
   5.206               ide_atapi_cmd_error(s, SENSE_NOT_READY, 
     6.1 --- a/tools/ioemu/patches/xenstore-write-vnc-port	Wed Aug 09 15:03:38 2006 +0100
     6.2 +++ b/tools/ioemu/patches/xenstore-write-vnc-port	Wed Aug 09 15:05:12 2006 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  Index: ioemu/xenstore.c
     6.5  ===================================================================
     6.6 ---- ioemu.orig/xenstore.c	2006-08-07 17:42:28.684289249 +0100
     6.7 -+++ ioemu/xenstore.c	2006-08-07 17:42:28.891266728 +0100
     6.8 +--- ioemu.orig/xenstore.c	2006-08-09 15:04:25.374528729 +0100
     6.9 ++++ ioemu/xenstore.c	2006-08-09 15:04:25.579509243 +0100
    6.10  @@ -185,3 +185,31 @@
    6.11       free(image);
    6.12       free(vec);
    6.13 @@ -36,10 +36,10 @@ Index: ioemu/xenstore.c
    6.14  +}
    6.15  Index: ioemu/vl.c
    6.16  ===================================================================
    6.17 ---- ioemu.orig/vl.c	2006-08-07 17:42:28.687288922 +0100
    6.18 -+++ ioemu/vl.c	2006-08-07 17:42:28.894266401 +0100
    6.19 -@@ -6501,6 +6501,7 @@
    6.20 - 	vnc_display_init(ds, vnc_display);
    6.21 +--- ioemu.orig/vl.c	2006-08-09 15:04:25.377528443 +0100
    6.22 ++++ ioemu/vl.c	2006-08-09 15:04:25.583508863 +0100
    6.23 +@@ -6511,6 +6511,7 @@
    6.24 + 	vnc_display = vnc_display_init(ds, vnc_display, vncunused);
    6.25   	if (vncviewer)
    6.26   	    vnc_start_viewer(vnc_display);
    6.27  +	xenstore_write_vncport(vnc_display);
    6.28 @@ -48,8 +48,8 @@ Index: ioemu/vl.c
    6.29           sdl_display_init(ds, full_screen);
    6.30  Index: ioemu/vl.h
    6.31  ===================================================================
    6.32 ---- ioemu.orig/vl.h	2006-08-07 17:42:28.689288705 +0100
    6.33 -+++ ioemu/vl.h	2006-08-07 17:42:28.895266293 +0100
    6.34 +--- ioemu.orig/vl.h	2006-08-09 15:04:25.380528158 +0100
    6.35 ++++ ioemu/vl.h	2006-08-09 15:04:25.584508768 +0100
    6.36  @@ -1203,6 +1203,7 @@
    6.37   int xenstore_fd(void);
    6.38   void xenstore_process_event(void *opaque);