Accepting request 630954 from Virtualization:Staging

Update to v3.0.0 version

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

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

@@ -1,4 +1,4 @@
-From 1c52bb7e5eddde98e1ec2b93dce09976ca8c5d31 Mon Sep 17 00:00:00 2001
+From fc0c1906704dfc1c699bf1397e02e5887fd13da6 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 b283270391..93ba2c3304 100644
+index 602b631b92..49b00e0b2b 100644
 --- a/linux-user/signal.c
 +++ b/linux-user/signal.c
-@@ -560,6 +560,10 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig)
+@@ -575,6 +575,10 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig)
      trace_user_force_sig(env, target_sig, host_sig);
      gdb_signalled(env, target_sig);
  
@@ -22,7 +22,7 @@ index b283270391..93ba2c3304 100644
      /* dump core if supported by target binary format */
      if (core_dump_signal(target_sig) && (ts->bprm->core_dump != NULL)) {
          stop_all_tasks();
-@@ -577,6 +581,8 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig)
+@@ -592,6 +596,8 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig)
              target_sig, strsignal(host_sig), "core dumped" );
      }
  

0002-qemu-binfmt-conf-Modify-default-pat.patch

@@ -1,4 +1,4 @@
-From ff80b2b25fe1068630412065e9be32dbad1cc51d Mon Sep 17 00:00:00 2001
+From e7c65bc5548a677685a73132ae6113cfd511599c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 10 Aug 2016 19:00:24 +0200
 Subject: [PATCH] qemu-binfmt-conf: Modify default path
@@ -14,15 +14,15 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
-index 7ab7435fbd..adb3e1a613 100755
+index b0dc8a714a..e6a120e842 100755
 --- a/scripts/qemu-binfmt-conf.sh
 +++ b/scripts/qemu-binfmt-conf.sh
-@@ -299,7 +299,7 @@ BINFMT_SET=qemu_register_interpreter
+@@ -315,7 +315,7 @@ BINFMT_SET=qemu_register_interpreter
  SYSTEMDDIR="/etc/binfmt.d"
  DEBIANDIR="/usr/share/binfmts"
  
 -QEMU_PATH=/usr/local/bin
 +QEMU_PATH=/usr/bin
- FLAGS=""
+ CREDENTIAL=no
- 
+ PERSISTENT=no
- options=$(getopt -o ds:Q:e:hc: -l debian,systemd:,qemu-path:,exportdir:,help,credential: -- "$@")
+ QEMU_SUFFIX=""

0003-qemu-cvs-gettimeofday.patch

@@ -1,4 +1,4 @@
-From d41683a7c527171a36f3f77e448f0599b9a6e1f4 Mon Sep 17 00:00:00 2001
+From 6d0df1babae523ed024402f716b433a2628473d4 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 643b8833de..db2a3f132c 100644
+index dfc851cc35..fec6d16aa6 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -9159,6 +9159,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -9292,6 +9292,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
      case TARGET_NR_gettimeofday:
          {
              struct timeval tv;

0004-qemu-cvs-ioctl_debug.patch

@@ -1,4 +1,4 @@
-From 7ea11bc96063bd9256a8e0106e9886ba9c20c951 Mon Sep 17 00:00:00 2001
+From 252fd8536222a6f851aae919665959a1fe2783fd 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 db2a3f132c..ef7de52667 100644
+index fec6d16aa6..0c4ba18b2f 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5698,7 +5698,12 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+@@ -5770,7 +5770,12 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
      ie = ioctl_entries;
      for(;;) {
          if (ie->target_cmd == 0) {

0005-qemu-cvs-ioctl_nodirection.patch

@@ -1,4 +1,4 @@
-From 62603c271e2ea6bbd3e6f9b463d8450f712e16fc Mon Sep 17 00:00:00 2001
+From a82a766a9e2802352c5a0f4e66ddb3be84e32afc 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 ef7de52667..25cc3e90bc 100644
+index 0c4ba18b2f..76c1cbe36e 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5735,6 +5735,11 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+@@ -5807,6 +5807,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 ef7de52667..25cc3e90bc 100644
          case IOC_R:
              ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp));
              if (!is_error(ret)) {
-@@ -5753,6 +5758,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+@@ -5825,6 +5830,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
              unlock_user(argptr, arg, 0);
              ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp));
              break;

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

@@ -1,4 +1,4 @@
-From 7a2745150f04fcc553a715421a60cc3f85c6794f Mon Sep 17 00:00:00 2001
+From 8d952c63e49ef3f04a79d3e2bc58a5c555bae585 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
@@ -36,12 +36,12 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  3 files changed, 57 insertions(+)
 
 diff --git a/Makefile.target b/Makefile.target
-index d0ec77a307..ddd1b0f1e9 100644
+index 4d56298bbf..c85327169f 100644
 --- a/Makefile.target
 +++ b/Makefile.target
-@@ -36,6 +36,10 @@ endif
+@@ -41,6 +41,10 @@ ifdef CONFIG_USER_ONLY
- PROGS=$(QEMU_PROG) $(QEMU_PROGW)
+ include $(SRC_PATH)/tests/tcg/Makefile.include
- STPFILES=
+ endif
  
 +ifdef CONFIG_LINUX_USER
 +PROGS+=$(QEMU_PROG)-binfmt
@@ -50,7 +50,7 @@ index d0ec77a307..ddd1b0f1e9 100644
  config-target.h: config-target.h-timestamp
  config-target.h-timestamp: config-target.mak
  
-@@ -114,6 +118,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
+@@ -119,6 +123,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
  obj-y += linux-user/
  obj-y += gdbstub.o thunk.o
  
@@ -59,7 +59,7 @@ index d0ec77a307..ddd1b0f1e9 100644
  endif #CONFIG_LINUX_USER
  
  #########################################################
-@@ -155,7 +161,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)
  
@@ -71,7 +71,7 @@ index d0ec77a307..ddd1b0f1e9 100644
  all-obj-y := $(obj-y)
  
  target-obj-y :=
-@@ -196,6 +206,9 @@ ifdef CONFIG_DARWIN
+@@ -202,6 +212,9 @@ ifdef CONFIG_DARWIN
  	$(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@")
  endif
  
@@ -82,10 +82,10 @@ index d0ec77a307..ddd1b0f1e9 100644
  	$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@")
  
 diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
-index 8c93058100..607ca2dc92 100644
+index b5dfb71f25..cfd71c2648 100644
 --- a/linux-user/Makefile.objs
 +++ b/linux-user/Makefile.objs
-@@ -6,3 +6,5 @@ obj-$(TARGET_HAS_BFLT) += flatload.o
+@@ -7,3 +7,5 @@ obj-$(TARGET_HAS_BFLT) += flatload.o
  obj-$(TARGET_I386) += vm86.o
  obj-$(TARGET_ARM) += arm/nwfpe/
  obj-$(TARGET_M68K) += m68k-sim.o

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

@@ -1,4 +1,4 @@
-From c3dee2b9a06d0f7c0e5093cf3fb98f5f4dbe2912 Mon Sep 17 00:00:00 2001
+From a98cb00cf67a473e816ecde4058f9f4c01cd6d57 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 02b1efebb7..3caa8c1eed 100644
+index 4f5df07b6a..71520a9c89 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -2052,11 +2052,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
+@@ -2270,11 +2270,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
          return NULL;
      }
  

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

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

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

@@ -1,42 +0,0 @@
-From d082166f9ab67080ceddde9293fac81adf5519f2 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When entering the guest we take a lock to ensure that nobody else messes
-with our TB chaining while we're doing it. If we get a segfault inside that
-code, we manage to work on, but will not unlock the lock.
-
-This patch forces unlocking of that lock in the segv handler. I'm not sure
-this is the right approach though. Maybe we should rather make sure we don't
-segfault in the code? I would greatly appreciate someone more intelligible
-than me to look at this :).
-
-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>
----
- accel/tcg/user-exec.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
-index 26a3ffbba1..43bbf92f36 100644
---- a/accel/tcg/user-exec.c
-+++ b/accel/tcg/user-exec.c
-@@ -103,6 +103,10 @@ static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info,
-     printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n",
-            pc, address, is_write, *(unsigned long *)old_set);
- #endif
-+
-+    /* Maybe we're still holding the TB fiddling lock? */
-+    tb_lock_reset();
-+
-     /* XXX: locking issue */
-     /* Note that it is important that we don't call page_unprotect() unless
-      * this is really a "write to nonwriteable page" fault, because

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

@@ -1,4 +1,4 @@
-From a7335abe6db76da2d826fdab1effae19b95a4a8c Mon Sep 17 00:00:00 2001
+From 7511bbd3bc2037599632fd8ff288fb3d32668977 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 25cc3e90bc..d1e14071ad 100644
+index 76c1cbe36e..1b55bd11c5 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -7566,6 +7566,25 @@ static int open_self_stat(void *cpu_env, int fd)
+@@ -7702,6 +7702,25 @@ static int open_self_stat(void *cpu_env, int fd)
      return 0;
  }
  
@@ -51,7 +51,7 @@ index 25cc3e90bc..d1e14071ad 100644
  static int open_self_auxv(void *cpu_env, int fd)
  {
      CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env);
-@@ -7680,6 +7699,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
+@@ -7816,6 +7835,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

0010-Remove-problematic-evdev-86-key-fro.patch

@@ -1,4 +1,4 @@
-From 3342309d6c6c1b426e856d4575c7f757e031fa00 Mon Sep 17 00:00:00 2001
+From e13afd152f77bb443153a04bc9a1a3ef798859c1 Mon Sep 17 00:00:00 2001
 From: Adam Williamson <awilliam@redhat.com>
 Date: Wed, 20 Dec 2017 15:43:07 -0800
 Subject: [PATCH] Remove problematic 'evdev 86' key from en-us keymap

0011-linux-user-use-target_ulong.patch

@@ -1,4 +1,4 @@
-From 34e9123848291dcfa90aab73e6a6117054e5155c Mon Sep 17 00:00:00 2001
+From 4aecd955fdf4122a71f9b638650e0eec24ac725b 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 192a0d2fef..725f3f5e63 100644
+index b4959e41c6..51ea01f2ef 100644
 --- a/linux-user/qemu.h
 +++ b/linux-user/qemu.h
-@@ -192,10 +192,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
+@@ -202,10 +202,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 192a0d2fef..725f3f5e63 100644
  extern __thread CPUState *thread_cpu;
  void cpu_loop(CPUArchState *env);
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index d1e14071ad..65d9391e47 100644
+index 1b55bd11c5..c2f2cb10b9 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -7884,10 +7884,10 @@ static int host_to_target_cpu_mask(const unsigned long *host_mask,
+@@ -8020,10 +8020,10 @@ static int host_to_target_cpu_mask(const unsigned long *host_mask,
  /* 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>. */

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

@@ -1,4 +1,4 @@
-From 515368558bf1a4a36c58510047b55a6b8e096c39 Mon Sep 17 00:00:00 2001
+From b45f8e8056de05f0f116066038b1b207bb8d01ff 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
@@ -105,7 +105,7 @@ index 1e13187767..3a000a9e9f 100644
      int mux_cnt;
      int term_got_escape;
 diff --git a/tests/test-char.c b/tests/test-char.c
-index b81b1e8e05..f90ae770cd 100644
+index 5905d31441..15361748c7 100644
 --- a/tests/test-char.c
 +++ b/tests/test-char.c
 @@ -1,3 +1,4 @@

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

@@ -1,4 +1,4 @@
-From 8eaf05e41e21e772fa3cb502e5e08b390f630914 Mon Sep 17 00:00:00 2001
+From 8c551cc70f35d5aee57fc4da9e58c81d8fec26b5 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 65d9391e47..fdf33b3279 100644
+index c2f2cb10b9..b743694853 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -8263,9 +8263,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+@@ -8396,9 +8396,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
      case TARGET_NR_oldstat:
          goto unimplemented;
  #endif

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

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

0015-xen_disk-Add-suse-specific-flush-di.patch

@@ -1,4 +1,4 @@
-From 5cd1a933c12cf0ae8146e6555a41179ad255431b Mon Sep 17 00:00:00 2001
+From 6ed042659b642186b1717038dbd93cd92da0030f Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Wed, 9 Mar 2016 15:18:11 -0700
 Subject: [PATCH] xen_disk: Add suse specific flush disable handling and map to
@@ -13,22 +13,23 @@ Patch taken from Xen's patch queue, Olaf Hering being the original author.
 Signed-off-by: Bruce Rogers <brogers@suse.com>
 Signed-off-by: Olaf Hering <olaf@aepfle.de>
 ---
- hw/block/xen_disk.c | 15 +++++++++++++++
+ hw/block/xen_disk.c | 16 ++++++++++++++++
- 1 file changed, 15 insertions(+)
+ 1 file changed, 16 insertions(+)
 
 diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
-index f74fcd42d1..1696382f36 100644
+index 36eff94f84..2b56c5e868 100644
 --- a/hw/block/xen_disk.c
 +++ b/hw/block/xen_disk.c
-@@ -115,6 +115,7 @@ struct XenBlkDev {
+@@ -90,6 +90,8 @@ struct XenBlkDev {
      int                 requests_finished;
      unsigned int        max_requests;
  
 +    gboolean            cache_unsafe;
-     /* Persistent grants extension */
++    /* Persistent grants extension */
      gboolean            feature_discard;
-     gboolean            feature_persistent;
+ 
-@@ -967,6 +968,16 @@ static void blk_parse_discard(struct XenBlkDev *blkdev)
+     /* qemu block driver */
+@@ -642,6 +644,16 @@ static void blk_parse_discard(struct XenBlkDev *blkdev)
      }
  }
  
@@ -45,7 +46,7 @@ index f74fcd42d1..1696382f36 100644
  static int blk_init(struct XenDevice *xendev)
  {
      struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev);
-@@ -1047,6 +1058,7 @@ static int blk_init(struct XenDevice *xendev)
+@@ -717,6 +729,7 @@ static int blk_init(struct XenDevice *xendev)
                            MAX_RING_PAGE_ORDER);
  
      blk_parse_discard(blkdev);
@@ -53,7 +54,7 @@ index f74fcd42d1..1696382f36 100644
  
      g_free(directiosafe);
      return 0;
-@@ -1104,6 +1116,9 @@ static int blk_connect(struct XenDevice *xendev)
+@@ -764,6 +777,9 @@ static int blk_connect(struct XenDevice *xendev)
          qflags |= BDRV_O_UNMAP;
      }
  
@@ -61,5 +62,5 @@ index f74fcd42d1..1696382f36 100644
 +        qflags |= BDRV_O_NO_FLUSH;
 +
      /* init qemu block driver */
-     index = (blkdev->xendev.dev - 202 * 256) / 16;
+     index = (xendev->dev - 202 * 256) / 16;
      blkdev->dinfo = drive_get(IF_XEN, 0, index);

0016-qemu-bridge-helper-reduce-security-.patch

@@ -1,4 +1,4 @@
-From 880795f6609a675f7926228ee71821d64062ea1c Mon Sep 17 00:00:00 2001
+From 960e9697aba84c52bb0a16512300d2a4ee4119c5 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Tue, 2 Aug 2016 11:36:02 -0600
 Subject: [PATCH] qemu-bridge-helper: reduce security profile

0017-qemu-binfmt-conf-use-qemu-ARCH-binf.patch

@@ -1,4 +1,4 @@
-From de37332ee7019356d8d6b14aa4ad701f9b97113b Mon Sep 17 00:00:00 2001
+From 1247ffeb8bfce7ec3e048fbe8b2864933b1cdb15 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@suse.de>
 Date: Fri, 12 Aug 2016 18:20:49 +0200
 Subject: [PATCH] qemu-binfmt-conf: use qemu-ARCH-binfmt
@@ -13,19 +13,19 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
-index adb3e1a613..1107386b80 100755
+index e6a120e842..3f031ca681 100755
 --- a/scripts/qemu-binfmt-conf.sh
 +++ b/scripts/qemu-binfmt-conf.sh
