[Xen-changelog] [xen-unstable] [qemu patches] Refresh patches.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User chris@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 36cf965711f625e4d1da23487e2401ea97dad503
# Parent  87346792fe906b8ad635f85b38a995e555c8b7da
[qemu patches] Refresh patches.

Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
 tools/ioemu/patches/domain-timeoffset            |   10 +++++-----
 tools/ioemu/patches/vnc-fixes                    |    8 ++++----
 tools/ioemu/patches/vnc-start-vncviewer          |    8 ++++----
 tools/ioemu/patches/xenstore-block-device-config |   19 +++++++++----------
 tools/ioemu/patches/xenstore-write-vnc-port      |    8 ++++----
 5 files changed, 26 insertions(+), 27 deletions(-)

diff -r 87346792fe90 -r 36cf965711f6 tools/ioemu/patches/domain-timeoffset
--- a/tools/ioemu/patches/domain-timeoffset     Fri Aug 04 10:52:49 2006 +0100
+++ b/tools/ioemu/patches/domain-timeoffset     Fri Aug 04 10:53:11 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/mc146818rtc.c
 Index: ioemu/hw/mc146818rtc.c
 ===================================================================
---- ioemu.orig/hw/mc146818rtc.c        2006-08-04 10:42:19.796998954 +0100
-+++ ioemu/hw/mc146818rtc.c     2006-08-04 10:42:26.456229392 +0100
+--- ioemu.orig/hw/mc146818rtc.c        2006-08-04 10:52:55.914499631 +0100
++++ ioemu/hw/mc146818rtc.c     2006-08-04 10:53:03.701599955 +0100
 @@ -178,10 +178,27 @@
      }
  }
@@ -46,8 +46,8 @@ Index: ioemu/hw/mc146818rtc.c
  static void rtc_copy_date(RTCState *s)
 Index: ioemu/hw/pc.c
 ===================================================================
---- ioemu.orig/hw/pc.c 2006-08-04 10:42:26.185260705 +0100
-+++ ioemu/hw/pc.c      2006-08-04 10:42:26.457229276 +0100
+--- ioemu.orig/hw/pc.c 2006-08-04 10:53:03.431631144 +0100
++++ ioemu/hw/pc.c      2006-08-04 10:53:03.701599955 +0100
 @@ -151,7 +151,7 @@
  }
  
@@ -117,8 +117,8 @@ Index: ioemu/hw/pc.c
  QEMUMachine pc_machine = {
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2006-08-04 10:42:26.324244644 +0100
-+++ ioemu/vl.c 2006-08-04 10:42:26.459229045 +0100
+--- ioemu.orig/vl.c    2006-08-04 10:53:03.571614972 +0100
++++ ioemu/vl.c 2006-08-04 10:53:03.704599608 +0100
 @@ -164,6 +164,8 @@
  
  int xc_handle;
@@ -162,7 +162,7 @@ Index: ioemu/vl.c
              }
          }
      }
-@@ -5993,7 +6001,8 @@
+@@ -6005,7 +6013,8 @@
  
      machine->init(ram_size, vga_ram_size, boot_device,
                    ds, fd_filename, snapshot,
@@ -174,8 +174,8 @@ Index: ioemu/vl.c
      qemu_mod_timer(gui_timer, qemu_get_clock(rt_clock));
 Index: ioemu/vl.h
 ===================================================================
---- ioemu.orig/vl.h    2006-08-04 10:42:26.190260127 +0100
-+++ ioemu/vl.h 2006-08-04 10:42:26.460228930 +0100
+--- ioemu.orig/vl.h    2006-08-04 10:53:03.436630567 +0100
++++ ioemu/vl.h 2006-08-04 10:53:03.705599493 +0100
 @@ -556,7 +556,7 @@
                                   int boot_device,
               DisplayState *ds, const char **fd_filename, int snapshot,
diff -r 87346792fe90 -r 36cf965711f6 tools/ioemu/patches/vnc-fixes
--- a/tools/ioemu/patches/vnc-fixes     Fri Aug 04 10:52:49 2006 +0100
+++ b/tools/ioemu/patches/vnc-fixes     Fri Aug 04 10:53:11 2006 +0100
@@ -1,8 +1,8 @@ Index: ioemu/vl.c
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2006-08-04 10:42:26.921175663 +0100
-+++ ioemu/vl.c 2006-08-04 10:42:27.107154171 +0100
-@@ -6012,8 +6012,10 @@
+--- ioemu.orig/vl.c    2006-08-04 10:53:04.142549012 +0100
++++ ioemu/vl.c 2006-08-04 10:53:04.206541619 +0100
+@@ -6024,8 +6024,10 @@
                    kernel_filename, kernel_cmdline, initrd_filename,
                    timeoffset);
  
