Accepting request 556837 from Virtualization:Staging

Update to v2.11.0. Additional changes related to SLE-15.

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

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

@@ -1,4 +1,4 @@
-From 7581f4407184223ed510ad37c7e50d0c958387e9 Mon Sep 17 00:00:00 2001
+From caaf3654f521627c6c669667a34b022d7aaf6d98 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,7 +8,7 @@ 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 cc0c3fcee9..47f1a89860 100644
+index cf35473671..9fd0155498 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)

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

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

0003-qemu-cvs-gettimeofday.patch

@@ -1,4 +1,4 @@
-From cfda7e6b1ea8a2851487abe2c8c0d667afe8f9e6 Mon Sep 17 00:00:00 2001
+From dc56d2a61411efc8ba57905117e2adc126a8e5c7 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 9b6364a266..ec6ee23f96 100644
+index 11c9116c4a..dc6a102449 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -8950,6 +8950,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+@@ -8996,6 +8996,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 7e6b306a14558468fd01def2ee997b2b6dc84210 Mon Sep 17 00:00:00 2001
+From 28b90ae8573a1b760f80ba928157d6df563d6c8b 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 ec6ee23f96..cf290dbf4b 100644
+index dc6a102449..faf890774a 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5615,7 +5615,12 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+@@ -5632,7 +5632,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 c4ee285e4bb85caa69a1870f313a22c1214bb5c6 Mon Sep 17 00:00:00 2001
+From ef7b5a6e1179b26e10461ffcc619e405f6e5adef 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 cf290dbf4b..1802aec4cb 100644
+index faf890774a..5288ee0078 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5652,6 +5652,11 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+@@ -5669,6 +5669,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 cf290dbf4b..1802aec4cb 100644
          case IOC_R:
              ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp));
              if (!is_error(ret)) {
-@@ -5670,6 +5675,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
+@@ -5687,6 +5692,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 17836cc820d22cb40b6a8fbf11606d47ba856236 Mon Sep 17 00:00:00 2001
+From b9c2beb358233531af35e2583fec914dc11545f8 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 30 Sep 2011 19:40:36 +0200
 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
@@ -37,7 +37,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  create mode 100644 linux-user/binfmt.c
 
 diff --git a/Makefile.target b/Makefile.target
-index 7f42c45db8..b5a3574059 100644
+index f9a9da7e7c..3920383fb7 100644
 --- a/Makefile.target
 +++ b/Makefile.target
 @@ -36,6 +36,10 @@ endif
@@ -51,16 +51,16 @@ index 7f42c45db8..b5a3574059 100644
  config-target.h: config-target.h-timestamp
  config-target.h-timestamp: config-target.mak
  
-@@ -121,6 +125,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
+@@ -114,6 +118,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
  obj-y += linux-user/
- obj-y += gdbstub.o thunk.o user-exec.o user-exec-stub.o
+ obj-y += gdbstub.o thunk.o
  
 +obj-binfmt-y += linux-user/
 +
  endif #CONFIG_LINUX_USER
  
  #########################################################
-@@ -162,7 +168,11 @@ endif # CONFIG_SOFTMMU
+@@ -155,7 +161,11 @@ endif # CONFIG_SOFTMMU
  # Workaround for http://gcc.gnu.org/PR55489, see configure.
  %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
  
@@ -72,7 +72,7 @@ index 7f42c45db8..b5a3574059 100644
  all-obj-y := $(obj-y)
  
  target-obj-y :=
-@@ -203,6 +213,9 @@ ifdef CONFIG_DARWIN
+@@ -196,6 +206,9 @@ ifdef CONFIG_DARWIN
  	$(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@")
  endif
  

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

@@ -1,4 +1,4 @@
-From d9c823f0543f04bcef646f910cd8879a851e75c5 Mon Sep 17 00:00:00 2001
+From 7b5988dd911b6af4745d34e0c8cfc1e95518d80a 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 d20c34ca83..b54fbb02c8 100644
+index 03238a3449..1ca0f9e0ab 100644
 --- a/exec.c
 +++ b/exec.c
-@@ -1950,11 +1950,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
+@@ -1975,11 +1975,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
          return NULL;
      }
  

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

@@ -1,4 +1,4 @@
-From 8afb2be95138a0e8cbee39bdda6394dffe8c330f Mon Sep 17 00:00:00 2001
+From d7114fd9a14209b60ba65f1990034dc8e9670d32 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
@@ -22,14 +22,14 @@ 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>
 ---
- user-exec.c | 4 ++++
+ accel/tcg/user-exec.c | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/user-exec.c b/user-exec.c
-index 2a975eaf69..6225c4e1a8 100644
---- a/user-exec.c
-+++ b/user-exec.c
-@@ -78,6 +78,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
+diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
+index f42285ea1c..a96c56aa33 100644
+--- a/accel/tcg/user-exec.c
++++ b/accel/tcg/user-exec.c
+@@ -102,6 +102,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
      printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n",
             pc, address, is_write, *(unsigned long *)old_set);
  #endif

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

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

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

@@ -1,4 +1,4 @@
-From 66ea32c79be3274c9325d0063604fc881e4d1dfb Mon Sep 17 00:00:00 2001
+From c323c1f97f0fe389da384e64a35c9307735a1cd5 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 1802aec4cb..cf22c5b96a 100644
+index 5288ee0078..feb8556076 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -7472,6 +7472,25 @@ static int open_self_stat(void *cpu_env, int fd)
+@@ -7499,6 +7499,25 @@ static int open_self_stat(void *cpu_env, int fd)
      return 0;
  }
  
@@ -51,7 +51,7 @@ index 1802aec4cb..cf22c5b96a 100644
  static int open_self_auxv(void *cpu_env, int fd)
  {
      CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env);
-@@ -7586,6 +7605,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
+@@ -7613,6 +7632,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

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

@@ -1,4 +1,4 @@
-From d8c7d4aacc3c49a46c24fce329e11157334a9991 Mon Sep 17 00:00:00 2001
+From 22681343ff83b0ab4664fd741145cb098398c366 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 21 Aug 2012 14:20:40 +0200
 Subject: [PATCH] linux-user: XXX disable fiemap
@@ -9,10 +9,10 @@ agraf: fiemap breaks in libarchive. Disable it for now.
  1 file changed, 5 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index cf22c5b96a..99e9ee82ed 100644
+index feb8556076..da7deec78d 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -5080,6 +5080,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
+@@ -5097,6 +5097,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
      uint32_t outbufsz;
      int free_fm = 0;
  

0012-linux-user-use-target_ulong.patch

@@ -1,4 +1,4 @@
-From 6b87f98a760341933d6541857f2d2d46bb3037cc Mon Sep 17 00:00:00 2001
+From 48f19b6362b58c5fef53965b5b7a136f42fe78a9 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 9 Oct 2012 09:06:49 +0200
 Subject: [PATCH] linux-user: use target_ulong
@@ -36,10 +36,10 @@ index 4edd7d0c08..25208645e9 100644
  extern THREAD CPUState *thread_cpu;
  void cpu_loop(CPUArchState *env);
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 99e9ee82ed..a2bb65922b 100644
+index da7deec78d..dee97c05be 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -7728,10 +7728,10 @@ static TargetFdTrans target_inotify_trans = {
+@@ -7755,10 +7755,10 @@ static TargetFdTrans target_inotify_trans = {
  /* 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>. */

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

@@ -1,4 +1,4 @@
-From 796187f66978f7e0b41fb5e50a009c0003b4b3eb Mon Sep 17 00:00:00 2001
+From 0bfbec0356fcf27a378144048a5dbc5bc97b6d94 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
@@ -27,7 +27,7 @@ This patch fixes input when using -nographic on s390 for me.
  4 files changed, 19 insertions(+)
 
 diff --git a/chardev/char-fe.c b/chardev/char-fe.c
-index f3af6ae584..9683926048 100644
+index ee6d596100..41e0b251a4 100644
 --- a/chardev/char-fe.c
 +++ b/chardev/char-fe.c
 @@ -21,6 +21,7 @@
@@ -78,7 +78,7 @@ index 4cda5e7458..a6dc05c624 100644
       * set of muxes
       */
 diff --git a/chardev/char.c b/chardev/char.c
-index 5d283b90d3..d74fd7aeb9 100644
+index 2ae4f465ec..f90d428cfe 100644
 --- a/chardev/char.c
 +++ b/chardev/char.c
 @@ -21,6 +21,7 @@

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

@@ -1,30 +0,0 @@
-From a4eba69bc99000fdfcfc33d5d18a46b3d03927de Mon Sep 17 00:00:00 2001
-From: Alexander Graf <agraf@suse.de>
-Date: Mon, 6 Jun 2011 06:53:52 +0200
-Subject: [PATCH] console: add question-mark escape operator
-
-Some termcaps (found using SLES11SP1) use [? sequences. According to man
-console_codes (http://linux.die.net/man/4/console_codes) the question mark
-is a nop and should simply be ignored.
-
-This patch does exactly that, rendering screen output readable when
-outputting guest serial consoles to the graphical console emulator.
-
-Signed-off-by: Alexander Graf <agraf@suse.de>
----
- ui/console.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui/console.c b/ui/console.c
-index f0292d7820..6950aea8a5 100644
---- a/ui/console.c
-+++ b/ui/console.c
-@@ -880,7 +880,7 @@ static void console_putchar(QemuConsole *s, int ch)
-         } else {
-             if (s->nb_esc_params < MAX_ESC_PARAMS)
-                 s->nb_esc_params++;
--            if (ch == ';')
-+            if (ch == ';' || ch == '?')
-                 break;
-             trace_console_putchar_csi(s->esc_params[0], s->esc_params[1],
-                                       ch, s->nb_esc_params);

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

@@ -1,4 +1,4 @@
-From b9f37480429f32cd09c3d26eca0f52efdad69b5c Mon Sep 17 00:00:00 2001
+From 261a9b540c31dc0812158924bbae63e5ce50baf3 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 a2bb65922b..8b75b1f588 100644
+index dee97c05be..95fb8de295 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -8107,9 +8107,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+@@ -8134,9 +8134,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
      case TARGET_NR_oldstat:
          goto unimplemented;
  #endif

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

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

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

@@ -1,4 +1,4 @@
-From 6fb43092cfca3e96c07ad78727a6b78a1d3b981f Mon Sep 17 00:00:00 2001
+From 6474f499d5e3b489aab3ef145d4b35c0ba298a45 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
@@ -17,7 +17,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
  1 file changed, 15 insertions(+)
 
 diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
-index d42ed7070d..0dc524903e 100644
+index e431bd89e8..dceee88a78 100644
 --- a/hw/block/xen_disk.c
 +++ b/hw/block/xen_disk.c
 @@ -113,6 +113,7 @@ struct XenBlkDev {
@@ -28,7 +28,7 @@ index d42ed7070d..0dc524903e 100644
      /* Persistent grants extension */
      gboolean            feature_discard;
      gboolean            feature_persistent;
-@@ -947,6 +948,16 @@ static void blk_parse_discard(struct XenBlkDev *blkdev)
+@@ -944,6 +945,16 @@ static void blk_parse_discard(struct XenBlkDev *blkdev)
      }
  }
  
@@ -45,7 +45,7 @@ index d42ed7070d..0dc524903e 100644
  static int blk_init(struct XenDevice *xendev)
  {
      struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev);
-@@ -1028,6 +1039,7 @@ static int blk_init(struct XenDevice *xendev)
+@@ -1022,6 +1033,7 @@ static int blk_init(struct XenDevice *xendev)
                            MAX_RING_PAGE_ORDER);
  
      blk_parse_discard(blkdev);
@@ -53,7 +53,7 @@ index d42ed7070d..0dc524903e 100644
  
      g_free(directiosafe);
      return 0;
-@@ -1083,6 +1095,9 @@ static int blk_connect(struct XenDevice *xendev)
+@@ -1077,6 +1089,9 @@ static int blk_connect(struct XenDevice *xendev)
          qflags |= BDRV_O_UNMAP;
      }
  

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

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

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

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

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

@@ -1,4 +1,4 @@
-From e176ceb6119cacf3d62d04efc8382a05e5d8db48 Mon Sep 17 00:00:00 2001
+From 182bbee4da8555984ca47867e035e62a943d6ed8 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 8b75b1f588..25b0a2ce69 100644
+index 95fb8de295..642462242b 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -10240,7 +10240,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+@@ -10286,7 +10286,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
              {
                  struct timespec ts, *pts;
  

0020-configure-Fix-detection-of-seccomp-.patch

@@ -1,28 +0,0 @@
-From a2cbc794e201460c128e455ae0dba9f78ac6476e Mon Sep 17 00:00:00 2001
-From: markkp <mpost@suse.com>
-Date: Thu, 11 Aug 2016 16:28:39 -0400
-Subject: [PATCH] configure: Fix detection of seccomp on s390x
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mark Post <mpost@suse.com>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
----
- configure | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure b/configure
-index dd73cce62f..f2b265681e 100755
---- a/configure
-+++ b/configure
-@@ -2040,6 +2040,9 @@ if test "$seccomp" != "no" ; then
-     ppc|ppc64)
-         libseccomp_minver="2.3.0"
-         ;;
-+    s390|s390x)
-+        libseccomp_minver="2.2.0"
-+        ;;
-     *)
-         libseccomp_minver=""
-         ;;

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

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

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

@@ -1,4 +1,4 @@
-From c66c18e3f6c228ec3204aa76afc567e3834c3a13 Mon Sep 17 00:00:00 2001
+From 7c7cdde1614864ef3304fd5f28a6e2a7b3de9ae4 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,7 +17,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  1 file changed, 12 insertions(+)
 
 diff --git a/vl.c b/vl.c
-index d63269332f..b939df9622 100644
+index 1ad1c04637..11d14b3ec1 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -26,6 +26,7 @@
@@ -28,7 +28,7 @@ index d63269332f..b939df9622 100644
  
  #ifdef CONFIG_SECCOMP
  #include "sysemu/seccomp.h"
-@@ -3035,6 +3036,7 @@ int main(int argc, char **argv, char **envp)
+@@ -3132,6 +3133,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 d63269332f..b939df9622 100644
  
      module_call_init(MODULE_INIT_TRACE);
  
-@@ -3042,6 +3044,16 @@ int main(int argc, char **argv, char **envp)
+@@ -3139,6 +3141,16 @@ int main(int argc, char **argv, char **envp)
      qemu_init_cpu_loop();
      qemu_mutex_lock_iothread();
  

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

@@ -1,4 +1,4 @@
-From df2a986f0271437a0ea2242014e90e0dfdae12cc Mon Sep 17 00:00:00 2001
+From e4e996c7352a5563dae701ee9880ed48a132f696 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 051867399b..fdbaf372a9 100644
+index b086b1528b..cbdd631e2e 100644
 --- a/target/i386/cpu.h
 +++ b/target/i386/cpu.h
-@@ -1500,7 +1500,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
+@@ -1501,7 +1501,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)

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

@@ -1,4 +1,4 @@
-From d6d884c2201c9215b061e80fcab0cd71df3c4851 Mon Sep 17 00:00:00 2001
+From ec1a9384505f5e372b3d5225fcada36ea35ac045 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 46dfd2c954..e4ac76c905 100644
+index 5e47528993..a1994c77ee 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
-@@ -789,7 +789,32 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,
+@@ -793,7 +793,32 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,
  
  
  #define PC_COMPAT_0_15 \

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

@@ -1,4 +1,4 @@
-From 4f418097d0297836e6e7576e83f69c851716f899 Mon Sep 17 00:00:00 2001
+From 745af73eab8459b7b8d6889850943afba3aeb6fd 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
@@ -17,10 +17,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 7 insertions(+)
 
 diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
-index 976d5200f1..f1d9b3cbe9 100644
+index b623c96198..18e69688c9 100644
 --- a/hw/timer/i8254_common.c
 +++ b/hw/timer/i8254_common.c
-@@ -258,6 +258,12 @@ static int pit_dispatch_post_load(void *opaque, int version_id)
+@@ -260,6 +260,12 @@ static int pit_dispatch_post_load(void *opaque, int version_id)
      return 0;
  }
  
