Accepting request 293337 from home:a_faerber:branches:Virtualization

Update to v2.3.0-rc1 and disable building x86 firmware on 11.4

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

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

@@ -1,4 +1,4 @@
-From 60f8ba3fd2e393535ae86191658f40a97b5af3d0 Mon Sep 17 00:00:00 2001
+From 322c9bbba6e40e0626cfce45b0e20e5b37efcbda 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 a5727f0cf48531cb9b990e6148c2159271b3793c Mon Sep 17 00:00:00 2001
+From 2c57860eb6a5772ee54b2dec943fd01dbc44e10d 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 6e446de..3cb2140 100644
+index a8adb04..f2c9391 100644
 --- a/linux-user/main.c
 +++ b/linux-user/main.c
-@@ -817,15 +817,22 @@ void cpu_loop(CPUARMState *env)
+@@ -815,15 +815,22 @@ void cpu_loop(CPUARMState *env)
                              break;
                          }
                      } else {
@@ -119,7 +119,7 @@ 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 5720195..4a1d145 100644
+index 4bd9543..6c0f026 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)
@@ -232,7 +232,7 @@ index 5720195..4a1d145 100644
          }
  
          switch(arg2) {
-@@ -9810,6 +9897,7 @@ fail:
+@@ -9824,6 +9911,7 @@ fail:
  #endif
      if(do_strace)
          print_syscall_ret(num, ret);

0003-qemu-0.9.0.cvs-binfmt.patch

@@ -1,4 +1,4 @@
-From b4ae3edb76a31a7765655a381da50f0ba9864d60 Mon Sep 17 00:00:00 2001
+From d9e8b9da1fae1ea5d542c34c81a52cfe011b3fc3 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 4ac0301902403b811b824edf38c2011bffec42ba Mon Sep 17 00:00:00 2001
+From 8f761fafbc1f8802d972b608d4784e03cfaf7d74 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 09d12c451372af67a5d0ee6eddbdad1d665ff635 Mon Sep 17 00:00:00 2001
+From bfdd73189482e7cea6dadf96d8133ca43cb8263d 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 9d1694f11f7171adbd6b42142dbbdfb1d4623865 Mon Sep 17 00:00:00 2001
+From 666af5b3b310c01b6f7854b164699122cbed04cb 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 52a52fa257980cd20b6441c31adbf87ec247000d Mon Sep 17 00:00:00 2001
+From 98239c6d7854fabbbeaaf262bd5a632e9ab31366 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,7 +9,7 @@ No clue what this is for.
  1 file changed, 2 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 4a1d145..5f096a3 100644
+index 6c0f026..ce80b62 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,

0008-qemu-cvs-ioctl_debug.patch

@@ -1,4 +1,4 @@
-From 5e82562223c2a75d9231146fb87c9e25ac841bba Mon Sep 17 00:00:00 2001
+From b5305f22c07a7643430e36d82ccfbe87ec51ea0b 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 5f096a3..612896a 100644
+index ce80b62..3d07586 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 b464308fc1a48dec0c071577c8ba553db864474b Mon Sep 17 00:00:00 2001
+From 1e931455838c8cb218ec1887cfd163c5dcf48517 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 612896a..0b3d170 100644
+index 3d07586..2a3f819 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 06a328a901796c87e71e4317a08579dd1ba30451 Mon Sep 17 00:00:00 2001
+From 77bb1f2b37fc8e32b0c43b8b3d502f37f24cab58 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

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

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

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

@@ -1,4 +1,4 @@
-From 830a9a72e9460cb85519a38b69a2fe611dd6cd51 Mon Sep 17 00:00:00 2001
+From 0d5cfca2dacf6c7f6a9dee12b207993be2e92c62 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 a56841890642f1bb470498643c4f7bd1410ca7cc Mon Sep 17 00:00:00 2001
+From 428404c0345876f6c9ccd0a9ec89cb6dfeedb06a 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 ae94953ccaa0d6eb4640f2c23784df544e07ceb3 Mon Sep 17 00:00:00 2001
+From 7a0130c3e54e8e84c8863f86078f99e37a156e78 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 0b3d170..69e6f1c 100644
+index 2a3f819..d809bfa 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 1259c5643d469e9c411dacf28b9eadb91c6fba07 Mon Sep 17 00:00:00 2001
+From 2f5689f8cc7a3beaa618def08065238a7d367389 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 b1a2eb97a7f8dffa47c9b5e1edfe62f79d56b26d Mon Sep 17 00:00:00 2001
+From 5e635e7f3d979d2b543c5673ebbc346939d26aa9 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 69e6f1c..918c241 100644
+index d809bfa..7908044 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 f0dbe90ae92886e7da301ab76cc3e89027665ca4 Mon Sep 17 00:00:00 2001
+From 10412ba16b90036632abda465cb5fd9785ed86e7 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 ccc5654782e3fd6ab5e6e55811c3c79c8079d233 Mon Sep 17 00:00:00 2001
+From bb2856bca03725f33c3084097be2ef8011ef1946 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,7 +22,7 @@ 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 918c241..bcf9c35 100644
+index 7908044..4c980e6 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)

0020-linux-user-implement-FS_IOC_GETFLAG.patch

@@ -1,4 +1,4 @@
-From a4f1607a34a435386492ed9583ad1343b306a54d Mon Sep 17 00:00:00 2001
+From f1b74316b43f2bfe1880800fd04014d8f1c09c95 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 269ab75ddd80189af02fc4a63eae6879283c6386 Mon Sep 17 00:00:00 2001
+From 4ecab214545d695e017f0b8928014cb2beaff563 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 6a9b4c81f3286ffe3618adb21d3cdab6c8bf9271 Mon Sep 17 00:00:00 2001
+From 5573b42d51b131bef0f43190c4ff235f6fc5e9f4 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 bcf9c35..1d708bf 100644
+index 4c980e6..3c9de16 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 1dc47b4ec4a0f91f5d8cf9c956386831e26cc9e7 Mon Sep 17 00:00:00 2001
+From 01ed66fdb653daf8a9967bb434688407c2e9aa16 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 c513352..a447d3c 100644
+index 319d971..4b6dd9a 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -2879,6 +2879,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
+@@ -2878,6 +2878,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
  from a script.
  ETEXI
  
@@ -97,7 +97,7 @@ index 7571c5a..0555e18 100644
      socket_set_fast_reuse(s);
      opt = 1;
 diff --git a/vl.c b/vl.c
-index 694deb4..ee4d68f 100644
+index 75ec292..c07e272 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -163,6 +163,7 @@ int smp_threads = 1;
@@ -108,7 +108,7 @@ index 694deb4..ee4d68f 100644
  static int no_reboot;
  int no_shutdown = 0;
  int cursor_hide = 1;
-@@ -3144,6 +3145,14 @@ int main(int argc, char **argv, char **envp)
+@@ -3146,6 +3147,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 5762072dcfd4c76623ee8d95341e1357ea83384e Mon Sep 17 00:00:00 2001
+From 82b259c1ad11bfff6c32f345d81fb64208a6f78b 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,7 +9,7 @@ TBD (from SUSE Studio team)
  1 file changed, 55 insertions(+)
 
 diff --git a/ui/vnc.c b/ui/vnc.c
-index 6f9b718..a09f7c1 100644
+index cffb5b7..77c4027 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
 @@ -51,6 +51,8 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
@@ -43,7 +43,7 @@ index 6f9b718..a09f7c1 100644
  }
  
  int vnc_client_io_error(VncState *vs, int ret, int last_errno)
-@@ -3251,6 +3261,39 @@ char *vnc_display_local_addr(const char *id)
+@@ -3240,6 +3250,39 @@ char *vnc_display_local_addr(const char *id)
      return vnc_socket_local_addr("%s:%s", vs->lsock);
  }
  
@@ -83,7 +83,7 @@ index 6f9b718..a09f7c1 100644
  static QemuOptsList qemu_vnc_opts = {
      .name = "vnc",
      .head = QTAILQ_HEAD_INITIALIZER(qemu_vnc_opts.head),
-@@ -3278,6 +3321,9 @@ static QemuOptsList qemu_vnc_opts = {
+@@ -3267,6 +3310,9 @@ static QemuOptsList qemu_vnc_opts = {
              .name = "connections",
              .type = QEMU_OPT_NUMBER,
          },{
@@ -93,7 +93,7 @@ index 6f9b718..a09f7c1 100644
              .name = "to",
              .type = QEMU_OPT_NUMBER,
          },{
-@@ -3290,6 +3336,9 @@ static QemuOptsList qemu_vnc_opts = {
+@@ -3279,6 +3325,9 @@ static QemuOptsList qemu_vnc_opts = {
              .name = "password",
              .type = QEMU_OPT_BOOL,
          },{
@@ -103,7 +103,7 @@ index 6f9b718..a09f7c1 100644
              .name = "reverse",
              .type = QEMU_OPT_BOOL,
          },{
-@@ -3326,6 +3375,7 @@ void vnc_display_open(const char *id, Error **errp)
+@@ -3443,6 +3492,7 @@ void vnc_display_open(const char *id, Error **errp)
      const char *share, *device_id;
      QemuConsole *con;
      bool password = false;
@@ -111,7 +111,7 @@ index 6f9b718..a09f7c1 100644
      bool reverse = false;
      const char *vnc;
      const char *has_to;
-@@ -3401,6 +3451,10 @@ void vnc_display_open(const char *id, Error **errp)
+@@ -3516,6 +3566,10 @@ void vnc_display_open(const char *id, Error **errp)
                     "methods as an alternative");
          goto fail;
      }
@@ -122,11 +122,11 @@ index 6f9b718..a09f7c1 100644
  
      reverse = qemu_opt_get_bool(opts, "reverse", false);
      lock_key_sync = qemu_opt_get_bool(opts, "lock-key-sync", true);
-@@ -3445,6 +3499,7 @@ void vnc_display_open(const char *id, Error **errp)
+@@ -3569,6 +3623,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);
  
-  #ifdef CONFIG_VNC_WS
      websocket = qemu_opt_get(opts, "websocket");
+     if (websocket) {

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

@@ -1,4 +1,4 @@
-From 8a82ca25e42fb9b547bb3df6758584d375876042 Mon Sep 17 00:00:00 2001
+From 11c16ee5d5fd50ccde9dcf1e2c5a211a008b3b54 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 401ccedfe65286e896b6ff4651dad0196a724be7 Mon Sep 17 00:00:00 2001
+From 61f4e02f62438a0847b2053559e06d3ce4e9848d 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,7 +36,7 @@ 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 1d708bf..9aa15dc 100644
+index 3c9de16..e8b578a 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -5647,10 +5647,10 @@ int syscall_restartable(int syscall_nr)

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

@@ -1,4 +1,4 @@
-From df055bd529dbe5dfd85014d6089d231f649b1e10 Mon Sep 17 00:00:00 2001
+From cdf54d3db3c58438d7dc8aa4713c16d53b565e9f 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 f767767a5bd19552ba1968561e2ca191c1328a16 Mon Sep 17 00:00:00 2001
+From 3fbff970f8d9e2ec753469f0f68ed5b5a7f9ce48 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 53b044412aa1c768a69351e6fbf0e5cb99a87ba4 Mon Sep 17 00:00:00 2001
+From a17b61302eda455e5dc0da33357276934f2067bf 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 b3343a0ecb332a13170fdad61aa6877305d081f8 Mon Sep 17 00:00:00 2001
+From 0c4f5936c8be6fde2e49539ca3e89e048623c707 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 f5050ecb22d9364e905b05257637b1fd7f4a4409 Mon Sep 17 00:00:00 2001
+From f0fd1d5c552afa2e3a7b6e0daeaecdfc2dcd64ae 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 65d9d57555716647319048e305770ad03832baa6 Mon Sep 17 00:00:00 2001
+From 22d133d33ee03b749a5d119f5c51a2ba2b41ef41 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 3c073db35b5c13dab97c594688653be68eec98db Mon Sep 17 00:00:00 2001
+From 228e29d0100b1d87970a875ec1281d793a160991 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,7 +16,7 @@ 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 9aa15dc..3e5e2d3 100644
+index e8b578a..2ed71b6 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,

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

@@ -1,4 +1,4 @@
-From d1dc6aaab69df4019a398e93a55a610aa8e0ca0c Mon Sep 17 00:00:00 2001
+From 96418e39e20fb3f418e67e70ff213d42f542102e 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 13fe032..ebd75a7 100644
+index a698e2d..bbc6233 100644
 --- a/fsdev/virtfs-proxy-helper.c
 +++ b/fsdev/virtfs-proxy-helper.c
 @@ -9,6 +9,13 @@

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

@@ -1,4 +1,4 @@
-From c5b3b3f5ecc19b60719c54aed7bccedf04fb20a9 Mon Sep 17 00:00:00 2001
+From 8c68850233b30b35ab9fb131fd42a99eaa132d18 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 f74a6fd..4271403 100755
+index 589798e..ff18828 100755
 --- a/configure
 +++ b/configure
 @@ -1551,7 +1551,7 @@ fi

0036-qtest-Increase-socket-timeout.patch

@@ -1,4 +1,4 @@
-From 544ceaa85c8f063fd61af7a00a3d0256972d00b3 Mon Sep 17 00:00:00 2001
+From 389736ce698e3bac84afc1259f4ae25cf1f01482 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

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

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

0038-linux-user-Fix-emulation-of-splice-.patch

@@ -1,57 +0,0 @@
-From e471c1b79130da7e1b3ed725cd5a147f8698c386 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@suse.de>
-Date: Thu, 5 Feb 2015 12:31:16 +0100
-Subject: [PATCH] linux-user: Fix emulation of splice syscall
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The second and fourth argument are in/out parameters, store them back
-after the syscall.  Also, the fourth argument was mishandled, and EFAULT
-handling was missing.
-
-Signed-off-by: Andreas Schwab <schwab@suse.de>
-Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- linux-user/syscall.c | 22 ++++++++++++++++++----
- 1 file changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 3e5e2d3..2ed71b6 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -9497,15 +9497,29 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
-         {
-             loff_t loff_in, loff_out;
-             loff_t *ploff_in = NULL, *ploff_out = NULL;
--            if(arg2) {
--                get_user_u64(loff_in, arg2);
-+            if (arg2) {
-+                if (get_user_u64(loff_in, arg2)) {
-+                    goto efault;
-+                }
-                 ploff_in = &loff_in;
-             }
--            if(arg4) {
--                get_user_u64(loff_out, arg2);
-+            if (arg4) {
-+                if (get_user_u64(loff_out, arg4)) {
-+                    goto efault;
-+                }
-                 ploff_out = &loff_out;
-             }
-             ret = get_errno(splice(arg1, ploff_in, arg3, ploff_out, arg5, arg6));
-+            if (arg2) {
-+                if (put_user_u64(loff_in, arg2)) {
-+                    goto efault;
-+                }
-+            }
-+            if (arg4) {
-+                if (put_user_u64(loff_out, arg4)) {
-+                    goto efault;
-+                }
-+            }
-         }
-         break;
- #endif

0039-ide-fix-cmd_write_pio-when-nsectors.patch

@@ -1,38 +0,0 @@
-From 7d51103f2e1a7ec7fe0623cc115f450d57f442b4 Mon Sep 17 00:00:00 2001
-From: John Snow <jsnow@redhat.com>
-Date: Thu, 19 Mar 2015 20:24:13 -0400
-Subject: [PATCH] ide: fix cmd_write_pio when nsectors > 1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We need to adjust the sector being written to
-prior to calling ide_transfer_start, otherwise
-we'll write to the same sector again.
-
-Signed-off-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- hw/ide/core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/ide/core.c b/hw/ide/core.c
-index ef52f35..0e9da64 100644
---- a/hw/ide/core.c
-+++ b/hw/ide/core.c
-@@ -846,6 +846,7 @@ static void ide_sector_write_cb(void *opaque, int ret)
-     s->nsector -= n;
-     s->io_buffer_offset += 512 * n;
- 
-+    ide_set_sector(s, ide_get_sector(s) + n);
-     if (s->nsector == 0) {
-         /* no more sectors to write */
-         ide_transfer_stop(s);
-@@ -857,7 +858,6 @@ static void ide_sector_write_cb(void *opaque, int ret)
-         ide_transfer_start(s, s->io_buffer, n1 * BDRV_SECTOR_SIZE,
-                            ide_sector_write);
-     }
--    ide_set_sector(s, ide_get_sector(s) + n);
- 
-     if (win2k_install_hack && ((++s->irq_count % 16) == 0)) {
-         /* It seems there is a bug in the Windows 2000 installer HDD

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

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

0040-ide-fix-cmd_read_pio-when-nsectors-.patch

@@ -1,39 +0,0 @@
-From bac9220185506f9d0c5ad93a23789334898c3860 Mon Sep 17 00:00:00 2001
-From: John Snow <jsnow@redhat.com>
-Date: Thu, 19 Mar 2015 20:24:14 -0400
-Subject: [PATCH] ide: fix cmd_read_pio when nsectors > 1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Similar to the cmd_write_pio fix, update the nsector count and
-ide sector before we invoke ide_transfer_start.
-
-Signed-off-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- hw/ide/core.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/hw/ide/core.c b/hw/ide/core.c
-index 0e9da64..a895fd8 100644
---- a/hw/ide/core.c
-+++ b/hw/ide/core.c
-@@ -587,14 +587,12 @@ static void ide_sector_read_cb(void *opaque, int ret)
-         n = s->req_nb_sectors;
-     }
- 
--    /* Allow the guest to read the io_buffer */
--    ide_transfer_start(s, s->io_buffer, n * BDRV_SECTOR_SIZE, ide_sector_read);
--
--    ide_set_irq(s->bus);
--
-     ide_set_sector(s, ide_get_sector(s) + n);
-     s->nsector -= n;
-+    /* Allow the guest to read the io_buffer */
-+    ide_transfer_start(s, s->io_buffer, n * BDRV_SECTOR_SIZE, ide_sector_read);
-     s->io_buffer_offset += 512 * n;
-+    ide_set_irq(s->bus);
- }
- 
- static void ide_sector_read(IDEState *s)

0041-ahci-Fix-sglist-offset-manipulation.patch

@@ -1,38 +0,0 @@
-From ec2869aba738e3eea46a3202f41f1d5efe38325b Mon Sep 17 00:00:00 2001
-From: John Snow <jsnow@redhat.com>
-Date: Thu, 19 Mar 2015 20:24:15 -0400
-Subject: [PATCH] ahci: Fix sglist offset manipulation for BE machines
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This does not bother DMA, because DMA generally transfers
-the entire SGList in one shot if it can.
-
-PIO, on the other hand, tries to transfer just one sector
-at a time, and will make multiple visits to the sglist
-to fetch memory addresses.
-
-Fix the memory address calculaton when we have an offset
-by moving the offset addition OUTSIDE of the le64_to_cpu
-calculation.
-
-Signed-off-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- hw/ide/ahci.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
-index e1ae36f..7a223be 100644
---- a/hw/ide/ahci.c
-+++ b/hw/ide/ahci.c
-@@ -799,7 +799,7 @@ static int ahci_populate_sglist(AHCIDevice *ad, QEMUSGList *sglist,
- 
-         qemu_sglist_init(sglist, qbus->parent, (sglist_alloc_hint - off_idx),
-                          ad->hba->as);
--        qemu_sglist_add(sglist, le64_to_cpu(tbl[off_idx].addr + off_pos),
-+        qemu_sglist_add(sglist, le64_to_cpu(tbl[off_idx].addr) + off_pos,
-                         prdt_tbl_entry_size(&tbl[off_idx]) - off_pos);
- 
-         for (i = off_idx + 1; i < sglist_alloc_hint; i++) {

0042-ahci-test-improve-rw-buffer-pattern.patch

@@ -1,94 +0,0 @@
-From cd75c139869ea1fa98eeaf2d8b7004d8da0e1bbe Mon Sep 17 00:00:00 2001
-From: John Snow <jsnow@redhat.com>
-Date: Thu, 19 Mar 2015 20:24:16 -0400
-Subject: [PATCH] ahci-test: improve rw buffer patterns
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-My pattern was cyclical every 256 bytes, so it missed a fairly obvious
-failure case. Add some rand() pepper into the test pattern, and for large
-patterns that exceed 256 sectors, start writing an ID per-sector so that
-we never generate identical sector patterns.
-
-Signed-off-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- tests/ahci-test.c | 36 ++++++++++++++++++++++++++++--------
- 1 file changed, 28 insertions(+), 8 deletions(-)
-
-diff --git a/tests/ahci-test.c b/tests/ahci-test.c
-index cf0b98b..82e2efd 100644
---- a/tests/ahci-test.c
-+++ b/tests/ahci-test.c
-@@ -68,6 +68,32 @@ static void string_bswap16(uint16_t *s, size_t bytes)
-     }
- }
- 
-+static void generate_pattern(void *buffer, size_t len, size_t cycle_len)
-+{
-+    int i, j;
-+    unsigned char *tx = (unsigned char *)buffer;
-+    unsigned char p;
-+    size_t *sx;
-+
-+    /* Write an indicative pattern that varies and is unique per-cycle */
-+    p = rand() % 256;
-+    for (i = j = 0; i < len; i++, j++) {
-+        tx[i] = p;
-+        if (j % cycle_len == 0) {
-+            p = rand() % 256;
-+        }
-+    }
-+
-+    /* force uniqueness by writing an id per-cycle */
-+    for (i = 0; i < len / cycle_len; i++) {
-+        j = i * cycle_len;
-+        if (j + sizeof(*sx) <= len) {
-+            sx = (size_t *)&tx[j];
-+            *sx = i;
-+        }
-+    }
-+}
-+
- /*** Test Setup & Teardown ***/
- 
- /**
-@@ -736,7 +762,6 @@ static void ahci_test_io_rw_simple(AHCIQState *ahci, unsigned bufsize,
- {
-     uint64_t ptr;
-     uint8_t port;
--    unsigned i;
-     unsigned char *tx = g_malloc(bufsize);
-     unsigned char *rx = g_malloc0(bufsize);
- 
-@@ -752,9 +777,7 @@ static void ahci_test_io_rw_simple(AHCIQState *ahci, unsigned bufsize,
-     g_assert(ptr);
- 
-     /* Write some indicative pattern to our buffer. */
--    for (i = 0; i < bufsize; i++) {
--        tx[i] = (bufsize - i);
--    }
-+    generate_pattern(tx, bufsize, AHCI_SECTOR_SIZE);
-     memwrite(ptr, tx, bufsize);
- 
-     /* Write this buffer to disk, then read it back to the DMA buffer. */
-@@ -865,7 +888,6 @@ static void test_dma_fragmented(void)
-     size_t bufsize = 4096;
-     unsigned char *tx = g_malloc(bufsize);
-     unsigned char *rx = g_malloc0(bufsize);
--    unsigned i;
-     uint64_t ptr;
- 
-     ahci = ahci_boot_and_enable();
-@@ -873,9 +895,7 @@ static void test_dma_fragmented(void)
-     ahci_port_clear(ahci, px);
- 
-     /* create pattern */
--    for (i = 0; i < bufsize; i++) {
--        tx[i] = (bufsize - i);
--    }
-+    generate_pattern(tx, bufsize, AHCI_SECTOR_SIZE);
- 
-     /* Create a DMA buffer in guest memory, and write our pattern to it. */
-     ptr = guest_alloc(ahci->parent->alloc, bufsize);

0045-linux-user-fix-broken-cpu_copy.patch

@@ -1,30 +0,0 @@
-From 14537bb8faabb603627e1b0845be0870d4cef8ba Mon Sep 17 00:00:00 2001
-From: Leon Alrae <leon.alrae@imgtec.com>
-Date: Mon, 23 Mar 2015 12:55:52 +0000
-Subject: [PATCH] linux-user: fix broken cpu_copy()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-New threads always point at the same env which is incorrect and usually
-leads to a crash.
-
-Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- linux-user/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux-user/main.c b/linux-user/main.c
-index 3cb2140..be28e37 100644
---- a/linux-user/main.c
-+++ b/linux-user/main.c
-@@ -3460,7 +3460,7 @@ CPUArchState *cpu_copy(CPUArchState *env)
- {
-     CPUState *cpu = ENV_GET_CPU(env);
-     CPUState *new_cpu = cpu_init(cpu_model);
--    CPUArchState *new_env = cpu->env_ptr;
-+    CPUArchState *new_env = new_cpu->env_ptr;
-     CPUBreakpoint *bp;
-     CPUWatchpoint *wp;
- 

libcacard.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Mar 26 14:49:44 UTC 2015 - afaerber@suse.de
+
+- Update to v2.3.0-rc1: 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-linux-user-Fix-emulation-of-splice-.patch
+  0039-ide-fix-cmd_write_pio-when-nsectors.patch
+  0040-ide-fix-cmd_read_pio-when-nsectors-.patch
+  0041-ahci-Fix-sglist-offset-manipulation.patch
+  0042-ahci-test-improve-rw-buffer-pattern.patch
+  0045-linux-user-fix-broken-cpu_copy.patch
+* Patches renamed:
+  0043-fw_cfg-test-Fix-test-path-to-includ.patch -> 0038-fw_cfg-test-Fix-test-path-to-includ.patch
+  0044-rcu-tests-fix-compilation-on-32-bit.patch -> 0039-rcu-tests-fix-compilation-on-32-bit.patch
+
 -------------------------------------------------------------------
 Mon Mar 23 13:20:39 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.90
+Version:        2.2.91
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc1.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,14 +62,8 @@ 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-linux-user-Fix-emulation-of-splice-.patch
-Patch0039:      0039-ide-fix-cmd_write_pio-when-nsectors.patch
-Patch0040:      0040-ide-fix-cmd_read_pio-when-nsectors-.patch
-Patch0041:      0041-ahci-Fix-sglist-offset-manipulation.patch
-Patch0042:      0042-ahci-test-improve-rw-buffer-pattern.patch
-Patch0043:      0043-fw_cfg-test-Fix-test-path-to-includ.patch
-Patch0044:      0044-rcu-tests-fix-compilation-on-32-bit.patch
-Patch0045:      0045-linux-user-fix-broken-cpu_copy.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
@@ -128,7 +122,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-rc0
+%setup -q -n qemu-2.3.0-rc1
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -168,12 +162,6 @@ This sub-package contains development files for the Smartcard library.
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
-%patch0044 -p1
-%patch0045 -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-rc0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc1.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-rc0
+%setup -q -n qemu-2.3.0-rc1
 PATCH_EXEC
 
 %build

qemu-2.3.0-rc0.tar.bz2

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

qemu-2.3.0-rc1.tar.bz2

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

qemu-linux-user.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Mar 26 14:49:43 UTC 2015 - afaerber@suse.de
+
+- Update to v2.3.0-rc1: 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-linux-user-Fix-emulation-of-splice-.patch
+  0039-ide-fix-cmd_write_pio-when-nsectors.patch
+  0040-ide-fix-cmd_read_pio-when-nsectors-.patch
+  0041-ahci-Fix-sglist-offset-manipulation.patch
+  0042-ahci-test-improve-rw-buffer-pattern.patch
+  0045-linux-user-fix-broken-cpu_copy.patch
+* Patches renamed:
+  0043-fw_cfg-test-Fix-test-path-to-includ.patch -> 0038-fw_cfg-test-Fix-test-path-to-includ.patch
+  0044-rcu-tests-fix-compilation-on-32-bit.patch -> 0039-rcu-tests-fix-compilation-on-32-bit.patch
+
 -------------------------------------------------------------------
 Mon Mar 23 13:20:35 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.90
+Version:        2.2.91
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc1.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,14 +62,8 @@ 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-linux-user-Fix-emulation-of-splice-.patch
-Patch0039:      0039-ide-fix-cmd_write_pio-when-nsectors.patch
-Patch0040:      0040-ide-fix-cmd_read_pio-when-nsectors-.patch
-Patch0041:      0041-ahci-Fix-sglist-offset-manipulation.patch
-Patch0042:      0042-ahci-test-improve-rw-buffer-pattern.patch
-Patch0043:      0043-fw_cfg-test-Fix-test-path-to-includ.patch
-Patch0044:      0044-rcu-tests-fix-compilation-on-32-bit.patch
-Patch0045:      0045-linux-user-fix-broken-cpu_copy.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 +116,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-rc0
+%setup -q -n qemu-2.3.0-rc1
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -162,12 +156,6 @@ run cross-architecture builds.
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
-%patch0044 -p1
-%patch0045 -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-rc0.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.3.0-rc1.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-rc0
+%setup -q -n qemu-2.3.0-rc1
 PATCH_EXEC
 
 %build

qemu.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Mar 26 14:49:43 UTC 2015 - afaerber@suse.de
+
+- Build x86 firmware only from 13.1 on (11.4 was broken, surpassing 128 KB)
+- Update to v2.3.0-rc1: 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-linux-user-Fix-emulation-of-splice-.patch
+  0039-ide-fix-cmd_write_pio-when-nsectors.patch
+  0040-ide-fix-cmd_read_pio-when-nsectors-.patch
+  0041-ahci-Fix-sglist-offset-manipulation.patch
+  0042-ahci-test-improve-rw-buffer-pattern.patch
+  0045-linux-user-fix-broken-cpu_copy.patch
+* Patches renamed:
+  0043-fw_cfg-test-Fix-test-path-to-includ.patch -> 0038-fw_cfg-test-Fix-test-path-to-includ.patch
+  0044-rcu-tests-fix-compilation-on-32-bit.patch -> 0039-rcu-tests-fix-compilation-on-32-bit.patch
+
 -------------------------------------------------------------------
 Mon Mar 23 13:20:31 UTC 2015 - afaerber@suse.de
 

qemu.spec

@@ -18,7 +18,7 @@
 
 %ifarch %ix86 x86_64
 # choice of building all from source or using provided binary x86 blobs
-%if 0%{?suse_version} >= 1140
+%if 0%{?suse_version} >= 1310
 %define build_x86_fw_from_source 1
 %else
 %define build_x86_fw_from_source 0
@@ -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.90
+Version:        2.2.91
 Release:        0
-Source:         http://wiki.qemu.org/download/%name-2.3.0-rc0.tar.bz2
-Source99:       http://wiki.qemu.org/download/%name-2.3.0-rc0.tar.bz2.sig
+Source:         http://wiki.qemu.org/download/%name-2.3.0-rc1.tar.bz2
+Source99:       http://wiki.qemu.org/download/%name-2.3.0-rc1.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -93,14 +93,8 @@ 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-linux-user-Fix-emulation-of-splice-.patch
-Patch0039:      0039-ide-fix-cmd_write_pio-when-nsectors.patch
-Patch0040:      0040-ide-fix-cmd_read_pio-when-nsectors-.patch
-Patch0041:      0041-ahci-Fix-sglist-offset-manipulation.patch
-Patch0042:      0042-ahci-test-improve-rw-buffer-pattern.patch
-Patch0043:      0043-fw_cfg-test-Fix-test-path-to-includ.patch
-Patch0044:      0044-rcu-tests-fix-compilation-on-32-bit.patch
-Patch0045:      0045-linux-user-fix-broken-cpu_copy.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.
 
@@ -479,7 +473,7 @@ This package provides a service file for starting and stopping KSM.
 %endif
 
 %prep
-%setup -q -n %name-2.3.0-rc0
+%setup -q -n %name-2.3.0-rc1
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -519,12 +513,6 @@ This package provides a service file for starting and stopping KSM.
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
-%patch0044 -p1
-%patch0045 -p1
 
 %if %{build_x86_fw_from_source}
 pushd roms/seabios

qemu.spec.in

@@ -18,7 +18,7 @@
 
 %ifarch %ix86 x86_64
 # choice of building all from source or using provided binary x86 blobs
-%if 0%{?suse_version} >= 1140
+%if 0%{?suse_version} >= 1310
 %define build_x86_fw_from_source 1
 %else
 %define build_x86_fw_from_source 0
@@ -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-rc0.tar.bz2
-Source99:       http://wiki.qemu.org/download/%name-2.3.0-rc0.tar.bz2.sig
+Source:         http://wiki.qemu.org/download/%name-2.3.0-rc1.tar.bz2
+Source99:       http://wiki.qemu.org/download/%name-2.3.0-rc1.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -435,7 +435,7 @@ This package provides a service file for starting and stopping KSM.
 %endif
 
 %prep
-%setup -q -n %name-2.3.0-rc0
+%setup -q -n %name-2.3.0-rc1
 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-rc0
+GIT_UPSTREAM_TAG=v2.3.0-rc1
 GIT_DIR=/dev/shm/qemu-factory-git-dir
 CMP_DIR=/dev/shm/qemu-factory-cmp-dir