@@ -17,8 +17,8 @@ Index: ioemu/vl.c
      if (use_gdbstub) {
 Index: ioemu/vnc.c
 ===================================================================
---- ioemu.orig/vnc.c   2006-08-04 10:42:26.918176009 +0100
-+++ ioemu/vnc.c        2006-08-04 10:42:27.108154056 +0100
+--- ioemu.orig/vnc.c   2006-08-04 10:53:04.139549358 +0100
++++ ioemu/vnc.c        2006-08-04 10:53:04.207541503 +0100
 @@ -3,6 +3,7 @@
   * 
   * Copyright (C) 2006 Anthony Liguori <anthony@xxxxxxxxxxxxx>
@@ -493,8 +493,8 @@ Index: ioemu/vnc.c
  }
 Index: ioemu/vl.h
 ===================================================================
---- ioemu.orig/vl.h    2006-08-04 10:42:26.724198425 +0100
-+++ ioemu/vl.h 2006-08-04 10:42:27.108154056 +0100
+--- ioemu.orig/vl.h    2006-08-04 10:53:03.950571191 +0100
++++ ioemu/vl.h 2006-08-04 10:53:04.207541503 +0100
 @@ -302,6 +302,7 @@
  int is_graphic_console(void);
  CharDriverState *text_console_init(DisplayState *ds);
diff -r 87346792fe90 -r 36cf965711f6 tools/ioemu/patches/vnc-start-vncviewer
--- a/tools/ioemu/patches/vnc-start-vncviewer   Fri Aug 04 10:52:49 2006 +0100
+++ b/tools/ioemu/patches/vnc-start-vncviewer   Fri Aug 04 10:53:11 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/vnc.c
 Index: ioemu/vnc.c
 ===================================================================
---- ioemu.orig/vnc.c   2006-08-04 10:42:27.108154056 +0100
-+++ ioemu/vnc.c        2006-08-04 10:42:27.272135106 +0100
+--- ioemu.orig/vnc.c   2006-08-04 10:53:04.207541503 +0100
++++ ioemu/vnc.c        2006-08-04 10:53:04.370522674 +0100
 @@ -1002,3 +1002,25 @@
  
      vnc_dpy_resize(vs->ds, 640, 400);
@@ -30,8 +30,8 @@ Index: ioemu/vnc.c
 +}
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2006-08-04 10:42:27.107154171 +0100
-+++ ioemu/vl.c 2006-08-04 10:42:27.276134644 +0100
+--- ioemu.orig/vl.c    2006-08-04 10:53:04.206541619 +0100
++++ ioemu/vl.c 2006-08-04 10:53:04.373522328 +0100
 @@ -121,6 +121,7 @@
  int bios_size;
  static DisplayState display_state;
@@ -82,7 +82,7 @@ Index: ioemu/vl.c
              case QEMU_OPTION_domainname:
                  strncat(domain_name, optarg, sizeof(domain_name) - 20);
                  break;
