Accepting request 354829 from home:a_faerber:branches:Virtualization

Update to 2.5.0

OBS-URL: https://build.opensuse.org/request/show/354829
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=284

0001-XXX-dont-dump-core-on-sigabort.patch

@@ -1,4 +1,4 @@
-From 1e556e72ef1334533b0a6ed652c7b00b0382949a Mon Sep 17 00:00:00 2001
+From 8aa30747a59c1beab3e56a314e1963357baeb99f 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
@@ -8,10 +8,10 @@ Subject: [PATCH] XXX dont dump core on sigabort
  1 file changed, 6 insertions(+)
 
 diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 9d4cef4..42c5681 100644
+index 9d62e02..1a8a332 100644
 --- a/linux-user/signal.c
 +++ b/linux-user/signal.c
-@@ -448,6 +448,10 @@ static void QEMU_NORETURN force_sig(int target_sig)
+@@ -447,6 +447,10 @@ static void QEMU_NORETURN force_sig(int target_sig)
      host_sig = target_to_host_signal(target_sig);
      gdb_signalled(env, target_sig);
  
@@ -22,7 +22,7 @@ index 9d4cef4..42c5681 100644
      /* dump core if supported by target binary format */
      if (core_dump_signal(target_sig) && (ts->bprm->core_dump != NULL)) {
          stop_all_tasks();
-@@ -465,6 +469,8 @@ static void QEMU_NORETURN force_sig(int target_sig)
+@@ -464,6 +468,8 @@ static void QEMU_NORETURN force_sig(int target_sig)
              target_sig, strsignal(host_sig), "core dumped" );
      }
  

0002-XXX-work-around-SA_RESTART-race-wit.patch

@@ -1,4 +1,4 @@
-From 5a7aa97bf33ef868052ee97fb8078af791859a5c Mon Sep 17 00:00:00 2001
+From c3a774e193db19f48a4a471814360123150a3526 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)
@@ -13,10 +13,10 @@ Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)
  4 files changed, 130 insertions(+), 10 deletions(-)
 
 diff --git a/linux-user/main.c b/linux-user/main.c
-index fdee981..c9954fd 100644
+index 8acfe0f..6379e03 100644
 --- a/linux-user/main.c
 +++ b/linux-user/main.c
-@@ -811,15 +811,22 @@ void cpu_loop(CPUARMState *env)
+@@ -809,15 +809,22 @@ void cpu_loop(CPUARMState *env)
                              break;
                          }
                      } else {
@@ -49,10 +49,10 @@ index fdee981..c9954fd 100644
                  } else {
                      goto error;
 diff --git a/linux-user/qemu.h b/linux-user/qemu.h
-index 8012cc2..e29c7f3 100644
+index bd90cc3..ea9c98d 100644
 --- a/linux-user/qemu.h
 +++ b/linux-user/qemu.h
-@@ -135,6 +135,8 @@ typedef struct TaskState {
+@@ -133,6 +133,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 */
@@ -61,7 +61,7 @@ index 8012cc2..e29c7f3 100644
  } __attribute__((aligned(16))) TaskState;
  
  extern char *exec_path;
-@@ -200,6 +202,7 @@ int get_osversion(void);
+@@ -191,6 +193,7 @@ int get_osversion(void);
  void init_qemu_uname_release(void);
  void fork_start(void);
  void fork_end(int child);
@@ -70,18 +70,18 @@ index 8012cc2..e29c7f3 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 42c5681..4153c99 100644
+index 1a8a332..2c9b0da 100644
 --- a/linux-user/signal.c
 +++ b/linux-user/signal.c
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
- #include <assert.h>
+ #include <errno.h>
  #include <sys/ucontext.h>
  #include <sys/resource.h>
 +#include <sched.h>
  
  #include "qemu.h"
  #include "qemu-common.h"
-@@ -571,6 +572,11 @@ int queue_signal(CPUArchState *env, int sig, target_siginfo_t *info)
+@@ -570,6 +571,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;
@@ -93,7 +93,7 @@ index 42c5681..4153c99 100644
          return 1; /* indicates that the signal was queued */
      }
  }
-@@ -717,8 +723,24 @@ int do_sigaction(int sig, const struct target_sigaction *act,
+@@ -716,8 +722,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;
@@ -119,10 +119,10 @@ index 42c5681..4153c99 100644
                 ignore state to avoid getting unexpected interrupted
                 syscalls */
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index f62c698..a53a85f 100644
+index 6c64ba6..ce8eba3 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5570,6 +5570,87 @@ static target_timer_t get_timer_id(abi_long arg)
+@@ -5663,6 +5663,87 @@ static target_timer_t get_timer_id(abi_long arg)
      return timerid;
  }
  
@@ -210,7 +210,7 @@ index f62c698..a53a85f 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>. */
-@@ -5583,6 +5664,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -5676,6 +5757,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
      struct stat st;
      struct statfs stfs;
      void *p;
@@ -223,7 +223,7 @@ index f62c698..a53a85f 100644
  
  #ifdef DEBUG
      gemu_log("syscall %d", num);
-@@ -8852,7 +8939,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -8998,7 +9085,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;
@@ -232,7 +232,7 @@ index f62c698..a53a85f 100644
          }
  
          switch(arg2) {
-@@ -9883,6 +9970,7 @@ fail:
+@@ -10029,6 +10116,7 @@ fail:
  #endif
      if(do_strace)
          print_syscall_ret(num, ret);

0003-qemu-0.9.0.cvs-binfmt.patch

@@ -1,4 +1,4 @@
-From 46a229c08679d4ba67bdf5f43568b08594c2ba8e Mon Sep 17 00:00:00 2001
+From 80376f4f9c820a5d1e9abe4e53f97bc7e0d349f4 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

0004-qemu-cvs-alsa_bitfield.patch

@@ -1,4 +1,4 @@
-From 30757b11ba37493290f9df04e4f2fdc095463ada Mon Sep 17 00:00:00 2001
+From d0b55bb89eeaffae5f5d0563cf53801943fcefb7 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

0005-qemu-cvs-alsa_ioctl.patch

@@ -1,4 +1,4 @@
-From 706f125ff6cb4940199af13de0040df33827326d Mon Sep 17 00:00:00 2001
+From a03418dfe9a1151a5863f84c71ea576d87136cef 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
@@ -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 edd5f3c..e9f81f3 100644
+index f996acf..c2baa9e 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
-@@ -2521,6 +2521,8 @@ struct target_ucred {
+@@ -2540,6 +2540,8 @@ struct target_ucred {
      uint32_t gid;
  };
  

0006-qemu-cvs-alsa_mmap.patch

@@ -1,4 +1,4 @@
-From e467d93b8c067719e5f240096d85a2c72f025d8d Mon Sep 17 00:00:00 2001
+From 9578bb8be38338db9e59ca5085970e23e49df081 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
@@ -12,10 +12,10 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  1 file changed, 14 insertions(+)
 
 diff --git a/linux-user/mmap.c b/linux-user/mmap.c
-index 78e1b2d..5fd32f1 100644
+index 7b459d5..9f164de 100644
 --- a/linux-user/mmap.c
 +++ b/linux-user/mmap.c
-@@ -367,6 +367,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size)
+@@ -363,6 +363,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size)
      }
  }
  
@@ -25,7 +25,7 @@ index 78e1b2d..5fd32f1 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)
-@@ -401,6 +404,17 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
+@@ -397,6 +400,17 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
      }
  #endif
  

0007-qemu-cvs-gettimeofday.patch

@@ -1,4 +1,4 @@
-From 33a0ebb46acf6693587ad719646bce324973a1b7 Mon Sep 17 00:00:00 2001
+From 41d4cd0e804058e7cb43184144c602ac94118ac5 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
@@ -9,10 +9,10 @@ No clue what this is for.
  1 file changed, 2 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index a53a85f..8e8c92e 100644
+index ce8eba3..7a6bd6c 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -6742,6 +6742,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -6870,6 +6870,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
      case TARGET_NR_gettimeofday:
          {
              struct timeval tv;

0008-qemu-cvs-ioctl_debug.patch

@@ -1,4 +1,4 @@
-From ea09ea340eecc844351b3f645f4ab1bc83a30209 Mon Sep 17 00:00:00 2001
+From a8de3056b883fc9a2dbade321fa56cd7053aba8e 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
@@ -12,10 +12,10 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 8e8c92e..8270fd0 100644
+index 7a6bd6c..c744746 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -3917,7 +3917,12 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+@@ -3922,7 +3922,12 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
      ie = ioctl_entries;
      for(;;) {
          if (ie->target_cmd == 0) {

0009-qemu-cvs-ioctl_nodirection.patch

@@ -1,4 +1,4 @@
-From 578468f720038a99ae3a0cb8fec3c032aad77f63 Mon Sep 17 00:00:00 2001
+From 93e7c43e8820bfcfa65fd4b2283fde1070056f55 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
@@ -15,10 +15,10 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  1 file changed, 6 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 8270fd0..42fad52 100644
+index c744746..6cdbd86 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -3951,6 +3951,11 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+@@ -3955,6 +3955,11 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
          arg_type++;
          target_size = thunk_type_size(arg_type, 0);
          switch(ie->access) {
@@ -30,7 +30,7 @@ index 8270fd0..42fad52 100644
          case IOC_R:
              ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
              if (!is_error(ret)) {
-@@ -3969,6 +3974,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+@@ -3973,6 +3978,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
              unlock_user(argptr, arg, 0);
              ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
              break;

0010-block-vmdk-Support-creation-of-SCSI.patch

@@ -1,4 +1,4 @@
-From dd09a1efb9aaa88ea67b087046dda700fcc6fd78 Mon Sep 17 00:00:00 2001
+From 0c87155ccca56143a74019bf10233837920a6467 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
@@ -21,12 +21,12 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  4 files changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/block.c b/block.c
-index d088ee0..fae98a4 100644
+index 3a7324b..ae06afb 100644
 --- a/block.c
 +++ b/block.c
-@@ -3871,6 +3871,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
+@@ -3682,6 +3682,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
      if (!quiet) {
-         printf("Formatting '%s', fmt=%s", filename, fmt);
+         printf("Formatting '%s', fmt=%s ", filename, fmt);
          qemu_opts_print(opts, " ");
 +        if (qemu_opt_get_bool(opts, BLOCK_OPT_SCSI, false)) {
 +            printf(", SCSI");
@@ -35,10 +35,10 @@ index d088ee0..fae98a4 100644
      }
  
 diff --git a/block/vmdk.c b/block/vmdk.c
-index fbaab67..6029805 100644
+index 6f819e4..9944b17 100644
 --- a/block/vmdk.c
 +++ b/block/vmdk.c
-@@ -1845,9 +1845,12 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp)
+@@ -1852,9 +1852,12 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp)
      if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ZEROED_GRAIN, false)) {
          zeroed_grain = true;
      }
@@ -52,7 +52,7 @@ index fbaab67..6029805 100644
      } else if (strcmp(adapter_type, "ide") &&
                 strcmp(adapter_type, "buslogic") &&
                 strcmp(adapter_type, "lsilogic") &&
-@@ -2262,6 +2265,11 @@ static QemuOptsList vmdk_create_opts = {
+@@ -2270,6 +2273,11 @@ static QemuOptsList vmdk_create_opts = {
              .help = "Enable efficient zero writes "
                      "using the zeroed-grain GTE feature"
          },
@@ -65,10 +65,10 @@ index fbaab67..6029805 100644
      }
  };
 diff --git a/include/block/block_int.h b/include/block/block_int.h
-index 14ad4c3..6843176 100644
+index 4012e36..5dcdca5 100644
 --- a/include/block/block_int.h
 +++ b/include/block/block_int.h
-@@ -39,10 +39,12 @@
+@@ -40,10 +40,12 @@
  #define BLOCK_FLAG_ENCRYPT          1
  #define BLOCK_FLAG_COMPAT6          4
  #define BLOCK_FLAG_LAZY_REFCOUNTS   8
@@ -82,10 +82,10 @@ index 14ad4c3..6843176 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 75f4ee4..6610617 100644
+index 033011c..02e2dab 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -1806,6 +1806,13 @@ static int img_convert(int argc, char **argv)
+@@ -1805,6 +1805,13 @@ static int img_convert(int argc, char **argv)
          }
      }
  

0011-linux-user-add-binfmt-wrapper-for-a.patch

@@ -1,4 +1,4 @@
-From 3e9916744db0c1ed9d1a7f63c5d473b98db861ab Mon Sep 17 00:00:00 2001
+From c5622c7c69f393bc1f04f5855fa5ef79d4a2083d 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
@@ -37,7 +37,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  create mode 100644 linux-user/binfmt.c
 
 diff --git a/Makefile.target b/Makefile.target
-index 3e7aafd..8a84d6f 100644
+index 962d004..46f5178 100644
 --- a/Makefile.target
 +++ b/Makefile.target
 @@ -36,6 +36,10 @@ endif
@@ -51,7 +51,7 @@ index 3e7aafd..8a84d6f 100644
  config-target.h: config-target.h-timestamp
  config-target.h-timestamp: config-target.mak
  
-@@ -110,6 +114,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user
+@@ -113,6 +117,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
  
@@ -60,7 +60,7 @@ index 3e7aafd..8a84d6f 100644
  endif #CONFIG_LINUX_USER
  
  #########################################################
-@@ -158,7 +164,11 @@ endif # CONFIG_SOFTMMU
+@@ -161,7 +167,11 @@ endif # CONFIG_SOFTMMU
  # Workaround for http://gcc.gnu.org/PR55489, see configure.
  %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
  
@@ -72,7 +72,7 @@ index 3e7aafd..8a84d6f 100644
  all-obj-y := $(obj-y)
  
  target-obj-y :=
