Accepting request 184936 from home:a_faerber:branches:Virtualization

Update to v1.6.0-rc0, fixing build regression against latest Base:System dtc for SLE_11_SP2 ppc64 reported by k0da OBS-URL: https://build.opensuse.org/request/show/184936 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=149
2013-07-30 12:36:48 +00:00 · 2013-07-30 12:36:48 +00:00 · 49c99eebef
commit 49c99eebef
parent 924fec7f05
49 changed files with 312 additions and 376 deletions
--- a/0001-XXX-dont-dump-core-on-sigabort.patc.patch
+++ b/0001-XXX-dont-dump-core-on-sigabort.patc.patch
@ -1,19 +1,19 @@
-From 13dfb466d30258e7a8e1657d9be88c8270e299fc Mon Sep 17 00:00:00 2001
+From 9b0c8f950c275b2115fd20cf1e706771774d6132 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 21 Nov 2011 23:50:36 +0100
 Subject: [PATCH] XXX dont dump core on sigabort

 ---
- linux-user/signal.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ linux-user/signal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)

 diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 1055507..7af7caa 100644
+index 23d65da..c6f9968 100644
 --- a/linux-user/signal.c
 +++ b/linux-user/signal.c
-@@ -394,6 +394,10 @@ static void QEMU_NORETURN force_sig(int target_sig)
+@@ -395,6 +395,10 @@ static void QEMU_NORETURN force_sig(int target_sig)
     host_sig = target_to_host_signal(target_sig);
-     gdb_signalled(thread_env, target_sig);
+     gdb_signalled(env, target_sig);
 
 +    if (target_sig == 6) {
 +        goto no_core;
@ -22,7 +22,7 @@ index 1055507..7af7caa 100644
     /* dump core if supported by target binary format */
     if (core_dump_signal(target_sig) && (ts->bprm->core_dump != NULL)) {
         stop_all_tasks();
-@@ -411,6 +415,8 @@ static void QEMU_NORETURN force_sig(int target_sig)
+@@ -412,6 +416,8 @@ static void QEMU_NORETURN force_sig(int target_sig)
             target_sig, strsignal(host_sig), "core dumped" );
     }
 
--- a/0002-XXX-work-around-SA_RESTART-race-wit.patch
+++ b/0002-XXX-work-around-SA_RESTART-race-wit.patch
@ -1,21 +1,21 @@
-From 7a858eca9a75c39cf33a8f259db541ae295132f7 Mon Sep 17 00:00:00 2001
+From 31fa99e2fe523eed278bacddbe41bcd66f558894 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 1 Dec 2011 19:00:01 +0100
 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)

 [AF: CPUState -> CPUArchState, adapt to reindentation]
 ---
- linux-user/main.c    |   25 +++++++++-----
- linux-user/qemu.h    |    3 ++
- linux-user/signal.c  |   22 ++++++++++++
- linux-user/syscall.c |   90 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ linux-user/main.c    | 25 +++++++++------
+ linux-user/qemu.h    |  3 ++
+ linux-user/signal.c  | 22 +++++++++++++
+ linux-user/syscall.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 130 insertions(+), 10 deletions(-)

 diff --git a/linux-user/main.c b/linux-user/main.c
-index b97b8cf..7ce4488 100644
+index 03859bc..aae31c1 100644
 --- a/linux-user/main.c
 +++ b/linux-user/main.c
-@@ -840,15 +840,22 @@ void cpu_loop(CPUARMState *env)
+@@ -801,15 +801,22 @@ void cpu_loop(CPUARMState *env)
                             break;
                         }
                     } else {
@ -48,10 +48,10 @@ index b97b8cf..7ce4488 100644
                 } else {
                     goto error;
 diff --git a/linux-user/qemu.h b/linux-user/qemu.h
-index b10e957..2d6f957 100644
+index 4a16e8f..9411c77 100644
 --- a/linux-user/qemu.h
 +++ b/linux-user/qemu.h
-@@ -137,6 +137,8 @@ typedef struct TaskState {
+@@ -131,6 +131,8 @@ typedef struct TaskState {
     struct sigqueue sigqueue_table[MAX_SIGQUEUE_SIZE]; /* siginfo queue */
     struct sigqueue *first_free; /* first free siginfo queue entry */
     int signal_pending; /* non zero if a signal may be pending */
@ -60,7 +60,7 @@ index b10e957..2d6f957 100644
 } __attribute__((aligned(16))) TaskState;
 
 extern char *exec_path;
-@@ -203,6 +205,7 @@ char *target_strerror(int err);
+@@ -197,6 +199,7 @@ char *target_strerror(int err);
 int get_osversion(void);
 void fork_start(void);
 void fork_end(int child);
@ -69,7 +69,7 @@ index b10e957..2d6f957 100644
 /* Creates the initial guest address space in the host memory space using
  * the given host start address hint and size.  The guest_start parameter
 diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 7af7caa..dd81bc6 100644
+index c6f9968..b52c536 100644
 --- a/linux-user/signal.c
 +++ b/linux-user/signal.c
@@ -25,6 +25,7 @@
@ -80,7 +80,7 @@ index 7af7caa..dd81bc6 100644
 
 #include "qemu.h"
 #include "qemu-common.h"
-@@ -502,6 +503,11 @@ int queue_signal(CPUArchState *env, int sig, target_siginfo_t *info)
+@@ -503,6 +504,11 @@ int queue_signal(CPUArchState *env, int sig, target_siginfo_t *info)
         k->pending = 1;
         /* signal that a new signal is pending */
         ts->signal_pending = 1;
@ -92,7 +92,7 @@ index 7af7caa..dd81bc6 100644
         return 1; /* indicates that the signal was queued */
     }
 }
-@@ -636,8 +642,24 @@ int do_sigaction(int sig, const struct target_sigaction *act,
+@@ -638,8 +644,24 @@ int do_sigaction(int sig, const struct target_sigaction *act,
         if (host_sig != SIGSEGV && host_sig != SIGBUS) {
             sigfillset(&act1.sa_mask);
             act1.sa_flags = SA_SIGINFO;
@ -118,10 +118,10 @@ index 7af7caa..dd81bc6 100644
                ignore state to avoid getting unexpected interrupted
                syscalls */
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 30e93bc..1d3406f 100644
+index f986548..23954c1 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5185,6 +5185,87 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
+@@ -5085,6 +5085,87 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
     return get_errno(open(path(pathname), flags, mode));
 }
 
@ -209,7 +209,7 @@ index 30e93bc..1d3406f 100644
 /* do_syscall() should always have a single exit point at the end so
    that actions, such as logging of syscall results, can be performed.
    All errnos that do_syscall() returns must be -TARGET_<errcode>. */
-@@ -5197,6 +5278,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -5098,6 +5179,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
     struct stat st;
     struct statfs stfs;
     void *p;
@ -222,7 +222,7 @@ index 30e93bc..1d3406f 100644
 
 #ifdef DEBUG
     gemu_log("syscall %d", num);
-@@ -8255,7 +8342,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -8215,7 +8302,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 	cmd = target_to_host_fcntl_cmd(arg2);
         if (cmd == -TARGET_EINVAL) {
             ret = cmd;
@ -231,7 +231,7 @@ index 30e93bc..1d3406f 100644
         }
 
         switch(arg2) {
-@@ -9034,6 +9121,7 @@ fail:
+@@ -9006,6 +9093,7 @@ fail:
 #endif
     if(do_strace)
         print_syscall_ret(num, ret);
--- a/0003-qemu-0.9.0.cvs-binfmt.patch.patch
+++ b/0003-qemu-0.9.0.cvs-binfmt.patch.patch
@ -1,4 +1,4 @@
-From b8c97a30f3ae2c1a1c8fb27071938f5126ef5511 Mon Sep 17 00:00:00 2001
+From deb7d7569b070edcbf4c0496bd7371167f22e4bf Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:18:44 +0200
 Subject: [PATCH] qemu-0.9.0.cvs-binfmt
@ -10,8 +10,8 @@ Fixes binfmt_misc setup script:

 Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
- scripts/qemu-binfmt-conf.sh |   37 ++++++++++++++++++++-----------------
- 1 files changed, 20 insertions(+), 17 deletions(-)
+ scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++-----------------
+ 1 file changed, 20 insertions(+), 17 deletions(-)

 diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
 index 0da2618..dc652f0 100644
--- a/0004-qemu-cvs-alsa_bitfield.patch.patch
+++ b/0004-qemu-cvs-alsa_bitfield.patch.patch
@ -1,4 +1,4 @@
-From 94fa57b0b5a784afdb81243ca42c2ceb56b07891 Mon Sep 17 00:00:00 2001
+From 8fdbddc95242f8f33985729c5ae90814fb37857b Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:20:50 +0200
 Subject: [PATCH] qemu-cvs-alsa_bitfield
@ -8,9 +8,9 @@ Implements TYPE_INTBITFIELD partially. (required for ALSA support)
 Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
- include/exec/user/thunk.h |    3 +++
- thunk.c                   |   21 +++++++++++++++++++++
- 2 files changed, 24 insertions(+), 0 deletions(-)
+ include/exec/user/thunk.h |  3 +++
+ thunk.c                   | 21 +++++++++++++++++++++
+ 2 files changed, 24 insertions(+)

 diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
 index 87025c3..6c35e64 100644
--- a/0005-qemu-cvs-alsa_ioctl.patch.patch
+++ b/0005-qemu-cvs-alsa_ioctl.patch.patch
@ -1,4 +1,4 @@
-From d0759bf94abea6a8f4bb307269f53de63c86f51a Mon Sep 17 00:00:00 2001
+From 65146a18ef2101b2fee4d9a2215237583b30ca16 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:23:27 +0200
 Subject: [PATCH] qemu-cvs-alsa_ioctl
@ -14,16 +14,16 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
 linux-user/syscall_defs.h        |    2 +
 linux-user/syscall_types.h       |    5 +
 linux-user/syscall_types_alsa.h  | 1336 +++++++++++++++++++++++++++++
- 6 files changed, 3555 insertions(+), 0 deletions(-)
+ 6 files changed, 3555 insertions(+)
 create mode 100644 linux-user/ioctls_alsa.h
 create mode 100644 linux-user/ioctls_alsa_structs.h
 create mode 100644 linux-user/syscall_types_alsa.h

 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index 8a47767..6af0cb7 100644
+index 439c2a9..28dc0b2 100644
 --- a/linux-user/ioctls.h
 +++ b/linux-user/ioctls.h
-@@ -316,6 +316,11 @@
+@@ -314,6 +314,11 @@
   IOCTL(VFAT_IOCTL_READDIR_BOTH, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2)))
   IOCTL(VFAT_IOCTL_READDIR_SHORT, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2)))
 
@ -2255,10 +2255,10 @@ index 0000000..e09a30d
 +  unsigned char *code;
 +};
 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 92c01a9..7ceb56b 100644
+index 086fbff..a8aba1b 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
-@@ -2448,4 +2448,6 @@ struct target_ucred {
+@@ -2476,4 +2476,6 @@ struct target_ucred {
     uint32_t gid;
 };
 
--- a/0006-qemu-cvs-alsa_mmap.patch.patch
+++ b/0006-qemu-cvs-alsa_mmap.patch.patch
@ -1,4 +1,4 @@
-From 4ab598c475bad5e975ee84dfe0a61cfd87b4b41a Mon Sep 17 00:00:00 2001
+From a042a38679238920c4a52d8810404ac17153aff9 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:24:15 +0200
 Subject: [PATCH] qemu-cvs-alsa_mmap
@ -8,14 +8,14 @@ Hack to prevent ALSA from using mmap() interface to simplify emulation.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
- linux-user/mmap.c |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
+ linux-user/mmap.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)

 diff --git a/linux-user/mmap.c b/linux-user/mmap.c
-index b412e3f..46523de 100644
+index a249f0c..34a5615 100644
 --- a/linux-user/mmap.c
 +++ b/linux-user/mmap.c
-@@ -377,6 +377,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size)
+@@ -366,6 +366,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size)
     }
 }
 
@ -25,7 +25,7 @@ index b412e3f..46523de 100644
 /* NOTE: all the constants are the HOST ones */
 abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
                      int flags, int fd, abi_ulong offset)
-@@ -411,6 +414,17 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
+@@ -400,6 +403,17 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
     }
 #endif
 
--- a/0007-qemu-cvs-gettimeofday.patch.patch
+++ b/0007-qemu-cvs-gettimeofday.patch.patch
@ -1,18 +1,18 @@
-From 1bd4e865038ce8b6baedee0bfef0921d81731804 Mon Sep 17 00:00:00 2001
+From 049bb6ee62768e192c87c8834b49a3532bdce2de Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:25:41 +0200
 Subject: [PATCH] qemu-cvs-gettimeofday

 No clue what this is for.
 ---
- linux-user/syscall.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 2 ++
+ 1 file changed, 2 insertions(+)

 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 1d3406f..94eb877 100644
+index 23954c1..709c167 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -6336,6 +6336,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -6236,6 +6236,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
     case TARGET_NR_gettimeofday:
         {
             struct timeval tv;
--- a/0008-qemu-cvs-ioctl_debug.patch.patch
+++ b/0008-qemu-cvs-ioctl_debug.patch.patch
@ -1,4 +1,4 @@
-From 06cafbff311739237aac8e18505d0d9713048eb1 Mon Sep 17 00:00:00 2001
+From 1c2a8edbb0813234b21313e3dd96c3a0954ef9ec Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:26:33 +0200
 Subject: [PATCH] qemu-cvs-ioctl_debug
@ -8,14 +8,14 @@ Extends unsupported ioctl debug output.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
- linux-user/syscall.c |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ linux-user/syscall.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 94eb877..a171128 100644
+index 709c167..7453ff5 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -3737,7 +3737,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
+@@ -3649,7 +3649,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
     ie = ioctl_entries;
     for(;;) {
         if (ie->target_cmd == 0) {
--- a/0009-qemu-cvs-ioctl_nodirection.patch.patch
+++ b/0009-qemu-cvs-ioctl_nodirection.patch.patch
@ -1,4 +1,4 @@
-From e33833ca5e418416c4ba1fdb84a11a5c1d39992b Mon Sep 17 00:00:00 2001
+From bc5c4b794113cf1460f11a7463220a58058a990a Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:27:36 +0200
 Subject: [PATCH] qemu-cvs-ioctl_nodirection
@ -11,14 +11,14 @@ IOC_RW.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
- linux-user/syscall.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 6 ++++++
+ 1 file changed, 6 insertions(+)

 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index a171128..01fbfb7 100644
+index 7453ff5..18ec182 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -3771,6 +3771,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
+@@ -3683,6 +3683,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
         arg_type++;
         target_size = thunk_type_size(arg_type, 0);
         switch(ie->access) {
@ -30,7 +30,7 @@ index a171128..01fbfb7 100644
         case IOC_R:
             ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
             if (!is_error(ret)) {
-@@ -3789,6 +3794,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
+@@ -3701,6 +3706,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
             unlock_user(argptr, arg, 0);
             ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
             break;
--- a/0010-block-vmdk-Support-creation-of-SCSI.patch
+++ b/0010-block-vmdk-Support-creation-of-SCSI.patch
@ -1,4 +1,4 @@
-From 1931e39b450242d402e779204aaf832ab5bb98a5 Mon Sep 17 00:00:00 2001
+From b9b9015ac3d7db7ce57d7dda50eafc30c835cb04 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:37:42 +0200
 Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img
@ -11,17 +11,17 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
 [AF: Rebased onto upstream VMDK SCSI support]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- block.c                   |    6 +++++-
- block/vmdk.c              |    9 ++++++++-
- include/block/block_int.h |    2 ++
- qemu-img.c                |    8 +++++++-
+ block.c                   | 6 +++++-
+ block/vmdk.c              | 9 ++++++++-
+ include/block/block_int.h | 2 ++
+ qemu-img.c                | 8 +++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

 diff --git a/block.c b/block.c
-index 3f87489..34a332f 100644
+index 01b66d8..35a07a5 100644
 --- a/block.c
 +++ b/block.c
-@@ -4739,7 +4739,7 @@ void bdrv_img_create(const char *filename, const char *fmt,
+@@ -4469,7 +4469,7 @@ void bdrv_img_create(const char *filename, const char *fmt,
                      Error **errp, bool quiet)
 {
     QEMUOptionParameter *param = NULL, *create_options = NULL;
@ -30,7 +30,7 @@ index 3f87489..34a332f 100644
     BlockDriverState *bs = NULL;
     BlockDriver *drv, *proto_drv;
     BlockDriver *backing_drv = NULL;
-@@ -4849,6 +4849,10 @@ void bdrv_img_create(const char *filename, const char *fmt,
+@@ -4579,6 +4579,10 @@ void bdrv_img_create(const char *filename, const char *fmt,
     if (!quiet) {
         printf("Formatting '%s', fmt=%s ", filename, fmt);
         print_option_parameters(param);
@ -42,10 +42,10 @@ index 3f87489..34a332f 100644
     }
     ret = bdrv_create(drv, filename, param);
 diff --git a/block/vmdk.c b/block/vmdk.c
-index 608daaf..9e0f678 100644
+index 3756333..c67bfbf 100644
 --- a/block/vmdk.c
 +++ b/block/vmdk.c
-@@ -1557,6 +1557,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
+@@ -1543,6 +1543,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
             fmt = options->value.s;
         } else if (!strcmp(options->name, BLOCK_OPT_ZEROED_GRAIN)) {
             zeroed_grain |= options->value.n;
@ -54,7 +54,7 @@ index 608daaf..9e0f678 100644
         }
         options++;
     }
-@@ -1663,7 +1665,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
+@@ -1646,7 +1648,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
             ext_desc_lines,
             (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
             total_size / (int64_t)(63 * number_heads * 512), number_heads,
@ -76,10 +76,10 @@ index 608daaf..9e0f678 100644
 };
 
 diff --git a/include/block/block_int.h b/include/block/block_int.h
-index 6078dd3..1679515 100644
+index e45f2a0..74f71ba 100644
 --- a/include/block/block_int.h
 +++ b/include/block/block_int.h
-@@ -37,6 +37,7 @@
+@@ -38,6 +38,7 @@
 #define BLOCK_FLAG_ENCRYPT          1
 #define BLOCK_FLAG_COMPAT6          4
 #define BLOCK_FLAG_LAZY_REFCOUNTS   8
@ -87,7 +87,7 @@ index 6078dd3..1679515 100644
 
 #define BLOCK_IO_LIMIT_READ     0
 #define BLOCK_IO_LIMIT_WRITE    1
-@@ -48,6 +49,7 @@
+@@ -49,6 +50,7 @@
 #define BLOCK_OPT_SIZE              "size"
 #define BLOCK_OPT_ENCRYPT           "encryption"
 #define BLOCK_OPT_COMPAT6           "compat6"
@ -96,10 +96,10 @@ index 6078dd3..1679515 100644
 #define BLOCK_OPT_BACKING_FMT       "backing_fmt"
 #define BLOCK_OPT_CLUSTER_SIZE      "cluster_size"
 diff --git a/qemu-img.c b/qemu-img.c
-index cd096a1..8586fc8 100644
+index c55ca5c..d7cc9a1 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -1121,7 +1121,7 @@ static int img_convert(int argc, char **argv)
+@@ -1124,7 +1124,7 @@ static int img_convert(int argc, char **argv)
     const uint8_t *buf1;
     BlockDriverInfo bdi;
     QEMUOptionParameter *param = NULL, *create_options = NULL;
@ -108,7 +108,7 @@ index cd096a1..8586fc8 100644
     char *options = NULL;
     const char *snapshot_name = NULL;
     float local_progress = 0;
-@@ -1323,6 +1323,12 @@ static int img_convert(int argc, char **argv)
+@@ -1326,6 +1326,12 @@ static int img_convert(int argc, char **argv)
         }
     }
 
--- a/0011-linux-user-add-binfmt-wrapper-for-a.patch
+++ b/0011-linux-user-add-binfmt-wrapper-for-a.patch
@ -1,4 +1,4 @@
-From 42b99c285cb5d260a3bfcf505ac2e2392bfda203 Mon Sep 17 00:00:00 2001
+From 103411d099113abcad7fe7990717174f70a9f74c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 30 Sep 2011 19:40:36 +0200
 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
@ -27,15 +27,15 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
 [AF: Rebased onto new Makefile infrastructure]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- Makefile.target             |   12 ++++++++++++
- linux-user/Makefile.objs    |    2 ++
- linux-user/binfmt.c         |   42 ++++++++++++++++++++++++++++++++++++++++++
- scripts/qemu-binfmt-conf.sh |   34 +++++++++++++++++-----------------
+ Makefile.target             | 12 ++++++++++++
+ linux-user/Makefile.objs    |  2 ++
+ linux-user/binfmt.c         | 42 ++++++++++++++++++++++++++++++++++++++++++
+ scripts/qemu-binfmt-conf.sh | 34 +++++++++++++++++-----------------
 4 files changed, 73 insertions(+), 17 deletions(-)
 create mode 100644 linux-user/binfmt.c

 diff --git a/Makefile.target b/Makefile.target
-index ce4391f..1d733e0 100644
+index 9a49852..58e7a22 100644
 --- a/Makefile.target
 +++ b/Makefile.target
@@ -31,6 +31,10 @@ PROGS+=$(QEMU_PROGW)
@ -49,7 +49,7 @@ index ce4391f..1d733e0 100644
 config-target.h: config-target.h-timestamp
 config-target.h-timestamp: config-target.mak
 
-@@ -88,6 +92,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user
+@@ -96,6 +100,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user
 obj-y += linux-user/
 obj-y += gdbstub.o thunk.o user-exec.o
 
@ -58,7 +58,7 @@ index ce4391f..1d733e0 100644
 endif #CONFIG_LINUX_USER
 
 #########################################################
-@@ -138,6 +144,9 @@ endif # CONFIG_SOFTMMU
+@@ -144,6 +150,9 @@ endif # CONFIG_SOFTMMU
 %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
 
 nested-vars += obj-y
@ -68,7 +68,7 @@ index ce4391f..1d733e0 100644
 
 # This resolves all nested paths, so it must come last
 include $(SRC_PATH)/Makefile.objs
-@@ -160,6 +169,9 @@ $(QEMU_PROG): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
+@@ -166,6 +175,9 @@ $(QEMU_PROG): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
 	$(call LINK,$^)
 endif
 
--- a/0012-linux-user-Ignore-timer_create-sysc.patch
+++ b/0012-linux-user-Ignore-timer_create-sysc.patch
@ -1,4 +1,4 @@
-From fc313ec8af695db139b22e315470dc52f0384459 Mon Sep 17 00:00:00 2001
+From 20a565c58308fd4c02b6034332f0a398b2a28304 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Sun, 11 Dec 2011 01:19:24 +0100
 Subject: [PATCH] linux-user: Ignore timer_create syscall
@ -8,14 +8,14 @@ about it breaks some %check tests in OBS, so better ignore it silently.

 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- linux-user/syscall.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 5 +++++
+ 1 file changed, 5 insertions(+)

 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 01fbfb7..14c98ac 100644
+index 18ec182..eda4455 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -8716,6 +8716,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -8690,6 +8690,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
         break;
 #endif
 
--- a/0013-linux-user-be-silent-about-capget-f.patch
+++ b/0013-linux-user-be-silent-about-capget-f.patch
@ -1,4 +1,4 @@
-From 57a183ec5bff1c3de46b5ade272fca4a5868d7b4 Mon Sep 17 00:00:00 2001
+From 93714be3c1587237bd68468da2c61c101fdc4439 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Sun, 11 Dec 2011 01:21:51 +0100
 Subject: [PATCH] linux-user: be silent about capget failures
@ -9,14 +9,14 @@ implementation and go on with life :)

 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- linux-user/syscall.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ linux-user/syscall.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 14c98ac..58c5f70 100644
+index eda4455..628fe66 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -7645,7 +7645,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -7609,7 +7609,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
         unlock_user(p, arg1, ret);
         break;
     case TARGET_NR_capget:
--- a/0014-PPC-KVM-Disable-mmu-notifier-check..patch
+++ b/0014-PPC-KVM-Disable-mmu-notifier-check..patch
@ -1,4 +1,4 @@
-From 437147c88e0ef65c41d0d661827edfa0e351a26c Mon Sep 17 00:00:00 2001
+From 64ba662dba1c256c78d205f22e0821c3674d5843 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 6 Jan 2012 01:05:55 +0100
 Subject: [PATCH] PPC: KVM: Disable mmu notifier check
@ -9,14 +9,14 @@ check for MMU notifiers that on 970 can not be implemented properly.
 So disable the check for mmu notifiers on PowerPC guests, making
 KVM guests work there, even if possibly racy in some odd circumstances.
 ---
- exec.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ exec.c | 2 ++
+ 1 file changed, 2 insertions(+)

 diff --git a/exec.c b/exec.c
-index aec65c5..53c937d 100644
+index c4f2894..b8a41ad 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -874,10 +874,12 @@ static void *file_ram_alloc(RAMBlock *block,
+@@ -941,10 +941,12 @@ static void *file_ram_alloc(RAMBlock *block,
         return NULL;
     }
 
--- a/0015-linux-user-fix-segfault-deadlock.pa.patch
+++ b/0015-linux-user-fix-segfault-deadlock.pa.patch
@ -1,4 +1,4 @@
-From 3daa08dc15e6d8d673b5360aa63e1ea4bc98d9d0 Mon Sep 17 00:00:00 2001
+From 386ea4ffa5f3e718b06099952134f23268e0feed Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 13 Jan 2012 17:05:41 +0100
 Subject: [PATCH] linux-user: fix segfault deadlock
@ -21,9 +21,9 @@ Reported-by: Fabio Erculiani <lxnay@sabayon.org>
 Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- include/exec/spinlock.h |   10 ++++++++++
- user-exec.c             |    4 ++++
- 2 files changed, 14 insertions(+), 0 deletions(-)
+ include/exec/spinlock.h | 10 ++++++++++
+ user-exec.c             |  4 ++++
+ 2 files changed, 14 insertions(+)

 diff --git a/include/exec/spinlock.h b/include/exec/spinlock.h
 index a72edda..e460e12 100644
@ -52,10 +52,10 @@ index a72edda..e460e12 100644
 +
 #endif
 diff --git a/user-exec.c b/user-exec.c
-index 71bd6c5..aa15bee 100644
+index 82bfa66..dd46019 100644
 --- a/user-exec.c
 +++ b/user-exec.c
-@@ -87,6 +87,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
+@@ -89,6 +89,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
     qemu_printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n",
                 pc, address, is_write, *(unsigned long *)old_set);
 #endif
--- a/0016-linux-user-binfmt-support-host-bina.patch
+++ b/0016-linux-user-binfmt-support-host-bina.patch
@ -1,4 +1,4 @@
-From 18e9f9ce9d4c5881d53ed089184a3f3b1df7f897 Mon Sep 17 00:00:00 2001
+From 6918f9b83df82e66730c2dccc94ccd899440d235 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 2 Feb 2012 18:02:33 +0100
 Subject: [PATCH] linux-user: binfmt: support host binaries
@ -8,8 +8,8 @@ trying to run, let's just use that instead as it will be a lot faster.

 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- linux-user/binfmt.c |   25 +++++++++++++++++++++++++
- 1 files changed, 25 insertions(+), 0 deletions(-)
+ linux-user/binfmt.c | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)

 diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
 index cd1f513..87dc4c6 100644
--- a/0017-linux-user-arm-no-tb_flush-on-reset.patch
+++ b/0017-linux-user-arm-no-tb_flush-on-reset.patch
@ -1,4 +1,4 @@
-From 4946c30bb4ec03a5f92889e538b5ba6c47b3bdc2 Mon Sep 17 00:00:00 2001
+From 3dab1141173bac86c23a417142215229c13950b5 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 29 May 2012 15:30:01 +0200
 Subject: [PATCH] linux-user: arm: no tb_flush on reset
@ -10,14 +10,14 @@ tb_flush on reset.
 So something in our thread creation is broken. But for now, let's revert the
 change to at least get a working build again.
 ---
- target-arm/cpu.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ target-arm/cpu.c | 4 ++++
+ 1 file changed, 4 insertions(+)

 diff --git a/target-arm/cpu.c b/target-arm/cpu.c
-index 496a59f..ad60f82 100644
+index 5a7566b..40bddc3 100644
 --- a/target-arm/cpu.c
 +++ b/target-arm/cpu.c
-@@ -124,7 +124,11 @@ static void arm_cpu_reset(CPUState *s)
+@@ -126,7 +126,11 @@ static void arm_cpu_reset(CPUState *s)
      * bake assumptions about into translated code, so we need to
      * tb_flush().
      */
--- a/0018-linux-user-Ignore-broken-loop-ioctl.patch
+++ b/0018-linux-user-Ignore-broken-loop-ioctl.patch
@ -1,4 +1,4 @@
-From 381af044b64a71ba59a6ae0766162c8a4bb06bca Mon Sep 17 00:00:00 2001
+From e599ca3ed7f6fe4181f22480ace4adeb5b883167 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 12 Jun 2012 04:41:10 +0200
 Subject: [PATCH] linux-user: Ignore broken loop ioctl
@ -11,17 +11,17 @@ So let's silently ignore that bogus ioctl.

 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- linux-user/ioctls.h       |    1 +
- linux-user/linux_loop.h   |    1 +
- linux-user/syscall.c      |    7 +++++++
- linux-user/syscall_defs.h |    1 +
- 4 files changed, 10 insertions(+), 0 deletions(-)
+ linux-user/ioctls.h       | 1 +
+ linux-user/linux_loop.h   | 1 +
+ linux-user/syscall.c      | 7 +++++++
+ linux-user/syscall_defs.h | 1 +
+ 4 files changed, 10 insertions(+)

 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index 6af0cb7..bb76c56 100644
+index 28dc0b2..da4f12c 100644
 --- a/linux-user/ioctls.h
 +++ b/linux-user/ioctls.h
-@@ -328,6 +328,7 @@
+@@ -326,6 +326,7 @@
   IOCTL(LOOP_SET_STATUS64, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info64)))
   IOCTL(LOOP_GET_STATUS64, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info64)))
   IOCTL(LOOP_CHANGE_FD, 0, TYPE_INT)
@ -41,10 +41,10 @@ index 8974caa..810ae61 100644
 
 #endif
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 58c5f70..689bd33 100644
+index 628fe66..38ca7af 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -3714,6 +3714,13 @@ out:
+@@ -3626,6 +3626,13 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp,
     return ret;
 }
 
@ -59,7 +59,7 @@ index 58c5f70..689bd33 100644
 #define IOCTL(cmd, access, ...) \
     { TARGET_ ## cmd, cmd, #cmd, access, 0, {  __VA_ARGS__ } },
 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 7ceb56b..3cbbaa1 100644
+index a8aba1b..bb83772 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
@@ -1020,6 +1020,7 @@ struct target_pollfd {
--- a/0019-linux-user-fix-segmentation-fault-p.patch
+++ b/0019-linux-user-fix-segmentation-fault-p.patch
@ -1,4 +1,4 @@
-From 790e3e8da8976c8c9a51d89ac3900f2c5750e26b Mon Sep 17 00:00:00 2001
+From 0201e8bca74282032c313d8aa48bf6259939b8f9 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 25 Jun 2012 19:02:32 +0200
 Subject: [PATCH] linux-user: fix segmentation fault passing with g2h(x) != x
@ -19,23 +19,25 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
 [AF: Rebased onto AREG0 fix for v1.2, squashed fixup by agraf]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- user-exec.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ user-exec.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)

 diff --git a/user-exec.c b/user-exec.c
-index aa15bee..2fe945a 100644
+index dd46019..1e8d3f1 100644
 --- a/user-exec.c
 +++ b/user-exec.c
-@@ -97,6 +97,12 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
+@@ -99,9 +99,11 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
         return 1;
     }
 
+-    /* Convert forcefully to guest address space, invalid addresses
+-       are still valid segv ones */
+-    address = h2g_nocheck(address);
 +    if (RESERVED_VA) {
 +        /* Convert forcefully to guest address space, invalid addresses
 +           are still valid segv ones */
 +        address = address - GUEST_BASE;
 +    }
-+
+ 
+     env = current_cpu->env_ptr;
     /* see if it is an MMU fault */
-     ret = cpu_handle_mmu_fault(cpu_single_env, address, is_write,
-                                MMU_USER_IDX);
--- a/0020-linux-user-lock-tcg.patch.patch
+++ b/0020-linux-user-lock-tcg.patch.patch
@ -1,4 +1,4 @@
-From a45d0feaac0c7708c692bc8f42be3c27c47e7a4c Mon Sep 17 00:00:00 2001
+From b4554c8ef53fddc09703802310cc928f4d142d40 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 5 Jul 2012 17:31:39 +0200
 Subject: [PATCH] linux-user: lock tcg
@ -13,13 +13,13 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
 [AF: Rebased onto exec.c/translate-all.c split for 1.4]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- linux-user/mmap.c |    3 +++
- tcg/tcg.c         |   36 ++++++++++++++++++++++++++++++++++--
- tcg/tcg.h         |    6 ++++++
+ linux-user/mmap.c |  3 +++
+ tcg/tcg.c         | 36 ++++++++++++++++++++++++++++++++++--
+ tcg/tcg.h         |  6 ++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

 diff --git a/linux-user/mmap.c b/linux-user/mmap.c
-index 46523de..59718b5 100644
+index 34a5615..7ebf953 100644
 --- a/linux-user/mmap.c
 +++ b/linux-user/mmap.c
@@ -30,6 +30,7 @@
@ -30,7 +30,7 @@ index 46523de..59718b5 100644
 
 //#define DEBUG_MMAP
 
-@@ -41,6 +42,7 @@ void mmap_lock(void)
+@@ -40,6 +41,7 @@ void mmap_lock(void)
 {
     if (mmap_lock_count++ == 0) {
         pthread_mutex_lock(&mmap_mutex);
@ -38,7 +38,7 @@ index 46523de..59718b5 100644
     }
 }
 
-@@ -48,6 +50,7 @@ void mmap_unlock(void)
+@@ -47,6 +49,7 @@ void mmap_unlock(void)
 {
     if (--mmap_lock_count == 0) {
         pthread_mutex_unlock(&mmap_mutex);
@ -47,7 +47,7 @@ index 46523de..59718b5 100644
 }
 
 diff --git a/tcg/tcg.c b/tcg/tcg.c
-index 1d8099c..51cf7b9 100644
+index dac8224..914456f 100644
 --- a/tcg/tcg.c
 +++ b/tcg/tcg.c
@@ -40,6 +40,8 @@
@ -59,7 +59,7 @@ index 1d8099c..51cf7b9 100644
 
 /* Note: the long term plan is to reduce the dependancies on the QEMU
    CPU definitions. Currently they are used for qemu_ld/st
-@@ -96,6 +98,29 @@ const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);
+@@ -114,6 +116,29 @@ const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);
 static TCGRegSet tcg_target_available_regs[2];
 static TCGRegSet tcg_target_call_clobber_regs;
 
@ -89,7 +89,7 @@ index 1d8099c..51cf7b9 100644
 static inline void tcg_out8(TCGContext *s, uint8_t v)
 {
     *s->code_ptr++ = v;
-@@ -235,7 +260,8 @@ void tcg_context_init(TCGContext *s)
+@@ -253,7 +278,8 @@ void tcg_context_init(TCGContext *s)
 
     memset(s, 0, sizeof(*s));
     s->nb_globals = 0;
@ -99,7 +99,7 @@ index 1d8099c..51cf7b9 100644
     /* Count total number of arguments and allocate the corresponding
        space */
     total_args = 0;
-@@ -2363,11 +2389,13 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf)
+@@ -2379,11 +2405,13 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf)
     }
 #endif
 
@ -113,7 +113,7 @@ index 1d8099c..51cf7b9 100644
 
     return s->code_ptr -  gen_code_buf;
 }
-@@ -2378,7 +2406,11 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf)
+@@ -2394,7 +2422,11 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf)
    Return -1 if not found. */
 int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset)
 {
@ -127,7 +127,7 @@ index 1d8099c..51cf7b9 100644
 
 #ifdef CONFIG_PROFILER
 diff --git a/tcg/tcg.h b/tcg/tcg.h
-index df375cf..3d16a31 100644
+index f3f9889..49ede77 100644
 --- a/tcg/tcg.h
 +++ b/tcg/tcg.h
@@ -46,6 +46,8 @@ typedef uint64_t tcg_target_ulong;
@ -139,7 +139,7 @@ index df375cf..3d16a31 100644
 #include "tcg-target.h"
 #include "tcg-runtime.h"
 
-@@ -487,6 +489,7 @@ struct TCGContext {
+@@ -490,6 +492,7 @@ struct TCGContext {
     TCGLabelQemuLdst *qemu_ldst_labels;
     int nb_qemu_ldst_labels;
 #endif
@ -147,7 +147,7 @@ index df375cf..3d16a31 100644
 };
 
 extern TCGContext tcg_ctx;
-@@ -666,6 +669,9 @@ void tcg_gen_shifti_i64(TCGv_i64 ret, TCGv_i64 arg1,
+@@ -670,6 +673,9 @@ void tcg_gen_shifti_i64(TCGv_i64 ret, TCGv_i64 arg1,
 TCGArg *tcg_optimize(TCGContext *s, uint16_t *tcg_opc_ptr, TCGArg *args,
                      TCGOpDef *tcg_op_def);
 
--- a/0021-linux-user-Run-multi-threaded-code-.patch
+++ b/0021-linux-user-Run-multi-threaded-code-.patch
@ -1,4 +1,4 @@
-From f537471a496ab597c3f144c7f8227e15c6c9d438 Mon Sep 17 00:00:00 2001
+From 54269b5b6daa169f1a0d97d31ec6918f7c68dd23 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 10 Jul 2012 20:40:55 +0200
 Subject: [PATCH] linux-user: Run multi-threaded code on a single core
@ -15,14 +15,14 @@ This gets Java 1.7 working for me again on my test box.

 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- linux-user/syscall.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)

 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 689bd33..38cee23 100644
+index 38ca7af..8aef3e8 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -4434,6 +4434,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
+@@ -4326,6 +4326,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
         if (nptl_flags & CLONE_SETTLS)
             cpu_set_tls (new_env, newtls);
 
--- a/0022-linux-user-lock-tb-flushing-too.pat.patch
+++ b/0022-linux-user-lock-tb-flushing-too.pat.patch
@ -1,4 +1,4 @@
-From be9964c9b53e898f853b4e5d26f3809e25ace09a Mon Sep 17 00:00:00 2001
+From d39f1f04e71cc3d0f8ad4836d2636b6509c68ee1 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 11 Jul 2012 16:47:42 +0200
 Subject: [PATCH] linux-user: lock tb flushing too
@ -10,14 +10,14 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
 [AF: Rebased onto exec.c/translate-all.c split for 1.4]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- translate-all.c |   20 ++++++++++++++++++--
- 1 files changed, 18 insertions(+), 2 deletions(-)
+ translate-all.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)

 diff --git a/translate-all.c b/translate-all.c
-index da93608..7e2e6fc 100644
+index 3b5fc7c..165a63e 100644
 --- a/translate-all.c
 +++ b/translate-all.c
-@@ -611,19 +611,23 @@ static TranslationBlock *tb_alloc(target_ulong pc)
+@@ -612,19 +612,23 @@ static TranslationBlock *tb_alloc(target_ulong pc)
 {
     TranslationBlock *tb;
 
@ -41,7 +41,7 @@ index da93608..7e2e6fc 100644
     /* In practice this is mostly used for single use temporary TB
        Ignore the hard cases and just back up if this TB happens to
        be the last one generated.  */
-@@ -632,6 +636,7 @@ void tb_free(TranslationBlock *tb)
+@@ -633,6 +637,7 @@ void tb_free(TranslationBlock *tb)
         tcg_ctx.code_gen_ptr = tb->tc_ptr;
         tcg_ctx.tb_ctx.nb_tbs--;
     }
@ -49,7 +49,7 @@ index da93608..7e2e6fc 100644
 }
 
 static inline void invalidate_page_bitmap(PageDesc *p)
-@@ -689,6 +694,7 @@ void tb_flush(CPUArchState *env1)
+@@ -690,6 +695,7 @@ void tb_flush(CPUArchState *env1)
            ((unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer)) /
            tcg_ctx.tb_ctx.nb_tbs : 0);
 #endif
@ -57,7 +57,7 @@ index da93608..7e2e6fc 100644
     if ((unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer)
         > tcg_ctx.code_gen_buffer_size) {
         cpu_abort(env1, "Internal error: code buffer overflow\n");
-@@ -707,6 +713,7 @@ void tb_flush(CPUArchState *env1)
+@@ -710,6 +716,7 @@ void tb_flush(CPUArchState *env1)
     /* XXX: flush processor icache at this point if cache flush is
        expensive */
     tcg_ctx.tb_ctx.tb_flush_count++;
@ -65,7 +65,7 @@ index da93608..7e2e6fc 100644
 }
 
 #ifdef DEBUG_TB_CHECK
-@@ -1012,8 +1019,10 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
+@@ -1019,8 +1026,10 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
     int current_flags = 0;
 #endif /* TARGET_HAS_PRECISE_SMC */
 
@ -76,7 +76,7 @@ index da93608..7e2e6fc 100644
         return;
     }
     if (!p->code_bitmap &&
-@@ -1104,6 +1113,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
+@@ -1113,6 +1122,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
         cpu_resume_from_signal(env, NULL);
     }
 #endif
@ -84,7 +84,7 @@ index da93608..7e2e6fc 100644
 }
 
 /* len must be <= 8 and start must be a multiple of len */
-@@ -1323,13 +1333,16 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
+@@ -1336,13 +1346,16 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
 {
     int m_min, m_max, m;
     uintptr_t v;
@ -102,7 +102,7 @@ index da93608..7e2e6fc 100644
         return NULL;
     }
     /* binary search (cf Knuth) */
-@@ -1340,6 +1353,7 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
+@@ -1353,6 +1366,7 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
         tb = &tcg_ctx.tb_ctx.tbs[m];
         v = (uintptr_t)tb->tc_ptr;
         if (v == tc_ptr) {
@ -110,7 +110,7 @@ index da93608..7e2e6fc 100644
             return tb;
         } else if (tc_ptr < v) {
             m_max = m - 1;
-@@ -1347,7 +1361,9 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
+@@ -1360,7 +1374,9 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
             m_min = m + 1;
         }
     }
--- a/0023-linux-user-Fake-proc-cpuinfo.patch.patch
+++ b/0023-linux-user-Fake-proc-cpuinfo.patch.patch
@ -1,7 +1,10 @@
-From 526d9026e266f793ca565956af414a0fab28cc81 Mon Sep 17 00:00:00 2001
+From 342be54646097f107522be6733552b84d027acae Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 23 Jul 2012 10:24:14 +0200
 Subject: [PATCH] linux-user: Fake /proc/cpuinfo
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit

 Fedora 17 for ARM reads /proc/cpuinfo and fails if it doesn't contain
 ARM related contents. This patch implements a quick hack to expose real
@ -12,15 +15,17 @@ on the selected CPU. Please do not submit this patch upstream until this
 has happened.

 Signed-off-by: Alexander Graf <agraf@suse.de>
+[AF: Rebased for v1.6]
+Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- linux-user/syscall.c |   20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)

 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 38cee23..18c7447 100644
+index 8aef3e8..429ab3a 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5134,6 +5134,25 @@ static int open_self_stat(void *cpu_env, int fd)
+@@ -5011,6 +5011,25 @@ static int open_self_stat(void *cpu_env, int fd)
     return 0;
 }
 
@ -46,11 +51,11 @@ index 38cee23..18c7447 100644
 static int open_self_auxv(void *cpu_env, int fd)
 {
     TaskState *ts = ((CPUArchState *)cpu_env)->opaque;
-@@ -5174,6 +5193,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
-         { "/proc/self/maps", open_self_maps },
-         { "/proc/self/stat", open_self_stat },
-         { "/proc/self/auxv", open_self_auxv },
-+        { "/proc/cpuinfo", open_cpuinfo },
+@@ -5075,6 +5094,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
+         { "maps", open_self_maps },
+         { "stat", open_self_stat },
+         { "auxv", open_self_auxv },
+        { "cpuinfo", open_cpuinfo },
         { NULL, NULL }
     };
 
--- a/0024-linux-user-implement-FS_IOC_GETFLAG.patch
+++ b/0024-linux-user-implement-FS_IOC_GETFLAG.patch
@ -1,4 +1,4 @@
-From cb5f9a7bc4ff7b99a85c3a20e2eb46c6327de27e Mon Sep 17 00:00:00 2001
+From 77c47efe63b08de1267467d236829df654f6f44c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 20 Aug 2012 00:02:52 +0200
 Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl
@ -11,12 +11,12 @@ v1 -> v2:

  - use TYPE_LONG instead of TYPE_INT
 ---
- linux-user/ioctls.h       |    1 +
- linux-user/syscall_defs.h |    2 ++
- 2 files changed, 3 insertions(+), 0 deletions(-)
+ linux-user/ioctls.h       | 1 +
+ linux-user/syscall_defs.h | 2 ++
+ 2 files changed, 3 insertions(+)

 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index bb76c56..85b5bfd 100644
+index da4f12c..17b67af 100644
 --- a/linux-user/ioctls.h
 +++ b/linux-user/ioctls.h
@@ -86,6 +86,7 @@
@ -26,12 +26,12 @@ index bb76c56..85b5bfd 100644
 +  IOCTL(FS_IOC_GETFLAGS, IOC_R, MK_PTR(TYPE_LONG))
 
   IOCTL(SIOCATMARK, 0, TYPE_NULL)
-   IOCTL(SIOCADDRT, IOC_W, MK_PTR(MK_STRUCT(STRUCT_rtentry)))
+   IOCTL(SIOCGIFNAME, IOC_RW, MK_PTR(TYPE_INT))
 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 3cbbaa1..729c8ef 100644