-@@ -5919,6 +5927,8 @@
+@@ -5931,6 +5939,8 @@
          dumb_display_init(ds);
      } else if (vnc_display != -1) {
        vnc_display_init(ds, vnc_display);
@@ -93,8 +93,8 @@ Index: ioemu/vl.c
          sdl_display_init(ds, full_screen);
 Index: ioemu/vl.h
 ===================================================================
---- ioemu.orig/vl.h    2006-08-04 10:42:27.108154056 +0100
-+++ ioemu/vl.h 2006-08-04 10:42:27.277134528 +0100
+--- ioemu.orig/vl.h    2006-08-04 10:53:04.207541503 +0100
++++ ioemu/vl.h 2006-08-04 10:53:04.374522212 +0100
 @@ -734,6 +734,7 @@
  
  /* vnc.c */
diff -r 87346792fe90 -r 36cf965711f6 
tools/ioemu/patches/xenstore-block-device-config
--- a/tools/ioemu/patches/xenstore-block-device-config  Fri Aug 04 10:52:49 
2006 +0100
+++ b/tools/ioemu/patches/xenstore-block-device-config  Fri Aug 04 10:53:11 
2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/Makefile.target
 Index: ioemu/Makefile.target
 ===================================================================
---- ioemu.orig/Makefile.target 2006-08-04 10:42:26.718199119 +0100
-+++ ioemu/Makefile.target      2006-08-04 10:42:27.563101483 +0100
+--- ioemu.orig/Makefile.target 2006-08-04 10:53:03.944571884 +0100
++++ ioemu/Makefile.target      2006-08-04 10:53:04.659489290 +0100
 @@ -336,6 +336,7 @@
  VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
  VL_OBJS+= cirrus_vga.o mixeng.o parallel.o
@@ -13,7 +13,7 @@ Index: ioemu/xenstore.c
 Index: ioemu/xenstore.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/xenstore.c   2006-08-04 10:42:27.564101367 +0100
++++ ioemu/xenstore.c   2006-08-04 10:53:04.660489174 +0100
 @@ -0,0 +1,187 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General
@@ -204,8 +204,8 @@ Index: ioemu/xenstore.c
 +}
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2006-08-04 10:42:27.276134644 +0100
-+++ ioemu/vl.c 2006-08-04 10:42:27.567101020 +0100
+--- ioemu.orig/vl.c    2006-08-04 10:53:04.373522328 +0100
++++ ioemu/vl.c 2006-08-04 10:53:04.663488828 +0100
 @@ -4711,9 +4711,11 @@
             "Standard options:\n"
             "-M machine      select emulated machine (-M ? for list)\n"
@@ -359,7 +359,7 @@ Index: ioemu/vl.c
  
  #if !defined(CONFIG_SOFTMMU)
      /* must avoid mmap() usage of glibc by setting a buffer "by hand" */
-@@ -5856,6 +5887,7 @@
+@@ -5868,6 +5899,7 @@
  
  #endif /* !CONFIG_DM */
  
@@ -367,7 +367,7 @@ Index: ioemu/vl.c
      /* we always create the cdrom drive, even if no disk is there */
      bdrv_init();
      if (cdrom_index >= 0) {
-@@ -5882,6 +5914,7 @@
+@@ -5894,6 +5926,7 @@
              }
          }
      }
@@ -375,7 +375,7 @@ Index: ioemu/vl.c
  
      /* we always create at least one floppy disk */
      fd_table[0] = bdrv_new("fda");
-@@ -6017,6 +6050,8 @@
+@@ -6029,6 +6062,8 @@
  #endif
      init_timers();
  
@@ -386,8 +386,8 @@ Index: ioemu/vl.c
                    kernel_filename, kernel_cmdline, initrd_filename,
 Index: ioemu/monitor.c
 ===================================================================
---- ioemu.orig/monitor.c       2006-08-04 10:42:25.965286125 +0100
-+++ ioemu/monitor.c    2006-08-04 10:42:27.568100905 +0100
+--- ioemu.orig/monitor.c       2006-08-04 10:53:03.222655287 +0100
++++ ioemu/monitor.c    2006-08-04 10:53:04.664488712 +0100
 @@ -24,6 +24,7 @@
  #include "vl.h"
  #include "disas.h"