@@ -33,7 +33,7 @@ index 976d5200f1..f1d9b3cbe9 100644
  static const VMStateDescription vmstate_pit_common = {
      .name = "i8254",
      .version_id = 3,
-@@ -267,6 +273,7 @@ static const VMStateDescription vmstate_pit_common = {
+@@ -269,6 +275,7 @@ static const VMStateDescription vmstate_pit_common = {
      .pre_save = pit_dispatch_pre_save,
      .post_load = pit_dispatch_post_load,
      .fields = (VMStateField[]) {

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

@@ -1,4 +1,4 @@
-From b54cf4a53119c84576eb016cd5dbcaef14504747 Mon Sep 17 00:00:00 2001
+From cc5b2a3c40b43326c1f555e8f46f61bb10812cd3 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,7 +17,7 @@ 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 f4fd5907b8..261b746b26 100644
+index a0fb1ce037..67a36cb660 100644
 --- a/hw/acpi/piix4.c
 +++ b/hw/acpi/piix4.c
 @@ -311,7 +311,7 @@ static const VMStateDescription vmstate_cpuhp_state = {

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

@@ -1,4 +1,4 @@
-From d609e5c88bf83530538ac63c74789f9d47cfb4b3 Mon Sep 17 00:00:00 2001
+From ea79d0cc0c448c2d04bba7cdcf686ea18aa3a0ae 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 651cbb8606..eb3d7d0e54 100644
+index 9f8d5a1b1f..5bf1130486 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
-@@ -1657,6 +1657,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
+@@ -1662,6 +1662,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
          if (down)
              vs->modifiers_state[keycode] ^= 1;
          break;

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

@@ -1,4 +1,4 @@
-From 5812dbdce09f97f52d832c67f509753aa8a93f59 Mon Sep 17 00:00:00 2001
+From 594154fd98941c5740ce595a252834040f6ae655 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
@@ -22,10 +22,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 50 insertions(+), 13 deletions(-)
 
 diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
-index 67a0a4a58b..1c73e5aeae 100644
+index b3fdd0827d..d64ad081b7 100644
 --- a/qapi/string-input-visitor.c
 +++ b/qapi/string-input-visitor.c
-@@ -43,7 +43,8 @@ static void free_range(void *range, void *dummy)
+@@ -44,7 +44,8 @@ static void free_range(void *range, void *dummy)
      g_free(range);
  }
  
@@ -35,7 +35,7 @@ index 67a0a4a58b..1c73e5aeae 100644
  {
      char *str = (char *) siv->string;
      long long start, end;
-@@ -60,7 +61,11 @@ static int parse_str(StringInputVisitor *siv, const char *name, Error **errp)
+@@ -61,7 +62,11 @@ static int parse_str(StringInputVisitor *siv, const char *name, Error **errp)
  
      do {
          errno = 0;
@@ -48,7 +48,7 @@ index 67a0a4a58b..1c73e5aeae 100644
          if (errno == 0 && endptr > str) {
              if (*endptr == '\0') {
                  cur = g_malloc0(sizeof(*cur));
-@@ -71,7 +76,11 @@ static int parse_str(StringInputVisitor *siv, const char *name, Error **errp)
+@@ -72,7 +77,11 @@ static int parse_str(StringInputVisitor *siv, const char *name, Error **errp)
              } else if (*endptr == '-') {
                  str = endptr + 1;
                  errno = 0;
@@ -61,7 +61,7 @@ index 67a0a4a58b..1c73e5aeae 100644
                  if (errno == 0 && endptr > str && start <= end &&
                      (start > INT64_MAX - 65536 ||
                       end < start + 65536)) {
-@@ -127,7 +136,7 @@ start_list(Visitor *v, const char *name, GenericList **list, size_t size,
+@@ -128,7 +137,7 @@ start_list(Visitor *v, const char *name, GenericList **list, size_t size,
      assert(list);
      siv->list = list;
  
@@ -70,7 +70,7 @@ index 67a0a4a58b..1c73e5aeae 100644
          *list = NULL;
          return;
      }
-@@ -215,7 +224,7 @@ static void parse_type_int64(Visitor *v, const char *name, int64_t *obj,
+@@ -216,7 +225,7 @@ static void parse_type_int64(Visitor *v, const char *name, int64_t *obj,
  {
      StringInputVisitor *siv = to_siv(v);
  
@@ -79,7 +79,7 @@ index 67a0a4a58b..1c73e5aeae 100644
          return;
      }
  
-@@ -251,15 +260,43 @@ error:
+@@ -252,15 +261,43 @@ error:
  static void parse_type_uint64(Visitor *v, const char *name, uint64_t *obj,
                                Error **errp)
  {

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

@@ -1,4 +1,4 @@
-From c3e8ce72202ea22d0c4c649ca57b8392515e8cac Mon Sep 17 00:00:00 2001
+From d98ad37e0fa5c3d254a016b5a2de2bc5a36ac603 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
@@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 8 insertions(+)
 
 diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
-index 79313a7f7a..e00194a649 100644
+index 4f9c36bef1..470f58e0ab 100644
 --- a/tests/test-string-input-visitor.c
 +++ b/tests/test-string-input-visitor.c
 @@ -55,6 +55,14 @@ static void test_visitor_in_int(TestInputVisitorData *data,

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

@@ -1,4 +1,4 @@
-From 5483b85712ce2d049b26ce8bf78b790dc9c2c34d Mon Sep 17 00:00:00 2001
+From 7b6711a0a89635a57773ed8dff4e8543b199b161 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
@@ -15,7 +15,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 23 insertions(+)
 
 diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
-index e00194a649..558782796a 100644
+index 470f58e0ab..0bf22777cf 100644
 --- a/tests/test-string-input-visitor.c
 +++ b/tests/test-string-input-visitor.c
 @@ -78,6 +78,27 @@ static void test_visitor_in_int(TestInputVisitorData *data,

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

@@ -1,4 +1,4 @@
-From bc88c2eb27f326884bc328708313eb750250fb9c Mon Sep 17 00:00:00 2001
+From b7f197720e170281c479d2b892c45e598f428a27 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
@@ -17,10 +17,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  create mode 100644 tests/check-qom-props.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index ccee28b12d..1d6ae7b46c 100644
+index 0255113470..7801583a76 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -1439,6 +1439,7 @@ F: qom/
+@@ -1521,6 +1521,7 @@ F: qom/
  X: qom/cpu.c
  F: tests/check-qom-interface.c
  F: tests/check-qom-proplist.c
@@ -29,10 +29,10 @@ index ccee28b12d..1d6ae7b46c 100644
  
  QMP
 diff --git a/tests/Makefile.include b/tests/Makefile.include
-index 37c1bed683..1cffa2403f 100644
+index c002352134..f777533f1a 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
-@@ -113,6 +113,8 @@ check-unit-y += tests/check-qom-interface$(EXESUF)
+@@ -116,6 +116,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
@@ -41,8 +41,8 @@ index 37c1bed683..1cffa2403f 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)
-@@ -571,6 +573,7 @@ tests/check-qnull$(EXESUF): tests/check-qnull.o $(test-util-obj-y)
- tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y)
+@@ -586,6 +588,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)
 +tests/check-qom-props$(EXESUF): tests/check-qom-props.o $(test-qom-obj-y)

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

@@ -1,4 +1,4 @@
-From 6c4a1edc2ac8dedae718765c55bf9574003e7329 Mon Sep 17 00:00:00 2001
+From a3cb893add9ad07fd3c971aed8e38f11496f9b9c 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
@@ -20,10 +20,10 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  create mode 100644 tests/scsi-disk-test.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 1d6ae7b46c..45a45935ea 100644
+index 7801583a76..e7dbf3c9b2 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -970,6 +970,7 @@ M: Paolo Bonzini <pbonzini@redhat.com>
+@@ -1003,6 +1003,7 @@ M: Paolo Bonzini <pbonzini@redhat.com>
  S: Supported
  F: include/hw/scsi/*
  F: hw/scsi/*
@@ -32,10 +32,10 @@ index 1d6ae7b46c..45a45935ea 100644
  T: git git://github.com/bonzini/qemu.git scsi-next
  
 diff --git a/tests/Makefile.include b/tests/Makefile.include
-index 1cffa2403f..27d4ce8bc3 100644
+index f777533f1a..199b7bbddd 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
-@@ -185,6 +185,8 @@ check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF)
+@@ -188,6 +188,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
@@ -44,7 +44,7 @@ index 1cffa2403f..27d4ce8bc3 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
-@@ -779,6 +781,7 @@ tests/postcopy-test$(EXESUF): tests/postcopy-test.o
+@@ -793,6 +795,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)

0032-scripts-avoid-usr-bin-python-refere.patch

@@ -1,4 +1,4 @@
-From 4cb98f80ab51823101ee0e387d24d441b0257f0e Mon Sep 17 00:00:00 2001
+From d14c342fa04004f66197adabc16d8678227b3b8e Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Wed, 29 Nov 2017 10:30:02 -0700
 Subject: [PATCH] scripts: avoid /usr/bin/python reference in

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

@@ -0,0 +1,37 @@
+From dc5a5c0f142eb0176824a440de94b77544ce2fdc 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
+
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+---
+ Makefile  | 2 +-
+ configure | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ab0354c153..4be3366e27 100644
+--- a/Makefile
++++ b/Makefile
+@@ -449,7 +449,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
+-scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist
++scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmpathpersist -lmultipath
+ endif
+ 
+ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
+diff --git a/configure b/configure
+index 0c6e7572db..01e1d15fa4 100755
+--- a/configure
++++ b/configure
+@@ -3382,7 +3382,7 @@ int main(void) {
+     return 0;
+ }
+ EOF
+-  if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then
++  if compile_prog "" "-ludev -lmpathpersist -lmultipath" ; then
+     mpathpersist=yes
+   else
+     mpathpersist=no

0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch

@@ -1,86 +0,0 @@
-From 25e3e93ab685cabcaf987e493a6adfe5a463ce56 Mon Sep 17 00:00:00 2001
-From: Brijesh Singh <brijesh.singh@amd.com>
-Date: Tue, 15 Aug 2017 12:00:51 -0500
-Subject: [PATCH] target-i386/cpu: Add new EPYC CPU model
-
-Add a new base CPU model called 'EPYC' to model processors from AMD EPYC
-family (which includes EPYC 76xx,75xx,74xx, 73xx and 72xx).
-
-The following features bits have been added/removed compare to Opteron_G5
-
-Added: monitor, movbe, rdrand, mmxext, ffxsr, rdtscp, cr8legacy, osvw,
-       fsgsbase, bmi1, avx2, smep, bmi2, rdseed, adx, smap, clfshopt, sha
-       xsaveopt, xsavec, xgetbv1, arat
-
-Removed: xop, fma4, tbm
-
-Cc: Paolo Bonzini <pbonzini@redhat.com>
-Cc: Richard Henderson <rth@twiddle.net>
-Cc: Eduardo Habkost <ehabkost@redhat.com>
-Cc: Tom Lendacky <Thomas.Lendacky@amd.com>
-Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
-Message-Id: <20170815170051.127257-1-brijesh.singh@amd.com>
-Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
-Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-(cherry picked from commit 2e2efc7dbe2b0adc1200b5aa286cdbed729f6751)
-[BR: BSC#1052825]
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- target/i386/cpu.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 44 insertions(+)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index ddc45abd70..6617e01a72 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -1522,6 +1522,50 @@ static X86CPUDefinition builtin_x86_defs[] = {
-         .xlevel = 0x8000001A,
-         .model_id = "AMD Opteron 63xx class CPU",
-     },
-+    {
-+        .name = "EPYC",
-+        .level = 0xd,
-+        .vendor = CPUID_VENDOR_AMD,
-+        .family = 23,
-+        .model = 1,
-+        .stepping = 2,
-+        .features[FEAT_1_EDX] =
-+            CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | CPUID_CLFLUSH |
-+            CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA | CPUID_PGE |
-+            CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 | CPUID_MCE |
-+            CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE | CPUID_DE |
-+            CPUID_VME | CPUID_FP87,
-+        .features[FEAT_1_ECX] =
-+            CPUID_EXT_RDRAND | CPUID_EXT_F16C | CPUID_EXT_AVX |
-+            CPUID_EXT_XSAVE | CPUID_EXT_AES |  CPUID_EXT_POPCNT |
-+            CPUID_EXT_MOVBE | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
-+            CPUID_EXT_CX16 | CPUID_EXT_FMA | CPUID_EXT_SSSE3 |
-+            CPUID_EXT_MONITOR | CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3,
-+        .features[FEAT_8000_0001_EDX] =
-+            CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_PDPE1GB |
-+            CPUID_EXT2_FFXSR | CPUID_EXT2_MMXEXT | CPUID_EXT2_NX |
-+            CPUID_EXT2_SYSCALL,
-+        .features[FEAT_8000_0001_ECX] =
-+            CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH |
-+            CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
-+            CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
-+        .features[FEAT_7_0_EBX] =
-+            CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_AVX2 |
-+            CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_RDSEED |
-+            CPUID_7_0_EBX_ADX | CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLFLUSHOPT |
-+            CPUID_7_0_EBX_SHA_NI,
-+        /* Missing: XSAVES (not supported by some Linux versions,
-+         * including v4.1 to v4.12).
-+         * KVM doesn't yet expose any XSAVES state save component.
-+         */
-+        .features[FEAT_XSAVE] =
-+            CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
-+            CPUID_XSAVE_XGETBV1,
-+        .features[FEAT_6_EAX] =
-+            CPUID_6_EAX_ARAT,
-+        .xlevel = 0x8000000A,
-+        .model_id = "AMD EPYC Processor",
-+    },
- };
- 
- typedef struct PropValue {

0035-chardev-baum-fix-baum-that-releases.patch

@@ -1,34 +0,0 @@
-From d131e1cccb06a09c867752ac4b9a075f4c97ffbc Mon Sep 17 00:00:00 2001
-From: Liang Yan <lyan@suse.com>
-Date: Fri, 22 Sep 2017 18:55:33 -0400
-Subject: [PATCH] chardev/baum: fix baum that releases brlapi twice
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Error process of baum_chr_open needs to set brlapi null, so it won't
-get released twice in char_braille_finalize, which will cause
-"/usr/bin/qemu-system-x86_64: double free or corruption (!prev)"
-
-Signed-off-by: Liang Yan <lyan@suse.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-(cherry picked from commit 98e8790326d732fc79f0c133d9658f4761ba9cb7)
-[LY: BSC#1060045]
-Signed-off-by: Liang Yan <lyan@suse.com>
----
- chardev/baum.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chardev/baum.c b/chardev/baum.c
-index 302dd9666c..67fd783a59 100644
---- a/chardev/baum.c
-+++ b/chardev/baum.c
-@@ -643,6 +643,7 @@ static void baum_chr_open(Chardev *chr,
-         error_setg(errp, "brlapi__openConnection: %s",
-                    brlapi_strerror(brlapi_error_location()));
-         g_free(handle);
-+        baum->brlapi = NULL;
-         return;
-     }
-     baum->deferred_init = 0;

0036-io-fix-temp-directory-used-by-test-.patch

@@ -1,36 +0,0 @@
-From 4d4549d686febaa531a0f2eef8cc0aa745ef1300 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Fri, 21 Jul 2017 12:47:39 +0100
-Subject: [PATCH] io: fix temp directory used by test-io-channel-tls test
-
-The test-io-channel-tls test was mistakenly using two of the
-same directories as test-crypto-tlssession. This causes a
-sporadic failure when using make -j$BIGNUM.
-
-Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-(cherry picked from commit d4adf9675801cd90e66ecfcd6a54ca1abc5a6698)
-[BR: We're getting failures in qemu-testsuite. This fix either resolves
-that failure, or has been identified as being a qemu-testsuite failure
-fix in related code]
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- tests/test-io-channel-tls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
-index 8eaa208e1b..ff96877323 100644
---- a/tests/test-io-channel-tls.c
-+++ b/tests/test-io-channel-tls.c
-@@ -127,8 +127,8 @@ static void test_io_channel_tls(const void *opaque)
-     /* We'll use this for our fake client-server connection */
-     g_assert(socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == 0);
- 
--#define CLIENT_CERT_DIR "tests/test-crypto-tlssession-client/"
--#define SERVER_CERT_DIR "tests/test-crypto-tlssession-server/"
-+#define CLIENT_CERT_DIR "tests/test-io-channel-tls-client/"
-+#define SERVER_CERT_DIR "tests/test-io-channel-tls-server/"
-     mkdir(CLIENT_CERT_DIR, 0700);
-     mkdir(SERVER_CERT_DIR, 0700);
- 

0037-io-fix-check-for-handshake-completi.patch

@@ -1,36 +0,0 @@
-From 0fa69eb51de581673ab4dd105be56fb59ef5556c Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Tue, 29 Aug 2017 17:04:52 +0100
-Subject: [PATCH] io: fix check for handshake completion in TLS test
-
-The TLS I/O channel test had mistakenly used && instead
-of || when checking for handshake completion. As a
-result it could terminate the handshake process before
-it had actually completed. This was harmless before but
-changes in GNUTLS 3.6.0 exposed this bug and caused the
-test suite to fail.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-(cherry picked from commit 689ed13e73bdb5a5ca3366524475e3065fae854a)
-[BR: We're getting failures in qemu-testsuite. This fix either resolves
-that failure, or has been identified as being a qemu-testsuite failure
-fix in related code]
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- tests/test-io-channel-tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
-index ff96877323..a210d01ba5 100644
---- a/tests/test-io-channel-tls.c
-+++ b/tests/test-io-channel-tls.c
-@@ -218,7 +218,7 @@ static void test_io_channel_tls(const void *opaque)
-     mainloop = g_main_context_default();
-     do {
-         g_main_context_iteration(mainloop, TRUE);
--    } while (!clientHandshake.finished &&
-+    } while (!clientHandshake.finished ||
-              !serverHandshake.finished);
- 
-     g_assert(clientHandshake.failed == data->expectClientFail);

0038-crypto-fix-test-cert-generation-to-.patch

@@ -1,36 +0,0 @@
-From 3578aeb73b6bfd11643fe65f34b454f4a6bd957e Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Tue, 29 Aug 2017 17:03:30 +0100
-Subject: [PATCH] crypto: fix test cert generation to not use SHA1 algorithm
-
-GNUTLS 3.6.0 marked SHA1 as untrusted for certificates.
-Unfortunately the gnutls_x509_crt_sign() method we are
-using to create certificates in the test suite is fixed
-to always use SHA1. We must switch to a different method
-and explicitly ask for SHA256.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-(cherry picked from commit 23c1595b0297e6ca8f37559af6f0b8533aa1fd99)
-[BR: We're getting failures in qemu-testsuite. This fix either resolves
-that failure, or has been identified as being a qemu-testsuite failure
-fix in related code]
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- tests/crypto-tls-x509-helpers.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/crypto-tls-x509-helpers.c b/tests/crypto-tls-x509-helpers.c
-index 64073d3bd3..173d4e28fb 100644
---- a/tests/crypto-tls-x509-helpers.c
-+++ b/tests/crypto-tls-x509-helpers.c
-@@ -406,7 +406,8 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req,
-      * If no 'ca' is set then we are self signing
-      * the cert. This is done for the root CA certs
-      */
--    err = gnutls_x509_crt_sign(crt, ca ? ca : crt, privkey);
-+    err = gnutls_x509_crt_sign2(crt, ca ? ca : crt, privkey,
-+                                GNUTLS_DIG_SHA256, 0);
-     if (err < 0) {
-         g_critical("Failed to sign certificate %s",
-                    gnutls_strerror(err));

0039-vhost-user-disable-the-broken-subpr.patch

@@ -1,78 +0,0 @@
-From dd7d5241682092e93714f73ccdfc844a0058cca6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
-Date: Tue, 5 Sep 2017 15:06:02 -0300
-Subject: [PATCH] vhost-user: disable the *broken* subprocess tests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-tests/vhost-user-test keeps failing on build-system since Aug 15:
-
-  ERROR:tests/vhost-user-test.c:835:test_flags_mismatch: child process (/i386/vhost-user/flags-mismatch/subprocess [4836]) failed unexpectedly
-...
-  ERROR:tests/vhost-user-test.c:807:test_connect_fail: child process (/x86_64/vhost-user/connect-fail/subprocess [58910]) failed unexpectedly
-
-Suggested-by: Peter Maydell <peter.maydell@linaro.org>
-Suggested-by: Daniel P. Berrange <berrange@redhat.com>
-Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Message-id: 20170905180602.28698-1-f4bug@amsat.org
-Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-(cherry picked from commit 20784087eb875e22cf0021989e61716304b63c84)
-[BR: We're getting failures in qemu-testsuite. This fix either resolves
-that failure, or has been identified as being a qemu-testsuite failure
-fix in related code]
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- tests/vhost-user-test.c | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
-index d4da09f147..4b98018478 100644
---- a/tests/vhost-user-test.c
-+++ b/tests/vhost-user-test.c
-@@ -31,6 +31,8 @@
- #include <linux/virtio_net.h>
- #include <sys/vfs.h>
- 
-+#define VHOST_USER_NET_TESTS_WORKING 0 /* broken as of 2.10.0 */
-+
- /* GLIB version compatibility flags */
- #if !GLIB_CHECK_VERSION(2, 26, 0)
- #define G_TIME_SPAN_SECOND              (G_GINT64_CONSTANT(1000000))
-@@ -472,11 +474,6 @@ static void test_server_listen(TestServer *server)
-     test_server_create_chr(server, ",server,nowait");
- }
- 
--static inline void test_server_connect(TestServer *server)
--{
--    test_server_create_chr(server, ",reconnect=1");
--}
--
- #define GET_QEMU_CMD(s)                                         \
-     g_strdup_printf(QEMU_CMD, 512, 512, (root), (s)->chr_name,  \
-                     (s)->socket_path, "", (s)->chr_name)
-@@ -722,7 +719,12 @@ static void wait_for_rings_started(TestServer *s, size_t count)
-     g_mutex_unlock(&s->data_mutex);
- }
- 
--#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
-+#if VHOST_USER_NET_TESTS_WORKING && defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
-+static inline void test_server_connect(TestServer *server)
-+{
-+    test_server_create_chr(server, ",reconnect=1");
-+}
-+
- static gboolean
- reconnect_cb(gpointer user_data)
- {
-@@ -962,7 +964,8 @@ int main(int argc, char **argv)
-     qtest_add_data_func("/vhost-user/read-guest-mem", server, read_guest_mem);
-     qtest_add_func("/vhost-user/migrate", test_migrate);
-     qtest_add_func("/vhost-user/multiqueue", test_multiqueue);
--#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
-+
-+#if VHOST_USER_NET_TESTS_WORKING && defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
-     qtest_add_func("/vhost-user/reconnect/subprocess",
-                    test_reconnect_subprocess);
-     qtest_add_func("/vhost-user/reconnect", test_reconnect);

0040-io-monitor-encoutput-buffer-size-fr.patch

@@ -1,77 +0,0 @@
-From e0032c4d69b0c6b3eeeded2ab496db61c4632e46 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Wed, 18 Oct 2017 14:51:33 -0600
-Subject: [PATCH] io: monitor encoutput buffer size from websocket GSource
-
-The websocket GSource is monitoring the size of the rawoutput
-buffer to determine if the channel can accepts more writes.
-The rawoutput buffer, however, is merely a temporary staging
-buffer before data is copied into the encoutput buffer. Thus
-its size will always be zero when the GSource runs.
-
-This flaw causes the encoutput buffer to grow without bound
-if the other end of the underlying data channel doesn't
-read data being sent. This can be seen with VNC if a client
-is on a slow WAN link and the guest OS is sending many screen
-updates. A malicious VNC client can act like it is on a slow
-link by playing a video in the guest and then reading data
-very slowly, causing QEMU host memory to expand arbitrarily.
-
-This issue is assigned CVE-2017-15268, publically reported in
-
-  https://bugs.launchpad.net/qemu/+bug/1718964
-
-(cherry picked from commit a7b20a8efa28e5f22c26c06cd06c2f12bc863493)
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-
-[Dan: Added extra checks to deal with code refactored in master but
- not stable 2.10]
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-[BR: BSC#1062942 CVE-2017-15268]
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- io/channel-websock.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/io/channel-websock.c b/io/channel-websock.c
-index 5a3badbec2..19116dc148 100644
---- a/io/channel-websock.c
-+++ b/io/channel-websock.c
-@@ -26,7 +26,7 @@
- #include "trace.h"
- 
- 
--/* Max amount to allow in rawinput/rawoutput buffers */
-+/* Max amount to allow in rawinput/encoutput buffers */
- #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192
- 
- #define QIO_CHANNEL_WEBSOCK_CLIENT_KEY_LEN 24
-@@ -1006,7 +1006,7 @@ qio_channel_websock_source_prepare(GSource *source,
-     if (wsource->wioc->rawinput.offset) {
-         cond |= G_IO_IN;
-     }
--    if (wsource->wioc->rawoutput.offset < QIO_CHANNEL_WEBSOCK_MAX_BUFFER) {
-+    if (wsource->wioc->encoutput.offset < QIO_CHANNEL_WEBSOCK_MAX_BUFFER) {
-         cond |= G_IO_OUT;
-     }
- 
-@@ -1022,7 +1022,7 @@ qio_channel_websock_source_check(GSource *source)
-     if (wsource->wioc->rawinput.offset) {
-         cond |= G_IO_IN;
-     }
--    if (wsource->wioc->rawoutput.offset < QIO_CHANNEL_WEBSOCK_MAX_BUFFER) {
-+    if (wsource->wioc->encoutput.offset < QIO_CHANNEL_WEBSOCK_MAX_BUFFER) {
-         cond |= G_IO_OUT;
-     }
- 
-@@ -1041,7 +1041,7 @@ qio_channel_websock_source_dispatch(GSource *source,
-     if (wsource->wioc->rawinput.offset) {
-         cond |= G_IO_IN;
-     }
--    if (wsource->wioc->rawoutput.offset < QIO_CHANNEL_WEBSOCK_MAX_BUFFER) {
-+    if (wsource->wioc->encoutput.offset < QIO_CHANNEL_WEBSOCK_MAX_BUFFER) {
-         cond |= G_IO_OUT;
-     }
- 

0041-cirrus-fix-oob-access-in-mode4and5-.patch

@@ -1,57 +0,0 @@
-From f3c7b39cec549039b89fa1c6b2ab238b4bac1a97 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Wed, 18 Oct 2017 14:54:15 -0600
-Subject: [PATCH] cirrus: fix oob access in mode4and5 write functions
-
-Move dst calculation into the loop, so we apply the mask on each
-interation and will not overflow vga memory.
-
-Cc: Prasad J Pandit <pjp@fedoraproject.org>
-Reported-by: Niu Guoxiang <niuguoxiang@huawei.com>
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Message-id: 20171011084314.21752-1-kraxel@redhat.com
-[BR: BSC#1063122 CVE-2017-15289]
-Signed-off-by: Bruce Rogers <brogers@suse.com
----
- hw/display/cirrus_vga.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
-index afc290ab91..077a8cb74f 100644
---- a/hw/display/cirrus_vga.c
-+++ b/hw/display/cirrus_vga.c
-@@ -2038,15 +2038,14 @@ static void cirrus_mem_writeb_mode4and5_8bpp(CirrusVGAState * s,
-     unsigned val = mem_value;
-     uint8_t *dst;
- 
--    dst = s->vga.vram_ptr + (offset &= s->cirrus_addr_mask);
-     for (x = 0; x < 8; x++) {
-+        dst = s->vga.vram_ptr + ((offset + x) & s->cirrus_addr_mask);
- 	if (val & 0x80) {
- 	    *dst = s->cirrus_shadow_gr1;
- 	} else if (mode == 5) {
- 	    *dst = s->cirrus_shadow_gr0;
- 	}
- 	val <<= 1;
--	dst++;
-     }
-     memory_region_set_dirty(&s->vga.vram, offset, 8);
- }
-@@ -2060,8 +2059,8 @@ static void cirrus_mem_writeb_mode4and5_16bpp(CirrusVGAState * s,
-     unsigned val = mem_value;
-     uint8_t *dst;
- 
--    dst = s->vga.vram_ptr + (offset &= s->cirrus_addr_mask);
-     for (x = 0; x < 8; x++) {
-+        dst = s->vga.vram_ptr + ((offset + 2 * x) & s->cirrus_addr_mask & ~1);
- 	if (val & 0x80) {
- 	    *dst = s->cirrus_shadow_gr1;
- 	    *(dst + 1) = s->vga.gr[0x11];
-@@ -2070,7 +2069,6 @@ static void cirrus_mem_writeb_mode4and5_16bpp(CirrusVGAState * s,
- 	    *(dst + 1) = s->vga.gr[0x10];
- 	}
- 	val <<= 1;
--	dst += 2;
-     }
-     memory_region_set_dirty(&s->vga.vram, offset, 16);
- }

0042-9pfs-use-g_malloc0-to-allocate-spac.patch

@@ -1,43 +0,0 @@
-From 89a7eced18edb0d38a444abc1b367d241ae6cff8 Mon Sep 17 00:00:00 2001
-From: Prasad J Pandit <pjp@fedoraproject.org>
-Date: Mon, 16 Oct 2017 14:21:59 +0200
-Subject: [PATCH] 9pfs: use g_malloc0 to allocate space for xattr
-
-9p back-end first queries the size of an extended attribute,
-allocates space for it via g_malloc() and then retrieves its
-value into allocated buffer. Race between querying attribute
-size and retrieving its could lead to memory bytes disclosure.
-Use g_malloc0() to avoid it.
-
-Reported-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
-Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
-Signed-off-by: Greg Kurz <groug@kaod.org>
-(cherry picked from commit 7bd92756303f2158a68d5166264dc30139b813b6)
-[BR: BSC#1062069 CVE-2017-15038]
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- hw/9pfs/9p.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
-index 8e9490c5f5..c41c0eb106 100644
---- a/hw/9pfs/9p.c
-+++ b/hw/9pfs/9p.c
-@@ -3236,7 +3236,7 @@ static void coroutine_fn v9fs_xattrwalk(void *opaque)
-         xattr_fidp->fid_type = P9_FID_XATTR;
-         xattr_fidp->fs.xattr.xattrwalk_fid = true;
-         if (size) {
--            xattr_fidp->fs.xattr.value = g_malloc(size);
-+            xattr_fidp->fs.xattr.value = g_malloc0(size);
-             err = v9fs_co_llistxattr(pdu, &xattr_fidp->path,
-                                      xattr_fidp->fs.xattr.value,
-                                      xattr_fidp->fs.xattr.len);
-@@ -3269,7 +3269,7 @@ static void coroutine_fn v9fs_xattrwalk(void *opaque)
-         xattr_fidp->fid_type = P9_FID_XATTR;
-         xattr_fidp->fs.xattr.xattrwalk_fid = true;
-         if (size) {
--            xattr_fidp->fs.xattr.value = g_malloc(size);
-+            xattr_fidp->fs.xattr.value = g_malloc0(size);
-             err = v9fs_co_lgetxattr(pdu, &xattr_fidp->path,
-                                     &name, xattr_fidp->fs.xattr.value,
-                                     xattr_fidp->fs.xattr.len);

60-kvm.rules

@@ -1 +0,0 @@
-KERNEL=="kvm", MODE="0660", GROUP="kvm"

60-kvm.x86.rules

@@ -1,2 +0,0 @@
-KERNEL=="kvm", MODE="0660", GROUP="kvm"
-ACTION=="add|change", SUBSYSTEM=="dmi", KERNEL=="id", RUN+="/bin/sh -c 'grep -q vmx /proc/cpuinfo && /sbin/modprobe kvm-intel; grep -q svm /proc/cpuinfo && /sbin/modprobe kvm-amd; /sbin/modprobe vhost-net'"

qemu-2.10.1.tar.xz

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

qemu-2.11.0.tar.xz

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

qemu-linux-user.changes

@@ -1,3 +1,67 @@
+-------------------------------------------------------------------
+Wed Dec 13 20:57:00 UTC 2017 - brogers@suse.com
+
+- Update to v2.11.0: See http://wiki.qemu.org/ChangeLog/2.11
+  Some noteworthy changes:
+  misc TCG and linux user improvements
+* Drop very old compatability provisions
+* Patches dropped (upstream):
+  0013-console-add-question-mark-escape-op.patch
+  0020-configure-Fix-detection-of-seccomp-.patch
+  0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+  0035-chardev-baum-fix-baum-that-releases.patch
+  0036-io-fix-temp-directory-used-by-test-.patch
+  0037-io-fix-check-for-handshake-completi.patch
+  0038-crypto-fix-test-cert-generation-to-.patch
+  0039-vhost-user-disable-the-broken-subpr.patch
+  0040-io-monitor-encoutput-buffer-size-fr.patch
+  0041-cirrus-fix-oob-access-in-mode4and5-.patch
+  0042-9pfs-use-g_malloc0-to-allocate-spac.patch
+* Patches renamed:
+  0014-Make-char-muxer-more-robust-wrt-sma.patch
+  -> 0013-Make-char-muxer-more-robust-wrt-sma.patch
+  0015-linux-user-lseek-explicitly-cast-no.patch
+  -> 0014-linux-user-lseek-explicitly-cast-no.patch
+  0016-AIO-Reduce-number-of-threads-for-32.patch
+  -> 0015-AIO-Reduce-number-of-threads-for-32.patch
+  0017-xen_disk-Add-suse-specific-flush-di.patch
+  -> 0016-xen_disk-Add-suse-specific-flush-di.patch
+  0018-qemu-bridge-helper-reduce-security-.patch
+  -> 0017-qemu-bridge-helper-reduce-security-.patch
+  0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  -> 0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  0021-linux-user-properly-test-for-infini.patch
+  -> 0019-linux-user-properly-test-for-infini.patch
+  0022-roms-Makefile-pass-a-packaging-time.patch
+  -> 0020-roms-Makefile-pass-a-packaging-time.patch
+  0023-Raise-soft-address-space-limit-to-h.patch
+  -> 0021-Raise-soft-address-space-limit-to-h.patch
+  0024-increase-x86_64-physical-bits-to-42.patch
+  -> 0022-increase-x86_64-physical-bits-to-42.patch
+  0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  -> 0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  0026-i8254-Fix-migration-from-SLE11-SP2.patch
+  -> 0024-i8254-Fix-migration-from-SLE11-SP2.patch
+  0027-acpi_piix4-Fix-migration-from-SLE11.patch
+  -> 0025-acpi_piix4-Fix-migration-from-SLE11.patch
+  0028-Fix-tigervnc-long-press-issue.patch
+  -> 0026-Fix-tigervnc-long-press-issue.patch
+  0029-string-input-visitor-Fix-uint64-par.patch
+  -> 0027-string-input-visitor-Fix-uint64-par.patch
+  0030-test-string-input-visitor-Add-int-t.patch
+  -> 0028-test-string-input-visitor-Add-int-t.patch
+  0031-test-string-input-visitor-Add-uint6.patch
+  -> 0029-test-string-input-visitor-Add-uint6.patch
+  0032-tests-Add-QOM-property-unit-tests.patch
+  -> 0030-tests-Add-QOM-property-unit-tests.patch
+  0033-tests-Add-scsi-disk-test.patch
+  -> 0031-tests-Add-scsi-disk-test.patch
+  0043-scripts-avoid-usr-bin-python-refere.patch
+  -> 0032-scripts-avoid-usr-bin-python-refere.patch
+* Patches added:
+  0033-Switch-order-of-libraries-for-mpath.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11
+
 -------------------------------------------------------------------
 Wed Nov 29 17:31:29 UTC 2017 - brogers@suse.com
 

qemu-linux-user.spec

@@ -18,12 +18,12 @@
 
 Name:           qemu-linux-user
 Url:            http://www.qemu.org/
-Summary:        Universal CPU emulator
+Summary:        CPU emulator for user space
 License:        BSD-3-Clause AND GPL-2.0 AND GPL-2.0+ AND LGPL-2.1+ AND MIT
 Group:          System/Emulators/PC
-Version:        2.10.1
+Version:        2.11.0
 Release:        0
-Source:         qemu-2.10.1.tar.xz
+Source:         qemu-2.11.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
@@ -38,37 +38,27 @@ Patch0009:      0009-linux-user-binfmt-support-host-bina.patch
 Patch0010:      0010-linux-user-Fake-proc-cpuinfo.patch
 Patch0011:      0011-linux-user-XXX-disable-fiemap.patch
 Patch0012:      0012-linux-user-use-target_ulong.patch
-Patch0013:      0013-console-add-question-mark-escape-op.patch
-Patch0014:      0014-Make-char-muxer-more-robust-wrt-sma.patch
-Patch0015:      0015-linux-user-lseek-explicitly-cast-no.patch
-Patch0016:      0016-AIO-Reduce-number-of-threads-for-32.patch
-Patch0017:      0017-xen_disk-Add-suse-specific-flush-di.patch
-Patch0018:      0018-qemu-bridge-helper-reduce-security-.patch
-Patch0019:      0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
-Patch0020:      0020-configure-Fix-detection-of-seccomp-.patch
-Patch0021:      0021-linux-user-properly-test-for-infini.patch
-Patch0022:      0022-roms-Makefile-pass-a-packaging-time.patch
-Patch0023:      0023-Raise-soft-address-space-limit-to-h.patch
-Patch0024:      0024-increase-x86_64-physical-bits-to-42.patch
-Patch0025:      0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
-Patch0026:      0026-i8254-Fix-migration-from-SLE11-SP2.patch
-Patch0027:      0027-acpi_piix4-Fix-migration-from-SLE11.patch
-Patch0028:      0028-Fix-tigervnc-long-press-issue.patch
-Patch0029:      0029-string-input-visitor-Fix-uint64-par.patch
-Patch0030:      0030-test-string-input-visitor-Add-int-t.patch
-Patch0031:      0031-test-string-input-visitor-Add-uint6.patch
-Patch0032:      0032-tests-Add-QOM-property-unit-tests.patch
-Patch0033:      0033-tests-Add-scsi-disk-test.patch
-Patch0034:      0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
-Patch0035:      0035-chardev-baum-fix-baum-that-releases.patch
-Patch0036:      0036-io-fix-temp-directory-used-by-test-.patch
-Patch0037:      0037-io-fix-check-for-handshake-completi.patch
-Patch0038:      0038-crypto-fix-test-cert-generation-to-.patch
-Patch0039:      0039-vhost-user-disable-the-broken-subpr.patch
-Patch0040:      0040-io-monitor-encoutput-buffer-size-fr.patch
-Patch0041:      0041-cirrus-fix-oob-access-in-mode4and5-.patch
-Patch0042:      0042-9pfs-use-g_malloc0-to-allocate-spac.patch
-Patch0043:      0043-scripts-avoid-usr-bin-python-refere.patch
+Patch0013:      0013-Make-char-muxer-more-robust-wrt-sma.patch
+Patch0014:      0014-linux-user-lseek-explicitly-cast-no.patch
+Patch0015:      0015-AIO-Reduce-number-of-threads-for-32.patch
+Patch0016:      0016-xen_disk-Add-suse-specific-flush-di.patch
+Patch0017:      0017-qemu-bridge-helper-reduce-security-.patch
+Patch0018:      0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+Patch0019:      0019-linux-user-properly-test-for-infini.patch
+Patch0020:      0020-roms-Makefile-pass-a-packaging-time.patch
+Patch0021:      0021-Raise-soft-address-space-limit-to-h.patch
+Patch0022:      0022-increase-x86_64-physical-bits-to-42.patch
+Patch0023:      0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+Patch0024:      0024-i8254-Fix-migration-from-SLE11-SP2.patch
+Patch0025:      0025-acpi_piix4-Fix-migration-from-SLE11.patch
+Patch0026:      0026-Fix-tigervnc-long-press-issue.patch
+Patch0027:      0027-string-input-visitor-Fix-uint64-par.patch
+Patch0028:      0028-test-string-input-visitor-Add-int-t.patch
+Patch0029:      0029-test-string-input-visitor-Add-uint6.patch
+Patch0030:      0030-tests-Add-QOM-property-unit-tests.patch
+Patch0031:      0031-tests-Add-scsi-disk-test.patch
+Patch0032:      0032-scripts-avoid-usr-bin-python-refere.patch
+Patch0033:      0033-Switch-order-of-libraries-for-mpath.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 Source400:      update_git.sh
@@ -78,50 +68,26 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-%if 0%{?suse_version} >= 1140
 BuildRequires:  glib2-devel-static
-%else
-BuildRequires:  glib2-devel
-%endif
-%if 0%{?suse_version} >= 1210
 BuildRequires:  glibc-devel-static
-%endif
-%if 0%{?suse_version} >= 1210
 BuildRequires:  libattr-devel-static
-%else
-BuildRequires:  libattr-devel
-%endif
-%if 0%{?suse_version} > 1220
 BuildRequires:  makeinfo
-%endif
-%if 0%{?suse_version} >= 1220
 BuildRequires:  pcre-devel-static
-%endif
 BuildRequires:  python
-%if 0%{?suse_version} >= 1120
 BuildRequires:  zlib-devel-static
-%else
-BuildRequires:  zlib-devel
-%endif
 # we must not install the qemu-linux-user package when under QEMU build
 %if 0%{?qemu_user_space_build:1}
 #!BuildIgnore:  post-build-checks
 %endif
-Provides:       qemu:%_bindir/qemu-arm
 
 %description
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains statically linked binaries for running linux-user
-emulations. This can be used together with the OBS build script to
-run cross-architecture builds.
+QEMU provides CPU emulation along with other related capabilities. This package
+provides programs to run user space binaries and libraries meant for another
+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.10.1
+%setup -q -n qemu-2.11.0
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -155,16 +121,6 @@ run cross-architecture builds.
 %patch0031 -p1
 %patch0032 -p1
 %patch0033 -p1
-%patch0034 -p1
-%patch0035 -p1
-%patch0036 -p1
-%patch0037 -p1
-%patch0038 -p1
-%patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
 
 %build
 ./configure \
@@ -189,6 +145,7 @@ run cross-architecture builds.
 	--disable-brlapi \
 	--disable-bzip2 \
 	--disable-cap-ng \
+	--disable-capstone \
 	--enable-coroutine-pool \
 	--disable-curl \
 	--disable-curses \
@@ -203,11 +160,11 @@ run cross-architecture builds.
 	--disable-libiscsi \
 	--disable-linux-aio \
 	--disable-lzo \
+	--disable-mpath \
 	--disable-netmap \
 	--disable-nettle \
 	--disable-numa \
 	--disable-opengl \
-	--without-pixman \
 	--disable-rbd \
 	--disable-rdma \
 	--disable-replication \
@@ -233,10 +190,6 @@ run cross-architecture builds.
 	--disable-xen-pv-domain-build \
 	--disable-xfsctl \
 
-%if 0%{?suse_version} == 1140
-# -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime
-sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak
-%endif
 make %{?_smp_mflags} V=1
 
 %ifarch %ix86
@@ -265,11 +218,9 @@ make %{?_smp_mflags} V=1
 %endif
 
 %ifarch %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le s390x
-%if 0%{?suse_version} >= 1310
 %check
 %{qemu_arch}-linux-user/qemu-%{qemu_arch} %_bindir/ls > /dev/null
 %endif
-%endif
 
 %install
 make install DESTDIR=%{buildroot}
@@ -278,10 +229,6 @@ 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
-%ifnarch %ix86 x86_64
-ln -sf ../../../emul/ia32-linux %{buildroot}%_datadir/qemu/qemu-i386
-%endif
-mkdir -p %{buildroot}/emul/ia32-linux
 %fdupes -s %{buildroot}
 
 %clean
@@ -289,6 +236,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root)
+%doc COPYING COPYING.LIB COPYING.PYTHON Changelog README VERSION LICENSE
 %_bindir/qemu-aarch64
 %_bindir/qemu-alpha
 %_bindir/qemu-arm
@@ -321,10 +269,5 @@ rm -rf %{buildroot}
 %_bindir/qemu-x86_64
 %_bindir/qemu-*-binfmt
 %_sbindir/qemu-binfmt-conf.sh
-%ifnarch %ix86 x86_64
-%dir /emul/ia32-linux
-%dir %_datadir/qemu
-%_datadir/qemu/qemu-i386
-%endif
 
 %changelog

qemu-linux-user.spec.in

@@ -18,12 +18,12 @@
 
 Name:           qemu-linux-user
 Url:            http://www.qemu.org/
-Summary:        Universal CPU emulator
+Summary:        CPU emulator for user space
 License:        BSD-3-Clause AND GPL-2.0 AND GPL-2.0+ AND LGPL-2.1+ AND MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         qemu-2.10.1.tar.xz
+Source:         qemu-2.11.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
@@ -36,50 +36,26 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-%if 0%{?suse_version} >= 1140
 BuildRequires:  glib2-devel-static
-%else
-BuildRequires:  glib2-devel
-%endif
-%if 0%{?suse_version} >= 1210
 BuildRequires:  glibc-devel-static
-%endif
-%if 0%{?suse_version} >= 1210
 BuildRequires:  libattr-devel-static
-%else
-BuildRequires:  libattr-devel
-%endif
-%if 0%{?suse_version} > 1220
 BuildRequires:  makeinfo
-%endif
-%if 0%{?suse_version} >= 1220
 BuildRequires:  pcre-devel-static
-%endif
 BuildRequires:  python
-%if 0%{?suse_version} >= 1120
 BuildRequires:  zlib-devel-static
-%else
-BuildRequires:  zlib-devel
-%endif
 # we must not install the qemu-linux-user package when under QEMU build
 %if 0%{?qemu_user_space_build:1}
 #!BuildIgnore:  post-build-checks
 %endif
-Provides:       qemu:%_bindir/qemu-arm
 
 %description
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains statically linked binaries for running linux-user
-emulations. This can be used together with the OBS build script to
-run cross-architecture builds.
+QEMU provides CPU emulation along with other related capabilities. This package
+provides programs to run user space binaries and libraries meant for another
+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.10.1
+%setup -q -n qemu-2.11.0
 PATCH_EXEC
 
 %build
@@ -105,6 +81,7 @@ PATCH_EXEC
 	--disable-brlapi \
 	--disable-bzip2 \
 	--disable-cap-ng \
+	--disable-capstone \
 	--enable-coroutine-pool \
 	--disable-curl \
 	--disable-curses \
@@ -119,11 +96,11 @@ PATCH_EXEC
 	--disable-libiscsi \
 	--disable-linux-aio \
 	--disable-lzo \
+	--disable-mpath \
 	--disable-netmap \
 	--disable-nettle \
 	--disable-numa \
 	--disable-opengl \
-	--without-pixman \
 	--disable-rbd \
 	--disable-rdma \
 	--disable-replication \
@@ -149,10 +126,6 @@ PATCH_EXEC
 	--disable-xen-pv-domain-build \
 	--disable-xfsctl \
 
-%if 0%{?suse_version} == 1140
-# -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime
-sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak
-%endif
 make %{?_smp_mflags} V=1
 
 %ifarch %ix86
@@ -181,11 +154,9 @@ make %{?_smp_mflags} V=1
 %endif
 
 %ifarch %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le s390x
-%if 0%{?suse_version} >= 1310
 %check
 %{qemu_arch}-linux-user/qemu-%{qemu_arch} %_bindir/ls > /dev/null
 %endif
-%endif
 
 %install
 make install DESTDIR=%{buildroot}
@@ -194,10 +165,6 @@ 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
-%ifnarch %ix86 x86_64
-ln -sf ../../../emul/ia32-linux %{buildroot}%_datadir/qemu/qemu-i386
-%endif
-mkdir -p %{buildroot}/emul/ia32-linux
 %fdupes -s %{buildroot}
 
 %clean
@@ -205,6 +172,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root)
+%doc COPYING COPYING.LIB COPYING.PYTHON Changelog README VERSION LICENSE
 %_bindir/qemu-aarch64
 %_bindir/qemu-alpha
 %_bindir/qemu-arm
@@ -237,10 +205,5 @@ rm -rf %{buildroot}
 %_bindir/qemu-x86_64
 %_bindir/qemu-*-binfmt
 %_sbindir/qemu-binfmt-conf.sh
-%ifnarch %ix86 x86_64
-%dir /emul/ia32-linux
-%dir %_datadir/qemu
-%_datadir/qemu/qemu-i386
-%endif
 
 %changelog

qemu-rpmlintrc

@@ -2,4 +2,4 @@
 from Config import *
 
 addFilter("arch-dependent-file-in-usr-share")
-
+addFilter("summary-not-capitalized")

qemu-testsuite.changes

@@ -1,3 +1,93 @@
+-------------------------------------------------------------------
+Wed Dec 13 20:56:09 UTC 2017 - brogers@suse.com
+
+- Update to v2.11.0: See http://wiki.qemu.org/ChangeLog/2.11
+  Some noteworthy changes:
+  -nodefconfig is now deprecated
+  legacy pci-assignment code removed
+  qemu-pr-helper added for handling guest persistant reservations (bsc#891066,
+  bsc#910704, bsc#943807)
+  qemu-keymap tool added for generating keymap files
+  throttle block filter driver added
+  support for a TPM emulator
+  qcow2 image shrink support
+  better support for >=64 vcpus for Windows guests
+  nested KVM related improvements
+  s390 pgste handling now done better
+  EPYC cpu model added (bsc#1052825)
+  improvements in qcow2 buffer handling
+  vhost-user resume issue fixed
+  migration hardening
+  ARMv8-M security extension support
+  more seccomp/sandboxing options available
+  s390 cpu hot-plug improvements
+  misc. virtfs improvements
+  nbd improvements
+  MTTCG improvements
+  misc. TCG improvements
+  scsi correctness improvements
+  SEABIOS now has serial output option
+* Includes fixes for CVE-2017-15118 bsc#1070147, CVE-2017-15119 bsc#1070144
+* Adds KASLR support (fate#323473, bsc#1070281)
+* Update SLE support docs to match this release
+* simplify spec file to expect at least sle_version >= 1315
+* Patches dropped (upstream):
+  0013-console-add-question-mark-escape-op.patch
+  0020-configure-Fix-detection-of-seccomp-.patch
+  0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+  0035-chardev-baum-fix-baum-that-releases.patch
+  0036-io-fix-temp-directory-used-by-test-.patch
+  0037-io-fix-check-for-handshake-completi.patch
+  0038-crypto-fix-test-cert-generation-to-.patch
+  0039-vhost-user-disable-the-broken-subpr.patch
+  0040-io-monitor-encoutput-buffer-size-fr.patch
+  0041-cirrus-fix-oob-access-in-mode4and5-.patch
+  0042-9pfs-use-g_malloc0-to-allocate-spac.patch
+* Patches renamed:
+  0014-Make-char-muxer-more-robust-wrt-sma.patch
+  -> 0013-Make-char-muxer-more-robust-wrt-sma.patch
+  0015-linux-user-lseek-explicitly-cast-no.patch
+  -> 0014-linux-user-lseek-explicitly-cast-no.patch
+  0016-AIO-Reduce-number-of-threads-for-32.patch
+  -> 0015-AIO-Reduce-number-of-threads-for-32.patch
+  0017-xen_disk-Add-suse-specific-flush-di.patch
+  -> 0016-xen_disk-Add-suse-specific-flush-di.patch
+  0018-qemu-bridge-helper-reduce-security-.patch
+  -> 0017-qemu-bridge-helper-reduce-security-.patch
+  0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  -> 0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  0021-linux-user-properly-test-for-infini.patch
+  -> 0019-linux-user-properly-test-for-infini.patch
+  0022-roms-Makefile-pass-a-packaging-time.patch
+  -> 0020-roms-Makefile-pass-a-packaging-time.patch
+  0023-Raise-soft-address-space-limit-to-h.patch
+  -> 0021-Raise-soft-address-space-limit-to-h.patch
+  0024-increase-x86_64-physical-bits-to-42.patch
+  -> 0022-increase-x86_64-physical-bits-to-42.patch
+  0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  -> 0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  0026-i8254-Fix-migration-from-SLE11-SP2.patch
+  -> 0024-i8254-Fix-migration-from-SLE11-SP2.patch
+  0027-acpi_piix4-Fix-migration-from-SLE11.patch
+  -> 0025-acpi_piix4-Fix-migration-from-SLE11.patch
+  0028-Fix-tigervnc-long-press-issue.patch
+  -> 0026-Fix-tigervnc-long-press-issue.patch
+  0029-string-input-visitor-Fix-uint64-par.patch
+  -> 0027-string-input-visitor-Fix-uint64-par.patch
+  0030-test-string-input-visitor-Add-int-t.patch
+  -> 0028-test-string-input-visitor-Add-int-t.patch
+  0031-test-string-input-visitor-Add-uint6.patch
+  -> 0029-test-string-input-visitor-Add-uint6.patch
+  0032-tests-Add-QOM-property-unit-tests.patch
+  -> 0030-tests-Add-QOM-property-unit-tests.patch
+  0033-tests-Add-scsi-disk-test.patch
+  -> 0031-tests-Add-scsi-disk-test.patch
+  0043-scripts-avoid-usr-bin-python-refere.patch
+  -> 0032-scripts-avoid-usr-bin-python-refere.patch
+* We need the multipath libraries link order switched
+  0033-Switch-order-of-libraries-for-mpath.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11
+
 -------------------------------------------------------------------
 Wed Nov 29 17:31:26 UTC 2017 - brogers@suse.com
 

qemu.changes

@@ -1,3 +1,93 @@
+-------------------------------------------------------------------
+Wed Dec 13 20:56:09 UTC 2017 - brogers@suse.com
+
+- Update to v2.11.0: See http://wiki.qemu.org/ChangeLog/2.11
+  Some noteworthy changes:
+  -nodefconfig is now deprecated
+  legacy pci-assignment code removed
+  qemu-pr-helper added for handling guest persistant reservations (bsc#891066,
+  bsc#910704, bsc#943807)
+  qemu-keymap tool added for generating keymap files
+  throttle block filter driver added
+  support for a TPM emulator
+  qcow2 image shrink support
+  better support for >=64 vcpus for Windows guests
+  nested KVM related improvements
+  s390 pgste handling now done better
+  EPYC cpu model added (bsc#1052825)
+  improvements in qcow2 buffer handling
+  vhost-user resume issue fixed
+  migration hardening
+  ARMv8-M security extension support
+  more seccomp/sandboxing options available
+  s390 cpu hot-plug improvements
+  misc. virtfs improvements
+  nbd improvements
+  MTTCG improvements
+  misc. TCG improvements
+  scsi correctness improvements
+  SEABIOS now has serial output option
+* Includes fixes for CVE-2017-15118 bsc#1070147, CVE-2017-15119 bsc#1070144
+* Adds KASLR support (fate#323473, bsc#1070281)
+* Update SLE support docs to match this release
+* simplify spec file to expect at least sle_version >= 1315
+* Patches dropped (upstream):
+  0013-console-add-question-mark-escape-op.patch
+  0020-configure-Fix-detection-of-seccomp-.patch
+  0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+  0035-chardev-baum-fix-baum-that-releases.patch
+  0036-io-fix-temp-directory-used-by-test-.patch
+  0037-io-fix-check-for-handshake-completi.patch
+  0038-crypto-fix-test-cert-generation-to-.patch
+  0039-vhost-user-disable-the-broken-subpr.patch
+  0040-io-monitor-encoutput-buffer-size-fr.patch
+  0041-cirrus-fix-oob-access-in-mode4and5-.patch
+  0042-9pfs-use-g_malloc0-to-allocate-spac.patch
+* Patches renamed:
+  0014-Make-char-muxer-more-robust-wrt-sma.patch
+  -> 0013-Make-char-muxer-more-robust-wrt-sma.patch
+  0015-linux-user-lseek-explicitly-cast-no.patch
+  -> 0014-linux-user-lseek-explicitly-cast-no.patch
+  0016-AIO-Reduce-number-of-threads-for-32.patch
+  -> 0015-AIO-Reduce-number-of-threads-for-32.patch
+  0017-xen_disk-Add-suse-specific-flush-di.patch
+  -> 0016-xen_disk-Add-suse-specific-flush-di.patch
+  0018-qemu-bridge-helper-reduce-security-.patch
+  -> 0017-qemu-bridge-helper-reduce-security-.patch
+  0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  -> 0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch
+  0021-linux-user-properly-test-for-infini.patch
+  -> 0019-linux-user-properly-test-for-infini.patch
+  0022-roms-Makefile-pass-a-packaging-time.patch
+  -> 0020-roms-Makefile-pass-a-packaging-time.patch
+  0023-Raise-soft-address-space-limit-to-h.patch
+  -> 0021-Raise-soft-address-space-limit-to-h.patch
+  0024-increase-x86_64-physical-bits-to-42.patch
+  -> 0022-increase-x86_64-physical-bits-to-42.patch
+  0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  -> 0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch
+  0026-i8254-Fix-migration-from-SLE11-SP2.patch
+  -> 0024-i8254-Fix-migration-from-SLE11-SP2.patch
+  0027-acpi_piix4-Fix-migration-from-SLE11.patch
+  -> 0025-acpi_piix4-Fix-migration-from-SLE11.patch
+  0028-Fix-tigervnc-long-press-issue.patch
+  -> 0026-Fix-tigervnc-long-press-issue.patch
+  0029-string-input-visitor-Fix-uint64-par.patch
+  -> 0027-string-input-visitor-Fix-uint64-par.patch
+  0030-test-string-input-visitor-Add-int-t.patch
+  -> 0028-test-string-input-visitor-Add-int-t.patch
+  0031-test-string-input-visitor-Add-uint6.patch
+  -> 0029-test-string-input-visitor-Add-uint6.patch
+  0032-tests-Add-QOM-property-unit-tests.patch
+  -> 0030-tests-Add-QOM-property-unit-tests.patch
+  0033-tests-Add-scsi-disk-test.patch
+  -> 0031-tests-Add-scsi-disk-test.patch
+  0043-scripts-avoid-usr-bin-python-refere.patch
+  -> 0032-scripts-avoid-usr-bin-python-refere.patch
+* We need the multipath libraries link order switched
+  0033-Switch-order-of-libraries-for-mpath.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11
+
 -------------------------------------------------------------------
 Wed Nov 29 17:31:26 UTC 2017 - brogers@suse.com
 

qemu.spec.in

@@ -16,8 +16,6 @@
 #
 
 
-%define noarch_supported 1110
-
 %define build_x86_firmware_from_source 0
 %define build_skiboot_from_source 0
 %define build_slof_from_source 0
@@ -58,10 +56,6 @@
 %define legacy_qemu_kvm 1
 %endif
 
-%if 0%{?suse_version} >= 1210
-%define with_systemd 1
-%endif
-
 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} )
 %define with_glusterfs 1
 %endif
@@ -104,14 +98,6 @@
 %define with_seccomp 1
 %endif
 
-%if 0%{?suse_version} >= 1140
-%define with_spice 1
-%else
-%ifarch %ix86 x86_64
-%define with_spice 1
-%endif
-%endif
-
 %if 0%( pkg-config --exists 'udev > 190' && echo '1' ) == 01
 %define _udevrulesdir /usr/lib/udev/rules.d
 %else
@@ -120,29 +106,28 @@
 
 Name:           qemu
 Url:            http://www.qemu.org/
-Summary:        Universal CPU emulator
+Summary:        Machine emulator and virtualizer
 License:        BSD-3-Clause AND GPL-2.0 AND GPL-2.0+ AND LGPL-2.1+ AND MIT
-Group:          System/Emulators/PC
+Group:          System/Emulators/PC/
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.10.1.tar.xz
-Source99:       http://wiki.qemu.org/download/qemu-2.10.1.tar.xz.sig
+Source:         http://wiki.qemu.org/download/qemu-2.11.0.tar.xz
+Source99:       http://wiki.qemu.org/download/qemu-2.11.0.tar.xz.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
-Source4:        qemu-kvm.1.gz
-Source5:        60-kvm.rules
+Source4:        kvm_stat.1.gz
+Source5:        qemu-kvm.1.gz
 Source6:        ksm.service
-Source7:        60-kvm.x86.rules
+Source7:        qemu-ga.service
 Source8:        80-qemu-ga.rules
-Source9:        qemu-ga.service
+Source9:        qemu-supportconfig
 Source10:       kvm.conf
-Source11:       kvm_stat.1.gz
+Source11:       bridge.conf
 Source12:       supported.x86.txt
 Source13:       supported.s390.txt
 Source14:       supported.arm.txt
 Source15:       supported.ppc.txt
-Source16:       qemu-supportconfig
 # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
@@ -170,7 +155,6 @@ Patch1402:      skiboot-build-LDFLAGS-pass-pie-flag-explicitly-to-ld.patch
 # this is to make lint happy
 Source300:      qemu-rpmlintrc
 Source301:      ipxe-stub-out-the-SAN-req-s-in-int13.patch
-Source302:      bridge.conf
 Source400:      update_git.sh
 ExcludeArch:    s390
 %if "%{name}" == "qemu-testsuite"
@@ -178,6 +162,7 @@ ExcludeArch:    s390x
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  gcc-PIE
+BuildRequires:  Mesa-devel
 %if 0%{?is_opensuse}
 BuildRequires:  SDL-devel
 %if 0%{?suse_version} >= 1320
@@ -189,9 +174,7 @@ BuildRequires:  alsa-devel
 BuildRequires:  binutils-devel
 %endif
 BuildRequires:  bluez-devel
-%if 0%{?suse_version} >= 1130
 BuildRequires:  brlapi-devel
-%endif
 BuildRequires:  curl-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  e2fsprogs-devel
@@ -206,12 +189,7 @@ BuildRequires:  glib2-devel
 %if 0%{?with_glusterfs}
 BuildRequires:  glusterfs-devel
 %endif
-%if 0%{?suse_version} >= 1220
 BuildRequires:  gtk3-devel
-%else
-BuildRequires:  gtk2-devel
-%endif
-BuildRequires:  libaio
 BuildRequires:  libaio-devel
 BuildRequires:  libattr-devel
 BuildRequires:  libbz2-devel
@@ -224,14 +202,11 @@ BuildRequires:  libdrm-devel
 %if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
 BuildRequires:  libepoxy-devel
 %endif
-%if 0%{?suse_version} >= 1310
-# 12.3 and earlier don't ship a compatible libfdt; use the bundled one there
 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120200 )
 BuildRequires:  libfdt-devel
 %else
 BuildRequires:  libfdt1-devel
 %endif
-%endif
 BuildRequires:  libgbm-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgnutls-devel
@@ -246,9 +221,6 @@ BuildRequires:  ceph-devel
 BuildRequires:  libiscsi-devel
 %endif
 BuildRequires:  libjpeg-devel
-%if 0%{?suse_version} >= 1310
-BuildRequires:  libnettle-devel
-%endif
 %ifarch %ix86 x86_64
 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
 BuildRequires:  libnuma-devel
@@ -271,25 +243,22 @@ BuildRequires:  libpulse-devel
 %if 0%{?with_seccomp}
 BuildRequires:  libseccomp-devel
 %endif
-%if 0%{?with_spice}
 BuildRequires:  libspice-server-devel
-%endif
-%if 0%{?suse_version} > 1140
 BuildRequires:  libssh2-devel
-%endif
-%if 0%{?suse_version} > 1310
+BuildRequires:  libudev-devel
 BuildRequires:  libusb-1_0-devel
-%endif
 %if 0%{?suse_version} > 1320
 BuildRequires:  libvdeplug-devel
 %else
 BuildRequires:  libvdeplug3-devel
 %endif
+BuildRequires:  libxkbcommon-devel
 BuildRequires:  lzo-devel
-%if 0%{?suse_version} > 1220
 BuildRequires:  makeinfo
+%if 0%{?suse_version} > 1320
+BuildRequires:  multipath-tools
+BuildRequires:  multipath-tools-devel
 %endif
-BuildRequires:  Mesa-devel
 BuildRequires:  ncurses-devel
 %if %{build_x86_firmware_from_source}
 BuildRequires:  ovmf-tools
@@ -300,16 +269,10 @@ BuildRequires:  python
 %if 0%{?suse_version} >= 1315
 BuildRequires:  rdma-core-devel
 %endif
-%if 0%{?suse_version} >= 1310
 BuildRequires:  snappy-devel
-%endif
-%if 0%{?with_spice}
 BuildRequires:  spice-protocol-devel
-%endif
-%if 0%{?with_systemd}
 BuildRequires:  systemd
 %{?systemd_requires}
-%endif
 %if %{kvm_available}
 BuildRequires:  pkgconfig(udev)
 %endif
@@ -317,13 +280,7 @@ BuildRequires:  usbredir-devel
 %if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
 BuildRequires:  virglrenderer-devel >= 0.4.1
 %endif
-%if 0%{?suse_version} >= 1210
-%if 0%{?suse_version} >= 1220
 BuildRequires:  vte-devel
-%else
-BuildRequires:  vte2-devel
-%endif
-%endif
 %ifarch x86_64
 BuildRequires:  xen-devel
 %endif
@@ -352,10 +309,8 @@ BuildRequires:  qemu-block-iscsi = %version
 %if 0%{?with_rbd}
 BuildRequires:  qemu-block-rbd = %version
 %endif
-%if 0%{?suse_version} > 1140
 BuildRequires:  qemu-block-ssh = %version
 %endif
-%endif
 Requires(pre):  shadow
 Requires(post): coreutils
 %if %{kvm_available}
@@ -398,12 +353,10 @@ Suggests:       qemu-block-iscsi
 %if 0%{?with_rbd}
 Suggests:       qemu-block-rbd
 %endif
-%if 0%{?suse_version} > 1140
 Suggests:       qemu-block-ssh
-%endif
 Suggests:       qemu-extra
 Suggests:       qemu-lang
-%if 0%{?with_systemd} && 0%{?is_opensuse}
+%if 0%{?is_opensuse}
 Recommends:     qemu-ksm = %{version}
 %endif
 
@@ -460,16 +413,18 @@ efi-vmxnet3.rom}
 %{?x86_64_only_default_built_firmware} %{?x86_64_only_extra_built_firmware} }
 
 %description
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
+QEMU provides full machine emulation and cross architecture usage. It closely
+integrates with KVM and Xen virtualization, allowing for excellent performance.
+Many options are available for defining the emulated environment, including 
+traditional devices, direct host device access, and interfaces specific to
+virtualization.
+
+This package acts as an umbrella package to the other QEMU sub-packages.
 
 %if "%{name}" != "qemu-testsuite"
 
 %package x86
-Summary:        Universal CPU emulator -- x86
+Summary:        Machine emulator and virtualizer for x86 architectures
 Group:          System/Emulators/PC
 Requires:       qemu = %version
 Requires:       qemu-ipxe
@@ -480,46 +435,46 @@ Recommends:     ovmf
 Recommends:     qemu-ovmf-x86_64
 
 %description x86
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
+QEMU provides full machine emulation and cross architecture usage. It closely
+integrates with KVM and Xen virtualization, allowing for excellent performance.
+Many options are available for defining the emulated environment, including 
+traditional devices, direct host device access, and interfaces specific to
+virtualization.
 
-This sub-package provides i386 and x86_64 emulation.
+This package provides i386 and x86_64 emulation.
 
 %package ppc
-Summary:        Universal CPU emulator -- Power Architecture
+Summary:        Machine emulator and virtualizer for Power architectures
 Group:          System/Emulators/PC
 Requires:       qemu = %version
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
 
 %description ppc
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
+QEMU provides full machine emulation and cross architecture usage. It closely
+integrates with KVM and Xen virtualization, allowing for excellent performance.
+Many options are available for defining the emulated environment, including 
+traditional devices, direct host device access, and interfaces specific to
+virtualization.
 
-This sub-package provides ppc and ppc64 emulation.
+This package provides ppc and ppc64 emulation.
 
 %package s390
-Summary:        Universal CPU emulator -- S/390
+Summary:        Machine emulator and virtualizer for S/390 architectures
 Group:          System/Emulators/PC
 Requires:       qemu = %version
 
 %description s390
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
+QEMU provides full machine emulation and cross architecture usage. It closely
+integrates with KVM and Xen virtualization, allowing for excellent performance.
+Many options are available for defining the emulated environment, including 
+traditional devices, direct host device access, and interfaces specific to
+virtualization.
 
-This sub-package provides s390x emulation.
+This package provides s390x emulation.
 
 %package arm
-Summary:        Universal CPU emulator -- ARM
+Summary:        Machine emulator and virtualizer for ARM architectures
 Group:          System/Emulators/PC
 Requires:       qemu = %version
 Recommends:     qemu-ipxe
@@ -528,34 +483,36 @@ Recommends:     ovmf
 Recommends:     qemu-uefi-aarch64
 
 %description arm
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
+QEMU provides full machine emulation and cross architecture usage. It closely
+integrates with KVM and Xen virtualization, allowing for excellent performance.
+Many options are available for defining the emulated environment, including 
+traditional devices, direct host device access, and interfaces specific to
+virtualization.
 
-This sub-package provides arm emulation.
+This package provides arm emulation.
 
 %package extra
-Summary:        Universal CPU emulator -- extra architectures
+Summary:        Machine emulator and virtualizer for "extra" architectures
 Group:          System/Emulators/PC
 Requires:       qemu = %version
 Recommends:     qemu-ipxe
 Recommends:     qemu-vgabios
 
 %description extra
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
+QEMU provides full machine emulation and cross architecture usage. It closely
+integrates with KVM and Xen virtualization, allowing for excellent performance.
+Many options are available for defining the emulated environment, including 
+traditional devices, direct host device access, and interfaces specific to
+virtualization.
 
-This sub-package provides some lesser used emulations, such as moxie and xtensa.
+This package provides some lesser used emulations, including alpha, m68k,
+mips, moxie, sparc, and xtensa. (The term "extra" is juxtapositioned against
+more popular QEMU packages which are dedicated to a single architecture.)
 
 %if %{legacy_qemu_kvm}
 %package kvm
 Url:            http://www.linux-kvm.org
-Summary:        Kernel-based Virtual Machine
+Summary:        Wrapper to enable KVM acceleration under QEMU
 Group:          System/Emulators/PC
 %ifarch %ix86 x86_64
 Requires:       qemu-x86 = %version
@@ -567,26 +524,26 @@ Provides:       kvm = %version
 Obsoletes:      kvm < %version
 
 %description kvm
-KVM (Kernel-based Virtual Machine) is virtualization software for Linux.
-It is designed to leverage the hardware virtualization features included
-with various architectures. QEMU uses KVM for CPU virtualization, while
-still providing emulation of other system components. This package is
-not required for KVM usage, but rather facilitates its usage with tools
-derived from the legacy kvm package.
+QEMU provides full machine emulation and cross architecture usage. It closely
+integrates with KVM and Xen virtualization, allowing for excellent performance.
+Many options are available for defining the emulated environment, including 
+traditional devices, direct host device access, and interfaces specific to
+virtualization.
+
+This package simply provides a shell script wrapper for the QEMU program which
+does the actual machine emulation and virtualization for this architecture. The
+wrapper simply adds command-line parameters to ensure that the KVM accelerator
+is invoked. It provides no additional benefit, and is considered deprecated.
 %endif
 
 %package lang
-Summary:        Universal CPU emulator -- Translations
+Summary:        Translations for QEMU
 Group:          System/Emulators/PC
 
 %description lang
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains translations.
+This package contains a few language translations, particularly for the
+graphical user interface components that come with QEMU. The bulk of strings
+in QEMU are not localized.
 
 # Modules need to match {qemu-system-*,qemu-img} version.
 # We cannot have qemu and qemu-tools require them in the right version,
@@ -600,106 +557,67 @@ Conflicts:      qemu-tools < %version-%release \
 Conflicts:      qemu-tools > %version-%release
 
 %package block-curl
-Summary:        Universal CPU emulator -- cURL block support
+Summary:        cURL block support for QEMU
 Group:          System/Emulators/PC
 Provides:       qemu:%_libdir/%name/block-curl.so
 %{qemu_module_conflicts}
 
 %description block-curl
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains a module for accessing network-based image files
-over a network connection from qemu-img tool and QEMU system emulation.
+This package contains a module for accessing network-based image files over
+a network connection from qemu-img tool and QEMU system emulation.
 
 %package block-dmg
-Summary:        Universal CPU emulator -- DMG block support
+Summary:        DMG block support for QEMU
 Group:          System/Emulators/PC
 %{qemu_module_conflicts}
 
 %description block-dmg
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains a module for accessing Mac OS X image files
-from qemu-img tool and QEMU system emulation.
+This package contains a module for accessing Mac OS X image files from
+qemu-img tool and QEMU system emulation.
 
 %if 0%{?with_glusterfs}
 %package block-gluster
-Summary:        Universal CPU emulator -- GlusterFS block support
+Summary:        GlusterFS block support for QEMU
 Group:          System/Emulators/PC
 %{qemu_module_conflicts}
 
 %description block-gluster
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains a module for accessing network-based image files
-over a GlusterFS network connection from qemu-img tool and QEMU system emulation.
+This package contains a module for accessing network-based image files over a
+GlusterFS network connection from qemu-img tool and QEMU system emulation.
 %endif
 
 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
 %package block-iscsi
-Summary:        Universal CPU emulator -- iSCSI block support
+Summary:        iSCSI block support for QEMU
 Group:          System/Emulators/PC
 %{qemu_module_conflicts}
 
 %description block-iscsi
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains a module for accessing network-based image files
-over an iSCSI network connection from qemu-img tool and QEMU system emulation.
+This package contains a module for accessing network-based image files over an
+iSCSI network connection from qemu-img tool and QEMU system emulation.
 %endif
 
 %if 0%{?with_rbd}
 %package block-rbd
-Summary:        Universal CPU emulator -- Ceph (rbd) block support
+Summary:        Rados Block Device (Ceph) support for QEMU
 Group:          System/Emulators/PC
 %{qemu_module_conflicts}
 
 %description block-rbd
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains a module for accessing ceph (rbd,rados)
-image files.
+This package contains a module for accessing ceph (rbd,rados) image files.
 %endif
 
-%if 0%{?suse_version} > 1140
 %package block-ssh
-Summary:        Universal CPU emulator -- SSH block support
+Summary:        SSH (SFTP) block support for QEMU
 Group:          System/Emulators/PC
 %{qemu_module_conflicts}
 
 %description block-ssh
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains a module for accessing network-based image files
-over an SSH network connection from qemu-img tool and QEMU system emulation.
-%endif
+This package contains a module for accessing network-based image files over an
+SSH network connection from qemu-img tool and QEMU system emulation.
 
 %package tools
-Summary:        Universal CPU emulator -- Tools
+Summary:        Tools for QEMU
 Group:          System/Emulators/PC
 Provides:       qemu:%_libexecdir/qemu-bridge-helper
 Requires(pre):  permissions
@@ -710,57 +628,40 @@ Recommends:     qemu-block-rbd
 %endif
 
 %description tools
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains various tools, including a bridge helper,
-ivshmem, qemu disk tools and some scripts for different purposes.
+This package contains various QEMU related tools, including a bridge helper,
+a virtfs helper, ivshmem, disk utilities and scripts for various purposes.
 
 %package guest-agent
-Summary:        Universal CPU emulator -- Guest agent
+Summary:        Guest agent for QEMU
 Group:          System/Emulators/PC
 Provides:       qemu:%_bindir/qemu-ga
 Requires(pre):  shadow
 Requires(post): udev
-%if 0%{?with_systemd}
 %{?systemd_requires}
-%endif
 
 %description guest-agent
-QEMU is an extremely well-performing CPU emulator that allows you to
-choose between simulating an entire system and running userspace
-binaries for different architectures under your native operating
-system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
-as PC and PowerMac systems.
-
-This sub-package contains the guest agent.
+This package contains the QEMU guest agent. It is installed in the linux guest
+to provide information and control at the guest OS level.
 
 %ifarch %ix86 x86_64
 %package seabios
-Summary:        X86 BIOS for QEMU
+Summary:        x86 Legacy BIOS for QEMU
 Group:          System/Emulators/PC
 SEABIOS_VERSION
 Release:        0
-%if 0%{?suse_version} > %{noarch_supported}
 BuildArch:      noarch
-%endif
 Conflicts:      qemu < 1.6.0
 
 %description seabios
 SeaBIOS is an open source implementation of a 16bit x86 BIOS. SeaBIOS
-is the default BIOS for QEMU.
+is the default and legacy BIOS for QEMU.
 
 %package vgabios
 Summary:        VGA BIOSes for QEMU
 Group:          System/Emulators/PC
 SEABIOS_VERSION
 Release:        0
-%if 0%{?suse_version} > %{noarch_supported}
 BuildArch:      noarch
-%endif
 Conflicts:      qemu < 1.6.0
 
 %description vgabios
@@ -773,9 +674,7 @@ Summary:        Serial Graphics Adapter BIOS for QEMU
 Group:          System/Emulators/PC
 Version:        8
 Release:        0
-%if 0%{?suse_version} > %{noarch_supported}
 BuildArch:      noarch
-%endif
 Conflicts:      qemu < 1.6.0
 
 %description sgabios
@@ -788,24 +687,22 @@ Summary:        PXE ROMs for QEMU NICs
 Group:          System/Emulators/PC
 Version:        1.0.0
 Release:        0
-%if 0%{?suse_version} > %{noarch_supported}
 BuildArch:      noarch
-%endif
 Conflicts:      qemu < 1.6.0
 
 %description ipxe
-Preboot Execution Environment (PXE) ROM support for various emulated network
-adapters available with QEMU.
+Provides Preboot Execution Environment (PXE) ROM support for various emulated
+network adapters available with QEMU.
 %endif
 
-%if 0%{?with_systemd} && 0%{?is_opensuse}
+%if 0%{?is_opensuse}
 %package ksm
 Summary:        Kernel Samepage Merging services
 Group:          System/Emulators/PC
 
 %description ksm
-Kernel Samepage Merging (KSM) is a memory-saving de-duplication feature,
-that merges anonymous (private) pages (not pagecache ones).
+Kernel Samepage Merging (KSM) is a memory-saving de-duplication feature, that
+merges anonymous (private) pages (not pagecache ones).
 
 This package provides a service file for starting and stopping KSM.
 %endif
@@ -813,7 +710,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.10.1
+%setup -q -n qemu-2.11.0
 PATCH_EXEC
 
 pushd roms/ipxe
@@ -850,7 +747,8 @@ echo '%{version}' > roms/seabios/.version
 	--libdir=%_libdir \
 	--libexecdir=%_libexecdir \
 	--localstatedir=%_localstatedir \
-	--docdir=%_docdir/qemu \
+	--docdir=%_docdir/%name \
+	--firmwarepath=%_datadir/%name \
 	--extra-cflags="%{optflags}" \
 	--disable-stack-protector \
 	--disable-strip \
@@ -867,22 +765,16 @@ echo '%{version}' > roms/seabios/.version
 %endif
 	--enable-attr \
 	--enable-bluez \
-%if 0%{?suse_version} >= 1130
 	--enable-brlapi \
-%else
-	--disable-brlapi \
-%endif
 	--enable-bzip2 \
 	--enable-cap-ng \
+	--disable-capstone \
 	--enable-coroutine-pool \
+	--disable-crypto-afalg \
 	--enable-curl \
 	--enable-curses \
 	--enable-fdt \
-%if 0
-# Let it auto-detect these based on gnutls - uses libnettle in Tumbleweed but unavailable in SLE11
 	--enable-gcrypt \
-	--disable-nettle \
-%endif
 %if 0%{?with_glusterfs}
 	--enable-glusterfs \
 %else
@@ -890,11 +782,7 @@ echo '%{version}' > roms/seabios/.version
 %endif
 	--enable-gnutls \
 	--enable-gtk \
-%if 0%{?suse_version} >= 1220
 	--with-gtkabi=3.0 \
-%else
-	--with-gtkabi=2.0 \
-%endif
 	--disable-hax \
 	--disable-jemalloc \
 %if %{kvm_available}
@@ -908,19 +796,17 @@ echo '%{version}' > roms/seabios/.version
 	--disable-libiscsi \
 %endif
 	--disable-libnfs \
-%if 0%{?suse_version} > 1140
 	--enable-libssh2 \
-%else
-	--disable-libssh2 \
-%endif
-%if 0%{?suse_version} > 1310
 	--enable-libusb \
-%else
-	--disable-libusb \
-%endif
 	--enable-linux-aio \
 	--enable-lzo \
+%if 0%{?suse_version} > 1320
+	--enable-mpath \
+%else
+	--disable-mpath \
+%endif
 	--disable-netmap \
+	--disable-nettle \
 %ifarch %ix86 x86_64
 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
 	--enable-numa \
@@ -945,7 +831,6 @@ echo '%{version}' > roms/seabios/.version
 %if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
 	--enable-opengl \
 %endif
-	--with-system-pixman \
 %if 0%{?with_rbd}
 	--enable-rbd \
 %else
@@ -977,16 +862,8 @@ echo '%{version}' > roms/seabios/.version
 %else
 	--disable-smartcard \
 %endif
-%if 0%{?suse_version} >= 1310
 	--enable-snappy \
-%else
-	--disable-snappy \
-%endif
-%if 0%{?with_spice}
 	--enable-spice \
-%else
-	--disable-spice \
-%endif
 	--disable-tcmalloc \
 	--enable-tpm \
 	--enable-usb-redir \
@@ -1093,7 +970,7 @@ done
 %endif
 
 %if %{build_skiboot_from_source}
-make %{?_smp_mflags} -C roms skiboot SKIBOOT_VERSION=skiboot-5.3.7
+make %{?_smp_mflags} -C roms skiboot SKIBOOT_VERSION=skiboot-5.3.7 CROSS=
 %endif
 
 %if %{build_slof_from_source}
@@ -1122,11 +999,7 @@ touch -r config-host.mak pc-bios
 make tests/qom-test %{?_smp_mflags} V=1
 # Firmware
 # ... make comes in fresh and has lots of address space (needed for 32bit, bsc#957379)
-%if 0%{?suse_version} >= 1310
 make check-report.html V=1
-%else
-make check-report.xml V=1
-%endif
 
 %endif
 
@@ -1176,13 +1049,13 @@ for f in acpi-dsdt.aml %{x86_extra_built_firmware_list} \
 done
 %endif
 %find_lang %name
-install -D -m 644 %{SOURCE302} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
-install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
+install -D -m 0755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
-install -D -m 755 scripts/analyze-migration.py  %{buildroot}%{_bindir}/analyze-migration.py
-install -D -m 755 scripts/vmstate-static-checker.py  %{buildroot}%{_bindir}/vmstate-static-checker.py
+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 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
+install -D -m 0755 %{SOURCE9} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if 0%{?is_opensuse} == 0
 install -D -m 0644 %{SOURCE12} %{buildroot}%{_docdir}/qemu-x86/supported.txt
 install -D -m 0644 %{SOURCE13} %{buildroot}%{_docdir}/qemu-s390/supported.txt
@@ -1200,65 +1073,44 @@ exec %{_bindir}/qemu-system-x86_64 -machine accel=kvm "$@"
 %endif
 EOF
 chmod 755 %{buildroot}%{_bindir}/qemu-kvm
-install -D -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz
+%if 0%{?is_opensuse} == 0
+install -d %{buildroot}%{_docdir}/qemu-kvm
 %ifarch s390x
-mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d
-cat >  %{buildroot}%{_sysconfdir}/sysctl.d/50-allow-kvm-on-s390x.conf <<- 'EOF'
-	# To allow KVM to run on s390x, we need to set the sysctl below
-	vm.allocate_pgste = 1
-EOF
-chmod 644 %{buildroot}%{_sysconfdir}/sysctl.d/50-allow-kvm-on-s390x.conf
-%if 0%{?is_opensuse} == 0
-install -d %{buildroot}%{_docdir}/qemu-kvm
 ln -s ../qemu-s390/supported.txt %{buildroot}%{_docdir}/qemu-kvm/kvm-supported.txt
-%endif
 %else
-%if 0%{?is_opensuse} == 0
-install -d %{buildroot}%{_docdir}/qemu-kvm
 ln -s ../qemu-x86/supported.txt %{buildroot}%{_docdir}/qemu-kvm/kvm-supported.txt
 %endif
 %endif
 %endif
 %if %{kvm_available}
 %if 0%{?suse_version} <= 1320
-install -D -m 755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat
-install -D -m 644 %{SOURCE11} %{buildroot}%{_mandir}/man1/kvm_stat.1.gz
+install -D -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat
+install -D -m 0644 %{SOURCE4} %{buildroot}%{_mandir}/man1/kvm_stat.1.gz
 %endif
-%if 0%{?suse_version} >= 1230
-install -D -m 644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules
-%else
-%ifarch %ix86 x86_64
-install -D -m 644 %{SOURCE7} %{buildroot}%{_udevrulesdir}/60-kvm.rules
-%else
-install -D -m 644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-kvm.rules
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules
 %endif
-%endif
-%endif
-%if 0%{?with_systemd}
-install -D -p -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/qemu-ga.service
+install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/qemu-ga.service
 %if 0%{?is_opensuse}
 install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
 %endif
 %ifarch s390x
 install -D -m 0644 %{SOURCE10} %{buildroot}%{_libexecdir}/modules-load.d/kvm.conf
 %endif
-%endif
 %fdupes -s %{buildroot}
 
 %else # qemu-testsuite
 
-%if 0%{?suse_version} >= 1310
-install -D -m 644 check-report.html %{buildroot}%{_datadir}/qemu/check-report.html
-%endif
-install -D -m 644 check-report.xml %{buildroot}%{_datadir}/qemu/check-report.xml
+install -D -m 0644 check-report.html %{buildroot}%{_datadir}/qemu/check-report.html
+install -D -m 0644 check-report.xml %{buildroot}%{_datadir}/qemu/check-report.xml
 
 %endif
 
 %if "%{name}" != "qemu-testsuite"
 
 %pre
-%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm 2>/dev/null
-%{_bindir}/getent group qemu >/dev/null || %{_sbindir}/groupadd -r qemu 2>/dev/null
+%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm
+%{_bindir}/getent group qemu >/dev/null || %{_sbindir}/groupadd -r qemu
 %{_bindir}/getent passwd qemu >/dev/null || \
   %{_sbindir}/useradd -r -g qemu -G kvm -d / -s /sbin/nologin \
   -c "qemu user" qemu
@@ -1268,38 +1120,30 @@ install -D -m 644 check-report.xml %{buildroot}%{_datadir}/qemu/check-report.xml
 # Do not execute operations affecting host devices while running in a chroot
 if [ $(stat -L -c "%i" /proc/1/root/) = $(stat -L -c "%i" /) ]; then
   setfacl --remove-all /dev/kvm &> /dev/null || :
-%if 0%{?with_systemd}
 %ifarch s390x
   if [ -c /dev/kvm ]; then
-    %{_bindir}/chmod 666 /dev/kvm
+    %{_bindir}/chmod 0666 /dev/kvm
     %{_bindir}/chgrp kvm /dev/kvm
   fi
 %endif
   %udev_rules_update
   %_bindir/udevadm trigger -y kvm || :
-%else
-  /sbin/udevadm control --reload-rules  || :
-  /sbin/udevadm trigger -y kvm || :
-%endif
 %ifarch s390x
   sysctl vm.allocate_pgste=1 || :
 %endif
 fi
 %endif
 
-%if 0%{?suse_version} >= 1130
 %pre tools
-%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm 2>/dev/null
+%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm
 %post tools
 %set_permissions %_libexecdir/qemu-bridge-helper
 
 %verifyscript tools
 %verify_permissions %_libexecdir/qemu-bridge-helper
-%endif
 
 %pre guest-agent
-%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm 2>/dev/null
-%if 0%{?with_systemd}
+%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm
 %service_add_pre qemu-ga.service
 
 %preun guest-agent
@@ -1327,14 +1171,13 @@ fi
 %postun ksm
 %service_del_postun ksm.service
 %endif
-%endif
 
 %endif # !qemu-testsuite
 
 %files
 %defattr(-, root, root)
 %if "%{name}" != "qemu-testsuite"
-%doc COPYING COPYING.LIB Changelog README VERSION
+%doc COPYING COPYING.LIB COPYING.PYTHON Changelog README VERSION LICENSE
 %_docdir/%name/qemu-doc.txt
 %_docdir/%name/qemu-doc.html
 %_docdir/%name/qemu-qmp-ref.txt
@@ -1342,6 +1185,7 @@ fi
 %_docdir/%name/qemu-ga-ref.txt
 %_docdir/%name/qemu-ga-ref.html
 %_mandir/man1/qemu.1.gz
+%_mandir/man7/qemu-block-drivers.7.gz
 %_mandir/man7/qemu-qmp-ref.7.gz
 %_mandir/man7/qemu-ga-ref.7.gz
 %dir %_datadir/%name
@@ -1359,18 +1203,11 @@ fi
 %_bindir/kvm_stat
 %doc %_mandir/man1/kvm_stat.1.gz
 %endif
-%if 0%{?suse_version} >= 1230
 %{_udevrulesdir}/80-kvm.rules
-%else
-%{_udevrulesdir}/60-kvm.rules
-%endif
 %ifarch s390x
-%{_sysconfdir}/sysctl.d/50-allow-kvm-on-s390x.conf
-%if 0%{?with_systemd}
 %_libexecdir/modules-load.d/kvm.conf
 %endif
 %endif
-%endif
 
 %files x86
 %defattr(-, root, root)
@@ -1495,12 +1332,10 @@ fi
 %_libdir/%name/block-rbd.so
 %endif
 
-%if 0%{?suse_version} > 1140
 %files block-ssh
 %defattr(-, root, root)
 %dir %_libdir/%name
 %_libdir/%name/block-ssh.so
-%endif
 
 %files lang -f %name.lang
 %defattr(-, root, root)
@@ -1556,9 +1391,10 @@ fi
 %_bindir/ivshmem-server
 %_bindir/qemu-io
 %_bindir/qemu-img
+%_bindir/qemu-keymap
 %_bindir/qemu-nbd
+%_bindir/qemu-pr-helper
 %_bindir/virtfs-proxy-helper
-#%_bindir/vscclient
 %verify(not mode) %attr(4750,root,kvm) %_libexecdir/qemu-bridge-helper
 %dir %_sysconfdir/%name
 %config %_sysconfdir/%name/bridge.conf
@@ -1568,13 +1404,11 @@ fi
 %files guest-agent
 %defattr(-, root, root)
 %_mandir/man8/qemu-ga.8.gz
-%attr(755,root,kvm) %_bindir/qemu-ga
-%if 0%{?with_systemd}
+%attr(0755,root,kvm) %_bindir/qemu-ga
 %{_unitdir}/qemu-ga.service
-%endif
 %{_udevrulesdir}/80-qemu-ga.rules
 
-%if 0%{?with_systemd} && 0%{?is_opensuse}
+%if 0%{?is_opensuse}
 %files ksm
 %defattr(-, root, root)
 %{_unitdir}/ksm.service
@@ -1582,9 +1416,7 @@ fi
 
 %else # qemu-testsuite
 %_datadir/qemu/check-report.xml
-%if 0%{?suse_version} >= 1310
 %_datadir/qemu/check-report.html
 %endif
-%endif
 
 %changelog

supported.arm.txt

@@ -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 SLES15, which
-  allow boot options common to physical systems along with other features
+- QEMU is compatible with EDK based UEFI firmware available with SLES 15, 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.
 
@@ -166,12 +166,14 @@ Deprecated, Superseded, Modified and Dropped Features
 
 - These previously supported command line options are now considered deprecated:
   -device ivshmem (use ivshmem-doorbell or ivshmem-plain instead)
+  -nodefconfig (use -no-user-config instead)
 
 - These previously supported command line options are no longer supported:
-  -device pci-assign, -device kvm-pci-assign (use -device vfio-pci instead)
+  <previously mentioned items have been moved to another category>
 
 - These previously supported command line options are no longer recognized:
   -device pc-sysfw (no longer needed)
+  -device pci-assign, -device kvm-pci-assign (use -device vfio-pci instead)
   -display sdl
   -sdl
 
@@ -187,8 +189,8 @@ Deprecated, Superseded, Modified and Dropped Features
 - 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
-  supported and it is highly discouraged to continuing to use existing qed
-  images. They should instead be converted to another supported format.
+  supported and it is highly discouraged to continue using existing qed images.
+  They should instead be converted to another supported format.
 
 QEMU Command-Line and Monitor Syntax and Support
 ------------------------------------------------
@@ -208,8 +210,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.9
-  instead of virt-2.6) if possible. (note: there is no virt-2.9 machine type!)
+  This advice includes moving to the most recent machine type (eg virt-2.11
+  instead of virt-2.6) if possible.
 
 - The following command line options are supported:
   -accel ...
@@ -236,7 +238,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|vmcoreinfo|pcie-pci-bridge]
           (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 +263,8 @@ QEMU Command-Line and Monitor Syntax and Support
   -kernel ...
   -loadvm ...
   -m ...
-  -M [help|?|none|virt|virt-2.6]
-  -machine [help|?|none|virt|virt-2.6]
+  -M [help|?|none|virt|virt-2.6|virt-2.11]
+  -machine [help|?|none|virt|virt-2.6|virt-2.11]
   -mem-path ...
   -mem-prealloc
   -mon ...
@@ -350,6 +352,7 @@ QEMU Command-Line and Monitor Syntax and Support
   memsave ...
   migrate ...
   migrate_cancel
+  migrate_continue ...
   migrate_incoming
   migrate_set_cache_size ...
   migrate_set_capability ...
@@ -440,6 +443,7 @@ QEMU Command-Line and Monitor Syntax and Support
   memsave
   migrate
   migrate_cancel
+  migrate-continue
   migrate-incoming
   migrate-set-cache-size
   migrate-set-capabilities
@@ -480,6 +484,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-machines
   query-memdev
   query-memory-devices
+  query-memory-size-summary
   query-mice
   query-migrate
   query-migrate-cache-size
@@ -521,6 +526,7 @@ QEMU Command-Line and Monitor Syntax and Support
   trace-event-get-state
   trace-event-set-state
   transaction
+  watchdog-set-action
 
 -  The following command line options are unsupported:
   -acpitable ...
@@ -556,51 +562,51 @@ 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|kvm-pci-assign|l2x0|lan9118|lm8323|
-          loader|lsi53c810a|lsi53c895a|m25p05|m25p10|m25p128|m25p16|m25p20|
-          m25p32|m25p40|m25p64|m25p80|m25pe16|m25pe20|m25pe80|m25px32|
-          m25px32-s0|m25px32-s1|m25px64|m45pe10|m45pe16|m45pe80|mainstone-fpga|
-          max1110|max1111|max7310|musicpal_gpio|musicpal_key|musicpal_lcd|
-          musicpal-misc|mv88w8618_audio|mv88w8618_eth|mv88w8618_flashcfg|
-          mv88w8618_pic|mv88w8618_pit|mv88w8618_wlan|mx25l12805d|mx25l12855e|
-          mx25l1606e|mx25l2005a|mx25l25635e|mx25l25655e|mx25l3205d|mx25l4005a|
-          mx25l6405d|mx25l8005|n25q032|n25q032a11|n25q032a13|n25q064|n25q064a11|
-          n25q064a13|n25q128|n25q128a11|n25q128a13|n25q256a|n25q256a11|
-          n25q256a13|n25q512a|nand|ne2k_isa|nvdimm|omap2-gpio|omap2-intc|
-          omap-gpio|omap_i2c|omap-intc|onenand|pc-dimm|pc-testdev|piix3-ide|
-          piix3-ide|piix3-ide-xen|piix3-usb-uhci|pl011|pl011_luminary|pl022|
-          pl031|pl041|pl050_keyboard|pl050_mouse|pl061|pl061_luminary|pl080|
-          pl081|pl110|pl110_versatile|pl111|pl181|pl190|pl330|
-          platform-bus-device|pxa250-arm-cpu|pxa255-arm-cpu|pxa25x-timer|
-          pxa260-arm-cpu|pxa261-arm-cpu|pxa262-arm-cpu|pxa270-a0-arm-cpu|
-          pxa270-a1-arm-cpu|pxa270-arm-cpu|pxa270-b0-arm-cpu|pxa270-b1-arm-cpu|
-          pxa270-c0-arm-cpu|pxa270-c5-arm-cpu|pxa27x-timer|pxa2xx-dma|
-          pxa2xx-fir|pxa2xx-gpio|pxa2xx_i2c|pxa2xx-i2c-slave|pxa2xx-mmci|
-          pxa2xx-pcmcia|pxa2xx_pic|pxa2xx_rtc|pxa2xx-ssp|realview_gic|
-          realview_mpcore|realview_pci|realview_sysctl|s25fl016k|s25fl064k|
-          s25fl129p0|s25fl129p1|s25fl256s0|s25fl256s1|s25fl512s|s25sl004a|
-          s25sl008a|s25sl016a|s25sl032a|s25sl032p|s25sl064a|s25sl064p|
-          s25sl12800|s25sl12801|s70fl01gs|sa1100-arm-cpu|sa1110-arm-cpu|sb16|
-          scoop|sdhci-pci|sga|sl-nand|smbus-eeprom|smc91c111|sp804|
-          spitz-keyboard|spitz-lcdtg|ssd0303|ssd0323|ssi-sd|sst25vf016b|
-          sst25vf032b|sst25vf040b|sst25vf080b|sst25wf010|sst25wf020|sst25wf040|
-          sst25wf080|sst25wf512|stellaris-adc|stellaris_enet|stellaris-gptm|
-          stellaris-i2c|stm32f205-soc|stm32f2xx-syscfg|stm32f2xx-timer|
-          stm32f2xx-usart|strongarm-gpio|strongarm_pic|strongarm-ppc|
-          strongarm-rtc|strongarm-ssp|strongarm-uart|tegra2-ehci-usb|
-          ti925t-arm-cpu|tmp105|tosa_dac|tosa-ssp|tusb6010|twl92230|usb-redir|
-          versatile_i2c|versatilepb_sic|versatile_pci|versatile_pci_host|
-          vfio-pci-igd-lpc-bridge|vhost-vsock-device|vhost-vsock-pci|
-          virtconsole|virtio-crypto-device|virtio-crypto-pci|virtio-vga|
-          vmware-svga|w25q256|w25q32|w25q32dw|w25q64|w25q80|w25q80bl|w25x10|
-          w25x16|w25x20|w25x32|w25x40|w25x64|w25x80|wm8750|*-x86_64-cpu|
-          xen-backend|xen-pci-passthrough|xen-platform|xen-pvdevice|xgmac|
-          xilinxzynq_slcr|xlnx.ps7-qspi|xlnx.ps7-spi|xlnxps7-usb|xlnxzynqmp|
-          xlnxzynq-xadc|vmgenid|vhost-user-scsi|vhost-user-scsi-pci|
-          mmio_interface]
+          isa-vga|kvm-arm-gic|kvm-arm-gicv3|l2x0|lan9118|lm8323|loader|
+          lsi53c810a|lsi53c895a|m25p05|m25p10|m25p128|m25p16|m25p20|m25p32|
+          m25p40|m25p64|m25p80|m25pe16|m25pe20|m25pe80|m25px32|m25px32-s0|
+          m25px32-s1|m25px64|m45pe10|m45pe16|m45pe80|mainstone-fpga|max1110|
+          max1111|max7310|musicpal_gpio|musicpal_key|musicpal_lcd|musicpal-misc|
+          mv88w8618_audio|mv88w8618_eth|mv88w8618_flashcfg|mv88w8618_pic|
+          mv88w8618_pit|mv88w8618_wlan|mx25l12805d|mx25l12855e|mx25l1606e|
+          mx25l2005a|mx25l25635e|mx25l25655e|mx25l3205d|mx25l4005a|mx25l6405d|
+          mx25l8005|n25q032|n25q032a11|n25q032a13|n25q064|n25q064a11|n25q064a13|
+          n25q128|n25q128a11|n25q128a13|n25q256a|n25q256a11|n25q256a13|n25q512a|
+          nand|ne2k_isa|nvdimm|omap2-gpio|omap2-intc|omap-gpio|omap_i2c|
+          omap-intc|onenand|pc-dimm|pc-testdev|piix3-ide|piix3-ide|
+          piix3-ide-xen|piix3-usb-uhci|pl011|pl011_luminary|pl022|pl031|pl041|
+          pl050_keyboard|pl050_mouse|pl061|pl061_luminary|pl080|pl081|pl110|
+          pl110_versatile|pl111|pl181|pl190|pl330|platform-bus-device|
+          pxa250-arm-cpu|pxa255-arm-cpu|pxa25x-timer|pxa260-arm-cpu|
+          pxa261-arm-cpu|pxa262-arm-cpu|pxa270-a0-arm-cpu|pxa270-a1-arm-cpu|
+          pxa270-arm-cpu|pxa270-b0-arm-cpu|pxa270-b1-arm-cpu|pxa270-c0-arm-cpu|
+          pxa270-c5-arm-cpu|pxa27x-timer|pxa2xx-dma|pxa2xx-fir|pxa2xx-gpio|
+          pxa2xx_i2c|pxa2xx-i2c-slave|pxa2xx-mmci|pxa2xx-pcmcia|pxa2xx_pic|
+          pxa2xx_rtc|pxa2xx-ssp|realview_gic|realview_mpcore|realview_pci|
+          realview_sysctl|s25fl016k|s25fl064k|s25fl129p0|s25fl129p1|s25fl256s0|
+          s25fl256s1|s25fl512s|s25sl004a|s25sl008a|s25sl016a|s25sl032a|
+          s25sl032p|s25sl064a|s25sl064p|s25sl12800|s25sl12801|s70fl01gs|
+          sa1100-arm-cpu|sa1110-arm-cpu|sb16|scoop|sdhci-pci|sga|sl-nand|
+          smbus-eeprom|smc91c111|sp804|spitz-keyboard|spitz-lcdtg|ssd0303|
+          ssd0323|ssi-sd|sst25vf016b|sst25vf032b|sst25vf040b|sst25vf080b|
+          sst25wf010|sst25wf020|sst25wf040|sst25wf080|sst25wf512|stellaris-adc|
+          stellaris_enet|stellaris-gptm|stellaris-i2c|stm32f205-soc|
+          stm32f2xx-syscfg|stm32f2xx-timer|stm32f2xx-usart|strongarm-gpio|
+          strongarm_pic|strongarm-ppc|strongarm-rtc|strongarm-ssp|
+          strongarm-uart|tegra2-ehci-usb|ti925t-arm-cpu|tmp105|tosa_dac|
+          tosa-ssp|tusb6010|twl92230|usb-redir|versatile_i2c|versatilepb_sic|
+          versatile_pci|versatile_pci_host|vfio-pci-igd-lpc-bridge|
+          vhost-vsock-device|vhost-vsock-pci|virtconsole|virtio-crypto-device|
+          virtio-crypto-pci|virtio-vga|vmware-svga|w25q256|w25q32|w25q32dw|
+          w25q64|w25q80|w25q80bl|w25x10|w25x16|w25x20|w25x32|w25x40|w25x64|
+          w25x80|wm8750|*-x86_64-cpu|xen-backend|xen-pci-passthrough|
+          xen-platform|xen-pvdevice|xgmac|xilinxzynq_slcr|xlnx.ps7-qspi|
+          xlnx.ps7-spi|xlnxps7-usb|xlnxzynqmp|xlnxzynq-xadc|vmgenid|
+          vhost-user-scsi|vhost-user-scsi-pci|mmio_interface|msf2-soc|
+          msf2-sysreg|mss-spi|mss-timer]
           (the following are aliases of these unsupported devices: lsi|
           virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet|
-          virtio-gpu|pci-assign|piix-usb-uhci)
+          virtio-gpu||piix-usb-uhci)
           (note that some of these device names represent supported devices and
           are used internally, but are not specifyable via -device even though
           they appear in the list of devices)
@@ -613,18 +619,20 @@ QEMU Command-Line and Monitor Syntax and Support
   -hda/-hdb/-hdc/-hdd ...
   -icount ...
   -L ...
-  -M [akita|borzoi|canon-a1100|cheetah|collie|connex|cubieboard|highbank|
-     imx25-pdk|integratorcp|kzm|lm3s6965evb|lm3s811evb|mainstone|midway|
-     musicpal|n800|n810|nuri|palmetto-bmc|raspi2|realview-eb|
-     realview-eb-mpcore|realview-pb-a8|realview-pbx-a9|smdkc210|spitz|sx1|
-     sx1-v1|terrier|tosa|verdex|versatileab|versatilepb|vexpress-a15|
-     vexpress-a9|xilinx-zynq-a9|xlnx-ep108|z2]
-  -machine [akita|borzoi|canon-a1100|cheetah|collie|connex|cubieboard|highbank|
-     imx25-pdk|integratorcp|kzm|lm3s6965evb|lm3s811evb|mainstone|midway|
-     musicpal|n800|n810|nuri|palmetto-bmc|raspi2|realview-eb|realview-eb-mpcore|
-     realview-pb-a8|realview-pbx-a9|smdkc210|spitz|sx1|sx1-v1|terrier|tosa|
-     verdex|versatileab|versatilepb|vexpress-a15|vexpress-a9|xilinx-zynq-a9|
-     xlnx-ep108|z2]
+  -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|
+     palmetto-bmc|raspi2|realview-eb|realview-eb-mpcore|realview-pb-a8|
+     realview-pbx-a9|romulus-bmc|sabrelite|smdkc210|spitz|sx1|sx1-v1|terrier|
+     tosa|verdex|versatileab|versatilepb|vexpress-a15|vexpress-a9|virt-2.7|
+     virt-2.8|xilinx-zynq-a9|xlnx-ep108|z2]
+  -machine [akita|asr2500-evb|borzoi|canon-a1100|cheetah|collie|connex|
+           cubieboard|highbank|imx25-pdk|integratorcp|kzm|lm3s6965evb|
+           lm3s811evb|mainstone|midway|mps2-an385|mps2-an511|musicpal|n800|n810|
+           netduin02|nuri|palmetto-bmc|raspi2|realview-eb|realview-eb-mpcore|
+           realview-pb-a8|realview-pbx-a9|romulus-bmc|sabrelite|smdkc210|spitz|
+           sx1|sx1-v1|terrier|tosa|verdex|versatileab|versatilepb|vexpress-a15|
+           vexpress-a9|virt-2.7|virt-2.8|xilinx-zynq-a9|xlnx-ep108|z2]
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
@@ -652,6 +660,7 @@ QEMU Command-Line and Monitor Syntax and Support
   -soundhw ...
   -tb-size ...
   -tdf
+  -tpmdev emulator ...
   -vga [cg3|tcx|virtio|cirrus|xenfb]
   -win2k-hack
   -xen-attach ...

supported.ppc.txt

@@ -1,6 +1,6 @@
 [qemu-ppc package document]
 
-SLES 12 SP3 QEMU/KVM RELATED SUPPORT STATEMENTS
+SLES 15 QEMU/KVM RELATED SUPPORT STATEMENTS
 
 Overview
 --------
@@ -95,8 +95,8 @@ Major QEMU/KVM Supported Features
   direct hugetlb usage. Physical PCI and USB devices may also be passed through
   to the guest, including SR-IOV VF's.
 
-- The guest UI is accessable via GTK, VNC, Spice, and serial (including curses
-  TUI) interfaces.
+- The guest UI is accessable via GTK, VNC, and serial (including curses TUI)
+  interfaces.
 
 - Guest timekeeping is supported in a variety of ways, including a paravirtual
   clocksource, and options for the various guest clocks for how to handle the
@@ -166,12 +166,14 @@ Deprecated, Superseded, Modified and Dropped Features
 
 - These previously supported command line options are now considered deprecated:
   -device ivshmem (use ivshmem-doorbell or ivshmem-plain instead)
+  -nodefconfig (use -no-user-config instead)
 
 - These previously supported command line options are no longer supported:
-  -device pci-assign, -device kvm-pci-assign (use -device vfio-pci instead)
+  <previously mentioned items have been moved to another category>
 
 - These previously supported command line options are no longer recognized:
   -device pc-sysfw (no longer needed)
+  -device pci-assign, -device kvm-pci-assign (use -device vfio-pci instead)
   -display sdl
   -sdl
 
@@ -187,8 +189,8 @@ Deprecated, Superseded, Modified and Dropped Features
 - 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
-  supported and it is highly discouraged to continuing to use existing qed
-  images. They should instead be converted to another supported format.
+  supported and it is highly discouraged to continue using existing qed images.
+  They should instead be converted to another supported format.
 
 QEMU Command-Line and Monitor Syntax and Support
 ------------------------------------------------
@@ -208,8 +210,6 @@ 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.9
-  instead of virt-2.6) if possible. (note: there is no virt-2.9 machine type!)
 
 - The following command line options are supported:
   -accel ...
@@ -261,8 +261,8 @@ QEMU Command-Line and Monitor Syntax and Support
   -kernel ...
   -loadvm ...
   -m ...
-  -M [help|?|none|pseries|pseries-2.9]
-  -machine [help|?|none|pseries|pseries-2.9]
+  -M [help|?|none|pseries|pseries-2.11]
+  -machine [help|?|none|pseries|pseries-2.11]
   -mem-path ...
   -mem-prealloc
   -mon ...
@@ -297,7 +297,6 @@ QEMU Command-Line and Monitor Syntax and Support
   -show-cursor
   -smbios ...
   -smp ...
-  -spice
   -tpmdev passthrough ...
   -trace ...
   -usb
@@ -345,6 +344,7 @@ QEMU Command-Line and Monitor Syntax and Support
   memsave ...
   migrate ...
   migrate_cancel
+  migrate_continue ...
   migrate_incoming
   migrate_set_cache_size ...
   migrate_set_capability ...
@@ -433,6 +433,7 @@ QEMU Command-Line and Monitor Syntax and Support
   memsave
   migrate
   migrate_cancel
+  migrate-continue
   migrate-incoming
   migrate-set-cache-size
   migrate-set-capabilities
@@ -473,6 +474,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-machines
   query-memdev
   query-memory-devices
+  query-memory-size-summary
   query-mice
   query-migrate
   query-migrate-cache-size
@@ -514,6 +516,7 @@ QEMU Command-Line and Monitor Syntax and Support
   trace-event-get-state
   trace-event-set-state
   transaction
+  watchdog-set-action
 
 -  The following command line options are unsupported:
   -acpitable ...
@@ -529,11 +532,11 @@ QEMU Command-Line and Monitor Syntax and Support
           icp-kvm|ics|icskvm|igd-passthrough-isa-bridge|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-m48t59|
-          isa-parallel|isa-vga|isabus-bridge|kvm-openpic|kvm-pci-assign|loader|
-          lsi53c810a| macio-ide|macio-newworld|macio-nvram|macio-oldworld|
-          mpc8544-guts| mpc8xxx_gpio|ne2k_isa|nvdimm|openpic|pc-dimm|pc-testdev|
-          pc87312|piix3-ide|piix3-ide|piix3-ide-xen|piix3-usb-uhci|
-          platform-bus-device|pnv-lpc|powernv-chip-POWER8|powernv-chip-POWER8E|
+          isa-parallel|isa-vga|isabus-bridge|kvm-openpic|loader|lsi53c810a|
+          macio-ide|macio-newworld|macio-nvram|macio-oldworld|mpc8544-guts|
+          mpc8xxx_gpio|ne2k_isa|nvdimm|openpic|pc-dimm|pc-testdev|pc87312|
+          piix3-ide|piix3-ide|piix3-ide-xen|piix3-usb-uhci|platform-bus-device|
+          pnv-lpc|powernv-chip-POWER8|powernv-chip-POWER8E|
           powernv-chip-POWER8NVL|powernv-chip-POWER9|powernv-cpu-core-POWER8|
           powernv-cpu-core-POWER8E|powernv-cpu-core-POWER8NVL|
           powernv-cpu-core-POWER9|ppc4xx-pcihost|prep-systemio|raven-pcihost|
@@ -547,10 +550,10 @@ QEMU Command-Line and Monitor Syntax and Support
           virtio-crypto-pci|virtio-mmio|virtio-vga|vmgenid|vmware-svga|
           xen-backend|xen-pci-passthrough|xen-platform|xen-pvdevice|xen-sysdev|
           xlnx.xps-ethernetlite|xlnx.xps-intc|xlnx.xps-timer|xlnx.xps-uartlite|
-          *-i386-cpu|*-powerpc64-cpu|*-spapr-cpu-core|*-x86_64-cpu]
+          *-i386-cpu|*-powerpc64-cpu|*-spapr-cpu-core|*-x86_64-cpu|vmcoreinfo]
           (the following are aliases of these unsupported devices: lsi|
           virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet|
-          virtio-gpu|pci-assign|piix-usb-uhci)
+          virtio-gpu|piix-usb-uhci|mac-dbdma|ppc4xx-i2c)
           (note that some of these device names represent supported devices and
           are used internally, but are not specifyable via -device even though
           they appear in the list of devices)
@@ -565,10 +568,10 @@ 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|ref405ep|taihu|virtex-ml507]
+     pseries-2.8|pseries-2.9|pseries-2.10|ref405ep|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|ref405ep|taihu|virtex-ml507]
+           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]
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
@@ -593,8 +596,10 @@ QEMU Command-Line and Monitor Syntax and Support
   -singlestep
   -snapshot
   -soundhw ...
+  -spice
   -tb-size ...
   -tdf
+  -tpmdev emulator ...
   -vga [cg3|tcx|virtio|cirrus|xenfb]
   -win2k-hack
   -xen-attach ...

supported.s390.txt

@@ -26,7 +26,7 @@ Overview
   to share those host resources as efficiently as possible.
 
   QEMU is a primary component of KVM based virtualization. The legacy qemu-kvm
-  program is provided for continuity with pre SLES 12 usage, including in
+  program is available for continuity with pre SLES 12 usage, including in
   libvirt domain xml references. The QEMU emulator binary qemu-system-s390x is
   now the primary programs to use to access KVM virtualization. When using this
   programs, the -machine option accel=kvm (or its alias -enable-kvm) must be
@@ -96,8 +96,8 @@ Major QEMU/KVM Supported Features
   direct hugetlb usage. Physical PCI devices may also be passed through to the
   guest, including SR-IOV VF's.
 
-- The guest UI is accessable via GTK, VNC, Spice, and serial (including curses
-  TUI) interfaces.
+- The guest UI is accessable via GTK, VNC, and serial (including curses TUI)
+  interfaces.
 
 - Guest timekeeping is supported in a variety of ways, including a paravirtual
   clocksource, and options for the various guest clocks for how to handle the
@@ -167,12 +167,14 @@ Deprecated, Superseded, Modified and Dropped Features
 
 - These previously supported command line options are now considered deprecated:
   -device ivshmem (use ivshmem-doorbell or ivshmem-plain instead)
+  -nodefconfig (use -no-user-config instead)
 
 - These previously supported command line options are no longer supported:
-  -device pci-assign, -device kvm-pci-assign (use -device vfio-pci instead)
+  <previously mentioned items have been moved to another category>
 
 - These previously supported command line options are no longer recognized:
   -device pc-sysfw (no longer needed)
+  -device pci-assign, -device kvm-pci-assign (use -device vfio-pci instead)
   -display sdl
   -sdl
 
@@ -188,8 +190,8 @@ Deprecated, Superseded, Modified and Dropped Features
 - 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
-  supported and it is highly discouraged to continuing to use existing qed
-  images. They should instead be converted to another supported format.
+  supported and it is highly discouraged to continue using existing qed images.
+  They should instead be converted to another supported format.
 
 QEMU Command-Line and Monitor Syntax and Support
 ------------------------------------------------
@@ -210,7 +212,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.9 instead of s390-ccw-virtio-2.6) if possible.
+  s390-ccw-virtio-2.11 instead of s390-ccw-virtio-2.9) if possible.
 
 - The following command line options are supported:
   -accel ...
@@ -233,7 +235,8 @@ QEMU Command-Line and Monitor Syntax and Support
   -device [virtio-net-pci|virtio-blk-pci|virtio-balloon-pci|virtserialport|
           virtconsole|virtio-serial-pci|virtio-scsi-pci|scsi-cd|scsi-hd|
           scsi-generic|scsi-disk|scsi-block|virtio-rng-pci|pci-bridge|
-          megasas-gen2|e1000e|e1000|zpci]
+          megasas-gen2|e1000e|e1000|zpci|virtio-gpu-ccw|virtio-keyboard-ccw|
+          virtio-mouse-ccw|virtio-tablet-ccw|vfio-pci]
           (the following are aliases of these supported devices: virtio-blk|
           virtio-net|virtio-serial|virtio-balloon|virtio-scsi|virtio-rng)
   -dfilter range, ...
@@ -257,8 +260,10 @@ QEMU Command-Line and Monitor Syntax and Support
   -kernel ...
   -loadvm ...
   -m ...
-  -M [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9]
-  -machine [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9]
+  -M [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9|
+     s390-ccw-virtio-2.11]
+  -machine [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9|
+           s390-ccw-virtio-2.11]
   -mem-path ...
   -mem-prealloc
   -mon ...
@@ -292,7 +297,6 @@ QEMU Command-Line and Monitor Syntax and Support
   -serial ...
   -show-cursor
   -smp ...
-  -spice
   -trace ...
   -uuid ..
   -version
@@ -341,6 +345,7 @@ QEMU Command-Line and Monitor Syntax and Support
   memsave ...
   migrate ...
   migrate_cancel
+  migrate_continue ...
   migrate_incoming
   migrate_set_cache_size ...
   migrate_set_capability ...
@@ -429,6 +434,7 @@ QEMU Command-Line and Monitor Syntax and Support
   memsave
   migrate
   migrate_cancel
+  migrate-continue
   migrate-incoming
   migrate-set-cache-size
   migrate-set-capabilities
@@ -469,6 +475,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-machines
   query-memdev
   query-memory-devices
+  query-memory-size-summary
   query-mice
   query-migrate
   query-migrate-cache-size
@@ -507,6 +514,7 @@ QEMU Command-Line and Monitor Syntax and Support
   trace-event-get-state
   trace-event-set-state
   transaction
+  watchdog-set-action
 
 -  The following command line options are unsupported:
   -acpitable ...
@@ -525,42 +533,45 @@ QEMU Command-Line and Monitor Syntax and Support
           igd-passthrough-isa-bridge|intel-hda|intel_iommu|ioh3420|
           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|kvm-pci-assign|lsi53c810|lsi53c810a|
-          megasas|mptsas1068|ne2k_isa|ne2k_pci|nec-usb-xhci|nvdimm|nvme|pc-dimm|
+          isa-parallel|isa-serial|isa-vga|lsi53c810|lsi53c810a|megasas|
+          mptsas1068|ne2k_isa|ne2k_pci|nec-usb-xhci|nvdimm|nvme|pc-dimm|
           pci-testdev|pcnet|pc-testdev|piix3-ide|piix3-ide|piix3-ide-xen|
           piix4-usb-uhci|pvscsi|pxb|pxb-host|pxb-pcie|qemu-s390-cpu|rocker|
           s390-flic|s390-flic-qemu|s390-ipl|s390-pcihost|
           s390-sclp-event-facility|s390-skeys-qemu|sb16|sclp|sclpconsole|
           sclp-cpu-hotplug|sclplmconsole|sclp-memory-hotplug-dev|sclpquiesce|
-          sd-card|sdhci-pci|sdhci-pci|secondary-vga|sga|smbus-eeprom|tpci200|
-          usb-audio|usb-bot|usb-bt-dongle|usb-ccid|usb-mtp|usb-uas|vfio-pci|
-          vhost-scsi-ccw|vhost-vsock-ccw|virtio-9p-device|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|
-          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-s390-cpu|z10BC.2-s390-cpu|
-          z10BC-base-s390-cpu|z10BC-s390-cpu|z10EC.2-base-s390-cpu|
-          z10EC.2-s390-cpu|z10EC.3-base-s390-cpu|z10EC.3-s390-cpu|
-          z10EC-base-s390-cpu|z10EC-s390-cpu|z114-base-s390-cpu|z114-s390-cpu|
-          z13.2-base-s390-cpu|z13.2-s390-cpu|z13-base-s390-cpu|z13-s390-cpu|
-          z13s-base-s390-cpu|z13s-s390-cpu|z196.2-base-s390-cpu|z196.2-s390-cpu|
-          z196-base-s390-cpu|z196-s390-cpu|z800-base-s390-cpu|z800-s390-cpu|
-          z890.2-base-s390-cpu|z890.2-s390-cpu|z890.3-base-s390-cpu|
-          z890.3-s390-cpu|z890-base-s390-cpu|z890-s390-cpu|z900.2-base-s390-cpu|
-          z900.2-s390-cpu|z900.3-base-s390-cpu|z900.3-s390-cpu|
-          z900-base-s390-cpu|z900-s390-cpu|z990.2-base-s390-cpu|z990.2-s390-cpu|
-          z990.3-base-s390-cpu|z990.3-s390-cpu|z990.4-base-s390-cpu|
-          z990.4-s390-cpu|z990.5-base-s390-cpu|z990.5-s390-cpu|
-          z990-base-s390-cpu|z990-s390-cpu|z9BC.2-base-s390-cpu|z9BC.2-s390-cpu|
-          z9BC-base-s390-cpu|z9BC-s390-cpu|z9EC.2-base-s390-cpu|z9EC.2-s390-cpu|
-          z9EC.3-base-s390-cpu|z9EC.3-s390-cpu|z9EC-base-s390-cpu|z9EC-s390-cpu|
-          zBC12-base-s390-cpu|zBC12-s390-cpu|zEC12.2-base-s390-cpu|
-          zEC12.2-s390-cpu|zEC12-base-s390-cpu|zEC12-s390-cpu|vmgenid|
-          vhost-user-scsi|vhost-user-scsi-pci|mmio_interface]
+          sd-card|sdhci-pci|secondary-vga|sga|smbus-eeprom|tpci200|usb-audio|
+          usb-bot|usb-bt-dongle|usb-ccid|usb-mtp|usb-uas|vhost-scsi-ccw|
+          vhost-vsock-ccw|virtio-9p-device|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|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|
+          z10BC-s390x-cpu|z10EC.2-base-s390x-cpu|z10EC.2-s390x-cpu|
+          z10EC.3-base-s390x-cpu|z10EC.3-s390x-cpu|z10EC-base-s390x-cpu|
+          z10EC-s390x-cpu|z114-base-s390x-cpu|z114-s390x-cpu|
+          z13.2-base-s390x-cpu|z13.2-s390x-cpu|z13-base-s390x-cpu|z13-s390x-cpu|
+          z13s-base-s390x-cpu|z13s-s390x-cpu|z196.2-base-s390x-cpu|
+          z196.2-s390x-cpu|z196-base-s390x-cpu|z196-s390x-cpu|
+          z800-base-s390x-cpu|z800-s390x-cpu|z890.2-base-s390x-cpu|
+          z890.2-s390x-cpu|z890.3-base-s390x-cpu|z890.3-s390x-cpu|
+          z890-base-s390x-cpu|z890-s390x-cpu|z900.2-base-s390x-cpu|
+          z900.2-s390x-cpu|z900.3-base-s390x-cpu|z900.3-s390x-cpu|
+          z900-base-s390x-cpu|z900-s390x-cpu|z990.2-base-s390x-cpu|
+          z990.2-s390x-cpu|z990.3-base-s390x-cpu|z990.3-s390x-cpu|
+          z990.4-base-s390x-cpu|z990.4-s390x-cpu|z990.5-base-s390x-cpu|
+          z990.5-s390x-cpu|z990-base-s390x-cpu|z990-s390x-cpu|
+          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|
+          zEC12.2-base-s390x-cpu|zEC12.2-s390x-cpu|zEC12-base-s390x-cpu|
+          zEC12-s390x-cpu|vmgenid|vhost-user-scsi|vhost-user-scsi-pci|
+          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|pci-assign|ahci|e1000-82540em|vfio-ccw)
+          virtio-gpu|virtio-9p|ahci|e1000-82540em|vfio-ccw)
           (note that some of these device names represent supported devices and
           are used internally, but are not specifyable via -device even though
           they appear in the list of devices)
@@ -574,9 +585,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.8|s390-ccw-virtio-2.10]
   -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.8|s390-ccw-virtio-2.10]
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
@@ -604,8 +615,10 @@ QEMU Command-Line and Monitor Syntax and Support
   -smbios ...
   -snapshot
   -soundhw ...
+  -spice
   -tb-size ...
   -tdf
+  -tpmdev emulator ...
   -tpmdev passthrough ...
   -usb
   -usbdevice [braile|disk|host|mouse|net|serial|tablet]

supported.x86.txt

@@ -26,7 +26,7 @@ Overview
   enable guests to share those host resources as efficiently as possible.
 
   QEMU is a primary component of KVM based virtualization. The legacy qemu-kvm
-  program is provided for continuity with pre SLES 12 usage, including in
+  program is available for continuity with pre SLES 12 usage, including in
   libvirt domain xml references. The QEMU emulator binaries qemu-system-x86_64
   and qemu-system-i386 (x86 host) are now the primary programs to use to access
   KVM virtualization. When using these programs, the -machine option accel=kvm
@@ -64,7 +64,7 @@ Major QEMU/KVM Supported Features
   individual CPU features visible to the guest.
 
 - QEMU incorporates a SEABIOS based system BIOS and iPXE based PXE ROMs, which
-  allow boot options common to physical systems along with other 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.
@@ -207,12 +207,14 @@ Deprecated, Superseded, Modified and Dropped Features
 
 - These previously supported command line options are now considered deprecated:
   -device ivshmem (use ivshmem-doorbell or ivshmem-plain instead)
+  -nodefconfig (use -no-user-config instead)
 
 - These previously supported command line options are no longer supported:
-  -device pci-assign, -device kvm-pci-assign (use -device vfio-pci instead)
+  <previously mentioned items have been moved to another category>
 
 - These previously supported command line options are no longer recognized:
   -device pc-sysfw (no longer needed)
+  -device pci-assign, -device kvm-pci-assign (use -device vfio-pci instead)
   -display sdl
   -sdl
 
@@ -279,8 +281,8 @@ Deprecated, Superseded, Modified and Dropped Features
 - 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
-  supported and it is highly discouraged to continuing to use existing qed
-  images. They should instead be converted to another supported format.
+  supported and it is highly discouraged to continue using existing qed images.
+  They should instead be converted to another supported format.
 
 QEMU Command-Line and Monitor Syntax and Support
 ------------------------------------------------
@@ -290,7 +292,7 @@ QEMU Command-Line and Monitor Syntax and Support
   qemu-system-x86_64 [options] [disk_image]
 
   Where 'options' are taken from the options listed below, and 'disk_image' is
-  the file system reference to the the x86 guest's primary IDE based hard disk
+  the file system reference to the x86 guest's primary IDE based hard disk
   image. This image as well as those used with -drive or -cdrom, may be in the
   raw (no format) or qcow2 storage formats, and may be located in files within
   the host filesystem, logical volumes, host physical disks, or network based
@@ -303,8 +305,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.9
-  instead of pc-i440fx-2.6) if possible.
+  This advice includes moving to the most recent machine type (eg pc-i440fx-2.11
+  instead of pc-i440fx-2.9) if possible.
 
 - The following command line options are supported:
   -accel ...
@@ -335,7 +337,7 @@ QEMU Command-Line and Monitor Syntax and Support
           virtio-rng-pci|i6300esb|ib700|qxl|qxl-vga|pvpanic|vfio-pci|ivshmem|
           ivshmem-doorbell|ivshmem-plain|pci-bridge|megasas-gen2|pc-dimm|
           floppy|e1000e|ccid-card-emulated|ccid-card-passthrough|xen-backend|
-          loader|e1000|vmgenid]
+          loader|e1000|vmgenid|vmcoreinfo|pcie-pci-bridge]
           (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)
@@ -363,11 +365,11 @@ 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|q35|pc-q35-2.6|
-     pc-q35-2.9|xenfv|xenpv]
+     pc-i440fx-2.0|pc-i440fx-2.3|pc-i440fx-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]
   -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|q35|
-           pc-q35-2.6|pc-q35-2.9|xenfv|xenpv]
+           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]
   -mem-path ...
   -mem-prealloc
   -mon ...
@@ -463,6 +465,7 @@ QEMU Command-Line and Monitor Syntax and Support
   memsave ...
   migrate ...
   migrate_cancel
+  migrate_continue ...
   migrate_incoming
   migrate_set_cache_size ...
   migrate_set_capability ...
@@ -553,6 +556,7 @@ QEMU Command-Line and Monitor Syntax and Support
   memsave
   migrate
   migrate_cancel
+  migrate-continue
   migrate-incoming
   migrate-set-cache-size
   migrate-set-capabilities
@@ -593,6 +597,7 @@ QEMU Command-Line and Monitor Syntax and Support
   query-machines
   query-memdev
   query-memory-devices
+  query-memory-size-summary
   query-mice
   query-migrate
   query-migrate-cache-size
@@ -634,6 +639,7 @@ QEMU Command-Line and Monitor Syntax and Support
   trace-event-get-state
   trace-event-set-state
   transaction