-@@ -187,6 +197,9 @@ ifdef CONFIG_DARWIN
+@@ -196,6 +206,9 @@ ifdef CONFIG_DARWIN
  	$(call quiet-command,SetFile -a C $@,"  SETFILE $(TARGET_DIR)$@")
  endif
  

0012-PPC-KVM-Disable-mmu-notifier-check.patch

@@ -1,4 +1,4 @@
-From 2fc3bebad0110c2578f4db9e0f4dae1613000843 Mon Sep 17 00:00:00 2001
+From 4b4b134b43b0efae453be44dafe1459218ef176e 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
@@ -13,10 +13,10 @@ KVM guests work there, even if possibly racy in some odd circumstances.
  1 file changed, 2 insertions(+)
 
 diff --git a/exec.c b/exec.c
-index 0a4a0c5..03054a8 100644
+index 0bf0a6e..79c3983 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -1183,11 +1183,13 @@ static void *file_ram_alloc(RAMBlock *block,
+@@ -1229,11 +1229,13 @@ static void *file_ram_alloc(RAMBlock *block,
          goto error;
      }
  
@@ -28,5 +28,5 @@ index 0a4a0c5..03054a8 100644
      }
 +#endif
  
-     /* Make name safe to use with mkstemp by replacing '/' with '_'. */
+     if (!stat(path, &st) && S_ISDIR(st.st_mode)) {
-     sanitized_name = g_strdup(memory_region_name(block->mr));
+         /* Make name safe to use with mkstemp by replacing '/' with '_'. */

0013-linux-user-fix-segfault-deadlock.patch

@@ -1,4 +1,4 @@
-From b3086c4600cb1e8aef85977566df8fee6a20a6a1 Mon Sep 17 00:00:00 2001
+From cce489197692907986c6fec5c089daf57d46b58b 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
@@ -19,49 +19,23 @@ Example code to trigger this is at: http://csgraf.de/tmp/conftest.c
 
 Reported-by: Fabio Erculiani <lxnay@sabayon.org>
 Signed-off-by: Alexander Graf <agraf@suse.de>
+[AF: Drop spinlock_safe_unlock() and switch to tb_lock_reset() (bonzini)]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
- include/exec/spinlock.h | 10 ++++++++++
+ user-exec.c | 4 ++++
- user-exec.c             |  4 ++++
+ 1 file changed, 4 insertions(+)
- 2 files changed, 14 insertions(+)
 
-diff --git a/include/exec/spinlock.h b/include/exec/spinlock.h
-index a72edda..e460e12 100644
---- a/include/exec/spinlock.h
-+++ b/include/exec/spinlock.h
-@@ -24,6 +24,12 @@
- #include <pthread.h>
- #define spin_lock pthread_mutex_lock
- #define spin_unlock pthread_mutex_unlock
-+static inline void spin_unlock_safe(pthread_mutex_t *lock)
-+{
-+    /* unlocking an unlocked mutex results in undefined behavior */
-+    pthread_mutex_trylock(lock);
-+    pthread_mutex_unlock(lock);
-+}
- #define spinlock_t pthread_mutex_t
- #define SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER
- 
-@@ -46,4 +52,8 @@ static inline void spin_unlock(spinlock_t *lock)
- {
- }
- 
-+static inline void spin_unlock_safe(spinlock_t *lock)
-+{
-+}
-+
- #endif
 diff --git a/user-exec.c b/user-exec.c
-index ed9a07f..38f7baf 100644
+index 8ad89a4..02c5c3b 100644
 --- a/user-exec.c
 +++ b/user-exec.c
 @@ -95,6 +95,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",
+     printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n",
-                 pc, address, is_write, *(unsigned long *)old_set);
+            pc, address, is_write, *(unsigned long *)old_set);
  #endif
 +
 +    /* Maybe we're still holding the TB fiddling lock? */
-+    spin_unlock_safe(&tcg_ctx.tb_ctx.tb_lock);
++    tb_lock_reset();
 +
      /* XXX: locking issue */
      if (is_write && h2g_valid(address)

0014-linux-user-binfmt-support-host-bina.patch

@@ -1,4 +1,4 @@
-From 9d108fe88813ed9b5c04f27229c335e88d1ee0b5 Mon Sep 17 00:00:00 2001
+From 8cb8d78c1f37f758d87e8afa64dd6884f8f4af65 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

0015-linux-user-Ignore-broken-loop-ioctl.patch

@@ -1,4 +1,4 @@
-From c09e4874d845ac6783be16bb560ef4a69f4e24bb Mon Sep 17 00:00:00 2001
+From c133a037638e8831f61352311a5acbd6241f184b 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
@@ -46,10 +46,10 @@ index 8974caa..810ae61 100644
  
  #endif
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 42fad52..8abe4cd 100644
+index 6cdbd86..55dfcf9 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -3894,6 +3894,13 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp,
+@@ -3899,6 +3899,13 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp,
      return get_errno(ioctl(fd, ie->host_cmd, sig));
  }
  
@@ -64,10 +64,10 @@ index 42fad52..8abe4cd 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 e9f81f3..9fabee7 100644
+index c2baa9e..4f966b4 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
-@@ -1068,6 +1068,7 @@ struct target_pollfd {
+@@ -1085,6 +1085,7 @@ struct target_pollfd {
  #define TARGET_LOOP_SET_STATUS64      0x4C04
  #define TARGET_LOOP_GET_STATUS64      0x4C05
  #define TARGET_LOOP_CHANGE_FD         0x4C06

0016-linux-user-lock-tcg.patch

@@ -1,4 +1,4 @@
-From 66d948dc1ca00cf95af18a77f0db061f657956a9 Mon Sep 17 00:00:00 2001
+From 75fce0091f944eeda3edc005be834f26351cd61f 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
@@ -12,15 +12,16 @@ different threads.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 [AF: Rebased onto exec.c/translate-all.c split for 1.4]
 [AF: Rebased for v2.1.0-rc0]
+[AF: Rebased onto tcg_gen_code_common() drop for v2.5.0-rc0]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  linux-user/mmap.c |  3 +++
- tcg/tcg.c         | 36 ++++++++++++++++++++++++++++++++++--
+ tcg/tcg.c         | 31 ++++++++++++++++++++++++++++++-
  tcg/tcg.h         |  6 ++++++
- 3 files changed, 43 insertions(+), 2 deletions(-)
+ 3 files changed, 39 insertions(+), 1 deletion(-)
 
 diff --git a/linux-user/mmap.c b/linux-user/mmap.c
-index 5fd32f1..38f1cdd 100644
+index 9f164de..691e63a 100644
 --- a/linux-user/mmap.c
 +++ b/linux-user/mmap.c
 @@ -30,6 +30,7 @@
@@ -48,7 +49,7 @@ index 5fd32f1..38f1cdd 100644
  }
  
 diff --git a/tcg/tcg.c b/tcg/tcg.c
-index 0892a9b..f67c38c 100644
+index a163541..da174b9 100644
 --- a/tcg/tcg.c
 +++ b/tcg/tcg.c
 @@ -39,6 +39,8 @@
@@ -60,7 +61,7 @@ index 0892a9b..f67c38c 100644
  
  /* Note: the long term plan is to reduce the dependencies on the QEMU
     CPU definitions. Currently they are used for qemu_ld/st
-@@ -123,6 +125,29 @@ const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);
+@@ -117,6 +119,29 @@ static void tcg_out_tb_finalize(TCGContext *s);
  static TCGRegSet tcg_target_available_regs[2];
  static TCGRegSet tcg_target_call_clobber_regs;
  
@@ -90,7 +91,7 @@ index 0892a9b..f67c38c 100644
  #if TCG_TARGET_INSN_UNIT_SIZE == 1
  static __attribute__((unused)) inline void tcg_out8(TCGContext *s, uint8_t v)
  {
-@@ -333,7 +358,8 @@ void tcg_context_init(TCGContext *s)
+@@ -327,7 +352,8 @@ void tcg_context_init(TCGContext *s)
  
      memset(s, 0, sizeof(*s));
      s->nb_globals = 0;
@@ -100,12 +101,23 @@ index 0892a9b..f67c38c 100644
      /* Count total number of arguments and allocate the corresponding
         space */
      total_args = 0;
-@@ -2422,10 +2448,12 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
+@@ -2345,6 +2371,7 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
+         qemu_log("\n");
      }
  #endif
- 
 +    tcg_lock();
-     tcg_gen_code_common(s, gen_code_buf, -1);
+ 
+ #ifdef CONFIG_PROFILER
+     s->opt_time -= profile_getclock();
+@@ -2448,6 +2475,7 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
+            the buffer completely.  Thus we can test for overflow after
+            generating code without having to check during generation.  */
+         if (unlikely((void *)s->code_ptr > s->code_gen_highwater)) {
++            tcg_unlock();
+             return -1;
+         }
+     }
+@@ -2459,6 +2487,7 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
  
      /* flush instruction cache */
      flush_icache_range((uintptr_t)s->code_buf, (uintptr_t)s->code_ptr);
@@ -113,21 +125,8 @@ index 0892a9b..f67c38c 100644
  
      return tcg_current_code_size(s);
  }
-@@ -2437,7 +2465,11 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
- int tcg_gen_code_search_pc(TCGContext *s, tcg_insn_unit *gen_code_buf,
-                            long offset)
- {
--    return tcg_gen_code_common(s, gen_code_buf, offset);
-+    int r;
-+    tcg_lock();
-+    r = tcg_gen_code_common(s, gen_code_buf, offset);
-+    tcg_unlock();
-+    return r;
- }
- 
- #ifdef CONFIG_PROFILER
 diff --git a/tcg/tcg.h b/tcg/tcg.h
-index 231a781..e0806f9 100644
+index a696922..da22788 100644
 --- a/tcg/tcg.h
 +++ b/tcg/tcg.h
 @@ -27,6 +27,7 @@
@@ -138,16 +137,16 @@ index 231a781..e0806f9 100644
  #include "tcg-target.h"
  
  #define CPU_TEMP_BUF_NLONGS 128
-@@ -572,6 +573,8 @@ struct TCGContext {
+@@ -581,6 +582,8 @@ struct TCGContext {
-     target_ulong gen_opc_pc[OPC_BUF_SIZE];
+ 
-     uint16_t gen_opc_icount[OPC_BUF_SIZE];
+     uint16_t gen_insn_end_off[TCG_MAX_INSNS];
-     uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
+     target_ulong gen_insn_data[TCG_MAX_INSNS][TARGET_INSN_START_WORDS];
 +
 +    QemuMutex lock;
  };
  
  extern TCGContext tcg_ctx;
-@@ -760,6 +763,9 @@ void tcg_gen_callN(TCGContext *s, void *func,
+@@ -771,6 +774,9 @@ void tcg_gen_callN(TCGContext *s, void *func,
  void tcg_op_remove(TCGContext *s, TCGOp *op);
  void tcg_optimize(TCGContext *s);
  

0017-linux-user-Run-multi-threaded-code-.patch

@@ -1,4 +1,4 @@
-From bb2c2983421cc2b39cd7174f9bfdbb0376d5fcb9 Mon Sep 17 00:00:00 2001
+From e5315d304cfd3d5398576a5c6f3fed541b775bc8 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
@@ -19,10 +19,10 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 9 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 8abe4cd..72701d4 100644
+index 55dfcf9..aa21cb6 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -4599,6 +4599,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
+@@ -4604,6 +4604,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
          if (nptl_flags & CLONE_SETTLS)
              cpu_set_tls (new_env, newtls);
  

0018-linux-user-lock-tb-flushing-too.patch

@@ -1,4 +1,4 @@
-From 996083e51b49804d7d9b6fa8c0daa6b2a68fbfee Mon Sep 17 00:00:00 2001
+From 0ca59d2290fa0a06cf51a159549461ab0b71bf5e 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
@@ -8,23 +8,22 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Alexander Graf <agraf@suse.de>
 [AF: Rebased onto exec.c/translate-all.c split for 1.4]
+[AF: Rebased onto tb_alloc() changes for v2.5.0-rc0]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  translate-all.c | 20 ++++++++++++++++++--
  1 file changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/translate-all.c b/translate-all.c
-index 60a3d8b..6de63cd 100644
+index 042a857..8d0d1a6 100644
 --- a/translate-all.c
 +++ b/translate-all.c
-@@ -705,19 +705,23 @@ static TranslationBlock *tb_alloc(target_ulong pc)
+@@ -767,17 +767,21 @@ static TranslationBlock *tb_alloc(target_ulong pc)
  {
      TranslationBlock *tb;
  
 +    tcg_lock();
-     if (tcg_ctx.tb_ctx.nb_tbs >= tcg_ctx.code_gen_max_blocks ||
+     if (tcg_ctx.tb_ctx.nb_tbs >= tcg_ctx.code_gen_max_blocks) {
-         (tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer) >=
-          tcg_ctx.code_gen_buffer_max_size) {
 +        tcg_unlock();
          return NULL;
      }
@@ -41,7 +40,7 @@ index 60a3d8b..6de63cd 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.  */
-@@ -726,6 +730,7 @@ void tb_free(TranslationBlock *tb)
+@@ -786,6 +790,7 @@ void tb_free(TranslationBlock *tb)
          tcg_ctx.code_gen_ptr = tb->tc_ptr;
          tcg_ctx.tb_ctx.nb_tbs--;
      }
@@ -49,7 +48,7 @@ index 60a3d8b..6de63cd 100644
  }
  
  static inline void invalidate_page_bitmap(PageDesc *p)
-@@ -781,6 +786,7 @@ void tb_flush(CPUState *cpu)
+@@ -839,6 +844,7 @@ void tb_flush(CPUState *cpu)
             ((unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer)) /
             tcg_ctx.tb_ctx.nb_tbs : 0);
  #endif
@@ -57,7 +56,7 @@ index 60a3d8b..6de63cd 100644
      if ((unsigned long)(tcg_ctx.code_gen_ptr - tcg_ctx.code_gen_buffer)
          > tcg_ctx.code_gen_buffer_size) {
          cpu_abort(cpu, "Internal error: code buffer overflow\n");
-@@ -798,6 +804,7 @@ void tb_flush(CPUState *cpu)
+@@ -856,6 +862,7 @@ void tb_flush(CPUState *cpu)
      /* XXX: flush processor icache at this point if cache flush is
         expensive */
      tcg_ctx.tb_ctx.tb_flush_count++;
@@ -65,7 +64,7 @@ index 60a3d8b..6de63cd 100644
  }
  
  #ifdef DEBUG_TB_CHECK
-@@ -1079,8 +1086,10 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
+@@ -1212,8 +1219,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 +75,7 @@ index 60a3d8b..6de63cd 100644
          return;
      }
  #if defined(TARGET_HAS_PRECISE_SMC)
-@@ -1165,6 +1174,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
+@@ -1298,6 +1307,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
          cpu_resume_from_signal(cpu, NULL);
      }
  #endif
