ia64/xen-unstable

changeset 11557:93135bbb5344

[qemu patches] Refresh qemu-pci patch without -p3.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author Christian Limpach <Christian.Limpach@xensource.com>
date Thu Sep 21 11:33:38 2006 +0100 (2006-09-21)
parents 4fab9c477f62
children 39aaa54756db 587735fb18ab
files tools/ioemu/patches/qemu-pci tools/ioemu/patches/series
line diff
     1.1 --- a/tools/ioemu/patches/qemu-pci	Thu Sep 21 11:33:00 2006 +0100
     1.2 +++ b/tools/ioemu/patches/qemu-pci	Thu Sep 21 11:33:38 2006 +0100
     1.3 @@ -1,7 +1,8 @@
     1.4 -diff -r d5eb5205ff35 tools/ioemu/hw/pci.c
     1.5 ---- a/tools/ioemu/hw/pci.c	Thu Aug 24 16:25:49 2006 +0100
     1.6 -+++ b/tools/ioemu/hw/pci.c	Fri Aug 25 11:00:03 2006 +0800
     1.7 -@@ -286,6 +286,7 @@ void pci_default_write_config(PCIDevice 
     1.8 +Index: ioemu/hw/pci.c
     1.9 +===================================================================
    1.10 +--- ioemu.orig/hw/pci.c	2006-09-21 11:31:14.000000000 +0100
    1.11 ++++ ioemu/hw/pci.c	2006-09-21 11:31:32.000000000 +0100
    1.12 +@@ -286,6 +286,7 @@
    1.13               case 0x0b:
    1.14               case 0x0e:
    1.15               case 0x10 ... 0x27: /* base */
    1.16 @@ -9,7 +10,7 @@ diff -r d5eb5205ff35 tools/ioemu/hw/pci.
    1.17               case 0x30 ... 0x33: /* rom */
    1.18               case 0x3d:
    1.19                   can_write = 0;
    1.20 -@@ -318,6 +319,18 @@ void pci_default_write_config(PCIDevice 
    1.21 +@@ -318,6 +319,18 @@
    1.22               break;
    1.23           }
    1.24           if (can_write) {
    1.25 @@ -28,10 +29,11 @@ diff -r d5eb5205ff35 tools/ioemu/hw/pci.
    1.26               d->config[addr] = val;
    1.27           }
    1.28           addr++;
    1.29 -diff -r d5eb5205ff35 tools/ioemu/hw/rtl8139.c
    1.30 ---- a/tools/ioemu/hw/rtl8139.c	Thu Aug 24 16:25:49 2006 +0100
    1.31 -+++ b/tools/ioemu/hw/rtl8139.c	Fri Aug 25 11:00:03 2006 +0800
    1.32 -@@ -3423,6 +3423,8 @@ void pci_rtl8139_init(PCIBus *bus, NICIn
    1.33 +Index: ioemu/hw/rtl8139.c
    1.34 +===================================================================
    1.35 +--- ioemu.orig/hw/rtl8139.c	2006-09-21 11:31:14.000000000 +0100
    1.36 ++++ ioemu/hw/rtl8139.c	2006-09-21 11:31:32.000000000 +0100
    1.37 +@@ -3423,6 +3423,8 @@
    1.38       pci_conf[0x0e] = 0x00; /* header_type */
    1.39       pci_conf[0x3d] = 1;    /* interrupt pin 0 */
    1.40       pci_conf[0x34] = 0xdc;
    1.41 @@ -40,10 +42,11 @@ diff -r d5eb5205ff35 tools/ioemu/hw/rtl8
    1.42   
    1.43       s = &d->rtl8139;
    1.44   
    1.45 -diff -r d5eb5205ff35 tools/ioemu/hw/usb-uhci.c
    1.46 ---- a/tools/ioemu/hw/usb-uhci.c	Thu Aug 24 16:25:49 2006 +0100
    1.47 -+++ b/tools/ioemu/hw/usb-uhci.c	Fri Aug 25 11:00:03 2006 +0800
    1.48 -@@ -659,6 +659,8 @@ void usb_uhci_init(PCIBus *bus, int devf
    1.49 +Index: ioemu/hw/usb-uhci.c
    1.50 +===================================================================
    1.51 +--- ioemu.orig/hw/usb-uhci.c	2006-09-21 11:31:14.000000000 +0100
    1.52 ++++ ioemu/hw/usb-uhci.c	2006-09-21 11:31:32.000000000 +0100
    1.53 +@@ -659,6 +659,8 @@
    1.54       pci_conf[0x0e] = 0x00; // header_type
    1.55       pci_conf[0x3d] = 4; // interrupt pin 3
    1.56       pci_conf[0x60] = 0x10; // release number
     2.1 --- a/tools/ioemu/patches/series	Thu Sep 21 11:33:00 2006 +0100
     2.2 +++ b/tools/ioemu/patches/series	Thu Sep 21 11:33:38 2006 +0100
     2.3 @@ -44,4 +44,4 @@ qemu-daemonize
     2.4  xen-platform-device
     2.5  qemu-bootorder
     2.6  qemu-tunable-ide-write-cache
     2.7 -qemu-pci -p3
     2.8 +qemu-pci