ia64/xen-unstable

changeset 11070:0e32095a7b46

[qemu patches] Update patches for changeset 11048:27bef4f3c1d3.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Wed Aug 09 21:34:27 2006 +0100 (2006-08-09)
parents 27bef4f3c1d3
children cfd9d4601022
files tools/ioemu/patches/acpi-support tools/ioemu/patches/domain-timeoffset tools/ioemu/patches/xenstore-block-device-config tools/ioemu/patches/xenstore-write-vnc-port
line diff
     1.1 --- a/tools/ioemu/patches/acpi-support	Wed Aug 09 21:33:59 2006 +0100
     1.2 +++ b/tools/ioemu/patches/acpi-support	Wed Aug 09 21:34:27 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: ioemu/Makefile.target
     1.5  ===================================================================
     1.6  --- ioemu.orig/Makefile.target	2006-08-09 19:54:26.055548240 +0100
     1.7 -+++ ioemu/Makefile.target	2006-08-09 19:59:49.537686802 +0100
     1.8 ++++ ioemu/Makefile.target	2006-08-09 21:29:37.834611244 +0100
     1.9  @@ -357,6 +357,7 @@
    1.10   VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
    1.11   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
    1.12 @@ -13,25 +13,20 @@ Index: ioemu/Makefile.target
    1.13  Index: ioemu/hw/pc.c
    1.14  ===================================================================
    1.15  --- ioemu.orig/hw/pc.c	2006-08-09 19:54:26.133539447 +0100
    1.16 -+++ ioemu/hw/pc.c	2006-08-09 20:04:32.767826231 +0100
    1.17 -@@ -572,6 +572,9 @@
    1.18 - static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
    1.19 - static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
    1.20 ++++ ioemu/hw/pc.c	2006-08-09 21:30:30.188733212 +0100
    1.21 +@@ -874,13 +874,19 @@
    1.22   
    1.23 -+/* PIIX4 acpi pci configuration space, func 3 */
    1.24 -+extern void pci_piix4_acpi_init(PCIBus *bus, int devfn);
    1.25 -+
    1.26 - #ifdef HAS_AUDIO
    1.27 - static void audio_init (PCIBus *pci_bus)
    1.28 - {
    1.29 -@@ -878,9 +881,15 @@
    1.30 -         usb_uhci_init(pci_bus, piix3_devfn + 2);
    1.31 -     }
    1.32 +     cmos_init(ram_size, boot_device, bs_table, timeoffset);
    1.33   
    1.34  +    /* using PIIX4 acpi model */
    1.35  +    if (pci_enabled && acpi_enabled)
    1.36 -+        pci_piix4_acpi_init(pci_bus, piix3_devfn + (usb_enabled ? 3 : 2));
    1.37 ++        pci_piix4_acpi_init(pci_bus, piix3_devfn + 2);
    1.38  +
    1.39 +     if (pci_enabled && usb_enabled) {
    1.40 +-        usb_uhci_init(pci_bus, piix3_devfn + 2);
    1.41 ++        usb_uhci_init(pci_bus, piix3_devfn + (acpi_enabled ? 3 : 2));
    1.42 +     }
    1.43 + 
    1.44  +#ifndef CONFIG_DM
    1.45       if (pci_enabled && acpi_enabled) {
    1.46           piix4_pm_init(pci_bus, piix3_devfn + 3);
    1.47 @@ -40,7 +35,7 @@ Index: ioemu/hw/pc.c
    1.48   
    1.49   #if 0
    1.50       /* ??? Need to figure out some way for the user to
    1.51 -@@ -903,8 +912,10 @@
    1.52 +@@ -903,8 +909,10 @@
    1.53       /* XXX: should be done in the Bochs BIOS */
    1.54       if (pci_enabled) {
    1.55           pci_bios_init();
    1.56 @@ -54,7 +49,7 @@ Index: ioemu/hw/pc.c
    1.57  Index: ioemu/hw/piix4acpi.c
    1.58  ===================================================================
    1.59  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    1.60 -+++ ioemu/hw/piix4acpi.c	2006-08-09 20:00:56.118008198 +0100
    1.61 ++++ ioemu/hw/piix4acpi.c	2006-08-09 21:32:04.400129788 +0100
    1.62  @@ -0,0 +1,388 @@
    1.63  +/*
    1.64  + * PIIX4 ACPI controller emulation
    1.65 @@ -415,13 +410,13 @@ Index: ioemu/hw/piix4acpi.c
    1.66  +}
    1.67  +													
    1.68  +
    1.69 -+/* PIIX4 acpi pci configuration space, func 3 */
    1.70 ++/* PIIX4 acpi pci configuration space, func 2 */
    1.71  +void pci_piix4_acpi_init(PCIBus *bus, int devfn)
    1.72  +{
    1.73  +    PCIAcpiState *d;
    1.74  +    uint8_t *pci_conf;
    1.75  +
    1.76 -+    /* register a function devfn of PIIX4 */
    1.77 ++    /* register a function 2 of PIIX4 */
    1.78  +    d = (PCIAcpiState *)pci_register_device(
    1.79  +        bus, "PIIX4 ACPI", sizeof(PCIAcpiState),
    1.80  +        devfn, NULL, NULL);
    1.81 @@ -447,7 +442,7 @@ Index: ioemu/hw/piix4acpi.c
    1.82  Index: ioemu/vl.c
    1.83  ===================================================================
    1.84  --- ioemu.orig/vl.c	2006-08-09 19:54:26.135539222 +0100
    1.85 -+++ ioemu/vl.c	2006-08-09 19:59:49.772659756 +0100
    1.86 ++++ ioemu/vl.c	2006-08-09 21:29:38.067585110 +0100
    1.87  @@ -156,7 +156,7 @@
    1.88   #else
    1.89   #define MAX_CPUS 1
    1.90 @@ -494,7 +489,7 @@ Index: ioemu/vl.c
    1.91  Index: ioemu/vl.h
    1.92  ===================================================================
    1.93  --- ioemu.orig/vl.h	2006-08-09 19:54:26.136539109 +0100
    1.94 -+++ ioemu/vl.h	2006-08-09 19:59:49.734664129 +0100
    1.95 ++++ ioemu/vl.h	2006-08-09 21:31:21.772931536 +0100
    1.96  @@ -167,6 +167,7 @@
    1.97   extern int kqemu_allowed;
    1.98   extern int win2k_install_hack;
    1.99 @@ -503,6 +498,16 @@ Index: ioemu/vl.h
   1.100   extern int smp_cpus;
   1.101   
   1.102   /* XXX: make it dynamic */
   1.103 +@@ -922,6 +923,9 @@
   1.104 + void piix4_pm_init(PCIBus *bus, int devfn);
   1.105 + void acpi_bios_init(void);
   1.106 + 
   1.107 ++/* piix4acpi.c */
   1.108 ++extern void pci_piix4_acpi_init(PCIBus *bus, int devfn);
   1.109 ++
   1.110 + /* pc.c */
   1.111 + extern QEMUMachine pc_machine;
   1.112 + extern QEMUMachine isapc_machine;
   1.113  Index: ioemu/hw/piix_pci.c
   1.114  ===================================================================
   1.115  --- ioemu.orig/hw/piix_pci.c	2006-08-09 19:54:19.636318228 +0100
     2.1 --- a/tools/ioemu/patches/domain-timeoffset	Wed Aug 09 21:33:59 2006 +0100
     2.2 +++ b/tools/ioemu/patches/domain-timeoffset	Wed Aug 09 21:34:27 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  Index: ioemu/hw/mc146818rtc.c
     2.5  ===================================================================
     2.6 ---- ioemu.orig/hw/mc146818rtc.c	2006-08-09 15:04:17.857242121 +0100
     2.7 -+++ ioemu/hw/mc146818rtc.c	2006-08-09 15:04:24.588603423 +0100
     2.8 +--- ioemu.orig/hw/mc146818rtc.c	2006-08-09 21:32:18.709516404 +0100
     2.9 ++++ ioemu/hw/mc146818rtc.c	2006-08-09 21:32:24.723838065 +0100
    2.10  @@ -178,10 +178,27 @@
    2.11       }
    2.12   }
    2.13 @@ -46,8 +46,8 @@ Index: ioemu/hw/mc146818rtc.c
    2.14   static void rtc_copy_date(RTCState *s)
    2.15  Index: ioemu/hw/pc.c
    2.16  ===================================================================
    2.17 ---- ioemu.orig/hw/pc.c	2006-08-09 15:04:24.316629266 +0100
    2.18 -+++ ioemu/hw/pc.c	2006-08-09 15:04:24.589603328 +0100
    2.19 +--- ioemu.orig/hw/pc.c	2006-08-09 21:32:24.449868968 +0100
    2.20 ++++ ioemu/hw/pc.c	2006-08-09 21:32:24.724837952 +0100
    2.21  @@ -159,7 +159,7 @@
    2.22   }
    2.23   
    2.24 @@ -117,8 +117,8 @@ Index: ioemu/hw/pc.c
    2.25   QEMUMachine pc_machine = {
    2.26  Index: ioemu/vl.c
    2.27  ===================================================================
    2.28 ---- ioemu.orig/vl.c	2006-08-09 15:04:24.457615869 +0100
    2.29 -+++ ioemu/vl.c	2006-08-09 15:04:24.592603043 +0100
    2.30 +--- ioemu.orig/vl.c	2006-08-09 21:32:24.591852952 +0100
    2.31 ++++ ioemu/vl.c	2006-08-09 21:32:24.727837614 +0100
    2.32  @@ -163,6 +163,8 @@
    2.33   
    2.34   int xc_handle;
    2.35 @@ -174,8 +174,8 @@ Index: ioemu/vl.c
    2.36       if (usb_enabled) {
    2.37  Index: ioemu/vl.h
    2.38  ===================================================================
    2.39 ---- ioemu.orig/vl.h	2006-08-09 15:04:24.321628791 +0100
    2.40 -+++ ioemu/vl.h	2006-08-09 15:04:24.593602948 +0100
    2.41 +--- ioemu.orig/vl.h	2006-08-09 21:32:24.454868404 +0100
    2.42 ++++ ioemu/vl.h	2006-08-09 21:32:24.728837501 +0100
    2.43  @@ -575,7 +575,7 @@
    2.44                                    int boot_device,
    2.45                DisplayState *ds, const char **fd_filename, int snapshot,
     3.1 --- a/tools/ioemu/patches/xenstore-block-device-config	Wed Aug 09 21:33:59 2006 +0100
     3.2 +++ b/tools/ioemu/patches/xenstore-block-device-config	Wed Aug 09 21:34:27 2006 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  Index: ioemu/Makefile.target
     3.5  ===================================================================
     3.6 ---- ioemu.orig/Makefile.target	2006-08-09 15:04:24.795583755 +0100
     3.7 -+++ ioemu/Makefile.target	2006-08-09 15:04:25.373528824 +0100
     3.8 +--- ioemu.orig/Makefile.target	2006-08-09 21:32:24.915816410 +0100
     3.9 ++++ ioemu/Makefile.target	2006-08-09 21:32:25.500750429 +0100
    3.10  @@ -358,6 +358,7 @@
    3.11   VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
    3.12   VL_OBJS+= usb-uhci.o
    3.13 @@ -13,7 +13,7 @@ Index: ioemu/Makefile.target
    3.14  Index: ioemu/xenstore.c
    3.15  ===================================================================
    3.16  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
    3.17 -+++ ioemu/xenstore.c	2006-08-09 15:04:25.374528729 +0100
    3.18 ++++ ioemu/xenstore.c	2006-08-09 21:32:25.501750317 +0100
    3.19  @@ -0,0 +1,187 @@
    3.20  +/*
    3.21  + * This file is subject to the terms and conditions of the GNU General
    3.22 @@ -204,8 +204,8 @@ Index: ioemu/xenstore.c
    3.23  +}
    3.24  Index: ioemu/vl.c
    3.25  ===================================================================
    3.26 ---- ioemu.orig/vl.c	2006-08-09 15:04:25.312534622 +0100
    3.27 -+++ ioemu/vl.c	2006-08-09 15:04:25.377528443 +0100
    3.28 +--- ioemu.orig/vl.c	2006-08-09 21:32:25.438757422 +0100
    3.29 ++++ ioemu/vl.c	2006-08-09 21:32:25.504749978 +0100
    3.30  @@ -5243,9 +5243,11 @@
    3.31              "Standard options:\n"
    3.32              "-M machine      select emulated machine (-M ? for list)\n"
    3.33 @@ -386,8 +386,8 @@ Index: ioemu/vl.c
    3.34                     kernel_filename, kernel_cmdline, initrd_filename,
    3.35  Index: ioemu/monitor.c
    3.36  ===================================================================
    3.37 ---- ioemu.orig/monitor.c	2006-08-09 15:04:24.105649313 +0100
    3.38 -+++ ioemu/monitor.c	2006-08-09 15:04:25.379528253 +0100
    3.39 +--- ioemu.orig/monitor.c	2006-08-09 21:32:24.238892765 +0100
    3.40 ++++ ioemu/monitor.c	2006-08-09 21:32:25.505749865 +0100
    3.41  @@ -24,6 +24,7 @@
    3.42   #include "vl.h"
    3.43   #include "disas.h"
    3.44 @@ -416,8 +416,8 @@ Index: ioemu/monitor.c
    3.45       int i;
    3.46  Index: ioemu/block.c
    3.47  ===================================================================
    3.48 ---- ioemu.orig/block.c	2006-08-09 15:04:17.487277167 +0100
    3.49 -+++ ioemu/block.c	2006-08-09 15:04:25.379528253 +0100
    3.50 +--- ioemu.orig/block.c	2006-08-09 21:32:18.339558126 +0100
    3.51 ++++ ioemu/block.c	2006-08-09 21:32:25.506749753 +0100
    3.52  @@ -758,6 +758,7 @@
    3.53   static void raw_close(BlockDriverState *bs)
    3.54   {
    3.55 @@ -428,9 +428,9 @@ Index: ioemu/block.c
    3.56   
    3.57  Index: ioemu/vl.h
    3.58  ===================================================================
    3.59 ---- ioemu.orig/vl.h	2006-08-09 15:04:25.313534527 +0100
    3.60 -+++ ioemu/vl.h	2006-08-09 15:04:25.380528158 +0100
    3.61 -@@ -1184,6 +1184,8 @@
    3.62 +--- ioemu.orig/vl.h	2006-08-09 21:32:25.439757309 +0100
    3.63 ++++ ioemu/vl.h	2006-08-09 21:32:25.506749753 +0100
    3.64 +@@ -1187,6 +1187,8 @@
    3.65   void term_print_help(void);
    3.66   void monitor_readline(const char *prompt, int is_password,
    3.67                         char *buf, int buf_size);
    3.68 @@ -439,7 +439,7 @@ Index: ioemu/vl.h
    3.69   
    3.70   /* readline.c */
    3.71   typedef void ReadLineFunc(void *opaque, const char *str);
    3.72 -@@ -1196,6 +1198,13 @@
    3.73 +@@ -1199,6 +1201,13 @@
    3.74   void readline_start(const char *prompt, int is_password,
    3.75                       ReadLineFunc *readline_func, void *opaque);
    3.76   
    3.77 @@ -455,8 +455,8 @@ Index: ioemu/vl.h
    3.78   extern char domain_name[];
    3.79  Index: ioemu/hw/ide.c
    3.80  ===================================================================
    3.81 ---- ioemu.orig/hw/ide.c	2006-08-09 15:04:24.524609503 +0100
    3.82 -+++ ioemu/hw/ide.c	2006-08-09 15:04:25.381528063 +0100
    3.83 +--- ioemu.orig/hw/ide.c	2006-08-09 21:32:24.658845396 +0100
    3.84 ++++ ioemu/hw/ide.c	2006-08-09 21:32:25.508749527 +0100
    3.85  @@ -1158,6 +1158,7 @@
    3.86           } else {
    3.87               ide_atapi_cmd_error(s, SENSE_NOT_READY, 
     4.1 --- a/tools/ioemu/patches/xenstore-write-vnc-port	Wed Aug 09 21:33:59 2006 +0100
     4.2 +++ b/tools/ioemu/patches/xenstore-write-vnc-port	Wed Aug 09 21:34:27 2006 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  Index: ioemu/xenstore.c
     4.5  ===================================================================
     4.6 ---- ioemu.orig/xenstore.c	2006-08-09 15:04:25.374528729 +0100
     4.7 -+++ ioemu/xenstore.c	2006-08-09 15:04:25.579509243 +0100
     4.8 +--- ioemu.orig/xenstore.c	2006-08-09 21:32:25.501750317 +0100
     4.9 ++++ ioemu/xenstore.c	2006-08-09 21:32:25.706727195 +0100
    4.10  @@ -185,3 +185,31 @@
    4.11       free(image);
    4.12       free(vec);
    4.13 @@ -36,8 +36,8 @@ Index: ioemu/xenstore.c
    4.14  +}
    4.15  Index: ioemu/vl.c
    4.16  ===================================================================
    4.17 ---- ioemu.orig/vl.c	2006-08-09 15:04:25.377528443 +0100
    4.18 -+++ ioemu/vl.c	2006-08-09 15:04:25.583508863 +0100
    4.19 +--- ioemu.orig/vl.c	2006-08-09 21:32:25.504749978 +0100
    4.20 ++++ ioemu/vl.c	2006-08-09 21:32:25.709726857 +0100
    4.21  @@ -6511,6 +6511,7 @@
    4.22   	vnc_display = vnc_display_init(ds, vnc_display, vncunused);
    4.23   	if (vncviewer)
    4.24 @@ -48,9 +48,9 @@ Index: ioemu/vl.c
    4.25           sdl_display_init(ds, full_screen);
    4.26  Index: ioemu/vl.h
    4.27  ===================================================================
    4.28 ---- ioemu.orig/vl.h	2006-08-09 15:04:25.380528158 +0100
    4.29 -+++ ioemu/vl.h	2006-08-09 15:04:25.584508768 +0100
    4.30 -@@ -1203,6 +1203,7 @@
    4.31 +--- ioemu.orig/vl.h	2006-08-09 21:32:25.506749753 +0100
    4.32 ++++ ioemu/vl.h	2006-08-09 21:32:25.710726744 +0100
    4.33 +@@ -1206,6 +1206,7 @@
    4.34   int xenstore_fd(void);
    4.35   void xenstore_process_event(void *opaque);
    4.36   void xenstore_check_new_media_present(int timeout);