# HG changeset patch
# User Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
# Node ID a7dcafb540be647160dbacfe00d390992026e2fe
# Parent 078bfd250677e403cfb0e29f79042e040ee4f89a
[qemu patches] Update patches for changeset 11186:078bfd250677.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
tools/ioemu/patches/acpi-poweroff-support | 2
tools/ioemu/patches/acpi-support | 15 +++----
tools/ioemu/patches/acpi-timer-support | 4 -
tools/ioemu/patches/domain-destroy | 8 +--
tools/ioemu/patches/domain-reset | 10 ++--
tools/ioemu/patches/domain-timeoffset | 12 ++---
tools/ioemu/patches/hypervisor-pit | 6 +-
tools/ioemu/patches/ide-hd-multithread | 2
tools/ioemu/patches/ioemu-ia64 | 31 ++++++--------
tools/ioemu/patches/qemu-allow-disable-sdl | 2
tools/ioemu/patches/qemu-fix-memset-args | 2
tools/ioemu/patches/qemu-fix-write-to-disk-synchronous | 12 ++---
tools/ioemu/patches/serial-non-block | 2
tools/ioemu/patches/shadow-vram | 4 -
tools/ioemu/patches/shared-vram | 14 +++---
tools/ioemu/patches/support-xm-console | 2
tools/ioemu/patches/vnc-access-monitor-vt | 2
tools/ioemu/patches/vnc-cleanup | 4 -
tools/ioemu/patches/vnc-display-find-unused | 10 ++--
tools/ioemu/patches/vnc-fixes | 10 ++--
tools/ioemu/patches/vnc-start-vncviewer | 10 ++--
tools/ioemu/patches/vnc-title-domain-name | 2
tools/ioemu/patches/xen-mm | 36 +++++++++++------
tools/ioemu/patches/xen-platform-device | 9 +---
tools/ioemu/patches/xen-support-buffered-ioreqs | 26 ++++--------
tools/ioemu/patches/xenstore-block-device-config | 23 +++++-----
tools/ioemu/patches/xenstore-write-vnc-port | 10 ++--
27 files changed, 133 insertions(+), 137 deletions(-)
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/acpi-poweroff-support
--- a/tools/ioemu/patches/acpi-poweroff-support Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/acpi-poweroff-support Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/piix4acpi.c
Index: ioemu/hw/piix4acpi.c
===================================================================
---- ioemu.orig/hw/piix4acpi.c 2006-08-06 02:30:29.288761563 +0100
-+++ ioemu/hw/piix4acpi.c 2006-08-06 02:30:42.131331446 +0100
+--- ioemu.orig/hw/piix4acpi.c 2006-08-17 19:50:05.060576667 +0100
++++ ioemu/hw/piix4acpi.c 2006-08-17 19:50:07.563300039 +0100
@@ -45,6 +45,10 @@
#define GBL_RLS (1 << 2)
#define SLP_EN (1 << 13)
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/acpi-support
--- a/tools/ioemu/patches/acpi-support Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/acpi-support Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/Makefile.target
Index: ioemu/Makefile.target
===================================================================
---- ioemu.orig/Makefile.target 2006-08-09 19:54:26.055548240 +0100
-+++ ioemu/Makefile.target 2006-08-09 21:29:37.834611244 +0100
+--- ioemu.orig/Makefile.target 2006-08-17 19:49:50.228216099 +0100
++++ ioemu/Makefile.target 2006-08-17 19:50:02.405870095 +0100
@@ -357,6 +357,7 @@
VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
@@ -12,8 +12,8 @@ Index: ioemu/Makefile.target
ifeq ($(TARGET_BASE_ARCH), ppc)
Index: ioemu/hw/pc.c
===================================================================
---- ioemu.orig/hw/pc.c 2006-08-09 19:54:26.133539447 +0100
-+++ ioemu/hw/pc.c 2006-08-09 21:30:30.188733212 +0100
+--- ioemu.orig/hw/pc.c 2006-08-17 19:49:59.312212039 +0100
++++ ioemu/hw/pc.c 2006-08-17 19:50:02.406869984 +0100
@@ -874,13 +874,19 @@
cmos_init(ram_size, boot_device, bs_table, timeoffset);
@@ -49,7 +49,7 @@ Index: ioemu/hw/piix4acpi.c
Index: ioemu/hw/piix4acpi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/hw/piix4acpi.c 2006-08-09 21:32:04.400129788 +0100
++++ ioemu/hw/piix4acpi.c 2006-08-17 19:50:02.407869874 +0100
@@ -0,0 +1,388 @@
+/*
+ * PIIX4 ACPI controller emulation
@@ -441,8 +441,8 @@ Index: ioemu/hw/piix4acpi.c
+}
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-09 19:54:26.135539222 +0100
-+++ ioemu/vl.c 2006-08-09 21:29:38.067585110 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:49:59.315211708 +0100
++++ ioemu/vl.c 2006-08-17 19:50:02.410869542 +0100
@@ -156,7 +156,7 @@
#else
#define MAX_CPUS 1
@@ -488,9 +488,9 @@ Index: ioemu/vl.c
}
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-09 19:54:26.136539109 +0100
-+++ ioemu/vl.h 2006-08-09 21:31:21.772931536 +0100
-@@ -167,6 +167,7 @@
+--- ioemu.orig/vl.h 2006-08-17 19:49:59.316211597 +0100
++++ ioemu/vl.h 2006-08-17 19:50:02.411869432 +0100
+@@ -168,6 +168,7 @@
extern int kqemu_allowed;
extern int win2k_install_hack;
extern int usb_enabled;
@@ -498,7 +498,7 @@ Index: ioemu/vl.h
extern int smp_cpus;
/* XXX: make it dynamic */
-@@ -922,6 +923,9 @@
+@@ -923,6 +924,9 @@
void piix4_pm_init(PCIBus *bus, int devfn);
void acpi_bios_init(void);
@@ -510,8 +510,8 @@ Index: ioemu/vl.h
extern QEMUMachine isapc_machine;
Index: ioemu/hw/piix_pci.c
===================================================================
---- ioemu.orig/hw/piix_pci.c 2006-08-09 19:54:19.636318228 +0100
-+++ ioemu/hw/piix_pci.c 2006-08-09 19:54:26.152537305 +0100
+--- ioemu.orig/hw/piix_pci.c 2006-08-17 19:38:05.806252180 +0100
++++ ioemu/hw/piix_pci.c 2006-08-17 19:50:02.411869432 +0100
@@ -241,7 +241,7 @@
static uint32_t pci_bios_io_addr;
static uint32_t pci_bios_mem_addr;
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/acpi-timer-support
--- a/tools/ioemu/patches/acpi-timer-support Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/acpi-timer-support Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/piix4acpi.c
Index: ioemu/hw/piix4acpi.c
===================================================================
---- ioemu.orig/hw/piix4acpi.c 2006-08-09 20:00:56.118008198 +0100
-+++ ioemu/hw/piix4acpi.c 2006-08-09 20:04:54.375299065 +0100
+--- ioemu.orig/hw/piix4acpi.c 2006-08-17 19:50:02.407869874 +0100
++++ ioemu/hw/piix4acpi.c 2006-08-17 19:50:05.060576667 +0100
@@ -24,31 +24,30 @@
*/
@@ -184,7 +184,7 @@ Index: ioemu/hw/piix4acpi.c
}
-
- /* PIIX4 acpi pci configuration space, func 3 */
+ /* PIIX4 acpi pci configuration space, func 2 */
void pci_piix4_acpi_init(PCIBus *bus, int devfn)
@@ -384,5 +383,5 @@
pci_register_io_region((PCIDevice *)d, 4, 0x10,
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/domain-destroy
--- a/tools/ioemu/patches/domain-destroy Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/domain-destroy Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/monitor.c
Index: ioemu/monitor.c
===================================================================
---- ioemu.orig/monitor.c 2006-08-08 11:27:48.555190337 +0100
-+++ ioemu/monitor.c 2006-08-08 11:27:53.984584612 +0100
+--- ioemu.orig/monitor.c 2006-08-17 19:37:36.489509621 +0100
++++ ioemu/monitor.c 2006-08-17 19:49:44.491850141 +0100
@@ -308,6 +308,7 @@
static void do_quit(void)
@@ -12,8 +12,8 @@ Index: ioemu/monitor.c
Index: ioemu/target-i386-dm/helper2.c
===================================================================
---- ioemu.orig/target-i386-dm/helper2.c 2006-08-08 11:27:53.063687351
+0100
-+++ ioemu/target-i386-dm/helper2.c 2006-08-08 11:27:54.011581601 +0100
+--- ioemu.orig/target-i386-dm/helper2.c 2006-08-17 19:49:40.116333768
+0100
++++ ioemu/target-i386-dm/helper2.c 2006-08-17 19:49:44.491850141 +0100
@@ -488,5 +488,25 @@
xc_evtchn_notify(xce_handle, ioreq_local_port[send_vcpu]);
}
@@ -42,9 +42,9 @@ Index: ioemu/target-i386-dm/helper2.c
+}
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-08 11:27:53.067686905 +0100
-+++ ioemu/vl.h 2006-08-08 11:27:54.061576023 +0100
-@@ -1189,4 +1189,7 @@
+--- ioemu.orig/vl.h 2006-08-17 19:49:40.120333326 +0100
++++ ioemu/vl.h 2006-08-17 19:49:44.492850031 +0100
+@@ -1190,4 +1190,7 @@
void kqemu_record_dump(void);
extern char domain_name[];
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/domain-reset
--- a/tools/ioemu/patches/domain-reset Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/domain-reset Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/target-i386-dm/helper2.c
Index: ioemu/target-i386-dm/helper2.c
===================================================================
---- ioemu.orig/target-i386-dm/helper2.c 2006-08-08 11:27:45.566523765
+0100
-+++ ioemu/target-i386-dm/helper2.c 2006-08-08 11:27:53.063687351 +0100
+--- ioemu.orig/target-i386-dm/helper2.c 2006-08-17 19:37:36.530505066
+0100
++++ ioemu/target-i386-dm/helper2.c 2006-08-17 19:49:40.116333768 +0100
@@ -127,6 +127,25 @@
/* called from main_cpu_reset */
void cpu_reset(CPUX86State *env)
@@ -41,8 +41,8 @@ Index: ioemu/target-i386-dm/helper2.c
/* Wait up to 10 msec. */
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-08 11:27:52.994695048 +0100
-+++ ioemu/vl.c 2006-08-08 11:27:53.066687017 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:49:39.442408257 +0100
++++ ioemu/vl.c 2006-08-17 19:49:40.119333436 +0100
@@ -4948,7 +4948,7 @@
} QEMUResetEntry;
@@ -54,9 +54,9 @@ Index: ioemu/vl.c
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-08 11:27:48.757167803 +0100
-+++ ioemu/vl.h 2006-08-08 11:27:53.067686905 +0100
-@@ -130,6 +130,7 @@
+--- ioemu.orig/vl.h 2006-08-17 19:47:32.680418959 +0100
++++ ioemu/vl.h 2006-08-17 19:49:40.120333326 +0100
+@@ -131,6 +131,7 @@
void qemu_register_reset(QEMUResetHandler *func, void *opaque);
void qemu_system_reset_request(void);
@@ -64,7 +64,7 @@ Index: ioemu/vl.h
void qemu_system_shutdown_request(void);
void qemu_system_powerdown_request(void);
#if !defined(TARGET_SPARC)
-@@ -139,6 +140,8 @@
+@@ -140,6 +141,8 @@
void qemu_system_powerdown(void);
#endif
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/domain-timeoffset
--- a/tools/ioemu/patches/domain-timeoffset Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/domain-timeoffset Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/mc146818rtc.c
Index: ioemu/hw/mc146818rtc.c
===================================================================
---- ioemu.orig/hw/mc146818rtc.c 2006-08-09 21:32:18.709516404 +0100
-+++ ioemu/hw/mc146818rtc.c 2006-08-09 21:32:24.723838065 +0100
+--- ioemu.orig/hw/mc146818rtc.c 2006-08-17 19:58:03.222720593 +0100
++++ ioemu/hw/mc146818rtc.c 2006-08-17 19:58:08.528134087 +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-09 21:32:24.449868968 +0100
-+++ ioemu/hw/pc.c 2006-08-09 21:32:24.724837952 +0100
+--- ioemu.orig/hw/pc.c 2006-08-17 19:58:08.252164595 +0100
++++ ioemu/hw/pc.c 2006-08-17 19:58:08.529133976 +0100
@@ -159,7 +159,7 @@
}
@@ -117,8 +117,8 @@ Index: ioemu/hw/pc.c
QEMUMachine pc_machine = {
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-09 21:32:24.591852952 +0100
-+++ ioemu/vl.c 2006-08-09 21:32:24.727837614 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:58:08.395148788 +0100
++++ ioemu/vl.c 2006-08-17 19:58:08.532133645 +0100
@@ -163,6 +163,8 @@
int xc_handle;
@@ -162,7 +162,7 @@ Index: ioemu/vl.c
}
}
}
-@@ -6489,7 +6497,8 @@
+@@ -6507,7 +6515,8 @@
machine->init(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot,
@@ -174,9 +174,9 @@ Index: ioemu/vl.c
if (usb_enabled) {
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-09 21:32:24.454868404 +0100
-+++ ioemu/vl.h 2006-08-09 21:32:24.728837501 +0100
-@@ -575,7 +575,7 @@
+--- ioemu.orig/vl.h 2006-08-17 19:58:08.257164042 +0100
++++ ioemu/vl.h 2006-08-17 19:58:08.532133645 +0100
+@@ -576,7 +576,7 @@
int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/hypervisor-pit
--- a/tools/ioemu/patches/hypervisor-pit Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/hypervisor-pit Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/Makefile.target
Index: ioemu/Makefile.target
===================================================================
---- ioemu.orig/Makefile.target 2006-08-06 02:22:26.380544784 +0100
-+++ ioemu/Makefile.target 2006-08-06 02:23:23.059226607 +0100
+--- ioemu.orig/Makefile.target 2006-08-17 19:49:33.813030472 +0100
++++ ioemu/Makefile.target 2006-08-17 19:49:50.228216099 +0100
@@ -354,7 +354,7 @@
ifeq ($(TARGET_BASE_ARCH), i386)
# Hardware support
@@ -13,8 +13,8 @@ Index: ioemu/Makefile.target
DEFINES += -DHAS_AUDIO
Index: ioemu/hw/pc.c
===================================================================
---- ioemu.orig/hw/pc.c 2006-08-06 02:22:35.588518336 +0100
-+++ ioemu/hw/pc.c 2006-08-06 02:23:07.875919141 +0100
+--- ioemu.orig/hw/pc.c 2006-08-17 19:49:35.507843144 +0100
++++ ioemu/hw/pc.c 2006-08-17 19:49:50.229215988 +0100
@@ -38,7 +38,9 @@
static fdctrl_t *floppy_controller;
@@ -38,8 +38,8 @@ Index: ioemu/hw/pc.c
pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic);
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-06 02:23:05.216215627 +0100
-+++ ioemu/vl.c 2006-08-06 02:23:07.878918807 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:49:48.566399780 +0100
++++ ioemu/vl.c 2006-08-17 19:49:50.231215767 +0100
@@ -5570,6 +5570,7 @@
#ifdef HAS_AUDIO
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/ide-hd-multithread
--- a/tools/ioemu/patches/ide-hd-multithread Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/ide-hd-multithread Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/ide.c
Index: ioemu/hw/ide.c
===================================================================
---- ioemu.orig/hw/ide.c 2006-08-06 02:03:50.520919718 +0100
-+++ ioemu/hw/ide.c 2006-08-06 02:23:41.153209614 +0100
+--- ioemu.orig/hw/ide.c 2006-08-17 19:37:36.267534285 +0100
++++ ioemu/hw/ide.c 2006-08-17 19:49:57.830375828 +0100
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/ioemu-ia64
--- a/tools/ioemu/patches/ioemu-ia64 Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/ioemu-ia64 Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/iommu.c
Index: ioemu/hw/iommu.c
===================================================================
---- ioemu.orig/hw/iommu.c 2006-08-15 13:51:31.425498388 +0100
-+++ ioemu/hw/iommu.c 2006-08-15 13:51:35.834011166 +0100
+--- ioemu.orig/hw/iommu.c 2006-08-17 19:37:36.791476068 +0100
++++ ioemu/hw/iommu.c 2006-08-17 19:48:27.357375720 +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-15 13:51:35.772018017 +0100
-+++ ioemu/cpu-all.h 2006-08-15 13:51:35.835011055 +0100
+--- ioemu.orig/cpu-all.h 2006-08-17 19:37:36.791476068 +0100
++++ ioemu/cpu-all.h 2006-08-17 19:48:27.358375609 +0100
@@ -835,6 +835,31 @@
:"=m" (*(volatile long *)addr)
:"dIr" (nr));
@@ -52,21 +52,21 @@ Index: ioemu/cpu-all.h
/* memory API */
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-15 13:51:35.824012271 +0100
-+++ ioemu/vl.c 2006-08-15 13:51:46.770802425 +0100
-@@ -6140,6 +6140,11 @@
- /* init the memory */
- phys_ram_size = ram_size + vga_ram_size + bios_size;
+--- ioemu.orig/vl.c 2006-08-17 19:47:08.538087284 +0100
++++ ioemu/vl.c 2006-08-17 19:57:50.666108706 +0100
+@@ -6144,6 +6144,11 @@
+
+ xc_handle = xc_interface_open();
+#if defined (__ia64__)
+ if (ram_size > MMIO_START)
-+ ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */
++ ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */
+#endif
+
- #ifdef CONFIG_DM
-
nr_pages = ram_size/PAGE_SIZE;
-@@ -6151,6 +6156,7 @@
+ tmp_nr_pages = nr_pages;
+
+@@ -6161,6 +6166,7 @@
exit(-1);
}
@@ -74,7 +74,7 @@ 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);
-@@ -6173,6 +6179,41 @@
+@@ -6191,6 +6197,41 @@
free(page_array);
@@ -100,9 +100,9 @@ Index: ioemu/vl.c
+ }
+
+ if (ram_size > MMIO_START) {
-+ for (i = 0 ; i < MEM_G >> PAGE_SHIFT; i++)
-+ page_array[MMIO_START >> PAGE_SHIFT + i] =
-+ page_array[IO_PAGE_START >> PAGE_SHIFT + 1];
++ for (i = 0 ; i < MEM_G >> PAGE_SHIFT; i++)
++ page_array[MMIO_START >> PAGE_SHIFT + i] =
++ page_array[IO_PAGE_START >> PAGE_SHIFT + 1];
+ }
+
+ phys_ram_base = xc_map_foreign_batch(xc_handle, domid,
@@ -118,8 +118,8 @@ Index: ioemu/vl.c
phys_ram_base = qemu_vmalloc(phys_ram_size);
Index: ioemu/target-i386-dm/exec-dm.c
===================================================================
---- ioemu.orig/target-i386-dm/exec-dm.c 2006-08-15 13:51:35.705025421
+0100
-+++ ioemu/target-i386-dm/exec-dm.c 2006-08-15 13:51:51.987225890 +0100
+--- ioemu.orig/target-i386-dm/exec-dm.c 2006-08-17 19:37:36.792475957
+0100
++++ ioemu/target-i386-dm/exec-dm.c 2006-08-17 19:48:27.361375278 +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
if (io_index) {
Index: ioemu/exec-all.h
===================================================================
---- ioemu.orig/exec-all.h 2006-08-15 13:51:35.682027963 +0100
-+++ ioemu/exec-all.h 2006-08-15 13:51:35.839010613 +0100
+--- ioemu.orig/exec-all.h 2006-08-17 19:37:36.791476068 +0100
++++ ioemu/exec-all.h 2006-08-17 19:48:27.362375167 +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-15 13:51:35.704025531 +0100
-+++ ioemu/target-i386-dm/cpu.h 2006-08-15 13:51:35.839010613 +0100
+--- ioemu.orig/target-i386-dm/cpu.h 2006-08-17 19:37:36.792475957 +0100
++++ ioemu/target-i386-dm/cpu.h 2006-08-17 19:48:27.362375167 +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-15 13:51:35.840010502 +0100
++++ ioemu/ia64_intrinsic.h 2006-08-17 19:48:27.363375057 +0100
@@ -0,0 +1,276 @@
+#ifndef IA64_INTRINSIC_H
+#define IA64_INTRINSIC_H
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/qemu-allow-disable-sdl
--- a/tools/ioemu/patches/qemu-allow-disable-sdl Thu Aug 17 20:31:13
2006 +0100
+++ b/tools/ioemu/patches/qemu-allow-disable-sdl Thu Aug 17 20:31:47
2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/configure
Index: ioemu/configure
===================================================================
---- ioemu.orig/configure 2006-08-06 02:15:01.771108621 +0100
-+++ ioemu/configure 2006-08-06 02:42:26.213918476 +0100
+--- ioemu.orig/configure 2006-08-17 19:37:35.772589281 +0100
++++ ioemu/configure 2006-08-17 19:50:24.735401975 +0100
@@ -228,8 +228,6 @@
;;
--enable-cocoa) cocoa="yes" ; coreaudio="yes" ; sdl="no"
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/qemu-fix-memset-args
--- a/tools/ioemu/patches/qemu-fix-memset-args Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/qemu-fix-memset-args Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/audio/audio.c
Index: ioemu/audio/audio.c
===================================================================
---- ioemu.orig/audio/audio.c 2006-08-06 02:03:50.013976165 +0100
-+++ ioemu/audio/audio.c 2006-08-06 02:42:28.991609008 +0100
+--- ioemu.orig/audio/audio.c 2006-08-17 19:37:35.755591169 +0100
++++ ioemu/audio/audio.c 2006-08-17 19:50:26.867166346 +0100
@@ -605,11 +605,11 @@
}
diff -r 078bfd250677 -r a7dcafb540be
tools/ioemu/patches/qemu-fix-write-to-disk-synchronous
--- a/tools/ioemu/patches/qemu-fix-write-to-disk-synchronous Thu Aug 17
20:31:13 2006 +0100
+++ b/tools/ioemu/patches/qemu-fix-write-to-disk-synchronous Thu Aug 17
20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/block-vmdk.c
Index: ioemu/block-vmdk.c
===================================================================
---- ioemu.orig/block-vmdk.c 2006-08-06 02:03:45.756450226 +0100
-+++ ioemu/block-vmdk.c 2006-08-06 02:42:31.884286728 +0100
+--- ioemu.orig/block-vmdk.c 2006-08-17 19:37:35.737593169 +0100
++++ ioemu/block-vmdk.c 2006-08-17 19:50:28.884943317 +0100
@@ -96,7 +96,7 @@
uint32_t magic;
int l1_size;
@@ -13,8 +13,8 @@ Index: ioemu/block-vmdk.c
if (fd < 0)
Index: ioemu/block-qcow.c
===================================================================
---- ioemu.orig/block-qcow.c 2006-08-06 02:03:45.754450449 +0100
-+++ ioemu/block-qcow.c 2006-08-06 02:42:31.885286616 +0100
+--- ioemu.orig/block-qcow.c 2006-08-17 19:37:35.737593169 +0100
++++ ioemu/block-qcow.c 2006-08-17 19:50:28.885943206 +0100
@@ -95,7 +95,7 @@
int fd, len, i, shift;
QCowHeader header;
@@ -26,8 +26,8 @@ Index: ioemu/block-qcow.c
if (fd < 0)
Index: ioemu/block-bochs.c
===================================================================
---- ioemu.orig/block-bochs.c 2006-08-06 01:55:02.225741179 +0100
-+++ ioemu/block-bochs.c 2006-08-06 02:42:31.885286616 +0100
+--- ioemu.orig/block-bochs.c 2006-08-17 19:37:35.737593169 +0100
++++ ioemu/block-bochs.c 2006-08-17 19:50:28.885943206 +0100
@@ -91,7 +91,7 @@
int fd, i;
struct bochs_header bochs;
@@ -39,8 +39,8 @@ Index: ioemu/block-bochs.c
if (fd < 0)
Index: ioemu/block.c
===================================================================
---- ioemu.orig/block.c 2006-08-06 02:42:18.880735483 +0100
-+++ ioemu/block.c 2006-08-06 02:42:31.886286505 +0100
+--- ioemu.orig/block.c 2006-08-17 19:50:18.872050063 +0100
++++ ioemu/block.c 2006-08-17 19:50:28.885943206 +0100
@@ -685,7 +685,7 @@
int rv;
#endif
@@ -52,8 +52,8 @@ Index: ioemu/block.c
if (fd < 0)
Index: ioemu/block-cow.c
===================================================================
---- ioemu.orig/block-cow.c 2006-08-06 02:03:45.751450783 +0100
-+++ ioemu/block-cow.c 2006-08-06 02:42:31.886286505 +0100
+--- ioemu.orig/block-cow.c 2006-08-17 19:37:35.738593058 +0100
++++ ioemu/block-cow.c 2006-08-17 19:50:28.886943095 +0100
@@ -69,7 +69,7 @@
struct cow_header_v2 cow_header;
int64_t size;
@@ -65,8 +65,8 @@ Index: ioemu/block-cow.c
if (fd < 0)
Index: ioemu/block-cloop.c
===================================================================
---- ioemu.orig/block-cloop.c 2006-08-06 01:55:02.226741067 +0100
-+++ ioemu/block-cloop.c 2006-08-06 02:42:31.886286505 +0100
+--- ioemu.orig/block-cloop.c 2006-08-17 19:37:35.737593169 +0100
++++ ioemu/block-cloop.c 2006-08-17 19:50:28.886943095 +0100
@@ -55,7 +55,7 @@
BDRVCloopState *s = bs->opaque;
uint32_t offsets_size,max_compressed_block_size=1,i;
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/serial-non-block
--- a/tools/ioemu/patches/serial-non-block Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/serial-non-block Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/vl.c
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-06 02:23:29.827472129 +0100
-+++ ioemu/vl.c 2006-08-06 02:23:36.856688561 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:49:52.162002356 +0100
++++ ioemu/vl.c 2006-08-17 19:49:56.273547905 +0100
@@ -1175,19 +1175,34 @@
static int unix_write(int fd, const uint8_t *buf, int len1)
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/shadow-vram
--- a/tools/ioemu/patches/shadow-vram Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/shadow-vram Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/vga.c
Index: ioemu/hw/vga.c
===================================================================
---- ioemu.orig/hw/vga.c 2006-08-06 02:23:29.824472464 +0100
-+++ ioemu/hw/vga.c 2006-08-06 02:23:33.873021159 +0100
+--- ioemu.orig/hw/vga.c 2006-08-17 19:49:52.159002688 +0100
++++ ioemu/hw/vga.c 2006-08-17 19:49:54.575735565 +0100
@@ -1359,6 +1359,105 @@
}
}
@@ -137,8 +137,8 @@ Index: ioemu/hw/vga.c
s->vram_size = vga_ram_size;
Index: ioemu/hw/vga_int.h
===================================================================
---- ioemu.orig/hw/vga_int.h 2006-08-06 02:23:29.824472464 +0100
-+++ ioemu/hw/vga_int.h 2006-08-06 02:23:33.874021048 +0100
+--- ioemu.orig/hw/vga_int.h 2006-08-17 19:49:52.159002688 +0100
++++ ioemu/hw/vga_int.h 2006-08-17 19:49:54.575735565 +0100
@@ -79,6 +79,7 @@
#define VGA_STATE_COMMON \
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/shared-vram
--- a/tools/ioemu/patches/shared-vram Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/shared-vram Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/cirrus_vga.c
Index: ioemu/hw/cirrus_vga.c
===================================================================
---- ioemu.orig/hw/cirrus_vga.c 2006-08-06 01:55:02.822674718 +0100
-+++ ioemu/hw/cirrus_vga.c 2006-08-06 02:23:29.822472686 +0100
+--- ioemu.orig/hw/cirrus_vga.c 2006-08-17 19:37:36.372522620 +0100
++++ ioemu/hw/cirrus_vga.c 2006-08-17 19:49:52.157002909 +0100
@@ -28,6 +28,9 @@
*/
#include "vl.h"
@@ -176,8 +176,8 @@ Index: ioemu/hw/cirrus_vga.c
}
Index: ioemu/hw/pc.c
===================================================================
---- ioemu.orig/hw/pc.c 2006-08-06 02:23:07.875919141 +0100
-+++ ioemu/hw/pc.c 2006-08-06 02:23:29.823472575 +0100
+--- ioemu.orig/hw/pc.c 2006-08-17 19:49:50.229215988 +0100
++++ ioemu/hw/pc.c 2006-08-17 19:49:52.158002799 +0100
@@ -790,14 +790,14 @@
if (cirrus_vga_enabled) {
if (pci_enabled) {
@@ -198,8 +198,8 @@ Index: ioemu/hw/pc.c
Index: ioemu/hw/vga.c
===================================================================
---- ioemu.orig/hw/vga.c 2006-08-06 02:22:46.606290142 +0100
-+++ ioemu/hw/vga.c 2006-08-06 02:23:29.824472464 +0100
+--- ioemu.orig/hw/vga.c 2006-08-17 19:49:37.764593706 +0100
++++ ioemu/hw/vga.c 2006-08-17 19:49:52.159002688 +0100
@@ -1858,6 +1858,7 @@
/* TODO: add vbe support if enabled */
}
@@ -251,8 +251,8 @@ Index: ioemu/hw/vga.c
Index: ioemu/hw/vga_int.h
===================================================================
---- ioemu.orig/hw/vga_int.h 2006-08-06 02:14:09.797902638 +0100
-+++ ioemu/hw/vga_int.h 2006-08-06 02:23:29.824472464 +0100
+--- ioemu.orig/hw/vga_int.h 2006-08-17 19:37:36.372522620 +0100
++++ ioemu/hw/vga_int.h 2006-08-17 19:49:52.159002688 +0100
@@ -169,5 +169,6 @@
unsigned int color0, unsigned int color1,
unsigned int color_xor);
@@ -262,8 +262,8 @@ Index: ioemu/hw/vga_int.h
extern const uint8_t gr_mask[16];
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-06 02:23:07.878918807 +0100
-+++ ioemu/vl.c 2006-08-06 02:23:29.827472129 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:49:50.231215767 +0100
++++ ioemu/vl.c 2006-08-17 19:49:52.162002356 +0100
@@ -5693,6 +5693,78 @@
#define MAX_NET_CLIENTS 32
@@ -345,9 +345,9 @@ Index: ioemu/vl.c
#ifdef CONFIG_GDBSTUB
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-06 02:23:02.271543880 +0100
-+++ ioemu/vl.h 2006-08-06 02:23:29.828472018 +0100
-@@ -144,6 +144,13 @@
+--- ioemu.orig/vl.h 2006-08-17 19:49:44.492850031 +0100
++++ ioemu/vl.h 2006-08-17 19:49:52.163002246 +0100
+@@ -145,6 +145,13 @@
void main_loop_wait(int timeout);
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/support-xm-console
--- a/tools/ioemu/patches/support-xm-console Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/support-xm-console Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/vl.c
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-06 02:22:59.254880158 +0100
-+++ ioemu/vl.c 2006-08-06 02:23:05.216215627 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:49:40.119333436 +0100
++++ ioemu/vl.c 2006-08-17 19:49:48.566399780 +0100
@@ -1536,26 +1536,65 @@
return chr;
}
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/vnc-access-monitor-vt
--- a/tools/ioemu/patches/vnc-access-monitor-vt Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/vnc-access-monitor-vt Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/vnc.c
Index: ioemu/vnc.c
===================================================================
---- ioemu.orig/vnc.c 2006-08-07 17:44:33.084748631 +0100
-+++ ioemu/vnc.c 2006-08-07 17:44:33.224733389 +0100
+--- ioemu.orig/vnc.c 2006-08-17 19:50:14.623519661 +0100
++++ ioemu/vnc.c 2006-08-17 19:50:15.956372339 +0100
@@ -32,6 +32,10 @@
#include "vnc_keysym.h"
#include "keymaps.c"
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/vnc-cleanup
--- a/tools/ioemu/patches/vnc-cleanup Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/vnc-cleanup Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/vnc.c
Index: ioemu/vnc.c
===================================================================
---- ioemu.orig/vnc.c 2006-08-07 17:42:21.888055419 +0100
-+++ ioemu/vnc.c 2006-08-07 17:42:28.001363557 +0100
+--- ioemu.orig/vnc.c 2006-08-17 19:37:36.091553839 +0100
++++ ioemu/vnc.c 2006-08-17 19:50:10.313996001 +0100
@@ -143,13 +143,16 @@
static void vnc_dpy_update(DisplayState *ds, int x, int y, int w, int h)
{
@@ -65,8 +65,8 @@ Index: ioemu/vnc.c
static void vnc_timer_init(VncState *vs)
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-07 17:42:27.807385506 +0100
-+++ ioemu/vl.c 2006-08-07 17:42:28.004363230 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:50:02.410869542 +0100
++++ ioemu/vl.c 2006-08-17 19:50:10.316995669 +0100
@@ -5120,10 +5120,10 @@
/* XXX: better handling of removal */
for(ioh = first_io_handler; ioh != NULL; ioh = ioh_next) {
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/vnc-display-find-unused
--- a/tools/ioemu/patches/vnc-display-find-unused Thu Aug 17 20:31:13
2006 +0100
+++ b/tools/ioemu/patches/vnc-display-find-unused Thu Aug 17 20:31:47
2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/vnc.c
Index: ioemu/vnc.c
===================================================================
---- ioemu.orig/vnc.c 2006-08-09 14:44:44.721942535 +0100
-+++ ioemu/vnc.c 2006-08-09 14:52:37.262165292 +0100
+--- ioemu.orig/vnc.c 2006-08-17 19:50:15.956372339 +0100
++++ ioemu/vnc.c 2006-08-17 19:50:17.083247783 +0100
@@ -1183,7 +1183,7 @@
}
}
@@ -50,8 +50,8 @@ Index: ioemu/vnc.c
int vnc_start_viewer(int port)
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-09 14:44:44.721942535 +0100
-+++ ioemu/vl.c 2006-08-09 14:52:06.783905832 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:50:13.152682236 +0100
++++ ioemu/vl.c 2006-08-17 19:50:17.086247452 +0100
@@ -121,6 +121,7 @@
static DisplayState display_state;
int nographic;
@@ -104,7 +104,7 @@ Index: ioemu/vl.c
}
}
}
-@@ -6465,7 +6475,7 @@
+@@ -6483,7 +6493,7 @@
if (nographic) {
dumb_display_init(ds);
} else if (vnc_display != -1) {
@@ -115,9 +115,9 @@ Index: ioemu/vl.c
} else {
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-09 14:44:44.721942535 +0100
-+++ ioemu/vl.h 2006-08-09 14:52:06.783905832 +0100
-@@ -784,7 +784,7 @@
+--- ioemu.orig/vl.h 2006-08-17 19:50:13.153682125 +0100
++++ ioemu/vl.h 2006-08-17 19:50:17.087247341 +0100
+@@ -785,7 +785,7 @@
void cocoa_display_init(DisplayState *ds, int full_screen);
/* vnc.c */
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/vnc-fixes
--- a/tools/ioemu/patches/vnc-fixes Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/vnc-fixes Thu Aug 17 20:31:47 2006 +0100
@@ -1,8 +1,8 @@ Index: ioemu/vl.c
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-07 17:42:28.004363230 +0100
-+++ ioemu/vl.c 2006-08-07 17:43:16.361100898 +0100
-@@ -6516,8 +6516,10 @@
+--- ioemu.orig/vl.c 2006-08-17 19:50:10.316995669 +0100
++++ ioemu/vl.c 2006-08-17 19:50:12.100798502 +0100
+@@ -6534,8 +6534,10 @@
}
}
@@ -17,8 +17,8 @@ Index: ioemu/vl.c
if (use_gdbstub) {
Index: ioemu/vnc.c
===================================================================
---- ioemu.orig/vnc.c 2006-08-07 17:42:28.001363557 +0100
-+++ ioemu/vnc.c 2006-08-07 17:43:33.593225293 +0100
+--- ioemu.orig/vnc.c 2006-08-17 19:50:10.313996001 +0100
++++ ioemu/vnc.c 2006-08-17 19:50:12.101798392 +0100
@@ -3,6 +3,7 @@
*
* Copyright (C) 2006 Anthony Liguori <anthony@xxxxxxxxxxxxx>
@@ -524,9 +524,9 @@ Index: ioemu/vnc.c
}
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-07 17:42:27.807385506 +0100
-+++ ioemu/vl.h 2006-08-07 17:43:16.361100898 +0100
-@@ -318,6 +318,7 @@
+--- ioemu.orig/vl.h 2006-08-17 19:50:02.411869432 +0100
++++ ioemu/vl.h 2006-08-17 19:50:12.102798281 +0100
+@@ -319,6 +319,7 @@
int is_graphic_console(void);
CharDriverState *text_console_init(DisplayState *ds);
void console_select(unsigned int index);
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/vnc-start-vncviewer
--- a/tools/ioemu/patches/vnc-start-vncviewer Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/vnc-start-vncviewer Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/vnc.c
Index: ioemu/vnc.c
===================================================================
---- ioemu.orig/vnc.c 2006-08-07 17:44:32.852773890 +0100
-+++ ioemu/vnc.c 2006-08-07 17:44:32.915767031 +0100
+--- ioemu.orig/vnc.c 2006-08-17 19:50:12.101798392 +0100
++++ ioemu/vnc.c 2006-08-17 19:50:13.149682567 +0100
@@ -1175,3 +1175,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-07 17:44:32.851773999 +0100
-+++ ioemu/vl.c 2006-08-07 17:44:32.918766704 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:50:12.100798502 +0100
++++ ioemu/vl.c 2006-08-17 19:50:13.152682236 +0100
@@ -120,6 +120,7 @@
int bios_size;
static DisplayState display_state;
@@ -82,7 +82,7 @@ Index: ioemu/vl.c
}
}
}
-@@ -6458,6 +6466,8 @@
+@@ -6476,6 +6484,8 @@
dumb_display_init(ds);
} else if (vnc_display != -1) {
vnc_display_init(ds, vnc_display);
@@ -93,9 +93,9 @@ Index: ioemu/vl.c
sdl_display_init(ds, full_screen);
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-07 17:44:32.853773781 +0100
-+++ ioemu/vl.h 2006-08-07 17:44:32.919766595 +0100
-@@ -785,6 +785,7 @@
+--- ioemu.orig/vl.h 2006-08-17 19:50:12.102798281 +0100
++++ ioemu/vl.h 2006-08-17 19:50:13.153682125 +0100
+@@ -786,6 +786,7 @@
/* vnc.c */
void vnc_display_init(DisplayState *ds, int display);
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/vnc-title-domain-name
--- a/tools/ioemu/patches/vnc-title-domain-name Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/vnc-title-domain-name Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/vnc.c
Index: ioemu/vnc.c
===================================================================
---- ioemu.orig/vnc.c 2006-08-07 17:44:32.915767031 +0100
-+++ ioemu/vnc.c 2006-08-07 17:44:33.084748631 +0100
+--- ioemu.orig/vnc.c 2006-08-17 19:50:13.149682567 +0100
++++ ioemu/vnc.c 2006-08-17 19:50:14.623519661 +0100
@@ -1014,6 +1014,7 @@
static int protocol_client_init(VncState *vs, char *data, size_t len)
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/xen-mm
--- a/tools/ioemu/patches/xen-mm Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/xen-mm Thu Aug 17 20:31:47 2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/hw/pc.c
Index: ioemu/hw/pc.c
===================================================================
---- ioemu.orig/hw/pc.c 2006-08-06 02:15:39.708879311 +0100
-+++ ioemu/hw/pc.c 2006-08-06 02:18:18.875135656 +0100
+--- ioemu.orig/hw/pc.c 2006-08-17 19:36:00.588166019 +0100
++++ ioemu/hw/pc.c 2006-08-17 19:37:36.704485734 +0100
@@ -646,7 +646,9 @@
}
@@ -25,8 +25,8 @@ Index: ioemu/hw/pc.c
isa_bios_size = bios_size;
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-06 02:18:12.550840673 +0100
-+++ ioemu/vl.c 2006-08-06 02:18:45.608155528 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:36:00.667157242 +0100
++++ ioemu/vl.c 2006-08-17 19:47:08.538087284 +0100
@@ -158,6 +158,8 @@
int acpi_enabled = 1;
int fd_bootchk = 1;
@@ -40,7 +40,7 @@ Index: ioemu/vl.c
QEMUMachine *machine;
char usb_devices[MAX_USB_CMDLINE][128];
int usb_devices_index;
-+ unsigned long nr_pages;
++ unsigned long nr_pages, tmp_nr_pages, shared_page_nr;
+ xen_pfn_t *page_array;
+ extern void *shared_page;
@@ -60,16 +60,26 @@ Index: ioemu/vl.c
break;
case QEMU_OPTION_l:
{
-@@ -6133,12 +6140,49 @@
+@@ -6133,12 +6140,67 @@
/* init the memory */
phys_ram_size = ram_size + vga_ram_size + bios_size;
+#ifdef CONFIG_DM
+
-+ nr_pages = ram_size/PAGE_SIZE;
+ xc_handle = xc_interface_open();
+
-+ page_array = (xen_pfn_t *)malloc(nr_pages * sizeof(xen_pfn_t));
++ nr_pages = ram_size/PAGE_SIZE;
++ tmp_nr_pages = nr_pages;
++
++#if defined(__i386__) || defined(__x86_64__)
++ if (ram_size > HVM_BELOW_4G_RAM_END) {
++ tmp_nr_pages += HVM_BELOW_4G_MMIO_LENGTH >> PAGE_SHIFT;
++ shared_page_nr = (HVM_BELOW_4G_RAM_END >> PAGE_SHIFT) - 1;
++ } else
++ shared_page_nr = nr_pages - 1;
++#endif
++
++ page_array = (xen_pfn_t *)malloc(tmp_nr_pages * sizeof(xen_pfn_t));
+ if (page_array == NULL) {
+ fprintf(logfile, "malloc returned error %d\n", errno);
+ exit(-1);
@@ -80,20 +90,28 @@ Index: ioemu/vl.c
+ exit(-1);
+ }
+
++ if (ram_size > HVM_BELOW_4G_RAM_END)
++ for (i = 0; i < nr_pages - (HVM_BELOW_4G_RAM_END >> PAGE_SHIFT); i++)
++ page_array[tmp_nr_pages - 1 - i] = page_array[nr_pages - 1 - i];
++
+ phys_ram_base = xc_map_foreign_batch(xc_handle, domid,
+ PROT_READ|PROT_WRITE, page_array,
-+ nr_pages - 1);
-+ if (phys_ram_base == 0) {
-+ fprintf(logfile, "xc_map_foreign_batch returned error %d\n", errno);
++ tmp_nr_pages);
++ if (phys_ram_base == NULL) {
++ fprintf(logfile, "batch map guest memory returned error %d\n", errno);
+ exit(-1);
+ }
+
+ shared_page = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
+ PROT_READ|PROT_WRITE,
-+ page_array[nr_pages - 1]);
++ page_array[shared_page_nr]);
++ if (shared_page == NULL) {
++ fprintf(logfile, "map shared IO page returned error %d\n", errno);
++ exit(-1);
++ }
+
-+ fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n", nr_pages - 1,
-+ (uint64_t)(page_array[nr_pages - 1]));
++ fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n",
++ shared_page_nr, (uint64_t)(page_array[shared_page_nr]));
+
+ free(page_array);
+
@@ -110,3 +128,28 @@ Index: ioemu/vl.c
/* we always create the cdrom drive, even if no disk is there */
bdrv_init();
if (cdrom_index >= 0) {
+Index: ioemu/hw/piix_pci.c
+===================================================================
+--- ioemu.orig/hw/piix_pci.c 2006-08-17 19:37:36.189542951 +0100
++++ ioemu/hw/piix_pci.c 2006-08-17 19:38:05.806252180 +0100
+@@ -399,7 +399,7 @@
+ uint8_t elcr[2];
+
+ pci_bios_io_addr = 0xc000;
+- pci_bios_mem_addr = 0xf0000000;
++ pci_bios_mem_addr = HVM_BELOW_4G_MMIO_START;
+
+ /* activate IRQ mappings */
+ elcr[0] = 0x00;
+Index: ioemu/vl.h
+===================================================================
+--- ioemu.orig/vl.h 2006-08-17 19:37:36.529505177 +0100
++++ ioemu/vl.h 2006-08-17 19:47:32.680418959 +0100
+@@ -39,6 +39,7 @@
+ #include <sys/stat.h>
+ #include "xenctrl.h"
+ #include "xs.h"
++#include <xen/hvm/e820.h>
+
+ #ifndef O_LARGEFILE
+ #define O_LARGEFILE 0
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/xen-platform-device
--- a/tools/ioemu/patches/xen-platform-device Thu Aug 17 20:31:13 2006 +0100
+++ b/tools/ioemu/patches/xen-platform-device Thu Aug 17 20:31:47 2006 +0100
@@ -3,8 +3,8 @@ will come later.
Index: ioemu/Makefile.target
===================================================================
---- ioemu.orig/Makefile.target 2006-08-17 11:37:49.910902700 +0100
-+++ ioemu/Makefile.target 2006-08-17 11:42:15.196191649 +0100
+--- ioemu.orig/Makefile.target 2006-08-17 19:50:18.866050726 +0100
++++ ioemu/Makefile.target 2006-08-17 19:55:35.776020218 +0100
@@ -359,6 +359,7 @@
VL_OBJS+= usb-uhci.o
VL_OBJS+= piix4acpi.o
@@ -15,8 +15,8 @@ Index: ioemu/Makefile.target
ifeq ($(TARGET_BASE_ARCH), ppc)
Index: ioemu/hw/pc.c
===================================================================
---- ioemu.orig/hw/pc.c 2006-08-17 11:37:49.794915697 +0100
-+++ ioemu/hw/pc.c 2006-08-17 11:43:11.818853900 +0100
+--- ioemu.orig/hw/pc.c 2006-08-17 19:50:02.406869984 +0100
++++ ioemu/hw/pc.c 2006-08-17 19:55:35.777020107 +0100
@@ -823,6 +823,9 @@
}
#endif /* !CONFIG_DM */
@@ -30,7 +30,7 @@ Index: ioemu/hw/xen_platform.c
Index: ioemu/hw/xen_platform.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/hw/xen_platform.c 2006-08-17 11:56:16.043076969 +0100
++++ ioemu/hw/xen_platform.c 2006-08-17 19:55:35.777020107 +0100
@@ -0,0 +1,138 @@
+/*
+ * XEN platform fake pci device, formerly known as the event channel device
@@ -172,9 +172,9 @@ Index: ioemu/hw/xen_platform.c
+}
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-17 11:37:49.932900235 +0100
-+++ ioemu/vl.h 2006-08-17 11:44:59.487739984 +0100
-@@ -1208,6 +1208,9 @@
+--- ioemu.orig/vl.h 2006-08-17 19:50:22.278673522 +0100
++++ ioemu/vl.h 2006-08-17 19:55:35.778019997 +0100
+@@ -1209,6 +1209,9 @@
void xenstore_check_new_media_present(int timeout);
void xenstore_write_vncport(int vnc_display);
diff -r 078bfd250677 -r a7dcafb540be
tools/ioemu/patches/xen-support-buffered-ioreqs
--- a/tools/ioemu/patches/xen-support-buffered-ioreqs Thu Aug 17 20:31:13
2006 +0100
+++ b/tools/ioemu/patches/xen-support-buffered-ioreqs Thu Aug 17 20:31:47
2006 +0100
@@ -1,38 +1,38 @@ Index: ioemu/vl.c
Index: ioemu/vl.c
===================================================================
---- ioemu.orig/vl.c 2006-08-09 15:04:25.583508863 +0100
-+++ ioemu/vl.c 2006-08-09 15:04:26.034465993 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:50:22.277673633 +0100
++++ ioemu/vl.c 2006-08-17 19:55:21.878556486 +0100
@@ -5838,6 +5838,7 @@
- unsigned long nr_pages;
+ unsigned long nr_pages, tmp_nr_pages, shared_page_nr;
xen_pfn_t *page_array;
extern void *shared_page;
+ extern void *buffered_io_page;
char qemu_dm_logfilename[64];
-@@ -6388,12 +6389,17 @@
-
- phys_ram_base = xc_map_foreign_batch(xc_handle, domid,
- PROT_READ|PROT_WRITE, page_array,
-- nr_pages - 1);
-+ nr_pages - 3);
- if (phys_ram_base == 0) {
- fprintf(logfile, "xc_map_foreign_batch returned error %d\n", errno);
- exit(-1);
- }
+@@ -6419,6 +6420,18 @@
+ fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n",
+ shared_page_nr, (uint64_t)(page_array[shared_page_nr]));
+ /* not yet add for IA64 */
+ buffered_io_page = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
-+ PROT_READ|PROT_WRITE,
-+ page_array[nr_pages - 3]);
++ PROT_READ|PROT_WRITE,
++ page_array[shared_page_nr - 2]);
++ if (buffered_io_page == NULL) {
++ fprintf(logfile, "map buffered IO page returned error %d\n", errno);
++ exit(-1);
++ }
+
- shared_page = xc_map_foreign_range(xc_handle, domid, PAGE_SIZE,
- PROT_READ|PROT_WRITE,
- page_array[nr_pages - 1]);
++ fprintf(logfile, "buffered io page at pfn:%lx, mfn: %"PRIx64"\n",
++ shared_page_nr - 2, (uint64_t)(page_array[shared_page_nr - 2]));
++
+ free(page_array);
+
+ #elif defined(__ia64__)
Index: ioemu/target-i386-dm/helper2.c
===================================================================
---- ioemu.orig/target-i386-dm/helper2.c 2006-08-09 15:04:24.105649313
+0100
-+++ ioemu/target-i386-dm/helper2.c 2006-08-09 15:04:26.040465422 +0100
+--- ioemu.orig/target-i386-dm/helper2.c 2006-08-17 19:49:44.491850141
+0100
++++ ioemu/target-i386-dm/helper2.c 2006-08-17 19:50:41.490549986 +0100
@@ -76,6 +76,10 @@
shared_iopage_t *shared_page = NULL;
diff -r 078bfd250677 -r a7dcafb540be
tools/ioemu/patches/xenstore-block-device-config
--- a/tools/ioemu/patches/xenstore-block-device-config Thu Aug 17 20:31:13
2006 +0100
+++ b/tools/ioemu/patches/xenstore-block-device-config Thu Aug 17 20:31:47
2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/Makefile.target
Index: ioemu/Makefile.target
===================================================================
---- ioemu.orig/Makefile.target 2006-08-09 21:32:24.915816410 +0100
-+++ ioemu/Makefile.target 2006-08-09 21:32:25.500750429 +0100
+--- ioemu.orig/Makefile.target 2006-08-17 19:50:02.405870095 +0100
++++ ioemu/Makefile.target 2006-08-17 19:50:18.866050726 +0100
@@ -358,6 +358,7 @@
VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
VL_OBJS+= usb-uhci.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-09 21:32:25.501750317 +0100
++++ ioemu/xenstore.c 2006-08-17 19:50:18.867050616 +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-09 21:32:25.438757422 +0100
-+++ ioemu/vl.c 2006-08-09 21:32:25.504749978 +0100
+--- ioemu.orig/vl.c 2006-08-17 19:50:17.086247452 +0100
++++ ioemu/vl.c 2006-08-17 19:50:18.870050284 +0100
@@ -5243,9 +5243,11 @@
"Standard options:\n"
"-M machine select emulated machine (-M ? for list)\n"
@@ -359,7 +359,7 @@ Index: ioemu/vl.c
setvbuf(stdout, NULL, _IOLBF, 0);
-@@ -6417,6 +6448,7 @@
+@@ -6435,6 +6466,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) {
-@@ -6443,6 +6475,7 @@
+@@ -6461,6 +6493,7 @@
}
}
}
@@ -375,7 +375,7 @@ Index: ioemu/vl.c
/* we always create at least one floppy disk */
fd_table[0] = bdrv_new("fda");
-@@ -6521,6 +6554,8 @@
+@@ -6539,6 +6572,8 @@
}
}
@@ -386,8 +386,8 @@ Index: ioemu/vl.c
kernel_filename, kernel_cmdline, initrd_filename,
Index: ioemu/monitor.c
===================================================================
---- ioemu.orig/monitor.c 2006-08-09 21:32:24.238892765 +0100
-+++ ioemu/monitor.c 2006-08-09 21:32:25.505749865 +0100
+--- ioemu.orig/monitor.c 2006-08-17 19:49:44.491850141 +0100
++++ ioemu/monitor.c 2006-08-17 19:50:18.871050174 +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-09 21:32:18.339558126 +0100
-+++ ioemu/block.c 2006-08-09 21:32:25.506749753 +0100
+--- ioemu.orig/block.c 2006-08-17 19:37:35.865578948 +0100
++++ ioemu/block.c 2006-08-17 19:50:18.872050063 +0100
@@ -758,6 +758,7 @@
static void raw_close(BlockDriverState *bs)
{
@@ -428,9 +428,9 @@ Index: ioemu/block.c
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-09 21:32:25.439757309 +0100
-+++ ioemu/vl.h 2006-08-09 21:32:25.506749753 +0100
-@@ -1187,6 +1187,8 @@
+--- ioemu.orig/vl.h 2006-08-17 19:50:17.087247341 +0100
++++ ioemu/vl.h 2006-08-17 19:50:18.872050063 +0100
+@@ -1188,6 +1188,8 @@
void term_print_help(void);
void monitor_readline(const char *prompt, int is_password,
char *buf, int buf_size);
@@ -439,7 +439,7 @@ Index: ioemu/vl.h
/* readline.c */
typedef void ReadLineFunc(void *opaque, const char *str);
-@@ -1199,6 +1201,13 @@
+@@ -1200,6 +1202,13 @@
void readline_start(const char *prompt, int is_password,
ReadLineFunc *readline_func, void *opaque);
@@ -455,8 +455,8 @@ Index: ioemu/vl.h
extern char domain_name[];
Index: ioemu/hw/ide.c
===================================================================
---- ioemu.orig/hw/ide.c 2006-08-09 21:32:24.658845396 +0100
-+++ ioemu/hw/ide.c 2006-08-09 21:32:25.508749527 +0100
+--- ioemu.orig/hw/ide.c 2006-08-17 19:49:57.830375828 +0100
++++ ioemu/hw/ide.c 2006-08-17 19:50:18.874049842 +0100
@@ -1158,6 +1158,7 @@
} else {
ide_atapi_cmd_error(s, SENSE_NOT_READY,
diff -r 078bfd250677 -r a7dcafb540be tools/ioemu/patches/xenstore-write-vnc-port
--- a/tools/ioemu/patches/xenstore-write-vnc-port Thu Aug 17 20:31:13
2006 +0100
+++ b/tools/ioemu/patches/xenstore-write-vnc-port Thu Aug 17 20:31:47
2006 +0100
@@ -1,7 +1,7 @@ Index: ioemu/xenstore.c
Index: ioemu/xenstore.c
===================================================================
---- ioemu.orig/xenstore.c 2006-08-09 21:32:25.501750317 +0100
-+++ ioemu/xenstore.c 2006-08-09 21:32:25.706727195 +0100
+--- ioemu.orig/xenstore.c 2006-08-17 19:50:18.867050616 +0100
++++ ioemu/xenstore.c 2006-08-17 19:50:22.274673964 +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-09 21:32:25.504749978 +0100
-+++ ioemu/vl.c 2006-08-09 21:32:25.709726857 +0100
-@@ -6511,6 +6511,7 @@
+--- ioemu.orig/vl.c 2006-08-17 19:50:18.870050284 +0100
++++ ioemu/vl.c 2006-08-17 19:50:22.277673633 +0100
+@@ -6529,6 +6529,7 @@
vnc_display = vnc_display_init(ds, vnc_display, vncunused);
if (vncviewer)
vnc_start_viewer(vnc_display);
@@ -48,9 +48,9 @@ Index: ioemu/vl.c
sdl_display_init(ds, full_screen);
Index: ioemu/vl.h
===================================================================
---- ioemu.orig/vl.h 2006-08-09 21:32:25.506749753 +0100
-+++ ioemu/vl.h 2006-08-09 21:32:25.710726744 +0100
-@@ -1206,6 +1206,7 @@
+--- ioemu.orig/vl.h 2006-08-17 19:50:18.872050063 +0100
++++ ioemu/vl.h 2006-08-17 19:50:22.278673522 +0100
+@@ -1207,6 +1207,7 @@
int xenstore_fd(void);
void xenstore_process_event(void *opaque);
void xenstore_check_new_media_present(int timeout);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home