+  watchdog-set-action
   xen-load-devices-state
   xen-save-devices-state
   xen-set-global-dirty-log
@@ -661,18 +667,17 @@ QEMU Command-Line and Monitor Syntax and Support
           piix3-ide|i8042|sdhci-pci|secondary-vga|edu|intel_iommu|usb-mtp|
           e1000-82544gc|e1000-82545em|virtio-input-host-pci|virtio-keyboard-pci|
           virtio-mouse-pci|virtio-tablet-pci|virtio-gpu-pci|pci-bridge-seat|pxb|
-          pxb-pcie|sdhci-pci|rocker|virtio-input-host-device|
-          virtio-keyboard-device|virtio-mouse-device|virtio-tablet-device|
-          virtio-vga|hyperv-testdev|generic-sdhci|igd-passthrough-isa-bridge|
-          ipmi-bmc-extern|ipmi-bmc-sim|isa-ipmi-bt|isa-ipmi-kcs|mptsas1068|
-          nvdimm|pxb-host|sd-card|virtio-gpu-device|kvm-pci-assign|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]
+          pxb-pcie|rocker|virtio-input-host-device|virtio-keyboard-device|
+          virtio-mouse-device|virtio-tablet-device|virtio-vga|hyperv-testdev|
+          generic-sdhci|igd-passthrough-isa-bridge|ipmi-bmc-extern|ipmi-bmc-sim|
+          isa-ipmi-bt|isa-ipmi-kcs|mptsas1068|nvdimm|pxb-host|sd-card|
+          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]
           (the following are aliases of these unsupported devices: lsi|
           virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet|
-          virtio-gpu|pci-assign)
+          virtio-gpu)
           (note that some of these device names represent supported devices and
           are used internally, but are not specifyable via -device even though
           they appear in the list of devices)
@@ -685,14 +690,15 @@ 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-1440fx-2.8|pc-q35-1.4|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.3|pc-q35-2.4|pc-q35-2.5|
-     pc-q35-2.7|pc-q35-2.8]
+     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-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-2.7|pc-q35-2.8|pc-q35-2.10]
   -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-q35-1.4|
-           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.3|pc-q35-2.4|pc-q35-2.5|pc-q35-2.7|pc-q35-2.8]
+           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-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-2.7|pc-q35-2.8|pc-q35-2.10]
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
@@ -715,6 +721,7 @@ QEMU Command-Line and Monitor Syntax and Support
   -snapshot
   -soundhw ...
   -tb-size ...
+  -tpmdev emulator ...
   -vga [cg3|tcx|virtio|vmware]
   -win2k-hack
   -xen-create

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.10
-GIT_UPSTREAM_TAG=v2.10.1
+GIT_BRANCH=opensuse-2.11
+GIT_UPSTREAM_TAG=v2.11.0
 GIT_DIR=/dev/shm/qemu-factory-git-dir
 CMP_DIR=/dev/shm/qemu-factory-cmp-dir