]> git.pld-linux.org Git - packages/qemu.git/commitdiff
outdated
authorJan Rękorajski <baggins@pld-linux.org>
Wed, 22 Feb 2012 10:57:06 +0000 (10:57 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    qemu-dosguest.patch -> 1.2
    qemu-isa-bios-ram.patch -> 1.3
    qemu-ncurses.patch -> 1.5
    qemu-piix-ram-size.patch -> 1.4
    qemu-ppc_old_binutils.patch -> 1.3

qemu-dosguest.patch [deleted file]
qemu-isa-bios-ram.patch [deleted file]
qemu-ncurses.patch [deleted file]
qemu-piix-ram-size.patch [deleted file]
qemu-ppc_old_binutils.patch [deleted file]

diff --git a/qemu-dosguest.patch b/qemu-dosguest.patch
deleted file mode 100644 (file)
index 30324ae..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur qemu-0.9.0.orig/hw/ps2.c qemu-0.9.0.chng/hw/ps2.c
---- qemu-0.9.0.orig/hw/ps2.c   2007-02-06 00:01:54.000000000 +0100
-+++ qemu-0.9.0.chng/hw/ps2.c   2007-03-14 12:52:00.000000000 +0100
-@@ -162,7 +162,7 @@
-             q->rptr = 0;
-         q->count--;
-         /* reading deasserts IRQ */
--        s->update_irq(s->update_arg, 0);
-+//        s->update_irq(s->update_arg, 0);
-         /* reassert IRQs if data left */
-         s->update_irq(s->update_arg, q->count != 0);
-     }
diff --git a/qemu-isa-bios-ram.patch b/qemu-isa-bios-ram.patch
deleted file mode 100644 (file)
index 589084f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: qemu-snapshot-2007-02-09_05/hw/pc.c
-===================================================================
---- qemu-snapshot-2007-02-09_05.orig/hw/pc.c
-+++ qemu-snapshot-2007-02-09_05/hw/pc.c
-@@ -522,15 +522,13 @@ static void pc_init1(int ram_size, int v
-     cpu_register_physical_memory(0xc0000, 0x10000, 
-                                  vga_bios_offset | IO_MEM_ROM);
--    /* map the last 128KB of the BIOS in ISA space */
-+    /* copy the last 128KB of the BIOS to ISA space */
-     isa_bios_size = bios_size;
-     if (isa_bios_size > (128 * 1024))
-         isa_bios_size = 128 * 1024;
--    cpu_register_physical_memory(0xd0000, (192 * 1024) - isa_bios_size,
--                                 IO_MEM_UNASSIGNED);
--    cpu_register_physical_memory(0x100000 - isa_bios_size,
--                                 isa_bios_size,
--                                 (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);
-+    memcpy(phys_ram_base + 0x100000 - isa_bios_size,
-+           phys_ram_base + bios_offset + bios_size - isa_bios_size,
-+           isa_bios_size);
-     {
-         ram_addr_t option_rom_offset;
diff --git a/qemu-ncurses.patch b/qemu-ncurses.patch
deleted file mode 100644 (file)
index 5b62e0c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
---- qemu-0.12.2.a/configure    2010-02-02 17:41:58.000000000 +0100
-+++ qemu-0.12.2.b/configure    2010-02-02 17:58:54.000000000 +0100
-@@ -1267,7 +1267,7 @@
- if test "$curses" != "no" ; then
-   curses_found=no
-   cat > $TMPC << EOF
--#include <curses.h>
-+#include <ncurses/curses.h>
- #ifdef __OpenBSD__
- #define resize_term resizeterm
- #endif
---- qemu-0.12.2.a/ui/curses.c  2010-02-02 18:29:18.000000000 +0100
-+++ qemu-0.12.2.a/ui/curses.c  2010-02-02 18:29:47.000000000 +0100
-@@ -21,7 +21,7 @@
-  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  * THE SOFTWARE.
-  */
--#include <curses.h>
-+#include <ncurses/curses.h>
- #ifndef _WIN32
- #include <signal.h>
---- qemu-0.13.0/ui/curses_keys.h~      2010-10-15 21:56:09.000000000 +0100
-+++ qemu-0.13.0/ui/curses_keys.h       2010-10-20 13:38:16.578832783 +0100
-@@ -22,7 +22,7 @@
-  * THE SOFTWARE.
-  */
--#include <curses.h>
-+#include <ncurses/curses.h>
- #include "keymaps.h"
---- qemu-1.0/console.h.wiget   2011-12-01 23:44:44.809570527 +0100
-+++ qemu-1.0/console.h 2011-12-01 23:45:02.775490445 +0100
-@@ -329,7 +329,7 @@ static inline int ds_get_bytes_per_pixel
- }
- #ifdef CONFIG_CURSES
--#include <curses.h>
-+#include <ncurses/curses.h>
- typedef chtype console_ch_t;
- #else
- typedef unsigned long console_ch_t;
diff --git a/qemu-piix-ram-size.patch b/qemu-piix-ram-size.patch
deleted file mode 100644 (file)
index 2d28f97..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: qemu-snapshot-2007-02-09_05/hw/piix_pci.c
-===================================================================
---- qemu-snapshot-2007-02-09_05.orig/hw/piix_pci.c
-+++ qemu-snapshot-2007-02-09_05/hw/piix_pci.c
-@@ -155,7 +155,7 @@ static int i440fx_load(QEMUFile* f, void
-     return 0;
- }
--PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic)
-+PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic, int ram_size)
- {
-     PCIBus *b;
-     PCIDevice *d;
-@@ -186,6 +186,10 @@ PCIBus *i440fx_init(PCIDevice **pi440fx_
-     d->config[0x08] = 0x02; // revision
-     pci_config_set_class(d->config, PCI_CLASS_BRIDGE_HOST);
-     d->config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
-+    ram_size = ram_size / 8 / 1024 / 1024;
-+    if (ram_size > 255)
-+        ram_size = 255;
-+    d->config[0x57] = ram_size;
-     d->config[0x72] = 0x02; /* SMRAM */
-Index: qemu-snapshot-2007-02-09_05/hw/pc.c
-===================================================================
---- qemu-snapshot-2007-02-09_05.orig/hw/pc.c
-+++ qemu-snapshot-2007-02-09_05/hw/pc.c
-@@ -623,7 +623,7 @@ static void pc_init1(int ram_size, int v
-     }
-     if (pci_enabled) {
--        pci_bus = i440fx_init(&i440fx_state, i8259);
-+        pci_bus = i440fx_init(&i440fx_state, i8259, ram_size);
-         piix3_devfn = piix3_init(pci_bus, -1);
-     } else {
-         pci_bus = NULL;
-Index: qemu-snapshot-2007-02-09_05/hw/pc.h
-===================================================================
---- qemu-snapshot-2007-02-09_05.orig/hw/pc.h
-+++ qemu-snapshot-2007-02-09_05/hw/pc.h
-@@ -841,7 +841,7 @@ PCIBus *pci_apb_init(target_ulong specia
- PCIBus *pci_vpb_init(void *pic, int irq, int realview);
- /* piix_pci.c */
--PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic);
-+PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic, int ram_size);
- void i440fx_set_smm(PCIDevice *d, int val);
- int piix3_init(PCIBus *bus, int devfn);
- void i440fx_init_memory_mappings(PCIDevice *d);
diff --git a/qemu-ppc_old_binutils.patch b/qemu-ppc_old_binutils.patch
deleted file mode 100644 (file)
index 5cd9203..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
---- qemu-0.9.1/ppc.ld  2008-01-06 19:38:42.000000000 +0000
-+++ qemu-0.9.1/ppc.ld.new      2008-01-21 21:51:54.000000000 +0000
-@@ -93,23 +93,23 @@
-   .tbss                 : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-   .preinit_array     :
-   {
--    PROVIDE_HIDDEN (__preinit_array_start = .);
-+    PROVIDE (__preinit_array_start = .);
-     KEEP (*(.preinit_array))
--    PROVIDE_HIDDEN (__preinit_array_end = .);
-+    PROVIDE (__preinit_array_end = .);
-   }
-   .init_array     :
-   {
--     PROVIDE_HIDDEN (__init_array_start = .);
-+     PROVIDE (__init_array_start = .);
-      KEEP (*(SORT(.init_array.*)))
-      KEEP (*(.init_array))
--     PROVIDE_HIDDEN (__init_array_end = .);
-+     PROVIDE (__init_array_end = .);
-   }
-   .fini_array     :
-   {
--    PROVIDE_HIDDEN (__fini_array_start = .);
-+    PROVIDE (__fini_array_start = .);
-     KEEP (*(.fini_array))
-     KEEP (*(SORT(.fini_array.*)))
--    PROVIDE_HIDDEN (__fini_array_end = .);
-+    PROVIDE (__fini_array_end = .);
-   }
-   .ctors          :
-   {
-@@ -143,9 +143,9 @@
-   .got1           : { *(.got1) }
-   .got2           : { *(.got2) }
-   .dynamic        : { *(.dynamic) }
--  .got            : SPECIAL { *(.got) }
-+  .got            :  { *(.got) }
-   . = DATA_SEGMENT_RELRO_END (0, .);
--  .plt            : SPECIAL { *(.plt) }
-+  .plt            :  { *(.plt) }
-   .data           :
-   {
-     *(.data .data.* .gnu.linkonce.d.*)
-@@ -153,7 +153,7 @@
-     SORT(CONSTRUCTORS)
-   }
-   .data1          : { *(.data1) }
--  .got            : SPECIAL { *(.got) }
-+  .got            :  { *(.got) }
-   /* We want the small data sections together, so single-instruction offsets
-      can access them all, and initialized data all before uninitialized, so
-      we can shorten the on-disk segment size.  */
-@@ -172,7 +172,7 @@
-     *(.scommon)
-     PROVIDE (__sbss_end = .); PROVIDE (___sbss_end = .);
-   }
--  .plt            : SPECIAL { *(.plt) }
-+  .plt            :  { *(.plt) }
-   .bss            :
-   {
-    *(.dynbss)
This page took 0.038098 seconds and 4 git commands to generate.