@@ -416,8 +416,8 @@ Index: ioemu/monitor.c
      int i;
 Index: ioemu/block.c
 ===================================================================
---- ioemu.orig/block.c 2006-08-04 10:42:19.406044135 +0100
-+++ ioemu/block.c      2006-08-04 10:42:27.568100905 +0100
+--- ioemu.orig/block.c 2006-08-04 10:52:55.582537986 +0100
++++ ioemu/block.c      2006-08-04 10:53:04.664488712 +0100
 @@ -750,6 +750,7 @@
  static void raw_close(BlockDriverState *bs)
  {
@@ -428,8 +428,8 @@ Index: ioemu/block.c
  
 Index: ioemu/vl.h
 ===================================================================
---- ioemu.orig/vl.h    2006-08-04 10:42:27.277134528 +0100
-+++ ioemu/vl.h 2006-08-04 10:42:27.569100789 +0100
+--- ioemu.orig/vl.h    2006-08-04 10:53:04.374522212 +0100
++++ ioemu/vl.h 2006-08-04 10:53:04.665488597 +0100
 @@ -1093,6 +1093,8 @@
  void term_print_help(void);
  void monitor_readline(const char *prompt, int is_password,
@@ -455,8 +455,8 @@ Index: ioemu/vl.h
  extern char domain_name[];
 Index: ioemu/hw/ide.c
 ===================================================================
---- ioemu.orig/hw/ide.c        2006-08-04 10:42:26.391236902 +0100
-+++ ioemu/hw/ide.c     2006-08-04 10:42:27.571100558 +0100
+--- ioemu.orig/hw/ide.c        2006-08-04 10:53:03.636607463 +0100
++++ ioemu/hw/ide.c     2006-08-04 10:53:04.666488481 +0100
 @@ -1279,6 +1279,7 @@
          } else {
              ide_atapi_cmd_error(s, SENSE_NOT_READY, 
diff -r 87346792fe90 -r 36cf965711f6 tools/ioemu/patches/xenstore-write-vnc-port
--- a/tools/ioemu/patches/xenstore-write-vnc-port       Fri Aug 04 10:52:49 
2006 +0100
+++ b/tools/ioemu/patches/xenstore-write-vnc-port       Fri Aug 04 10:53:11 
2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/xenstore.c
 Index: ioemu/xenstore.c
 ===================================================================
---- ioemu.orig/xenstore.c      2006-08-04 10:42:27.564101367 +0100
-+++ ioemu/xenstore.c   2006-08-04 10:42:27.771077449 +0100
+--- ioemu.orig/xenstore.c      2006-08-04 10:53:04.660489174 +0100
++++ ioemu/xenstore.c   2006-08-04 10:53:04.865465494 +0100
 @@ -185,3 +185,31 @@
      free(image);
      free(vec);
@@ -36,9 +36,9 @@ Index: ioemu/xenstore.c
 +}
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2006-08-04 10:42:27.567101020 +0100
-+++ ioemu/vl.c 2006-08-04 10:42:27.774077103 +0100
-@@ -5962,6 +5962,7 @@
+--- ioemu.orig/vl.c    2006-08-04 10:53:04.663488828 +0100
++++ ioemu/vl.c 2006-08-04 10:53:04.868465147 +0100
+@@ -5974,6 +5974,7 @@
        vnc_display_init(ds, vnc_display);
        if (vncviewer)
            vnc_start_viewer(vnc_display);
@@ -48,8 +48,8 @@ Index: ioemu/vl.c
          sdl_display_init(ds, full_screen);
 Index: ioemu/vl.h
 ===================================================================
---- ioemu.orig/vl.h    2006-08-04 10:42:27.569100789 +0100
-+++ ioemu/vl.h 2006-08-04 10:42:27.775076987 +0100
+--- ioemu.orig/vl.h    2006-08-04 10:53:04.665488597 +0100
++++ ioemu/vl.h 2006-08-04 10:53:04.869465032 +0100
 @@ -1112,6 +1112,7 @@
  int xenstore_fd(void);
  void xenstore_process_event(void *opaque);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog