Accepting request 294983 from home:a_faerber:branches:Virtualization

Update to v2.3.0-rc2

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

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

@@ -1,4 +1,4 @@
-From 322c9bbba6e40e0626cfce45b0e20e5b37efcbda Mon Sep 17 00:00:00 2001
+From 86f09f6efc6c174728fbf0197c58beb91895c158 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

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

@@ -1,4 +1,4 @@
-From 2c57860eb6a5772ee54b2dec943fd01dbc44e10d Mon Sep 17 00:00:00 2001
+From c42b470d67ec4c6ac17e6a4ba2d744c10cb6d189 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)
@@ -119,10 +119,10 @@ index a849f26..ace2bfb 100644
                 ignore state to avoid getting unexpected interrupted
                 syscalls */
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 4bd9543..6c0f026 100644
+index 1622ad6..f70e4f3 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5511,6 +5511,87 @@ static target_timer_t get_timer_id(abi_long arg)
+@@ -5512,6 +5512,87 @@ static target_timer_t get_timer_id(abi_long arg)
      return timerid;
  }
  
@@ -210,7 +210,7 @@ index 4bd9543..6c0f026 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>. */
-@@ -5524,6 +5605,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -5525,6 +5606,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 4bd9543..6c0f026 100644
  
  #ifdef DEBUG
      gemu_log("syscall %d", num);
-@@ -8793,7 +8880,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -8794,7 +8881,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 4bd9543..6c0f026 100644
          }
  
          switch(arg2) {
-@@ -9824,6 +9911,7 @@ fail:
+@@ -9825,6 +9912,7 @@ fail:
  #endif
      if(do_strace)
          print_syscall_ret(num, ret);

0003-qemu-0.9.0.cvs-binfmt.patch

@@ -1,4 +1,4 @@
-From d9e8b9da1fae1ea5d542c34c81a52cfe011b3fc3 Mon Sep 17 00:00:00 2001
+From f1fb305714ee61f049072c3f6cd7691fdff11226 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 8f761fafbc1f8802d972b608d4784e03cfaf7d74 Mon Sep 17 00:00:00 2001
+From 86ccc436bbcb2ca66a811beda2d7953a7986422e 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 bfdd73189482e7cea6dadf96d8133ca43cb8263d Mon Sep 17 00:00:00 2001
+From 6849dd6f02d9431c98b071157e6c8adc53f78dd4 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

0006-qemu-cvs-alsa_mmap.patch

@@ -1,4 +1,4 @@
-From 666af5b3b310c01b6f7854b164699122cbed04cb Mon Sep 17 00:00:00 2001
+From 991e8590654a10a100d6c4a818b6f4b5fa797b57 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

0007-qemu-cvs-gettimeofday.patch

@@ -1,4 +1,4 @@
-From 98239c6d7854fabbbeaaf262bd5a632e9ab31366 Mon Sep 17 00:00:00 2001
+From bfd6f1eb9793707792f0c8e713f9a111cb1d24b8 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 6c0f026..ce80b62 100644
+index f70e4f3..1244004 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -6683,6 +6683,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -6684,6 +6684,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 b5305f22c07a7643430e36d82ccfbe87ec51ea0b Mon Sep 17 00:00:00 2001
+From ec93bacc793ec45635b634e1fb7c1be08a98c257 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,7 +12,7 @@ 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 ce80b62..3d07586 100644
+index 1244004..28ca660 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -3861,7 +3861,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)

0009-qemu-cvs-ioctl_nodirection.patch

@@ -1,4 +1,4 @@
-From 1e931455838c8cb218ec1887cfd163c5dcf48517 Mon Sep 17 00:00:00 2001
+From b6b4ca610502573b02a2be2234ada7d28d743d46 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,7 +15,7 @@ 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 3d07586..2a3f819 100644
+index 28ca660..4f94afb 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -3895,6 +3895,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)

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

@@ -1,4 +1,4 @@
-From 77bb1f2b37fc8e32b0c43b8b3d502f37f24cab58 Mon Sep 17 00:00:00 2001
+From 32f2ddd6a79a72b99d885d117e4297ef4b6cc2d3 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,10 +21,10 @@ 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 0fe97de..c4636da 100644
+index f2f8ae7..0d32442 100644
 --- a/block.c
 +++ b/block.c
-@@ -5780,6 +5780,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
+@@ -5813,6 +5813,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
      if (!quiet) {
          printf("Formatting '%s', fmt=%s", filename, fmt);
          qemu_opts_print(opts, " ");

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

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

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

@@ -1,4 +1,4 @@
-From 256dc8229e834043afb85541261375bae218686b Mon Sep 17 00:00:00 2001
+From 8bbbaf424fa80c32258e5ab099724944fd61abf8 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 8b922db..527630a 100644
+index 874ecfc..0274800 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -1132,11 +1132,13 @@ static void *file_ram_alloc(RAMBlock *block,
+@@ -1134,11 +1134,13 @@ static void *file_ram_alloc(RAMBlock *block,
          goto error;
      }
  

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

@@ -1,4 +1,4 @@
-From 0d5cfca2dacf6c7f6a9dee12b207993be2e92c62 Mon Sep 17 00:00:00 2001
+From 58736f61391758db5eb4ba4451a9c033142c47c9 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

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

@@ -1,4 +1,4 @@
-From 428404c0345876f6c9ccd0a9ec89cb6dfeedb06a Mon Sep 17 00:00:00 2001
+From 836fc2f8a1f747e3ca19b467ac5565d57e857655 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 7a0130c3e54e8e84c8863f86078f99e37a156e78 Mon Sep 17 00:00:00 2001
+From b6688474cdc1fe0d2c3f170cef4831adaed3823d 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,7 +46,7 @@ index 8974caa..810ae61 100644
  
  #endif
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 2a3f819..d809bfa 100644
+index 4f94afb..75ccd66 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -3838,6 +3838,13 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp,

0016-linux-user-lock-tcg.patch

@@ -1,4 +1,4 @@
-From 2f5689f8cc7a3beaa618def08065238a7d367389 Mon Sep 17 00:00:00 2001
+From 2552b7cff6269b951a3b29651c49af726d8f81c2 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

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

@@ -1,4 +1,4 @@
-From 5e635e7f3d979d2b543c5673ebbc346939d26aa9 Mon Sep 17 00:00:00 2001
+From 7f9c7d50862d93d5939ec3fe3097469f34640e74 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,7 +19,7 @@ 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 d809bfa..7908044 100644
+index 75ccd66..11a1572 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -4543,6 +4543,15 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,

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

@@ -1,4 +1,4 @@
-From 10412ba16b90036632abda465cb5fd9785ed86e7 Mon Sep 17 00:00:00 2001
+From c9c7549d1dc3bab837165332f630b8f7fea4ad96 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

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

@@ -1,4 +1,4 @@
-From bb2856bca03725f33c3084097be2ef8011ef1946 Mon Sep 17 00:00:00 2001
+From bf91a8cbb745b8c0ea2d184b0fe1123131c593ab 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 7908044..4c980e6 100644
+index 11a1572..4c72020 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5361,6 +5361,25 @@ static int open_self_stat(void *cpu_env, int fd)
+@@ -5362,6 +5362,25 @@ static int open_self_stat(void *cpu_env, int fd)
      return 0;
  }
  
@@ -51,7 +51,7 @@ index 7908044..4c980e6 100644
  static int open_self_auxv(void *cpu_env, int fd)
  {
      CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env);
-@@ -5475,6 +5494,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
+@@ -5476,6 +5495,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 f1b74316b43f2bfe1880800fd04014d8f1c09c95 Mon Sep 17 00:00:00 2001
+From 002293cfa85b70e4ed04f769eb2dd6a132483283 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

0021-linux-user-implement-FS_IOC_SETFLAG.patch

@@ -1,4 +1,4 @@
-From 4ecab214545d695e017f0b8928014cb2beaff563 Mon Sep 17 00:00:00 2001
+From 3508ae270e1c12ea54d048656d18fec86b7c30bc 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

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

@@ -1,4 +1,4 @@
-From 5573b42d51b131bef0f43190c4ff235f6fc5e9f4 Mon Sep 17 00:00:00 2001
+From af029d768792739aabc3a153eebda3af83046264 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,7 +9,7 @@ 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 4c980e6..3c9de16 100644
+index 4c72020..30d6bcd 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -3333,6 +3333,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,

0023-slirp-nooutgoing.patch

@@ -1,4 +1,4 @@
-From 01ed66fdb653daf8a9967bb434688407c2e9aa16 Mon Sep 17 00:00:00 2001
+From 276e5bc594de10c2697be2280c26e4b9a4aa6d11 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
@@ -97,7 +97,7 @@ index 7571c5a..0555e18 100644
      socket_set_fast_reuse(s);
      opt = 1;
 diff --git a/vl.c b/vl.c
-index 75ec292..c07e272 100644
+index 74c2681..51de200 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -163,6 +163,7 @@ int smp_threads = 1;

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

@@ -1,4 +1,4 @@
-From 82b259c1ad11bfff6c32f345d81fb64208a6f78b Mon Sep 17 00:00:00 2001
+From aa027229a0a9d4123df3b424638ba11f486d456d 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=

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

@@ -1,4 +1,4 @@
-From 11c16ee5d5fd50ccde9dcf1e2c5a211a008b3b54 Mon Sep 17 00:00:00 2001
+From 8c5c611b5328c12af7a68039c4e6a722af6b83b3 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

0026-linux-user-use-target_ulong.patch

@@ -1,4 +1,4 @@
-From 61f4e02f62438a0847b2053559e06d3ce4e9848d Mon Sep 17 00:00:00 2001
+From 264fa73c5eb55329ec4f445264f8acb44a996a5e 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
@@ -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 3c9de16..e8b578a 100644
+index 30d6bcd..07c0138 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5647,10 +5647,10 @@ int syscall_restartable(int syscall_nr)
+@@ -5648,10 +5648,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 cdf54d3db3c58438d7dc8aa4713c16d53b565e9f Mon Sep 17 00:00:00 2001
+From dd23b6e39b707025d2cd081f209419ad4a251155 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

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

@@ -1,4 +1,4 @@
-From 3fbff970f8d9e2ec753469f0f68ed5b5a7f9ce48 Mon Sep 17 00:00:00 2001
+From dffc3a317aef60cd70ce4ddeab13b1733fbe2bdc 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

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

@@ -1,4 +1,4 @@
-From a17b61302eda455e5dc0da33357276934f2067bf Mon Sep 17 00:00:00 2001
+From 641e495ce5643f1f80e69d290495768d82eb968b 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

0030-net-Warn-about-default-MAC-address.patch

@@ -1,4 +1,4 @@
-From 0c4f5936c8be6fde2e49539ca3e89e048623c707 Mon Sep 17 00:00:00 2001
+From 1a709119c593c74fb7db745030a0dda33e7dd18c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 12 Dec 2012 19:11:31 +0100
 Subject: [PATCH] net: Warn about default MAC address

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

@@ -1,4 +1,4 @@
-From f0fd1d5c552afa2e3a7b6e0daeaecdfc2dcd64ae Mon Sep 17 00:00:00 2001
+From 495a5acd9650ef793443d716f2e2c80f42c75b54 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

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

@@ -1,4 +1,4 @@
-From 22d133d33ee03b749a5d119f5c51a2ba2b41ef41 Mon Sep 17 00:00:00 2001
+From ae8f274f387c2401d6e17cd9e9889aa0d76b1b9b 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

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

@@ -1,4 +1,4 @@
-From 228e29d0100b1d87970a875ec1281d793a160991 Mon Sep 17 00:00:00 2001
+From 9fe73c4701b0ccecc6d6c6662e6092351aa4f381 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 e8b578a..2ed71b6 100644
+index 07c0138..4917e20 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5958,9 +5958,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+@@ -5959,9 +5959,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
      case TARGET_NR_oldstat:
          goto unimplemented;
  #endif

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

@@ -1,4 +1,4 @@
-From 96418e39e20fb3f418e67e70ff213d42f542102e Mon Sep 17 00:00:00 2001
+From 31d35e1ce9f365e2b0c98d5a6d7cb2c12123a8b1 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

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

@@ -1,4 +1,4 @@
-From 8c68850233b30b35ab9fb131fd42a99eaa132d18 Mon Sep 17 00:00:00 2001
+From 06cfe0f8276cdd0de53c4ec27d72ffd716e2a5ae 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,7 +14,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 589798e..ff18828 100755
+index 09c9225..9194c62 100755
 --- a/configure
 +++ b/configure
 @@ -1551,7 +1551,7 @@ fi

0036-qtest-Increase-socket-timeout.patch

@@ -1,4 +1,4 @@
-From 389736ce698e3bac84afc1259f4ae25cf1f01482 Mon Sep 17 00:00:00 2001
+From f50b5dc24e9bbe259d1c64f6da4732012f03b2cc 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 9a92aa7..81ade4e 100644
+index 12d65bd..2931773 100644
 --- a/tests/libqtest.c
 +++ b/tests/libqtest.c
 @@ -35,7 +35,7 @@

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

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

0038-fw_cfg-test-Fix-test-path-to-includ.patch

@@ -1,58 +0,0 @@
-From 07b2c7c8424f2e2036a882190dab1d9a56b3bb3e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
-Date: Thu, 19 Mar 2015 18:47:52 +0100
-Subject: [PATCH] fw_cfg-test: Fix test path to include architecture
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use qtest_add_func() instead of g_test_add_func() to reflect
-the architecture tested, changing GTester paths as follows:
-
-  /fw_cfg/foo -> /x86_64/fw_cfg/foo etc.
-
-Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- tests/fw_cfg-test.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
-index 5c8f8d6..9be78e9 100644
---- a/tests/fw_cfg-test.c
-+++ b/tests/fw_cfg-test.c
-@@ -109,21 +109,21 @@ int main(int argc, char **argv)
- 
-     fw_cfg = pc_fw_cfg_init();
- 
--    g_test_add_func("/fw_cfg/signature", test_fw_cfg_signature);
--    g_test_add_func("/fw_cfg/id", test_fw_cfg_id);
--    g_test_add_func("/fw_cfg/uuid", test_fw_cfg_uuid);
--    g_test_add_func("/fw_cfg/ram_size", test_fw_cfg_ram_size);
--    g_test_add_func("/fw_cfg/nographic", test_fw_cfg_nographic);
--    g_test_add_func("/fw_cfg/nb_cpus", test_fw_cfg_nb_cpus);
-+    qtest_add_func("fw_cfg/signature", test_fw_cfg_signature);
-+    qtest_add_func("fw_cfg/id", test_fw_cfg_id);
-+    qtest_add_func("fw_cfg/uuid", test_fw_cfg_uuid);
-+    qtest_add_func("fw_cfg/ram_size", test_fw_cfg_ram_size);
-+    qtest_add_func("fw_cfg/nographic", test_fw_cfg_nographic);
-+    qtest_add_func("fw_cfg/nb_cpus", test_fw_cfg_nb_cpus);
- #if 0
--    g_test_add_func("/fw_cfg/machine_id", test_fw_cfg_machine_id);
--    g_test_add_func("/fw_cfg/kernel", test_fw_cfg_kernel);
--    g_test_add_func("/fw_cfg/initrd", test_fw_cfg_initrd);
--    g_test_add_func("/fw_cfg/boot_device", test_fw_cfg_boot_device);
-+    qtest_add_func("fw_cfg/machine_id", test_fw_cfg_machine_id);
-+    qtest_add_func("fw_cfg/kernel", test_fw_cfg_kernel);
-+    qtest_add_func("fw_cfg/initrd", test_fw_cfg_initrd);
-+    qtest_add_func("fw_cfg/boot_device", test_fw_cfg_boot_device);
- #endif
--    g_test_add_func("/fw_cfg/max_cpus", test_fw_cfg_max_cpus);
--    g_test_add_func("/fw_cfg/numa", test_fw_cfg_numa);
--    g_test_add_func("/fw_cfg/boot_menu", test_fw_cfg_boot_menu);
-+    qtest_add_func("fw_cfg/max_cpus", test_fw_cfg_max_cpus);
-+    qtest_add_func("fw_cfg/numa", test_fw_cfg_numa);
-+    qtest_add_func("fw_cfg/boot_menu", test_fw_cfg_boot_menu);
- 
-     cmdline = g_strdup_printf("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 ");
-     s = qtest_start(cmdline);

0039-rcu-tests-fix-compilation-on-32-bit.patch

@@ -1,238 +0,0 @@
-From 4b8f19b5ecb8355e41914cd025d1b6a8ee1cfeb2 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Sun, 22 Mar 2015 09:26:50 +0100
-Subject: [PATCH] rcu tests: fix compilation on 32-bit ppc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-32-bit PPC cannot do atomic operations on long long.  Inside the loops,
-we are already using local counters that are summed at the end of
-the run---with some exceptions (rcu_stress_count for rcutorture,
-n_nodes for test-rcu-list): fix them to use the same technique.
-For test-rcu-list, remove the mostly unused member "val" from the
-list.  Then, use a mutex to protect the global counts.
-
-Performance does not matter there because every thread will only enter
-the critical section once.
-
-Remaining uses of atomic instructions are for ints or pointers.
-
-Reported-by: Andreas Faerber <afaerber@suse.de>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- tests/rcutorture.c    | 20 ++++++++++++++++----
- tests/test-rcu-list.c | 50 ++++++++++++++++++++++++++++----------------------
- 2 files changed, 44 insertions(+), 26 deletions(-)
-
-diff --git a/tests/rcutorture.c b/tests/rcutorture.c
-index 60a2ccf..d6b304d 100644
---- a/tests/rcutorture.c
-+++ b/tests/rcutorture.c
-@@ -82,6 +82,7 @@ static volatile int goflag = GOFLAG_INIT;
- #define RCU_READ_RUN 1000
- 
- #define NR_THREADS 100
-+static QemuMutex counts_mutex;
- static QemuThread threads[NR_THREADS];
- static struct rcu_reader_data *data[NR_THREADS];
- static int n_threads;
-@@ -130,7 +131,9 @@ static void *rcu_read_perf_test(void *arg)
-         }
-         n_reads_local += RCU_READ_RUN;
-     }
--    atomic_add(&n_reads, n_reads_local);
-+    qemu_mutex_lock(&counts_mutex);
-+    n_reads += n_reads_local;
-+    qemu_mutex_unlock(&counts_mutex);
- 
-     rcu_unregister_thread();
-     return NULL;
-@@ -151,7 +154,9 @@ static void *rcu_update_perf_test(void *arg)
-         synchronize_rcu();
-         n_updates_local++;
-     }
--    atomic_add(&n_updates, n_updates_local);
-+    qemu_mutex_lock(&counts_mutex);
-+    n_updates += n_updates_local;
-+    qemu_mutex_unlock(&counts_mutex);
- 
-     rcu_unregister_thread();
-     return NULL;
-@@ -241,6 +246,7 @@ static void *rcu_read_stress_test(void *arg)
-     struct rcu_stress *p;
-     int pc;
-     long long n_reads_local = 0;
-+    long long rcu_stress_local[RCU_STRESS_PIPE_LEN + 1] = { 0 };
-     volatile int garbage = 0;
- 
-     rcu_register_thread();
-@@ -265,13 +271,18 @@ static void *rcu_read_stress_test(void *arg)
-         if ((pc > RCU_STRESS_PIPE_LEN) || (pc < 0)) {
-             pc = RCU_STRESS_PIPE_LEN;
-         }
--        atomic_inc(&rcu_stress_count[pc]);
-+        rcu_stress_local[pc]++;
-         n_reads_local++;
-         if ((++itercnt % 0x1000) == 0) {
-             synchronize_rcu();
-         }
-     }
--    atomic_add(&n_reads, n_reads_local);
-+    qemu_mutex_lock(&counts_mutex);
-+    n_reads += n_reads_local;
-+    for (i = 0; i <= RCU_STRESS_PIPE_LEN; i++) {
-+        rcu_stress_count[i] += rcu_stress_local[i];
-+    }
-+    qemu_mutex_unlock(&counts_mutex);
- 
-     rcu_unregister_thread();
-     return NULL;
-@@ -419,6 +430,7 @@ int main(int argc, char *argv[])
-     int nreaders = 1;
-     int duration = 1;
- 
-+    qemu_mutex_init(&counts_mutex);
-     if (argc >= 2 && argv[1][0] == '-') {
-         g_test_init(&argc, &argv, NULL);
-         if (g_test_quick()) {
-diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c
-index 46b5e26..4c5f62e 100644
---- a/tests/test-rcu-list.c
-+++ b/tests/test-rcu-list.c
-@@ -35,16 +35,15 @@
-  * Test variables.
-  */
- 
--long long n_reads = 0LL;
--long long n_updates = 0LL;
--long long n_reclaims = 0LL;
--long long n_nodes_removed = 0LL;
--long long n_nodes = 0LL;
--int g_test_in_charge = 0;
-+static QemuMutex counts_mutex;
-+static long long n_reads = 0LL;
-+static long long n_updates = 0LL;
-+static long long n_reclaims = 0LL;
-+static long long n_nodes_removed = 0LL;
-+static long long n_nodes = 0LL;
-+static int g_test_in_charge = 0;
- 
--int nthreadsrunning;
--
--char argsbuf[64];
-+static int nthreadsrunning;
- 
- #define GOFLAG_INIT 0
- #define GOFLAG_RUN  1
-@@ -92,21 +91,21 @@ static void wait_all_threads(void)
- struct list_element {
-     QLIST_ENTRY(list_element) entry;
-     struct rcu_head rcu;
--    long long val;
- };
- 
- static void reclaim_list_el(struct rcu_head *prcu)
- {
-     struct list_element *el = container_of(prcu, struct list_element, rcu);
-     g_free(el);
--    atomic_add(&n_reclaims, 1);
-+    /* Accessed only from call_rcu thread.  */
-+    n_reclaims++;
- }
- 
- static QLIST_HEAD(q_list_head, list_element) Q_list_head;
- 
- static void *rcu_q_reader(void *arg)
- {
--    long long j, n_reads_local = 0;
-+    long long n_reads_local = 0;
-     struct list_element *el;
- 
-     *(struct rcu_reader_data **)arg = &rcu_reader;
-@@ -118,8 +117,6 @@ static void *rcu_q_reader(void *arg)
-     while (goflag == GOFLAG_RUN) {
-         rcu_read_lock();
-         QLIST_FOREACH_RCU(el, &Q_list_head, entry) {
--            j = atomic_read(&el->val);
--            (void)j;
-             n_reads_local++;
-             if (goflag == GOFLAG_STOP) {
-                 break;
-@@ -129,7 +126,9 @@ static void *rcu_q_reader(void *arg)
- 
-         g_usleep(100);
-     }
--    atomic_add(&n_reads, n_reads_local);
-+    qemu_mutex_lock(&counts_mutex);
-+    n_reads += n_reads_local;
-+    qemu_mutex_unlock(&counts_mutex);
-     return NULL;
- }
- 
-@@ -137,6 +136,7 @@ static void *rcu_q_reader(void *arg)
- static void *rcu_q_updater(void *arg)
- {
-     int j, target_el;
-+    long long n_nodes_local = 0;
-     long long n_updates_local = 0;
-     long long n_removed_local = 0;
-     struct list_element *el, *prev_el;
-@@ -170,8 +170,7 @@ static void *rcu_q_updater(void *arg)
-             j++;
-             if (target_el == j) {
-                 prev_el = g_new(struct list_element, 1);
--                atomic_add(&n_nodes, 1);
--                prev_el->val = atomic_read(&n_nodes);
-+                n_nodes += n_nodes_local;
-                 QLIST_INSERT_BEFORE_RCU(el, prev_el, entry);
-                 break;
-             }
-@@ -181,8 +180,11 @@ static void *rcu_q_updater(void *arg)
-         synchronize_rcu();
-     }
-     synchronize_rcu();
--    atomic_add(&n_updates, n_updates_local);
--    atomic_add(&n_nodes_removed, n_removed_local);
-+    qemu_mutex_lock(&counts_mutex);
-+    n_nodes += n_nodes_local;
-+    n_updates += n_updates_local;
-+    n_nodes_removed += n_removed_local;
-+    qemu_mutex_unlock(&counts_mutex);
-     return NULL;
- }
- 
-@@ -194,10 +196,11 @@ static void rcu_qtest_init(void)
-     srand(time(0));
-     for (i = 0; i < RCU_Q_LEN; i++) {
-         new_el = g_new(struct list_element, 1);
--        new_el->val = i;
-         QLIST_INSERT_HEAD_RCU(&Q_list_head, new_el, entry);
-     }
--    atomic_add(&n_nodes, RCU_Q_LEN);
-+    qemu_mutex_lock(&counts_mutex);
-+    n_nodes += RCU_Q_LEN;
-+    qemu_mutex_unlock(&counts_mutex);
- }
- 
- static void rcu_qtest_run(int duration, int nreaders)
-@@ -233,7 +236,9 @@ static void rcu_qtest(const char *test, int duration, int nreaders)
-         call_rcu1(&prev_el->rcu, reclaim_list_el);
-         n_removed_local++;
-     }
--    atomic_add(&n_nodes_removed, n_removed_local);
-+    qemu_mutex_lock(&counts_mutex);
-+    n_nodes_removed += n_removed_local;
-+    qemu_mutex_unlock(&counts_mutex);
-     synchronize_rcu();
-     while (n_nodes_removed > n_reclaims) {
-         g_usleep(100);
-@@ -277,6 +282,7 @@ int main(int argc, char *argv[])
- {
-     int duration = 0, readers = 0;
- 
-+    qemu_mutex_init(&counts_mutex);
-     if (argc >= 2) {
-         if (argv[1][0] == '-') {
-             g_test_init(&argc, &argv, NULL);

libcacard.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr  8 13:10:27 UTC 2015 - afaerber@suse.de
+
+- Update to v2.3.0-rc2: See http://wiki.qemu-project.org/ChangeLog/2.3
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
+* Patches dropped:
+  0038-fw_cfg-test-Fix-test-path-to-includ.patch
+  0039-rcu-tests-fix-compilation-on-32-bit.patch
+
 -------------------------------------------------------------------
 Thu Mar 26 14:49:44 UTC 2015 - afaerber@suse.de
 

libcacard.spec

@@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.2.91
+Version:        2.2.92
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc1.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc2.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
@@ -62,8 +62,6 @@ Patch0034:      0034-virtfs-proxy-helper-Provide-__u64-f.patch
 Patch0035:      0035-configure-Enable-PIE-for-ppc-and-pp.patch
 Patch0036:      0036-qtest-Increase-socket-timeout.patch
 Patch0037:      0037-AIO-Reduce-number-of-threads-for-32.patch
-Patch0038:      0038-fw_cfg-test-Fix-test-path-to-includ.patch
-Patch0039:      0039-rcu-tests-fix-compilation-on-32-bit.patch
 # Please do not add patches manually here, run update_git.sh.
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
@@ -122,7 +120,7 @@ the cards could be pure software constructs.
 This sub-package contains development files for the Smartcard library.
 
 %prep
-%setup -q -n qemu-2.3.0-rc1
+%setup -q -n qemu-2.3.0-rc2
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -160,8 +158,6 @@ This sub-package contains development files for the Smartcard library.
 %patch0035 -p1
 %patch0036 -p1
 %patch0037 -p1
-%patch0038 -p1
-%patch0039 -p1
 
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

libcacard.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.3.0-rc1.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc2.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.
@@ -84,7 +84,7 @@ the cards could be pure software constructs.
 This sub-package contains development files for the Smartcard library.
 
 %prep
-%setup -q -n qemu-2.3.0-rc1
+%setup -q -n qemu-2.3.0-rc2
 PATCH_EXEC
 
 %build

qemu-2.3.0-rc1.tar.bz2

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

qemu-2.3.0-rc2.tar.bz2

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

qemu-linux-user.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr  8 13:10:27 UTC 2015 - afaerber@suse.de
+
+- Update to v2.3.0-rc2: See http://wiki.qemu-project.org/ChangeLog/2.3
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
+* Patches dropped:
+  0038-fw_cfg-test-Fix-test-path-to-includ.patch
+  0039-rcu-tests-fix-compilation-on-32-bit.patch
+
 -------------------------------------------------------------------
 Thu Mar 26 14:49:43 UTC 2015 - afaerber@suse.de
 

qemu-linux-user.spec

@@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.2.91
+Version:        2.2.92
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc1.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc2.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
@@ -62,8 +62,6 @@ Patch0034:      0034-virtfs-proxy-helper-Provide-__u64-f.patch
 Patch0035:      0035-configure-Enable-PIE-for-ppc-and-pp.patch
 Patch0036:      0036-qtest-Increase-socket-timeout.patch
 Patch0037:      0037-AIO-Reduce-number-of-threads-for-32.patch
-Patch0038:      0038-fw_cfg-test-Fix-test-path-to-includ.patch
-Patch0039:      0039-rcu-tests-fix-compilation-on-32-bit.patch
 # Please do not add patches manually here, run update_git.sh.
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
@@ -116,7 +114,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.
 
 %prep
-%setup -q -n qemu-2.3.0-rc1
+%setup -q -n qemu-2.3.0-rc2
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -154,8 +152,6 @@ run cross-architecture builds.
 %patch0035 -p1
 %patch0036 -p1
 %patch0037 -p1
-%patch0038 -p1
-%patch0039 -p1
 
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

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.3.0-rc1.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc2.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.3.0-rc1
+%setup -q -n qemu-2.3.0-rc2
 PATCH_EXEC
 
 %build

qemu.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr  8 13:10:26 UTC 2015 - afaerber@suse.de
+
+- Update to v2.3.0-rc2: See http://wiki.qemu-project.org/ChangeLog/2.3
+* Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
+* Patches dropped (upstreamed):
+  0038-fw_cfg-test-Fix-test-path-to-includ.patch
+  0039-rcu-tests-fix-compilation-on-32-bit.patch
+
 -------------------------------------------------------------------
 Sat Mar 28 00:13:05 UTC 2015 - brogers@suse.com
 

qemu.spec

@@ -43,10 +43,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.2.91
+Version:        2.2.92
 Release:        0
-Source:         http://wiki.qemu.org/download/%name-2.3.0-rc1.tar.bz2
+Source:         http://wiki.qemu.org/download/%name-2.3.0-rc2.tar.bz2
-Source99:       http://wiki.qemu.org/download/%name-2.3.0-rc1.tar.bz2.sig
+Source99:       http://wiki.qemu.org/download/%name-2.3.0-rc2.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -93,8 +93,6 @@ Patch0034:      0034-virtfs-proxy-helper-Provide-__u64-f.patch
 Patch0035:      0035-configure-Enable-PIE-for-ppc-and-pp.patch
 Patch0036:      0036-qtest-Increase-socket-timeout.patch
 Patch0037:      0037-AIO-Reduce-number-of-threads-for-32.patch
-Patch0038:      0038-fw_cfg-test-Fix-test-path-to-includ.patch
-Patch0039:      0039-rcu-tests-fix-compilation-on-32-bit.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -474,7 +472,7 @@ This package provides a service file for starting and stopping KSM.
 %endif
 
 %prep
-%setup -q -n %name-2.3.0-rc1
+%setup -q -n %name-2.3.0-rc2
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -512,8 +510,6 @@ This package provides a service file for starting and stopping KSM.
 %patch0035 -p1
 %patch0036 -p1
 %patch0037 -p1
-%patch0038 -p1
-%patch0039 -p1
 
 %if %{build_x86_fw_from_source}
 pushd roms/seabios

qemu.spec.in

@@ -45,8 +45,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/%name-2.3.0-rc1.tar.bz2
+Source:         http://wiki.qemu.org/download/%name-2.3.0-rc2.tar.bz2
-Source99:       http://wiki.qemu.org/download/%name-2.3.0-rc1.tar.bz2.sig
+Source99:       http://wiki.qemu.org/download/%name-2.3.0-rc2.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -436,7 +436,7 @@ This package provides a service file for starting and stopping KSM.
 %endif
 
 %prep
-%setup -q -n %name-2.3.0-rc1
+%setup -q -n %name-2.3.0-rc2
 PATCH_EXEC
 
 %if %{build_x86_fw_from_source}

update_git.sh

@@ -12,7 +12,7 @@
 GIT_TREE=git://github.com/openSUSE/qemu.git
 GIT_LOCAL_TREE=~/git/qemu-opensuse
 GIT_BRANCH=opensuse-2.3
-GIT_UPSTREAM_TAG=v2.3.0-rc1
+GIT_UPSTREAM_TAG=v2.3.0-rc2
 GIT_DIR=/dev/shm/qemu-factory-git-dir
 CMP_DIR=/dev/shm/qemu-factory-cmp-dir