# HG changeset patch
# User chris@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 2534981686582816bcc72b46c8263ac50959f993
# Parent 1cbf49c018cbb4348a32690f66f8a29dcc849255
[qemu patches] Refresh patches.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
tools/ioemu/patches/domain-timeoffset | 10 +++++-----
tools/ioemu/patches/ioemu-ia64 | 19 +++++++++----------
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 ++++----
6 files changed, 35 insertions(+), 37 deletions(-)
diff -r 1cbf49c018cb -r 253498168658 tools/ioemu/patches/domain-timeoffset
--- a/tools/ioemu/patches/domain-timeoffset Fri Aug 04 10:57:13 2006 +0100
+++ b/tools/ioemu/patches/domain-timeoffset Fri Aug 04 10:57:34 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:52:55.914499631 +0100
-+++ ioemu/hw/mc146818rtc.c 2006-08-04 10:53:03.701599955 +0100
+--- ioemu.orig/hw/mc146818rtc.c 2006-08-04 10:57:22.049787220 +0100
++++ ioemu/hw/mc146818rtc.c 2006-08-04 10:57:28.677023336 +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:53:03.431631144 +0100
-+++ ioemu/hw/pc.c 2006-08-04 10:53:03.701599955 +0100
+--- ioemu.orig/hw/pc.c 2006-08-04 10:57:28.406054568 +0100
++++ ioemu/hw/pc.c 2006-08-04 10:57:28.678023221 +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:53:03.571614972 +0100
-+++ ioemu/vl.c 2006-08-04 10:53:03.704599608 +0100
+--- ioemu.orig/vl.c 2006-08-04 10:57:28.545038549 +0100
++++ ioemu/vl.c 2006-08-04 10:57:28.680022990 +0100
@@ -164,6 +164,8 @@
int xc_handle;
@@ -162,7 +162,7 @@ Index: ioemu/vl.c
}
}
}
-@@ -6005,7 +6013,8 @@
+@@ -6007,7 +6015,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:53:03.436630567 +0100
-+++ ioemu/vl.h 2006-08-04 10:53:03.705599493 +0100
+--- ioemu.orig/vl.h 2006-08-04 10:57:28.411053992 +0100
++++ ioemu/vl.h 2006-08-04 10:57:28.681022875 +0100
@@ -556,7 +556,7 @@
int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
diff -r 1cbf49c018cb -r 253498168658 tools/ioemu/patches/ioemu-ia64
--- a/tools/ioemu/patches/ioemu-ia64 Fri Aug 04 10:57:13 2006 +0100
+++ b/tools/ioemu/patches/ioemu-ia64 Fri Aug 04 10:57:34 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/iommu.c
Index: ioemu/hw/iommu.c
===================================================================
---- ioemu.orig/hw/iommu.c 2006-08-04 10:42:20.772886174 +0100
-+++ ioemu/hw/iommu.c 2006-08-04 10:42:25.397351756 +0100
+--- ioemu.orig/hw/iommu.c 2006-08-04 10:57:22.606723023 +0100
++++ ioemu/hw/iommu.c 2006-08-04 10:57:27.489160251 +0100
@@ -82,7 +82,11 @@
#define IOPTE_VALID 0x00000002 /* IOPTE is valid */
#define IOPTE_WAZ 0x00000001 /* Write as zeros */
@@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
Index: ioemu/cpu-all.h
===================================================================
---- ioemu.orig/cpu-all.h 2006-08-04 10:42:25.029394277 +0100
-+++ ioemu/cpu-all.h 2006-08-04 10:42:25.398351640 +0100
+--- ioemu.orig/cpu-all.h 2006-08-04 10:57:27.123202432 +0100
++++ ioemu/cpu-all.h 2006-08-04 10:57:27.490160136 +0100
@@ -835,6 +835,31 @@
:"=m" (*(volatile long *)addr)
:"dIr" (nr));
@@ -52,8 +52,8 @@ Index: ioemu/cpu-all.h
/* memory API */
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-04 10:42:25.326359960 +0100
-+++ ioemu/vl.c 2006-08-04 10:51:21.239442976 +0100
+--- ioemu.orig/vl.c 2006-08-04 10:57:27.419168318 +0100
++++ ioemu/vl.c 2006-08-04 10:57:27.493159790 +0100
@@ -5567,6 +5567,11 @@
/* init the memory */
phys_ram_size = ram_size + vga_ram_size + bios_size;
@@ -74,9 +74,9 @@ Index: ioemu/vl.c
if (xc_get_pfn_list(xc_handle, domid, page_array, nr_pages) != nr_pages) {
fprintf(logfile, "xc_get_pfn_list returned error %d\n", errno);
exit(-1);
-@@ -5598,6 +5604,41 @@
- fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n", nr_pages - 1,
- (uint64_t)(page_array[nr_pages - 1]));
+@@ -5600,6 +5606,41 @@
+
+ free(page_array);
+#elif defined(__ia64__)
+
@@ -118,8 +118,8 @@ Index: ioemu/vl.c
#ifdef CONFIG_SOFTMMU
Index: ioemu/target-i386-dm/exec-dm.c
===================================================================
---- ioemu.orig/target-i386-dm/exec-dm.c 2006-08-04 10:42:24.647438417
+0100
-+++ ioemu/target-i386-dm/exec-dm.c 2006-08-04 10:42:25.401351294 +0100
+--- ioemu.orig/target-i386-dm/exec-dm.c 2006-08-04 10:57:26.738246803
+0100
++++ ioemu/target-i386-dm/exec-dm.c 2006-08-04 10:57:27.493159790 +0100
@@ -341,6 +341,23 @@
return io_mem_read[io_index >> IO_MEM_SHIFT];
}
@@ -156,8 +156,8 @@ Index: ioemu/target-i386-dm/exec-dm.c
memset(buf, 0xff, len);
Index: ioemu/exec-all.h
===================================================================
---- ioemu.orig/exec-all.h 2006-08-04 10:42:24.518453323 +0100
-+++ ioemu/exec-all.h 2006-08-04 10:42:25.401351294 +0100
+--- ioemu.orig/exec-all.h 2006-08-04 10:57:26.651256830 +0100
++++ ioemu/exec-all.h 2006-08-04 10:57:27.494159675 +0100
@@ -462,12 +462,13 @@
}
#endif
@@ -177,8 +177,8 @@ Index: ioemu/exec-all.h
Index: ioemu/target-i386-dm/cpu.h
===================================================================
---- ioemu.orig/target-i386-dm/cpu.h 2006-08-04 10:42:24.647438417 +0100
-+++ ioemu/target-i386-dm/cpu.h 2006-08-04 10:42:25.401351294 +0100
+--- ioemu.orig/target-i386-dm/cpu.h 2006-08-04 10:57:26.737246918 +0100
++++ ioemu/target-i386-dm/cpu.h 2006-08-04 10:57:27.494159675 +0100
@@ -80,7 +80,11 @@
/* helper2.c */
int main_loop(void);
@@ -194,7 +194,7 @@ Index: ioemu/ia64_intrinsic.h
Index: ioemu/ia64_intrinsic.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/ia64_intrinsic.h 2006-08-04 10:42:25.402351178 +0100
++++ ioemu/ia64_intrinsic.h 2006-08-04 10:57:27.495159560 +0100
@@ -0,0 +1,276 @@
+#ifndef IA64_INTRINSIC_H
+#define IA64_INTRINSIC_H
diff -r 1cbf49c018cb -r 253498168658 tools/ioemu/patches/vnc-fixes
--- a/tools/ioemu/patches/vnc-fixes Fri Aug 04 10:57:13 2006 +0100
+++ b/tools/ioemu/patches/vnc-fixes Fri Aug 04 10:57:34 2006 +0100
@@ -1,8 +1,8 @@ Index: ioemu/vl.c
Index: ioemu/vl.c
===================================================================
---- 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 @@
+--- ioemu.orig/vl.c 2006-08-04 10:57:29.116972627 +0100
++++ ioemu/vl.c 2006-08-04 10:57:29.186964560 +0100
+@@ -6026,8 +6026,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:53:04.139549358 +0100
-+++ ioemu/vnc.c 2006-08-04 10:53:04.207541503 +0100
+--- ioemu.orig/vnc.c 2006-08-04 10:57:29.114972858 +0100
++++ ioemu/vnc.c 2006-08-04 10:57:29.187964445 +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:53:03.950571191 +0100
-+++ ioemu/vl.h 2006-08-04 10:53:04.207541503 +0100
+--- ioemu.orig/vl.h 2006-08-04 10:57:28.925994639 +0100
++++ ioemu/vl.h 2006-08-04 10:57:29.187964445 +0100
@@ -302,6 +302,7 @@
int is_graphic_console(void);
CharDriverState *text_console_init(DisplayState *ds);
diff -r 1cbf49c018cb -r 253498168658 tools/ioemu/patches/vnc-start-vncviewer
--- a/tools/ioemu/patches/vnc-start-vncviewer Fri Aug 04 10:57:13 2006 +0100
+++ b/tools/ioemu/patches/vnc-start-vncviewer Fri Aug 04 10:57:34 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/vnc.c
Index: ioemu/vnc.c
===================================================================
---- ioemu.orig/vnc.c 2006-08-04 10:53:04.207541503 +0100
-+++ ioemu/vnc.c 2006-08-04 10:53:04.370522674 +0100
+--- ioemu.orig/vnc.c 2006-08-04 10:57:29.187964445 +0100
++++ ioemu/vnc.c 2006-08-04 10:57:29.351945544 +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:53:04.206541619 +0100
-+++ ioemu/vl.c 2006-08-04 10:53:04.373522328 +0100
+--- ioemu.orig/vl.c 2006-08-04 10:57:29.186964560 +0100
++++ ioemu/vl.c 2006-08-04 10:57:29.354945198 +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;
-@@ -5931,6 +5939,8 @@
+@@ -5933,6 +5941,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:53:04.207541503 +0100
-+++ ioemu/vl.h 2006-08-04 10:53:04.374522212 +0100
+--- ioemu.orig/vl.h 2006-08-04 10:57:29.187964445 +0100
++++ ioemu/vl.h 2006-08-04 10:57:29.355945083 +0100
@@ -734,6 +734,7 @@
/* vnc.c */
diff -r 1cbf49c018cb -r 253498168658
tools/ioemu/patches/xenstore-block-device-config
--- a/tools/ioemu/patches/xenstore-block-device-config Fri Aug 04 10:57:13
2006 +0100
+++ b/tools/ioemu/patches/xenstore-block-device-config Fri Aug 04 10:57:34
2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/Makefile.target
Index: ioemu/Makefile.target
===================================================================
---- ioemu.orig/Makefile.target 2006-08-04 10:53:03.944571884 +0100
-+++ ioemu/Makefile.target 2006-08-04 10:53:04.659489290 +0100
+--- ioemu.orig/Makefile.target 2006-08-04 10:57:28.920995216 +0100
++++ ioemu/Makefile.target 2006-08-04 10:57:29.641912123 +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:53:04.660489174 +0100
++++ ioemu/xenstore.c 2006-08-04 10:57:29.641912123 +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:53:04.373522328 +0100
-+++ ioemu/vl.c 2006-08-04 10:53:04.663488828 +0100
+--- ioemu.orig/vl.c 2006-08-04 10:57:29.354945198 +0100
++++ ioemu/vl.c 2006-08-04 10:57:29.644911777 +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" */
-@@ -5868,6 +5899,7 @@
+@@ -5870,6 +5901,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) {
-@@ -5894,6 +5926,7 @@
+@@ -5896,6 +5928,7 @@
}
}
}
@@ -375,7 +375,7 @@ Index: ioemu/vl.c
/* we always create at least one floppy disk */
fd_table[0] = bdrv_new("fda");
-@@ -6029,6 +6062,8 @@
+@@ -6031,6 +6064,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:53:03.222655287 +0100
-+++ ioemu/monitor.c 2006-08-04 10:53:04.664488712 +0100
+--- ioemu.orig/monitor.c 2006-08-04 10:57:28.195078886 +0100
++++ ioemu/monitor.c 2006-08-04 10:57:29.645911662 +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:52:55.582537986 +0100
-+++ ioemu/block.c 2006-08-04 10:53:04.664488712 +0100
+--- ioemu.orig/block.c 2006-08-04 10:57:21.718825369 +0100
++++ ioemu/block.c 2006-08-04 10:57:29.646911546 +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:53:04.374522212 +0100
-+++ ioemu/vl.h 2006-08-04 10:53:04.665488597 +0100
+--- ioemu.orig/vl.h 2006-08-04 10:57:29.355945083 +0100
++++ ioemu/vl.h 2006-08-04 10:57:29.647911431 +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:53:03.636607463 +0100
-+++ ioemu/hw/ide.c 2006-08-04 10:53:04.666488481 +0100
+--- ioemu.orig/hw/ide.c 2006-08-04 10:57:28.612030827 +0100
++++ ioemu/hw/ide.c 2006-08-04 10:57:29.648911316 +0100
@@ -1279,6 +1279,7 @@
} else {
ide_atapi_cmd_error(s, SENSE_NOT_READY,
diff -r 1cbf49c018cb -r 253498168658 tools/ioemu/patches/xenstore-write-vnc-port
--- a/tools/ioemu/patches/xenstore-write-vnc-port Fri Aug 04 10:57:13
2006 +0100
+++ b/tools/ioemu/patches/xenstore-write-vnc-port Fri Aug 04 10:57:34
2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/xenstore.c
Index: ioemu/xenstore.c
===================================================================
---- ioemu.orig/xenstore.c 2006-08-04 10:53:04.660489174 +0100
-+++ ioemu/xenstore.c 2006-08-04 10:53:04.865465494 +0100
+--- ioemu.orig/xenstore.c 2006-08-04 10:57:29.641912123 +0100
++++ ioemu/xenstore.c 2006-08-04 10:57:30.244842629 +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:53:04.663488828 +0100
-+++ ioemu/vl.c 2006-08-04 10:53:04.868465147 +0100
-@@ -5974,6 +5974,7 @@
+--- ioemu.orig/vl.c 2006-08-04 10:57:29.644911777 +0100
++++ ioemu/vl.c 2006-08-04 10:57:30.246842399 +0100
+@@ -5976,6 +5976,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:53:04.665488597 +0100
-+++ ioemu/vl.h 2006-08-04 10:53:04.869465032 +0100
+--- ioemu.orig/vl.h 2006-08-04 10:57:29.647911431 +0100
++++ ioemu/vl.h 2006-08-04 10:57:30.247842283 +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
|
Home