-@@ -241,7 +241,7 @@ qemu_check_systemd() {
+@@ -258,7 +258,7 @@ qemu_generate_register() {
- }
+         flags="${flags}F"
+     fi
  
- qemu_generate_register() {
+-    echo ":qemu-$cpu:M::$magic:$mask:$qemu:$flags"
--    echo ":qemu-$cpu:M::$magic:$mask:$qemu:$FLAGS"
++    echo ":qemu-$cpu:M::$magic:$mask:$qemu:P$flags"
-+    echo ":qemu-$cpu:M::$magic:$mask:$qemu:P$FLAGS"
  }
  
  qemu_register_interpreter() {
-@@ -282,9 +282,9 @@ qemu_set_binfmts() {
+@@ -297,9 +297,9 @@ qemu_set_binfmts() {
              continue
          fi
  
@@ -36,4 +36,4 @@ index adb3e1a613..1107386b80 100755
 +            qemu="$QEMU_PATH/qemu-i386-binfmt"
          fi
  
-         if [ "$host_family" != "$family" ] ; then
+         qemu="$qemu$QEMU_SUFFIX"

0018-linux-user-properly-test-for-infini.patch

@@ -1,4 +1,4 @@
-From 2207224e716784c1de3877bbb208572b59e33516 Mon Sep 17 00:00:00 2001
+From 94c36b397d6948d3fd704874acb923b504098214 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@linux-m68k.org>
 Date: Thu, 8 Sep 2016 11:21:05 +0200
 Subject: [PATCH] linux-user: properly test for infinite timeout in poll (#8)
@@ -16,10 +16,10 @@ Signed-off-by: Andreas Schwab <schwab@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index fdf33b3279..7c71c74983 100644
+index b743694853..bdf7571bd3 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -10449,7 +10449,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+@@ -10580,7 +10580,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
              {
                  struct timespec ts, *pts;
  

0019-roms-Makefile-pass-a-packaging-time.patch

@@ -1,4 +1,4 @@
-From f1427767434f6cb0dab71e8333e489f38f3194a2 Mon Sep 17 00:00:00 2001
+From d952859543912a233b133a0b614b4b871ca98535 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Sat, 19 Nov 2016 08:06:30 -0700
 Subject: [PATCH] roms/Makefile: pass a packaging timestamp to subpackages with
@@ -20,7 +20,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/roms/Makefile b/roms/Makefile
-index 02b69fbac8..7d97ba46a9 100644
+index f1ac85ae9b..6d590147e4 100644
 --- a/roms/Makefile
 +++ b/roms/Makefile
 @@ -52,6 +52,12 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org"
@@ -36,7 +36,7 @@ index 02b69fbac8..7d97ba46a9 100644
  default:
  	@echo "nothing is build by default"
  	@echo "available build targets:"
-@@ -107,7 +113,7 @@ build-lgplvgabios:
+@@ -95,7 +101,7 @@ build-seabios-config-%: config.%
  
  .PHONY: sgabios skiboot
  sgabios:
@@ -45,7 +45,7 @@ index 02b69fbac8..7d97ba46a9 100644
  	cp sgabios/sgabios.bin ../pc-bios
  
  
-@@ -127,18 +133,22 @@ efi-rom-%: build-pxe-roms build-efi-roms
+@@ -115,18 +121,22 @@ efi-rom-%: build-pxe-roms build-efi-roms
  
  build-pxe-roms:
  	$(MAKE) -C ipxe/src CONFIG=qemu \

0020-Raise-soft-address-space-limit-to-h.patch

@@ -1,4 +1,4 @@
-From 5121ac04d076e3855b7d1d3657658b44171ec30c Mon Sep 17 00:00:00 2001
+From a6216a05efcd1354fcbfbdecf89c75651d9a8447 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Sun, 15 Jan 2012 19:53:49 +0100
 Subject: [PATCH] Raise soft address space limit to hard limit
@@ -17,18 +17,18 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  1 file changed, 12 insertions(+)
 
 diff --git a/vl.c b/vl.c
-index fce1fd12d8..c00a250831 100644
+index 16b913f9d5..3af5bcdc9e 100644
 --- a/vl.c
 +++ b/vl.c
-@@ -28,6 +28,7 @@
+@@ -29,6 +29,7 @@
  #include "qemu/cutils.h"
  #include "qemu/help_option.h"
  #include "qemu/uuid.h"
 +#include <sys/resource.h>
+ #include "sysemu/seccomp.h"
  
- #ifdef CONFIG_SECCOMP
+ #ifdef CONFIG_SDL
- #include <sys/prctl.h>
+@@ -2949,6 +2950,7 @@ int main(int argc, char **argv, char **envp)
-@@ -3059,6 +3060,7 @@ int main(int argc, char **argv, char **envp)
      } BlockdevOptions_queue;
      QSIMPLEQ_HEAD(, BlockdevOptions_queue) bdo_queue
          = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue);
@@ -36,7 +36,7 @@ index fce1fd12d8..c00a250831 100644
  
      module_call_init(MODULE_INIT_TRACE);
  
-@@ -3067,6 +3069,16 @@ int main(int argc, char **argv, char **envp)
+@@ -2957,6 +2959,16 @@ int main(int argc, char **argv, char **envp)
  
      qemu_mutex_lock_iothread();
  

0021-increase-x86_64-physical-bits-to-42.patch

@@ -1,4 +1,4 @@
-From f3fc8add8b9999be0c050be64b66d1bb5c95372b Mon Sep 17 00:00:00 2001
+From 3efe84f92126685bd9c82a9b0ee3c3f2e00515f7 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 17 May 2013 16:49:58 -0600
 Subject: [PATCH] increase x86_64 physical bits to 42
@@ -19,10 +19,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index 75e821cefe..e63205d1f0 100644
+index c18863ec7a..7e1a04fb6c 100644
 --- a/target/i386/cpu.h
 +++ b/target/i386/cpu.h
-@@ -1586,7 +1586,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
+@@ -1675,7 +1675,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
  /* XXX: This value should match the one returned by CPUID
   * and in exec.c */
  # if defined(TARGET_X86_64)

0022-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch

@@ -1,4 +1,4 @@
-From 988cfa72f5a1853abcec4608f0c7ecb0807906b6 Mon Sep 17 00:00:00 2001
+From edd9909ef3e115102f142f23aaa298d6928a97b9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 12 Jun 2013 19:26:37 +0200
 Subject: [PATCH] vga: Raise VRAM to 16 MiB for pc-0.15 and below
@@ -25,10 +25,10 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  1 file changed, 26 insertions(+), 1 deletion(-)
 
 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
-index 729a0508aa..6000f8c898 100644
+index dc09466b3e..7c6a9bdaa3 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
-@@ -797,7 +797,32 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,
+@@ -809,7 +809,32 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,
  
  
  #define PC_COMPAT_0_15 \

0023-i8254-Fix-migration-from-SLE11-SP2.patch

@@ -1,4 +1,4 @@
-From 24d6420ba7194b0c06e41ad464eca93292a41ede Mon Sep 17 00:00:00 2001
+From 83a2c6af42a497053dcf1614879896f4609eaa55 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 31 Jul 2013 17:05:29 +0200
 Subject: [PATCH] i8254: Fix migration from SLE11 SP2

0024-acpi_piix4-Fix-migration-from-SLE11.patch

@@ -1,4 +1,4 @@
-From e60d65bd393ce6c5389fa4f1ee7743de7ce1bcaa Mon Sep 17 00:00:00 2001
+From ff50be5b0f523ba1e5137e1d1eacd509b92d4079 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 31 Jul 2013 17:32:35 +0200
 Subject: [PATCH] acpi_piix4: Fix migration from SLE11 SP2
@@ -17,10 +17,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
-index 8b703455b7..4fddf8d694 100644
+index 6404af5f33..4e74f91f77 100644
 --- a/hw/acpi/piix4.c
 +++ b/hw/acpi/piix4.c
-@@ -311,7 +311,7 @@ static const VMStateDescription vmstate_cpuhp_state = {
+@@ -310,7 +310,7 @@ static const VMStateDescription vmstate_cpuhp_state = {
  static const VMStateDescription vmstate_acpi = {
      .name = "piix4_pm",
      .version_id = 3,

0025-Fix-tigervnc-long-press-issue.patch

@@ -1,4 +1,4 @@
-From 64706e7671a07bce389c48c77369c1cd76b2b9cb Mon Sep 17 00:00:00 2001
+From 613a8ec4414bbc66f4997f0ebf0679d1c5d49544 Mon Sep 17 00:00:00 2001
 From: Chunyan Liu <cyliu@suse.com>
 Date: Thu, 3 Mar 2016 16:48:17 +0800
 Subject: [PATCH] Fix tigervnc long press issue
@@ -24,10 +24,10 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
  1 file changed, 19 insertions(+)
 
 diff --git a/ui/vnc.c b/ui/vnc.c
-index 5526e54f48..a4b2cc7666 100644
+index 359693238b..3dd8528a5e 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
-@@ -1818,6 +1818,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
+@@ -1825,6 +1825,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
          if (down)
              vs->modifiers_state[keycode] ^= 1;
          break;

0026-string-input-visitor-Fix-uint64-par.patch

@@ -1,4 +1,4 @@
-From 9828006ad0a5150f6e33774f52dbe0c1cd83c127 Mon Sep 17 00:00:00 2001
+From ad93dd9db343779846b46338433db321a2dfc9b5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 24 Sep 2015 19:21:11 +0200
 Subject: [PATCH] string-input-visitor: Fix uint64 parsing

0027-test-string-input-visitor-Add-int-t.patch

@@ -1,4 +1,4 @@
-From 475c5683bb5f62150cdab5b2206c8f3e396564e0 Mon Sep 17 00:00:00 2001
+From bc42c484c1d4fdc9efcda8d0a0162357eee8a68b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 24 Sep 2015 19:23:50 +0200
 Subject: [PATCH] test-string-input-visitor: Add int test case

0028-test-string-input-visitor-Add-uint6.patch

@@ -1,4 +1,4 @@
-From 35ff4045ae70674705a9a73d287801fec6dbe3b6 Mon Sep 17 00:00:00 2001
+From ec5cf6d449fa658c58de6331a6226b917ad468cb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 24 Sep 2015 19:24:23 +0200
 Subject: [PATCH] test-string-input-visitor: Add uint64 test

0029-tests-Add-QOM-property-unit-tests.patch

@@ -1,4 +1,4 @@
-From ac3be2e198d0651911efe748d66b03fcb1729ed9 Mon Sep 17 00:00:00 2001
+From d6d65620fcb384c26f5f60ca65c1706c2d064a2a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Sun, 6 Sep 2015 20:12:42 +0200
 Subject: [PATCH] tests: Add QOM property unit tests
@@ -16,10 +16,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  3 files changed, 126 insertions(+)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index ada7c33485..fa02f8d7bb 100644
+index 666e936812..0c212e09c1 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -1619,6 +1619,7 @@ F: qom/
+@@ -1685,6 +1685,7 @@ F: qom/
  X: qom/cpu.c
  F: tests/check-qom-interface.c
  F: tests/check-qom-proplist.c
@@ -28,10 +28,10 @@ index ada7c33485..fa02f8d7bb 100644
  
  QMP
 diff --git a/tests/Makefile.include b/tests/Makefile.include
-index 3b9a5e31a2..7dbfe5e4ad 100644
+index a49282704e..51e4011191 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
-@@ -127,6 +127,8 @@ check-unit-y += tests/check-qom-interface$(EXESUF)
+@@ -129,6 +129,8 @@ check-unit-y += tests/check-qom-interface$(EXESUF)
  gcov-files-check-qom-interface-y = qom/object.c
  check-unit-y += tests/check-qom-proplist$(EXESUF)
  gcov-files-check-qom-proplist-y = qom/object.c
@@ -40,7 +40,7 @@ index 3b9a5e31a2..7dbfe5e4ad 100644
  check-unit-y += tests/test-qemu-opts$(EXESUF)
  gcov-files-test-qemu-opts-y = util/qemu-option.c
  check-unit-y += tests/test-keyval$(EXESUF)
-@@ -617,6 +619,7 @@ tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y)
+@@ -629,6 +631,7 @@ tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y)
  tests/check-qlit$(EXESUF): tests/check-qlit.o $(test-util-obj-y)
  tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom-obj-y)
  tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-obj-y)

0030-tests-Add-scsi-disk-test.patch

@@ -1,4 +1,4 @@
-From 94dfb04c2d225bd3805043f5ad1372a9bdfea0a1 Mon Sep 17 00:00:00 2001
+From 874f90da7dcc12f828778dee408b776bdfb2f029 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Fri, 25 Sep 2015 12:31:11 +0200
 Subject: [PATCH] tests: Add scsi-disk test
@@ -19,10 +19,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  3 files changed, 87 insertions(+)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index fa02f8d7bb..a01f9d3c20 100644
+index 0c212e09c1..34cd91c0da 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -1093,6 +1093,7 @@ R: Fam Zheng <famz@redhat.com>
+@@ -1125,6 +1125,7 @@ R: Fam Zheng <famz@redhat.com>
  S: Supported
  F: include/hw/scsi/*
  F: hw/scsi/*
@@ -31,10 +31,10 @@ index fa02f8d7bb..a01f9d3c20 100644
  T: git git://github.com/bonzini/qemu.git scsi-next
  
 diff --git a/tests/Makefile.include b/tests/Makefile.include
-index 7dbfe5e4ad..0d76624dd5 100644
+index 51e4011191..d6f0290685 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
-@@ -200,6 +200,8 @@ check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF)
+@@ -203,6 +203,8 @@ check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF)
  gcov-files-virtio-y += hw/virtio/virtio-rng.c
  check-qtest-virtio-y += tests/virtio-scsi-test$(EXESUF)
  gcov-files-virtio-y += i386-softmmu/hw/scsi/virtio-scsi.c
@@ -43,7 +43,7 @@ index 7dbfe5e4ad..0d76624dd5 100644
  ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
  check-qtest-virtio-y += tests/virtio-9p-test$(EXESUF)
  gcov-files-virtio-y += hw/9pfs/virtio-9p.c
-@@ -821,6 +823,7 @@ tests/migration-test$(EXESUF): tests/migration-test.o
+@@ -840,6 +842,7 @@ tests/migration-test$(EXESUF): tests/migration-test.o
  tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y) \
  	$(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y) \
  	$(chardev-obj-y)

0031-Switch-order-of-libraries-for-mpath.patch

@@ -1,4 +1,4 @@
-From fd50e2e8a90887300e49d50863bff64a116f93b8 Mon Sep 17 00:00:00 2001
+From f813f4f807bb16471bef7a9144335089fb5e80cf Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 3 Nov 2017 11:12:40 -0600
 Subject: [PATCH] Switch order of libraries for mpath support
@@ -10,10 +10,10 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index d71dd5bea4..3c5368382c 100644
+index 2da686be33..8ad4ef03aa 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -544,7 +544,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
+@@ -547,7 +547,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
  
  scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
  ifdef CONFIG_MPATH
@@ -23,10 +23,10 @@ index d71dd5bea4..3c5368382c 100644
  
  qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
 diff --git a/configure b/configure
-index 457684a7e6..96edba0aed 100755
+index 2a7796ea80..039923ab4e 100755
 --- a/configure
 +++ b/configure
-@@ -3488,7 +3488,7 @@ int main(void) {
+@@ -3577,7 +3577,7 @@ int main(void) {
      return 0;
  }
  EOF

0032-Make-installed-scripts-explicitly-p.patch

@@ -1,10 +1,9 @@
-From a2df489a5073322fd0eec514e59cde6e7788e845 Mon Sep 17 00:00:00 2001
+From 6d5e50164b7b72337af2ab9332e75c9bb0cc8b01 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Thu, 25 Jan 2018 14:16:10 -0700
-Subject: [PATCH] Make installed scripts explicitly python2
+Subject: [PATCH] Make installed scripts explicitly python3
 
-This is one step towards having our python support be explicitly
+We want to expliitly reference python3 in the scripts we install.
-either python2 or python3.
 
 [BR: BSC#1077564]
 Signed-off-by: Bruce Rogers <brogers@suse.com>
@@ -14,22 +13,22 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py
-index 88ff4adb30..519b600161 100755
+index 5c2010c917..8786801270 100755
 --- a/scripts/analyze-migration.py
 +++ b/scripts/analyze-migration.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2
++#!/usr/bin/python3
  #
  #  Migration Stream Analyzer
  #
 diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py
-index bcef7ee28e..45ae2df2cf 100755
+index d3467288dc..2046b1fedd 100755
 --- a/scripts/vmstate-static-checker.py
 +++ b/scripts/vmstate-static-checker.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
-+#!/usr/bin/python2
++#!/usr/bin/python3
  #
  # Compares vmstate information stored in JSON format, obtained from
  # the -dump-vmstate QEMU command.

0033-migration-warn-about-inconsistent-s.patch

@@ -1,4 +1,4 @@
-From c82bb4d1c7daf2c41d3a7e6d44f26cab65b138f9 Mon Sep 17 00:00:00 2001
+From 579a6f80e0ea312e9c113bd79be8bef36eabb090 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Wed, 21 Feb 2018 14:00:52 -0700
 Subject: [PATCH] migration: warn about inconsistent spec_ctrl state
@@ -22,10 +22,10 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  3 files changed, 21 insertions(+)
 
 diff --git a/cpus.c b/cpus.c
-index 6fa701e423..b57038fda5 100644
+index b5844b7103..2717f2e105 100644
 --- a/cpus.c
 +++ b/cpus.c
-@@ -2326,6 +2326,18 @@ exit:
+@@ -2367,6 +2367,18 @@ exit:
      fclose(f);
  }
  
@@ -55,10 +55,10 @@ index ef7bd16123..c4ecb386fe 100644
 +bool spec_ctrl_is_inconsistent(void);
  #endif
 diff --git a/migration/migration.c b/migration/migration.c
-index 52a5092add..3cf11aadfa 100644
+index b7d9854bda..31b4d8bd28 100644
 --- a/migration/migration.c
 +++ b/migration/migration.c
-@@ -2163,6 +2163,14 @@ static void migration_completion(MigrationState *s)
+@@ -2575,6 +2575,14 @@ static void migration_completion(MigrationState *s)
          migrate_set_state(&s->state, current_active_state,
                            MIGRATION_STATUS_COMPLETED);
      }

0034-smbios-Add-1-terminator-if-any-stri.patch

@@ -1,4 +1,4 @@
-From 01bcb184df242a24536a42d4dc5ef1443659e372 Mon Sep 17 00:00:00 2001
+From a0170ac31193117fd280bd8bb2a72fb768459c57 Mon Sep 17 00:00:00 2001
 From: Lin Ma <lma@suse.com>
 Date: Wed, 14 Mar 2018 14:31:26 +0800
 Subject: [PATCH] smbios: Add 1 terminator if any string fields defined in
@@ -29,10 +29,10 @@ Signed-off-by: Lin Ma <lma@suse.com>
  2 files changed, 134 insertions(+)
 
 diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
-index 27a07e96f4..b4515ae787 100644
+index a27e54b2fa..1dedd08780 100644
 --- a/hw/smbios/smbios.c
 +++ b/hw/smbios/smbios.c
-@@ -955,6 +955,9 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
+@@ -952,6 +952,9 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
  {
      const char *val;
  
@@ -42,7 +42,7 @@ index 27a07e96f4..b4515ae787 100644
      assert(!smbios_immutable);
  
      val = qemu_opt_get(opts, "file");
-@@ -996,7 +999,94 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
+@@ -993,7 +996,94 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
              smbios_type4_count++;
          }
  

0035-configure-Modify-python-used-for-io.patch

@@ -1,4 +1,4 @@
-From 6fc40e2e4fd28137984e26595214f86542237e1f Mon Sep 17 00:00:00 2001
+From ce30b89aa845332c2c22287ffc9f03ea0414d438 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 6 Apr 2018 09:21:56 -0600
 Subject: [PATCH] configure: Modify python used for io tests
@@ -12,10 +12,10 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 96edba0aed..9f54af3811 100755
+index 039923ab4e..f08f2812e4 100755
 --- a/configure
 +++ b/configure
-@@ -7190,7 +7190,7 @@ iotests_check="tests/qemu-iotests/check"
+@@ -7418,7 +7418,7 @@ iotests_check="tests/qemu-iotests/check"
  
  echo "# Automatically generated by configure - do not modify" > "$iotests_common_env"
  echo >> "$iotests_common_env"

0036-qemu-io-tests-comment-out-problemat.patch

@@ -1,12 +1,12 @@
-From 98e7409be18fc3f5be3abef72a7ecdc5b4b6cb44 Mon Sep 17 00:00:00 2001
+From cf1f31580527f27ea02bce3df8ff6fed88613d21 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 6 Apr 2018 13:33:31 -0600
 Subject: [PATCH] qemu-io tests: comment out problematic block io tests issues
 
-The following issues are seen:
+The following issue is seen:
 130 - timeout resulting from failed to get shared "write" lock
-153 - failed to get "write" lock
+153 - error resulting from failed to get "write" lock
-162 - occasional, using nbd, network unreachable
+162 - sometimes we see different error code / message
 
 Signed-off-by: Bruce Rogers <brogers@suse.com>
 ---
@@ -14,7 +14,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
-index 6bb961f4a4..f0f0fa67c3 100644
+index b973dc842d..f64d962a99 100644
 --- a/tests/qemu-iotests/group
 +++ b/tests/qemu-iotests/group
 @@ -136,7 +136,7 @@
@@ -26,16 +26,16 @@ index 6bb961f4a4..f0f0fa67c3 100644
  131 rw auto quick
  132 rw auto quick
  133 auto quick
-@@ -158,7 +158,7 @@
+@@ -159,7 +159,7 @@
- 149 rw auto sudo
  150 rw auto quick
+ 151 rw auto
  152 rw auto quick
 -153 rw auto quick
 +#ISSUES 153 rw auto quick
  154 rw auto backing quick
  155 rw auto
  156 rw auto quick
-@@ -166,7 +166,7 @@
+@@ -167,7 +167,7 @@
  158 rw auto quick
  159 rw auto quick
  160 rw auto quick
@@ -43,4 +43,4 @@ index 6bb961f4a4..f0f0fa67c3 100644
 +#ISSUES 162 auto quick
  163 rw auto
  165 rw auto quick
- 169 rw auto quick
+ 169 rw auto quick migration

0037-tests-test-thread-pool-is-racy-add-.patch

@@ -1,4 +1,4 @@
-From c08a2b4509e471944ab27e31d8cf2592eaf74611 Mon Sep 17 00:00:00 2001
+From 0903be7746e8710c7e7856f8223441396fa4be72 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 13 Apr 2018 11:46:47 -0600
 Subject: [PATCH] tests: test-thread-pool is racy - add some barriers
@@ -13,7 +13,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/tests/test-thread-pool.c b/tests/test-thread-pool.c
-index 91b4ec5524..9790200df7 100644
+index 9cdccb3a47..9f9e42af65 100644
 --- a/tests/test-thread-pool.c
 +++ b/tests/test-thread-pool.c
 @@ -171,6 +171,7 @@ static void do_test_cancel(bool sync)

0038-xen-add-block-resize-support-for-xe.patch

@@ -1,4 +1,4 @@
-From 0cfb8139037fde82de1263951c8c1ce8d4c2592c Mon Sep 17 00:00:00 2001
+From 780702171c0213af1594a9ba8a0756073ded5f49 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 8 Jun 2018 11:04:36 -0600
 Subject: [PATCH] xen: add block resize support for xen disks
@@ -13,12 +13,12 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  blockdev.c                     |  8 ++++++++
  hw/block/xen_disk.c            | 24 ++++++++++++++++++++++++
  include/hw/xen/xen.h           |  4 ++++
- include/sysemu/block-backend.h |  2 ++
+ include/sysemu/block-backend.h |  1 +
  stubs/xen-common.c             |  9 +++++++++
- 6 files changed, 58 insertions(+), 1 deletion(-)
+ 6 files changed, 57 insertions(+), 1 deletion(-)
 
 diff --git a/block/block-backend.c b/block/block-backend.c
-index 681b240b12..7f4f803c5b 100644
+index f2f75a977d..f62217d967 100644
 --- a/block/block-backend.c
 +++ b/block/block-backend.c
 @@ -23,6 +23,7 @@
@@ -29,7 +29,7 @@ index 681b240b12..7f4f803c5b 100644
  
  /* Number of coroutines to reserve per attached device model */
  #define COROUTINE_POOL_RESERVATION 64
-@@ -895,7 +896,9 @@ char *blk_get_attached_dev_id(BlockBackend *blk)
+@@ -900,7 +901,9 @@ char *blk_get_attached_dev_id(BlockBackend *blk)
  {
      DeviceState *dev;
  
@@ -40,7 +40,7 @@ index 681b240b12..7f4f803c5b 100644
      dev = blk->dev;
  
      if (!dev) {
-@@ -2006,6 +2009,13 @@ int blk_truncate(BlockBackend *blk, int64_t offset, PreallocMode prealloc,
+@@ -2005,6 +2008,13 @@ int blk_truncate(BlockBackend *blk, int64_t offset, PreallocMode prealloc,
      return bdrv_truncate(blk->root, offset, prealloc, errp);
  }
  
@@ -55,10 +55,10 @@ index 681b240b12..7f4f803c5b 100644
  {
      BlkRwCo *rwco = opaque;
 diff --git a/blockdev.c b/blockdev.c
-index c31bf3d98d..7aa158868b 100644
+index dcf8c8d2ab..bf1b82539c 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -3014,6 +3014,7 @@ void qmp_block_resize(bool has_device, const char *device,
+@@ -3175,6 +3175,7 @@ void qmp_block_resize(bool has_device, const char *device,
  {
      Error *local_err = NULL;
      BlockBackend *blk = NULL;
@@ -66,7 +66,7 @@ index c31bf3d98d..7aa158868b 100644
      BlockDriverState *bs;
      AioContext *aio_context;
      int ret;
-@@ -3026,6 +3027,10 @@ void qmp_block_resize(bool has_device, const char *device,
+@@ -3187,6 +3188,10 @@ void qmp_block_resize(bool has_device, const char *device,
          return;
      }
  
@@ -77,7 +77,7 @@ index c31bf3d98d..7aa158868b 100644
      aio_context = bdrv_get_aio_context(bs);
      aio_context_acquire(aio_context);
  
-@@ -3052,6 +3057,9 @@ void qmp_block_resize(bool has_device, const char *device,
+@@ -3213,6 +3218,9 @@ void qmp_block_resize(bool has_device, const char *device,
  
      bdrv_drained_begin(bs);
      ret = blk_truncate(blk, size, PREALLOC_MODE_OFF, errp);
@@ -88,18 +88,18 @@ index c31bf3d98d..7aa158868b 100644
  
  out:
 diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
-index 1696382f36..faa40239c0 100644
+index 2b56c5e868..a90df967a3 100644
 --- a/hw/block/xen_disk.c
 +++ b/hw/block/xen_disk.c
-@@ -1098,6 +1098,7 @@ static int blk_connect(struct XenDevice *xendev)
+@@ -759,6 +759,7 @@ static int blk_connect(struct XenDevice *xendev)
+     int order, ring_ref;
      unsigned int ring_size, max_grants;
      unsigned int i;
-     uint32_t *domids;
 +    Error *errp = NULL;
  
      trace_xen_disk_connect(xendev->name);
  
-@@ -1157,6 +1158,13 @@ static int blk_connect(struct XenDevice *xendev)
+@@ -818,6 +819,13 @@ static int blk_connect(struct XenDevice *xendev)
          blk_ref(blkdev->blk);
      }
      blk_attach_dev_legacy(blkdev->blk, blkdev);
@@ -113,7 +113,7 @@ index 1696382f36..faa40239c0 100644
      blkdev->file_size = blk_getlength(blkdev->blk);
      if (blkdev->file_size < 0) {
          BlockDriverState *bs = blk_bs(blkdev->blk);
-@@ -1351,6 +1359,7 @@ static void blk_disconnect(struct XenDevice *xendev)
+@@ -968,6 +976,7 @@ static void blk_disconnect(struct XenDevice *xendev)
      if (blkdev->blk) {
          blk_set_aio_context(blkdev->blk, qemu_get_aio_context());
          blk_detach_dev(blkdev->blk, blkdev);
@@ -121,7 +121,7 @@ index 1696382f36..faa40239c0 100644
          blk_unref(blkdev->blk);
          blkdev->blk = NULL;
      }
-@@ -1424,6 +1433,21 @@ static void blk_event(struct XenDevice *xendev)
+@@ -1015,6 +1024,21 @@ static void blk_event(struct XenDevice *xendev)
      qemu_bh_schedule(blkdev->bh);
  }
  
@@ -141,8 +141,8 @@ index 1696382f36..faa40239c0 100644
 +}
 +
  struct XenDevOps xen_blkdev_ops = {
+     .flags      = DEVOPS_FLAG_NEED_GNTDEV,
      .size       = sizeof(struct XenBlkDev),
-     .alloc      = blk_alloc,
 diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
 index 7efcdaa8fe..45c8c0b6f7 100644
 --- a/include/hw/xen/xen.h
@@ -157,15 +157,15 @@ index 7efcdaa8fe..45c8c0b6f7 100644
 +
  #endif /* QEMU_HW_XEN_H */
 diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
-index 92ab624fac..9565dbaf97 100644
+index 830d873f24..5ac2638d63 100644
 --- a/include/sysemu/block-backend.h
 +++ b/include/sysemu/block-backend.h
-@@ -232,4 +232,6 @@ void blk_set_force_allow_inactivate(BlockBackend *blk);
+@@ -236,5 +236,6 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,
- void blk_register_buf(BlockBackend *blk, void *host, size_t size);
+                                    BlockBackend *blk_out, int64_t off_out,
- void blk_unregister_buf(BlockBackend *blk, void *host);
+                                    int bytes, BdrvRequestFlags read_flags,
- 
+                                    BdrvRequestFlags write_flags);
 +void blk_legacy_resize_cb(BlockBackend *blk);
-+
+ 
  #endif
 diff --git a/stubs/xen-common.c b/stubs/xen-common.c
 index 09fce2dd36..91542fc019 100644

0039-blockjob-Fix-assertion-in-block_job.patch

@@ -1,39 +0,0 @@
-From 7369fc58700028a5ce4d91676a88a1b05f9179b1 Mon Sep 17 00:00:00 2001
-From: Kevin Wolf <kwolf@redhat.com>
-Date: Tue, 8 May 2018 11:55:30 +0200
-Subject: [PATCH] blockjob: Fix assertion in block_job_finalize()
-
-Every job gets a non-NULL job->txn on creation, but it doesn't
-necessarily keep it until it is decommissioned: Finalising a job removes
-it from its transaction. Therefore, calling 'blockdev-job-finalize' a
-second time on an already concluded job causes an assertion failure.
-
-Remove job->txn from the assertion in block_job_finalize() to fix this.
-block_job_do_finalize() still has the same assertion, but if a job is
-already removed from its transaction, block_job_apply_verb() will
-already error out before we run into that assertion.
-
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-(cherry picked from commit 37aa19b63c46d933f1e4ea944cfccee54e2caf4a)
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- blockjob.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/blockjob.c b/blockjob.c
-index 4de48166b2..b38ed7e265 100644
---- a/blockjob.c
-+++ b/blockjob.c
-@@ -702,7 +702,7 @@ void block_job_complete(BlockJob *job, Error **errp)
- 
- void block_job_finalize(BlockJob *job, Error **errp)
- {
--    assert(job && job->id && job->txn);
-+    assert(job && job->id);
-     if (block_job_apply_verb(job, BLOCK_JOB_VERB_FINALIZE, errp)) {
-         return;
-     }

0039-tests-boot-serial-test-Bump-timeout.patch

@@ -0,0 +1,37 @@
+From eb6fab8ccd1380173483e35ff830d7c829d79742 Mon Sep 17 00:00:00 2001
+From: Peter Maydell <peter.maydell@linaro.org>
+Date: Fri, 17 Aug 2018 17:14:04 +0100
+Subject: [PATCH] tests/boot-serial-test: Bump timeout to 6 minutes
+
+On a SPARC host that I'm using as a build test machine, the
+boot-serial-test for the SPARC guest machines takes about 65
+seconds to execute. This means that it hits the current
+60 second timer on these tests. Push the timeout up so
+that it doesn't trigger spuriously on slow hosts like this one.
+
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
+Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
+Message-id: 20180817161404.9420-1-peter.maydell@linaro.org
+(cherry picked from commit 627fce617868df87b3757375a2a0318ad2beb381)
+[BR: We have seen this issue occasionally for qemu-testsuite on armv7l]
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+---
+ tests/boot-serial-test.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
+index 952a2e7ead..7fbf7b35de 100644
+--- a/tests/boot-serial-test.c
++++ b/tests/boot-serial-test.c
+@@ -116,8 +116,8 @@ static bool check_guest_output(const testdef_t *test, int fd)
+     int i, nbr = 0, pos = 0, ccnt;
+     char ch;
+ 
+-    /* Poll serial output... Wait at most 60 seconds */
+-    for (i = 0; i < 6000; ++i) {
++    /* Poll serial output... Wait at most 360 seconds */
++    for (i = 0; i < 36000; ++i) {
+         ccnt = 0;
+         while (ccnt++ < 512 && (nbr = read(fd, &ch, 1)) == 1) {
+             if (ch == test->expect[pos]) {

0041-seccomp-allow-sched_setscheduler-wi.patch

@@ -1,65 +0,0 @@
-From 7ce038453d10846a02f693ca2ef83eaf9c42f2b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
-Date: Tue, 10 Jul 2018 16:55:57 +0200
-Subject: [PATCH] seccomp: allow sched_setscheduler() with SCHED_IDLE policy
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Current and upcoming mesa releases rely on a shader disk cash. It uses
-a thread job queue with low priority, set with
-sched_setscheduler(SCHED_IDLE). However, that syscall is rejected by
-the "resourcecontrol" seccomp qemu filter.
-
-Since it should be safe to allow lowering thread priority, let's allow
-scheduling thread to idle policy.
-
-Related to:
-https://bugzilla.redhat.com/show_bug.cgi?id=1594456
-
-Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Acked-by: Eduardo Otubo <otubo@redhat.com>
-(cherry picked from commit 056de1e894155fbb99e7b43c1c4382d4920cf437)
-[LD: BSC#1102627]
-Signed-off-by: Larry Dewey <ldewey@suse.com>
----
- qemu-seccomp.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/qemu-seccomp.c b/qemu-seccomp.c
-index b770a77d33..845a3330df 100644
---- a/qemu-seccomp.c
-+++ b/qemu-seccomp.c
-@@ -29,6 +29,12 @@
- struct QemuSeccompSyscall {
-     int32_t num;
-     uint8_t set;
-+    uint8_t narg;
-+    const struct scmp_arg_cmp *arg_cmp;
-+};
-+
-+const struct scmp_arg_cmp sched_setscheduler_arg[] = {
-+    SCMP_A1(SCMP_CMP_NE, SCHED_IDLE)
- };
- 
- static const struct QemuSeccompSyscall blacklist[] = {
-@@ -87,7 +93,8 @@ static const struct QemuSeccompSyscall blacklist[] = {
-     { SCMP_SYS(setpriority),            QEMU_SECCOMP_SET_RESOURCECTL },
-     { SCMP_SYS(sched_setparam),         QEMU_SECCOMP_SET_RESOURCECTL },
-     { SCMP_SYS(sched_getparam),         QEMU_SECCOMP_SET_RESOURCECTL },
--    { SCMP_SYS(sched_setscheduler),     QEMU_SECCOMP_SET_RESOURCECTL },
-+    { SCMP_SYS(sched_setscheduler),     QEMU_SECCOMP_SET_RESOURCECTL,
-+      ARRAY_SIZE(sched_setscheduler_arg), sched_setscheduler_arg },
-     { SCMP_SYS(sched_getscheduler),     QEMU_SECCOMP_SET_RESOURCECTL },
-     { SCMP_SYS(sched_setaffinity),      QEMU_SECCOMP_SET_RESOURCECTL },
-     { SCMP_SYS(sched_getaffinity),      QEMU_SECCOMP_SET_RESOURCECTL },
-@@ -113,7 +120,8 @@ int seccomp_start(uint32_t seccomp_opts)
-             continue;
-         }
- 
--        rc = seccomp_rule_add(ctx, SCMP_ACT_KILL, blacklist[i].num, 0);
-+        rc = seccomp_rule_add_array(ctx, SCMP_ACT_KILL, blacklist[i].num,
-+                                    blacklist[i].narg, blacklist[i].arg_cmp);
-         if (rc < 0) {
-             goto seccomp_return;
-         }

Make-installed-scripts-explicitly-python3.patch

@@ -1,306 +0,0 @@
-From f633201a0f40958641f5ff3352b637bd2fa16922 Mon Sep 17 00:00:00 2001
-From: Bruce Rogers <brogers@suse.com>
-Date: Thu, 25 Jan 2018 14:26:04 -0700
-Subject: [PATCH] Make installed scripts explicitly python3
-
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- scripts/analyze-migration.py      | 18 ++++----
- scripts/vmstate-static-checker.py | 94 +++++++++++++++++++--------------------
- 2 files changed, 56 insertions(+), 56 deletions(-)
-
-diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py
-index a512ddc552..d2e4cb9f8a 100755
---- a/scripts/analyze-migration.py
-+++ b/scripts/analyze-migration.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2
-+#!/usr/bin/python3
- #
- #  Migration Stream Analyzer
- #
-@@ -162,7 +162,7 @@ class RamSection(object):
-                     len = self.file.read64()
-                     self.sizeinfo[self.name] = '0x%016x' % len
-                     if self.write_memory:
--                        print self.name
-+                        print(self.name)
-                         mkdir_p('./' + os.path.dirname(self.name))
-                         f = open('./' + self.name, "wb")
-                         f.truncate(0)
-@@ -359,7 +359,7 @@ class VMSDFieldStruct(VMSDFieldGeneric):
-             array_len = field.pop('array_len')
-             field['index'] = 0
-             new_fields.append(field)
--            for i in xrange(1, array_len):
-+            for i in range(1, array_len):
-                 c = field.copy()
-                 c['index'] = i
-                 new_fields.append(c)
-@@ -426,7 +426,7 @@ class VMSDFieldStruct(VMSDFieldGeneric):
- 
-     def getDictOrderedDict(self, dict):
-         r = collections.OrderedDict()
--        for (key, value) in dict.items():
-+        for (key, value) in list(dict.items()):
-             r[key] = self.getDictItem(value)
-         return r
- 
-@@ -558,7 +558,7 @@ class MigrationDump(object):
- 
-     def getDict(self):
-         r = collections.OrderedDict()
--        for (key, value) in self.sections.items():
-+        for (key, value) in list(self.sections.items()):
-            key = "%s (%d)" % ( value.section_key[0], key )
-            r[key] = value.getDict()
-         return r
-@@ -584,7 +584,7 @@ if args.extract:
-     dump = MigrationDump(args.file)
- 
-     dump.read(desc_only = True)
--    print "desc.json"
-+    print("desc.json")
-     f = open("desc.json", "wb")
-     f.truncate()
-     f.write(jsonenc.encode(dump.vmsd_desc))
-@@ -592,7 +592,7 @@ if args.extract:
- 
-     dump.read(write_memory = True)
-     dict = dump.getDict()
--    print "state.json"
-+    print("state.json")
-     f = open("state.json", "wb")
-     f.truncate()
-     f.write(jsonenc.encode(dict))
-@@ -601,10 +601,10 @@ elif args.dump == "state":
-     dump = MigrationDump(args.file)
-     dump.read(dump_memory = args.memory)
-     dict = dump.getDict()
--    print jsonenc.encode(dict)
-+    print(jsonenc.encode(dict))
- elif args.dump == "desc":
-     dump = MigrationDump(args.file)
-     dump.read(desc_only = True)
--    print jsonenc.encode(dump.vmsd_desc)
-+    print(jsonenc.encode(dump.vmsd_desc))
- else:
-     raise Exception("Please specify either -x, -d state or -d dump")
-diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py
-index 45ae2df2cf..3bfcbd3d4a 100755
---- a/scripts/vmstate-static-checker.py
-+++ b/scripts/vmstate-static-checker.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2
-+#!/usr/bin/python3
- #
- # Compares vmstate information stored in JSON format, obtained from
- # the -dump-vmstate QEMU command.
-@@ -157,7 +157,7 @@ def check_fields(src_fields, dest_fields, desc, sec):
-     while True:
-         if advance_src:
-             try:
--                s_item = s_iter.next()
-+                s_item = next(s_iter)
-             except StopIteration:
-                 if s_iter_list == []:
-                     break
-@@ -172,14 +172,14 @@ def check_fields(src_fields, dest_fields, desc, sec):
- 
-         if advance_dest:
-             try:
--                d_item = d_iter.next()
-+                d_item = next(d_iter)
-             except StopIteration:
-                 if d_iter_list == []:
-                     # We were not in a substruct
--                    print "Section \"" + sec + "\",",
--                    print "Description " + "\"" + desc + "\":",
--                    print "expected field \"" + s_item["field"] + "\",",
--                    print "while dest has no further fields"
-+                    print("Section \"" + sec + "\",", end=' ')
-+                    print("Description " + "\"" + desc + "\":", end=' ')
-+                    print("expected field \"" + s_item["field"] + "\",", end=' ')
-+                    print("while dest has no further fields")
-                     bump_taint()
-                     break
- 
-@@ -197,10 +197,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
-                     advance_dest = True
-                     continue
-                 if unused_count < 0:
--                    print "Section \"" + sec + "\",",
--                    print "Description \"" + desc + "\":",
--                    print "unused size mismatch near \"",
--                    print s_item["field"] + "\""
-+                    print("Section \"" + sec + "\",", end=' ')
-+                    print("Description \"" + desc + "\":", end=' ')
-+                    print("unused size mismatch near \"", end=' ')
-+                    print(s_item["field"] + "\"")
-                     bump_taint()
-                     break
-                 continue
-@@ -211,10 +211,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
-                     advance_src = True
-                     continue
-                 if unused_count < 0:
--                    print "Section \"" + sec + "\",",
--                    print "Description \"" + desc + "\":",
--                    print "unused size mismatch near \"",
--                    print d_item["field"] + "\""
-+                    print("Section \"" + sec + "\",", end=' ')
-+                    print("Description \"" + desc + "\":", end=' ')
-+                    print("unused size mismatch near \"", end=' ')
-+                    print(d_item["field"] + "\"")
-                     bump_taint()
-                     break
-                 continue
-@@ -262,10 +262,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
-                     unused_count = s_item["size"] - d_item["size"]
-                     continue
- 
--            print "Section \"" + sec + "\",",
--            print "Description \"" + desc + "\":",
--            print "expected field \"" + s_item["field"] + "\",",
--            print "got \"" + d_item["field"] + "\"; skipping rest"
-+            print("Section \"" + sec + "\",", end=' ')
-+            print("Description \"" + desc + "\":", end=' ')
-+            print("expected field \"" + s_item["field"] + "\",", end=' ')
-+            print("got \"" + d_item["field"] + "\"; skipping rest")
-             bump_taint()
-             break
- 
-@@ -289,8 +289,8 @@ def check_subsections(src_sub, dest_sub, desc, sec):
-             check_descriptions(s_item, d_item, sec)
- 
-         if not found:
--            print "Section \"" + sec + "\", Description \"" + desc + "\":",
--            print "Subsection \"" + s_item["name"] + "\" not found"
-+            print("Section \"" + sec + "\", Description \"" + desc + "\":", end=' ')
-+            print("Subsection \"" + s_item["name"] + "\" not found")
-             bump_taint()
- 
- 
-@@ -299,8 +299,8 @@ def check_description_in_list(s_item, d_item, sec, desc):
-         return
- 
-     if not "Description" in d_item:
--        print "Section \"" + sec + "\", Description \"" + desc + "\",",
--        print "Field \"" + s_item["field"] + "\": missing description"
-+        print("Section \"" + sec + "\", Description \"" + desc + "\",", end=' ')
-+        print("Field \"" + s_item["field"] + "\": missing description")
-         bump_taint()
-         return
- 
-@@ -311,17 +311,17 @@ def check_descriptions(src_desc, dest_desc, sec):
-     check_version(src_desc, dest_desc, sec, src_desc["name"])
- 
-     if not check_fields_match(sec, src_desc["name"], dest_desc["name"]):
--        print "Section \"" + sec + "\":",
--        print "Description \"" + src_desc["name"] + "\"",
--        print "missing, got \"" + dest_desc["name"] + "\" instead; skipping"
-+        print("Section \"" + sec + "\":", end=' ')
-+        print("Description \"" + src_desc["name"] + "\"", end=' ')
-+        print("missing, got \"" + dest_desc["name"] + "\" instead; skipping")
-         bump_taint()
-         return
- 
-     for f in src_desc:
-         if not f in dest_desc:
--            print "Section \"" + sec + "\"",
--            print "Description \"" + src_desc["name"] + "\":",
--            print "Entry \"" + f + "\" missing"
-+            print("Section \"" + sec + "\"", end=' ')
-+            print("Description \"" + src_desc["name"] + "\":", end=' ')
-+            print("Entry \"" + f + "\" missing")
-             bump_taint()
-             continue
- 
-@@ -334,39 +334,39 @@ def check_descriptions(src_desc, dest_desc, sec):
- 
- def check_version(s, d, sec, desc=None):
-     if s["version_id"] > d["version_id"]:
--        print "Section \"" + sec + "\"",
-+        print("Section \"" + sec + "\"", end=' ')
-         if desc:
--            print "Description \"" + desc + "\":",
--        print "version error:", s["version_id"], ">", d["version_id"]
-+            print("Description \"" + desc + "\":", end=' ')
-+        print("version error:", s["version_id"], ">", d["version_id"])
-         bump_taint()
- 
-     if not "minimum_version_id" in d:
-         return
- 
-     if s["version_id"] < d["minimum_version_id"]:
--        print "Section \"" + sec + "\"",
-+        print("Section \"" + sec + "\"", end=' ')
-         if desc:
--            print "Description \"" + desc + "\":",
--            print "minimum version error:", s["version_id"], "<",
--            print d["minimum_version_id"]
-+            print("Description \"" + desc + "\":", end=' ')
-+            print("minimum version error:", s["version_id"], "<", end=' ')
-+            print(d["minimum_version_id"])
-             bump_taint()
- 
- 
- def check_size(s, d, sec, desc=None, field=None):
-     if s["size"] != d["size"]:
--        print "Section \"" + sec + "\"",
-+        print("Section \"" + sec + "\"", end=' ')
-         if desc:
--            print "Description \"" + desc + "\"",
-+            print("Description \"" + desc + "\"", end=' ')
-         if field:
--            print "Field \"" + field + "\"",
--        print "size mismatch:", s["size"], ",", d["size"]
-+            print("Field \"" + field + "\"", end=' ')
-+        print("size mismatch:", s["size"], ",", d["size"])
-         bump_taint()
- 
- 
- def check_machine_type(s, d):
-     if s["Name"] != d["Name"]:
--        print "Warning: checking incompatible machine types:",
--        print "\"" + s["Name"] + "\", \"" + d["Name"] + "\""
-+        print("Warning: checking incompatible machine types:", end=' ')
-+        print("\"" + s["Name"] + "\", \"" + d["Name"] + "\"")
-     return
- 
- 
-@@ -374,9 +374,9 @@ def main():
-     help_text = "Parse JSON-formatted vmstate dumps from QEMU in files SRC and DEST.  Checks whether migration from SRC to DEST QEMU versions would break based on the VMSTATE information contained within the JSON outputs.  The JSON output is created from a QEMU invocation with the -dump-vmstate parameter and a filename argument to it.  Other parameters to QEMU do not matter, except the -M (machine type) parameter."
- 
-     parser = argparse.ArgumentParser(description=help_text)
--    parser.add_argument('-s', '--src', type=file, required=True,
-+    parser.add_argument('-s', '--src', type=open, required=True,
-                         help='json dump from src qemu')
--    parser.add_argument('-d', '--dest', type=file, required=True,
-+    parser.add_argument('-d', '--dest', type=open, required=True,
-                         help='json dump from dest qemu')
-     parser.add_argument('--reverse', required=False, default=False,
-                         action='store_true',
-@@ -400,7 +400,7 @@ def main():
-             # doesn't exist in dest.
-             dest_sec = get_changed_sec_name(sec)
-             if not dest_sec in dest_data:
--                print "Section \"" + sec + "\" does not exist in dest"
-+                print("Section \"" + sec + "\" does not exist in dest")
-                 bump_taint()
-                 continue
- 
-@@ -415,8 +415,8 @@ def main():
- 
-         for entry in s:
-             if not entry in d:
--                print "Section \"" + sec + "\": Entry \"" + entry + "\"",
--                print "missing"
-+                print("Section \"" + sec + "\": Entry \"" + entry + "\"", end=' ')
-+                print("missing")
-                 bump_taint()
-                 continue
- 
--- 
-2.16.1
-

kvm_stat

@@ -1,827 +0,0 @@
-#!/usr/bin/python
-#
-# top-like utility for displaying kvm statistics
-#
-# Copyright 2006-2008 Qumranet Technologies
-# Copyright 2008-2011 Red Hat, Inc.
-#
-# Authors:
-#  Avi Kivity <avi@redhat.com>
-#
-# This work is licensed under the terms of the GNU GPL, version 2.  See
-# the COPYING file in the top-level directory.
-
-import curses
-import sys
-import os
-import time
-import optparse
-import ctypes
-import fcntl
-import resource
-import struct
-import re
-from collections import defaultdict
-from time import sleep
-
-VMX_EXIT_REASONS = {
-    'EXCEPTION_NMI':        0,
-    'EXTERNAL_INTERRUPT':   1,
-    'TRIPLE_FAULT':         2,
-    'PENDING_INTERRUPT':    7,
-    'NMI_WINDOW':           8,
-    'TASK_SWITCH':          9,
-    'CPUID':                10,
-    'HLT':                  12,
-    'INVLPG':               14,
-    'RDPMC':                15,
-    'RDTSC':                16,
-    'VMCALL':               18,
-    'VMCLEAR':              19,
-    'VMLAUNCH':             20,
-    'VMPTRLD':              21,
-    'VMPTRST':              22,
-    'VMREAD':               23,
-    'VMRESUME':             24,
-    'VMWRITE':              25,
-    'VMOFF':                26,
-    'VMON':                 27,
-    'CR_ACCESS':            28,
-    'DR_ACCESS':            29,
-    'IO_INSTRUCTION':       30,
-    'MSR_READ':             31,
-    'MSR_WRITE':            32,
-    'INVALID_STATE':        33,
-    'MWAIT_INSTRUCTION':    36,
-    'MONITOR_INSTRUCTION':  39,
-    'PAUSE_INSTRUCTION':    40,
-    'MCE_DURING_VMENTRY':   41,
-    'TPR_BELOW_THRESHOLD':  43,
-    'APIC_ACCESS':          44,
-    'EPT_VIOLATION':        48,
-    'EPT_MISCONFIG':        49,
-    'WBINVD':               54,
-    'XSETBV':               55,
-    'APIC_WRITE':           56,
-    'INVPCID':              58,
-}
-
-SVM_EXIT_REASONS = {
-    'READ_CR0':       0x000,
-    'READ_CR3':       0x003,
-    'READ_CR4':       0x004,
-    'READ_CR8':       0x008,
-    'WRITE_CR0':      0x010,
-    'WRITE_CR3':      0x013,
-    'WRITE_CR4':      0x014,
-    'WRITE_CR8':      0x018,
-    'READ_DR0':       0x020,
-    'READ_DR1':       0x021,
-    'READ_DR2':       0x022,
-    'READ_DR3':       0x023,
-    'READ_DR4':       0x024,
-    'READ_DR5':       0x025,
-    'READ_DR6':       0x026,
-    'READ_DR7':       0x027,
-    'WRITE_DR0':      0x030,
-    'WRITE_DR1':      0x031,
-    'WRITE_DR2':      0x032,
-    'WRITE_DR3':      0x033,
-    'WRITE_DR4':      0x034,
-    'WRITE_DR5':      0x035,
-    'WRITE_DR6':      0x036,
-    'WRITE_DR7':      0x037,
-    'EXCP_BASE':      0x040,
-    'INTR':           0x060,
-    'NMI':            0x061,
-    'SMI':            0x062,
-    'INIT':           0x063,
-    'VINTR':          0x064,
-    'CR0_SEL_WRITE':  0x065,
-    'IDTR_READ':      0x066,
-    'GDTR_READ':      0x067,
-    'LDTR_READ':      0x068,
-    'TR_READ':        0x069,
-    'IDTR_WRITE':     0x06a,
-    'GDTR_WRITE':     0x06b,
-    'LDTR_WRITE':     0x06c,
-    'TR_WRITE':       0x06d,
-    'RDTSC':          0x06e,
-    'RDPMC':          0x06f,
-    'PUSHF':          0x070,
-    'POPF':           0x071,
-    'CPUID':          0x072,
-    'RSM':            0x073,
-    'IRET':           0x074,
-    'SWINT':          0x075,
-    'INVD':           0x076,
-    'PAUSE':          0x077,
-    'HLT':            0x078,
-    'INVLPG':         0x079,
-    'INVLPGA':        0x07a,
-    'IOIO':           0x07b,
-    'MSR':            0x07c,
-    'TASK_SWITCH':    0x07d,
-    'FERR_FREEZE':    0x07e,
-    'SHUTDOWN':       0x07f,
-    'VMRUN':          0x080,
-    'VMMCALL':        0x081,
-    'VMLOAD':         0x082,
-    'VMSAVE':         0x083,
-    'STGI':           0x084,
-    'CLGI':           0x085,
-    'SKINIT':         0x086,
-    'RDTSCP':         0x087,
-    'ICEBP':          0x088,
-    'WBINVD':         0x089,
-    'MONITOR':        0x08a,
-    'MWAIT':          0x08b,
-    'MWAIT_COND':     0x08c,
-    'XSETBV':         0x08d,
-    'NPF':            0x400,
-}
-
-# EC definition of HSR (from arch/arm64/include/asm/kvm_arm.h)
-AARCH64_EXIT_REASONS = {
-    'UNKNOWN':      0x00,
-    'WFI':          0x01,
-    'CP15_32':      0x03,
-    'CP15_64':      0x04,
-    'CP14_MR':      0x05,
-    'CP14_LS':      0x06,
-    'FP_ASIMD':     0x07,
-    'CP10_ID':      0x08,
-    'CP14_64':      0x0C,
-    'ILL_ISS':      0x0E,
-    'SVC32':        0x11,
-    'HVC32':        0x12,
-    'SMC32':        0x13,
-    'SVC64':        0x15,
-    'HVC64':        0x16,
-    'SMC64':        0x17,
-    'SYS64':        0x18,
-    'IABT':         0x20,
-    'IABT_HYP':     0x21,
-    'PC_ALIGN':     0x22,
-    'DABT':         0x24,
-    'DABT_HYP':     0x25,
-    'SP_ALIGN':     0x26,
-    'FP_EXC32':     0x28,
-    'FP_EXC64':     0x2C,
-    'SERROR':       0x2F,
-    'BREAKPT':      0x30,
-    'BREAKPT_HYP':  0x31,
-    'SOFTSTP':      0x32,
-    'SOFTSTP_HYP':  0x33,
-    'WATCHPT':      0x34,
-    'WATCHPT_HYP':  0x35,
-    'BKPT32':       0x38,
-    'VECTOR32':     0x3A,
-    'BRK64':        0x3C,
-}
-
-# From include/uapi/linux/kvm.h, KVM_EXIT_xxx
-USERSPACE_EXIT_REASONS = {
-    'UNKNOWN':          0,
-    'EXCEPTION':        1,
-    'IO':               2,
-    'HYPERCALL':        3,
-    'DEBUG':            4,
-    'HLT':              5,
-    'MMIO':             6,
-    'IRQ_WINDOW_OPEN':  7,
-    'SHUTDOWN':         8,
-    'FAIL_ENTRY':       9,
-    'INTR':             10,
-    'SET_TPR':          11,
-    'TPR_ACCESS':       12,
-    'S390_SIEIC':       13,
-    'S390_RESET':       14,
-    'DCR':              15,
-    'NMI':              16,
-    'INTERNAL_ERROR':   17,
-    'OSI':              18,
-    'PAPR_HCALL':       19,
-    'S390_UCONTROL':    20,
-    'WATCHDOG':         21,
-    'S390_TSCH':        22,
-    'EPR':              23,
-    'SYSTEM_EVENT':     24,
-}
-
-IOCTL_NUMBERS = {
-    'SET_FILTER':  0x40082406,
-    'ENABLE':      0x00002400,
-    'DISABLE':     0x00002401,
-    'RESET':       0x00002403,
-}
-
-class Arch(object):
-    """Class that encapsulates global architecture specific data like
-    syscall and ioctl numbers.
-
-    """
-    @staticmethod
-    def get_arch():
-        machine = os.uname()[4]
-
-        if machine.startswith('ppc'):
-            return ArchPPC()
-        elif machine.startswith('aarch64'):
-            return ArchA64()
-        elif machine.startswith('s390'):
-            return ArchS390()
-        else:
-            # X86_64
-            for line in open('/proc/cpuinfo'):
-                if not line.startswith('flags'):
-                    continue
-
-                flags = line.split()
-                if 'vmx' in flags:
-                    return ArchX86(VMX_EXIT_REASONS)
-                if 'svm' in flags:
-                    return ArchX86(SVM_EXIT_REASONS)
-                return
-
-class ArchX86(Arch):
-    def __init__(self, exit_reasons):
-        self.sc_perf_evt_open = 298
-        self.ioctl_numbers = IOCTL_NUMBERS
-        self.exit_reasons = exit_reasons
-
-class ArchPPC(Arch):
-    def __init__(self):
-        self.sc_perf_evt_open = 319
-        self.ioctl_numbers = IOCTL_NUMBERS
-        self.ioctl_numbers['ENABLE'] = 0x20002400
-        self.ioctl_numbers['DISABLE'] = 0x20002401
-        self.ioctl_numbers['RESET'] = 0x20002403
-
-        # PPC comes in 32 and 64 bit and some generated ioctl
-        # numbers depend on the wordsize.
-        char_ptr_size = ctypes.sizeof(ctypes.c_char_p)
-        self.ioctl_numbers['SET_FILTER'] = 0x80002406 | char_ptr_size << 16
-        self.exit_reasons = {}
-
-class ArchA64(Arch):
-    def __init__(self):
-        self.sc_perf_evt_open = 241
-        self.ioctl_numbers = IOCTL_NUMBERS
-        self.exit_reasons = AARCH64_EXIT_REASONS
-
-class ArchS390(Arch):
-    def __init__(self):
-        self.sc_perf_evt_open = 331
-        self.ioctl_numbers = IOCTL_NUMBERS
-        self.exit_reasons = None
-
-ARCH = Arch.get_arch()
-
-
-def walkdir(path):
-    """Returns os.walk() data for specified directory.
-
-    As it is only a wrapper it returns the same 3-tuple of (dirpath,
-    dirnames, filenames).
-    """
-    return next(os.walk(path))
-
-
-def parse_int_list(list_string):
-    """Returns an int list from a string of comma separated integers and
-    integer ranges."""
-    integers = []
-    members = list_string.split(',')
-
-    for member in members:
-        if '-' not in member:
-            integers.append(int(member))
-        else:
-            int_range = member.split('-')
-            integers.extend(range(int(int_range[0]),
-                                  int(int_range[1]) + 1))
-
-    return integers
-
-
-def get_online_cpus():
-    with open('/sys/devices/system/cpu/online') as cpu_list:
-        cpu_string = cpu_list.readline()
-        return parse_int_list(cpu_string)
-
-
-def get_filters():
-    filters = {}
-    filters['kvm_userspace_exit'] = ('reason', USERSPACE_EXIT_REASONS)
-    if ARCH.exit_reasons:
-        filters['kvm_exit'] = ('exit_reason', ARCH.exit_reasons)
-    return filters
-
-libc = ctypes.CDLL('libc.so.6', use_errno=True)
-syscall = libc.syscall
-
-class perf_event_attr(ctypes.Structure):
-    _fields_ = [('type', ctypes.c_uint32),
-                ('size', ctypes.c_uint32),
-                ('config', ctypes.c_uint64),
-                ('sample_freq', ctypes.c_uint64),
-                ('sample_type', ctypes.c_uint64),
-                ('read_format', ctypes.c_uint64),
-                ('flags', ctypes.c_uint64),
-                ('wakeup_events', ctypes.c_uint32),
-                ('bp_type', ctypes.c_uint32),
-                ('bp_addr', ctypes.c_uint64),
-                ('bp_len', ctypes.c_uint64),
-                ]
-
-    def __init__(self):
-        super(self.__class__, self).__init__()
-        self.type = PERF_TYPE_TRACEPOINT
-        self.size = ctypes.sizeof(self)
-        self.read_format = PERF_FORMAT_GROUP
-
-def perf_event_open(attr, pid, cpu, group_fd, flags):
-    return syscall(ARCH.sc_perf_evt_open, ctypes.pointer(attr),
-                   ctypes.c_int(pid), ctypes.c_int(cpu),
-                   ctypes.c_int(group_fd), ctypes.c_long(flags))
-
-PERF_TYPE_TRACEPOINT = 2
-PERF_FORMAT_GROUP = 1 << 3
-
-PATH_DEBUGFS_TRACING = '/sys/kernel/debug/tracing'
-PATH_DEBUGFS_KVM = '/sys/kernel/debug/kvm'
-
-class Group(object):
-    def __init__(self):
-        self.events = []
-
-    def add_event(self, event):
-        self.events.append(event)
-
-    def read(self):
-        length = 8 * (1 + len(self.events))
-        read_format = 'xxxxxxxx' + 'Q' * len(self.events)
-        return dict(zip([event.name for event in self.events],
-                        struct.unpack(read_format,
-                                      os.read(self.events[0].fd, length))))
-
-class Event(object):
-    def __init__(self, name, group, trace_cpu, trace_point, trace_filter,
-                 trace_set='kvm'):
-        self.name = name
-        self.fd = None
-        self.setup_event(group, trace_cpu, trace_point, trace_filter,
-                         trace_set)
-
-    def setup_event_attribute(self, trace_set, trace_point):
-        id_path = os.path.join(PATH_DEBUGFS_TRACING, 'events', trace_set,
-                               trace_point, 'id')
-
-        event_attr = perf_event_attr()
-        event_attr.config = int(open(id_path).read())
-        return event_attr
-
-    def setup_event(self, group, trace_cpu, trace_point, trace_filter,
-                    trace_set):
-        event_attr = self.setup_event_attribute(trace_set, trace_point)
-
-        group_leader = -1
-        if group.events:
-            group_leader = group.events[0].fd
-
-        fd = perf_event_open(event_attr, -1, trace_cpu,
-                             group_leader, 0)
-        if fd == -1:
-            err = ctypes.get_errno()
-            raise OSError(err, os.strerror(err),
-                          'while calling sys_perf_event_open().')
-
-        if trace_filter:
-            fcntl.ioctl(fd, ARCH.ioctl_numbers['SET_FILTER'],
-                        trace_filter)
-
-        self.fd = fd
-
-    def enable(self):
-        fcntl.ioctl(self.fd, ARCH.ioctl_numbers['ENABLE'], 0)
-
-    def disable(self):
-        fcntl.ioctl(self.fd, ARCH.ioctl_numbers['DISABLE'], 0)
-
-    def reset(self):
-        fcntl.ioctl(self.fd, ARCH.ioctl_numbers['RESET'], 0)
-
-class TracepointProvider(object):
-    def __init__(self):
-        self.group_leaders = []
-        self.filters = get_filters()
-        self._fields = self.get_available_fields()
-        self.setup_traces()
-        self.fields = self._fields
-
-    def get_available_fields(self):
-        path = os.path.join(PATH_DEBUGFS_TRACING, 'events', 'kvm')
-        fields = walkdir(path)[1]
-        extra = []
-        for field in fields:
-            if field in self.filters:
-                filter_name_, filter_dicts = self.filters[field]
-                for name in filter_dicts:
-                    extra.append(field + '(' + name + ')')
-        fields += extra
-        return fields
-
-    def setup_traces(self):
-        cpus = get_online_cpus()
-
-        # The constant is needed as a buffer for python libs, std
-        # streams and other files that the script opens.
-        newlim = len(cpus) * len(self._fields) + 50
-        try:
-            softlim_, hardlim = resource.getrlimit(resource.RLIMIT_NOFILE)
-
-            if hardlim < newlim:
-                # Now we need CAP_SYS_RESOURCE, to increase the hard limit.
-                resource.setrlimit(resource.RLIMIT_NOFILE, (newlim, newlim))
-            else:
-                # Raising the soft limit is sufficient.
-                resource.setrlimit(resource.RLIMIT_NOFILE, (newlim, hardlim))
-
-        except ValueError:
-            sys.exit("NOFILE rlimit could not be raised to {0}".format(newlim))
-
-        for cpu in cpus:
-            group = Group()
-            for name in self._fields:
-                tracepoint = name
-                tracefilter = None
-                match = re.match(r'(.*)\((.*)\)', name)
-                if match:
-                    tracepoint, sub = match.groups()
-                    tracefilter = ('%s==%d\0' %
-                                   (self.filters[tracepoint][0],
-                                    self.filters[tracepoint][1][sub]))
-
-                group.add_event(Event(name=name,
-                                      group=group,
-                                      trace_cpu=cpu,
-                                      trace_point=tracepoint,
-                                      trace_filter=tracefilter))
-            self.group_leaders.append(group)
-
-    def available_fields(self):
-        return self.get_available_fields()
-
-    @property
-    def fields(self):
-        return self._fields
-
-    @fields.setter
-    def fields(self, fields):
-        self._fields = fields
-        for group in self.group_leaders:
-            for index, event in enumerate(group.events):
-                if event.name in fields:
-                    event.reset()
-                    event.enable()
-                else:
-                    # Do not disable the group leader.
-                    # It would disable all of its events.
-                    if index != 0:
-                        event.disable()
-
-    def read(self):
-        ret = defaultdict(int)
-        for group in self.group_leaders:
-            for name, val in group.read().iteritems():
-                if name in self._fields:
-                    ret[name] += val
-        return ret
-
-class DebugfsProvider(object):
-    def __init__(self):
-        self._fields = self.get_available_fields()
-
-    def get_available_fields(self):
-        return walkdir(PATH_DEBUGFS_KVM)[2]
-
-    @property
-    def fields(self):
-        return self._fields
-
-    @fields.setter
-    def fields(self, fields):
-        self._fields = fields
-
-    def read(self):
-        def val(key):
-            return int(file(PATH_DEBUGFS_KVM + '/' + key).read())
-        return dict([(key, val(key)) for key in self._fields])
-
-class Stats(object):
-    def __init__(self, providers, fields=None):
-        self.providers = providers
-        self._fields_filter = fields
-        self.values = {}
-        self.update_provider_filters()
-
-    def update_provider_filters(self):
-        def wanted(key):
-            if not self._fields_filter:
-                return True
-            return re.match(self._fields_filter, key) is not None
-
-        # As we reset the counters when updating the fields we can
-        # also clear the cache of old values.
-        self.values = {}
-        for provider in self.providers:
-            provider_fields = [key for key in provider.get_available_fields()
-                               if wanted(key)]
-            provider.fields = provider_fields
-
-    @property
-    def fields_filter(self):
-        return self._fields_filter
-
-    @fields_filter.setter
-    def fields_filter(self, fields_filter):
-        self._fields_filter = fields_filter
-        self.update_provider_filters()
-
-    def get(self):
-        for provider in self.providers:
-            new = provider.read()
-            for key in provider.fields:
-                oldval = self.values.get(key, (0, 0))
-                newval = new.get(key, 0)
-                newdelta = None
-                if oldval is not None:
-                    newdelta = newval - oldval[0]
-                self.values[key] = (newval, newdelta)
-        return self.values
-
-LABEL_WIDTH = 40
-NUMBER_WIDTH = 10
-
-class Tui(object):
-    def __init__(self, stats):
-        self.stats = stats
-        self.screen = None
-        self.drilldown = False
-        self.update_drilldown()
-
-    def __enter__(self):
-        """Initialises curses for later use.  Based on curses.wrapper
-           implementation from the Python standard library."""
-        self.screen = curses.initscr()
-        curses.noecho()
-        curses.cbreak()
-
-        # The try/catch works around a minor bit of
-        # over-conscientiousness in the curses module, the error
-        # return from C start_color() is ignorable.
-        try:
-            curses.start_color()
-        except:
-            pass
-
-        curses.use_default_colors()
-        return self
-
-    def __exit__(self, *exception):
-        """Resets the terminal to its normal state.  Based on curses.wrappre
-           implementation from the Python standard library."""
-        if self.screen:
-            self.screen.keypad(0)
-            curses.echo()
-            curses.nocbreak()
-            curses.endwin()
-
-    def update_drilldown(self):
-        if not self.stats.fields_filter:
-            self.stats.fields_filter = r'^[^\(]*$'
-
-        elif self.stats.fields_filter == r'^[^\(]*$':
-            self.stats.fields_filter = None
-
-    def refresh(self, sleeptime):
-        self.screen.erase()
-        self.screen.addstr(0, 0, 'kvm statistics - summary', curses.A_BOLD)
-        self.screen.addstr(2, 1, 'Event')
-        self.screen.addstr(2, 1 + LABEL_WIDTH + NUMBER_WIDTH -
-                           len('Total'), 'Total')
-        self.screen.addstr(2, 1 + LABEL_WIDTH + NUMBER_WIDTH + 8 -
-                           len('Current'), 'Current')
-        row = 3
-        stats = self.stats.get()
-        def sortkey(x):
-            if stats[x][1]:
-                return (-stats[x][1], -stats[x][0])
-            else:
-                return (0, -stats[x][0])
-        for key in sorted(stats.keys(), key=sortkey):
-
-            if row >= self.screen.getmaxyx()[0]:
-                break
-            values = stats[key]
-            if not values[0] and not values[1]:
-                break
-            col = 1
-            self.screen.addstr(row, col, key)
-            col += LABEL_WIDTH
-            self.screen.addstr(row, col, '%10d' % (values[0],))
-            col += NUMBER_WIDTH
-            if values[1] is not None:
-                self.screen.addstr(row, col, '%8d' % (values[1] / sleeptime,))
-            row += 1
-        self.screen.refresh()
-
-    def show_filter_selection(self):
-        while True:
-            self.screen.erase()
-            self.screen.addstr(0, 0,
-                               "Show statistics for events matching a regex.",
-                               curses.A_BOLD)
-            self.screen.addstr(2, 0,
-                               "Current regex: {0}"
-                               .format(self.stats.fields_filter))
-            self.screen.addstr(3, 0, "New regex: ")
-            curses.echo()
-            regex = self.screen.getstr()
-            curses.noecho()
-            if len(regex) == 0:
-                return
-            try:
-                re.compile(regex)
-                self.stats.fields_filter = regex
-                return
-            except re.error:
-                continue
-
-    def show_stats(self):
-        sleeptime = 0.25
-        while True:
-            self.refresh(sleeptime)
-            curses.halfdelay(int(sleeptime * 10))
-            sleeptime = 3
-            try:
-                char = self.screen.getkey()
-                if char == 'x':
-                    self.drilldown = not self.drilldown
-                    self.update_drilldown()
-                if char == 'q':
-                    break
-                if char == 'f':
-                    self.show_filter_selection()
-            except KeyboardInterrupt:
-                break
-            except curses.error:
-                continue
-
-def batch(stats):
-    s = stats.get()
-    time.sleep(1)
-    s = stats.get()
-    for key in sorted(s.keys()):
-        values = s[key]
-        print '%-42s%10d%10d' % (key, values[0], values[1])
-
-def log(stats):
-    keys = sorted(stats.get().iterkeys())
-    def banner():
-        for k in keys:
-            print '%s' % k,
-        print
-    def statline():
-        s = stats.get()
-        for k in keys:
-            print ' %9d' % s[k][1],
-        print
-    line = 0
-    banner_repeat = 20
-    while True:
-        time.sleep(1)
-        if line % banner_repeat == 0:
-            banner()
-        statline()
-        line += 1
-
-def get_options():
-    description_text = """
-This script displays various statistics about VMs running under KVM.
-The statistics are gathered from the KVM debugfs entries and / or the
-currently available perf traces.
-
-The monitoring takes additional cpu cycles and might affect the VM's
-performance.
-
-Requirements:
-- Access to:
-    /sys/kernel/debug/kvm
-    /sys/kernel/debug/trace/events/*
-    /proc/pid/task
-- /proc/sys/kernel/perf_event_paranoid < 1 if user has no
-  CAP_SYS_ADMIN and perf events are used.
-- CAP_SYS_RESOURCE if the hard limit is not high enough to allow
-  the large number of files that are possibly opened.
-"""
-
-    class PlainHelpFormatter(optparse.IndentedHelpFormatter):
-        def format_description(self, description):
-            if description:
-                return description + "\n"
-            else:
-                return ""
-
-    optparser = optparse.OptionParser(description=description_text,
-                                      formatter=PlainHelpFormatter())
-    optparser.add_option('-1', '--once', '--batch',
-                         action='store_true',
-                         default=False,
-                         dest='once',
-                         help='run in batch mode for one second',
-                         )
-    optparser.add_option('-l', '--log',
-                         action='store_true',
-                         default=False,
-                         dest='log',
-                         help='run in logging mode (like vmstat)',
-                         )
-    optparser.add_option('-t', '--tracepoints',
-                         action='store_true',
-                         default=False,
-                         dest='tracepoints',
-                         help='retrieve statistics from tracepoints',
-                         )
-    optparser.add_option('-d', '--debugfs',
-                         action='store_true',
-                         default=False,
-                         dest='debugfs',
-                         help='retrieve statistics from debugfs',
-                         )
-    optparser.add_option('-f', '--fields',
-                         action='store',
-                         default=None,
-                         dest='fields',
-                         help='fields to display (regex)',
-                         )
-    (options, _) = optparser.parse_args(sys.argv)
-    return options
-
-def get_providers(options):
-    providers = []
-
-    if options.tracepoints:
-        providers.append(TracepointProvider())
-    if options.debugfs:
-        providers.append(DebugfsProvider())
-    if len(providers) == 0:
-        providers.append(TracepointProvider())
-
-    return providers
-
-def check_access(options):
-    if not os.path.exists('/sys/kernel/debug'):
-        sys.stderr.write('Please enable CONFIG_DEBUG_FS in your kernel.')
-        sys.exit(1)
-
-    if not os.path.exists(PATH_DEBUGFS_KVM):
-        sys.stderr.write("Please make sure, that debugfs is mounted and "
-                         "readable by the current user:\n"
-                         "('mount -t debugfs debugfs /sys/kernel/debug')\n"
-                         "Also ensure, that the kvm modules are loaded.\n")
-        sys.exit(1)
-
-    if not os.path.exists(PATH_DEBUGFS_TRACING) and (options.tracepoints
-                                                     or not options.debugfs):
-        sys.stderr.write("Please enable CONFIG_TRACING in your kernel "
-                         "when using the option -t (default).\n"
-                         "If it is enabled, make {0} readable by the "
-                         "current user.\n"
-                         .format(PATH_DEBUGFS_TRACING))
-        if options.tracepoints:
-            sys.exit(1)
-
-        sys.stderr.write("Falling back to debugfs statistics!\n")
-        options.debugfs = True
-        sleep(5)
-
-    return options
-
-def main():
-    options = get_options()
-    options = check_access(options)
-    providers = get_providers(options)
-    stats = Stats(providers, fields=options.fields)
-
-    if options.log:
-        log(stats)
-    elif not options.once:
-        with Tui(stats) as tui:
-            tui.show_stats()
-    else:
-        batch(stats)
-
-if __name__ == "__main__":
-    main()

kvm_stat.1.gz

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

qemu-2.12.1.tar.xz

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

qemu-3.0.0.tar.xz

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

qemu-linux-user.changes

@@ -1,3 +1,99 @@
+-------------------------------------------------------------------
+Mon Aug 20 21:18:22 UTC 2018 - brogers@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.0
+* Patches added:
+  0039-tests-boot-serial-test-Bump-timeout.patch
+
+-------------------------------------------------------------------
+Tue Aug 14 21:22:44 UTC 2018 - brogers@suse.com
+
+- Update to v3.0.0: See http://wiki.qemu.org/ChangeLog/3.0
+  Don't read anything into the major version number update. It's
+  been decided to increase the major version number each year.
+  Take note that ongoing feature deprecation is tracked at both
+  http://wiki.qemu-project.org/Features/LegacyRemoval and in
+  Appendix B of the qemu-doc.* files installed with the qemu package.
+  Some noteworthy changes:
+* PPC64 host fixes (page size, mmap alignment, interrupted syscall,
+   F_*LK64)
+* Fixes for several syscalls: mmap with 0 length, setsockopt, netlink
+* new syscalls: swapcontext (ppc), get_tls (ARM)
+* Most errors are now affected by -d rather than just dumped to stderr
+* qemu-binfmt-conf.sh: new options to use persistent (F) flag, ignore
+  the OS/ABI field
+* add support of FDPIC for ARM
+* Support for ARM's Scalable Vector Extensions
+
+* Patches dropped (upstream unless otherwise noted):
+  0008-linux-user-fix-segfault-deadlock.patch (no longer needed)
+  0039-blockjob-Fix-assertion-in-block_job.patch
+  0041-seccomp-allow-sched_setscheduler-wi.patch
+* Patches renamed:
+  0009-linux-user-binfmt-support-host-bina.patch
+  -> 0008-linux-user-binfmt-support-host-bina.patch
+  0010-linux-user-Fake-proc-cpuinfo.patch
+  -> 0009-linux-user-Fake-proc-cpuinfo.patch
+  0011-Remove-problematic-evdev-86-key-fro.patch
+  -> 0010-Remove-problematic-evdev-86-key-fro.patch
+  0012-linux-user-use-target_ulong.patch
+  -> 0011-linux-user-use-target_ulong.patch
+  0013-Make-char-muxer-more-robust-wrt-sma.patch
+  -> 0012-Make-char-muxer-more-robust-wrt-sma.patch
+  0014-linux-user-lseek-explicitly-cast-no.patch
+  -> 0013-linux-user-lseek-explicitly-cast-no.patch
+  0015-AIO-Reduce-number-of-threads-for-32.patch
+  -> 0014-AIO-Reduce-number-of-threads-for-32.patch
+  0016-xen_disk-Add-suse-specific-flush-di.patch
+  -> 0015-xen_disk-Add-suse-specific-flush-di.patch
+  0017-qemu-bridge-helper-reduce-security-.patch
+  -> 0016-qemu-bridge-helper-reduce-security-.patch
+  0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  -> 0017-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  0019-linux-user-properly-test-for-infini.patch
+  -> 0018-linux-user-properly-test-for-infini.patch
+  0020-roms-Makefile-pass-a-packaging-time.patch
+  -> 0019-roms-Makefile-pass-a-packaging-time.patch
+  0021-Raise-soft-address-space-limit-to-h.patch
+  -> 0020-Raise-soft-address-space-limit-to-h.patch
+  0022-increase-x86_64-physical-bits-to-42.patch
+  -> 0021-increase-x86_64-physical-bits-to-42.patch
+  0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  -> 0022-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  0024-i8254-Fix-migration-from-SLE11-SP2.patch
+  -> 0023-i8254-Fix-migration-from-SLE11-SP2.patch
+  0025-acpi_piix4-Fix-migration-from-SLE11.patch
+  -> 0024-acpi_piix4-Fix-migration-from-SLE11.patch
+  0026-Fix-tigervnc-long-press-issue.patch
+  -> 0025-Fix-tigervnc-long-press-issue.patch
+  0027-string-input-visitor-Fix-uint64-par.patch
+  -> 0026-string-input-visitor-Fix-uint64-par.patch
+  0028-test-string-input-visitor-Add-int-t.patch
+  -> 0027-test-string-input-visitor-Add-int-t.patch
+  0029-test-string-input-visitor-Add-uint6.patch
+  -> 0028-test-string-input-visitor-Add-uint6.patch
+  0030-tests-Add-QOM-property-unit-tests.patch
+  -> 0029-tests-Add-QOM-property-unit-tests.patch
+  0031-tests-Add-scsi-disk-test.patch
+  -> 0030-tests-Add-scsi-disk-test.patch
+  0032-Switch-order-of-libraries-for-mpath.patch
+  -> 0031-Switch-order-of-libraries-for-mpath.patch
+  0033-Make-installed-scripts-explicitly-p.patch
+  -> 0032-Make-installed-scripts-explicitly-p.patch (python2->python3)
+  0034-migration-warn-about-inconsistent-s.patch
+  -> 0033-migration-warn-about-inconsistent-s.patch
+  0035-smbios-Add-1-terminator-if-any-stri.patch
+  -> 0034-smbios-Add-1-terminator-if-any-stri.patch
+  0037-configure-Modify-python-used-for-io.patch
+  -> 0035-configure-Modify-python-used-for-io.patch
+  0038-qemu-io-tests-comment-out-problemat.patch
+  -> 0036-qemu-io-tests-comment-out-problemat.patch
+  0039-tests-test-thread-pool-is-racy-add-.patch
+  -> 0037-tests-test-thread-pool-is-racy-add-.patch
+  0040-xen-add-block-resize-support-for-xe.patch
+  -> 0038-xen-add-block-resize-support-for-xe.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.0
+
 -------------------------------------------------------------------
 Fri Aug  3 14:05:52 UTC 2018 - brogers@suse.com
 

qemu-linux-user.spec

@@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        CPU emulator for user space
 License:        BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 Group:          System/Emulators/PC
-Version:        2.12.1
+Version:        3.0.0
 Release:        0
-Source:         qemu-2.12.1.tar.xz
+Source:         qemu-3.0.0.tar.xz
 # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
@@ -33,40 +33,38 @@ Patch0004:      0004-qemu-cvs-ioctl_debug.patch
 Patch0005:      0005-qemu-cvs-ioctl_nodirection.patch
 Patch0006:      0006-linux-user-add-binfmt-wrapper-for-a.patch
 Patch0007:      0007-PPC-KVM-Disable-mmu-notifier-check.patch
-Patch0008:      0008-linux-user-fix-segfault-deadlock.patch
+Patch0008:      0008-linux-user-binfmt-support-host-bina.patch
-Patch0009:      0009-linux-user-binfmt-support-host-bina.patch
+Patch0009:      0009-linux-user-Fake-proc-cpuinfo.patch
-Patch0010:      0010-linux-user-Fake-proc-cpuinfo.patch
+Patch0010:      0010-Remove-problematic-evdev-86-key-fro.patch
-Patch0011:      0011-Remove-problematic-evdev-86-key-fro.patch
+Patch0011:      0011-linux-user-use-target_ulong.patch
-Patch0012:      0012-linux-user-use-target_ulong.patch
+Patch0012:      0012-Make-char-muxer-more-robust-wrt-sma.patch
-Patch0013:      0013-Make-char-muxer-more-robust-wrt-sma.patch
+Patch0013:      0013-linux-user-lseek-explicitly-cast-no.patch
-Patch0014:      0014-linux-user-lseek-explicitly-cast-no.patch
+Patch0014:      0014-AIO-Reduce-number-of-threads-for-32.patch
-Patch0015:      0015-AIO-Reduce-number-of-threads-for-32.patch
+Patch0015:      0015-xen_disk-Add-suse-specific-flush-di.patch
-Patch0016:      0016-xen_disk-Add-suse-specific-flush-di.patch
+Patch0016:      0016-qemu-bridge-helper-reduce-security-.patch
-Patch0017:      0017-qemu-bridge-helper-reduce-security-.patch
+Patch0017:      0017-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
-Patch0018:      0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+Patch0018:      0018-linux-user-properly-test-for-infini.patch
-Patch0019:      0019-linux-user-properly-test-for-infini.patch
+Patch0019:      0019-roms-Makefile-pass-a-packaging-time.patch
-Patch0020:      0020-roms-Makefile-pass-a-packaging-time.patch
+Patch0020:      0020-Raise-soft-address-space-limit-to-h.patch
-Patch0021:      0021-Raise-soft-address-space-limit-to-h.patch
+Patch0021:      0021-increase-x86_64-physical-bits-to-42.patch
-Patch0022:      0022-increase-x86_64-physical-bits-to-42.patch
+Patch0022:      0022-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
-Patch0023:      0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+Patch0023:      0023-i8254-Fix-migration-from-SLE11-SP2.patch
-Patch0024:      0024-i8254-Fix-migration-from-SLE11-SP2.patch
+Patch0024:      0024-acpi_piix4-Fix-migration-from-SLE11.patch
-Patch0025:      0025-acpi_piix4-Fix-migration-from-SLE11.patch
+Patch0025:      0025-Fix-tigervnc-long-press-issue.patch
-Patch0026:      0026-Fix-tigervnc-long-press-issue.patch
+Patch0026:      0026-string-input-visitor-Fix-uint64-par.patch
-Patch0027:      0027-string-input-visitor-Fix-uint64-par.patch
+Patch0027:      0027-test-string-input-visitor-Add-int-t.patch
-Patch0028:      0028-test-string-input-visitor-Add-int-t.patch
+Patch0028:      0028-test-string-input-visitor-Add-uint6.patch
-Patch0029:      0029-test-string-input-visitor-Add-uint6.patch
+Patch0029:      0029-tests-Add-QOM-property-unit-tests.patch
-Patch0030:      0030-tests-Add-QOM-property-unit-tests.patch
+Patch0030:      0030-tests-Add-scsi-disk-test.patch
-Patch0031:      0031-tests-Add-scsi-disk-test.patch
+Patch0031:      0031-Switch-order-of-libraries-for-mpath.patch
-Patch0032:      0032-Switch-order-of-libraries-for-mpath.patch
+Patch0032:      0032-Make-installed-scripts-explicitly-p.patch
-Patch0033:      0033-Make-installed-scripts-explicitly-p.patch
+Patch0033:      0033-migration-warn-about-inconsistent-s.patch
-Patch0034:      0034-migration-warn-about-inconsistent-s.patch
+Patch0034:      0034-smbios-Add-1-terminator-if-any-stri.patch
-Patch0035:      0035-smbios-Add-1-terminator-if-any-stri.patch
+Patch0035:      0035-configure-Modify-python-used-for-io.patch
-Patch0036:      0036-configure-Modify-python-used-for-io.patch
+Patch0036:      0036-qemu-io-tests-comment-out-problemat.patch
-Patch0037:      0037-qemu-io-tests-comment-out-problemat.patch
+Patch0037:      0037-tests-test-thread-pool-is-racy-add-.patch
-Patch0038:      0038-tests-test-thread-pool-is-racy-add-.patch
+Patch0038:      0038-xen-add-block-resize-support-for-xe.patch
-Patch0039:      0039-blockjob-Fix-assertion-in-block_job.patch
+Patch0039:      0039-tests-boot-serial-test-Bump-timeout.patch
-Patch0040:      0040-xen-add-block-resize-support-for-xe.patch
-Patch0041:      0041-seccomp-allow-sched_setscheduler-wi.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 Source400:      update_git.sh
@@ -99,7 +97,7 @@ architecture. The syscall interface is intercepted and execution below the
 syscall layer occurs on the native hardware and operating system.
 
 %prep
-%setup -q -n qemu-2.12.1
+%setup -q -n qemu-3.0.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -139,8 +137,6 @@ syscall layer occurs on the native hardware and operating system.
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
 
 %build
 ./configure \
@@ -258,7 +254,6 @@ make %{?_smp_mflags} V=1
 make install DESTDIR=%{buildroot}
 rm -rf %{buildroot}%_datadir/qemu/keymaps
 unlink %{buildroot}%_datadir/qemu/trace-events-all
-unlink %{buildroot}%_libexecdir/qemu-bridge-helper
 install -d -m 755 %{buildroot}%_sbindir
 install -m 755 scripts/qemu-binfmt-conf.sh %{buildroot}%_sbindir
 %fdupes -s %{buildroot}
@@ -266,7 +261,7 @@ install -m 755 scripts/qemu-binfmt-conf.sh %{buildroot}%_sbindir
 %files
 %defattr(-, root, root)
 %doc Changelog README VERSION
-%license COPYING COPYING.LIB COPYING.PYTHON LICENSE
+%license COPYING COPYING.LIB LICENSE
 %_bindir/qemu-aarch64
 %_bindir/qemu-aarch64_be
 %_bindir/qemu-alpha

qemu-linux-user.spec.in

@@ -23,7 +23,7 @@ License:        BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         qemu-2.12.1.tar.xz
+Source:         qemu-3.0.0.tar.xz
 # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
@@ -59,7 +59,7 @@ architecture. The syscall interface is intercepted and execution below the
 syscall layer occurs on the native hardware and operating system.
 
 %prep
-%setup -q -n qemu-2.12.1
+%setup -q -n qemu-3.0.0
 PATCH_EXEC
 
 %build
@@ -178,7 +178,6 @@ make %{?_smp_mflags} V=1
 make install DESTDIR=%{buildroot}
 rm -rf %{buildroot}%_datadir/qemu/keymaps
 unlink %{buildroot}%_datadir/qemu/trace-events-all
-unlink %{buildroot}%_libexecdir/qemu-bridge-helper
 install -d -m 755 %{buildroot}%_sbindir
 install -m 755 scripts/qemu-binfmt-conf.sh %{buildroot}%_sbindir
 %fdupes -s %{buildroot}
@@ -186,7 +185,7 @@ install -m 755 scripts/qemu-binfmt-conf.sh %{buildroot}%_sbindir
 %files
 %defattr(-, root, root)
 %doc Changelog README VERSION
-%license COPYING COPYING.LIB COPYING.PYTHON LICENSE
+%license COPYING COPYING.LIB LICENSE
 %_bindir/qemu-aarch64
 %_bindir/qemu-aarch64_be
 %_bindir/qemu-alpha

qemu-testsuite.changes

@@ -1,3 +1,132 @@
+-------------------------------------------------------------------
+Mon Aug 20 21:18:19 UTC 2018 - brogers@suse.com
+
+- Increase timeout for boot-serial-test, since we've hit the timeout
+  for armv7l arch in qemu-testsuite.
+  0039-tests-boot-serial-test-Bump-timeout.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.0
+
+-------------------------------------------------------------------
+Wed Aug 15 14:27:34 UTC 2018 - brogers@suse.com
+
+- Drop legacy kvm_stat script and man page. We'll rely on the kvm_stat
+  package only going forward
+  kvm_stat
+  kvm_stat.1.gz
+- Update SLE support documentation to match v3.0.0 release
+
+-------------------------------------------------------------------
+Tue Aug 14 21:22:18 UTC 2018 - brogers@suse.com
+
+- Update to v3.0.0: See http://wiki.qemu.org/ChangeLog/3.0
+  Don't read anything into the major version number update. It's
+  been decided to increase the major version number each year.
+  Take note that ongoing feature deprecation is tracked at both
+  http://wiki.qemu-project.org/Features/LegacyRemoval and in
+  Appendix B of the qemu-doc.* files installed with the qemu package.
+  Some noteworthy changes:
+* Support for additional x86/AMD mitigations against Speculative
+  Store Bypass (Spectre Variant 4, CVE-2018-3639)
+* Improved support for nested KVM guests running on Hyper-V
+* Block device support for active disk-mirroring, which avoids
+  convergence issues which may arise when doing passive/background
+  mirroring of busy devices
+* Improved support for AHCI emulation, SCSI emulation, and persistent
+  reservations / cluster management
+* OpenGL ES support for SDL front-end, additional framebuffer
+  device options for early boot display without using legacy VGA
+  emulation
+* Live migration support for TPM TIS devices, capping bandwidth
+  usage during post-copy migration, and recovering from a failed
+  post-copy migration
+* Improved latency when using user-mode networking / SLIRP
+* ARM: support for SMMUv3 IOMMU when using 'virt' machine type
+* ARM: v8M extensions for VLLDM and VLSTM floating-point instructions,
+  and improved support for AArch64 v8.2 FP16 extensions
+* ARM: support for Scalable Vector Extensions in linux-user mode
+* Microblaze: support for 64-bit address sizes and translation bug
+  fixes
+* PowerPC: PMU support for mac99 machine type and improvements for
+  Uninorth PCI host bridge emulation for Mac machine types
+* PowerPC: preliminary support for emulating POWER9 hash MMU mode when
+  using powernv machine type
+* RISC-V: improvement for privileged ISA emulation
+* s390: support for z14 ZR1 CPU model
+* s390: bpb/ppa15 Spectre mitigations enabled by default for z196 and
+  later CPU models
+* s390: support for configuring consoles via -serial options
+
+* Patches dropped (upstream unless otherwise noted):
+  0008-linux-user-fix-segfault-deadlock.patch (no longer needed)
+  0039-blockjob-Fix-assertion-in-block_job.patch
+  0041-seccomp-allow-sched_setscheduler-wi.patch
+  Make-installed-scripts-explicitly-python3.patch (we now make
+  python3 explicit in other patch)
+* Patches renamed:
+  0009-linux-user-binfmt-support-host-bina.patch
+  -> 0008-linux-user-binfmt-support-host-bina.patch
+  0010-linux-user-Fake-proc-cpuinfo.patch
+  -> 0009-linux-user-Fake-proc-cpuinfo.patch
+  0011-Remove-problematic-evdev-86-key-fro.patch
+  -> 0010-Remove-problematic-evdev-86-key-fro.patch
+  0012-linux-user-use-target_ulong.patch
+  -> 0011-linux-user-use-target_ulong.patch
+  0013-Make-char-muxer-more-robust-wrt-sma.patch
+  -> 0012-Make-char-muxer-more-robust-wrt-sma.patch
+  0014-linux-user-lseek-explicitly-cast-no.patch
+  -> 0013-linux-user-lseek-explicitly-cast-no.patch
+  0015-AIO-Reduce-number-of-threads-for-32.patch
+  -> 0014-AIO-Reduce-number-of-threads-for-32.patch
+  0016-xen_disk-Add-suse-specific-flush-di.patch
+  -> 0015-xen_disk-Add-suse-specific-flush-di.patch
+  0017-qemu-bridge-helper-reduce-security-.patch
+  -> 0016-qemu-bridge-helper-reduce-security-.patch
+  0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  -> 0017-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  0019-linux-user-properly-test-for-infini.patch
+  -> 0018-linux-user-properly-test-for-infini.patch
+  0020-roms-Makefile-pass-a-packaging-time.patch
+  -> 0019-roms-Makefile-pass-a-packaging-time.patch
+  0021-Raise-soft-address-space-limit-to-h.patch
+  -> 0020-Raise-soft-address-space-limit-to-h.patch
+  0022-increase-x86_64-physical-bits-to-42.patch
+  -> 0021-increase-x86_64-physical-bits-to-42.patch
+  0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  -> 0022-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  0024-i8254-Fix-migration-from-SLE11-SP2.patch
+  -> 0023-i8254-Fix-migration-from-SLE11-SP2.patch
+  0025-acpi_piix4-Fix-migration-from-SLE11.patch
+  -> 0024-acpi_piix4-Fix-migration-from-SLE11.patch
+  0026-Fix-tigervnc-long-press-issue.patch
+  -> 0025-Fix-tigervnc-long-press-issue.patch
+  0027-string-input-visitor-Fix-uint64-par.patch
+  -> 0026-string-input-visitor-Fix-uint64-par.patch
+  0028-test-string-input-visitor-Add-int-t.patch
+  -> 0027-test-string-input-visitor-Add-int-t.patch
+  0029-test-string-input-visitor-Add-uint6.patch
+  -> 0028-test-string-input-visitor-Add-uint6.patch
+  0030-tests-Add-QOM-property-unit-tests.patch
+  -> 0029-tests-Add-QOM-property-unit-tests.patch
+  0031-tests-Add-scsi-disk-test.patch
+  -> 0030-tests-Add-scsi-disk-test.patch
+  0032-Switch-order-of-libraries-for-mpath.patch
+  -> 0031-Switch-order-of-libraries-for-mpath.patch
+  0033-Make-installed-scripts-explicitly-p.patch
+  -> 0032-Make-installed-scripts-explicitly-p.patch (python2->python3)
+  0034-migration-warn-about-inconsistent-s.patch
+  -> 0033-migration-warn-about-inconsistent-s.patch
+  0035-smbios-Add-1-terminator-if-any-stri.patch
+  -> 0034-smbios-Add-1-terminator-if-any-stri.patch
+  0037-configure-Modify-python-used-for-io.patch
+  -> 0035-configure-Modify-python-used-for-io.patch
+  0038-qemu-io-tests-comment-out-problemat.patch
+  -> 0036-qemu-io-tests-comment-out-problemat.patch
+  0039-tests-test-thread-pool-is-racy-add-.patch
+  -> 0037-tests-test-thread-pool-is-racy-add-.patch
+  0040-xen-add-block-resize-support-for-xe.patch
+  -> 0038-xen-add-block-resize-support-for-xe.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.0
+
 -------------------------------------------------------------------
 Thu Aug  9 03:27:38 UTC 2018 - ldewey@suse.com
 

qemu-testsuite.spec

@@ -109,26 +109,24 @@ Url:            http://www.qemu.org/
 Summary:        Machine emulator and virtualizer
 License:        BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 Group:          System/Emulators/PC
-Version:        2.12.1
+Version:        3.0.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.12.1.tar.xz
+Source:         http://wiki.qemu.org/download/qemu-3.0.0.tar.xz
-Source99:       http://wiki.qemu.org/download/qemu-2.12.1.tar.xz.sig
+Source99:       http://wiki.qemu.org/download/qemu-3.0.0.tar.xz.sig
 Source1:        80-kvm.rules
-Source2:        qemu-ifup
+Source2:        71-sev.rules
-Source3:        kvm_stat
+Source3:        qemu-ifup
-Source4:        kvm_stat.1.gz
+Source4:        bridge.conf
 Source5:        qemu-kvm.1.gz
 Source6:        ksm.service
 Source7:        qemu-ga@.service
 Source8:        80-qemu-ga.rules
 Source9:        qemu-supportconfig
 Source10:       kvm.conf
-Source11:       bridge.conf
+Source11:       supported.ppc.txt
 Source12:       supported.x86.txt
 Source13:       supported.s390.txt
 Source14:       supported.arm.txt
-Source15:       supported.ppc.txt
-Source16:       71-sev.rules
 # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
@@ -138,46 +136,43 @@ Patch0004:      0004-qemu-cvs-ioctl_debug.patch
 Patch0005:      0005-qemu-cvs-ioctl_nodirection.patch
 Patch0006:      0006-linux-user-add-binfmt-wrapper-for-a.patch
 Patch0007:      0007-PPC-KVM-Disable-mmu-notifier-check.patch
-Patch0008:      0008-linux-user-fix-segfault-deadlock.patch
+Patch0008:      0008-linux-user-binfmt-support-host-bina.patch
-Patch0009:      0009-linux-user-binfmt-support-host-bina.patch
+Patch0009:      0009-linux-user-Fake-proc-cpuinfo.patch
-Patch0010:      0010-linux-user-Fake-proc-cpuinfo.patch
+Patch0010:      0010-Remove-problematic-evdev-86-key-fro.patch
-Patch0011:      0011-Remove-problematic-evdev-86-key-fro.patch
+Patch0011:      0011-linux-user-use-target_ulong.patch
-Patch0012:      0012-linux-user-use-target_ulong.patch
+Patch0012:      0012-Make-char-muxer-more-robust-wrt-sma.patch
-Patch0013:      0013-Make-char-muxer-more-robust-wrt-sma.patch
+Patch0013:      0013-linux-user-lseek-explicitly-cast-no.patch
-Patch0014:      0014-linux-user-lseek-explicitly-cast-no.patch
+Patch0014:      0014-AIO-Reduce-number-of-threads-for-32.patch
-Patch0015:      0015-AIO-Reduce-number-of-threads-for-32.patch
+Patch0015:      0015-xen_disk-Add-suse-specific-flush-di.patch
-Patch0016:      0016-xen_disk-Add-suse-specific-flush-di.patch
+Patch0016:      0016-qemu-bridge-helper-reduce-security-.patch
-Patch0017:      0017-qemu-bridge-helper-reduce-security-.patch
+Patch0017:      0017-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
-Patch0018:      0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+Patch0018:      0018-linux-user-properly-test-for-infini.patch
-Patch0019:      0019-linux-user-properly-test-for-infini.patch
+Patch0019:      0019-roms-Makefile-pass-a-packaging-time.patch
-Patch0020:      0020-roms-Makefile-pass-a-packaging-time.patch
+Patch0020:      0020-Raise-soft-address-space-limit-to-h.patch
-Patch0021:      0021-Raise-soft-address-space-limit-to-h.patch
+Patch0021:      0021-increase-x86_64-physical-bits-to-42.patch
-Patch0022:      0022-increase-x86_64-physical-bits-to-42.patch
+Patch0022:      0022-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
-Patch0023:      0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+Patch0023:      0023-i8254-Fix-migration-from-SLE11-SP2.patch
-Patch0024:      0024-i8254-Fix-migration-from-SLE11-SP2.patch
+Patch0024:      0024-acpi_piix4-Fix-migration-from-SLE11.patch
-Patch0025:      0025-acpi_piix4-Fix-migration-from-SLE11.patch
+Patch0025:      0025-Fix-tigervnc-long-press-issue.patch
-Patch0026:      0026-Fix-tigervnc-long-press-issue.patch
+Patch0026:      0026-string-input-visitor-Fix-uint64-par.patch
-Patch0027:      0027-string-input-visitor-Fix-uint64-par.patch
+Patch0027:      0027-test-string-input-visitor-Add-int-t.patch
-Patch0028:      0028-test-string-input-visitor-Add-int-t.patch
+Patch0028:      0028-test-string-input-visitor-Add-uint6.patch
-Patch0029:      0029-test-string-input-visitor-Add-uint6.patch
+Patch0029:      0029-tests-Add-QOM-property-unit-tests.patch
-Patch0030:      0030-tests-Add-QOM-property-unit-tests.patch
+Patch0030:      0030-tests-Add-scsi-disk-test.patch
-Patch0031:      0031-tests-Add-scsi-disk-test.patch
+Patch0031:      0031-Switch-order-of-libraries-for-mpath.patch
-Patch0032:      0032-Switch-order-of-libraries-for-mpath.patch
+Patch0032:      0032-Make-installed-scripts-explicitly-p.patch
-Patch0033:      0033-Make-installed-scripts-explicitly-p.patch
+Patch0033:      0033-migration-warn-about-inconsistent-s.patch
-Patch0034:      0034-migration-warn-about-inconsistent-s.patch
+Patch0034:      0034-smbios-Add-1-terminator-if-any-stri.patch
-Patch0035:      0035-smbios-Add-1-terminator-if-any-stri.patch
+Patch0035:      0035-configure-Modify-python-used-for-io.patch
-Patch0036:      0036-configure-Modify-python-used-for-io.patch
+Patch0036:      0036-qemu-io-tests-comment-out-problemat.patch
-Patch0037:      0037-qemu-io-tests-comment-out-problemat.patch
+Patch0037:      0037-tests-test-thread-pool-is-racy-add-.patch
-Patch0038:      0038-tests-test-thread-pool-is-racy-add-.patch
+Patch0038:      0038-xen-add-block-resize-support-for-xe.patch
-Patch0039:      0039-blockjob-Fix-assertion-in-block_job.patch
+Patch0039:      0039-tests-boot-serial-test-Bump-timeout.patch
-Patch0040:      0040-xen-add-block-resize-support-for-xe.patch
-Patch0041:      0041-seccomp-allow-sched_setscheduler-wi.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
 # If for any reason we have base QEMU patches which are conditionally applied,
 # include them here
-Patch1000:      Make-installed-scripts-explicitly-python3.patch
 
 # SeaBIOS / SeaVGABIOS
 Patch1100:      seabios-use-python2-explicitly-as-needed.patch
@@ -380,11 +375,7 @@ Requires(post): udev
 %ifarch s390x
 Requires(post): procps
 %endif
-%if 0%{?suse_version} > 1320
 Recommends:     kvm_stat
-%else
-Recommends:     python-curses
-%endif
 %endif
 Recommends:     qemu-block-curl
 Recommends:     qemu-tools
@@ -776,7 +767,7 @@ to provide information and control at the guest OS level.
 %package seabios
 Summary:        x86 Legacy BIOS for QEMU
 Group:          System/Emulators/PC
-Version:        1.11.1
+Version:        1.11.2
 Release:        0
 BuildArch:      noarch
 Conflicts:      qemu < 1.6.0
@@ -788,7 +779,7 @@ is the default and legacy BIOS for QEMU.
 %package vgabios
 Summary:        VGA BIOSes for QEMU
 Group:          System/Emulators/PC
-Version:        1.11.1
+Version:        1.11.2
 Release:        0
 BuildArch:      noarch
 Conflicts:      qemu < 1.6.0
@@ -841,7 +832,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.12.1
+%setup -q -n qemu-3.0.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -881,12 +872,6 @@ This package provides a service file for starting and stopping KSM.
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
-
-%if 0%{?suse_version} > 1320
-%patch1000 -p1
-%endif
 
 pushd roms/seabios
 %patch1100 -p1
@@ -1207,10 +1192,7 @@ export QEMU_PROG=%{_bindir}/qemu-system-x86_64
 export QEMU_IMG_PROG=%{_bindir}/qemu-img
 export QEMU_IO_PROG=%{_bindir}/qemu-io
 export QEMU_NBD_PROG=%{_bindir}/qemu-nbd
-# the block tests are not yet 32 bit x86 friendly
-%ifnarch %ix86
 make check-block V=1
-%endif
 
 # Create minimal gzip format file
 echo "Test" > test.txt
@@ -1239,18 +1221,18 @@ for f in %{x86_extra_built_firmware_list} \
 done
 %endif
 %find_lang %name
-install -D -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
+install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
-install -D -m 0755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
+install -D -m 0755 %{SOURCE3} %{buildroot}/usr/share/qemu/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
 install -D -m 0755 scripts/analyze-migration.py  %{buildroot}%{_bindir}/analyze-migration.py
 install -D -m 0755 scripts/vmstate-static-checker.py  %{buildroot}%{_bindir}/vmstate-static-checker.py
 mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
 install -D -m 0755 %{SOURCE9} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if 0%{?is_opensuse} == 0
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
 install -D -m 0644 %{SOURCE12} %{buildroot}%{_docdir}/qemu-x86/supported.txt
 install -D -m 0644 %{SOURCE13} %{buildroot}%{_docdir}/qemu-s390/supported.txt
 install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt
-install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
 %endif
 %if %{legacy_qemu_kvm}
 cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF'
@@ -1274,12 +1256,8 @@ ln -s ../qemu-x86/supported.txt %{buildroot}%{_docdir}/qemu-kvm/kvm-supported.tx
 %endif
 %endif
 %if %{kvm_available}
-%if 0%{?suse_version} <= 1320
-install -D -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat
-install -D -m 0644 %{SOURCE4} %{buildroot}%{_mandir}/man1/kvm_stat.1.gz
-%endif
 %ifarch %ix86 x86_64
-install -D -m 0644 %{SOURCE16} %{buildroot}%{_udevrulesdir}/71-sev.rules
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/71-sev.rules
 %endif
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules
 %endif
@@ -1376,7 +1354,7 @@ fi
 %defattr(-, root, root)
 %if "%{name}" != "qemu-testsuite"
 %doc Changelog README VERSION
-%license COPYING COPYING.LIB COPYING.PYTHON LICENSE
+%license COPYING COPYING.LIB LICENSE
 %_docdir/%name/qemu-doc.txt
 %_docdir/%name/qemu-doc.html
 %_docdir/%name/qemu-qmp-ref.txt
@@ -1398,10 +1376,6 @@ fi
 %dir %_libexecdir/supportconfig/plugins
 %_libexecdir/supportconfig/plugins/qemu
 %if %{kvm_available}
-%if 0%{?suse_version} <= 1320
-%_bindir/kvm_stat
-%doc %_mandir/man1/kvm_stat.1.gz
-%endif
 %ifarch %ix86 x86_64
 %{_udevrulesdir}/71-sev.rules
 %endif

qemu.changes

@@ -1,3 +1,132 @@
+-------------------------------------------------------------------
+Mon Aug 20 21:18:19 UTC 2018 - brogers@suse.com
+
+- Increase timeout for boot-serial-test, since we've hit the timeout
+  for armv7l arch in qemu-testsuite.
+  0039-tests-boot-serial-test-Bump-timeout.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.0
+
+-------------------------------------------------------------------
+Wed Aug 15 14:27:34 UTC 2018 - brogers@suse.com
+
+- Drop legacy kvm_stat script and man page. We'll rely on the kvm_stat
+  package only going forward
+  kvm_stat
+  kvm_stat.1.gz
+- Update SLE support documentation to match v3.0.0 release
+
+-------------------------------------------------------------------
+Tue Aug 14 21:22:18 UTC 2018 - brogers@suse.com
+
+- Update to v3.0.0: See http://wiki.qemu.org/ChangeLog/3.0
+  Don't read anything into the major version number update. It's
+  been decided to increase the major version number each year.
+  Take note that ongoing feature deprecation is tracked at both
+  http://wiki.qemu-project.org/Features/LegacyRemoval and in
+  Appendix B of the qemu-doc.* files installed with the qemu package.
+  Some noteworthy changes:
+* Support for additional x86/AMD mitigations against Speculative
+  Store Bypass (Spectre Variant 4, CVE-2018-3639)
+* Improved support for nested KVM guests running on Hyper-V
+* Block device support for active disk-mirroring, which avoids
+  convergence issues which may arise when doing passive/background
+  mirroring of busy devices
+* Improved support for AHCI emulation, SCSI emulation, and persistent
+  reservations / cluster management
+* OpenGL ES support for SDL front-end, additional framebuffer
+  device options for early boot display without using legacy VGA
+  emulation
+* Live migration support for TPM TIS devices, capping bandwidth
+  usage during post-copy migration, and recovering from a failed
+  post-copy migration
+* Improved latency when using user-mode networking / SLIRP
+* ARM: support for SMMUv3 IOMMU when using 'virt' machine type
+* ARM: v8M extensions for VLLDM and VLSTM floating-point instructions,
+  and improved support for AArch64 v8.2 FP16 extensions
+* ARM: support for Scalable Vector Extensions in linux-user mode
+* Microblaze: support for 64-bit address sizes and translation bug
+  fixes
+* PowerPC: PMU support for mac99 machine type and improvements for
+  Uninorth PCI host bridge emulation for Mac machine types
+* PowerPC: preliminary support for emulating POWER9 hash MMU mode when
+  using powernv machine type
+* RISC-V: improvement for privileged ISA emulation
+* s390: support for z14 ZR1 CPU model
+* s390: bpb/ppa15 Spectre mitigations enabled by default for z196 and
+  later CPU models
+* s390: support for configuring consoles via -serial options
+
+* Patches dropped (upstream unless otherwise noted):
+  0008-linux-user-fix-segfault-deadlock.patch (no longer needed)
+  0039-blockjob-Fix-assertion-in-block_job.patch
+  0041-seccomp-allow-sched_setscheduler-wi.patch
+  Make-installed-scripts-explicitly-python3.patch (we now make
+  python3 explicit in other patch)
+* Patches renamed:
+  0009-linux-user-binfmt-support-host-bina.patch
+  -> 0008-linux-user-binfmt-support-host-bina.patch
+  0010-linux-user-Fake-proc-cpuinfo.patch
+  -> 0009-linux-user-Fake-proc-cpuinfo.patch
+  0011-Remove-problematic-evdev-86-key-fro.patch
+  -> 0010-Remove-problematic-evdev-86-key-fro.patch
+  0012-linux-user-use-target_ulong.patch
+  -> 0011-linux-user-use-target_ulong.patch
+  0013-Make-char-muxer-more-robust-wrt-sma.patch
+  -> 0012-Make-char-muxer-more-robust-wrt-sma.patch
+  0014-linux-user-lseek-explicitly-cast-no.patch
+  -> 0013-linux-user-lseek-explicitly-cast-no.patch
+  0015-AIO-Reduce-number-of-threads-for-32.patch
+  -> 0014-AIO-Reduce-number-of-threads-for-32.patch
+  0016-xen_disk-Add-suse-specific-flush-di.patch
+  -> 0015-xen_disk-Add-suse-specific-flush-di.patch
+  0017-qemu-bridge-helper-reduce-security-.patch
+  -> 0016-qemu-bridge-helper-reduce-security-.patch
+  0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  -> 0017-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  0019-linux-user-properly-test-for-infini.patch
+  -> 0018-linux-user-properly-test-for-infini.patch
+  0020-roms-Makefile-pass-a-packaging-time.patch
+  -> 0019-roms-Makefile-pass-a-packaging-time.patch
+  0021-Raise-soft-address-space-limit-to-h.patch
+  -> 0020-Raise-soft-address-space-limit-to-h.patch
+  0022-increase-x86_64-physical-bits-to-42.patch
+  -> 0021-increase-x86_64-physical-bits-to-42.patch
+  0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  -> 0022-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  0024-i8254-Fix-migration-from-SLE11-SP2.patch
+  -> 0023-i8254-Fix-migration-from-SLE11-SP2.patch
+  0025-acpi_piix4-Fix-migration-from-SLE11.patch
+  -> 0024-acpi_piix4-Fix-migration-from-SLE11.patch
+  0026-Fix-tigervnc-long-press-issue.patch
+  -> 0025-Fix-tigervnc-long-press-issue.patch
+  0027-string-input-visitor-Fix-uint64-par.patch
+  -> 0026-string-input-visitor-Fix-uint64-par.patch
+  0028-test-string-input-visitor-Add-int-t.patch
+  -> 0027-test-string-input-visitor-Add-int-t.patch
+  0029-test-string-input-visitor-Add-uint6.patch
+  -> 0028-test-string-input-visitor-Add-uint6.patch
+  0030-tests-Add-QOM-property-unit-tests.patch
+  -> 0029-tests-Add-QOM-property-unit-tests.patch
+  0031-tests-Add-scsi-disk-test.patch
+  -> 0030-tests-Add-scsi-disk-test.patch
+  0032-Switch-order-of-libraries-for-mpath.patch
+  -> 0031-Switch-order-of-libraries-for-mpath.patch
+  0033-Make-installed-scripts-explicitly-p.patch
+  -> 0032-Make-installed-scripts-explicitly-p.patch (python2->python3)
+  0034-migration-warn-about-inconsistent-s.patch
+  -> 0033-migration-warn-about-inconsistent-s.patch
+  0035-smbios-Add-1-terminator-if-any-stri.patch
+  -> 0034-smbios-Add-1-terminator-if-any-stri.patch
+  0037-configure-Modify-python-used-for-io.patch
+  -> 0035-configure-Modify-python-used-for-io.patch
+  0038-qemu-io-tests-comment-out-problemat.patch
+  -> 0036-qemu-io-tests-comment-out-problemat.patch
+  0039-tests-test-thread-pool-is-racy-add-.patch
+  -> 0037-tests-test-thread-pool-is-racy-add-.patch
+  0040-xen-add-block-resize-support-for-xe.patch
+  -> 0038-xen-add-block-resize-support-for-xe.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.0
+
 -------------------------------------------------------------------
 Thu Aug  9 03:27:38 UTC 2018 - ldewey@suse.com
 

qemu.spec

@@ -109,26 +109,24 @@ Url:            http://www.qemu.org/
 Summary:        Machine emulator and virtualizer
 License:        BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 Group:          System/Emulators/PC
-Version:        2.12.1
+Version:        3.0.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.12.1.tar.xz
+Source:         http://wiki.qemu.org/download/qemu-3.0.0.tar.xz
-Source99:       http://wiki.qemu.org/download/qemu-2.12.1.tar.xz.sig
+Source99:       http://wiki.qemu.org/download/qemu-3.0.0.tar.xz.sig
 Source1:        80-kvm.rules
-Source2:        qemu-ifup
+Source2:        71-sev.rules
-Source3:        kvm_stat
+Source3:        qemu-ifup
-Source4:        kvm_stat.1.gz
+Source4:        bridge.conf
 Source5:        qemu-kvm.1.gz
 Source6:        ksm.service
 Source7:        qemu-ga@.service
 Source8:        80-qemu-ga.rules
 Source9:        qemu-supportconfig
 Source10:       kvm.conf
-Source11:       bridge.conf
+Source11:       supported.ppc.txt
 Source12:       supported.x86.txt
 Source13:       supported.s390.txt
 Source14:       supported.arm.txt
-Source15:       supported.ppc.txt
-Source16:       71-sev.rules
 # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
@@ -138,46 +136,43 @@ Patch0004:      0004-qemu-cvs-ioctl_debug.patch
 Patch0005:      0005-qemu-cvs-ioctl_nodirection.patch
 Patch0006:      0006-linux-user-add-binfmt-wrapper-for-a.patch
 Patch0007:      0007-PPC-KVM-Disable-mmu-notifier-check.patch
-Patch0008:      0008-linux-user-fix-segfault-deadlock.patch
+Patch0008:      0008-linux-user-binfmt-support-host-bina.patch
-Patch0009:      0009-linux-user-binfmt-support-host-bina.patch
+Patch0009:      0009-linux-user-Fake-proc-cpuinfo.patch
-Patch0010:      0010-linux-user-Fake-proc-cpuinfo.patch
+Patch0010:      0010-Remove-problematic-evdev-86-key-fro.patch
-Patch0011:      0011-Remove-problematic-evdev-86-key-fro.patch
+Patch0011:      0011-linux-user-use-target_ulong.patch
-Patch0012:      0012-linux-user-use-target_ulong.patch
+Patch0012:      0012-Make-char-muxer-more-robust-wrt-sma.patch
-Patch0013:      0013-Make-char-muxer-more-robust-wrt-sma.patch
+Patch0013:      0013-linux-user-lseek-explicitly-cast-no.patch
-Patch0014:      0014-linux-user-lseek-explicitly-cast-no.patch
+Patch0014:      0014-AIO-Reduce-number-of-threads-for-32.patch
-Patch0015:      0015-AIO-Reduce-number-of-threads-for-32.patch
+Patch0015:      0015-xen_disk-Add-suse-specific-flush-di.patch
-Patch0016:      0016-xen_disk-Add-suse-specific-flush-di.patch
+Patch0016:      0016-qemu-bridge-helper-reduce-security-.patch
-Patch0017:      0017-qemu-bridge-helper-reduce-security-.patch
+Patch0017:      0017-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
-Patch0018:      0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+Patch0018:      0018-linux-user-properly-test-for-infini.patch
-Patch0019:      0019-linux-user-properly-test-for-infini.patch
+Patch0019:      0019-roms-Makefile-pass-a-packaging-time.patch
-Patch0020:      0020-roms-Makefile-pass-a-packaging-time.patch
+Patch0020:      0020-Raise-soft-address-space-limit-to-h.patch
-Patch0021:      0021-Raise-soft-address-space-limit-to-h.patch
+Patch0021:      0021-increase-x86_64-physical-bits-to-42.patch
-Patch0022:      0022-increase-x86_64-physical-bits-to-42.patch
+Patch0022:      0022-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
-Patch0023:      0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+Patch0023:      0023-i8254-Fix-migration-from-SLE11-SP2.patch
-Patch0024:      0024-i8254-Fix-migration-from-SLE11-SP2.patch
+Patch0024:      0024-acpi_piix4-Fix-migration-from-SLE11.patch
-Patch0025:      0025-acpi_piix4-Fix-migration-from-SLE11.patch
+Patch0025:      0025-Fix-tigervnc-long-press-issue.patch
-Patch0026:      0026-Fix-tigervnc-long-press-issue.patch
+Patch0026:      0026-string-input-visitor-Fix-uint64-par.patch
-Patch0027:      0027-string-input-visitor-Fix-uint64-par.patch
+Patch0027:      0027-test-string-input-visitor-Add-int-t.patch
-Patch0028:      0028-test-string-input-visitor-Add-int-t.patch
+Patch0028:      0028-test-string-input-visitor-Add-uint6.patch
-Patch0029:      0029-test-string-input-visitor-Add-uint6.patch
+Patch0029:      0029-tests-Add-QOM-property-unit-tests.patch
-Patch0030:      0030-tests-Add-QOM-property-unit-tests.patch
+Patch0030:      0030-tests-Add-scsi-disk-test.patch
-Patch0031:      0031-tests-Add-scsi-disk-test.patch
+Patch0031:      0031-Switch-order-of-libraries-for-mpath.patch
-Patch0032:      0032-Switch-order-of-libraries-for-mpath.patch
+Patch0032:      0032-Make-installed-scripts-explicitly-p.patch
-Patch0033:      0033-Make-installed-scripts-explicitly-p.patch
+Patch0033:      0033-migration-warn-about-inconsistent-s.patch
-Patch0034:      0034-migration-warn-about-inconsistent-s.patch
+Patch0034:      0034-smbios-Add-1-terminator-if-any-stri.patch
-Patch0035:      0035-smbios-Add-1-terminator-if-any-stri.patch
+Patch0035:      0035-configure-Modify-python-used-for-io.patch
-Patch0036:      0036-configure-Modify-python-used-for-io.patch
+Patch0036:      0036-qemu-io-tests-comment-out-problemat.patch
-Patch0037:      0037-qemu-io-tests-comment-out-problemat.patch
+Patch0037:      0037-tests-test-thread-pool-is-racy-add-.patch
-Patch0038:      0038-tests-test-thread-pool-is-racy-add-.patch
+Patch0038:      0038-xen-add-block-resize-support-for-xe.patch
-Patch0039:      0039-blockjob-Fix-assertion-in-block_job.patch
+Patch0039:      0039-tests-boot-serial-test-Bump-timeout.patch
-Patch0040:      0040-xen-add-block-resize-support-for-xe.patch
-Patch0041:      0041-seccomp-allow-sched_setscheduler-wi.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
 # If for any reason we have base QEMU patches which are conditionally applied,
 # include them here
-Patch1000:      Make-installed-scripts-explicitly-python3.patch
 
 # SeaBIOS / SeaVGABIOS
 Patch1100:      seabios-use-python2-explicitly-as-needed.patch
@@ -380,11 +375,7 @@ Requires(post): udev
 %ifarch s390x
 Requires(post): procps
 %endif
-%if 0%{?suse_version} > 1320
 Recommends:     kvm_stat
-%else
-Recommends:     python-curses
-%endif
 %endif
 Recommends:     qemu-block-curl
 Recommends:     qemu-tools
@@ -776,7 +767,7 @@ to provide information and control at the guest OS level.
 %package seabios
 Summary:        x86 Legacy BIOS for QEMU
 Group:          System/Emulators/PC
-Version:        1.11.1
+Version:        1.11.2
 Release:        0
 BuildArch:      noarch
 Conflicts:      qemu < 1.6.0
@@ -788,7 +779,7 @@ is the default and legacy BIOS for QEMU.
 %package vgabios
 Summary:        VGA BIOSes for QEMU
 Group:          System/Emulators/PC
-Version:        1.11.1
+Version:        1.11.2
 Release:        0
 BuildArch:      noarch
 Conflicts:      qemu < 1.6.0
@@ -841,7 +832,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.12.1
+%setup -q -n qemu-3.0.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -881,12 +872,6 @@ This package provides a service file for starting and stopping KSM.
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
-
-%if 0%{?suse_version} > 1320
-%patch1000 -p1
-%endif
 
 pushd roms/seabios
 %patch1100 -p1
@@ -1207,10 +1192,7 @@ export QEMU_PROG=%{_bindir}/qemu-system-x86_64
 export QEMU_IMG_PROG=%{_bindir}/qemu-img
 export QEMU_IO_PROG=%{_bindir}/qemu-io
 export QEMU_NBD_PROG=%{_bindir}/qemu-nbd
-# the block tests are not yet 32 bit x86 friendly
-%ifnarch %ix86
 make check-block V=1
-%endif
 
 # Create minimal gzip format file
 echo "Test" > test.txt
@@ -1239,18 +1221,18 @@ for f in %{x86_extra_built_firmware_list} \
 done
 %endif
 %find_lang %name
-install -D -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
+install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
-install -D -m 0755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
+install -D -m 0755 %{SOURCE3} %{buildroot}/usr/share/qemu/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
 install -D -m 0755 scripts/analyze-migration.py  %{buildroot}%{_bindir}/analyze-migration.py
 install -D -m 0755 scripts/vmstate-static-checker.py  %{buildroot}%{_bindir}/vmstate-static-checker.py
 mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
 install -D -m 0755 %{SOURCE9} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if 0%{?is_opensuse} == 0
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
 install -D -m 0644 %{SOURCE12} %{buildroot}%{_docdir}/qemu-x86/supported.txt
 install -D -m 0644 %{SOURCE13} %{buildroot}%{_docdir}/qemu-s390/supported.txt
 install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt
-install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
 %endif
 %if %{legacy_qemu_kvm}
 cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF'
@@ -1274,12 +1256,8 @@ ln -s ../qemu-x86/supported.txt %{buildroot}%{_docdir}/qemu-kvm/kvm-supported.tx
 %endif
 %endif
 %if %{kvm_available}
-%if 0%{?suse_version} <= 1320
-install -D -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat
-install -D -m 0644 %{SOURCE4} %{buildroot}%{_mandir}/man1/kvm_stat.1.gz
-%endif
 %ifarch %ix86 x86_64
-install -D -m 0644 %{SOURCE16} %{buildroot}%{_udevrulesdir}/71-sev.rules
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/71-sev.rules
 %endif
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules
 %endif
@@ -1376,7 +1354,7 @@ fi
 %defattr(-, root, root)
 %if "%{name}" != "qemu-testsuite"
 %doc Changelog README VERSION
-%license COPYING COPYING.LIB COPYING.PYTHON LICENSE
+%license COPYING COPYING.LIB LICENSE
 %_docdir/%name/qemu-doc.txt
 %_docdir/%name/qemu-doc.html
 %_docdir/%name/qemu-qmp-ref.txt
@@ -1398,10 +1376,6 @@ fi
 %dir %_libexecdir/supportconfig/plugins
 %_libexecdir/supportconfig/plugins/qemu
 %if %{kvm_available}
-%if 0%{?suse_version} <= 1320
-%_bindir/kvm_stat
-%doc %_mandir/man1/kvm_stat.1.gz
-%endif
 %ifarch %ix86 x86_64
 %{_udevrulesdir}/71-sev.rules
 %endif

qemu.spec.in

@@ -111,24 +111,22 @@ License:        BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.12.1.tar.xz
+Source:         http://wiki.qemu.org/download/qemu-3.0.0.tar.xz
-Source99:       http://wiki.qemu.org/download/qemu-2.12.1.tar.xz.sig
+Source99:       http://wiki.qemu.org/download/qemu-3.0.0.tar.xz.sig
 Source1:        80-kvm.rules
-Source2:        qemu-ifup
+Source2:        71-sev.rules
-Source3:        kvm_stat
+Source3:        qemu-ifup
-Source4:        kvm_stat.1.gz
+Source4:        bridge.conf
 Source5:        qemu-kvm.1.gz
 Source6:        ksm.service
 Source7:        qemu-ga@.service
 Source8:        80-qemu-ga.rules
 Source9:        qemu-supportconfig
 Source10:       kvm.conf
-Source11:       bridge.conf
+Source11:       supported.ppc.txt
 Source12:       supported.x86.txt
 Source13:       supported.s390.txt
 Source14:       supported.arm.txt
-Source15:       supported.ppc.txt
-Source16:       71-sev.rules
 # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
@@ -137,7 +135,6 @@ PATCH_FILES
 
 # If for any reason we have base QEMU patches which are conditionally applied,
 # include them here
-Patch1000:      Make-installed-scripts-explicitly-python3.patch
 
 # SeaBIOS / SeaVGABIOS
 Patch1100:      seabios-use-python2-explicitly-as-needed.patch
@@ -340,11 +337,7 @@ Requires(post): udev
 %ifarch s390x
 Requires(post): procps
 %endif
-%if 0%{?suse_version} > 1320
 Recommends:     kvm_stat
-%else
-Recommends:     python-curses
-%endif
 %endif
 Recommends:     qemu-block-curl
 Recommends:     qemu-tools
@@ -801,13 +794,9 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.12.1
+%setup -q -n qemu-3.0.0
 PATCH_EXEC
 
-%if 0%{?suse_version} > 1320
-%patch1000 -p1
-%endif
-
 pushd roms/seabios
 %patch1100 -p1
 %if 0%{?suse_version} > 1320
@@ -1127,10 +1116,7 @@ export QEMU_PROG=%{_bindir}/qemu-system-x86_64
 export QEMU_IMG_PROG=%{_bindir}/qemu-img
 export QEMU_IO_PROG=%{_bindir}/qemu-io
 export QEMU_NBD_PROG=%{_bindir}/qemu-nbd
-# the block tests are not yet 32 bit x86 friendly
-%ifnarch %ix86
 make check-block V=1
-%endif
 
 # Create minimal gzip format file
 echo "Test" > test.txt
@@ -1159,18 +1145,18 @@ for f in %{x86_extra_built_firmware_list} \
 done
 %endif
 %find_lang %name
-install -D -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
+install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
-install -D -m 0755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
+install -D -m 0755 %{SOURCE3} %{buildroot}/usr/share/qemu/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
 install -D -m 0755 scripts/analyze-migration.py  %{buildroot}%{_bindir}/analyze-migration.py
 install -D -m 0755 scripts/vmstate-static-checker.py  %{buildroot}%{_bindir}/vmstate-static-checker.py
 mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
 install -D -m 0755 %{SOURCE9} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if 0%{?is_opensuse} == 0
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
 install -D -m 0644 %{SOURCE12} %{buildroot}%{_docdir}/qemu-x86/supported.txt
 install -D -m 0644 %{SOURCE13} %{buildroot}%{_docdir}/qemu-s390/supported.txt
 install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt
-install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
 %endif
 %if %{legacy_qemu_kvm}
 cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF'
@@ -1194,12 +1180,8 @@ ln -s ../qemu-x86/supported.txt %{buildroot}%{_docdir}/qemu-kvm/kvm-supported.tx
 %endif
 %endif
 %if %{kvm_available}
-%if 0%{?suse_version} <= 1320
-install -D -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat
-install -D -m 0644 %{SOURCE4} %{buildroot}%{_mandir}/man1/kvm_stat.1.gz
-%endif
 %ifarch %ix86 x86_64
-install -D -m 0644 %{SOURCE16} %{buildroot}%{_udevrulesdir}/71-sev.rules
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/71-sev.rules
 %endif
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules
 %endif
@@ -1296,7 +1278,7 @@ fi
 %defattr(-, root, root)
 %if "%{name}" != "qemu-testsuite"
 %doc Changelog README VERSION
-%license COPYING COPYING.LIB COPYING.PYTHON LICENSE
+%license COPYING COPYING.LIB LICENSE
 %_docdir/%name/qemu-doc.txt
 %_docdir/%name/qemu-doc.html
 %_docdir/%name/qemu-qmp-ref.txt
@@ -1318,10 +1300,6 @@ fi
 %dir %_libexecdir/supportconfig/plugins
 %_libexecdir/supportconfig/plugins/qemu
 %if %{kvm_available}
-%if 0%{?suse_version} <= 1320
-%_bindir/kvm_stat
-%doc %_mandir/man1/kvm_stat.1.gz
-%endif
 %ifarch %ix86 x86_64
 %{_udevrulesdir}/71-sev.rules
 %endif

supported.arm.txt

@@ -1,11 +1,11 @@
 [qemu-arm package document]
 
-SLES 15 QEMU/KVM RELATED SUPPORT STATEMENTS
+SLES 15 SP1 QEMU/KVM RELATED SUPPORT STATEMENTS
 
 Overview
 --------
 
-  The QEMU based packages included with SLES 15 provide a large variety of
+  The QEMU based packages included with SLES 15 SP1 provide a large variety of
   features, from the very latest customer requests to features of questionable
   quality or value. The linux kernel includes components which contribute KVM
   virtualization features as well. This document was created to assist the user
@@ -56,8 +56,8 @@ Major QEMU/KVM Supported Features
   Since a KVM guest runs in the context of a normal linux process, some types
   of execution controls are managed with linux tools.
 
-- QEMU is compatible with EDK based UEFI firmware available with SLES 15, which
+- QEMU is compatible with EDK based UEFI firmware available with SLES 15 SP1,
-  allow boot options common to physical systems, along with other features
+  which allow boot options common to physical systems, along with other features
   tailored to virtualization. Various VGABIOS ROMs, from the SEABIOS project,
   are also available.
 
@@ -72,8 +72,9 @@ Major QEMU/KVM Supported Features
 
 - Guest execution state may be "moved" in both time (save/restore) and space
   (static and live migration). These migrations or save/restore operations can
-  take place either from certain prior SLES versioned hosts to a SLES 15 host
+  take place either from certain prior SLES versioned hosts to a SLES 15 SP1
-  or between hosts of the same version. Certain other restrictions also apply.
+  host or between hosts of the same version. Certain other restrictions also
+  apply.
 
 - Security considerations include privileged helpers and a security model which
   allows running guests as a non-root user.
@@ -111,16 +112,13 @@ Major QEMU/KVM Supported Features
 
 - Portions of the host file system may be shared with a guest by using virtFS.
 
-- A guest "agent" is available for SLES 15 KVM guests via the qemu-guest-agent
+- A guest "agent" is available for SLES 15 SP1 KVM guests via the
-  package. This allows some introspection and control of the guest OS
+  qemu-guest-agent package. This allows some introspection and control of the
-  environment from the host.
+  guest OS environment from the host.
 
 QEMU/KVM Technology Previews
 ----------------------------
 
-- Specifying and placing PCI devices on a PCI bridge allows for a greater number
-  of devices.
-
 - All features indicated as not being supported in this document fall under the
   Technology Preview definition contained in the main product's release notes.
 
@@ -143,7 +141,8 @@ Deprecated, Superseded, Modified and Dropped Features
   This website tracks feature deprecation and removal at the upstream
   development level. Our qemu package inherits this community direction, but be
   aware that we can and will deviate as needed. Those deviations and additional
-  information can be found in this section.
+  information can be found in this section. Feature deprecation is also tracked
+  in Appendix B of the qemu-doc.* files installed with the qemu package.
 
 - The use of "?" as a parameter to "-cpu", "-soundhw", "-device", "-M",
   "-machine", "-d", and "-clock" is now considered deprecated. Use "help"
@@ -165,8 +164,12 @@ Deprecated, Superseded, Modified and Dropped Features
   acpitable, boot, and smp respectively.
 
 - These previously supported command line options are now considered deprecated:
+  -balloon (use -device virtio-balloon instead)
+  -clock
   -device ivshmem (use ivshmem-doorbell or ivshmem-plain instead)
   -nodefconfig (use -no-user-config instead)
+  -no-frame
+  -virtioconsole (use -device virtconsole instead)
 
 - These previously supported command line options are no longer supported:
   <previously mentioned items have been moved to another category>
@@ -177,6 +180,9 @@ Deprecated, Superseded, Modified and Dropped Features
   -display sdl
   -sdl
 
+- The previously unsupported machine type xlnx-ep108 is no longer recognized
+  (used xlnx-zcu102 unstead)
+
 - Specifying a cpu feature with both "+feature/-feature" and "feature=on/off"
   will now cause a warning. The current behavior for this combination where
   "+feature/-feature" wins over "feature=on/off", will be changed going forward
@@ -186,6 +192,28 @@ Deprecated, Superseded, Modified and Dropped Features
 - The previously supported blkdev-add QMP command has been flagged as lacking
   and could possibly change syntax in the future.
 
+- These previously unsupported command line options are now deprecated:
+  -enable-hax
+
+- These previously unsupported command line options are no longer recognized:
+  -tdf
+
+- This previously supported QMP command is now deprecated:
+  query-cpus (use query-cpus-fast instead)
+
+- These previously supported monitor commands are no longer recognized:
+  pci_add (use device_add instead)
+  pci_del (use device_del instead)
+  usb_add (use device_add instead)
+  usb_del (use device_del instead)
+
+- These previously unsupported monitor commands are no longer recognized:
+  host_net_add
+  host_net_remove
+
+- This previously unsupported QMP command is now supported under a new name:
+  x-blockdev-create (use blockdev-create instead)
+
 - Due to upstream's decision to no longer fully support the qed storage format
   going forward (since it really provides no benefit over qcow2 and is now no
   longer actively maintained upstream), creating qed storage images is no longer
@@ -210,8 +238,8 @@ QEMU Command-Line and Monitor Syntax and Support
   better functionality and usability going forward. In some cases existing
   problems or even bugs in older interfaces cannot be fixed due to functional
   expectations, but are resolved in the newer interface or option.
-  This advice includes moving to the most recent machine type (eg virt-2.11
+  This advice includes moving to the most recent machine type (eg virt-3.0
-  instead of virt-2.6) if possible.
+  instead of virt-2.11) if possible.
 
 - The following command line options are supported:
   -accel ...
@@ -263,8 +291,8 @@ QEMU Command-Line and Monitor Syntax and Support
   -kernel ...
   -loadvm ...
   -m ...
-  -M [help|?|none|virt|virt-2.6|virt-2.11]
+  -M [help|?|none|virt|virt-2.6|virt-2.11|virtio-3.0]
-  -machine [help|?|none|virt|virt-2.6|virt-2.11]
+  -machine [help|?|none|virt|virt-2.6|virt-2.11|virt-3.0]
   -mem-path ...
   -mem-prealloc
   -mon ...
@@ -355,6 +383,8 @@ QEMU Command-Line and Monitor Syntax and Support
   migrate_cancel
   migrate_continue ...
   migrate_incoming
+  migrate_pause
+  migrate_recover ...
   migrate_set_cache_size ...
   migrate_set_capability ...
   migrate_set_downtime ...
@@ -369,8 +399,6 @@ QEMU Command-Line and Monitor Syntax and Support
   object_add ...
   object_del ...
   p ...
-  pci_add ...
-  pci_del...
   pmemsave ...
   print ...
   q
@@ -390,8 +418,6 @@ QEMU Command-Line and Monitor Syntax and Support
   system_reset
   system_wakeup
   trace-event ...
-  usb_add ...
-  usb_del ...
   watchdog_action ...
   x ...
   xp ...
@@ -404,6 +430,7 @@ QEMU Command-Line and Monitor Syntax and Support
   blockdev-backup
   blockdev-change-medium
   blockdev-close-tray
+  blockdev-create
   blockdev-del
   blockdev-mirror
   blockdev-open-tray
@@ -441,11 +468,19 @@ QEMU Command-Line and Monitor Syntax and Support
   human-monitor-command
   inject-nmi
   input-send-event
+  job-cancel
+  job-complete
+  job-dismiss
+  job-finalize
+  job-pause
+  job-resume
   memsave
   migrate
   migrate_cancel
   migrate-continue
   migrate-incoming
+  migrate-pause
+  migrate-resume
   migrate-set-cache-size
   migrate-set-capabilities
   migrate_set_downtime
@@ -482,6 +517,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-gic-capabilities
   query-hotpluggable-cpus
   query-iothreads
+  query-jobs
   query-kvm
   query-machines
   query-memdev
@@ -495,6 +531,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-name
   query-named-block-nodes
   query-pci
+  query-pr-managers
   query-qmp-schema
   query-rocker
   query-rocker-of-dpa-flows
@@ -542,13 +579,13 @@ QEMU Command-Line and Monitor Syntax and Support
           arm1136-r2-arm-cpu|arm1176-arm-cpu|arm11mpcore-arm-cpu|
           arm11mpcore_priv|arm11-scu|arm926-arm-cpu|arm946-arm-cpu|
           ARMbitband-memory|arm.cortex-a9-global-timer|arm_gic|arm-gicv2m|
-          arm_mptimer|armv7m_nvic|aspeed.timer|aspeed.vic|ast2400|
+          arm_mptimer|armv7m_nvic|aspeed.timer|aspeed.vic|ast2400|at24c-eeprom|
           at25128a-nonjedec|at25256a-nonjedec|at25df041a|at25df321a|at25df641|
           at25fs010|at25fs040|at26df081a|at26df161a|at26df321|at26f004|
           at45db081d|bcm2835-aux|bcm2835-dma|bcm2835-fb|bcm2835-ic|bcm2835-mbox|
           bcm2835-peripherals|bcm2835-property|bcm2836|bcm2836-control|
-          cadence_gem|cadence_ttc|cadence_uart|ccid-card-emulated|
+          bochs-display|cadence_gem|cadence_ttc|cadence_uart|ccid-card-emulated|
-          ccid-card-passthrough|cfi.pflash02|cirrus-vga|corgi-ssp|
+          ccid-card-passthru|cfi.pflash02|cirrus-vga|corgi-ssp|
           cortex-a15-arm-cpu|cortex-a53-arm-cpu|cortex-a57-arm-cpu|
           cortex-a8-arm-cpu|cortex-a9-arm-cpu|cortex-m3-arm-cpu|
           cortex-m4-arm-cpu|cortex-r5-arm-cpu|cs4231a|digic|digic-timer|
@@ -564,48 +601,49 @@ QEMU Command-Line and Monitor Syntax and Support
           integrator_debug|integrator_pic|integrator_pit|intel_iommu|
           ipmi-bmc-extern|ipmi-bmc-sim|isa-applesmc|isa-cirrus-vga|isa-debugcon|
           isa-debug-exit|isa-fdc|isa-ide|isa-ipmi-bt|isa-ipmi-kcs|isa-parallel|
-          isa-vga|kvm-arm-gic|kvm-arm-gicv3|l2x0|lan9118|lm8323|loader|
+          isa-vga|kvaser_pci|kvm-arm-gic|kvm-arm-gicv3|l2x0|lan9118|lm8323|
-          lsi53c810a|lsi53c895a|m25p05|m25p10|m25p128|m25p16|m25p20|m25p32|
+          loader|lsi53c810a|lsi53c895a|m25p05|m25p10|m25p128|m25p16|m25p20|
-          m25p40|m25p64|m25p80|m25pe16|m25pe20|m25pe80|m25px32|m25px32-s0|
+          m25p32|m25p40|m25p64|m25p80|m25pe16|m25pe20|m25pe80|m25px32|
-          m25px32-s1|m25px64|m45pe10|m45pe16|m45pe80|mainstone-fpga|max1110|
+          m25px32-s0|m25px32-s1|m25px64|m45pe10|m45pe16|m45pe80|mainstone-fpga|
-          max1111|max7310|musicpal_gpio|musicpal_key|musicpal_lcd|musicpal-misc|
+          max1110|max1111|max7310|mioe3680_pci|mmio_interface|msf2-soc|
-          mv88w8618_audio|mv88w8618_eth|mv88w8618_flashcfg|mv88w8618_pic|
+          msf2-sysreg|mss-sp1|mss-timer|musicpal_gpio|musicpal_key|musicpal_lcd|
-          mv88w8618_pit|mv88w8618_wlan|mx25l12805d|mx25l12855e|mx25l1606e|
+          musicpal-misc|mv88w8618_audio|mv88w8618_eth|mv88w8618_flashcfg|
-          mx25l2005a|mx25l25635e|mx25l25655e|mx25l3205d|mx25l4005a|mx25l6405d|
+          mv88w8618_pic|mv88w8618_pit|mv88w8618_wlan|mx25l12805d|mx25l12855e|
-          mx25l8005|n25q032|n25q032a11|n25q032a13|n25q064|n25q064a11|n25q064a13|
+          mx25l1606e|mx25l2005a|mx25l25635e|mx25l25655e|mx25l3205d|mx25l4005a|
-          n25q128|n25q128a11|n25q128a13|n25q256a|n25q256a11|n25q256a13|n25q512a|
+          mx25l6405d|mx25l8005|n25q032|n25q032a11|n25q032a13|n25q064|n25q064a11|
-          nand|ne2k_isa|nvdimm|omap2-gpio|omap2-intc|omap-gpio|omap_i2c|
+          n25q064a13|n25q128|n25q128a11|n25q128a13|n25q256a|n25q256a11|
-          omap-intc|onenand|pc-dimm|pc-testdev|piix3-ide|piix3-ide|
+          n25q256a13|n25q512a|n25q512a11|n25q512a13|nand|ne2k_isa|nvdimm|
-          piix3-ide-xen|piix3-usb-uhci|pl011|pl011_luminary|pl022|pl031|pl041|
+          omap2-gpio|omap2-intc|omap-gpio|omap_i2c|omap-intc|onenand|pc-dimm|
-          pl050_keyboard|pl050_mouse|pl061|pl061_luminary|pl080|pl081|pl110|
+          pc-testdev|piix3-ide|piix3-ide|piix3-ide-xen|piix3-usb-uhci|pl011|
-          pl110_versatile|pl111|pl181|pl190|pl330|platform-bus-device|
+          pl011_luminary|pl022|pl031|pl041|pl050_keyboard|pl050_mouse|pl061|
-          pxa250-arm-cpu|pxa255-arm-cpu|pxa25x-timer|pxa260-arm-cpu|
+          pl061_luminary|pl080|pl081|pl110|pl110_versatile|pl111|pl181|pl190|
-          pxa261-arm-cpu|pxa262-arm-cpu|pxa270-a0-arm-cpu|pxa270-a1-arm-cpu|
+          pl330|platform-bus-device|pvrdma|pxa250-arm-cpu|pxa255-arm-cpu|
-          pxa270-arm-cpu|pxa270-b0-arm-cpu|pxa270-b1-arm-cpu|pxa270-c0-arm-cpu|
+          pxa25x-timer|pxa260-arm-cpu|pxa261-arm-cpu|pxa262-arm-cpu|
-          pxa270-c5-arm-cpu|pxa27x-timer|pxa2xx-dma|pxa2xx-fir|pxa2xx-gpio|
+          pxa270-a0-arm-cpu|pxa270-a1-arm-cpu|pxa270-arm-cpu|pxa270-b0-arm-cpu|
-          pxa2xx_i2c|pxa2xx-i2c-slave|pxa2xx-mmci|pxa2xx-pcmcia|pxa2xx_pic|
+          pxa270-b1-arm-cpu|pxa270-c0-arm-cpu|pxa270-c5-arm-cpu|pxa27x-timer|
-          pxa2xx_rtc|pxa2xx-ssp|realview_gic|realview_mpcore|realview_pci|
+          pxa2xx-dma|pxa2xx-fir|pxa2xx-gpio|pxa2xx_i2c|pxa2xx-i2c-slave|
-          realview_sysctl|s25fl016k|s25fl064k|s25fl129p0|s25fl129p1|s25fl256s0|
+          pxa2xx-mmci|pxa2xx-pcmcia|pxa2xx_pic|pxa2xx_rtc|pxa2xx-ssp|ramfb|
-          s25fl256s1|s25fl512s|s25sl004a|s25sl008a|s25sl016a|s25sl032a|
+          realview_gic|realview_mpcore|realview_pci|realview_sysctl|s25fl016k|
-          s25sl032p|s25sl064a|s25sl064p|s25sl12800|s25sl12801|s70fl01gs|
+          s25fl064k|s25fl129p0|s25fl129p1|s25fl256s0|s25fl256s1|s25fl512s|
-          sa1100-arm-cpu|sa1110-arm-cpu|sb16|scoop|sdhci-pci|sga|sl-nand|
+          s25sl004a|s25sl008a|s25sl016a|s25sl032a|s25sl032p|s25sl064a|s25sl064p|
-          smbus-eeprom|smc91c111|sp804|spitz-keyboard|spitz-lcdtg|ssd0303|
+          s25sl12800|s25sl12801|s70fl01gs|sa1100-arm-cpu|sa1110-arm-cpu|sb16|
-          ssd0323|ssi-sd|sst25vf016b|sst25vf032b|sst25vf040b|sst25vf080b|
+          scoop|sdhci-pci|sga|sii9022|sl-nand|smbus-eeprom|smc91c111|sp804|
-          sst25wf010|sst25wf020|sst25wf040|sst25wf080|sst25wf512|stellaris-adc|
+          spitz-keyboard|spitz-lcdtg|ssd0303|ssd0323|ssi-sd|sst25vf016b|
-          stellaris_enet|stellaris-gptm|stellaris-i2c|stm32f205-soc|
+          sst25vf032b|sst25vf040b|sst25vf080b|sst25wf010|sst25wf020|sst25wf040|
-          stm32f2xx-syscfg|stm32f2xx-timer|stm32f2xx-usart|strongarm-gpio|
+          sst25wf080|sst25wf512|stellaris-adc|stellaris_enet|stellaris-gptm|
-          strongarm_pic|strongarm-ppc|strongarm-rtc|strongarm-ssp|
+          stellaris-i2c|stm32f205-soc|stm32f2xx-syscfg|stm32f2xx-timer|
-          strongarm-uart|tegra2-ehci-usb|ti925t-arm-cpu|tmp105|tosa_dac|
+          stm32f2xx-usart|strongarm-gpio|strongarm_pic|strongarm-ppc|
-          tosa-ssp|tusb6010|twl92230|usb-redir|versatile_i2c|versatilepb_sic|
+          strongarm-rtc|strongarm-ssp|strongarm-uart|tegra2-ehci-usb|
-          versatile_pci|versatile_pci_host|vfio-pci-igd-lpc-bridge|
+          ti925t-arm-cpu|tmp105|tosa_dac|tosa-ssp|tusb6010|twl92230|usb-redir|
-          vhost-vsock-device|vhost-vsock-pci|virtconsole|virtio-crypto-device|
+          versatile_i2c|versatilepb_sic|versatile_pci|versatile_pci_host|
-          virtio-crypto-pci|virtio-vga|vmware-svga|w25q256|w25q32|w25q32dw|
+          vfio-pci-igd-lpc-bridge|vhost-user-blk|vhost-user-blk-pci|
-          w25q64|w25q80|w25q80bl|w25x10|w25x16|w25x20|w25x32|w25x40|w25x64|
+          vhost-user-scsi|vhost-user-scsi-pci|vhost-vsock-device|
-          w25x80|wm8750|*-x86_64-cpu|xen-backend|xen-pci-passthrough|
+          vhost-vsock-pci|virtconsole|virtio-crypto-device|virtio-crypto-pci|
-          xen-platform|xen-pvdevice|xgmac|xilinxzynq_slcr|xlnx.ps7-qspi|
+          virtio-vga|vmgenid|vmware-svga|w25q256|w25q32|w25q32dw|w25q64|w25q80|
-          xlnx.ps7-spi|xlnxps7-usb|xlnxzynqmp|xlnxzynq-xadc|vmgenid|
+          w25q80bl|w25x10|w25x16|w25x20|w25x32|w25x40|w25x64|w25x80|wm8750|
-          vhost-user-scsi|vhost-user-scsi-pci|mmio_interface|msf2-soc|
+          *-x86_64-cpu|xen-backend|xen-pci-passthrough|xen-platform|
-          msf2-sysreg|mss-spi|mss-timer]
+          xen-pvdevice|xgmac|xilinxzynq_slcr|xlnx.ps7-qspi|xlnx.ps7-spi|
+          xlnxps7-usb|xlnxzynqmp|xlnxzynq-xadc]
           (the following are aliases of these unsupported devices: lsi|
           virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet|
           virtio-gpu||piix-usb-uhci)
@@ -623,18 +661,20 @@ QEMU Command-Line and Monitor Syntax and Support
   -L ...
   -M [akita|ast2500-evb|borzoi|canon-a1100|cheetah|collie|connex|cubieboard|
      highbank|imx25-pdk|integratorcp|kzm|lm3s6965evb|lm3s811evb|mainstone|
-     midway|mps2-an385|mps2-an511|musicpal|n800|n810|netduino2|nuri|
+     mcimx7d-sabre|midway|mps2-an385|mps2-an505|mps2-an511|musicpal|n800|n810|
-     palmetto-bmc|raspi2|realview-eb|realview-eb-mpcore|realview-pb-a8|
+     netduino2|nuri|palmetto-bmc|raspi2|raspi3|realview-eb|realview-eb-mpcore|
-     realview-pbx-a9|romulus-bmc|sabrelite|smdkc210|spitz|sx1|sx1-v1|terrier|
+     realview-pb-a8|realview-pbx-a9|romulus-bmc|sabrelite|smdkc210|spitz|sx1|
-     tosa|verdex|versatileab|versatilepb|vexpress-a15|vexpress-a9|virt-2.7|
+     sx1-v1|terrier|tosa|verdex|versatileab|versatilepb|vexpress-a15|
-     virt-2.8|xilinx-zynq-a9|xlnx-ep108|z2]
+     vexpress-a9|virt-2.7|virt-2.8|virt-2.12|witherspoon-bmc|xilinx-zynq-a9|
-  -machine [akita|asr2500-evb|borzoi|canon-a1100|cheetah|collie|connex|
+     xlnx-zcu102|z2]
+  -machine [akita|ast2500-evb|borzoi|canon-a1100|cheetah|collie|connex|
            cubieboard|highbank|imx25-pdk|integratorcp|kzm|lm3s6965evb|
-           lm3s811evb|mainstone|midway|mps2-an385|mps2-an511|musicpal|n800|n810|
+           lm3s811evb|mainstone|mcimx7d-sabre|midway|mps2-an385|mps2-an505|
-           netduin02|nuri|palmetto-bmc|raspi2|realview-eb|realview-eb-mpcore|
+           mps2-an511|musicpal|n800|n810|netduino2|nuri|palmetto-bmc|raspi2|
-           realview-pb-a8|realview-pbx-a9|romulus-bmc|sabrelite|smdkc210|spitz|
+           raspi3|realview-eb|realview-eb-mpcore|realview-pb-a8|realview-pbx-a9|
-           sx1|sx1-v1|terrier|tosa|verdex|versatileab|versatilepb|vexpress-a15|
+           romulus-bmc|sabrelite|smdkc210|spitz|sx1|sx1-v1|terrier|tosa|verdex|
-           vexpress-a9|virt-2.7|virt-2.8|xilinx-zynq-a9|xlnx-ep108|z2]
+           versatileab|versatilepb|vexpress-a15|vexpress-a9|virt-2.7|virt-2.8|
+           virt-2.12|witherspoon-bmc|xilinx-zynq-a9|xlnx-zcu102|z2]
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
@@ -648,8 +688,10 @@ QEMU Command-Line and Monitor Syntax and Support
   -numa dist ...
   -numa node ...
   -option-rom ...
+  -overcommit ...
   -pflash file
   -portrait
+  -preconfig
   -prom-env ...
   -qtest ...
   -qtest-log ...
@@ -661,7 +703,6 @@ QEMU Command-Line and Monitor Syntax and Support
   -snapshot
   -soundhw ...
   -tb-size ...
-  -tdf
   -tpmdev emulator ...
   -vga [cg3|tcx|virtio|cirrus|xenfb]
   -win2k-hack
@@ -684,11 +725,10 @@ QEMU Command-Line and Monitor Syntax and Support
   block_passwd ...
   commit ...
   drive_mirror ...
+  exit_preconfig
   expire_password ...
   hostfwd_add ...
   hostfwd_remove ...
-  host_net_add ...
-  host_net_remove ...
   nbd_server_add ...
   nbd server_start ...
   nbd_server_stop ...
@@ -720,12 +760,16 @@ QEMU Command-Line and Monitor Syntax and Support
   nbd-server-stop
   query-sev
   query-sev-launch-measure
+  x-block-dirty-bitmap-disable
+  x-block-dirty-bitmap-enable
+  x-block-dirty-bitmap-merge
   x-blockdev-change
-  x-blockdev-create
   x-blockdev-insert-medium
   x-blockdev-remove-medium
   x-colo-lost-heartbeat
   x-debug-block-dirty-bitmap-sha256
+  x-exit-preconfig
+  x-nbd-server-add-bitmap
   xen-colo-do-checkpoint
   xen-load-devices-state
   xen-save-devices-state

supported.ppc.txt

@@ -1,11 +1,11 @@
 [qemu-ppc package document]
 
-SLES 15 QEMU/KVM RELATED SUPPORT STATEMENTS
+SLES 15 SP1 QEMU/KVM RELATED SUPPORT STATEMENTS
 
 Overview
 --------
 
-  The QEMU based packages included with SLES 15 provide a large variety of
+  The QEMU based packages included with SLES 15 SP1 provide a large variety of
   features, from the very latest customer requests to features of questionable
   quality or value. The linux kernel includes components which contribute KVM
   virtualization features as well. This document was created to assist the user
@@ -111,16 +111,13 @@ Major QEMU/KVM Supported Features
 
 - Portions of the host file system may be shared with a guest by using virtFS.
 
-- A guest "agent" is available for SLES 12 KVM guests via the qemu-guest-agent
+- A guest "agent" is available for SLES 15 SP1 KVM guests via the
-  package. This allows some introspection and control of the guest OS
+  qemu-guest-agent package. This allows some introspection and control of the
-  environment from the host.
+  guest OS environment from the host.
 
 QEMU/KVM Technology Previews
 ----------------------------
 
-- Specifying and placing PCI devices on a PCI bridge allows for a greater number
-  of devices.
-
 - All features indicated as not being supported in this document fall under the
   Technology Preview definition contained in the main product's release notes.
 
@@ -143,7 +140,8 @@ Deprecated, Superseded, Modified and Dropped Features
   This website tracks feature deprecation and removal at the upstream
   development level. Our qemu package inherits this community direction, but be
   aware that we can and will deviate as needed. Those deviations and additional
-  information can be found in this section.
+  information can be found in this section. Feature deprecation is also tracked
+  in Appendix B of the qemu-doc.* files installed with the qemu package.
 
 - The use of "?" as a parameter to "-cpu", "-soundhw", "-device", "-M",
   "-machine", "-d", and "-clock" is now considered deprecated. Use "help"
@@ -165,8 +163,12 @@ Deprecated, Superseded, Modified and Dropped Features
   acpitable, boot, and smp respectively.
 
 - These previously supported command line options are now considered deprecated:
+  -balloon (use -device virtio-balloon instead)
+  -clock
   -device ivshmem (use ivshmem-doorbell or ivshmem-plain instead)
   -nodefconfig (use -no-user-config instead)
+  -no-frame
+  -virtioconsole (use -device virtconsole instead)
 
 - These previously supported command line options are no longer supported:
   <previously mentioned items have been moved to another category>
@@ -177,6 +179,12 @@ Deprecated, Superseded, Modified and Dropped Features
   -display sdl
   -sdl
 
+- These previously unsupported command line options are no longer recognized:
+  -device cmd646-ide
+  -device macio-newworld
+  -device macio-oldworld
+  -device spapr-pci-vfio-host-bridge
+
 - Specifying a cpu feature with both "+feature/-feature" and "feature=on/off"
   will now cause a warning. The current behavior for this combination where
   "+feature/-feature" wins over "feature=on/off", will be changed going forward
@@ -186,6 +194,28 @@ Deprecated, Superseded, Modified and Dropped Features
 - The previously supported blkdev-add QMP command has been flagged as lacking
   and could possibly change syntax in the future.
 
+- These previously unsupported command line options are now deprecated:
+  -enable-hax
+
+- These previously unsupported command line options are no longer recognized:
+  -tdf
+
+- This previously supported QMP command is now deprecated:
+  query-cpus (use query-cpus-fast instead)
+
+- These previously supported monitor commands are no longer recognized:
+  pci_add (use device_add instead)
+  pci_del (use device_del instead)
+  usb_add (use device_add instead)
+  usb_del (use device_del instead)
+
+- These previously unsupported monitor commands are no longer recognized:
+  host_net_add
+  host_net_remove
+
+- This previously unsupported QMP command is now supported under a new name:
+  x-blockdev-create (use blockdev-create instead)
+
 - Due to upstream's decision to no longer fully support the qed storage format
   going forward (since it really provides no benefit over qcow2 and is now no
   longer actively maintained upstream), creating qed storage images is no longer
@@ -210,6 +240,8 @@ QEMU Command-Line and Monitor Syntax and Support
   better functionality and usability going forward. In some cases existing
   problems or even bugs in older interfaces cannot be fixed due to functional
   expectations, but are resolved in the newer interface or option.
+  This advice includes moving to the most recent machine type (eg pseries-3.0
+  instead of pseries-2.11) if possible.
 
 - The following command line options are supported:
   -accel ...
@@ -236,7 +268,7 @@ QEMU Command-Line and Monitor Syntax and Support
           pci-serial|pci-serial-2x|pci-serial-4x|ich9-ahci|usb-host|usb-serial|
           usb-wacom-tablet|usb-braille|usb-net|pci-ohci|virtio-rng-pci|i6300esb|
           qxl|qxl-vga|pvpanic|vfio-pci|ivshmem|ivshmem-doorbell|ivshmem-plain|
-          pci-bridge|megasas-gen2|e1000e|e1000]
+          pci-bridge|megasas-gen2|e1000e|e1000|cirrus-vga]
           (the following are aliases of these supported devices: ahci|
           virtio-blk|virtio-net|virtio-serial|virtio-balloon| virtio-9p|
           virtio-scsi|virtio-rng|e1000-82540em)
@@ -261,8 +293,8 @@ QEMU Command-Line and Monitor Syntax and Support
   -kernel ...
   -loadvm ...
   -m ...
-  -M [help|?|none|pseries|pseries-2.11]
+  -M [help|?|none|pseries|pseries-2.11|pseries-3.0]
-  -machine [help|?|none|pseries|pseries-2.11]
+  -machine [help|?|none|pseries|pseries-2.11|pseries-3.0]
   -mem-path ...
   -mem-prealloc
   -mon ...
@@ -347,6 +379,8 @@ QEMU Command-Line and Monitor Syntax and Support
   migrate_cancel
   migrate_continue ...
   migrate_incoming
+  migrate_pause
+  migrate_recover ...
   migrate_set_cache_size ...
   migrate_set_capability ...
   migrate_set_downtime ...
@@ -361,8 +395,6 @@ QEMU Command-Line and Monitor Syntax and Support
   object_add ...
   object_del ...
   p ...
-  pci_add ...
-  pci_del...
   pmemsave ...
   print ...
   q
@@ -382,8 +414,6 @@ QEMU Command-Line and Monitor Syntax and Support
   system_reset
   system_wakeup
   trace-event ...
-  usb_add ...
-  usb_del ...
   watchdog_action ...
   x ...
   xp ...
@@ -396,6 +426,7 @@ QEMU Command-Line and Monitor Syntax and Support
   blockdev-backup
   blockdev-change-medium
   blockdev-close-tray
+  blockdev-create
   blockdev-del
   blockdev-mirror
   blockdev-open-tray
@@ -431,11 +462,19 @@ QEMU Command-Line and Monitor Syntax and Support
   human-monitor-command
   inject-nmi
   input-send-event
+  job-cancel
+  job-complete
+  job-dismiss
+  job-finalize
+  job-pause
+  job-resume
   memsave
   migrate
   migrate_cancel
   migrate-continue
   migrate-incoming
+  migrate-pause
+  migrate-resume
   migrate-set-cache-size
   migrate-set-capabilities
   migrate_set_downtime
@@ -472,6 +511,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-gic-capabilities
   query-hotpluggable-cpus
   query-iothreads
+  query-jobs
   query-kvm
   query-machines
   query-memdev
@@ -485,6 +525,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-name
   query-named-block-nodes
   query-pci
+  query-pr-managers
   query-qmp-schema
   query-rocker
   query-rocker-of-dpa-flows
@@ -527,7 +568,7 @@ QEMU Command-Line and Monitor Syntax and Support
   -cpu ... (all except host)
   -curses
   -device [adb-keyboard| adb-mouse|adlib|amd-iommu|AMDVI-PCI|ccid-card-emulated|
-          ccid-card-passthrough|cfi.pflash02|cirrus-vga|cmd646-ide|cs4231a|
+          ccid-card-passthrough|cfi.pflash02|cirrus-vga|cs4231a|
           dec-21154-p2p-bridge|dec-21154-sysbus|e1000 e500-ccsr|e500-pcihost|
           e500-spin|escc|esp|eTSEC|floppy|generic-sdhci|gus|grackle-pcihost|
           host-spapr-cpu-core|hyperv-testdev|i8042|i82374|i82378|ib700|icp|
@@ -535,24 +576,26 @@ QEMU Command-Line and Monitor Syntax and Support
           ipmi-bmc-extern|ipmi-bmc-sim|isa-applesmc|isa-cirrus-vga|isa-debugcon|
           isa-debug-exit|isa-fdc|isa-ide|isa-ipmi-bt|isa-ipmi-kcs|isa-m48t59|
           isa-parallel|isa-vga|isabus-bridge|kvm-openpic|loader|lsi53c810a|
-          macio-ide|macio-newworld|macio-nvram|macio-oldworld|mpc8544-guts|
+          macio-ide|macio-nvram|mpc8544-guts|mpc8xxx_gpio|ne2k_isa|nvdimm|
-          mpc8xxx_gpio|ne2k_isa|nvdimm|openpic|pc-dimm|pc-testdev|pc87312|
+          openpic|pc-dimm|pc-testdev|pc87312|piix3-ide|piix3-ide|piix3-ide-xen|
-          piix3-ide|piix3-ide|piix3-ide-xen|piix3-usb-uhci|platform-bus-device|
+          piix3-usb-uhci|platform-bus-device|pnv-lpc|powernv-chip-POWER8|
-          pnv-lpc|powernv-chip-POWER8|powernv-chip-POWER8E|
+          powernv-chip-POWER8E|powernv-chip-POWER8NVL|powernv-chip-POWER9|
-          powernv-chip-POWER8NVL|powernv-chip-POWER9|powernv-cpu-core-POWER8|
+          powernv-cpu-core-POWER8|powernv-cpu-core-POWER8E|
-          powernv-cpu-core-POWER8E|powernv-cpu-core-POWER8NVL|
+          powernv-cpu-core-POWER8NVL|powernv-cpu-core-POWER9|ppc4xx-pcihost|
-          powernv-cpu-core-POWER9|ppc4xx-pcihost|prep-systemio|raven-pcihost|
+          prep-systemio|raven-pcihost|rs6000-mc|sb16|sdhci-pci|sga spapr-nvram|
-          rs6000-mc|sb16|sdhci-pci|sga spapr-nvram|spapr-pci-host-bridge|
+          spapr-rng|spapr-rtc|spapr-tce-table|spapr-vio-bridge|spapr-vlan|
-          spapr-pci-vfio-host-bridge|spapr-rng|spapr-rtc|spapr-tce-table|
+          spapr-vscsi|spapr-vty|sysbus-m48t02|sysbus-m48t08|sysbus-m48t59|
-          spapr-vio-bridge|spapr-vlan|spapr-vscsi|spapr-vty|sysbus-m48t02|
+          u3-agp-pcihost|uni-north-agp-pcihost|uni-north-internal-pci-pcihost|
-          sysbus-m48t08|sysbus-m48t59|u3-agp-pcihost|uni-north-agp-pcihost|
+          uni-north-pci|uni-north-pci-pcihost|unimplemented-device|usb-redir|
-          uni-north-internal-pci-pcihost|uni-north-pci|uni-north-pci-pcihost|
+          vfio-pci-igd-lpc-bridge|vhost-vsock-device|vhost-vsock-pci|
-          unimplemented-device|usb-redir|vfio-pci-igd-lpc-bridge|
+          virtconsole|virtio-crypto-device|virtio-crypto-pci|virtio-mmio|
-          vhost-vsock-device|vhost-vsock-pci|virtconsole|virtio-crypto-device|
+          virtio-vga|vmgenid|vmware-svga| xen-backend|xen-pci-passthrough|
-          virtio-crypto-pci|virtio-mmio|virtio-vga|vmgenid|vmware-svga|
+          xen-platform|xen-pvdevice|xen-sysdev|xlnx.xps-ethernetlite|
-          xen-backend|xen-pci-passthrough|xen-platform|xen-pvdevice|xen-sysdev|
+          xlnx.xps-intc|xlnx.xps-timer|xlnx.xps-uartlite|*-i386-cpu|
-          xlnx.xps-ethernetlite|xlnx.xps-intc|xlnx.xps-timer|xlnx.xps-uartlite|
+          *-powerpc64-cpu|*-spapr-cpu-core|*-x86_64-cpu|vmcoreinfo|sii3112|
-          *-i386-cpu|*-powerpc64-cpu|*-spapr-cpu-core|*-x86_64-cpu|vmcoreinfo]
+          vhost-user-blk|vhost-user-blk-pci|pvrdma|sungem|ccid-card-emulated|
+          ccid-card-passthru| bochs-display|isa-cirrus-vga|ramfb|at24c-eeprom|
+          i2c-ddc|kvaser_pci|m41t80|mioe3680_pci|pcm3680_pci]
           (the following are aliases of these unsupported devices: lsi|
           virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet|
           virtio-gpu|piix-usb-uhci|mac-dbdma|ppc4xx-i2c)
@@ -570,10 +613,12 @@ QEMU Command-Line and Monitor Syntax and Support
   -L ...
   -M [40p|bamboo|g3beige|mac99|mpc8544ds|powernv|ppce500|prep|pseries-2.1|
      pseries-2.2|pseries-2.3|pseries-2.4|pseries-2.5|pseries-2.6|pseries-2.7|
-     pseries-2.8|pseries-2.9|pseries-2.10|ref405ep|taihu|virtex-ml507]
+     pseries-2.8|pseries-2.9|pseries-2.10|pseries-2.12|pseries-2.12-sxxm|
+     ref405ep|sam460ex|taihu|virtex-ml507]
   -machine [40p|bamboo|g3beige|mac99|mpc8544ds|powernv|ppce500|prep|pseries-2.1|
            pseries-2.2|pseries-2.3|pseries-2.4|pseries-2.5|pseries-2.6|
-           pseries-2.7|pseries-2.8|pseries-2.10|ref405ep|taihu|virtex-ml507]
+           pseries-2.7|pseries-2.8|pseries-2.10|pseries-2.12|pseries-2.12-sxxm|
+           ref405ep|sam460ex|taihu|virtex-ml507]
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
@@ -586,8 +631,10 @@ QEMU Command-Line and Monitor Syntax and Support
   -no-kvm-pit-reinjection
   -numa ...
   -option-rom ...
+  -overcommit ...
   -pflash file
   -portrait
+  -preconfig
   -prom-env ...
   -qtest ...
   -qtest-log ...
@@ -600,7 +647,6 @@ QEMU Command-Line and Monitor Syntax and Support
   -soundhw ...
   -spice
   -tb-size ...
-  -tdf
   -tpmdev emulator ...
   -vga [cg3|tcx|virtio|cirrus|xenfb]
   -win2k-hack
@@ -625,8 +671,6 @@ QEMU Command-Line and Monitor Syntax and Support
   expire_password ...
   hostfwd_add ...
   hostfwd_remove ...
-  host_net_add ...
-  host_net_remove ...
   nbd_server_add ...
   nbd server_start ...
   nbd_server_stop ...
@@ -650,6 +694,7 @@ QEMU Command-Line and Monitor Syntax and Support
   change-backing-file
   drive-backup
   drive-mirror
+  exit_preconfig
   dump-skeys
   netdev_add
   netdev_del
@@ -658,11 +703,16 @@ QEMU Command-Line and Monitor Syntax and Support
   nbd-server-stop
   query-sev
   query-sev-launch-measure
+  x-block-dirty-bitmap-disable
+  x-block-dirty-bitmap-enable
+  x-block-dirty-bitmap-merge
   x-blockdev-change
-  x-blockdev-create
   x-blockdev-insert-medium
   x-blockdev-remove-medium
   x-colo-lost-heartbeat
+  x-exit-preconfig
+  x-debug-block-dirty-bitmap-sha256
+  x-nbd-server-add-bitmap
   xen-colo-do-checkpoint
   xen-load-devices-state
   xen-save-devices-state

supported.s390.txt

@@ -1,11 +1,11 @@
 [qemu-s390 package document]
 
-SLES 15 QEMU/KVM RELATED SUPPORT STATEMENTS
+SLES 15 SP1 QEMU/KVM RELATED SUPPORT STATEMENTS
 
 Overview
 --------
 
-  The QEMU based packages included with SLES 15 provide a large variety of
+  The QEMU based packages included with SLES 15 SP1 provide a large variety of
   features, from the very latest customer requests to features of questionable
   quality or value. The linux kernel includes components which contribute KVM
   virtualization features as well. This document was created to assist the user
@@ -73,8 +73,9 @@ Major QEMU/KVM Supported Features
 
 - Guest execution state may be "moved" in both time (save/restore) and space
   (static and live migration). These migrations or save/restore operations can
-  take place either from certain prior SLES versioned hosts to a SLES 15 host
+  take place either from certain prior SLES versioned hosts to a SLES 15 SP1
-  or between hosts of the same version. Certain other restrictions also apply.
+  host or between hosts of the same version. Certain other restrictions also
+  apply.
 
 - Security considerations include privileged helpers and a security model which
   allows running guests as a non-root user.
@@ -112,16 +113,13 @@ Major QEMU/KVM Supported Features
 
 - Portions of the host file system may be shared with a guest by using virtFS.
 
-- A guest "agent" is available for SLES 15 KVM guests via the qemu-guest-agent
+- A guest "agent" is available for SLES 15 SP1 KVM guests via the
-  package. This allows some introspection and control of the guest OS
+  qemu-guest-agent package. This allows some introspection and control of the
-  environment from the host.
+  guest OS environment from the host.
 
 QEMU/KVM Technology Previews
 ----------------------------
 
-- Specifying and placing PCI devices on a PCI bridge allows for a greater number
-  of devices.
-
 - All features indicated as not being supported in this document fall under the
   Technology Preview definition contained in the main product's release notes.
 
@@ -144,7 +142,8 @@ Deprecated, Superseded, Modified and Dropped Features
   This website tracks feature deprecation and removal at the upstream
   development level. Our qemu package inherits this community direction, but be
   aware that we can and will deviate as needed. Those deviations and additional
-  information can be found in this section.
+  information can be found in this section. Feature deprecation is also tracked
+  in Appendix B of the qemu-doc.* files installed with the qemu package.
 
 - The use of "?" as a parameter to "-cpu", "-soundhw", "-device", "-M",
   "-machine", "-d", and "-clock" is now considered deprecated. Use "help"
@@ -166,8 +165,12 @@ Deprecated, Superseded, Modified and Dropped Features
   acpitable, boot, and smp respectively.
 
 - These previously supported command line options are now considered deprecated:
+  -balloon (use -device virtio-balloon instead)
+  -clock
   -device ivshmem (use ivshmem-doorbell or ivshmem-plain instead)
   -nodefconfig (use -no-user-config instead)
+  -no-frame
+  -virtioconsole (use -device virtconsole instead)
 
 - These previously supported command line options are no longer supported:
   <previously mentioned items have been moved to another category>
@@ -187,6 +190,28 @@ Deprecated, Superseded, Modified and Dropped Features
 - The previously supported blkdev-add QMP command has been flagged as lacking
   and could possibly change syntax in the future.
 
+- These previously unsupported command line options are now deprecated:
+  -enable-hax
+
+- These previously unsupported command line options are no longer recognized:
+  -tdf
+
+- This previously supported QMP command is now deprecated:
+  query-cpus (use query-cpus-fast instead)
+
+- These previously supported monitor commands are no longer recognized:
+  pci_add (use device_add instead)
+  pci_del (use device_del instead)
+
+- These previously unsupported monitor commands are no longer recognized:
+  host_net_add
+  host_net_remove
+  usb_add
+  usb_del
+
+- This previously unsupported QMP command is now supported under a new name:
+  x-blockdev-create (use blockdev-create instead)
+
 - Due to upstream's decision to no longer fully support the qed storage format
   going forward (since it really provides no benefit over qcow2 and is now no
   longer actively maintained upstream), creating qed storage images is no longer
@@ -212,7 +237,7 @@ QEMU Command-Line and Monitor Syntax and Support
   problems or even bugs in older interfaces cannot be fixed due to functional
   expectations, but are resolved in the newer interface or option.
   This advice includes moving to the most recent machine type (eg
-  s390-ccw-virtio-2.11 instead of s390-ccw-virtio-2.9) if possible.
+  s390-ccw-virtio-3.0 instead of s390-ccw-virtio-2.11) if possible.
 
 - The following command line options are supported:
   -accel ...
@@ -261,9 +286,9 @@ QEMU Command-Line and Monitor Syntax and Support
   -loadvm ...
   -m ...
   -M [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9|
-     s390-ccw-virtio-2.11]
+     s390-ccw-virtio-2.11|s390-ccw-virtio-3.0]
   -machine [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9|
-           s390-ccw-virtio-2.11]
+           s390-ccw-virtio-2.11|s390-ccw-virtio-3.0]
   -mem-path ...
   -mem-prealloc
   -mon ...
@@ -348,6 +373,8 @@ QEMU Command-Line and Monitor Syntax and Support
   migrate_cancel
   migrate_continue ...
   migrate_incoming
+  migrate_pause
+  migrate_recover ...
   migrate_set_cache_size ...
   migrate_set_capability ...
   migrate_set_downtime ...
@@ -362,8 +389,6 @@ QEMU Command-Line and Monitor Syntax and Support
   object_add ...
   object_del ...
   p ...
-  pci_add ...
-  pci_del...
   pmemsave ...
   print ...
   q
@@ -395,6 +420,7 @@ QEMU Command-Line and Monitor Syntax and Support
   blockdev-backup
   blockdev-change-medium
   blockdev-close-tray
+  blockdev-create
   blockdev-del
   blockdev-mirror
   blockdev-open-tray
@@ -432,11 +458,19 @@ QEMU Command-Line and Monitor Syntax and Support
   human-monitor-command
   inject-nmi
   input-send-event
+  job-cancel
+  job-complete
+  job-dismiss
+  job-finalize
+  job-pause
+  job-resume
   memsave
   migrate
   migrate_cancel
   migrate-continue
   migrate-incoming
+  migrate-pause
+  migrate-resume
   migrate-set-cache-size
   migrate-set-capabilities
   migrate_set_downtime
@@ -473,6 +507,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-gic-capabilities
   query-hotpluggable-cpus
   query-iothreads
+  query-jobs
   query-kvm
   query-machines
   query-memdev
@@ -486,6 +521,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-name
   query-named-block-nodes
   query-pci
+  query-pr-managers
   query-qmp-schema
   query-rocker
   query-rocker-of-dpa-flows
@@ -536,17 +572,19 @@ QEMU Command-Line and Monitor Syntax and Support
           ipmi-bmc-extern|ipmi-bmc-sim|ipoctal232|isa-applesmc|isa-cirrus-vga|
           isa-debugcon|isa-debug-exit|isa-fdc|isa-ide|isa-ipmi-bt|isa-ipmi-kcs|
           isa-parallel|isa-serial|isa-vga|lsi53c810|lsi53c810a|megasas|
-          mptsas1068|ne2k_isa|ne2k_pci|nec-usb-xhci|nvdimm|nvme|pc-dimm|
+          mmio_interface|mptsas1068|ne2k_isa|ne2k_pci|nec-usb-xhci|nvdimm|nvme|
-          pci-testdev|pcnet|pc-testdev|piix3-ide|piix3-ide|piix3-ide-xen|
+          pc-dimm|pci-testdev|pcnet|pc-testdev|piix3-ide|piix3-ide|
-          piix4-usb-uhci|pvscsi|pxb|pxb-host|pxb-pcie|qemu-s390-cpu|rocker|
+          piix3-ide-xen|piix4-usb-uhci|pvrdma|pvscsi|pxb|pxb-host|pxb-pcie|
-          s390-flic|s390-flic-qemu|s390-ipl|s390-pcihost|
+          qemu-s390-cpu|ramfb|rocker|s390-flic|s390-flic-qemu|s390-ipl|
-          s390-sclp-event-facility|s390-skeys-qemu|sb16|sclp|sclpconsole|
+          s390-pcihost|s390-sclp-event-facility|s390-skeys-qemu|sb16|sclp|
-          sclp-cpu-hotplug|sclplmconsole|sclp-memory-hotplug-dev|sclpquiesce|
+          sclpconsole|sclp-cpu-hotplug|sclplmconsole|sclp-memory-hotplug-dev|
-          sd-card|sdhci-pci|secondary-vga|sga|smbus-eeprom|tpci200|usb-audio|
+          sclpquiesce|sd-card|sdhci-pci|secondary-vga|sga|smbus-eeprom|tpci200|
-          usb-bot|usb-bt-dongle|usb-ccid|usb-mtp|usb-uas|vhost-scsi-ccw|
+          usb-audio|usb-bot|usb-bt-dongle|usb-ccid|usb-mtp|usb-uas|
-          vhost-vsock-ccw|virtio-9p-device|virtio-balloon-ccw|virtio-blk-ccw|
+          vhost-scsi-ccw|vhost-user-blk|vhost-user-blk-pci|vhost-user-scsi|
-          virtio-crypto-ccw|virtio-net-ccw|virtio-rng-ccw|virtio-scsi-ccw|
+          vhost-user-scsi-pci|vhost-vsock-ccw|virtio-9p-device|
-          virtio-serial-ccw|virtio-vga|virtual-css-bridge|vmware-svga|vmxnet3|
+          virtio-balloon-ccw|virtio-blk-ccw|virtio-crypto-ccw|virtio-net-ccw|
+          virtio-rng-ccw|virtio-scsi-ccw|virtio-serial-ccw|virtio-vga|
+          virtual-css-bridge|vmcoreinfo|vmgenid|vmware-svga|vmxnet3|
           vt82c686b-usb-uhci|x3130-upstream|*-x86_64-cpu|xen-backend|
           xen-pci-passthrough|xen-platform|xen-pvdevice|xio3130-downstream|
           z10BC.2-base-s390x-cpu|z10BC.2-s390x-cpu|z10BC-base-s390x-cpu|
@@ -567,10 +605,9 @@ QEMU Command-Line and Monitor Syntax and Support
           z9BC.2-base-s390x-cpu|z9BC.2-s390x-cpu|z9BC-base-s390x-cpu|
           z9BC-s390x-cpu|z9EC.2-base-s390x-cpu|z9EC.2-s390x-cpu|
           z9EC.3-base-s390x-cpu|z9EC.3-s390x-cpu|z9EC-base-s390x-cpu|
-          z9EC-s390x-cpu|zBC12-base-s390x-cpu|zBC12-s390x-cpu|
+          z9EC-s390x-cpu|z14ZR1-base-s390x-cpu|z14ZR1-s390x-cpu|
-          zEC12.2-base-s390x-cpu|zEC12.2-s390x-cpu|zEC12-base-s390x-cpu|
+          zBC12-base-s390x-cpu|zBC12-s390x-cpu|zEC12.2-base-s390x-cpu|
-          zEC12-s390x-cpu|vmgenid|vhost-user-scsi|vhost-user-scsi-pci|
+          zEC12.2-s390x-cpu|zEC12-base-s390x-cpu|zEC12-s390x-cpu]
-          mmio_interface|vmcoreinfo]
           (the following are aliases of these unsupported devices: lsi|
           virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet|
           virtio-gpu|virtio-9p|ahci|e1000-82540em|vfio-ccw)
@@ -587,9 +624,9 @@ QEMU Command-Line and Monitor Syntax and Support
   -icount ...
   -L ...
   -M [s390-ccw-virtio-2.4|s390-ccw-virtio-2.5|s390-ccw-virtio-2.7|
-     s390-ccw-virtio-2.8|s390-ccw-virtio-2.10]
+     s390-ccw-virtio-2.8|s390-ccw-virtio-2.10|s390-ccw-virtio-2.12]
   -machine [s390-ccw-virtio-2.4|s390-ccw-virtio-2.5|s390-ccw-virtio-2.7|
-           s390-ccw-virtio-2.8|s390-ccw-virtio-2.10]
+           s390-ccw-virtio-2.8|s390-ccw-virtio-2.10|s390-ccw-virtio-2.12]
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
@@ -604,8 +641,10 @@ QEMU Command-Line and Monitor Syntax and Support
   -numa dist ...
   -numa node ...
   -option-rom ...
+  -overcommit ...
   -pflash file
   -portrait
+  -preconfig
   -prom-env ...
   -qtest ...
   -qtest-log ...
@@ -645,11 +684,10 @@ QEMU Command-Line and Monitor Syntax and Support
   block_passwd ...
   commit ...
   drive_mirror ...
+  exit_preconfig
   expire_password ...
   hostfwd_add ...
   hostfwd_remove ...
-  host_net_add ...
-  host_net_remove ...
   nbd_server_add ...
   nbd server_start ...
   nbd_server_stop ...
@@ -661,8 +699,6 @@ QEMU Command-Line and Monitor Syntax and Support
   singlestep ...
   snapshot_blkdev ...
   stopcapture ...
-  usb_add ...
-  usb_del ...
   wavcapture ...
   x_colo_lost_heartbeat
 
@@ -686,12 +722,16 @@ QEMU Command-Line and Monitor Syntax and Support
   query-tpm
   query-tpm-models
   query-tpm-types
+  x-block-dirty-bitmap-disable
+  x-block-dirty-bitmap-enable
+  x-block-dirty-bitmap-merge
   x-blockdev-change
-  x-blockdev-create
   x-blockdev-insert-medium
   x-blockdev-remove-medium
   x-colo-lost-heartbeat
   x-debug-block-dirty-bitmap-sha256
+  x-exit-preconfig
+  x-nbd-server-add-bitmap
   xen-colo-do-checkpoint
   xen-load-devices-state
   xen-save-devices-state

supported.x86.txt

@@ -1,11 +1,11 @@
 [qemu-x86 package document]
 
-SLES 15 QEMU/KVM RELATED SUPPORT STATEMENTS
+SLES 15 SP1 QEMU/KVM RELATED SUPPORT STATEMENTS
 
 Overview
 --------
 
-  The QEMU based packages included with SLES 15 provide a large variety of
+  The QEMU based packages included with SLES 15 SP1 provide a large variety of
   features, from the very latest customer requests to features of questionable
   quality or value. The linux kernel includes components which contribute KVM
   virtualization features as well. This document was created to assist the user
@@ -67,7 +67,7 @@ Major QEMU/KVM Supported Features
   allow boot options common to physical systems, along with other features
   tailored to virtualization. Various VGABIOS ROMs, also from the SEABIOS
   project, are also included. A UEFI based guest boot environment is also
-  now possible by using the firmware provided by the qemu-ovmf-x86_64 package.
+  available by using the firmware provided by the qemu-ovmf-x86_64 package.
 
 - Some QEMU messages have been localized to various languages. This is provided
   by the optional qemu-lang package. Keyboard mappings for various nationalities
@@ -80,8 +80,9 @@ Major QEMU/KVM Supported Features
 
 - Guest execution state may be "moved" in both time (save/restore) and space
   (static and live migration). These migrations or save/restore operations can
-  take place either from certain prior SLES versioned hosts to a SLES 15 host
+  take place either from certain prior SLES versioned hosts to a SLES 15 SP1
-  or between hosts of the same version. Certain other restrictions also apply.
+  host or between hosts of the same version. Certain other restrictions also
+  apply.
 
 - Security considerations include seccomp2 based sandboxing, vTPM, privileged
   helpers and a security model which allows running guests as a non-root user.
@@ -130,16 +131,13 @@ Major QEMU/KVM Supported Features
 
 - Portions of the host file system may be shared with a guest by using virtFS.
 
-- A guest "agent" is available for SLES 15 KVM guests via the qemu-guest-agent
+- A guest "agent" is available for SLES 15 SP1 KVM guests via the
-  package. This allows some introspection and control of the guest OS
+  qemu-guest-agent package. This allows some introspection and control of the
-  environment from the host.
+  guest OS environment from the host.
 
 QEMU/KVM Technology Previews
 ----------------------------
 
-- Specifying and placing PCI devices on a PCI bridge allows for a greater number
-  of devices.
-
 - Nested VMX and SVM virtualization is possible.
 
 - All features indicated as not being supported in this document fall under the
@@ -166,7 +164,8 @@ Deprecated, Superseded, Modified and Dropped Features
   This website tracks feature deprecation and removal at the upstream
   development level. Our qemu package inherits this community direction, but be
   aware that we can and will deviate as needed. Those deviations and additional
-  information can be found in this section.
+  information can be found in this section. Feature deprecation is also tracked
+  in Appendix B of the qemu-doc.* files installed with the qemu package.
 
 - When no video adapter is specified, the default used is stdvga. This differs
   from the default of prior releases which was cirrus. The cirrus adapter was
@@ -206,8 +205,12 @@ Deprecated, Superseded, Modified and Dropped Features
   versions.
 
 - These previously supported command line options are now considered deprecated:
+  -balloon (use -device virtio-balloon instead)
+  -clock
   -device ivshmem (use ivshmem-doorbell or ivshmem-plain instead)
   -nodefconfig (use -no-user-config instead)
+  -no-frame
+  -virtioconsole (use -device virtconsole instead)
 
 - These previously supported command line options are no longer supported:
   <previously mentioned items have been moved to another category>
@@ -228,10 +231,10 @@ Deprecated, Superseded, Modified and Dropped Features
   and could possibly change syntax in the future.
 
 - These previously unsupported command line options are now deprecated:
-  -no-kvm-irqchip (use -machine kernel_irqchip=off instead)
+  -enable-hax (used -accel hax instead)
   -no-kvm-pit
-  -no-kvm-pit-reinjection
+
-  -tdf
+- The unsupported machine types pc-0.10 and pc-0.11 are now deprecated.
  
 - The case of specified sockets, cores, and threads not matching the vcpu count
   is no longer silently ignored. QEMU now requires that the topology match the
@@ -258,19 +261,33 @@ Deprecated, Superseded, Modified and Dropped Features
   -enable-nesting
   -kvm-shadow-memory (use -machine kvm_shadow_mem= instead)
   -M mac
+  -no-kvm-irqchip (use -machine kernel_irqchip=off instead)
+  -no-kvm-pit
+  -no-kvm-pit-reinjection (use -global kvm-pit.lost_tick_policy=discard instead)
   -nvram
   -old-param
   -osk
   -pcidevice (use -device vfio-pci instead)
   -qtest
   -semihosting
+  -tdf (note: mistakenly listed previously as supported)
+
+- This previously supported QMP command is now deprecated:
+  query-cpus (use query-cpus-fast instead)
 
 - These previously supported monitor commands are no longer recognized:
   cpu_set
   pci_add (use device_add instead)
   pci_del (use device_del instead)
+  usb_add (use device_add instead)
+  usb_del (use device_del instead)
+
+- These previously unsupported monitor commands are no longer recognized:
+  host_net_add
+  host_net_remove
 
 - This previously unsupported QMP command is now supported under a new name:
+  x-blockdev-create (use blockdev-create instead)
   x-input-send-event (use input-send-event instead)
 
 - Due to the lack of migration support (mainly due to ahci interface issues)
@@ -305,8 +322,8 @@ QEMU Command-Line and Monitor Syntax and Support
   better functionality and usability going forward. In some cases existing
   problems or even bugs in older interfaces cannot be fixed due to functional
   expectations, but are resolved in the newer interface or option.
-  This advice includes moving to the most recent machine type (eg pc-i440fx-2.11
+  This advice includes moving to the most recent machine type (eg pc-i440fx-3.0
-  instead of pc-i440fx-2.9) if possible.
+  instead of pc-i440fx-2.11) if possible.
 
 - The following command line options are supported:
   -accel ...
@@ -365,11 +382,12 @@ QEMU Command-Line and Monitor Syntax and Support
   -loadvm ...
   -m ...
   -M [help|?|none|pc|pc-0.12|pc-0.14|pc-0.15|pc-i440fx-1.4|pc-i440fx-1.7|
-     pc-i440fx-2.0|pc-i440fx-2.3|pc-i440fx-2.6|pc-i440fx-2.9|pc-i440fx-2.11|q35|
+     pc-i440fx-2.0|pc-i440fx-2.3|pc-i440fx-2.6|pc-i440fx-2.9|pc-i440fx-2.11|
-     pc-q35-2.6|pc-q35-2.9|pc-q35-2.11|xenfv|xenpv]
+     pc-i440fx-3.0|q35|pc-q35-2.6|pc-q35-2.9|pc-q35-2.11|pc-q35-3.0|xenfv|xenpv]
   -machine [help|?|none|pc|pc-0.12|pc-0.14|pc-0.15|pc-i440fx-1.4|pc-i440fx-1.7|
            pc-i440fx-2.0|pc-i440fx-2.3|pc-440fx-2.6|pc-i440fx-2.9|
-           pc-i440fx-2.11|q35|pc-q35-2.6|pc-q35-2.9|pc-q35-2.11|xenfv|xenpv]
+           pc-i440fx-2.11|pc-i440fx-3.0|q35|pc-q35-2.6|pc-q35-2.9|pc-q35-2.11|
+           pc-q35-3.0|xenfv|xenpv]
   -mem-path ...
   -mem-prealloc
   -mon ...
@@ -411,7 +429,6 @@ QEMU Command-Line and Monitor Syntax and Support
   -smbios ...
   -smp ...
   -spice
-  -tdf
   -tpmdev passthrough ...
   -trace ...
   -usb
@@ -468,6 +485,8 @@ QEMU Command-Line and Monitor Syntax and Support
   migrate_cancel
   migrate_continue ...
   migrate_incoming
+  migrate_pause
+  migrate_recover ...
   migrate_set_cache_size ...
   migrate_set_capability ...
   migrate_set_downtime ...
@@ -503,8 +522,6 @@ QEMU Command-Line and Monitor Syntax and Support
   system_reset
   system_wakeup
   trace-event ...
-  usb_add ...
-  usb_del ...
   watchdog_action ...
   x ...
   xp ...
@@ -517,6 +534,7 @@ QEMU Command-Line and Monitor Syntax and Support
   blockdev-backup
   blockdev-change-medium
   blockdev-close-tray
+  blockdev-create
   blockdev-del
   blockdev-mirror
   blockdev-open-tray
@@ -554,11 +572,19 @@ QEMU Command-Line and Monitor Syntax and Support
   human-monitor-command
   inject-nmi
   input-send-event
+  job-cancel
+  job-complete
+  job-dismiss
+  job-finalize
+  job-pause
+  job-resume
   memsave
   migrate
   migrate_cancel
   migrate-continue
   migrate-incoming
+  migrate-pause
+  migrate-resume
   migrate-set-cache-size
   migrate-set-capabilities
   migrate_set_downtime
@@ -595,6 +621,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-gic-capabilities
   query-hotpluggable-cpus
   query-iothreads
+  query-jobs
   query-kvm
   query-machines
   query-memdev
@@ -608,6 +635,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-name
   query-named-block-nodes
   query-pci
+  query-pr-managers
   query-qmp-schema
   query-rocker
   query-rocker-of-dpa-flows
@@ -634,6 +662,7 @@ QEMU Command-Line and Monitor Syntax and Support
   send-key
   set_link
   set_password
+  set-numa-node
   stop
   system_powerdown
   system_reset
@@ -676,7 +705,10 @@ QEMU Command-Line and Monitor Syntax and Support
           virtio-gpu-device|amd-iommu|AMDVI-PCI|vhost-vsock-device|
           vhost-vsock-pci|virtio-crypto-device|virtio-crypto-pci|
           vfio-pci-igd-lpc-bridge|pcie-root-port|qemu-xhci|*-i386-cpu|
-          *-x86_64-cpu|vhost-user-scsi|vhost-user-scsi-pci|mmio_interface]
+          *-x86_64-cpu|vhost-user-scsi|vhost-user-scsi-pci|mmio_interface|
+          vhost-user-blk|vhost-user-blk-pci|pvrdma|bochs-display|ramfb|
+          ccid-card-emulated|ccid-card-passthru|at24c-eeprom|kvaser_pci|tpm-crb|
+          mioe3680_pci|pcm3680_pci]
           (the following are aliases of these unsupported devices: lsi|
           virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet|
           virtio-gpu)
@@ -692,26 +724,26 @@ QEMU Command-Line and Monitor Syntax and Support
   -L ...
   -M [isapc|pc-0.10|pc-0.11|pc-0.13|pc-1.0|pc-1.1|pc-1.2|pc-1.3|pc-i440fx-1.5|
      pc-i440fx-1.6|pc-i440fx-2.1|pc-i440fx-2.2|pc-i440fx-2.4|pc-i440fx-2.5|
-     pc-i440fx-2.7|pc-i440fx-2.8|pc-i440fx-2.10|pc-q35-1.4|pc-q35-1.5|
+     pc-i440fx-2.7|pc-i440fx-2.8|pc-i440fx-2.10|pc-i440fx-2.12|pc-q35-1.4|
-     pc-q35-1.6|pc-q35-1.7|pc-q35-2.0|pc-q35-2.1|pc-q35-2.2|pc-q35-2.3|
+     pc-q35-1.5|pc-q35-1.6|pc-q35-1.7|pc-q35-2.0|pc-q35-2.1|pc-q35-2.2|
-     pc-q35-2.4|pc-q35-2.5|pc-q35-2.7|pc-q35-2.8|pc-q35-2.10]
+     pc-q35-2.3|pc-q35-2.4|pc-q35-2.5|pc-q35-2.7|pc-q35-2.8|pc-q35-2.10|
+     pc-q35-2.12]
   -machine [isapc|pc-0.10|pc-0.11|pc-0.13|pc-1.0|pc-1.1|pc-1.2|pc-1.3|
            pc-i440fx-1.5|pc-i440fx-1.6|pc-i440fx-2.1|pc-i440fx-2.2|
            pc-i440fx-2.4|pc-i440fx-2.5|pc-i440fx-2.7|pc-i440fx-2.8|
-           pc-i440fx-2.10|pc-q35-1.4|pc-q35-1.5|pc-q35-1.6|pc-q35-1.7|
+           pc-i440fx-2.10|pc-i440fx-2.12|pc-q35-1.4|pc-q35-1.5|pc-q35-1.6|
-           pc-q35-2.0|pc-q35-2.1|pc-q35-2.2|pc-q35-2.3|pc-q35-2.4|pc-q35-2.5|
+           pc-q35-1.7|pc-q35-2.0|pc-q35-2.1|pc-q35-2.2|pc-q35-2.3|pc-q35-2.4|
-           pc-q35-2.7|pc-q35-2.8|pc-q35-2.10]
+           pc-q35-2.5|pc-q35-2.7|pc-q35-2.8|pc-q35-2.10|pc-q35-2.12]
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
   -no-kvm
