qemu: Upgrade from 0.12.4 to 0.13.0

Patch status:
-- Removed --
arm-cp15-fix.patch
arm_timer-fix-oneshot-mode.patch
arm_timer-reload-timer-when-enabled.patch
cursor-shadow-fix.patch
-- They are already in upstream or some new changes make them useless.

-- Added --
parallel_make.patch:     Fix "make -j(>=6)" failure
wacom-tablet-fix.patch:  Fix seg fault of usb tablet.
port92_fix.patch:        Fix boot failure on ppc due to port 0x92 conflict.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>

24 files changed, 752 insertions, 736 deletions

diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/arm-cp15-fix.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/arm-cp15-fix.patch
deleted file mode 100644
index 1e0ea43083..0000000000
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/arm-cp15-fix.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From: Riku Voipio <riku.voipio@nokia.com>
-
-Access the cp15.c13 TLS registers directly with TCG ops instead of with
-a slow helper. If the the cp15 read/write was not TLS register access,
-fall back to the cp15 helper.
-
-This makes accessing __thread variables in linux-user when apps are compiled
-with -mtp=cp15 possible. legal cp15 register to acces from linux-user are
-already checked in cp15_user_ok.
-
-While at it, make the cp15.c13 Thread ID registers available only on
-ARMv6K and newer.
-
-Signed-off-by: Riku Voipio <riku.voipio@nokia.com>
-Acked-by: Laurent Desnogues <laurent.desnogues@gmail.com>
-
-diff --git a/target-arm/helper.c b/target-arm/helper.c
-index b3aec99..27001e8 100644
---- a/target-arm/helper.c
-+++ b/target-arm/helper.c
-@@ -511,7 +511,6 @@  void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val)
- uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn)
- {
-     cpu_abort(env, "cp15 insn %08x\n", insn);
--    return 0;
- }
- 
- /* These should probably raise undefined insn exceptions.  */
-@@ -1491,15 +1490,6 @@  void HELPER(set_cp15)(CPUState *env, uint32_t insn, uint32_t val)
-               tlb_flush(env, 0);
-             env->cp15.c13_context = val;
-             break;
--        case 2:
--            env->cp15.c13_tls1 = val;
--            break;
--        case 3:
--            env->cp15.c13_tls2 = val;
--            break;
--        case 4:
--            env->cp15.c13_tls3 = val;
--            break;
-         default:
-             goto bad_reg;
-         }
-@@ -1779,12 +1769,6 @@  uint32_t HELPER(get_cp15)(CPUState *env, uint32_t insn)
-             return env->cp15.c13_fcse;
-         case 1:
-             return env->cp15.c13_context;
--        case 2:
--            return env->cp15.c13_tls1;
--        case 3:
--            return env->cp15.c13_tls2;
--        case 4:
--            return env->cp15.c13_tls3;
-         default:
-             goto bad_reg;
-         }
-diff --git a/target-arm/translate.c b/target-arm/translate.c
-index 5cf3e06..786c329 100644
---- a/target-arm/translate.c
-+++ b/target-arm/translate.c
-@@ -2455,6 +2455,57 @@  static int cp15_user_ok(uint32_t insn)
-     return 0;
- }
- 
-+static int cp15_tls_load_store(CPUState *env, DisasContext *s, uint32_t insn, uint32_t rd)
-+{
-+    TCGv tmp;
-+    int cpn = (insn >> 16) & 0xf;
-+    int cpm = insn & 0xf;
-+    int op = ((insn >> 5) & 7) | ((insn >> 18) & 0x38);
-+
-+    if (!arm_feature(env, ARM_FEATURE_V6K))
-+        return 0;
-+
-+    if (!(cpn == 13 && cpm == 0))
-+        return 0;
-+
-+    if (insn & ARM_CP_RW_BIT) {
-+        tmp = new_tmp();
-+        switch (op) {
-+        case 2:
-+            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
-+            break;
-+        case 3:
-+            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
-+            break;
-+        case 4:
-+            tcg_gen_ld_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
-+            break;
-+        default:
-+            dead_tmp(tmp);
-+            return 0;
-+        }
-+        store_reg(s, rd, tmp);
-+
-+    } else {
-+        tmp = load_reg(s, rd);
-+        switch (op) {
-+        case 2:
-+            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls1));
-+            break;
-+        case 3:
-+            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls2));
-+            break;
-+        case 4:
-+            tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUARMState, cp15.c13_tls3));
-+            break;
-+        default:
-+            return 0;
-+        }
-+        dead_tmp(tmp);
-+    }
-+    return 1;
-+}
-+
- /* Disassemble system coprocessor (cp15) instruction.  Return nonzero if
-    instruction is not defined.  */
- static int disas_cp15_insn(CPUState *env, DisasContext *s, uint32_t insn)
-@@ -2489,6 +2540,10 @@  static int disas_cp15_insn(CPUState *env, DisasContext *s, uint32_t insn)
-         return 0;
-     }
-     rd = (insn >> 12) & 0xf;
-+
-+    if (cp15_tls_load_store(env, s, insn, rd))
-+        return 0;
-+
-     tmp2 = tcg_const_i32(insn);
-     if (insn & ARM_CP_RW_BIT) {
-         tmp = new_tmp();
-
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/arm_timer-fix-oneshot-mode.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/arm_timer-fix-oneshot-mode.patch
deleted file mode 100644
index 530736c4ca..0000000000
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/arm_timer-fix-oneshot-mode.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a9cf98d939c4f6539fad7e7d812ea16d96ba3dc9 Mon Sep 17 00:00:00 2001
-From: Rabin Vincent <rabin@rab.in>
-Date: Sun, 2 May 2010 15:20:52 +0530
-Subject: [PATCH] arm_timer: fix oneshot mode
-
-commit id: a9cf98d939c4f6539fad7e7d812ea16d96ba3dc9 in git://git.sv.gnu.org/qemu.git
-
-In oneshot mode, the delta needs to come from the TimerLoad register,
-not the maximum limit.
-
-Signed-off-by: Rabin Vincent <rabin@rab.in>
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
----
- hw/arm_timer.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/arm_timer.c b/hw/arm_timer.c
-index 5b6947a..9073ffc 100644
---- a/hw/arm_timer.c
-+++ b/hw/arm_timer.c
-@@ -71,7 +71,7 @@ static void arm_timer_recalibrate(arm_timer_state *s, int reload)
- {
-     uint32_t limit;
- 
--    if ((s->control & TIMER_CTRL_PERIODIC) == 0) {
-+    if ((s->control & (TIMER_CTRL_PERIODIC | TIMER_CTRL_ONESHOT)) == 0) {
-         /* Free running.  */
-         if (s->control & TIMER_CTRL_32BIT)
-             limit = 0xffffffff;
--- 
-1.6.5.2
-
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/arm_timer-reload-timer-when-enabled.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/arm_timer-reload-timer-when-enabled.patch
deleted file mode 100644
index 1890e21e60..0000000000
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/arm_timer-reload-timer-when-enabled.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d6759902cb467c002086853d2eb38fb969c29f7f Mon Sep 17 00:00:00 2001
-From: Rabin Vincent <rabin@rab.in>
-Date: Sun, 2 May 2010 15:20:51 +0530
-Subject: [PATCH] arm_timer: reload timer when enabled
-
-commit id: d6759902cb467c002086853d2eb38fb969c29f7f in git://git.sv.gnu.org/qemu.git
-
-Reload the timer when TimerControl is written, if the timer is to be
-enabled.  Otherwise, if an earlier write to TimerLoad was done while
-periodic mode was not set, s->delta may incorrectly still have the value
-of the maximum limit instead of the value written to TimerLoad.
-
-This problem is evident on versatileap on current linux-next, which
-enables TIMER_CTRL_32BIT before writing to TimerLoad and then enabling
-periodic mode and starting the timer.  This causes the first periodic
-tick to be scheduled to occur after 0xffffffff periods, leading to a
-perceived hang while the kernel waits for the first timer tick.
-
-Signed-off-by: Rabin Vincent <rabin@rab.in>
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
----
- hw/arm_timer.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/arm_timer.c b/hw/arm_timer.c
-index 9fef191..5b6947a 100644
---- a/hw/arm_timer.c
-+++ b/hw/arm_timer.c
-@@ -113,7 +113,7 @@ static void arm_timer_write(void *opaque, target_phys_addr_t offset,
-         case 1: freq >>= 4; break;
-         case 2: freq >>= 8; break;
-         }
--        arm_timer_recalibrate(s, 0);
-+        arm_timer_recalibrate(s, s->control & TIMER_CTRL_ENABLE);
-         ptimer_set_freq(s->timer, freq);
-         if (s->control & TIMER_CTRL_ENABLE) {
-             /* Restart the timer if still enabled.  */
--- 
-1.6.5.2
-
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/cursor-shadow-fix.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/cursor-shadow-fix.patch
deleted file mode 100644
index 6600c4303f..0000000000
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/cursor-shadow-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix the mouse shadow in qemu
-
-the root cause is that the qemu cursor array is hardcoded to 256 bytes, while the sato use cursor of the size 64*64=4096, thus lead buffer overflow and abnormal mouse.
-
-This issue has been fixed in upstream starting from v0.13.0-rc0. v0.12.5 still has this issue. So when qemu is upgraded to 0.13.0 or above, this patch can be safely removed.
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-diff --git a/sdl.c b/sdl.c
-index 7912c91..2f33cd2 100644
---- a/sdl.c
-+++ b/sdl.c
-@@ -775,12 +775,12 @@ static void sdl_mouse_define(int width, int height, int bpp,
-                              int hot_x, int hot_y,
-                              uint8_t *image, uint8_t *mask)
- {
--    uint8_t sprite[256], *line;
-+    uint8_t *sprite, *line;
-     int x, y, dst, bypl, src = 0;
-     if (guest_sprite)
-         SDL_FreeCursor(guest_sprite);
- 
--    memset(sprite, 0, 256);
-+    sprite = (uint8_t*)qemu_mallocz(width * height);
-     bypl = ((width * bpp + 31) >> 5) << 2;
-     for (y = 0, dst = 0; y < height; y ++, image += bypl) {
-         line = image;
-@@ -818,6 +818,7 @@ static void sdl_mouse_define(int width, int height, int bpp,
-     if (guest_cursor &&
-             (gui_grab || kbd_mouse_is_absolute() || absolute_enabled))
-         SDL_SetCursor(guest_sprite);
-+	qemu_free(sprite);
- }
- 
- static void sdl_cleanup(void)
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/qemu-ppc-hack.patch b/meta/recipes-devtools/qemu/qemu-0.12.4/qemu-ppc-hack.patch
deleted file mode 100644
index 3ed227ec35..0000000000
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/qemu-ppc-hack.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-Quick fixes to get the ppc system model to boot a 603e based

-kernel.

-

-diff --git a/hw/m48t59.c b/hw/m48t59.c

-index ce38f8b..d99054f 100644

---- a/hw/m48t59.c

-+++ b/hw/m48t59.c

-@@ -50,6 +50,7 @@

-  */

- 

- struct m48t59_t {

-+    SysBusDevice busdev;

-     /* Model parameters */

-     uint32_t type; // 2 = m48t02, 8 = m48t08, 59 = m48t59

-     /* Hardware parameters */

-@@ -74,11 +75,6 @@ typedef struct M48t59ISAState {

-     m48t59_t state;

- } M48t59ISAState;

- 

--typedef struct M48t59SysBusState {

--    SysBusDevice busdev;

--    m48t59_t state;

--} M48t59SysBusState;

--

- /* Fake timer functions */

- 

- /* Alarm management */

-@@ -629,8 +625,7 @@ static void m48t59_reset_isa(DeviceState *d)

- 

- static void m48t59_reset_sysbus(DeviceState *d)

- {

--    M48t59SysBusState *sys = container_of(d, M48t59SysBusState, busdev.qdev);

--    m48t59_t *NVRAM = &sys->state;

-+    m48t59_t *NVRAM = container_of(d, m48t59_t, busdev.qdev);

- 

-     m48t59_reset_common(NVRAM);

- }

-@@ -642,7 +637,7 @@ m48t59_t *m48t59_init (qemu_irq IRQ, target_phys_addr_t mem_base,

- {

-     DeviceState *dev;

-     SysBusDevice *s;

--    M48t59SysBusState *d;

-+    m48t59_t *d;

- 

-     dev = qdev_create(NULL, "m48t59");

-     qdev_prop_set_uint32(dev, "type", type);

-@@ -659,9 +654,9 @@ m48t59_t *m48t59_init (qemu_irq IRQ, target_phys_addr_t mem_base,

-         sysbus_mmio_map(s, 0, mem_base);

-     }

- 

--    d = FROM_SYSBUS(M48t59SysBusState, s);

-+    d = FROM_SYSBUS(m48t59_t, s);

- 

--    return &d->state;

-+    return d;

- }

- 

- m48t59_t *m48t59_init_isa(uint32_t io_base, uint16_t size, int type)

-@@ -711,8 +706,7 @@ static int m48t59_init_isa1(ISADevice *dev)

- 

- static int m48t59_init1(SysBusDevice *dev)

- {

--    M48t59SysBusState *d = FROM_SYSBUS(M48t59SysBusState, dev);

--    m48t59_t *s = &d->state;

-+    m48t59_t *s = FROM_SYSBUS(m48t59_t, dev);

-     int mem_index;

- 

-     sysbus_init_irq(dev, &s->IRQ);

-@@ -741,12 +735,12 @@ static ISADeviceInfo m48t59_isa_info = {

- static SysBusDeviceInfo m48t59_info = {

-     .init = m48t59_init1,

-     .qdev.name  = "m48t59",

--    .qdev.size = sizeof(M48t59SysBusState),

-+    .qdev.size  = sizeof(m48t59_t),

-     .qdev.reset = m48t59_reset_sysbus,

-     .qdev.props = (Property[]) {

--        DEFINE_PROP_UINT32("size",    M48t59SysBusState, state.size,    -1),

--        DEFINE_PROP_UINT32("type",    M48t59SysBusState, state.type,    -1),

--        DEFINE_PROP_HEX32( "io_base", M48t59SysBusState, state.io_base,  0),

-+        DEFINE_PROP_UINT32("size",    m48t59_t, size,    -1),

-+        DEFINE_PROP_UINT32("type",    m48t59_t, type,    -1),

-+        DEFINE_PROP_HEX32( "io_base", m48t59_t, io_base,  0),

-         DEFINE_PROP_END_OF_LIST(),

-     }

- };

-diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c

-index eb758f2..08db51b 100644

---- a/hw/ppc_prep.c

-+++ b/hw/ppc_prep.c

-@@ -73,7 +73,7 @@ qemu_log_mask(CPU_LOG_IOPORT, fmt, ## __VA_ARGS__)

- /* Constants for devices init */

- static const int ide_iobase[2] = { 0x1f0, 0x170 };

- static const int ide_iobase2[2] = { 0x3f6, 0x376 };

--static const int ide_irq[2] = { 13, 13 };

-+static const int ide_irq[2] = { 13, 14 };

- 

- #define NE2000_NB_MAX 6

- 

-@@ -620,9 +620,6 @@ static void ppc_prep_init (ram_addr_t ram_size,

-     if (filename) {

-         qemu_free(filename);

-     }

--    if (env->nip < 0xFFF80000 && bios_size < 0x00100000) {

--        hw_error("PowerPC 601 / 620 / 970 need a 1MB BIOS\n");

--    }

- 

-     if (linux_boot) {

-         kernel_base = KERNEL_LOAD_ADDR;

-diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c

-index e3bd29c..1cb2e07 100644

---- a/target-ppc/op_helper.c

-+++ b/target-ppc/op_helper.c

-@@ -1646,20 +1646,20 @@ static inline void do_rfi(target_ulong nip, target_ulong msr,

- void helper_rfi (void)

- {

-     do_rfi(env->spr[SPR_SRR0], env->spr[SPR_SRR1],

--           ~((target_ulong)0x0), 1);

-+           ~((target_ulong)0xFFFF0000), 1);

- }

- 

- #if defined(TARGET_PPC64)

- void helper_rfid (void)

- {

-     do_rfi(env->spr[SPR_SRR0], env->spr[SPR_SRR1],

--           ~((target_ulong)0x0), 0);

-+           ~((target_ulong)0xFFFF0000), 0);

- }

- 

- void helper_hrfid (void)

- {

-     do_rfi(env->spr[SPR_HSRR0], env->spr[SPR_HSRR1],

--           ~((target_ulong)0x0), 0);

-+           ~((target_ulong)0xFFFF0000), 0);

- }

- #endif

- #endif

diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/enable-i386-linux-user.patch
index 550d48b138..95420ef99e 100644
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/enable-i386-linux-user.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/enable-i386-linux-user.patch
@@ -2,13 +2,13 @@ Enable i386-linux-user
 
 Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 
-Index: qemu-0.12.4/Makefile.target
+Index: qemu-0.13.0/Makefile.target
 ===================================================================
---- qemu-0.12.4.orig/Makefile.target	2010-08-31 13:57:01.000000000 +0800
-+++ qemu-0.12.4/Makefile.target	2010-08-31 14:03:06.000000000 +0800
-@@ -46,8 +46,13 @@
- libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
- libobj-y += op_helper.o helper.o
+--- qemu-0.13.0.orig/Makefile.target	2011-01-17 16:50:39.000000000 +0800
++++ qemu-0.13.0/Makefile.target	2011-01-17 16:50:41.000000000 +0800
+@@ -54,8 +54,13 @@
+ libobj-y += cpuid.o
+ endif
  libobj-$(CONFIG_NEED_MMU) += mmu.o
 +ifndef CONFIG_LINUX_USER
  libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
@@ -20,10 +20,10 @@ Index: qemu-0.12.4/Makefile.target
  libobj-$(TARGET_ARM) += dummygl.o
  libobj-$(TARGET_MIPS) += dummygl.o
  libobj-$(TARGET_PPC) += dummygl.o
-Index: qemu-0.12.4/target-i386/dummygl.c
+Index: qemu-0.13.0/target-i386/dummygl.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qemu-0.12.4/target-i386/dummygl.c	2010-08-31 15:25:25.000000000 +0800
++++ qemu-0.13.0/target-i386/dummygl.c	2011-01-17 16:50:41.000000000 +0800
 @@ -0,0 +1,26 @@
 +#include <string.h>
 +#include <stdlib.h>
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/fix-configure-checks.patch
index 28ca2b3646..46ddc6e206 100644
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/fix-configure-checks.patch
@@ -6,15 +6,15 @@ added and files in the sysroot can be found.
 
 Patch from Paul Eggleton, Comments by RP 28/11/10
 
-Index: qemu-0.12.4/configure
+Index: qemu-0.13.0/configure
 ===================================================================
---- qemu-0.12.4.orig/configure
-+++ qemu-0.12.4/configure
-@@ -99,6 +99,7 @@ QEMU_CFLAGS="-Wstrict-prototypes -Wredun
+--- qemu-0.13.0.orig/configure	2010-10-16 04:56:09.000000000 +0800
++++ qemu-0.13.0/configure	2011-01-15 18:19:41.000000000 +0800
+@@ -134,6 +134,7 @@
  QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS"
+ QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
  QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"
 +QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS"
  LDFLAGS="-g $LDFLAGS"
  
- gcc_flags="-Wold-style-declaration -Wold-style-definition"
+ gcc_flags="-Wold-style-declaration -Wold-style-definition -fstack-protector-all"
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/fix-dirent.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/fix-dirent.patch
index 8bbfa0e88e..8bbfa0e88e 100644
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/fix-dirent.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/fix-dirent.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/fix-nogl.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/fix-nogl.patch
index 528b6f0d18..fa518abbf7 100644
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/fix-nogl.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/fix-nogl.patch
@@ -1,9 +1,9 @@
-Index: qemu-0.12.4/Makefile.target
+Index: qemu-0.13.0/Makefile.target
 ===================================================================
---- qemu-0.12.4.orig/Makefile.target	2010-06-24 07:59:15.669394205 +0100
-+++ qemu-0.12.4/Makefile.target	2010-06-24 08:07:38.739399512 +0100
-@@ -47,6 +47,10 @@
- libobj-y += op_helper.o helper.o
+--- qemu-0.13.0.orig/Makefile.target	2011-01-17 16:53:08.000000000 +0800
++++ qemu-0.13.0/Makefile.target	2011-01-17 16:53:11.000000000 +0800
+@@ -55,6 +55,10 @@
+ endif
  libobj-$(CONFIG_NEED_MMU) += mmu.o
  libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
 +libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
@@ -11,12 +11,12 @@ Index: qemu-0.12.4/Makefile.target
 +libobj-$(TARGET_MIPS) += dummygl.o
 +libobj-$(TARGET_PPC) += dummygl.o
  libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
- libobj-$(TARGET_ALPHA) += alpha_palcode.o
  
-Index: qemu-0.12.4/target-arm/dummygl.c
+ libobj-y += disas.o
+Index: qemu-0.13.0/target-arm/dummygl.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qemu-0.12.4/target-arm/dummygl.c	2010-06-24 07:59:15.899401748 +0100
++++ qemu-0.13.0/target-arm/dummygl.c	2011-01-17 16:53:11.000000000 +0800
 @@ -0,0 +1,22 @@
 +#include <string.h>
 +#include <stdlib.h>
@@ -40,10 +40,10 @@ Index: qemu-0.12.4/target-arm/dummygl.c
 +{
 +
 +}
-Index: qemu-0.12.4/target-mips/dummygl.c
+Index: qemu-0.13.0/target-mips/dummygl.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qemu-0.12.4/target-mips/dummygl.c	2010-06-24 07:59:15.899401748 +0100
++++ qemu-0.13.0/target-mips/dummygl.c	2011-01-17 16:53:11.000000000 +0800
 @@ -0,0 +1,22 @@
 +#include <string.h>
 +#include <stdlib.h>
@@ -67,10 +67,10 @@ Index: qemu-0.12.4/target-mips/dummygl.c
 +{
 +
 +}
-Index: qemu-0.12.4/target-ppc/dummygl.c
+Index: qemu-0.13.0/target-ppc/dummygl.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qemu-0.12.4/target-ppc/dummygl.c	2010-06-24 08:07:59.070712946 +0100
++++ qemu-0.13.0/target-ppc/dummygl.c	2011-01-17 16:53:11.000000000 +0800
 @@ -0,0 +1,22 @@
 +#include <string.h>
 +#include <stdlib.h>
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/glflags.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/glflags.patch
index 0a27c2dee1..0a27c2dee1 100644
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/glflags.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/glflags.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/init-info.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/init-info.patch
index 8ba7d8ff4c..77022ae541 100644
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/init-info.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/init-info.patch
@@ -2,11 +2,11 @@
 # makes info.info.x11.display zero and avoids the calls to
 # opengl_exec_set_parent_window, one of which is crashing.
 
-Index: qemu-0.12.4/sdl.c
+Index: qemu-0.13.0/ui/sdl.c
 ===================================================================
---- qemu-0.12.4.orig/sdl.c
-+++ qemu-0.12.4/sdl.c
-@@ -871,6 +871,7 @@ void sdl_display_init(DisplayState *ds, 
+--- qemu-0.13.0.orig/ui/sdl.c	2011-01-15 17:40:59.000000000 +0800
++++ qemu-0.13.0/ui/sdl.c	2011-01-15 17:41:04.000000000 +0800
+@@ -857,6 +857,7 @@
      vi = SDL_GetVideoInfo();
      host_format = *(vi->vfmt);
  
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/linker-flags.patch
index 7b33aa4840..54c480f94b 100644
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/linker-flags.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/linker-flags.patch
@@ -7,16 +7,16 @@ More information is available on the Fedora Wiki:
 https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
 
 JL - 15/06/10
-Index: qemu-0.12.4/Makefile.target
+Index: qemu-0.13.0/Makefile.target
 ===================================================================
---- qemu-0.12.4.orig/Makefile.target	2010-06-15 11:21:52.000000000 +0100
-+++ qemu-0.12.4/Makefile.target	2010-06-15 11:25:27.212852910 +0100
-@@ -178,7 +178,7 @@
- obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o
+--- qemu-0.13.0.orig/Makefile.target	2011-01-15 17:30:45.000000000 +0800
++++ qemu-0.13.0/Makefile.target	2011-01-15 17:33:22.000000000 +0800
+@@ -193,7 +193,7 @@
+ obj-y += rwhandler.o
  obj-$(CONFIG_KVM) += kvm.o kvm-all.o
- obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
+ obj-$(CONFIG_NO_KVM) += kvm-stub.o
 -LIBS+=-lz
 +LIBS+=-lz -lX11 -ldl
  
- sound-obj-y =
- sound-obj-$(CONFIG_SB16) += sb16.o
+ QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
+ QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
diff --git a/meta/recipes-devtools/qemu/qemu-0.12.4/no-strip.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/no-strip.patch
index 8a95a688b3..62cdec6109 100644
--- a/meta/recipes-devtools/qemu/qemu-0.12.4/no-strip.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/no-strip.patch
@@ -1,9 +1,9 @@
-Index: qemu/Makefile
+Index: qemu-0.13.0/Makefile
 ===================================================================
---- qemu.orig/Makefile	2010-05-11 17:17:06.416912704 -0400
-+++ qemu/Makefile	2010-05-11 17:17:17.051812402 -0400
-@@ -300,7 +300,7 @@ endif
- install: all $(if $(BUILD_DOCS),install-doc)
+--- qemu-0.13.0.orig/Makefile	2011-01-17 16:41:59.000000000 +0800
++++ qemu-0.13.0/Makefile	2011-01-17 16:44:57.000000000 +0800
+@@ -185,7 +185,7 @@
+ install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig
  	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
  ifneq ($(TOOLS),)
 -	$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
@@ -11,11 +11,11 @@ Index: qemu/Makefile
  endif
  ifneq ($(BLOBS),)
  	$(INSTALL_DIR) "$(DESTDIR)$(datadir)"
-Index: qemu/Makefile.target
+Index: qemu-0.13.0/Makefile.target
 ===================================================================
---- qemu.orig/Makefile.target	2010-05-11 17:17:12.188784092 -0400
-+++ qemu/Makefile.target	2010-05-11 17:17:17.052808122 -0400
-@@ -351,7 +351,7 @@ clean:
+--- qemu-0.13.0.orig/Makefile.target	2011-01-17 16:42:36.000000000 +0800
++++ qemu-0.13.0/Makefile.target	2011-01-17 16:44:57.000000000 +0800
+@@ -351,7 +351,7 @@
  
  install: all
  ifneq ($(PROGS),)
diff --git a/meta/recipes-devtools/qemu/qemu-0.13.0/parallel_make.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/parallel_make.patch
new file mode 100644
index 0000000000..278b1a759d
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/parallel_make.patch
@@ -0,0 +1,34 @@
+Make -j(>=6) always fail as some job depends on config-host.h. Added following
+patch in upstream to resolve it.
+
+Could remove it in next upgrade if necessary.
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+commit f0acb38015409024683911380daa94cc974e4e0e
+Author: Paul Brook <paul@codesourcery.com>
+Date:   Fri Nov 26 18:46:03 2010 +0000
+
+    Add missing dependency.
+    
+    Teach Makefile that cmd.o depends on a generated header (specifically
+    config-host.h).
+    
+    Signed-off-by: Paul Brook <paul@codesourcery.com>
+    (cherry picked from commit 6e14404aab26f74a448747d1e793ac16bde8a92b)
+    
+    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+
+Index: qemu-0.13.0/Makefile
+===================================================================
+--- qemu-0.13.0.orig/Makefile	2011-01-18 09:45:45.000000000 +0800
++++ qemu-0.13.0/Makefile	2011-01-18 09:45:45.000000000 +0800
+@@ -107,7 +107,7 @@
+ ######################################################################
+ 
+ qemu-img.o: qemu-img-cmds.h
+-qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS)
++qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o: $(GENERATED_HEADERS)
+ 
+ qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)
+ 
diff --git a/meta/recipes-devtools/qemu/qemu-0.13.0/port92_fix.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/port92_fix.patch
new file mode 100644
index 0000000000..e101c687c0
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.13.0/port92_fix.patch
@@ -0,0 +1,196 @@
+With qemu 0.13.0, poky failed to start on ppc arch because both ppc_prep_init
+and i8042_initfn try to register to port 0x92 then cause conflict. Introduce
+this patch from upstream to fix it.
+
+Could remove it in future if necessary.
+
+Signed-off-by: Zhai, Edwin <edwin.zhai@intel.com>
+
+commit 4b78a802ffaabb325a0f7b773031da92d173bde1
+Author: Blue Swirl <blauwirbel@gmail.com>
+Date:   Thu Jan 6 18:24:35 2011 +0000
+
+    pc: move port 92 stuff back to pc.c from pckbd.c
+    
+    956a3e6bb7386de48b642d4fee11f7f86a2fcf9a introduced a bug concerning