direct-io.hg

changeset 10938:36cf965711f6

[qemu patches] Refresh patches.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Fri Aug 04 10:53:11 2006 +0100 (2006-08-04)
parents 87346792fe90
children 5980fb28b050
files tools/ioemu/patches/domain-timeoffset 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:52:49 2006 +0100
     1.2 +++ b/tools/ioemu/patches/domain-timeoffset	Fri Aug 04 10:53:11 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:42:19.796998954 +0100
     1.7 -+++ ioemu/hw/mc146818rtc.c	2006-08-04 10:42:26.456229392 +0100
     1.8 +--- ioemu.orig/hw/mc146818rtc.c	2006-08-04 10:52:55.914499631 +0100
     1.9 ++++ ioemu/hw/mc146818rtc.c	2006-08-04 10:53:03.701599955 +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:42:26.185260705 +0100
    1.18 -+++ ioemu/hw/pc.c	2006-08-04 10:42:26.457229276 +0100
    1.19 +--- ioemu.orig/hw/pc.c	2006-08-04 10:53:03.431631144 +0100
    1.20 ++++ ioemu/hw/pc.c	2006-08-04 10:53:03.701599955 +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:42:26.324244644 +0100
    1.29 -+++ ioemu/vl.c	2006-08-04 10:42:26.459229045 +0100
    1.30 +--- ioemu.orig/vl.c	2006-08-04 10:53:03.571614972 +0100
    1.31 ++++ ioemu/vl.c	2006-08-04 10:53:03.704599608 +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 -@@ -5993,7 +6001,8 @@
    1.40 +@@ -6005,7 +6013,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:42:26.190260127 +0100
    1.49 -+++ ioemu/vl.h	2006-08-04 10:42:26.460228930 +0100
    1.50 +--- ioemu.orig/vl.h	2006-08-04 10:53:03.436630567 +0100
    1.51 ++++ ioemu/vl.h	2006-08-04 10:53:03.705599493 +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/vnc-fixes	Fri Aug 04 10:52:49 2006 +0100
     2.2 +++ b/tools/ioemu/patches/vnc-fixes	Fri Aug 04 10:53:11 2006 +0100
     2.3 @@ -1,8 +1,8 @@
     2.4  Index: ioemu/vl.c
     2.5  ===================================================================
     2.6 ---- ioemu.orig/vl.c	2006-08-04 10:42:26.921175663 +0100
     2.7 -+++ ioemu/vl.c	2006-08-04 10:42:27.107154171 +0100
     2.8 -@@ -6012,8 +6012,10 @@
     2.9 +--- ioemu.orig/vl.c	2006-08-04 10:53:04.142549012 +0100
    2.10 ++++ ioemu/vl.c	2006-08-04 10:53:04.206541619 +0100
    2.11 +@@ -6024,8 +6024,10 @@
    2.12                     kernel_filename, kernel_cmdline, initrd_filename,
    2.13                     timeoffset);
    2.14   
    2.15 @@ -17,8 +17,8 @@ Index: ioemu/vl.c
    2.16       if (use_gdbstub) {
    2.17  Index: ioemu/vnc.c
    2.18  ===================================================================
    2.19 ---- ioemu.orig/vnc.c	2006-08-04 10:42:26.918176009 +0100
    2.20 -+++ ioemu/vnc.c	2006-08-04 10:42:27.108154056 +0100
    2.21 +--- ioemu.orig/vnc.c	2006-08-04 10:53:04.139549358 +0100
    2.22 ++++ ioemu/vnc.c	2006-08-04 10:53:04.207541503 +0100
    2.23  @@ -3,6 +3,7 @@
    2.24    * 
    2.25    * Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws>
    2.26 @@ -493,8 +493,8 @@ Index: ioemu/vnc.c
    2.27   }
    2.28  Index: ioemu/vl.h
    2.29  ===================================================================
    2.30 ---- ioemu.orig/vl.h	2006-08-04 10:42:26.724198425 +0100
    2.31 -+++ ioemu/vl.h	2006-08-04 10:42:27.108154056 +0100
    2.32 +--- ioemu.orig/vl.h	2006-08-04 10:53:03.950571191 +0100
    2.33 ++++ ioemu/vl.h	2006-08-04 10:53:04.207541503 +0100
    2.34  @@ -302,6 +302,7 @@
    2.35   int is_graphic_console(void);
    2.36   CharDriverState *text_console_init(DisplayState *ds);
     3.1 --- a/tools/ioemu/patches/vnc-start-vncviewer	Fri Aug 04 10:52:49 2006 +0100
     3.2 +++ b/tools/ioemu/patches/vnc-start-vncviewer	Fri Aug 04 10:53:11 2006 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  Index: ioemu/vnc.c
     3.5  ===================================================================
     3.6 ---- ioemu.orig/vnc.c	2006-08-04 10:42:27.108154056 +0100
     3.7 -+++ ioemu/vnc.c	2006-08-04 10:42:27.272135106 +0100
     3.8 +--- ioemu.orig/vnc.c	2006-08-04 10:53:04.207541503 +0100
     3.9 ++++ ioemu/vnc.c	2006-08-04 10:53:04.370522674 +0100
    3.10  @@ -1002,3 +1002,25 @@
    3.11   
    3.12       vnc_dpy_resize(vs->ds, 640, 400);
    3.13 @@ -30,8 +30,8 @@ Index: ioemu/vnc.c
    3.14  +}
    3.15  Index: ioemu/vl.c
    3.16  ===================================================================
    3.17 ---- ioemu.orig/vl.c	2006-08-04 10:42:27.107154171 +0100
    3.18 -+++ ioemu/vl.c	2006-08-04 10:42:27.276134644 +0100
    3.19 +--- ioemu.orig/vl.c	2006-08-04 10:53:04.206541619 +0100
    3.20 ++++ ioemu/vl.c	2006-08-04 10:53:04.373522328 +0100
    3.21  @@ -121,6 +121,7 @@
    3.22   int bios_size;
    3.23   static DisplayState display_state;
    3.24 @@ -82,7 +82,7 @@ Index: ioemu/vl.c
    3.25               case QEMU_OPTION_domainname:
    3.26                   strncat(domain_name, optarg, sizeof(domain_name) - 20);
    3.27                   break;
    3.28 -@@ -5919,6 +5927,8 @@
    3.29 +@@ -5931,6 +5939,8 @@
    3.30           dumb_display_init(ds);
    3.31       } else if (vnc_display != -1) {
    3.32   	vnc_display_init(ds, vnc_display);
    3.33 @@ -93,8 +93,8 @@ Index: ioemu/vl.c
    3.34           sdl_display_init(ds, full_screen);
    3.35  Index: ioemu/vl.h
    3.36  ===================================================================
    3.37 ---- ioemu.orig/vl.h	2006-08-04 10:42:27.108154056 +0100
    3.38 -+++ ioemu/vl.h	2006-08-04 10:42:27.277134528 +0100
    3.39 +--- ioemu.orig/vl.h	2006-08-04 10:53:04.207541503 +0100
    3.40 ++++ ioemu/vl.h	2006-08-04 10:53:04.374522212 +0100
    3.41  @@ -734,6 +734,7 @@
    3.42   
    3.43   /* vnc.c */
     4.1 --- a/tools/ioemu/patches/xenstore-block-device-config	Fri Aug 04 10:52:49 2006 +0100
     4.2 +++ b/tools/ioemu/patches/xenstore-block-device-config	Fri Aug 04 10:53:11 2006 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  Index: ioemu/Makefile.target
     4.5  ===================================================================
     4.6 ---- ioemu.orig/Makefile.target	2006-08-04 10:42:26.718199119 +0100
     4.7 -+++ ioemu/Makefile.target	2006-08-04 10:42:27.563101483 +0100
     4.8 +--- ioemu.orig/Makefile.target	2006-08-04 10:53:03.944571884 +0100
     4.9 ++++ ioemu/Makefile.target	2006-08-04 10:53:04.659489290 +0100
    4.10  @@ -336,6 +336,7 @@
    4.11   VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
    4.12   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o
    4.13 @@ -13,7 +13,7 @@ Index: ioemu/Makefile.target
    4.14  Index: ioemu/xenstore.c
    4.15  ===================================================================
    4.16  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    4.17 -+++ ioemu/xenstore.c	2006-08-04 10:42:27.564101367 +0100
    4.18 ++++ ioemu/xenstore.c	2006-08-04 10:53:04.660489174 +0100
    4.19  @@ -0,0 +1,187 @@
    4.20  +/*
    4.21  + * This file is subject to the terms and conditions of the GNU General
    4.22 @@ -204,8 +204,8 @@ Index: ioemu/xenstore.c
    4.23  +}
    4.24  Index: ioemu/vl.c
    4.25  ===================================================================
    4.26 ---- ioemu.orig/vl.c	2006-08-04 10:42:27.276134644 +0100
    4.27 -+++ ioemu/vl.c	2006-08-04 10:42:27.567101020 +0100
    4.28 +--- ioemu.orig/vl.c	2006-08-04 10:53:04.373522328 +0100
    4.29 ++++ ioemu/vl.c	2006-08-04 10:53:04.663488828 +0100
    4.30  @@ -4711,9 +4711,11 @@
    4.31              "Standard options:\n"
    4.32              "-M machine      select emulated machine (-M ? for list)\n"
    4.33 @@ -359,7 +359,7 @@ Index: ioemu/vl.c
    4.34   
    4.35   #if !defined(CONFIG_SOFTMMU)
    4.36       /* must avoid mmap() usage of glibc by setting a buffer "by hand" */
    4.37 -@@ -5856,6 +5887,7 @@
    4.38 +@@ -5868,6 +5899,7 @@
    4.39   
    4.40   #endif /* !CONFIG_DM */
    4.41   
    4.42 @@ -367,7 +367,7 @@ Index: ioemu/vl.c
    4.43       /* we always create the cdrom drive, even if no disk is there */
    4.44       bdrv_init();
    4.45       if (cdrom_index >= 0) {
    4.46 -@@ -5882,6 +5914,7 @@
    4.47 +@@ -5894,6 +5926,7 @@
    4.48               }
    4.49           }
    4.50       }
    4.51 @@ -375,7 +375,7 @@ Index: ioemu/vl.c
    4.52   
    4.53       /* we always create at least one floppy disk */
    4.54       fd_table[0] = bdrv_new("fda");
    4.55 -@@ -6017,6 +6050,8 @@
    4.56 +@@ -6029,6 +6062,8 @@
    4.57   #endif
    4.58       init_timers();
    4.59   
    4.60 @@ -386,8 +386,8 @@ Index: ioemu/vl.c
    4.61                     kernel_filename, kernel_cmdline, initrd_filename,
    4.62  Index: ioemu/monitor.c
    4.63  ===================================================================
    4.64 ---- ioemu.orig/monitor.c	2006-08-04 10:42:25.965286125 +0100
    4.65 -+++ ioemu/monitor.c	2006-08-04 10:42:27.568100905 +0100
    4.66 +--- ioemu.orig/monitor.c	2006-08-04 10:53:03.222655287 +0100
    4.67 ++++ ioemu/monitor.c	2006-08-04 10:53:04.664488712 +0100
    4.68  @@ -24,6 +24,7 @@
    4.69   #include "vl.h"
    4.70   #include "disas.h"
    4.71 @@ -416,8 +416,8 @@ Index: ioemu/monitor.c
    4.72       int i;
    4.73  Index: ioemu/block.c
    4.74  ===================================================================
    4.75 ---- ioemu.orig/block.c	2006-08-04 10:42:19.406044135 +0100
    4.76 -+++ ioemu/block.c	2006-08-04 10:42:27.568100905 +0100
    4.77 +--- ioemu.orig/block.c	2006-08-04 10:52:55.582537986 +0100
    4.78 ++++ ioemu/block.c	2006-08-04 10:53:04.664488712 +0100
    4.79  @@ -750,6 +750,7 @@
    4.80   static void raw_close(BlockDriverState *bs)
    4.81   {
    4.82 @@ -428,8 +428,8 @@ Index: ioemu/block.c
    4.83   
    4.84  Index: ioemu/vl.h
    4.85  ===================================================================
    4.86 ---- ioemu.orig/vl.h	2006-08-04 10:42:27.277134528 +0100
    4.87 -+++ ioemu/vl.h	2006-08-04 10:42:27.569100789 +0100
    4.88 +--- ioemu.orig/vl.h	2006-08-04 10:53:04.374522212 +0100
    4.89 ++++ ioemu/vl.h	2006-08-04 10:53:04.665488597 +0100
    4.90  @@ -1093,6 +1093,8 @@
    4.91   void term_print_help(void);
    4.92   void monitor_readline(const char *prompt, int is_password,
    4.93 @@ -455,8 +455,8 @@ Index: ioemu/vl.h
    4.94   extern char domain_name[];
    4.95  Index: ioemu/hw/ide.c
    4.96  ===================================================================
    4.97 ---- ioemu.orig/hw/ide.c	2006-08-04 10:42:26.391236902 +0100
    4.98 -+++ ioemu/hw/ide.c	2006-08-04 10:42:27.571100558 +0100
    4.99 +--- ioemu.orig/hw/ide.c	2006-08-04 10:53:03.636607463 +0100
   4.100 ++++ ioemu/hw/ide.c	2006-08-04 10:53:04.666488481 +0100
   4.101  @@ -1279,6 +1279,7 @@
   4.102           } else {
   4.103               ide_atapi_cmd_error(s, SENSE_NOT_READY, 
     5.1 --- a/tools/ioemu/patches/xenstore-write-vnc-port	Fri Aug 04 10:52:49 2006 +0100
     5.2 +++ b/tools/ioemu/patches/xenstore-write-vnc-port	Fri Aug 04 10:53:11 2006 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  Index: ioemu/xenstore.c
     5.5  ===================================================================
     5.6 ---- ioemu.orig/xenstore.c	2006-08-04 10:42:27.564101367 +0100
     5.7 -+++ ioemu/xenstore.c	2006-08-04 10:42:27.771077449 +0100
     5.8 +--- ioemu.orig/xenstore.c	2006-08-04 10:53:04.660489174 +0100
     5.9 ++++ ioemu/xenstore.c	2006-08-04 10:53:04.865465494 +0100
    5.10  @@ -185,3 +185,31 @@
    5.11       free(image);
    5.12       free(vec);
    5.13 @@ -36,9 +36,9 @@ Index: ioemu/xenstore.c
    5.14  +}
    5.15  Index: ioemu/vl.c
    5.16  ===================================================================
    5.17 ---- ioemu.orig/vl.c	2006-08-04 10:42:27.567101020 +0100
    5.18 -+++ ioemu/vl.c	2006-08-04 10:42:27.774077103 +0100
    5.19 -@@ -5962,6 +5962,7 @@
    5.20 +--- ioemu.orig/vl.c	2006-08-04 10:53:04.663488828 +0100
    5.21 ++++ ioemu/vl.c	2006-08-04 10:53:04.868465147 +0100
    5.22 +@@ -5974,6 +5974,7 @@
    5.23   	vnc_display_init(ds, vnc_display);
    5.24   	if (vncviewer)
    5.25   	    vnc_start_viewer(vnc_display);
    5.26 @@ -48,8 +48,8 @@ Index: ioemu/vl.c
    5.27           sdl_display_init(ds, full_screen);
    5.28  Index: ioemu/vl.h
    5.29  ===================================================================
    5.30 ---- ioemu.orig/vl.h	2006-08-04 10:42:27.569100789 +0100
    5.31 -+++ ioemu/vl.h	2006-08-04 10:42:27.775076987 +0100
    5.32 +--- ioemu.orig/vl.h	2006-08-04 10:53:04.665488597 +0100
    5.33 ++++ ioemu/vl.h	2006-08-04 10:53:04.869465032 +0100
    5.34  @@ -1112,6 +1112,7 @@
    5.35   int xenstore_fd(void);
    5.36   void xenstore_process_event(void *opaque);