@@ -84,7 +83,7 @@ index 60a3d8b..6de63cd 100644
  }
  
  /* len must be <= 8 and start must be a multiple of len */
-@@ -1379,13 +1389,16 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
+@@ -1515,13 +1525,16 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
  {
      int m_min, m_max, m;
      uintptr_t v;
@@ -102,7 +101,7 @@ index 60a3d8b..6de63cd 100644
          return NULL;
      }
      /* binary search (cf Knuth) */
-@@ -1396,6 +1409,7 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
+@@ -1532,6 +1545,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 +109,7 @@ index 60a3d8b..6de63cd 100644
              return tb;
          } else if (tc_ptr < v) {
              m_max = m - 1;
-@@ -1403,7 +1417,9 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
+@@ -1539,7 +1553,9 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
              m_min = m + 1;
          }
      }

0019-linux-user-Fake-proc-cpuinfo.patch

@@ -1,4 +1,4 @@
-From a592905fec06b408000a34046a6e70095214d955 Mon Sep 17 00:00:00 2001
+From 6c8981399b1933011bb178f91d0bf91907d0ab8a 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
@@ -22,10 +22,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 20 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 72701d4..39dd818 100644
+index aa21cb6..8995968 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5420,6 +5420,25 @@ static int open_self_stat(void *cpu_env, int fd)
+@@ -5513,6 +5513,25 @@ static int open_self_stat(void *cpu_env, int fd)
      return 0;
  }
  
@@ -51,7 +51,7 @@ index 72701d4..39dd818 100644
  static int open_self_auxv(void *cpu_env, int fd)
  {
      CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env);
-@@ -5534,6 +5553,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
+@@ -5627,6 +5646,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
  #if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
          { "/proc/net/route", open_net_route, is_proc },
  #endif

0020-linux-user-implement-FS_IOC_GETFLAG.patch

@@ -1,4 +1,4 @@
-From e5e97946c33a9f96bf2690ef725879412d40b57d Mon Sep 17 00:00:00 2001
+From 58cee188a6c2a532d7a34494393969b364d6d3e8 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
@@ -28,10 +28,10 @@ index c180faf..8650a70 100644
    IOCTL(SIOCATMARK, 0, TYPE_NULL)
    IOCTL(SIOCGIFNAME, IOC_RW, MK_PTR(TYPE_INT))
 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 9fabee7..c8e47cf 100644
+index 4f966b4..817defd 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
-@@ -2436,6 +2436,8 @@ struct target_f_owner_ex {
+@@ -2455,6 +2455,8 @@ struct target_f_owner_ex {
  #define TARGET_MTIOCGET        TARGET_IOR('m', 2, struct mtget)
  #define TARGET_MTIOCPOS        TARGET_IOR('m', 3, struct mtpos)
  

0021-linux-user-implement-FS_IOC_SETFLAG.patch

@@ -1,4 +1,4 @@
-From 11b3d0e15103565ed1f80e31033f4b8e2ebb456f Mon Sep 17 00:00:00 2001
+From c0a3dcdbf263dc193d4337056c3f3a157f8b7d33 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
@@ -28,10 +28,10 @@ index 8650a70..f9f7c83 100644
    IOCTL(SIOCATMARK, 0, TYPE_NULL)
    IOCTL(SIOCGIFNAME, IOC_RW, MK_PTR(TYPE_INT))
 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index c8e47cf..1a8816d 100644
+index 817defd..367eac1 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
-@@ -2437,6 +2437,7 @@ struct target_f_owner_ex {
+@@ -2456,6 +2456,7 @@ struct target_f_owner_ex {
  #define TARGET_MTIOCPOS        TARGET_IOR('m', 3, struct mtpos)
  
  #define TARGET_FS_IOC_GETFLAGS TARGET_IORU('f', 1)

0022-linux-user-XXX-disable-fiemap.patch

@@ -1,4 +1,4 @@
-From 12eee45e1110866da047697a46425754c77b2039 Mon Sep 17 00:00:00 2001
+From 588f5e97ffbb3e072053fc5f39eb0411663800c6 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
@@ -9,10 +9,10 @@ agraf: fiemap breaks in libarchive. Disable it for now.
  1 file changed, 5 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 39dd818..5bd6f55 100644
+index 8995968..f7e57a6 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -3389,6 +3389,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
+@@ -3394,6 +3394,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
      uint32_t outbufsz;
      int free_fm = 0;
  

0023-slirp-nooutgoing.patch

@@ -1,4 +1,4 @@
-From 872dda04d480ab7c04830ae7297319ae52d03f65 Mon Sep 17 00:00:00 2001
+From 0f901ac5dba327c1c988bf7eb7b30bf002446bd9 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
@@ -12,10 +12,10 @@ TBD (from SUSE Studio team)
  4 files changed, 40 insertions(+)
 
 diff --git a/qemu-options.hx b/qemu-options.hx
-index 77f5853..fed72b0 100644
+index 0eea4ee..32a68e4 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -2915,6 +2915,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
+@@ -2949,6 +2949,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
  from a script.
  ETEXI
  
@@ -33,7 +33,7 @@ index 77f5853..fed72b0 100644
      "-singlestep     always run in singlestep mode\n", QEMU_ARCH_ALL)
  STEXI
 diff --git a/slirp/socket.c b/slirp/socket.c
-index 37ac5cf..b64baff 100644
+index 1673e3a..a177ab0 100644
 --- a/slirp/socket.c
 +++ b/slirp/socket.c
 @@ -532,6 +532,8 @@ sorecvfrom(struct socket *so)
@@ -59,7 +59,7 @@ index 37ac5cf..b64baff 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 7571c5a..0555e18 100644
+index e161ed2..d0e29e0 100644
 --- a/slirp/tcp_subr.c
 +++ b/slirp/tcp_subr.c
 @@ -324,6 +324,9 @@ tcp_sockclosed(struct tcpcb *tp)
@@ -74,7 +74,7 @@ index 7571c5a..0555e18 100644
    Slirp *slirp = so->slirp;
 @@ -332,6 +335,11 @@ int tcp_fconnect(struct socket *so)
    DEBUG_CALL("tcp_fconnect");
-   DEBUG_ARG("so = %lx", (long )so);
+   DEBUG_ARG("so = %p", so);
  
 +  if (slirp_nooutgoing) {
 +    errno = EHOSTUNREACH;
@@ -97,10 +97,10 @@ index 7571c5a..0555e18 100644
      socket_set_fast_reuse(s);
      opt = 1;
 diff --git a/vl.c b/vl.c
-index 0adbbd6..f876c0b 100644
+index 4211ff1..d5250b6 100644
 --- a/vl.c
 +++ b/vl.c
-@@ -165,6 +165,7 @@ int smp_threads = 1;
+@@ -167,6 +167,7 @@ int smp_threads = 1;
  int acpi_enabled = 1;
  int no_hpet = 0;
  int fd_bootchk = 1;
@@ -108,7 +108,7 @@ index 0adbbd6..f876c0b 100644
  static int no_reboot;
  int no_shutdown = 0;
  int cursor_hide = 1;
-@@ -3366,6 +3367,14 @@ int main(int argc, char **argv, char **envp)
+@@ -3385,6 +3386,14 @@ int main(int argc, char **argv, char **envp)
              case QEMU_OPTION_singlestep:
                  singlestep = 1;
                  break;

0024-vnc-password-file-and-incoming-conn.patch

@@ -1,4 +1,4 @@
-From e6f0d75af33e57a766e9d21333a55b981f374d4d Mon Sep 17 00:00:00 2001
+From dcdb06da7c0233d7532ebb281e79d9a57231311b 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=
@@ -9,10 +9,10 @@ TBD (from SUSE Studio team)
  1 file changed, 55 insertions(+)
 
 diff --git a/ui/vnc.c b/ui/vnc.c
-index e26973a..1545e9b 100644
+index cbe4d33..36cd143 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
-@@ -54,6 +54,8 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
+@@ -57,6 +57,8 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
  static QTAILQ_HEAD(, VncDisplay) vnc_displays =
      QTAILQ_HEAD_INITIALIZER(vnc_displays);
  
@@ -21,7 +21,7 @@ index e26973a..1545e9b 100644
  static int vnc_cursor_define(VncState *vs);
  static void vnc_release_modifiers(VncState *vs);
  
-@@ -1220,6 +1222,7 @@ static void vnc_disconnect_start(VncState *vs)
+@@ -1223,6 +1225,7 @@ static void vnc_disconnect_start(VncState *vs)
  void vnc_disconnect_finish(VncState *vs)
  {
      int i;
@@ -29,7 +29,7 @@ index e26973a..1545e9b 100644
  
      vnc_jobs_join(vs); /* Wait encoding jobs */
  
-@@ -1266,6 +1269,13 @@ void vnc_disconnect_finish(VncState *vs)
+@@ -1271,6 +1274,13 @@ void vnc_disconnect_finish(VncState *vs)
      }
      g_free(vs->lossy_rect);
      g_free(vs);
@@ -42,8 +42,8 @@ index e26973a..1545e9b 100644
 +    }
  }
  
- int vnc_client_io_error(VncState *vs, int ret, int last_errno)
+ ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, int last_errno)
-@@ -3233,6 +3243,39 @@ char *vnc_display_local_addr(const char *id)
+@@ -3268,6 +3278,39 @@ char *vnc_display_local_addr(const char *id)
      return vnc_socket_local_addr("%s:%s", vs->lsock);
  }
  