+index bb83772..7a08123 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
-@@ -2366,6 +2366,8 @@ struct target_eabi_flock64 {
+@@ -2391,6 +2391,8 @@ struct target_eabi_flock64 {
 #define TARGET_MTIOCGET        TARGET_IOR('m', 2, struct mtget)
 #define TARGET_MTIOCPOS        TARGET_IOR('m', 3, struct mtpos)
 
--- a/0025-linux-user-implement-FS_IOC_SETFLAG.patch
+++ b/0025-linux-user-implement-FS_IOC_SETFLAG.patch
@ -1,4 +1,4 @@
-From c84d6a1adadb52b976648947e7f16f5c03d6c415 Mon Sep 17 00:00:00 2001
+From a47b6d8ff50d7d7aec0eb7cd6c098015ab916037 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 20 Aug 2012 00:07:13 +0200
 Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl
@ -11,12 +11,12 @@ v1 -> v2

  - use TYPE_LONG instead of TYPE_INT
 ---
- linux-user/ioctls.h       |    1 +
- linux-user/syscall_defs.h |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ linux-user/ioctls.h       | 1 +
+ linux-user/syscall_defs.h | 1 +
+ 2 files changed, 2 insertions(+)

 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index 85b5bfd..229cd6f 100644
+index 17b67af..a77b72c 100644
 --- a/linux-user/ioctls.h
 +++ b/linux-user/ioctls.h
@@ -87,6 +87,7 @@
@ -26,12 +26,12 @@ index 85b5bfd..229cd6f 100644
 +  IOCTL(FS_IOC_SETFLAGS, IOC_W, MK_PTR(TYPE_LONG))
 
   IOCTL(SIOCATMARK, 0, TYPE_NULL)
-   IOCTL(SIOCADDRT, IOC_W, MK_PTR(MK_STRUCT(STRUCT_rtentry)))
+   IOCTL(SIOCGIFNAME, IOC_RW, MK_PTR(TYPE_INT))
 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 729c8ef..87fb53c 100644
+index 7a08123..bbcdec2 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
-@@ -2367,6 +2367,7 @@ struct target_eabi_flock64 {
+@@ -2392,6 +2392,7 @@ struct target_eabi_flock64 {
 #define TARGET_MTIOCPOS        TARGET_IOR('m', 3, struct mtpos)
 
 #define TARGET_FS_IOC_GETFLAGS TARGET_IORU('f', 1)
--- a/0026-linux-user-XXX-disable-fiemap.patch.patch
+++ b/0026-linux-user-XXX-disable-fiemap.patch.patch
@ -1,18 +1,18 @@
-From 6338c9b9a458302bbf8d01d9f33bfa3768efe9fa Mon Sep 17 00:00:00 2001
+From 60ad70f78eb857bff20ccfb0d434a6dfb83e5333 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 21 Aug 2012 14:20:40 +0200
 Subject: [PATCH] linux-user: XXX disable fiemap

 agraf: fiemap breaks in libarchive. Disable it for now.
 ---
- linux-user/syscall.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 5 +++++
+ 1 file changed, 5 insertions(+)

 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 18c7447..7512b56 100644
+index 429ab3a..5c42bc9 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -3334,6 +3334,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
+@@ -3183,6 +3183,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
     uint32_t outbufsz;
     int free_fm = 0;
 
--- a/0027-slirp-nooutgoing.patch.patch
+++ b/0027-slirp-nooutgoing.patch.patch
@ -1,21 +1,21 @@
-From c07080eab1123de18ef3eb610ccf721a31a2658a Mon Sep 17 00:00:00 2001
+From 4d214c0630d4611dd42027f0219ecfee5743386b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 29 Aug 2012 18:42:56 +0200
 Subject: [PATCH] slirp: -nooutgoing

 TBD (from SUSE Studio team)
 ---
- qemu-options.hx  |   10 ++++++++++
- slirp/socket.c   |    8 ++++++++
- slirp/tcp_subr.c |   13 +++++++++++++
- vl.c             |    9 +++++++++
- 4 files changed, 40 insertions(+), 0 deletions(-)
+ qemu-options.hx  | 10 ++++++++++
+ slirp/socket.c   |  8 ++++++++
+ slirp/tcp_subr.c | 13 +++++++++++++
+ vl.c             |  9 +++++++++
+ 4 files changed, 40 insertions(+)

 diff --git a/qemu-options.hx b/qemu-options.hx
-index fb62b75..2cd52ab 100644
+index d15338e..e8097ac 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -2568,6 +2568,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
+@@ -2574,6 +2574,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
 from a script.
 ETEXI
 
@ -59,7 +59,7 @@ index 8e8819c..57a45dc 100644
 	ret = sendto(so->s, m->m_data, m->m_len, 0,
 		     (struct sockaddr *)&addr, sizeof (struct sockaddr));
 diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
-index e98ce1a..b56bf35 100644
+index 043f28f..76b6525 100644
 --- a/slirp/tcp_subr.c
 +++ b/slirp/tcp_subr.c
@@ -324,6 +324,9 @@ tcp_sockclosed(struct tcpcb *tp)
@ -97,10 +97,10 @@ index e98ce1a..b56bf35 100644
     opt = 1;
     qemu_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));
 diff --git a/vl.c b/vl.c
-index 59dc0b4..4bf7351 100644
+index 25b8f2f..a043dac 100644
 --- a/vl.c
 +++ b/vl.c
-@@ -219,6 +219,7 @@ const char *vnc_display;
+@@ -217,6 +217,7 @@ const char *vnc_display;
 int acpi_enabled = 1;
 int no_hpet = 0;
 int fd_bootchk = 1;
@ -108,7 +108,7 @@ index 59dc0b4..4bf7351 100644
 static int no_reboot;
 int no_shutdown = 0;
 int cursor_hide = 1;
-@@ -3310,6 +3311,14 @@ int main(int argc, char **argv, char **envp)
+@@ -3307,6 +3308,14 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_singlestep:
                 singlestep = 1;
                 break;
--- a/0028-vnc-password-file-and-incoming-conn.patch
+++ b/0028-vnc-password-file-and-incoming-conn.patch
@ -1,15 +1,15 @@
-From 916f806218045f70a6f0d8f6bbe89ba8b9c1a318 Mon Sep 17 00:00:00 2001
+From 059140f57cded8d9f0df8486773344cbbbdd2e44 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 29 Aug 2012 20:06:01 +0200
 Subject: [PATCH] vnc: password-file= and incoming-connections=

 TBD (from SUSE Studio team)
 ---
- ui/vnc.c |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 71 insertions(+), 0 deletions(-)
+ ui/vnc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 71 insertions(+)

 diff --git a/ui/vnc.c b/ui/vnc.c
-index dfc7459..b3ca308 100644
+index 5601cc3..d5796e6 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
@@ -44,6 +44,7 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
@ -42,7 +42,7 @@ index dfc7459..b3ca308 100644
 }
 
 int vnc_client_io_error(VncState *vs, int ret, int last_errno)
-@@ -3035,6 +3044,39 @@ char *vnc_display_local_addr(DisplayState *ds)
+@@ -3036,6 +3045,39 @@ char *vnc_display_local_addr(DisplayState *ds)
     return vnc_socket_local_addr("%s:%s", vs->lsock);
 }
 