-  -no-kvm-irqchip
-  -no-kvm-pit
-  -no-kvm-pit-reinjection
   -numa node ...
   -option-rom ...
+  -overcommit ...
   -pflash file
   -portrait
+  -preconfig
   -prom-env ...
   -qtest ...
   -qtest-log ...
@@ -742,11 +774,10 @@ QEMU Command-Line and Monitor Syntax and Support
   block_passwd ...
   commit ...
   drive_mirror ...
+  exit_preconfig
   expire_password ...
   hostfwd_add ...
   hostfwd_remove ...
-  host_net_add ...
-  host_net_remove ...
   nbd_server_add ...
   nbd server_start ...
   nbd_server_stop ...
@@ -778,11 +809,15 @@ QEMU Command-Line and Monitor Syntax and Support
   nbd-server-stop
   query-sev
   query-sev-launch-measure
+  x-block-dirty-bitmap-disable
+  x-block-dirty-bitmap-enable
+  x-block-dirty-bitmap-merge
   x-blockdev-change
-  x-blockdev-create
   x-blockdev-insert-medium
   x-blockdev-remove-medium
   x-colo-lost-heartbeat
   x-debug-block-dirty-bitmap-sha256
+  x-exit-preconfig
+  x-nbd-server-add-bitmap
   xen-colo-do-checkpoint
   xen-set-replication

update_git.sh

@@ -13,8 +13,8 @@ set -e
 
 GIT_TREE=git://github.com/openSUSE/qemu.git
 GIT_LOCAL_TREE=~/git/qemu-opensuse
-GIT_BRANCH=opensuse-2.12
+GIT_BRANCH=opensuse-3.0
-GIT_UPSTREAM_TAG=v2.12.1
+GIT_UPSTREAM_TAG=v3.0.0
 GIT_DIR=/dev/shm/qemu-factory-git-dir
 CMP_DIR=/dev/shm/qemu-factory-cmp-dir