@@ -83,7 +83,7 @@ index e26973a..1545e9b 100644
  static QemuOptsList qemu_vnc_opts = {
      .name = "vnc",
      .head = QTAILQ_HEAD_INITIALIZER(qemu_vnc_opts.head),
-@@ -3260,6 +3303,9 @@ static QemuOptsList qemu_vnc_opts = {
+@@ -3299,6 +3342,9 @@ static QemuOptsList qemu_vnc_opts = {
              .name = "connections",
              .type = QEMU_OPT_NUMBER,
          },{
@@ -93,7 +93,7 @@ index e26973a..1545e9b 100644
              .name = "to",
              .type = QEMU_OPT_NUMBER,
          },{
-@@ -3272,6 +3318,9 @@ static QemuOptsList qemu_vnc_opts = {
+@@ -3311,6 +3357,9 @@ static QemuOptsList qemu_vnc_opts = {
              .name = "password",
              .type = QEMU_OPT_BOOL,
          },{
@@ -103,15 +103,15 @@ index e26973a..1545e9b 100644
              .name = "reverse",
              .type = QEMU_OPT_BOOL,
          },{
-@@ -3436,6 +3485,7 @@ void vnc_display_open(const char *id, Error **errp)
+@@ -3544,6 +3593,7 @@ void vnc_display_open(const char *id, Error **errp)
      const char *share, *device_id;
      QemuConsole *con;
      bool password = false;
 +    const char *password_file;
      bool reverse = false;
      const char *vnc;
-     const char *has_to;
+     char *h;
-@@ -3524,6 +3574,10 @@ void vnc_display_open(const char *id, Error **errp)
+@@ -3662,6 +3712,10 @@ void vnc_display_open(const char *id, Error **errp)
              goto fail;
          }
      }
@@ -122,11 +122,11 @@ index e26973a..1545e9b 100644
  
      reverse = qemu_opt_get_bool(opts, "reverse", false);
      lock_key_sync = qemu_opt_get_bool(opts, "lock-key-sync", true);
-@@ -3577,6 +3631,7 @@ void vnc_display_open(const char *id, Error **errp)
+@@ -3750,6 +3804,7 @@ void vnc_display_open(const char *id, Error **errp)
          vs->share_policy = VNC_SHARE_POLICY_ALLOW_EXCLUSIVE;
      }
      vs->connections_limit = qemu_opt_get_number(opts, "connections", 32);
 +    allowed_connections = qemu_opt_get_number(opts, "allowed-connections", 0);
  
-     websocket = qemu_opt_get(opts, "websocket");
+ #ifdef CONFIG_VNC_JPEG
-     if (websocket) {
+     vs->lossy = qemu_opt_get_bool(opts, "lossy", false);

0025-linux-user-add-more-blk-ioctls.patch

@@ -1,4 +1,4 @@
-From 41e679783a244ca0ea1963e55bd3da5b9a966f24 Mon Sep 17 00:00:00 2001
+From ea1a1506d303f1ae4ad584c2dfb21c92c42970f6 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
@@ -42,10 +42,10 @@ index f9f7c83..8eb4446 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 1a8816d..f3ac211 100644
+index 367eac1..ca14909 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
-@@ -937,6 +937,12 @@ struct target_pollfd {
+@@ -954,6 +954,12 @@ struct target_pollfd {
  #define TARGET_BLKGETSIZE64 TARGET_IOR(0x12,114,abi_ulong)
                                               /* return device size in bytes
                                                  (u64 *arg) */

0026-linux-user-use-target_ulong.patch

@@ -1,4 +1,4 @@
-From 72d795a02ff3fac05afef692938ab2ec12176795 Mon Sep 17 00:00:00 2001
+From 436e643f2f17bac815c7ec7315e0758b22f10fb4 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
@@ -17,10 +17,10 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/linux-user/qemu.h b/linux-user/qemu.h
-index e29c7f3..75b6558 100644
+index ea9c98d..a9e77d0 100644
 --- a/linux-user/qemu.h
 +++ b/linux-user/qemu.h
-@@ -190,10 +190,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
+@@ -181,10 +181,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);
@@ -36,10 +36,10 @@ index e29c7f3..75b6558 100644
  extern THREAD CPUState *thread_cpu;
  void cpu_loop(CPUArchState *env);
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 5bd6f55..8016256 100644
+index f7e57a6..2db566c 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5706,10 +5706,10 @@ int syscall_restartable(int syscall_nr)
+@@ -5799,10 +5799,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>. */

0027-block-Add-support-for-DictZip-enabl.patch

@@ -1,4 +1,4 @@
-From 3058cb28a3852a02ef20cb5fa6e17f89880bd2cb Mon Sep 17 00:00:00 2001
+From 6d0d71e8215d2273663a3ddb44cad3e24ed3ad35 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 09:49:37 +0200
 Subject: [PATCH] block: Add support for DictZip enabled gzip files
@@ -34,6 +34,7 @@ Signed-off-by: Tim Hardeck <thardeck@suse.de>
      qemu_aio_release() -> qemu_aio_unref(),
      drop dictzip_aio_cancel()]
 [AF: common-obj-y -> block-obj-y, drop probe hook (bsc#945778)]
+[AF: Drop bdrv_open() drv parameter for 2.5]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  block/Makefile.objs |   1 +
@@ -55,7 +56,7 @@ index 58ef2ef..c7b9294 100644
  
 diff --git a/block/dictzip.c b/block/dictzip.c
 new file mode 100644
-index 0000000..1824971
+index 0000000..728d5b4
 --- /dev/null
 +++ b/block/dictzip.c
 @@ -0,0 +1,578 @@
@@ -242,7 +243,7 @@ index 0000000..1824971
 +    else if (!strncmp(filename, "dzip:", 5))
 +        filename += 5;
 +
-+    ret = bdrv_open(&s->hd, filename, NULL, NULL, flags | BDRV_O_PROTOCOL, NULL, &local_err);
++    ret = bdrv_open(&s->hd, filename, NULL, NULL, flags | BDRV_O_PROTOCOL, &local_err);
 +    if (ret < 0) {
 +        error_propagate(errp, local_err);
 +        qemu_opts_del(opts);

0028-block-Add-tar-container-format.patch

@@ -1,4 +1,4 @@
-From 6492e67a4633bac8d339a8dd171a4560d9b0db6d Mon Sep 17 00:00:00 2001
+From ba2b8bb664ae784303710caa916066c313510755 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 17:28:38 +0200
 Subject: [PATCH] block: Add tar container format
@@ -35,6 +35,7 @@ Signed-off-by: Tim Hardeck <thardeck@suse.de>
      qemu_aio_release() -> qemu_aio_unref(),
      drop tar_aio_cancel()]
 [AF: common-obj-y -> block-obj-y, drop probe hook (bsc#945778)]
+[AF: Drop bdrv_open() drv parameter for 2.5]
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  block/Makefile.objs |   1 +
@@ -56,7 +57,7 @@ index c7b9294..0a4b697 100644
  
 diff --git a/block/tar.c b/block/tar.c
 new file mode 100644
-index 0000000..e612db3
+index 0000000..34dc57c
 --- /dev/null
 +++ b/block/tar.c
 @@ -0,0 +1,368 @@
@@ -241,7 +242,7 @@ index 0000000..e612db3
 +    else if (!strncmp(filename, "tar:", 4))
 +        filename += 4;
 +
-+    ret = bdrv_open(&s->hd, filename, NULL, NULL, flags | BDRV_O_PROTOCOL, NULL, &local_err);
++    ret = bdrv_open(&s->hd, filename, NULL, NULL, flags | BDRV_O_PROTOCOL, &local_err);
 +    if (ret < 0) {
 +        error_propagate(errp, local_err);
 +        qemu_opts_del(opts);

0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch

@@ -1,4 +1,4 @@
-From d893ae81b781a53bac6ee988bed2f32453dec3a7 Mon Sep 17 00:00:00 2001
+From fc62b8b5778e4f68993b7a1a58a555838ec57b62 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/block/tar.c b/block/tar.c
-index e612db3..654fcf7 100644
+index 34dc57c..cade8ab 100644
 --- a/block/tar.c
 +++ b/block/tar.c
 @@ -71,7 +71,8 @@ static int str_ends(char *str, const char *end)

0030-console-add-question-mark-escape-op.patch

@@ -1,4 +1,4 @@
-From 9ff792a6d58e3966c94dc22167d956df1756aa14 Mon Sep 17 00:00:00 2001
+From dff9e68c25df66cf1520415ea70f51c3068dc2c2 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
@@ -16,10 +16,10 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ui/console.c b/ui/console.c
-index 75fc492..827b91e 100644
+index 745c354..d66a9ac 100644
 --- a/ui/console.c
 +++ b/ui/console.c
-@@ -854,7 +854,7 @@ static void console_putchar(QemuConsole *s, int ch)
+@@ -855,7 +855,7 @@ static void console_putchar(QemuConsole *s, int ch)
          } else {
              if (s->nb_esc_params < MAX_ESC_PARAMS)
                  s->nb_esc_params++;

0031-Make-char-muxer-more-robust-wrt-sma.patch

@@ -1,4 +1,4 @@
-From 3de38631531f91c85e910e961978a77bd1ef842f Mon Sep 17 00:00:00 2001
+From 199c13d0611ca730dcba1784cd4d6da9172a5413 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
@@ -22,10 +22,10 @@ This patch fixes input when using -nographic on s390 for me.
  1 file changed, 16 insertions(+)
 
 diff --git a/qemu-char.c b/qemu-char.c
-index d956f8d..cd301ba 100644
+index 2969c44..9a32d09 100644
 --- a/qemu-char.c
 +++ b/qemu-char.c
-@@ -404,6 +404,9 @@ typedef struct {
+@@ -381,6 +381,9 @@ typedef struct {
      IOEventHandler *chr_event[MAX_MUX];
      void *ext_opaque[MAX_MUX];
      CharDriverState *drv;
@@ -35,7 +35,7 @@ index d956f8d..cd301ba 100644
      int focus;
      int mux_cnt;
      int term_got_escape;
-@@ -563,6 +566,15 @@ static void mux_chr_accept_input(CharDriverState *chr)
+@@ -540,6 +543,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 d956f8d..cd301ba 100644
  }
  
  static int mux_chr_can_read(void *opaque)
-@@ -691,6 +703,10 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
+@@ -677,6 +689,10 @@ static CharDriverState *qemu_chr_open_mux(const char *id,
      chr->opaque = d;
      d->drv = drv;
      d->focus = -1;

0032-linux-user-lseek-explicitly-cast-no.patch

@@ -1,4 +1,4 @@
-From c42944366a1ce036e7baab2ee14b71e2d38754d1 Mon Sep 17 00:00:00 2001
+From 625b8744b9365a6aec0f5197f7cd5fdec9e9dd26 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
@@ -16,10 +16,10 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 8016256..7c97105 100644
+index 2db566c..d8837a0 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -6017,9 +6017,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+@@ -6127,9 +6127,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
      case TARGET_NR_oldstat:
          goto unimplemented;
  #endif

0033-virtfs-proxy-helper-Provide-__u64-f.patch

@@ -1,4 +1,4 @@
-From cd1a94f80e21ef2b5fa584514c032b34c0f85aeb Mon Sep 17 00:00:00 2001
+From d426e2bf712d0393687782719b6dce20d7ef0e9f 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
@@ -12,7 +12,7 @@ Fixes the build on SLE 11 SP2.
  1 file changed, 7 insertions(+)
 
 diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
-index 9097d15..f73de4e 100644
+index ad1da0d..e6cabf0 100644
 --- a/fsdev/virtfs-proxy-helper.c
 +++ b/fsdev/virtfs-proxy-helper.c
 @@ -9,6 +9,13 @@

0034-configure-Enable-PIE-for-ppc-and-pp.patch

@@ -1,4 +1,4 @@
-From c9fbb5972a05e94bbe28bc75441344830a247fe5 Mon Sep 17 00:00:00 2001
+From e374ba1499f38700e88f30bb0a187b9c61768cca Mon Sep 17 00:00:00 2001
 From: Dinar Valeev <k0da@opensuse.org>
 Date: Wed, 2 Oct 2013 17:56:03 +0200
 Subject: [PATCH] configure: Enable PIE for ppc and ppc64 hosts
@@ -14,10 +14,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index cd219d8..6ab01bc 100755
+index b9552fd..da33d72 100755
 --- a/configure
 +++ b/configure
-@@ -1530,7 +1530,7 @@ fi
+@@ -1560,7 +1560,7 @@ fi
  
  if test "$pie" = ""; then
    case "$cpu-$targetos" in

0035-qtest-Increase-socket-timeout.patch

@@ -1,4 +1,4 @@
-From 39b6d2beaf481c85e836a77dede84456c25622ed Mon Sep 17 00:00:00 2001
+From 0501fde012f0a5881d9b916e670f3c0518de5ceb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 17 Apr 2014 18:39:10 +0200
 Subject: [PATCH] qtest: Increase socket timeout
@@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/libqtest.c b/tests/libqtest.c
-index e5188e0..e0c5f23 100644
+index fa314e1..a57e114 100644
 --- a/tests/libqtest.c
 +++ b/tests/libqtest.c
 @@ -35,7 +35,7 @@

0036-AIO-Reduce-number-of-threads-for-32.patch

@@ -1,4 +1,4 @@
-From 458ee6dac3863bf420d70cd218f88b60c4de7565 Mon Sep 17 00:00:00 2001
+From 6849a7c84a7f2639b0c72ddc6581ff9d4a1c23f7 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 14 Jan 2015 01:32:11 +0100
 Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts
@@ -21,7 +21,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/thread-pool.c b/thread-pool.c
-index ac909f4..fc16fc2 100644
+index 402c778..3d06c69 100644
 --- a/thread-pool.c
 +++ b/thread-pool.c
 @@ -297,7 +297,12 @@ static void thread_pool_init_one(ThreadPool *pool, AioContext *ctx)

0037-Revert-Revert-seccomp-tests-that-al.patch

@@ -1,45 +0,0 @@
-From 1c97919295ef36ddaaca131cc412aafe9a078151 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
-Date: Tue, 14 Apr 2015 18:42:06 +0200
-Subject: [PATCH] Revert "Revert seccomp tests that allow it to be used on
- non-x86 architectures"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit ae6e8ef11e6cb43ec83a5846e8f3b266834cf280.
-
-Our Factory libseccomp is patched to support ppc, ppc64, armv7l and soon
-ppc64le.
-
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- configure | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 6ab01bc..b1ed2a2 100755
---- a/configure
-+++ b/configure
-@@ -1827,14 +1827,19 @@ fi
- # libseccomp check
- 
- if test "$seccomp" != "no" ; then
--    if test "$cpu" = "i386" || test "$cpu" = "x86_64" &&
--        $pkg_config --atleast-version=2.1.1 libseccomp; then
-+    if $pkg_config --atleast-version=2.2.0 libseccomp ||
-+        (test "$cpu" = "i386" || test "$cpu" = "x86_64" &&
-+        $pkg_config --atleast-version=2.1.1 libseccomp); then
-         libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`"
-         QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`"
- 	seccomp="yes"
-     else
- 	if test "$seccomp" = "yes"; then
-+        if test "$cpu" = "i386" || test "$cpu" = "x86_64"; then
-             feature_not_found "libseccomp" "Install libseccomp devel >= 2.1.1"
-+        else
-+            feature_not_found "libseccomp" "Install libseccomp devel >= 2.2.0"
-+        fi
- 	fi
- 	seccomp="no"
-     fi

0037-configure-Enable-libseccomp-for-ppc.patch

@@ -0,0 +1,29 @@
+From 81b2f0411ac5660260d4d1b7ba527e969d5f9064 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
+Date: Tue, 14 Apr 2015 18:42:06 +0200
+Subject: [PATCH] configure: Enable libseccomp for ppc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Our Factory libseccomp is patched to support ppc, ppc64 and ppc64le.
+
+Signed-off-by: Andreas Färber <afaerber@suse.de>
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index da33d72..d140392 100755
+--- a/configure
++++ b/configure
+@@ -1910,6 +1910,9 @@ if test "$seccomp" != "no" ; then
+     arm|aarch64)
+         libseccomp_minver="2.2.3"
+         ;;
++    ppc|ppc64)
++        libseccomp_minver="2.2.0"
++        ;;
+     *)
+         libseccomp_minver=""
+         ;;

0038-dictzip-Fix-on-big-endian-systems.patch

@@ -1,4 +1,4 @@
-From 6daa5dc051e04f528bbe15cb7231a05cf92a072c Mon Sep 17 00:00:00 2001
+From 131c58925741584d7c0185aeba810d7be39f354c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 15 Jun 2015 17:36:32 +0200
 Subject: [PATCH] dictzip: Fix on big endian systems
@@ -20,7 +20,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 28 insertions(+), 22 deletions(-)
 
 diff --git a/block/dictzip.c b/block/dictzip.c
-index 1824971..71ffe7b 100644
+index 728d5b4..83484fd 100644
 --- a/block/dictzip.c
 +++ b/block/dictzip.c
 @@ -154,6 +154,7 @@ static int dictzip_open(BlockDriverState *bs, QDict *options, int flags, Error *

0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch

@@ -1,83 +0,0 @@
-From cf25e5be2ef07247d563a0aec6edc719a1f6a5aa Mon Sep 17 00:00:00 2001
-From: Richard Henderson <rth@twiddle.net>
-Date: Tue, 1 Sep 2015 15:58:02 -0400
-Subject: [PATCH] tcg/aarch64: Fix tcg_out_qemu_{ld, st} for guest_base == 0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In ffc6372851d8631a9f9fa56ec613b3244dc635b9, we swapped the guest
-base to the address base register from the address index register.
-Except that 31 in the base slot is SP not XZR, so we need to be
-more intelligent about which reg gets placed in which slot.
-
-Cc: qemu-stable@nongnu.org (v2.4.0)
-Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
-Reported-by: Andreas Färber <afaerber@suse.de>
-Signed-off-by: Richard Henderson <rth@twiddle.net>
-(cherry picked from commit 352bcb0a2b816ff9ab9d75d0f2384650d9e9ab19)
-[AF: Backported to GUEST_BASE and CONFIG_USE_GUEST_BASE]
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- tcg/aarch64/tcg-target.c | 27 ++++++++++++++++++++-------
- 1 file changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c
-index b7ec4f5..354c89d 100644
---- a/tcg/aarch64/tcg-target.c
-+++ b/tcg/aarch64/tcg-target.c
-@@ -56,6 +56,11 @@ static const int tcg_target_call_oarg_regs[1] = {
- #define TCG_REG_TMP TCG_REG_X30
- 
- #ifndef CONFIG_SOFTMMU
-+/* Note that XZR cannot be encoded in the address base register slot,
-+   as that actaully encodes SP.  So if we need to zero-extend the guest
-+   address, via the address index register slot, we need to load even
-+   a zero guest base into a register.  */
-+# define USE_GUEST_BASE      (GUEST_BASE != 0 || TARGET_LONG_BITS == 32)
- # ifdef CONFIG_USE_GUEST_BASE
- #  define TCG_REG_GUEST_BASE TCG_REG_X28
- # else
-@@ -1216,9 +1221,13 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
-     add_qemu_ldst_label(s, true, oi, ext, data_reg, addr_reg,
-                         s->code_ptr, label_ptr);
- #else /* !CONFIG_SOFTMMU */
--    tcg_out_qemu_ld_direct(s, memop, ext, data_reg,
--                           GUEST_BASE ? TCG_REG_GUEST_BASE : TCG_REG_XZR,
--                           otype, addr_reg);
-+    if (USE_GUEST_BASE) {
-+        tcg_out_qemu_ld_direct(s, memop, ext, data_reg,
-+                               TCG_REG_GUEST_BASE, otype, addr_reg);
-+    } else {
-+        tcg_out_qemu_ld_direct(s, memop, ext, data_reg,
-+                               addr_reg, TCG_TYPE_I64, TCG_REG_XZR);
-+    }
- #endif /* CONFIG_SOFTMMU */
- }
- 
-@@ -1238,9 +1247,13 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
-     add_qemu_ldst_label(s, false, oi, s_bits == MO_64, data_reg, addr_reg,
-                         s->code_ptr, label_ptr);
- #else /* !CONFIG_SOFTMMU */
--    tcg_out_qemu_st_direct(s, memop, data_reg,
--                           GUEST_BASE ? TCG_REG_GUEST_BASE : TCG_REG_XZR,
--                           otype, addr_reg);
-+    if (USE_GUEST_BASE) {
-+        tcg_out_qemu_st_direct(s, memop, data_reg,
-+                               TCG_REG_GUEST_BASE, otype, addr_reg);
-+    } else {
-+        tcg_out_qemu_st_direct(s, memop, data_reg,
-+                               addr_reg, TCG_TYPE_I64, TCG_REG_XZR);
-+    }
- #endif /* CONFIG_SOFTMMU */
- }
- 
-@@ -1795,7 +1808,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
-                   CPU_TEMP_BUF_NLONGS * sizeof(long));
- 
- #if defined(CONFIG_USE_GUEST_BASE)
--    if (GUEST_BASE) {
-+    if (USE_GUEST_BASE) {
-         tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_GUEST_BASE, GUEST_BASE);
-         tcg_regset_set_reg(s->reserved_regs, TCG_REG_GUEST_BASE);
-     }

0039-tests-Unique-test-path-for-string-v.patch

@@ -1,71 +0,0 @@
-From b3d605bbbebdfff36843fb785f4db3e633f96892 Mon Sep 17 00:00:00 2001
-From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
-Date: Mon, 5 Oct 2015 12:04:20 +0100
-Subject: [PATCH] tests: Unique test path for /string-visitor/output
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Newer GLib's want unique test paths, and thus moan at dupes.
-(Seen on Fedora 23 which has glib 2.46)
-
-Uniqueify the paths.
-
-Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- tests/test-string-output-visitor.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c
-index 101fb27..fd5e67b 100644
---- a/tests/test-string-output-visitor.c
-+++ b/tests/test-string-output-visitor.c
-@@ -248,39 +248,39 @@ int main(int argc, char **argv)
- 
-     output_visitor_test_add("/string-visitor/output/int",
-                             &out_visitor_data, test_visitor_out_int, false);
--    output_visitor_test_add("/string-visitor/output/int",
-+    output_visitor_test_add("/string-visitor/output/int-human",
-                             &out_visitor_data, test_visitor_out_int, true);
-     output_visitor_test_add("/string-visitor/output/bool",
-                             &out_visitor_data, test_visitor_out_bool, false);
--    output_visitor_test_add("/string-visitor/output/bool",
-+    output_visitor_test_add("/string-visitor/output/bool-human",
-                             &out_visitor_data, test_visitor_out_bool, true);
-     output_visitor_test_add("/string-visitor/output/number",
-                             &out_visitor_data, test_visitor_out_number, false);
--    output_visitor_test_add("/string-visitor/output/number",
-+    output_visitor_test_add("/string-visitor/output/number-human",
-                             &out_visitor_data, test_visitor_out_number, true);
-     output_visitor_test_add("/string-visitor/output/string",
-                             &out_visitor_data, test_visitor_out_string, false);
--    output_visitor_test_add("/string-visitor/output/string",
-+    output_visitor_test_add("/string-visitor/output/string-human",
-                             &out_visitor_data, test_visitor_out_string, true);
-     output_visitor_test_add("/string-visitor/output/no-string",
-                             &out_visitor_data, test_visitor_out_no_string,
-                             false);
--    output_visitor_test_add("/string-visitor/output/no-string",
-+    output_visitor_test_add("/string-visitor/output/no-string-human",
-                             &out_visitor_data, test_visitor_out_no_string,
-                             true);
-     output_visitor_test_add("/string-visitor/output/enum",
-                             &out_visitor_data, test_visitor_out_enum, false);
--    output_visitor_test_add("/string-visitor/output/enum",
-+    output_visitor_test_add("/string-visitor/output/enum-human",
-                             &out_visitor_data, test_visitor_out_enum, true);
-     output_visitor_test_add("/string-visitor/output/enum-errors",
-                             &out_visitor_data, test_visitor_out_enum_errors,
-                             false);
--    output_visitor_test_add("/string-visitor/output/enum-errors",
-+    output_visitor_test_add("/string-visitor/output/enum-errors-human",
-                             &out_visitor_data, test_visitor_out_enum_errors,
-                             true);
-     output_visitor_test_add("/string-visitor/output/intList",
-                             &out_visitor_data, test_visitor_out_intList, false);
--    output_visitor_test_add("/string-visitor/output/intList",
-+    output_visitor_test_add("/string-visitor/output/intList-human",
-                             &out_visitor_data, test_visitor_out_intList, true);
- 
-     g_test_run();

SLOF_ppc64le.patch

@@ -1,48 +0,0 @@
-From 14f14004dd8f7a9be63510284c10445c7a8be5d7 Mon Sep 17 00:00:00 2001
-From: Dinar Valeev <dvaleev@suse.com>
-Date: Fri, 9 Oct 2015 13:01:12 +0200
-Subject: [PATCH] Allow to build SLOF on Little Endian host
-
-Don't require cross compiler in order to build SLOF on ppc64le platform.
-Native compiler is capable to build ELFv1 BE binary. We just need to
-instruct it how to do it. By adding -mbig and -mabi=elfv1 flags
-
-Signed-off-by: Dinar Valeev <dvaleev@suse.com>
-Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
----
- make.rules | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/make.rules b/make.rules
-index aebc4e3..cbc6353 100644
---- a/make.rules
-+++ b/make.rules
-@@ -19,8 +19,12 @@
- ARCH := $(shell uname -p)
- 
- # Auto-detect ppc64
--ifeq ($(ARCH), ppc64)
--CROSS          = ""
-+ifeq (ppc64,$(findstring ppc64,$(ARCH)))
-+  ifeq ($(ARCH), ppc64le)
-+    EXTRA_CC	= -mbig -mabi=elfv1
-+    EXTRA_LD	= -mbig
-+  endif
-+CROSS		?=
- else
- CROSS		?= powerpc64-linux-
- endif
-@@ -31,8 +35,8 @@ HOSTCC		?= gcc
- HOSTCFLAGS	= -g -Wall -W -O2 -I. -I../include
- DD		= dd
- 
--ONLY_CC 	= $(CROSS)gcc -m$(CELLSIZE)
--ONLY_AS 	= $(CROSS)as -m$(CELLSIZE)
-+ONLY_CC 	= $(CROSS)gcc -m$(CELLSIZE) $(EXTRA_CC)
-+ONLY_AS 	= $(CROSS)as -m$(CELLSIZE) $(EXTRA_LD)
- ONLY_LD 	= $(CROSS)ld -melf$(CELLSIZE)ppc
- 
- # Verbose level:
--- 
-2.1.4
-

gcc5-ipxe-add-missing-const-qualifiers.patch

@@ -1,34 +0,0 @@
-From bf40b79734a070cea4dd4c74b50d3bf73fdc6061 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Thu, 23 Apr 2015 13:33:25 +0200
-Subject: [PATCH] [build] Add missing "const" qualifiers
-
-This fixes "initialization discards 'const' qualifier from pointer
-target type" warnings with GCC 5.1.0.
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
-Modified-by: Michael Brown <mcb30@ipxe.org>
-Signed-off-by: Michael Brown <mcb30@ipxe.org>
----
- src/net/tls.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/net/tls.c b/src/net/tls.c
-index 30ccc93..8f4bec7 100644
---- a/src/net/tls.c
-+++ b/src/net/tls.c
-@@ -1637,9 +1637,9 @@ static int tls_new_handshake ( struct tls_session *tls,
- 			uint8_t length[3];
- 			uint8_t payload[0];
- 		} __attribute__ (( packed )) *handshake = data;
--		void *payload = &handshake->payload;
-+		const void *payload = &handshake->payload;
- 		size_t payload_len = tls_uint24 ( handshake->length );
--		void *next = ( payload + payload_len );
-+		const void *next = ( payload + payload_len );
- 
- 		/* Sanity check */
- 		if ( next > end ) {
--- 
-1.7.0.4
-

gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch

@@ -1,226 +0,0 @@
-From: Christian Hesse <mail@eworm.de>
-Date: Thu, 23 Apr 2015 13:33:26 +0200
-Subject: [ath9k] Remove confusing logic inversion in an ANI variable
-Patch-mainline: no
-
-This changed in Linux kernel the same way in commit 7067e701
-("ath9k_hw: remove confusing logic inversion in an ANI variable") by
-Felix Fietkau.
-
-Additionally this fixes "error: logical not is only applied to the
-left hand side of comparison" with GCC 5.1.0.
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
-Signed-off-by: Michael Brown <mcb30@ipxe.org>
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- src/drivers/net/ath/ath9k/ani.h              |  2 +-
- src/drivers/net/ath/ath9k/ath9k_ani.c        | 16 ++++++++--------
- src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c | 18 +++++++++---------
- src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c | 12 ++++++------
- 4 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/src/drivers/net/ath/ath9k/ani.h b/src/drivers/net/ath/ath9k/ani.h
-index dbd4d4d5bc12..ba87ba0fd258 100644
---- a/src/drivers/net/ath/ath9k/ani.h
-+++ b/src/drivers/net/ath/ath9k/ani.h
-@@ -125,7 +125,7 @@ struct ar5416AniState {
- 	u8 mrcCCKOff;
- 	u8 spurImmunityLevel;
- 	u8 firstepLevel;
--	u8 ofdmWeakSigDetectOff;
-+	u8 ofdmWeakSigDetect;
- 	u8 cckWeakSigThreshold;
- 	u32 listenTime;
- 	int32_t rssiThrLow;
-diff --git a/src/drivers/net/ath/ath9k/ath9k_ani.c b/src/drivers/net/ath/ath9k/ath9k_ani.c
-index ff7df497fc92..76ca79cba3e8 100644
---- a/src/drivers/net/ath/ath9k/ath9k_ani.c
-+++ b/src/drivers/net/ath/ath9k/ath9k_ani.c
-@@ -177,7 +177,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah)
- 
- 	rssi = BEACON_RSSI(ah);
- 	if (rssi > aniState->rssiThrHigh) {
--		if (!aniState->ofdmWeakSigDetectOff) {
-+		if (aniState->ofdmWeakSigDetect) {
- 			if (ath9k_hw_ani_control(ah,
- 					 ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
- 					 0)) {
-@@ -192,7 +192,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah)
- 			return;
- 		}
- 	} else if (rssi > aniState->rssiThrLow) {
--		if (aniState->ofdmWeakSigDetectOff)
-+		if (!aniState->ofdmWeakSigDetect)
- 			ath9k_hw_ani_control(ah,
- 				     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
- 				     1);
-@@ -202,7 +202,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah)
- 		return;
- 	} else {
- 		if ((ah->dev->channels + ah->dev->channel)->band == NET80211_BAND_2GHZ) {
--			if (!aniState->ofdmWeakSigDetectOff)
-+			if (aniState->ofdmWeakSigDetect)
- 				ath9k_hw_ani_control(ah,
- 				     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
- 				     0);
-@@ -360,7 +360,7 @@ static void ath9k_hw_ani_lower_immunity_old(struct ath_hw *ah)
- 	if (rssi > aniState->rssiThrHigh) {
- 		/* XXX: Handle me */
- 	} else if (rssi > aniState->rssiThrLow) {
--		if (aniState->ofdmWeakSigDetectOff) {
-+		if (!aniState->ofdmWeakSigDetect) {
- 			if (ath9k_hw_ani_control(ah,
- 				 ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
- 				 1) == 1)
-@@ -436,9 +436,9 @@ static void ath9k_ani_reset_old(struct ath_hw *ah)
- 	if (aniState->spurImmunityLevel != 0)
- 		ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
- 				     aniState->spurImmunityLevel);
--	if (aniState->ofdmWeakSigDetectOff)
-+	if (!aniState->ofdmWeakSigDetect)
- 		ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
--				     !aniState->ofdmWeakSigDetectOff);
-+				     aniState->ofdmWeakSigDetect);
- 	if (aniState->cckWeakSigThreshold)
- 		ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,
- 				     aniState->cckWeakSigThreshold);
-@@ -709,8 +709,8 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
- 
- 		ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
- 		ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
--		ani->ofdmWeakSigDetectOff =
--			!ATH9K_ANI_USE_OFDM_WEAK_SIG;
-+		ani->ofdmWeakSigDetect =
-+			ATH9K_ANI_USE_OFDM_WEAK_SIG;
- 		ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
- 	}
- 
-diff --git a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c
-index 60e87e9e2625..2b6c133cb783 100644
---- a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c
-+++ b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c
-@@ -1141,12 +1141,12 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah,
- 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
- 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
- 
--		if (!on != aniState->ofdmWeakSigDetectOff) {
-+		if (on != aniState->ofdmWeakSigDetect) {
- 			if (on)
- 				ah->stats.ast_ani_ofdmon++;
- 			else
- 				ah->stats.ast_ani_ofdmoff++;
--			aniState->ofdmWeakSigDetectOff = !on;
-+			aniState->ofdmWeakSigDetect = on;
- 		}
- 		break;
- 	}
-@@ -1215,10 +1215,10 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah,
- 
- 	DBG2("ath9k: ANI parameters:\n");
- 	DBG2(
--		"noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetectOff=%d\n",
-+		"noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetect=%d\n",
- 		aniState->noiseImmunityLevel,
- 		aniState->spurImmunityLevel,
--		!aniState->ofdmWeakSigDetectOff);
-+		aniState->ofdmWeakSigDetect);
- 	DBG2(
- 		"cckWeakSigThreshold=%d, firstepLevel=%d, listenTime=%d\n",
- 		aniState->cckWeakSigThreshold,
-@@ -1307,18 +1307,18 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah,
- 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
- 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
- 
--		if (!on != aniState->ofdmWeakSigDetectOff) {
-+		if (on != aniState->ofdmWeakSigDetect) {
- 			DBG2("ath9k: "
- 				"** ch %d: ofdm weak signal: %s=>%s\n",
- 				chan->channel,
--				!aniState->ofdmWeakSigDetectOff ?
-+				aniState->ofdmWeakSigDetect ?
- 				"on" : "off",
- 				on ? "on" : "off");
- 			if (on)
- 				ah->stats.ast_ani_ofdmon++;
- 			else
- 				ah->stats.ast_ani_ofdmoff++;
--			aniState->ofdmWeakSigDetectOff = !on;
-+			aniState->ofdmWeakSigDetect = on;
- 		}
- 		break;
- 	}
-@@ -1467,7 +1467,7 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah,
- 	DBG2("ath9k: "
- 		"ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n",
- 		aniState->spurImmunityLevel,
--		!aniState->ofdmWeakSigDetectOff ? "on" : "off",
-+		aniState->ofdmWeakSigDetect ? "on" : "off",
- 		aniState->firstepLevel,
- 		!aniState->mrcCCKOff ? "on" : "off",
- 		aniState->listenTime,
-@@ -1554,7 +1554,7 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah)
- 	/* these levels just got reset to defaults by the INI */
- 	aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
- 	aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
--	aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
-+	aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
- 	aniState->mrcCCKOff = 1; /* not available on pre AR9003 */
- }
- 
-diff --git a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c
-index 6103040abfb2..2244b775a6be 100644
---- a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c
-+++ b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c
-@@ -859,18 +859,18 @@ static int ar9003_hw_ani_control(struct ath_hw *ah,
- 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
- 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
- 
--		if (!on != aniState->ofdmWeakSigDetectOff) {
-+		if (on != aniState->ofdmWeakSigDetect) {
- 			DBG2("ath9k: "
- 				"** ch %d: ofdm weak signal: %s=>%s\n",
- 				chan->channel,
--				!aniState->ofdmWeakSigDetectOff ?
-+				aniState->ofdmWeakSigDetect ?
- 				"on" : "off",
- 				on ? "on" : "off");
- 			if (on)
- 				ah->stats.ast_ani_ofdmon++;
- 			else
- 				ah->stats.ast_ani_ofdmoff++;
--			aniState->ofdmWeakSigDetectOff = !on;
-+			aniState->ofdmWeakSigDetect = on;
- 		}
- 		break;
- 	}
-@@ -1013,7 +1013,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah,
- 			      AR_PHY_MRC_CCK_ENABLE, is_on);
- 		REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
- 			      AR_PHY_MRC_CCK_MUX_REG, is_on);
--		if (!is_on != aniState->mrcCCKOff) {
-+		if (!(is_on != aniState->mrcCCKOff)) {
- 			DBG2("ath9k: "
- 				"** ch %d: MRC CCK: %s=>%s\n",
- 				chan->channel,
-@@ -1037,7 +1037,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah,
- 	DBG2("ath9k: "
- 		"ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n",
- 		aniState->spurImmunityLevel,
--		!aniState->ofdmWeakSigDetectOff ? "on" : "off",
-+		aniState->ofdmWeakSigDetect ? "on" : "off",
- 		aniState->firstepLevel,
- 		!aniState->mrcCCKOff ? "on" : "off",
- 		aniState->listenTime,
-@@ -1137,7 +1137,7 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah)
- 	/* these levels just got reset to defaults by the INI */
- 	aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
- 	aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
--	aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
-+	aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
- 	aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK;
- }
- 
--- 
-2.4.1
-

libcacard.spec

@@ -1,197 +0,0 @@
-#
-# spec file for package libcacard
-#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-Name:           libcacard
-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:        2.4.0
-Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2
-# This patch queue is auto-generated from https://github.com/openSUSE/qemu
-Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
-Patch0002:      0002-XXX-work-around-SA_RESTART-race-wit.patch
-Patch0003:      0003-qemu-0.9.0.cvs-binfmt.patch
-Patch0004:      0004-qemu-cvs-alsa_bitfield.patch
-Patch0005:      0005-qemu-cvs-alsa_ioctl.patch
-Patch0006:      0006-qemu-cvs-alsa_mmap.patch
-Patch0007:      0007-qemu-cvs-gettimeofday.patch
-Patch0008:      0008-qemu-cvs-ioctl_debug.patch
-Patch0009:      0009-qemu-cvs-ioctl_nodirection.patch
-Patch0010:      0010-block-vmdk-Support-creation-of-SCSI.patch
-Patch0011:      0011-linux-user-add-binfmt-wrapper-for-a.patch
-Patch0012:      0012-PPC-KVM-Disable-mmu-notifier-check.patch
-Patch0013:      0013-linux-user-fix-segfault-deadlock.patch
-Patch0014:      0014-linux-user-binfmt-support-host-bina.patch
-Patch0015:      0015-linux-user-Ignore-broken-loop-ioctl.patch
-Patch0016:      0016-linux-user-lock-tcg.patch
-Patch0017:      0017-linux-user-Run-multi-threaded-code-.patch
-Patch0018:      0018-linux-user-lock-tb-flushing-too.patch
-Patch0019:      0019-linux-user-Fake-proc-cpuinfo.patch
-Patch0020:      0020-linux-user-implement-FS_IOC_GETFLAG.patch
-Patch0021:      0021-linux-user-implement-FS_IOC_SETFLAG.patch
-Patch0022:      0022-linux-user-XXX-disable-fiemap.patch
-Patch0023:      0023-slirp-nooutgoing.patch
-Patch0024:      0024-vnc-password-file-and-incoming-conn.patch
-Patch0025:      0025-linux-user-add-more-blk-ioctls.patch
-Patch0026:      0026-linux-user-use-target_ulong.patch
-Patch0027:      0027-block-Add-support-for-DictZip-enabl.patch
-Patch0028:      0028-block-Add-tar-container-format.patch
-Patch0029:      0029-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
-Patch0030:      0030-console-add-question-mark-escape-op.patch
-Patch0031:      0031-Make-char-muxer-more-robust-wrt-sma.patch
-Patch0032:      0032-linux-user-lseek-explicitly-cast-no.patch
-Patch0033:      0033-virtfs-proxy-helper-Provide-__u64-f.patch
-Patch0034:      0034-configure-Enable-PIE-for-ppc-and-pp.patch
-Patch0035:      0035-qtest-Increase-socket-timeout.patch
-Patch0036:      0036-AIO-Reduce-number-of-threads-for-32.patch
-Patch0037:      0037-Revert-Revert-seccomp-tests-that-al.patch
-Patch0038:      0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
-Patch0039:      0039-tests-Unique-test-path-for-string-v.patch
-Patch0040:      0040-dictzip-Fix-on-big-endian-systems.patch
-# Please do not add patches manually here, run update_git.sh.
-# this is to make lint happy
-Source300:      qemu-rpmlintrc
-Source400:      update_git.sh
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  e2fsprogs-devel
-BuildRequires:  fdupes
-BuildRequires:  gcc-c++
-BuildRequires:  glib2-devel
-BuildRequires:  libattr-devel
-BuildRequires:  libtool
-BuildRequires:  mozilla-nss-devel
-BuildRequires:  ncurses-devel
-BuildRequires:  python
-BuildRequires:  zlib-devel
-
-%description
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains statically linked binaries for running linux-user
-emulations. This can be used together with the OBS build script to
-run cross-architecture builds.
-
-%package -n libcacard0
-Summary:        Common Access Card (CAC) emulation
-Group:          System/Emulators/PC
-
-%description -n libcacard0
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-%package -n libcacard-devel
-Summary:        Common Access Card (CAC) emulation -- Development files
-Group:          Development/Languages/C and C++
-Requires:       glib2-devel
-Requires:       libcacard0 = %version
-Requires:       mozilla-nspr
-Requires:       mozilla-nss
-
-%description -n libcacard-devel
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-This sub-package contains development files for the Smartcard library.
-
-%prep
-%setup -q -n qemu-2.4.0
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
-%patch0012 -p1
-%patch0013 -p1
-%patch0014 -p1
-%patch0015 -p1
-%patch0016 -p1
-%patch0017 -p1
-%patch0018 -p1
-%patch0019 -p1
-%patch0020 -p1
-%patch0021 -p1
-%patch0022 -p1
-%patch0023 -p1
-%patch0024 -p1
-%patch0025 -p1
-%patch0026 -p1
-%patch0027 -p1
-%patch0028 -p1
-%patch0029 -p1
-%patch0030 -p1
-%patch0031 -p1
-%patch0032 -p1
-%patch0033 -p1
-%patch0034 -p1
-%patch0035 -p1
-%patch0036 -p1
-%patch0037 -p1
-%patch0038 -p1
-%patch0039 -p1
-%patch0040 -p1
-
-%build
-./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
-	--libdir=%_libdir \
-	--libexecdir=%_libexecdir \
-	--disable-strip \
-	--enable-smartcard-nss \
-	--extra-cflags="$QEMU_OPT_FLAGS"
-make %{?_smp_mflags} V=1 libcacard.la
-
-%install
-make install-libcacard DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
-
-%post   -n libcacard0 -p /sbin/ldconfig
-
-%postun -n libcacard0 -p /sbin/ldconfig
-
-%files -n libcacard0
-%defattr(-, root, root)
-%_libdir/libcacard.so.0*
-
-%files -n libcacard-devel
-%defattr(-, root, root)
-%dir %_includedir/cacard
-%_includedir/cacard/*.h
-%_libdir/libcacard.so
-%_libdir/pkgconfig/libcacard.pc
-
-%changelog

libcacard.spec.in

@@ -1,119 +0,0 @@
-#
-# spec file for package libcacard
-#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-Name:           libcacard
-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
-QEMU_VERSION
-Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.4.0.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.
-# this is to make lint happy
-Source300:      qemu-rpmlintrc
-Source400:      update_git.sh
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  e2fsprogs-devel
-BuildRequires:  fdupes
-BuildRequires:  gcc-c++
-BuildRequires:  glib2-devel
-BuildRequires:  libattr-devel
-BuildRequires:  libtool
-BuildRequires:  mozilla-nss-devel
-BuildRequires:  ncurses-devel
-BuildRequires:  python
-BuildRequires:  zlib-devel
-
-%description
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains statically linked binaries for running linux-user
-emulations. This can be used together with the OBS build script to
-run cross-architecture builds.
-
-%package -n libcacard0
-Summary:        Common Access Card (CAC) emulation
-Group:          System/Emulators/PC
-
-%description -n libcacard0
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-%package -n libcacard-devel
-Summary:        Common Access Card (CAC) emulation -- Development files
-Group:          Development/Languages/C and C++
-Requires:       glib2-devel
-Requires:       libcacard0 = %version
-Requires:       mozilla-nspr
-Requires:       mozilla-nss
-
-%description -n libcacard-devel
-This emulator is designed to provide emulation of actual smart cards to a
-virtual card reader running in a guest virtual machine. The emulated smart
-cards can be representations of real smart cards, where the necessary functions
-such as signing, card removal/insertion, etc. are mapped to real, physical
-cards which are shared with the client machine the emulator is running on, or
-the cards could be pure software constructs.
-
-This sub-package contains development files for the Smartcard library.
-
-%prep
-%setup -q -n qemu-2.4.0
-PATCH_EXEC
-
-%build
-./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
-	--libdir=%_libdir \
-	--libexecdir=%_libexecdir \
-	--disable-strip \
-	--enable-smartcard-nss \
-	--extra-cflags="$QEMU_OPT_FLAGS"
-make %{?_smp_mflags} V=1 libcacard.la
-
-%install
-make install-libcacard DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
-rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
-
-%post   -n libcacard0 -p /sbin/ldconfig
-
-%postun -n libcacard0 -p /sbin/ldconfig
-
-%files -n libcacard0
-%defattr(-, root, root)
-%_libdir/libcacard.so.0*
-
-%files -n libcacard-devel
-%defattr(-, root, root)
-%dir %_includedir/cacard
-%_includedir/cacard/*.h
-%_libdir/libcacard.so
-%_libdir/pkgconfig/libcacard.pc
-
-%changelog

qemu-2.4.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620
-size 25070979

qemu-2.5.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4
+size 25464996

qemu-linux-user.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Fri Jan  8 14:54:26 UTC 2016 - afaerber@suse.de
+
+- Update to v2.5.0: See http://wiki.qemu-project.org/ChangeLog/2.5
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.5
+* Patches dropped:
+  0039-tests-Fix-check-report-qtest-target.patch
+
+-------------------------------------------------------------------
+Sun Nov 22 18:05:25 UTC 2015 - afaerber@suse.de
+
+- Update to v2.5.0-rc1: See http://wiki.qemu-project.org/ChangeLog/2.5
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.5
+* Patch renamed:
+  0037-Revert-Revert-seccomp-tests-that-al.patch -> 0037-configure-Enable-libseccomp-for-ppc.patch
+
+-------------------------------------------------------------------
+Thu Nov 19 17:23:34 UTC 2015 - afaerber@suse.de
+
+- Update to v2.5.0-rc0: See http://wiki.qemu-project.org/ChangeLog/2.5
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.5
+* Patches dropped (upstream):
+  0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+  0039-tests-Unique-test-path-for-string-v.patch
+* Patch renamed:
+  0040-dictzip-Fix-on-big-endian-systems.patch -> 0038-dictzip-Fix-on-big-endian-systems.patch
+* Package qemu-tilegx
+* Patches added:
+  0039-tests-Fix-check-report-qtest-target.patch
+
 -------------------------------------------------------------------
 Thu Oct  8 16:29:32 UTC 2015 - afaerber@suse.de
 

qemu-linux-user.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu-linux-user
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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:        2.4.0
+Version:        2.5.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.5.0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
 Patch0002:      0002-XXX-work-around-SA_RESTART-race-wit.patch
@@ -61,10 +61,8 @@ Patch0033:      0033-virtfs-proxy-helper-Provide-__u64-f.patch
 Patch0034:      0034-configure-Enable-PIE-for-ppc-and-pp.patch
 Patch0035:      0035-qtest-Increase-socket-timeout.patch
 Patch0036:      0036-AIO-Reduce-number-of-threads-for-32.patch
-Patch0037:      0037-Revert-Revert-seccomp-tests-that-al.patch
+Patch0037:      0037-configure-Enable-libseccomp-for-ppc.patch
-Patch0038:      0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+Patch0038:      0038-dictzip-Fix-on-big-endian-systems.patch
-Patch0039:      0039-tests-Unique-test-path-for-string-v.patch
-Patch0040:      0040-dictzip-Fix-on-big-endian-systems.patch
 # Please do not add patches manually here, run update_git.sh.
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
@@ -117,7 +115,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.
 
 %prep
-%setup -q -n qemu-2.4.0
+%setup -q -n qemu-2.5.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -156,8 +154,6 @@ run cross-architecture builds.
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
-%patch0039 -p1
-%patch0040 -p1
 
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
@@ -261,6 +257,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %_bindir/qemu-sparc32plus
 %_bindir/qemu-sparc64
 %_bindir/qemu-sparc
+%_bindir/qemu-tilegx
 %_bindir/qemu-unicore32
 %_bindir/qemu-x86_64
 %_bindir/qemu-*-binfmt

qemu-linux-user.spec.in

@@ -23,7 +23,7 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.5.0.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.
@@ -78,7 +78,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.
 
 %prep
-%setup -q -n qemu-2.4.0
+%setup -q -n qemu-2.5.0
 PATCH_EXEC
 
 %build
@@ -183,6 +183,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %_bindir/qemu-sparc32plus
 %_bindir/qemu-sparc64
 %_bindir/qemu-sparc
+%_bindir/qemu-tilegx
 %_bindir/qemu-unicore32
 %_bindir/qemu-x86_64
 %_bindir/qemu-*-binfmt

qemu-testsuite.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan  8 14:54:22 UTC 2016 - afaerber@suse.de
+
+- Update to v2.5.0: See http://wiki.qemu-project.org/ChangeLog/2.5
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.5
+* Patches dropped (upstreamed):
+  0039-tests-Fix-check-report-qtest-target.patch
+
 -------------------------------------------------------------------
 Tue Dec 29 17:14:12 UTC 2015 - stefan.bruens@rwth-aachen.de
 
@@ -8,11 +16,43 @@ Tue Dec  1 17:17:23 UTC 2015 - agraf@suse.com
 
 - Fix testsuite on 32bit systems (bsc#957379)
 
+-------------------------------------------------------------------
+Sun Nov 22 21:48:21 UTC 2015 - afaerber@suse.de
+
+- Update to v2.5.0-rc1: See http://wiki.qemu-project.org/ChangeLog/2.5
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.5
+* Rebase libseccomp enablement:
+  0037-Revert-Revert-seccomp-tests-that-al.patch -> 0037-configure-Enable-libseccomp-for-ppc.patch
+* Provide qemu-ga and qemu-ipxe for qemu-testsuite
+- Clean up qemu-ksm recommendation
+
 -------------------------------------------------------------------
 Sun Nov 22 20:36:53 UTC 2015 - afaerber@suse.de
 
 - Fix SLE11 build by fixing systemd conditionalization (from olh)
 
+-------------------------------------------------------------------
+Thu Nov 19 17:23:29 UTC 2015 - afaerber@suse.de
+
+- Update to v2.5.0-rc0: See http://wiki.qemu-project.org/ChangeLog/2.5
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.5
+* Patches dropped (upstream):
+  0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+  0039-tests-Unique-test-path-for-string-v.patch
+  gcc5-ipxe-add-missing-const-qualifiers.patch
+  gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
+  SLOF_ppc64le.patch
+* Patch renamed:
+  0040-dictzip-Fix-on-big-endian-systems.patch -> 0038-dictzip-Fix-on-big-endian-systems.patch
+* --enable-smartcard-nss -> --enable-smartcard
+  Needs an external libcacard, so drop it for now.
+* Drop --enable-vnc-tls
+* Require xz-devel for ipxe build
+* Package qemu-ga(8) man page
+* Package ivshmem-{client,server}
+* Patches added:
+  0039-tests-Fix-check-report-qtest-target.patch
+
 -------------------------------------------------------------------
 Thu Nov 19 11:23:26 UTC 2015 - tampakrap@opensuse.org
 

qemu-testsuite.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu-testsuite
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -51,10 +51,10 @@ 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:        2.4.0
+Version:        2.5.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.5.0.tar.bz2
-Source99:       http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2.sig
+Source99:       http://wiki.qemu.org/download/qemu-2.5.0.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -102,10 +102,8 @@ Patch0033:      0033-virtfs-proxy-helper-Provide-__u64-f.patch
 Patch0034:      0034-configure-Enable-PIE-for-ppc-and-pp.patch
 Patch0035:      0035-qtest-Increase-socket-timeout.patch
 Patch0036:      0036-AIO-Reduce-number-of-threads-for-32.patch
-Patch0037:      0037-Revert-Revert-seccomp-tests-that-al.patch
+Patch0037:      0037-configure-Enable-libseccomp-for-ppc.patch
-Patch0038:      0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+Patch0038:      0038-dictzip-Fix-on-big-endian-systems.patch
-Patch0039:      0039-tests-Unique-test-path-for-string-v.patch
-Patch0040:      0040-dictzip-Fix-on-big-endian-systems.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -117,9 +115,6 @@ Patch1000:      seabios_128kb.patch
 Patch1001:      seabios_checkrom_typo.patch
 Patch1002:      seabios_avoid_smbios_signature_string.patch
 %endif
-Patch1100:      gcc5-ipxe-add-missing-const-qualifiers.patch
-Patch1101:      gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
-Patch2000:      SLOF_ppc64le.patch
 
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
@@ -231,6 +226,9 @@ BuildRequires:  vte2-devel
 %ifarch x86_64
 BuildRequires:  xen-devel
 %endif
+%if %{build_x86_fw_from_source}
+BuildRequires:  xz-devel
+%endif
 BuildRequires:  zlib-devel
 %if 0%{?suse_version} >= 1140
 %ifarch %ix86 x86_64
@@ -242,6 +240,7 @@ BuildRequires:  spice-protocol-devel
 BuildRequires:  bc
 BuildRequires:  qemu-arm   = %version
 BuildRequires:  qemu-extra = %version
+BuildRequires:  qemu-guest-agent = %version
 BuildRequires:  qemu-ppc   = %version
 BuildRequires:  qemu-s390  = %version
 BuildRequires:  qemu-tools = %version
@@ -271,7 +270,7 @@ Suggests:       qemu-arm
 Suggests:       qemu-block-dmg
 Suggests:       qemu-extra
 Suggests:       qemu-lang
-%if 0%{?suse_version} >= 1210
+%if 0%{?with_systemd}
 Recommends:     qemu-ksm = %{version}
 %endif
 
@@ -587,7 +586,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.4.0
+%setup -q -n qemu-2.5.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -626,8 +625,6 @@ This package provides a service file for starting and stopping KSM.
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
-%patch0039 -p1
-%patch0040 -p1
 
 %if %{build_x86_fw_from_source}
 pushd roms/seabios
@@ -643,15 +640,7 @@ do
 done
 %endif
 
-pushd roms/ipxe
-%patch1100 -p1
-%patch1101 -p1
-popd
-
 %if %{build_slof_from_source}
-pushd roms/SLOF
-%patch2000 -p1
-popd
 rm -f pc-bios/slof.bin
 %endif
 
@@ -742,7 +731,6 @@ rm -f pc-bios/slof.bin
 %else
 	--disable-seccomp \
 %endif
-	--enable-smartcard-nss \
 %if 0%{?suse_version} >= 1310
 	--enable-snappy \
 %else
@@ -773,7 +761,6 @@ rm -f pc-bios/slof.bin
 	--enable-vnc-jpeg \
 	--enable-vnc-png \
 	--enable-vnc-sasl \
-	--enable-vnc-tls \
 %ifarch x86_64
 	--enable-xen \
 	--enable-xen-pci-passthrough \
@@ -802,6 +789,14 @@ cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
 %else # qemu-testsuite
 
 ln -s %{_bindir}/qemu-img qemu-img
+ln -s %{_bindir}/qemu-ga qemu-ga
+
+%if %{build_x86_fw_from_source}
+for i in %built_firmware_files
+do
+  ln -s %{_datadir}/qemu/$i pc-bios/$i
+done
+%endif
 
 for conf in default-configs/*-softmmu.mak; do
   arch=`echo "$conf" | sed -e 's|default-configs/\(.*\)-softmmu.mak|\1|g'`
@@ -859,9 +854,6 @@ format=`qemu-img info test.tar | grep "file format:" | cut -d ':' -f 2 | tr -d '
 
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT/%_datadir/doc
-rm $RPM_BUILD_ROOT/%_libdir/libcacard*
-rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
-rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
 %if ! %{build_x86_fw_from_source}
 for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*.rom sgabios.bin \
          vgabios-cirrus.bin vgabios-qxl.bin vgabios-stdvga.bin vgabios-virtio.bin vgabios-vmware.bin \
@@ -1130,11 +1122,13 @@ fi
 %doc %_mandir/man1/qemu-img.1.gz
 %doc %_mandir/man1/virtfs-proxy-helper.1.gz
 %doc %_mandir/man8/qemu-nbd.8.gz
+%_bindir/ivshmem-client
+%_bindir/ivshmem-server
 %_bindir/qemu-io
 %_bindir/qemu-img
 %_bindir/qemu-nbd
 %_bindir/virtfs-proxy-helper
-%_bindir/vscclient
+#%_bindir/vscclient
 %verify(not mode) %_libexecdir/qemu-bridge-helper
 %dir %_sysconfdir/%name
 %config %_sysconfdir/%name/bridge.conf
@@ -1142,6 +1136,7 @@ fi
 
 %files guest-agent
 %defattr(-, root, root)
+%doc %_mandir/man8/qemu-ga.8.gz
 %attr(755,root,kvm) %_bindir/qemu-ga
 %if 0%{?with_systemd}
 %{_unitdir}/qemu-ga.service

qemu.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan  8 14:54:22 UTC 2016 - afaerber@suse.de
+
+- Update to v2.5.0: See http://wiki.qemu-project.org/ChangeLog/2.5
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.5
+* Patches dropped (upstreamed):
+  0039-tests-Fix-check-report-qtest-target.patch
+
 -------------------------------------------------------------------
 Tue Dec 29 17:14:12 UTC 2015 - stefan.bruens@rwth-aachen.de
 
@@ -8,11 +16,43 @@ Tue Dec  1 17:17:23 UTC 2015 - agraf@suse.com
 
 - Fix testsuite on 32bit systems (bsc#957379)
 
+-------------------------------------------------------------------
+Sun Nov 22 21:48:21 UTC 2015 - afaerber@suse.de
+
+- Update to v2.5.0-rc1: See http://wiki.qemu-project.org/ChangeLog/2.5
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.5
+* Rebase libseccomp enablement:
+  0037-Revert-Revert-seccomp-tests-that-al.patch -> 0037-configure-Enable-libseccomp-for-ppc.patch
+* Provide qemu-ga and qemu-ipxe for qemu-testsuite
+- Clean up qemu-ksm recommendation
+
 -------------------------------------------------------------------
 Sun Nov 22 20:36:53 UTC 2015 - afaerber@suse.de
 
 - Fix SLE11 build by fixing systemd conditionalization (from olh)
 
+-------------------------------------------------------------------
+Thu Nov 19 17:23:29 UTC 2015 - afaerber@suse.de
+
+- Update to v2.5.0-rc0: See http://wiki.qemu-project.org/ChangeLog/2.5
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.5
+* Patches dropped (upstream):
+  0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+  0039-tests-Unique-test-path-for-string-v.patch
+  gcc5-ipxe-add-missing-const-qualifiers.patch
+  gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
+  SLOF_ppc64le.patch
+* Patch renamed:
+  0040-dictzip-Fix-on-big-endian-systems.patch -> 0038-dictzip-Fix-on-big-endian-systems.patch
+* --enable-smartcard-nss -> --enable-smartcard
+  Needs an external libcacard, so drop it for now.
+* Drop --enable-vnc-tls
+* Require xz-devel for ipxe build
+* Package qemu-ga(8) man page
+* Package ivshmem-{client,server}
+* Patches added:
+  0039-tests-Fix-check-report-qtest-target.patch
+
 -------------------------------------------------------------------
 Thu Nov 19 11:23:26 UTC 2015 - tampakrap@opensuse.org
 

qemu.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -51,10 +51,10 @@ 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:        2.4.0
+Version:        2.5.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.5.0.tar.bz2
-Source99:       http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2.sig
+Source99:       http://wiki.qemu.org/download/qemu-2.5.0.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -102,10 +102,8 @@ Patch0033:      0033-virtfs-proxy-helper-Provide-__u64-f.patch
 Patch0034:      0034-configure-Enable-PIE-for-ppc-and-pp.patch
 Patch0035:      0035-qtest-Increase-socket-timeout.patch
 Patch0036:      0036-AIO-Reduce-number-of-threads-for-32.patch
-Patch0037:      0037-Revert-Revert-seccomp-tests-that-al.patch
+Patch0037:      0037-configure-Enable-libseccomp-for-ppc.patch
-Patch0038:      0038-tcg-aarch64-Fix-tcg_out_qemu_-ld-st.patch
+Patch0038:      0038-dictzip-Fix-on-big-endian-systems.patch
-Patch0039:      0039-tests-Unique-test-path-for-string-v.patch
-Patch0040:      0040-dictzip-Fix-on-big-endian-systems.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -117,9 +115,6 @@ Patch1000:      seabios_128kb.patch
 Patch1001:      seabios_checkrom_typo.patch
 Patch1002:      seabios_avoid_smbios_signature_string.patch
 %endif
-Patch1100:      gcc5-ipxe-add-missing-const-qualifiers.patch
-Patch1101:      gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
-Patch2000:      SLOF_ppc64le.patch
 
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
@@ -231,6 +226,9 @@ BuildRequires:  vte2-devel
 %ifarch x86_64
 BuildRequires:  xen-devel
 %endif
+%if %{build_x86_fw_from_source}
+BuildRequires:  xz-devel
+%endif
 BuildRequires:  zlib-devel
 %if 0%{?suse_version} >= 1140
 %ifarch %ix86 x86_64
@@ -242,6 +240,7 @@ BuildRequires:  spice-protocol-devel
 BuildRequires:  bc
 BuildRequires:  qemu-arm   = %version
 BuildRequires:  qemu-extra = %version
+BuildRequires:  qemu-guest-agent = %version
 BuildRequires:  qemu-ppc   = %version
 BuildRequires:  qemu-s390  = %version
 BuildRequires:  qemu-tools = %version
@@ -271,7 +270,7 @@ Suggests:       qemu-arm
 Suggests:       qemu-block-dmg
 Suggests:       qemu-extra
 Suggests:       qemu-lang
-%if 0%{?suse_version} >= 1210
+%if 0%{?with_systemd}
 Recommends:     qemu-ksm = %{version}
 %endif
 
@@ -587,7 +586,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.4.0
+%setup -q -n qemu-2.5.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -626,8 +625,6 @@ This package provides a service file for starting and stopping KSM.
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
-%patch0039 -p1
-%patch0040 -p1
 
 %if %{build_x86_fw_from_source}
 pushd roms/seabios
@@ -643,15 +640,7 @@ do
 done
 %endif
 
-pushd roms/ipxe
-%patch1100 -p1
-%patch1101 -p1
-popd
-
 %if %{build_slof_from_source}
-pushd roms/SLOF
-%patch2000 -p1
-popd
 rm -f pc-bios/slof.bin
 %endif
 
@@ -742,7 +731,6 @@ rm -f pc-bios/slof.bin
 %else
 	--disable-seccomp \
 %endif
-	--enable-smartcard-nss \
 %if 0%{?suse_version} >= 1310
 	--enable-snappy \
 %else
@@ -773,7 +761,6 @@ rm -f pc-bios/slof.bin
 	--enable-vnc-jpeg \
 	--enable-vnc-png \
 	--enable-vnc-sasl \
-	--enable-vnc-tls \
 %ifarch x86_64
 	--enable-xen \
 	--enable-xen-pci-passthrough \
@@ -802,6 +789,14 @@ cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
 %else # qemu-testsuite
 
 ln -s %{_bindir}/qemu-img qemu-img
+ln -s %{_bindir}/qemu-ga qemu-ga
+
+%if %{build_x86_fw_from_source}
+for i in %built_firmware_files
+do
+  ln -s %{_datadir}/qemu/$i pc-bios/$i
+done
+%endif
 
 for conf in default-configs/*-softmmu.mak; do
   arch=`echo "$conf" | sed -e 's|default-configs/\(.*\)-softmmu.mak|\1|g'`
@@ -859,9 +854,6 @@ format=`qemu-img info test.tar | grep "file format:" | cut -d ':' -f 2 | tr -d '
 
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT/%_datadir/doc
-rm $RPM_BUILD_ROOT/%_libdir/libcacard*
-rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
-rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
 %if ! %{build_x86_fw_from_source}
 for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*.rom sgabios.bin \
          vgabios-cirrus.bin vgabios-qxl.bin vgabios-stdvga.bin vgabios-virtio.bin vgabios-vmware.bin \
@@ -1130,11 +1122,13 @@ fi
 %doc %_mandir/man1/qemu-img.1.gz
 %doc %_mandir/man1/virtfs-proxy-helper.1.gz
 %doc %_mandir/man8/qemu-nbd.8.gz
+%_bindir/ivshmem-client
+%_bindir/ivshmem-server
 %_bindir/qemu-io
 %_bindir/qemu-img
 %_bindir/qemu-nbd
 %_bindir/virtfs-proxy-helper
-%_bindir/vscclient
+#%_bindir/vscclient
 %verify(not mode) %_libexecdir/qemu-bridge-helper
 %dir %_sysconfdir/%name
 %config %_sysconfdir/%name/bridge.conf
@@ -1142,6 +1136,7 @@ fi
 
 %files guest-agent
 %defattr(-, root, root)
+%doc %_mandir/man8/qemu-ga.8.gz
 %attr(755,root,kvm) %_bindir/qemu-ga
 %if 0%{?with_systemd}
 %{_unitdir}/qemu-ga.service

qemu.spec.in

@@ -53,8 +53,8 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.5.0.tar.bz2
-Source99:       http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2.sig
+Source99:       http://wiki.qemu.org/download/qemu-2.5.0.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -78,9 +78,6 @@ Patch1000:      seabios_128kb.patch
 Patch1001:      seabios_checkrom_typo.patch
 Patch1002:      seabios_avoid_smbios_signature_string.patch
 %endif
-Patch1100:      gcc5-ipxe-add-missing-const-qualifiers.patch
-Patch1101:      gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
-Patch2000:      SLOF_ppc64le.patch
 
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
@@ -192,6 +189,9 @@ BuildRequires:  vte2-devel
 %ifarch x86_64
 BuildRequires:  xen-devel
 %endif
+%if %{build_x86_fw_from_source}
+BuildRequires:  xz-devel
+%endif
 BuildRequires:  zlib-devel
 %if 0%{?suse_version} >= 1140
 %ifarch %ix86 x86_64
@@ -203,6 +203,7 @@ BuildRequires:  spice-protocol-devel
 BuildRequires:  bc
 BuildRequires:  qemu-arm   = %version
 BuildRequires:  qemu-extra = %version
+BuildRequires:  qemu-guest-agent = %version
 BuildRequires:  qemu-ppc   = %version
 BuildRequires:  qemu-s390  = %version
 BuildRequires:  qemu-tools = %version
@@ -232,7 +233,7 @@ Suggests:       qemu-arm
 Suggests:       qemu-block-dmg
 Suggests:       qemu-extra
 Suggests:       qemu-lang
-%if 0%{?suse_version} >= 1210
+%if 0%{?with_systemd}
 Recommends:     qemu-ksm = %{version}
 %endif
 
@@ -548,7 +549,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.4.0
+%setup -q -n qemu-2.5.0
 PATCH_EXEC
 
 %if %{build_x86_fw_from_source}
@@ -565,15 +566,7 @@ do
 done
 %endif
 
-pushd roms/ipxe
-%patch1100 -p1
-%patch1101 -p1
-popd
-
 %if %{build_slof_from_source}
-pushd roms/SLOF
-%patch2000 -p1
-popd
 rm -f pc-bios/slof.bin
 %endif
 
@@ -664,7 +657,6 @@ rm -f pc-bios/slof.bin
 %else
 	--disable-seccomp \
 %endif
-	--enable-smartcard-nss \
 %if 0%{?suse_version} >= 1310
 	--enable-snappy \
 %else
@@ -695,7 +687,6 @@ rm -f pc-bios/slof.bin
 	--enable-vnc-jpeg \
 	--enable-vnc-png \
 	--enable-vnc-sasl \
-	--enable-vnc-tls \
 %ifarch x86_64
 	--enable-xen \
 	--enable-xen-pci-passthrough \
@@ -724,6 +715,14 @@ cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
 %else # qemu-testsuite
 
 ln -s %{_bindir}/qemu-img qemu-img
+ln -s %{_bindir}/qemu-ga qemu-ga
+
+%if %{build_x86_fw_from_source}
+for i in %built_firmware_files
+do
+  ln -s %{_datadir}/qemu/$i pc-bios/$i
+done
+%endif
 
 for conf in default-configs/*-softmmu.mak; do
   arch=`echo "$conf" | sed -e 's|default-configs/\(.*\)-softmmu.mak|\1|g'`
@@ -781,9 +780,6 @@ format=`qemu-img info test.tar | grep "file format:" | cut -d ':' -f 2 | tr -d '
 
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT/%_datadir/doc
-rm $RPM_BUILD_ROOT/%_libdir/libcacard*
-rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
-rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
 %if ! %{build_x86_fw_from_source}
 for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*.rom sgabios.bin \
          vgabios-cirrus.bin vgabios-qxl.bin vgabios-stdvga.bin vgabios-virtio.bin vgabios-vmware.bin \
@@ -1053,11 +1049,13 @@ fi
 %doc %_mandir/man1/qemu-img.1.gz
 %doc %_mandir/man1/virtfs-proxy-helper.1.gz
 %doc %_mandir/man8/qemu-nbd.8.gz
+%_bindir/ivshmem-client
+%_bindir/ivshmem-server
 %_bindir/qemu-io
 %_bindir/qemu-img
 %_bindir/qemu-nbd
 %_bindir/virtfs-proxy-helper
-%_bindir/vscclient
+#%_bindir/vscclient
 %verify(not mode) %_libexecdir/qemu-bridge-helper
 %dir %_sysconfdir/%name
 %config %_sysconfdir/%name/bridge.conf
@@ -1065,6 +1063,7 @@ fi
 
 %files guest-agent
 %defattr(-, root, root)
+%doc %_mandir/man8/qemu-ga.8.gz
 %attr(755,root,kvm) %_bindir/qemu-ga
 %if 0%{?with_systemd}
 %{_unitdir}/qemu-ga.service

update_git.sh

@@ -11,8 +11,8 @@
 
 GIT_TREE=git://github.com/openSUSE/qemu.git
 GIT_LOCAL_TREE=~/git/qemu-opensuse
-GIT_BRANCH=opensuse-2.4
+GIT_BRANCH=opensuse-2.5
-GIT_UPSTREAM_TAG=v2.4.0
+GIT_UPSTREAM_TAG=v2.5.0
 GIT_DIR=/dev/shm/qemu-factory-git-dir
 CMP_DIR=/dev/shm/qemu-factory-cmp-dir
 
@@ -87,7 +87,7 @@ rm -rf $GIT_DIR
         echo "  ${i##*/}" >> qemu.changes.added
     done
 
-    for package in qemu qemu-linux-user libcacard; do
+    for package in qemu qemu-linux-user; do
         while IFS= read -r line; do
             if [ "$line" = "PATCH_FILES" ]; then
                 for i in 0???-*.patch; do