@ -82,7 +82,7 @@ index dfc7459..b3ca308 100644
 void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
 {
     VncDisplay *vs = vnc_display;
-@@ -3068,6 +3110,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3069,6 +3111,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
     while ((options = strchr(options, ','))) {
         options++;
         if (strncmp(options, "password", 8) == 0) {
@ -92,7 +92,7 @@ index dfc7459..b3ca308 100644
             if (fips_get_state()) {
                 error_setg(errp,
                            "VNC password auth disabled due to FIPS mode, "
-@@ -3076,6 +3121,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3077,6 +3122,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
                 goto fail;
             }
             password = 1; /* Require password auth */
--- a/0029-linux-user-add-more-blk-ioctls.patc.patch
+++ b/0029-linux-user-add-more-blk-ioctls.patc.patch
@ -1,4 +1,4 @@
-From 92ba68874da0fade85cdd1aa23a34831a446e491 Mon Sep 17 00:00:00 2001
+From d6e2d4387572ce094c411f21b6c7e90e4de71ac6 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 10 Oct 2012 10:21:20 +0200
 Subject: [PATCH] linux-user: add more blk ioctls
@ -7,13 +7,13 @@ Implement a few more ioctls that operate on block devices.

 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- linux-user/ioctls.h        |   18 ++++++++++++++++++
- linux-user/syscall_defs.h  |    6 ++++++
- linux-user/syscall_types.h |    3 +++
- 3 files changed, 27 insertions(+), 0 deletions(-)
+ linux-user/ioctls.h        | 18 ++++++++++++++++++
+ linux-user/syscall_defs.h  |  6 ++++++
+ linux-user/syscall_types.h |  3 +++
+ 3 files changed, 27 insertions(+)

 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index 229cd6f..3323176 100644
+index a77b72c..4c6d2ee 100644
 --- a/linux-user/ioctls.h
 +++ b/linux-user/ioctls.h
@@ -71,6 +71,24 @@
@ -42,7 +42,7 @@ index 229cd6f..3323176 100644
      IOCTL(BLKRASET, 0, TYPE_INT)
      IOCTL(BLKRAGET, IOC_R, MK_PTR(TYPE_LONG))
 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 87fb53c..e428f76 100644
+index bbcdec2..5aeb3dd 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
@@ -889,6 +889,12 @@ struct target_pollfd {
--- a/0030-linux-user-use-target_ulong.patch.patch
+++ b/0030-linux-user-use-target_ulong.patch.patch
@ -1,4 +1,4 @@
-From 6faad754e57607eb0b5de855e16c6ef4d92b58d8 Mon Sep 17 00:00:00 2001
+From b15f8398de8f499b96e8437dc07f1cab98faccd4 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 9 Oct 2012 09:06:49 +0200
 Subject: [PATCH] linux-user: use target_ulong
@ -12,15 +12,15 @@ Pass syscall arguments as ulong always.

 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- linux-user/qemu.h    |    8 ++++----
- linux-user/syscall.c |    8 ++++----
+ linux-user/qemu.h    | 8 ++++----
+ linux-user/syscall.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

 diff --git a/linux-user/qemu.h b/linux-user/qemu.h
-index 2d6f957..766bd8a 100644
+index 9411c77..26c51a6 100644
 --- a/linux-user/qemu.h
 +++ b/linux-user/qemu.h
-@@ -194,10 +194,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
+@@ -188,10 +188,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
 void target_set_brk(abi_ulong new_brk);
 abi_long do_brk(abi_ulong new_brk);
 void syscall_init(void);
@ -33,13 +33,13 @@ index 2d6f957..766bd8a 100644
 +                    abi_ulong arg5, abi_ulong arg6, abi_ulong arg7,
 +                    abi_ulong arg8);
 void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
- extern THREAD CPUArchState *thread_env;
+ extern THREAD CPUState *thread_cpu;
 void cpu_loop(CPUArchState *env);
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 7512b56..c1eceb2 100644
+index 5c42bc9..ab30b58 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5321,10 +5321,10 @@ int syscall_restartable(int syscall_nr)
+@@ -5221,10 +5221,10 @@ int syscall_restartable(int syscall_nr)
 /* do_syscall() should always have a single exit point at the end so
    that actions, such as logging of syscall results, can be performed.
    All errnos that do_syscall() returns must be -TARGET_<errcode>. */
@ -52,5 +52,5 @@ index 7512b56..c1eceb2 100644
 +                    abi_ulong arg5, abi_ulong arg6, abi_ulong arg7,
 +                    abi_ulong arg8)
 {
+     CPUState *cpu = ENV_GET_CPU(cpu_env);
     abi_long ret;
-     struct stat st;
--- a/0031-Add-support-for-DictZip-enabled-gzi.patch
+++ b/0031-Add-support-for-DictZip-enabled-gzi.patch
@ -1,4 +1,4 @@
-From 7ac8770a4a64b2a220636d631abacbe02c1de533 Mon Sep 17 00:00:00 2001
+From 0480a8b5cdfee8e0be7fbbe7a4cd3a5861b2e751 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 09:49:37 +0200
 Subject: [PATCH] Add support for DictZip enabled gzip files
@ -27,19 +27,19 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
 Signed-off-by: Tim Hardeck <thardeck@suse.de>
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- block/Makefile.objs |    1 +
- block/dictzip.c     |  596 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 597 insertions(+), 0 deletions(-)
+ block/Makefile.objs |   1 +
+ block/dictzip.c     | 596 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 597 insertions(+)
 create mode 100644 block/dictzip.c

 diff --git a/block/Makefile.objs b/block/Makefile.objs
-index 5f0358a..1bb758c 100644
+index 4cf9aa4..2b1c535 100644
 --- a/block/Makefile.objs
 +++ b/block/Makefile.objs
-@@ -20,5 +20,6 @@ endif
- common-obj-y += stream.o
+@@ -22,5 +22,6 @@ common-obj-y += stream.o
 common-obj-y += commit.o
 common-obj-y += mirror.o
+ common-obj-y += backup.o
 +common-obj-y += dictzip.o
 
 $(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS)
--- a/0032-Add-tar-container-format.patch.patch
+++ b/0032-Add-tar-container-format.patch.patch
@ -1,4 +1,4 @@
-From e6e0a46f91b075258d03576055b4d4fd5ab6f467 Mon Sep 17 00:00:00 2001
+From 6685f863c4d295a177038cde7abc3018592635a3 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 17:28:38 +0200
 Subject: [PATCH] Add tar container format
@ -28,18 +28,18 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
 Signed-off-by: Tim Hardeck <thardeck@suse.de>
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- block/Makefile.objs |    1 +
- block/tar.c         |  386 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 387 insertions(+), 0 deletions(-)
+ block/Makefile.objs |   1 +
+ block/tar.c         | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 387 insertions(+)
 create mode 100644 block/tar.c

 diff --git a/block/Makefile.objs b/block/Makefile.objs
-index 1bb758c..f68a7e1 100644
+index 2b1c535..5b0d3ef 100644
 --- a/block/Makefile.objs
 +++ b/block/Makefile.objs
-@@ -21,5 +21,6 @@ common-obj-y += stream.o
- common-obj-y += commit.o
+@@ -23,5 +23,6 @@ common-obj-y += commit.o
 common-obj-y += mirror.o
+ common-obj-y += backup.o
 common-obj-y += dictzip.o
 +common-obj-y += tar.o
 
--- a/0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
+++ b/0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
@ -1,11 +1,11 @@
-From d98278210b69b211eee299c714d1231a7a974b00 Mon Sep 17 00:00:00 2001
+From 7f3c74ae7ec61617fabb7d1a205d817ff817d73b Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 12 Dec 2012 19:11:30 +0100
 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch

 ---
- block/tar.c |   13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
+ block/tar.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)

 diff --git a/block/tar.c b/block/tar.c
 index 87bf552..bf24c98 100644
--- a/0034-Legacy-Patch-kvm-qemu-preXX-report-.patch
+++ b/0034-Legacy-Patch-kvm-qemu-preXX-report-.patch
@ -1,14 +1,14 @@
-From 63ffaf3255317c0a0c0708af9747b171961f7f77 Mon Sep 17 00:00:00 2001
+From 2b59a037301c076102d371529417438c8b936c48 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 12 Dec 2012 19:11:31 +0100
 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch

 ---
- net/net.c |   22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
+ net/net.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)

 diff --git a/net/net.c b/net/net.c
-index 43a74e4..e1e7843 100644
+index c0d61bf..adc389f 100644
 --- a/net/net.c
 +++ b/net/net.c
@@ -139,6 +139,27 @@ void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6])
@ -39,7 +39,7 @@ index 43a74e4..e1e7843 100644
 void qemu_macaddr_default_if_unset(MACAddr *macaddr)
 {
     static int index = 0;
-@@ -1131,6 +1152,7 @@ int net_init_clients(void)
+@@ -1179,6 +1200,7 @@ int net_init_clients(void)
     if (qemu_opts_foreach(net, net_init_client, NULL, 1) == -1) {
         return -1;
     }
--- a/0035-console-add-question-mark-escape-op.patch
+++ b/0035-console-add-question-mark-escape-op.patch
@ -1,4 +1,4 @@
-From b5f66888d2af64028dc45940165d5381f13dc6e8 Mon Sep 17 00:00:00 2001
+From da725ceae8720f8b31a93a6cb4f8af4d26684ecb Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 6 Jun 2011 06:53:52 +0200
 Subject: [PATCH] console: add question-mark escape operator
@ -12,11 +12,11 @@ outputting guest serial consoles to the graphical console emulator.

 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- ui/console.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ ui/console.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/ui/console.c b/ui/console.c
-index b30853f..02d67b7 100644
+index e3e8297..8784cd0 100644
 --- a/ui/console.c
 +++ b/ui/console.c
@@ -897,7 +897,7 @@ static void console_putchar(QemuConsole *s, int ch)
--- a/0036-Make-char-muxer-more-robust-wrt-sma.patch
+++ b/0036-Make-char-muxer-more-robust-wrt-sma.patch
@ -1,4 +1,4 @@
-From 8a2bb5917850d9caf0d5984531b745668450dd6f Mon Sep 17 00:00:00 2001
+From d5cfe0798dcfbdc9095e2ded93e99a6dbaae02e0 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 1 Apr 2010 17:36:23 +0200
 Subject: [PATCH] Make char muxer more robust wrt small FIFOs
@ -18,14 +18,14 @@ it polls again after a while to check if the guest is now receiving input.

 This patch fixes input when using -nographic on s390 for me.
 ---
- qemu-char.c |   16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
+ qemu-char.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)

 diff --git a/qemu-char.c b/qemu-char.c
-index cff2896..206bd07 100644
+index 3f606c9..541f62b 100644
 --- a/qemu-char.c
 +++ b/qemu-char.c
-@@ -260,6 +260,9 @@ typedef struct {
+@@ -249,6 +249,9 @@ typedef struct {
     IOEventHandler *chr_event[MAX_MUX];
     void *ext_opaque[MAX_MUX];
     CharDriverState *drv;
@ -35,7 +35,7 @@ index cff2896..206bd07 100644
     int focus;
     int mux_cnt;
     int term_got_escape;
-@@ -416,6 +419,15 @@ static void mux_chr_accept_input(CharDriverState *chr)
+@@ -405,6 +408,15 @@ static void mux_chr_accept_input(CharDriverState *chr)
         d->chr_read[m](d->ext_opaque[m],
                        &d->buffer[m][d->cons[m]++ & MUX_BUFFER_MASK], 1);
     }
@ -51,7 +51,7 @@ index cff2896..206bd07 100644
 }
 
 static int mux_chr_can_read(void *opaque)
-@@ -498,6 +510,10 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
+@@ -487,6 +499,10 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
     chr->opaque = d;
     d->drv = drv;
     d->focus = -1;
--- a/0037-linux-user-lseek-explicitly-cast-no.patch
+++ b/0037-linux-user-lseek-explicitly-cast-no.patch
@ -1,4 +1,4 @@
-From a6c68880318cb93391649fa2a9edb9ef5cba9b8c Mon Sep 17 00:00:00 2001
+From 7169a2c44253a0165de15166e4738c472cf951bc Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 13 Dec 2012 14:29:22 +0100
 Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed
@ -12,14 +12,14 @@ absolute positioned which we need to maintain as unsigned.

 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- linux-user/syscall.c |    9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
+ linux-user/syscall.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)

 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index c1eceb2..232f70d 100644
+index ab30b58..4136873 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5648,9 +5648,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+@@ -5548,9 +5548,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
     case TARGET_NR_oldstat:
         goto unimplemented;
 #endif
--- a/0038-virtfs-proxy-helper-Provide-__u64-f.patch
+++ b/0038-virtfs-proxy-helper-Provide-__u64-f.patch
@ -1,4 +1,4 @@
-From da9befab62ffd8232354cc7e4e1d1d1db288d462 Mon Sep 17 00:00:00 2001
+From 144ae3f3055d9bf3b35c880bf44c19a170143024 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Thu, 16 May 2013 12:39:10 +0200
 Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken
@ -8,8 +8,8 @@ Fixes the build on SLE 11 SP2.

 [AF: Extend to ppc64]
 ---
- fsdev/virtfs-proxy-helper.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ fsdev/virtfs-proxy-helper.c | 7 +++++++
+ 1 file changed, 7 insertions(+)

 diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
 index 713a7b2..b8da77d 100644
--- a/0039-gtk-don-t-use-g_object_unref-on-Gdk.patch
+++ b/0039-gtk-don-t-use-g_object_unref-on-Gdk.patch
@ -1,34 +0,0 @@
-From 354ada837cfa3f1bac346b8565569e62afcc89c1 Mon Sep 17 00:00:00 2001
-From: Anthony Liguori <aliguori@us.ibm.com>
-Date: Mon, 3 Jun 2013 15:37:23 -0500
-Subject: [PATCH] gtk: don't use g_object_unref on GdkCursor
-
-It's not a GObject.
-
-Cc: Gerd Hoffman <kraxel@redhat.com>
-Reported-by: Michael Tokarev <mjt@tls.msk.ru>
-Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
-v1 -> v2
- - Fix summary to agree with code (Peter)
-(cherry picked from commit 171392406d8e230d62e5ebf4805f71460854b8ec)
-[bnc#830459]
-
-Signed-off-by: Bruce Rogers <brogers@suse.com>
---
- ui/gtk.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/ui/gtk.c b/ui/gtk.c
-index 52c3f95..79fa1d5 100644
--- a/ui/gtk.c
-+++ b/ui/gtk.c
-@@ -377,7 +377,7 @@ static void gd_cursor_define(DisplayChangeListener *dcl,
-                                         pixbuf, c->hot_x, c->hot_y);
-     gdk_window_set_cursor(gtk_widget_get_window(s->drawing_area), cursor);
-     g_object_unref(pixbuf);
-    g_object_unref(cursor);
-+    gdk_cursor_unref(cursor);
- }
- 
- static void gd_switch(DisplayChangeListener *dcl,
--- a/0040-gtk-Fix-compiler-warning-GTK-3-depr.patch
+++ b/0040-gtk-Fix-compiler-warning-GTK-3-depr.patch
@ -1,43 +0,0 @@
-From d054b88496c4699ecaf821072ddd6be0edc46815 Mon Sep 17 00:00:00 2001
-From: Stefan Weil <sw@weilnetz.de>
-Date: Sun, 16 Jun 2013 16:13:07 +0200
-Subject: [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With GTK 3, the function gdk_cursor_unref is deprecated:
-
-qemu/ui/gtk.c: In function ‘gd_cursor_define’:
-qemu/ui/gtk.c:380:5: error:
- ‘gdk_cursor_unref’ is deprecated (declared at /usr/include/gtk-3.0/gdk/gdkcursor.h:233): Use 'g_object_unref' instead [-Werror=deprecated-declarations]
-
-Fix the gcc compiler warning by using conditional compilation.
-
-Signed-off-by: Stefan Weil <sw@weilnetz.de>
-Message-id: 1371391987-10795-1-git-send-email-sw@weilnetz.de
-Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-(cherry picked from commit 030b4b7debf659dcd6fc66826564285fdce5057d)
-[bnc#830459]
-
-Signed-off-by: Bruce Rogers <brogers@suse.com>
---
- ui/gtk.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/ui/gtk.c b/ui/gtk.c
-index 79fa1d5..d8baea8 100644
--- a/ui/gtk.c
-+++ b/ui/gtk.c
-@@ -377,7 +377,11 @@ static void gd_cursor_define(DisplayChangeListener *dcl,
-                                         pixbuf, c->hot_x, c->hot_y);
-     gdk_window_set_cursor(gtk_widget_get_window(s->drawing_area), cursor);
-     g_object_unref(pixbuf);
-+#if !GTK_CHECK_VERSION(3, 0, 0)
-     gdk_cursor_unref(cursor);
-+#else
-+    g_object_unref(cursor);
-+#endif
- }
- 
- static void gd_switch(DisplayChangeListener *dcl,
--- a/qemu-1.5.0.tar.bz2
+++ b/qemu-1.5.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b22b30ee9712568dfb4eedf76783f4a76546e1cbc41659b909646bcf0b4867bb
-size 11931067
--- a/qemu-1.6.0-rc0.tar.bz2
+++ b/qemu-1.6.0-rc0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36164b8d7d347108c65dc3844f3ecd9e562229ed321f23ad892de2c864d55bc1
+size 12035882
--- a/qemu-linux-user.changes
+++ b/qemu-linux-user.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 30 04:58:55 UTC 2013 - afaerber@suse.de
+
+- Update to v1.6.0-rc0: cf. http://wiki.qemu.org/ChangeLog/1.6
+* Adapt update_git.sh script accordingly
+
 -------------------------------------------------------------------
 Tue Jul 20 13:27:00 UTC 2013 - afaerber@suse.de

--- a/qemu-linux-user.spec
+++ b/qemu-linux-user.spec
@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        1.5.0
+Version:        1.6.0rc0
 Release:        0
-Source:         qemu-%version.tar.bz2
+Source:         qemu-1.6.0-rc0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patc.patch
 Patch0002:      0002-XXX-work-around-SA_RESTART-race-wit.patch
@ -63,8 +63,6 @@ Patch0035:      0035-console-add-question-mark-escape-op.patch
 Patch0036:      0036-Make-char-muxer-more-robust-wrt-sma.patch
 Patch0037:      0037-linux-user-lseek-explicitly-cast-no.patch
 Patch0038:      0038-virtfs-proxy-helper-Provide-__u64-f.patch
-Patch0039:      0039-gtk-don-t-use-g_object_unref-on-Gdk.patch
-Patch0040:      0040-gtk-Fix-compiler-warning-GTK-3-depr.patch
 # Please do not add patches manually here, run update_git.sh.
 # this is to make lint happy
 Source300:      rpmlintrc
@ -116,7 +114,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.

 %prep
-%setup -q -n qemu-%version
+%setup -q -n qemu-1.6.0-rc0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@ -155,8 +153,6 @@ run cross-architecture builds.
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
-%patch0039 -p1
-%patch0040 -p1

 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--- a/qemu-linux-user.spec.in
+++ b/qemu-linux-user.spec.in
@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        1.5.0
+Version:        1.6.0rc0
 Release:        0
-Source:         qemu-%version.tar.bz2
+Source:         qemu-1.6.0-rc0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
 # Please do not add patches manually here, run update_git.sh.
@ -77,7 +77,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.

 %prep
-%setup -q -n qemu-%version
+%setup -q -n qemu-1.6.0-rc0
 PATCH_EXEC

 %build
--- a/qemu.changes
+++ b/qemu.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 30 04:58:55 UTC 2013 - afaerber@suse.de
+
+- Update to v1.6.0-rc0: cf. http://wiki.qemu.org/ChangeLog/1.6
+* Fixes build against recent dtc (SLE_11_SP2 ppc64 w/ Base:System)
+* Includes Gtk patches for bnc#830459
+* Adapt update_git.sh script accordingly
+
 -------------------------------------------------------------------
 Mon Jul 22 21:34:00 UTC 2013 - brogers@suse.com

--- a/qemu.spec
+++ b/qemu.spec
@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        1.5.0
+Version:        1.6.0rc0
 Release:        0
-Source:         %name-%version.tar.bz2
+Source:         %name-1.6.0-rc0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patc.patch
 Patch0002:      0002-XXX-work-around-SA_RESTART-race-wit.patch
@ -63,8 +63,6 @@ Patch0035:      0035-console-add-question-mark-escape-op.patch
 Patch0036:      0036-Make-char-muxer-more-robust-wrt-sma.patch
 Patch0037:      0037-linux-user-lseek-explicitly-cast-no.patch
 Patch0038:      0038-virtfs-proxy-helper-Provide-__u64-f.patch
-Patch0039:      0039-gtk-don-t-use-g_object_unref-on-Gdk.patch
-Patch0040:      0040-gtk-Fix-compiler-warning-GTK-3-depr.patch
 # Please do not add patches manually here, run update_git.sh.
 # this is to make lint happy
 Source300:      rpmlintrc
@ -176,7 +174,7 @@ as PC and PowerMac systems.
 This sub-package contains the guest agent.

 %prep
-%setup -q #-n %name-1.5.0-rc2
+%setup -q -n %name-1.6.0-rc0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@ -215,8 +213,6 @@ This sub-package contains the guest agent.
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
-%patch0039 -p1
-%patch0040 -p1

 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--- a/qemu.spec.in
+++ b/qemu.spec.in
@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        1.5.0
+Version:        1.6.0rc0
 Release:        0
-Source:         %name-%version.tar.bz2
+Source:         %name-1.6.0-rc0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
 # Please do not add patches manually here, run update_git.sh.
@ -137,7 +137,7 @@ as PC and PowerMac systems.
 This sub-package contains the guest agent.

 %prep
-%setup -q #-n %name-1.5.0-rc2
+%setup -q -n %name-1.6.0-rc0
 PATCH_EXEC

 %build
--- a/update_git.sh
+++ b/update_git.sh
@ -12,8 +12,8 @@

 GIT_TREE=git://github.com/openSUSE/qemu.git
 GIT_LOCAL_TREE=/home/andreas/QEMU/qemu-opensuse
-GIT_BRANCH=opensuse-1.5
-GIT_UPSTREAM_TAG=v1.5.0
+GIT_BRANCH=opensuse-1.6
+GIT_UPSTREAM_TAG=v1.6.0-rc0
 QEMU_TMP=/dev/shm/qemu-tmp

 # clean up