Accepting request 491710 from home:bfrogers:branches:Virtualization

A xen hvm fix and an experimental feature added on top of our v2.9.0 qemu.

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

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

@@ -1,4 +1,4 @@
-From 15097c2142d7864c93d733251095b00c49c76913 Mon Sep 17 00:00:00 2001
+From c033f8e4e487f2b1a09c86351f33c116464509af 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 a67db04e1a..a11728f6e0 100644
+index a67db04..a11728f 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 b07257dbe41b35539ca7ab0692812444c030c8d8 Mon Sep 17 00:00:00 2001
+From 70b4b47993dbbae58b80e504f4bc373e75a4acfb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 10 Aug 2016 19:00:24 +0200
 Subject: [PATCH] qemu-binfmt-conf: Modify default path
@@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
-index 0f1aa63872..9fcd95a435 100755
+index 0f1aa63..9fcd95a 100755
 --- a/scripts/qemu-binfmt-conf.sh
 +++ b/scripts/qemu-binfmt-conf.sh
 @@ -264,7 +264,7 @@ BINFMT_SET=qemu_register_interpreter

0003-qemu-cvs-alsa_bitfield.patch

@@ -1,4 +1,4 @@
-From eea1486b0b691e918140b06409bade282774eef8 Mon Sep 17 00:00:00 2001
+From d1c07c5e280a5ca62d3019792049038a53476248 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:20:50 +0200
 Subject: [PATCH] qemu-cvs-alsa_bitfield
@@ -13,7 +13,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  2 files changed, 24 insertions(+)
 
 diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
-index f19ef4b230..b2659e0def 100644
+index f19ef4b..b2659e0 100644
 --- a/include/exec/user/thunk.h
 +++ b/include/exec/user/thunk.h
 @@ -37,6 +37,7 @@ typedef enum argtype {
@@ -41,7 +41,7 @@ index f19ef4b230..b2659e0def 100644
      case TYPE_LONGLONG:
      case TYPE_ULONGLONG:
 diff --git a/thunk.c b/thunk.c
-index 2dac36666d..0eb72861fe 100644
+index 2dac366..0eb7286 100644
 --- a/thunk.c
 +++ b/thunk.c
 @@ -37,6 +37,7 @@ static inline const argtype *thunk_type_next(const argtype *type_ptr)

0004-qemu-cvs-alsa_ioctl.patch

@@ -1,4 +1,4 @@
-From 518797d98327188a5e9d001fb53906772d0af2a6 Mon Sep 17 00:00:00 2001
+From d7f885cf41b62c5b8168aaeadb4e30849c55a871 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:23:27 +0200
 Subject: [PATCH] qemu-cvs-alsa_ioctl
@@ -27,7 +27,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  create mode 100644 linux-user/syscall_types_alsa.h
 
 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index e6997ff230..ea335de680 100644
+index e6997ff..ea335de 100644
 --- a/linux-user/ioctls.h
 +++ b/linux-user/ioctls.h
 @@ -359,6 +359,11 @@
@@ -44,7 +44,7 @@ index e6997ff230..ea335de680 100644
    IOCTL(LOOP_SET_STATUS, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info)))
 diff --git a/linux-user/ioctls_alsa.h b/linux-user/ioctls_alsa.h
 new file mode 100644
-index 0000000000..c2aa542c3b
+index 0000000..c2aa542
 --- /dev/null
 +++ b/linux-user/ioctls_alsa.h
 @@ -0,0 +1,467 @@
@@ -517,7 +517,7 @@ index 0000000000..c2aa542c3b
 +IOCTL( SND_SSCAPE_LOAD_MCODE  , IOC_W, MK_PTR(MK_STRUCT(STRUCT_sscape_microcode)) )
 diff --git a/linux-user/ioctls_alsa_structs.h b/linux-user/ioctls_alsa_structs.h
 new file mode 100644
-index 0000000000..e09a30defb
+index 0000000..e09a30d
 --- /dev/null
 +++ b/linux-user/ioctls_alsa_structs.h
 @@ -0,0 +1,1740 @@
@@ -2262,7 +2262,7 @@ index 0000000000..e09a30defb
 +  unsigned char *code;
 +};
 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 40c5027e93..a34551debc 100644
+index 40c5027..a34551d 100644
 --- a/linux-user/syscall_defs.h
 +++ b/linux-user/syscall_defs.h
 @@ -2802,6 +2802,8 @@ struct target_ucred {
@@ -2275,7 +2275,7 @@ index 40c5027e93..a34551debc 100644
  
  #define TARGET_SIGEV_MAX_SIZE 64
 diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
-index 24631b09be..80ac53a8ed 100644
+index 24631b0..80ac53a 100644
 --- a/linux-user/syscall_types.h
 +++ b/linux-user/syscall_types.h
 @@ -89,6 +89,11 @@ STRUCT(buffmem_desc,
@@ -2292,7 +2292,7 @@ index 24631b09be..80ac53a8ed 100644
         TYPE_INT,                 /* lo_number */
 diff --git a/linux-user/syscall_types_alsa.h b/linux-user/syscall_types_alsa.h
 new file mode 100644
-index 0000000000..fa7a18d755
+index 0000000..fa7a18d
 --- /dev/null
 +++ b/linux-user/syscall_types_alsa.h
 @@ -0,0 +1,1330 @@

0005-qemu-cvs-alsa_mmap.patch

@@ -1,4 +1,4 @@
-From b9f7442c98a29037c8362eabb918b3b685c66000 Mon Sep 17 00:00:00 2001
+From 60ce6f53311146b52cd81ddd0aa964a1afa5bd5f Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:24:15 +0200
 Subject: [PATCH] qemu-cvs-alsa_mmap
@@ -12,7 +12,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  1 file changed, 14 insertions(+)
 
 diff --git a/linux-user/mmap.c b/linux-user/mmap.c
-index 4888f53139..a3fcea263f 100644
+index 4888f53..a3fcea2 100644
 --- a/linux-user/mmap.c
 +++ b/linux-user/mmap.c
 @@ -357,6 +357,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size)

0006-qemu-cvs-gettimeofday.patch

@@ -1,4 +1,4 @@
-From ea17afbe97617e470f4c2da0b6f8f1d8d1b6a7ae Mon Sep 17 00:00:00 2001
+From cc91b17c96a16f1fccdbe4f7ab534816b4ff5e77 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:25:41 +0200
 Subject: [PATCH] qemu-cvs-gettimeofday
@@ -9,7 +9,7 @@ No clue what this is for.
  1 file changed, 2 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index cec8428589..03c3576dab 100644
+index cec8428..03c3576 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -8914,6 +8914,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,

0007-qemu-cvs-ioctl_debug.patch

@@ -1,4 +1,4 @@
-From af495518c1e966163fa76fe1679cf55e67af8e50 Mon Sep 17 00:00:00 2001
+From a047a2ecf689e8f70d09ad3804b1c1fe8bca4406 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:26:33 +0200
 Subject: [PATCH] qemu-cvs-ioctl_debug
@@ -12,7 +12,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 03c3576dab..891ee1c6ea 100644
+index 03c3576..891ee1c 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -5611,7 +5611,12 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)

0008-qemu-cvs-ioctl_nodirection.patch

@@ -1,4 +1,4 @@
-From 9100a26067e96c78e276ec2ea6044413220bf315 Mon Sep 17 00:00:00 2001
+From 82f268e91d5582f5bf7c327abe2ba6c4ff527f7b Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:27:36 +0200
 Subject: [PATCH] qemu-cvs-ioctl_nodirection
@@ -15,7 +15,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  1 file changed, 6 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 891ee1c6ea..2f82a7d1a6 100644
+index 891ee1c..2f82a7d 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -5648,6 +5648,11 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)

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

@@ -1,4 +1,4 @@
-From 60738eab06e939240392062c02135c83d993cfe7 Mon Sep 17 00:00:00 2001
+From c1f6c6bbb68c9ceb462cb3f8f4a2abd719f67bd5 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 7df2b8c149..85ae084545 100644
+index 7df2b8c..85ae084 100644
 --- a/Makefile.target
 +++ b/Makefile.target
 @@ -36,6 +36,10 @@ endif
@@ -83,7 +83,7 @@ index 7df2b8c149..85ae084545 100644
  	$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@")
  
 diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
-index 8c93058100..607ca2dc92 100644
+index 8c93058..607ca2d 100644
 --- a/linux-user/Makefile.objs
 +++ b/linux-user/Makefile.objs
 @@ -6,3 +6,5 @@ obj-$(TARGET_HAS_BFLT) += flatload.o
@@ -94,7 +94,7 @@ index 8c93058100..607ca2dc92 100644
 +obj-binfmt-y = binfmt.o
 diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
 new file mode 100644
-index 0000000000..cd1f513b33
+index 0000000..cd1f513
 --- /dev/null
 +++ b/linux-user/binfmt.c
 @@ -0,0 +1,42 @@

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

@@ -1,4 +1,4 @@
-From 25d802b5ba5c7d5d878636a5d76e985d50534790 Mon Sep 17 00:00:00 2001
+From 5af3522f9a43395d9445806b150c0b9f5a7d107e 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,7 +13,7 @@ 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 c97ef4a8da..b47b3f9096 100644
+index c97ef4a..b47b3f9 100644
 --- a/exec.c
 +++ b/exec.c
 @@ -1362,11 +1362,13 @@ static void *file_ram_alloc(RAMBlock *block,

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

@@ -1,4 +1,4 @@
-From d4f2ec208cb1be22deb096a97515ff3c9e153df3 Mon Sep 17 00:00:00 2001
+From ebdfb6b8345badf51e6da5f56abcb069de29ebfe 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
@@ -26,7 +26,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 4 insertions(+)
 
 diff --git a/user-exec.c b/user-exec.c
-index a8f95fa1e1..c262653604 100644
+index a8f95fa..c262653 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,

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

@@ -1,4 +1,4 @@
-From 5433e27d9bc38cfa36cb3342a03a852506210a6a Mon Sep 17 00:00:00 2001
+From 8a8e7f00c3028d2f07a8afd4dabf20b634654637 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
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 26 insertions(+)
 
 diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
-index cd1f513b33..458f136fb4 100644
+index cd1f513..458f136 100644
 --- a/linux-user/binfmt.c
 +++ b/linux-user/binfmt.c
 @@ -5,6 +5,9 @@

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

@@ -1,4 +1,4 @@
-From fec2bb12ea9f28168e292f4ba6bab64e7a513fa7 Mon Sep 17 00:00:00 2001
+From fd25a10cf311c732589a131c107b0dd61a845ecf Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 23 Jul 2012 10:24:14 +0200
 Subject: [PATCH] linux-user: Fake /proc/cpuinfo
@@ -22,7 +22,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 20 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 2f82a7d1a6..37b49bd406 100644
+index 2f82a7d..37b49bd 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -7503,6 +7503,25 @@ static int open_self_stat(void *cpu_env, int fd)

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

@@ -1,4 +1,4 @@
-From baa2e1c88801877a9835fdf432d22a934f566803 Mon Sep 17 00:00:00 2001
+From be8989734d0f8f83659186495cca577e3844a310 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 21 Aug 2012 14:20:40 +0200
 Subject: [PATCH] linux-user: XXX disable fiemap
@@ -9,7 +9,7 @@ agraf: fiemap breaks in libarchive. Disable it for now.
  1 file changed, 5 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 37b49bd406..983475a0b9 100644
+index 37b49bd..983475a 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -5076,6 +5076,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,

0015-slirp-nooutgoing.patch

@@ -1,4 +1,4 @@
-From 159aec464e25bcd170093ffef80a29f44f300712 Mon Sep 17 00:00:00 2001
+From 83cb2267f51dd9240a9c7940205e65373a7665c3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 29 Aug 2012 18:42:56 +0200
 Subject: [PATCH] slirp: -nooutgoing
@@ -12,7 +12,7 @@ TBD (from SUSE Studio team)
  4 files changed, 39 insertions(+)
 
 diff --git a/qemu-options.hx b/qemu-options.hx
-index 99af8edf5f..4712277d7c 100644
+index 99af8ed..4712277 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
 @@ -3215,6 +3215,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
@@ -33,7 +33,7 @@ index 99af8edf5f..4712277d7c 100644
      "-singlestep     always run in singlestep mode\n", QEMU_ARCH_ALL)
  STEXI
 diff --git a/slirp/socket.c b/slirp/socket.c
-index 86927722e1..5c89064e15 100644
+index 8692772..5c89064 100644
 --- a/slirp/socket.c
 +++ b/slirp/socket.c
 @@ -625,6 +625,8 @@ sorecvfrom(struct socket *so)
@@ -59,7 +59,7 @@ index 86927722e1..5c89064e15 100644
  	ret = sendto(so->s, m->m_data, m->m_len, 0,
  		     (struct sockaddr *)&addr, sockaddr_size(&addr));
 diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
-index ed16e1807f..b2c7a8cba0 100644
+index ed16e18..b2c7a8c 100644
 --- a/slirp/tcp_subr.c
 +++ b/slirp/tcp_subr.c
 @@ -391,6 +391,8 @@ tcp_sockclosed(struct tcpcb *tp)
@@ -96,7 +96,7 @@ index ed16e1807f..b2c7a8cba0 100644
      socket_set_fast_reuse(s);
      opt = 1;
 diff --git a/vl.c b/vl.c
-index 0b4ed5241c..e0f2ec86a9 100644
+index 0b4ed52..e0f2ec8 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -168,6 +168,7 @@ int smp_threads = 1;

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

@@ -1,4 +1,4 @@
-From 5e8f033814b3b17c476f6bb4ab86fe835fdbe77a Mon Sep 17 00:00:00 2001
+From 1e4392f3e2e1641b7ed570da630a9e86cb23710d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 29 Aug 2012 20:06:01 +0200
 Subject: [PATCH] vnc: password-file= and incoming-connections=
@@ -9,7 +9,7 @@ TBD (from SUSE Studio team)
  1 file changed, 55 insertions(+)
 
 diff --git a/ui/vnc.c b/ui/vnc.c
-index 349cfc9d86..486d2759e4 100644
+index 349cfc9..486d275 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
 @@ -59,6 +59,8 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };

0017-linux-user-use-target_ulong.patch

@@ -1,4 +1,4 @@
-From 27f9e9ddabbfeaeb0ce3df22ad22040034146046 Mon Sep 17 00:00:00 2001
+From 86cc99ea8d1648c0e2388cde261e8349d7f235b8 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 9 Oct 2012 09:06:49 +0200
 Subject: [PATCH] linux-user: use target_ulong
@@ -17,7 +17,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/linux-user/qemu.h b/linux-user/qemu.h
-index 4edd7d0c08..25208645e9 100644
+index 4edd7d0..2520864 100644
 --- a/linux-user/qemu.h
 +++ b/linux-user/qemu.h
 @@ -196,10 +196,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
@@ -36,7 +36,7 @@ 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 983475a0b9..1472d72f27 100644
+index 983475a..1472d72 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -7710,10 +7710,10 @@ static target_timer_t get_timer_id(abi_long arg)

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

@@ -1,4 +1,4 @@
-From b650c5d72b49d741b044d118bb511213abad4da9 Mon Sep 17 00:00:00 2001
+From 9f1a253507537ec3fd31fb6bf9d9ad3278f1cd46 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 09:49:37 +0200
 Subject: [PATCH] block: Add support for DictZip enabled gzip files
@@ -47,7 +47,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  create mode 100644 block/dictzip.c
 
 diff --git a/block/Makefile.objs b/block/Makefile.objs
-index de96f8ee80..bab24da2fb 100644
+index de96f8e..bab24da 100644
 --- a/block/Makefile.objs
 +++ b/block/Makefile.objs
 @@ -21,6 +21,7 @@ block-obj-$(CONFIG_RBD) += rbd.o
@@ -60,7 +60,7 @@ index de96f8ee80..bab24da2fb 100644
  block-obj-$(CONFIG_REPLICATION) += replication.o
 diff --git a/block/dictzip.c b/block/dictzip.c
 new file mode 100644
-index 0000000000..4b7e2db817
+index 0000000..4b7e2db
 --- /dev/null
 +++ b/block/dictzip.c
 @@ -0,0 +1,580 @@

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

@@ -1,4 +1,4 @@
-From cd1d4fe4b3b649832a7e6f77e286f7cc5fb22f6b Mon Sep 17 00:00:00 2001
+From 9bab09a016d850caba2bffe818d9696bd8c165c3 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 17:28:38 +0200
 Subject: [PATCH] block: Add tar container format
@@ -48,7 +48,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  create mode 100644 block/tar.c
 
 diff --git a/block/Makefile.objs b/block/Makefile.objs
-index bab24da2fb..73c7b55871 100644
+index bab24da..73c7b55 100644
 --- a/block/Makefile.objs
 +++ b/block/Makefile.objs
 @@ -22,6 +22,7 @@ block-obj-$(CONFIG_GLUSTERFS) += gluster.o
@@ -61,7 +61,7 @@ index bab24da2fb..73c7b55871 100644
  block-obj-$(CONFIG_REPLICATION) += replication.o
 diff --git a/block/tar.c b/block/tar.c
 new file mode 100644
-index 0000000000..508265ed5e
+index 0000000..508265e
 --- /dev/null
 +++ b/block/tar.c
 @@ -0,0 +1,370 @@

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

@@ -1,4 +1,4 @@
-From c30751af0bb052aa5e50ac4e37689cbef30a0a75 Mon Sep 17 00:00:00 2001
+From d9f090d7d5e9ddefc29e3e0b3ead5b408fefaff3 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 12 Dec 2012 19:11:30 +0100
 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/block/tar.c b/block/tar.c
-index 508265ed5e..734082a011 100644
+index 508265e..734082a 100644
 --- a/block/tar.c
 +++ b/block/tar.c
 @@ -73,7 +73,8 @@ static int str_ends(char *str, const char *end)

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

@@ -1,4 +1,4 @@
-From 8833baf755611347a89e4163bf064a2db8b5eb5a Mon Sep 17 00:00:00 2001
+From 0e5cce67ba0aafd9cf0bc3c31a3b24706bee26f4 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 6 Jun 2011 06:53:52 +0200
 Subject: [PATCH] console: add question-mark escape operator
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ui/console.c b/ui/console.c
-index 419b098c11..9688457480 100644
+index 419b098..9688457 100644
 --- a/ui/console.c
 +++ b/ui/console.c
 @@ -880,7 +880,7 @@ static void console_putchar(QemuConsole *s, int ch)

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

@@ -1,4 +1,4 @@
-From fa308eea691d12d8ec28a9bfa41bc51f8eeba5b3 Mon Sep 17 00:00:00 2001
+From dafee8907bcaa3ee580ebef4f76e7d62c14cd5c3 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
@@ -25,7 +25,7 @@ This patch fixes input when using -nographic on s390 for me.
  2 files changed, 16 insertions(+)
 
 diff --git a/chardev/char-mux.c b/chardev/char-mux.c
-index 5547a36a0a..7b80dc8ad7 100644
+index 5547a36..7b80dc8 100644
 --- a/chardev/char-mux.c
 +++ b/chardev/char-mux.c
 @@ -179,6 +179,15 @@ static void mux_chr_accept_input(Chardev *chr)
@@ -56,7 +56,7 @@ index 5547a36a0a..7b80dc8ad7 100644
       * set of muxes
       */
 diff --git a/chardev/char-mux.h b/chardev/char-mux.h
-index 9a2fffce91..d5f419c8a9 100644
+index 9a2fffc..d5f419c 100644
 --- a/chardev/char-mux.h
 +++ b/chardev/char-mux.h
 @@ -35,6 +35,9 @@ typedef struct MuxChardev {

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

@@ -1,4 +1,4 @@
-From 7f47bac93215430e836626b4c2ce0d58a343cbe1 Mon Sep 17 00:00:00 2001
+From 53b09a6f91e505d68429e5e67002fcd476d5e4ee Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 13 Dec 2012 14:29:22 +0100
 Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 1472d72f27..71d4f06bdb 100644
+index 1472d72..71d4f06 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -8076,9 +8076,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,

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

@@ -1,4 +1,4 @@
-From f846b37e5bd992bb1ae3e95728cbc1e25f4d1187 Mon Sep 17 00:00:00 2001
+From e374a2f8d62eaba772ef5da1deede30b5a3b6868 Mon Sep 17 00:00:00 2001
 From: Dinar Valeev <k0da@opensuse.org>
 Date: Wed, 2 Oct 2013 17:56:03 +0200
 Subject: [PATCH] configure: Enable PIE for ppc and ppc64 hosts
@@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index be4d326ae0..3308560f78 100755
+index be4d326..3308560 100755
 --- a/configure
 +++ b/configure
 @@ -1600,7 +1600,7 @@ fi

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

@@ -1,4 +1,4 @@
-From cbdcade7bc68890bb2ef65e19cb16bf5417a6326 Mon Sep 17 00:00:00 2001
+From 5d3ffee948660539ebe7dc51595986d18ae3701b Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 14 Jan 2015 01:32:11 +0100
 Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts
@@ -21,7 +21,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/util/thread-pool.c b/util/thread-pool.c
-index 610646d131..2e34e9846d 100644
+index 610646d..2e34e98 100644
 --- a/util/thread-pool.c
 +++ b/util/thread-pool.c
 @@ -308,7 +308,12 @@ static void thread_pool_init_one(ThreadPool *pool, AioContext *ctx)

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

@@ -1,4 +1,4 @@
-From ca1aaa94610f7629cebf6e8e07b56f27e3a9e009 Mon Sep 17 00:00:00 2001
+From 86965fe480a4bf416e69617166b4f9f8ee7044bd Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 15 Jun 2015 17:36:32 +0200
 Subject: [PATCH] dictzip: Fix on big endian systems
@@ -21,7 +21,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 28 insertions(+), 22 deletions(-)
 
 diff --git a/block/dictzip.c b/block/dictzip.c
-index 4b7e2db817..3235337164 100644
+index 4b7e2db..3235337 100644
 --- a/block/dictzip.c
 +++ b/block/dictzip.c
 @@ -156,6 +156,7 @@ static int dictzip_open(BlockDriverState *bs, QDict *options, int flags, Error *

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

@@ -1,4 +1,4 @@
-From 0cf4b7b2f134ffc4286b58adaba6a92a3f299a53 Mon Sep 17 00:00:00 2001
+From e583a3cabe6667f8446d6ba35bd1f730d3ac991f 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 456a2d5694..94e755d3e8 100644
+index 456a2d5..94e755d 100644
 --- a/hw/block/xen_disk.c
 +++ b/hw/block/xen_disk.c
 @@ -111,6 +111,7 @@ struct XenBlkDev {

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

@@ -1,4 +1,4 @@
-From 00d935a39ada219ae10e50ba565777627dd9486b Mon Sep 17 00:00:00 2001
+From 2818c2f6840a0169068d390e5756a79ad1f2fb08 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
@@ -19,7 +19,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 24 insertions(+), 3 deletions(-)
 
 diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
-index 5396fbfbb6..f3710b80a3 100644
+index 5396fbf..f3710b8 100644
 --- a/qemu-bridge-helper.c
 +++ b/qemu-bridge-helper.c
 @@ -110,7 +110,12 @@ static int parse_acl_file(const char *filename, ACLList *acl_list)

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

@@ -1,4 +1,4 @@
-From 54aa1b15c84fbc6deaf4b36e7cb7c9c644518f9b Mon Sep 17 00:00:00 2001
+From 108e17b16aa8372c04ec13ddeb566794ae336cf5 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@suse.de>
 Date: Fri, 12 Aug 2016 18:20:49 +0200
 Subject: [PATCH] qemu-binfmt-conf: use qemu-ARCH-binfmt
@@ -13,7 +13,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
-index 9fcd95a435..f14a6ef37b 100755
+index 9fcd95a..f14a6ef 100755
 --- a/scripts/qemu-binfmt-conf.sh
 +++ b/scripts/qemu-binfmt-conf.sh
 @@ -206,7 +206,7 @@ qemu_check_systemd() {

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

@@ -1,4 +1,4 @@
-From 98cc01e1d51fde2dc54583662f6857c7f8eb2162 Mon Sep 17 00:00:00 2001
+From eebe76eeffb2166f2ce71bd3445498e989235aa2 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
@@ -13,7 +13,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 3 insertions(+)
 
 diff --git a/configure b/configure
-index 3308560f78..cb7589a8e7 100755
+index 3308560..cb7589a 100755
 --- a/configure
 +++ b/configure
 @@ -1961,6 +1961,9 @@ if test "$seccomp" != "no" ; then

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

@@ -1,4 +1,4 @@
-From b4df54e9a93bcd071bc33953a718639b3c3cf50b Mon Sep 17 00:00:00 2001
+From 158de49a5e5ae6f0e90f3e3f381acf769e063988 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,7 +16,7 @@ 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 71d4f06bdb..78f0ea4c58 100644
+index 71d4f06..78f0ea4 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -10204,7 +10204,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,

0032-linux-user-remove-all-traces-of-qem.patch

@@ -1,4 +1,4 @@
-From 56bdee7001923770e68bca722ba72533a2c45b99 Mon Sep 17 00:00:00 2001
+From 0206a322d7067b3b74c868f2d80e8dfb4c24de97 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@suse.de>
 Date: Wed, 28 Sep 2016 16:36:40 +0200
 Subject: [PATCH] linux-user: remove all traces of qemu from /proc/self/cmdline
@@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 7 insertions(+), 40 deletions(-)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 78f0ea4c58..1e56583d63 100644
+index 78f0ea4..1e56583 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
 @@ -7374,52 +7374,19 @@ int host_to_target_waitstatus(int status)

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

@@ -1,4 +1,4 @@
-From bcf46b2c9529afdf391d5b7729b20b3255d0bce6 Mon Sep 17 00:00:00 2001
+From efc73d004696dada76a417cb2797593493e94f66 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Sat, 19 Nov 2016 08:06:30 -0700
 Subject: [PATCH] roms/Makefile: pass a packaging timestamp to subpackages with
@@ -20,7 +20,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/roms/Makefile b/roms/Makefile
-index b5e5a69e91..89d69eb350 100644
+index b5e5a69..89d69eb 100644
 --- a/roms/Makefile
 +++ b/roms/Makefile
 @@ -52,6 +52,12 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org"

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

@@ -1,4 +1,4 @@
-From 5e7c7e036010f9911975aee4094ca4a14155701d Mon Sep 17 00:00:00 2001
+From 0b4661283cb4ea49967dd1a9b1f977a4fbc9e804 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 e0f2ec86a9..caad3f93b3 100644
+index e0f2ec8..caad3f9 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -26,6 +26,7 @@

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

@@ -1,4 +1,4 @@
-From 23fd25c2bed2c5be0c8123b6d4d0ba1184284e79 Mon Sep 17 00:00:00 2001
+From 28085d5db9376007294f5189c559d3182a2a98f4 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,7 +19,7 @@ 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 c4602ca80d..81c02c5a3b 100644
+index c4602ca..81c02c5 100644
 --- a/target/i386/cpu.h
 +++ b/target/i386/cpu.h
 @@ -1488,7 +1488,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);

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

@@ -1,4 +1,4 @@
-From ad664af23611c3a0e99500eb0fde74b0293cc359 Mon Sep 17 00:00:00 2001
+From dec5ed741c369aed84b47752e43ad0eace76b75b 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,7 +25,7 @@ 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 9f102aa388..1c09005293 100644
+index 9f102aa..1c09005 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
 @@ -779,7 +779,32 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,

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

@@ -1,4 +1,4 @@
-From 63a87039db14895506033106730691bc61bcb6bb Mon Sep 17 00:00:00 2001
+From 5013ff917f276a6d9edc2ca0ab93fed93a7ac653 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,7 +17,7 @@ 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 e18299a482..bc676c4664 100644
+index e18299a..bc676c4 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)

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

@@ -1,4 +1,4 @@
-From 71d3048652300cadcbcfbbed0c80a64ca3af0d2a Mon Sep 17 00:00:00 2001
+From e681140d293caba3f27ccadfd872473725021aa2 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 a553a7e110..c34f761175 100644
+index a553a7e..c34f761 100644
 --- a/hw/acpi/piix4.c
 +++ b/hw/acpi/piix4.c
 @@ -311,7 +311,7 @@ static const VMStateDescription vmstate_cpuhp_state = {

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

@@ -1,4 +1,4 @@
-From d0ff6fd851f40cacec6adf47d6ae0b5fbaa8cdc0 Mon Sep 17 00:00:00 2001
+From 76e9783f2f222d9650e620082cf1741002d9fd88 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,7 +24,7 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
  1 file changed, 19 insertions(+)
 
 diff --git a/ui/vnc.c b/ui/vnc.c
-index 486d2759e4..51d6f2353f 100644
+index 486d275..51d6f23 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
 @@ -1668,6 +1668,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)

0040-fix-xen-hvm-direct-kernel-boot.patch

@@ -1,4 +1,4 @@
-From 3da950b6028c09fcdd8c69c84ba51bae11120008 Mon Sep 17 00:00:00 2001
+From 301054b84a2e3b31768ec107f549e4742c4a15d6 Mon Sep 17 00:00:00 2001
 From: Chunyan Liu <cyliu@suse.com>
 Date: Fri, 29 Apr 2016 11:17:08 +0800
 Subject: [PATCH] fix xen hvm direct kernel boot
@@ -29,7 +29,7 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/hw/core/loader.c b/hw/core/loader.c
-index bf17b42cbe..14dc6e116f 100644
+index bf17b42..14dc6e1 100644
 --- a/hw/core/loader.c
 +++ b/hw/core/loader.c
 @@ -55,6 +55,7 @@

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

@@ -1,4 +1,4 @@
-From 266fcfd009fea38efec4f7f974b164840e1dd980 Mon Sep 17 00:00:00 2001
+From b6acefe54f39380e601ea553b8d2109c92427143 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,7 +22,7 @@ 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 c089491c24..fedbda7895 100644
+index c089491..fedbda7 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)

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

@@ -1,4 +1,4 @@
-From b3aaf0a9eb21406c3272c9823e74de1c5801f864 Mon Sep 17 00:00:00 2001
+From 610feec09278e8f2112c77c32d9c2e6633859730 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 79313a7..e00194a 100644
 --- a/tests/test-string-input-visitor.c
 +++ b/tests/test-string-input-visitor.c
 @@ -58,6 +58,14 @@ static void test_visitor_in_int(TestInputVisitorData *data,

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

@@ -1,4 +1,4 @@
-From fc586f9d96a564ce4eaee7a45440fa1205be384e Mon Sep 17 00:00:00 2001
+From c22b22f0d807e8dc81c94dfbea4d95864bd79586 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 e00194a..5587827 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,

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

@@ -1,4 +1,4 @@
-From fa088d9551d98f6c982d4cb7a4618ee7ae6e2a95 Mon Sep 17 00:00:00 2001
+From 1c4096e92b45e128c7b10d7eb03c64b1f6437152 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,7 +17,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  create mode 100644 tests/check-qom-props.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index c60235eaf6..a023f5d70e 100644
+index c60235e..a023f5d 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -1419,6 +1419,7 @@ F: qom/
@@ -29,7 +29,7 @@ index c60235eaf6..a023f5d70e 100644
  
  QMP
 diff --git a/tests/Makefile.include b/tests/Makefile.include
-index f3de81fcfb..ca8f859f79 100644
+index f3de81f..ca8f859 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
 @@ -92,6 +92,8 @@ check-unit-y += tests/check-qom-interface$(EXESUF)
@@ -51,7 +51,7 @@ index f3de81fcfb..ca8f859f79 100644
  tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y)
 diff --git a/tests/check-qom-props.c b/tests/check-qom-props.c
 new file mode 100644
-index 0000000000..681e121c07
+index 0000000..681e121
 --- /dev/null
 +++ b/tests/check-qom-props.c
 @@ -0,0 +1,122 @@

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

@@ -1,4 +1,4 @@
-From f381f8f04bde439bebea1848d7fb2289309569b8 Mon Sep 17 00:00:00 2001
+From 5739c0d7a8ddc5aeb056aee239b2339df4d22189 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,7 +20,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  create mode 100644 tests/scsi-disk-test.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index a023f5d70e..9840d5bb68 100644
+index a023f5d..9840d5b 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -957,6 +957,7 @@ M: Paolo Bonzini <pbonzini@redhat.com>
@@ -32,7 +32,7 @@ index a023f5d70e..9840d5bb68 100644
  T: git git://github.com/bonzini/qemu.git scsi-next
  
 diff --git a/tests/Makefile.include b/tests/Makefile.include
-index ca8f859f79..85187d4b8c 100644
+index ca8f859..85187d4 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
 @@ -161,6 +161,8 @@ check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF)
@@ -54,7 +54,7 @@ index ca8f859f79..85187d4b8c 100644
  tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y)
 diff --git a/tests/scsi-disk-test.c b/tests/scsi-disk-test.c
 new file mode 100644
-index 0000000000..f19f93d97a
+index 0000000..f19f93d
 --- /dev/null
 +++ b/tests/scsi-disk-test.c
 @@ -0,0 +1,82 @@

0046-RFC-update-Linux-headers-from-irqs-.patch

@@ -1,4 +1,4 @@
-From fdd612fbddddb3b3de6184eb21f6039a0e40c65d Mon Sep 17 00:00:00 2001
+From bc9b2977224fcea4131448ade1e122c36411435d Mon Sep 17 00:00:00 2001
 From: Christoffer Dall <cdall@linaro.org>
 Date: Tue, 28 Mar 2017 16:12:03 +0200
 Subject: [PATCH] RFC: update Linux headers from irqs-to-user-v3
@@ -15,7 +15,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  3 files changed, 12 insertions(+)
 
 diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h
-index 1101d55d2f..8a1654a55b 100644
+index 1101d55..8a1654a 100644
 --- a/linux-headers/asm-arm/kvm.h
 +++ b/linux-headers/asm-arm/kvm.h
 @@ -114,6 +114,8 @@ struct kvm_debug_exit_arch {
@@ -28,7 +28,7 @@ index 1101d55d2f..8a1654a55b 100644
  
  struct kvm_arch_memory_slot {
 diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h
-index 651ec30040..1bc8346f0d 100644
+index 651ec30..1bc8346 100644
 --- a/linux-headers/asm-arm64/kvm.h
 +++ b/linux-headers/asm-arm64/kvm.h
 @@ -143,6 +143,8 @@ struct kvm_debug_exit_arch {
@@ -41,7 +41,7 @@ index 651ec30040..1bc8346f0d 100644
  
  struct kvm_arch_memory_slot {
 diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
-index 4e082a81b4..72f0d21103 100644
+index 4e082a8..72f0d21 100644
 --- a/linux-headers/linux/kvm.h
 +++ b/linux-headers/linux/kvm.h
 @@ -883,6 +883,7 @@ struct kvm_ppc_resize_hpt {

0047-ARM-KVM-Enable-in-kernel-timers-wit.patch

@@ -1,4 +1,4 @@
-From 417d509b711678938a1c1b8e7ad5a10b9f2613b6 Mon Sep 17 00:00:00 2001
+From 3227a2bdc7a494194a6a4f7d5653ff178ecb1b2f Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 19 Sep 2016 10:02:55 +0200
 Subject: [PATCH] ARM: KVM: Enable in-kernel timers with user space gic
@@ -20,7 +20,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  3 files changed, 43 insertions(+), 1 deletion(-)
 
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index 5f62a0321e..a1d24a4db6 100644
+index 5f62a03..a1d24a4 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
 @@ -609,6 +609,16 @@ static void create_gic(VirtMachineState *vms, qemu_irq *pic)
@@ -41,7 +41,7 @@ index 5f62a0321e..a1d24a4db6 100644
  
  static void create_uart(const VirtMachineState *vms, qemu_irq *pic, int uart,
 diff --git a/target/arm/cpu.h b/target/arm/cpu.h
-index a8aabce7dd..19cb596449 100644
+index a8aabce..19cb596 100644
 --- a/target/arm/cpu.h
 +++ b/target/arm/cpu.h
 @@ -702,6 +702,9 @@ struct ARMCPU {
@@ -55,7 +55,7 @@ index a8aabce7dd..19cb596449 100644
  
  static inline ARMCPU *arm_env_get_cpu(CPUARMState *env)
 diff --git a/target/arm/kvm.c b/target/arm/kvm.c
-index 45554682f2..dccb326615 100644
+index 4555468..dccb326 100644
 --- a/target/arm/kvm.c
 +++ b/target/arm/kvm.c
 @@ -174,6 +174,12 @@ int kvm_arch_init(MachineState *ms, KVMState *s)

0048-input-Add-trace-event-for-empty-key.patch

@@ -1,4 +1,4 @@
-From 3ec21f24be4c96c2ea5cdae8548a2222b984961a Mon Sep 17 00:00:00 2001
+From c376e77aa2dd2489101c8d89a55771a67332447b Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 30 Mar 2017 15:32:08 +0200
 Subject: [PATCH] input: Add trace event for empty keyboard queue
@@ -20,7 +20,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  2 files changed, 5 insertions(+)
 
 diff --git a/hw/input/hid.c b/hw/input/hid.c
-index fa9cc4c616..93887ecc43 100644
+index fa9cc4c..93887ec 100644
 --- a/hw/input/hid.c
 +++ b/hw/input/hid.c
 @@ -256,6 +256,10 @@ static void hid_keyboard_process_keycode(HIDState *hs)
@@ -35,7 +35,7 @@ index fa9cc4c616..93887ecc43 100644
      index = key | ((hs->kbd.modifiers & (1 << 8)) >> 1);
      hid_code = hid_usage_keys[index];
 diff --git a/hw/input/trace-events b/hw/input/trace-events
-index f3bfbede5c..5a87818b49 100644
+index f3bfbed..5a87818 100644
 --- a/hw/input/trace-events
 +++ b/hw/input/trace-events
 @@ -24,6 +24,7 @@ milkymist_softusb_pulse_irq(void) "Pulse IRQ"

0049-ACPI-don-t-call-acpi_pcihp_device_p.patch

@@ -0,0 +1,47 @@
+From 9df0bb18bea5bc5cb4f292cfa4b51018cb2c70d9 Mon Sep 17 00:00:00 2001
+From: Bruce Rogers <brogers@suse.com>
+Date: Thu, 27 Apr 2017 13:43:58 -0600
+Subject: [PATCH] ACPI: don't call acpi_pcihp_device_plug_cb on xen
+
+Commit f0c9d64a exposed the issue that with a xenfv machine using
+pci passthrough, acpi cpi hotplug code was being executed by mistake.
+Guard calls to acpi_pcihp_device_plug_cb (and corresponding
+acpi_pcihp_device_unplug_cb) with a check for xen_enabled(). Without
+this check I am seeing an error that the bus doesn't have the
+acpi-pcihp-bsel property set.
+
+[BR: BSC#1034131]
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+---
+ hw/acpi/piix4.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
+index c34f761..ae1cb26 100644
+--- a/hw/acpi/piix4.c
++++ b/hw/acpi/piix4.c
+@@ -385,7 +385,10 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev,
+                                 dev, errp);
+         }
+     } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+-        acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, errp);
++        if (!xen_enabled()) {
++            acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev,
++                                      errp);
++        }
+     } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+         if (s->cpu_hotplug_legacy) {
+             legacy_acpi_cpu_plug_cb(hotplug_dev, &s->gpe_cpu, dev, errp);
+@@ -408,8 +411,10 @@ static void piix4_device_unplug_request_cb(HotplugHandler *hotplug_dev,
+         acpi_memory_unplug_request_cb(hotplug_dev, &s->acpi_memory_hotplug,
+                                       dev, errp);
+     } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+-        acpi_pcihp_device_unplug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev,
+-                                    errp);
++        if (!xen_enabled()) {
++            acpi_pcihp_device_unplug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev,
++                                        errp);
++        }
+     } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) &&
+                !s->cpu_hotplug_legacy) {
+         acpi_cpu_unplug_request_cb(hotplug_dev, &s->cpuhp_state, dev, errp);

0050-i386-Allow-cpuid-bit-override.patch

@@ -0,0 +1,102 @@
+From 475a538eb562cb8cb757105957b10903c420945a Mon Sep 17 00:00:00 2001
+From: Alexander Graf <agraf@suse.de>
+Date: Tue, 28 Mar 2017 05:27:00 -0600
+Subject: [PATCH] i386: Allow cpuid bit override
+
+KVM has a feature bitmap of CPUID bits that it knows works for guests.
+QEMU removes bits that are not part of that bitmap automatically on VM
+start.
+
+However, some times we just don't list features in that list because
+they don't make sense for normal scenarios, but may be useful in specific,
+targeted workloads.
+
+For that purpose, add a new =force option to all CPUID feature flags in
+the CPU property. With that we can override the accel filtering and give
+users full control over the CPUID feature bits exposed into guests.
+
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ target/i386/cpu.c | 25 ++++++++++++++++++++++---
+ target/i386/cpu.h |  3 +++
+ 2 files changed, 25 insertions(+), 3 deletions(-)
+
+diff --git a/target/i386/cpu.c b/target/i386/cpu.c
+index 13c0985..6105fc5 100644
+--- a/target/i386/cpu.c
++++ b/target/i386/cpu.c
+@@ -2229,7 +2229,7 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf)
+     g_slist_foreach(list, x86_cpu_list_entry, &s);
+     g_slist_free(list);
+ 
+-    (*cpu_fprintf)(f, "\nRecognized CPUID flags:\n");
++    (*cpu_fprintf)(f, "\nRecognized CPUID flags (=on|=off|=force):\n");
+     for (i = 0; i < ARRAY_SIZE(feature_word_info); i++) {
+         FeatureWordInfo *fw = &feature_word_info[i];
+ 
+@@ -3464,6 +3464,7 @@ static int x86_cpu_filter_features(X86CPU *cpu)
+             x86_cpu_get_supported_feature_word(w, false);
+         uint32_t requested_features = env->features[w];
+         env->features[w] &= host_feat;
++        env->features[w] |= cpu->forced_features[w];
+         cpu->filtered_features[w] = requested_features & ~env->features[w];
+         if (cpu->filtered_features[w]) {
+             rv = 1;
+@@ -3706,8 +3707,17 @@ static void x86_cpu_get_bit_prop(Object *obj, Visitor *v, const char *name,
+     X86CPU *cpu = X86_CPU(obj);
+     BitProperty *fp = opaque;
+     uint32_t f = cpu->env.features[fp->w];
++    uint32_t ff = cpu->forced_features[fp->w];
+     bool value = (f & fp->mask) == fp->mask;
+-    visit_type_bool(v, name, &value, errp);
++    bool forced = (ff & fp->mask) == fp->mask;
++    char str[] = "force";
++    char *strval = str;
++
++    if (forced) {
++        visit_type_str(v, name, &strval, errp);
++    } else {
++        visit_type_bool(v, name, &value, errp);
++    }
+ }
+ 
+ static void x86_cpu_set_bit_prop(Object *obj, Visitor *v, const char *name,
+@@ -3717,6 +3727,7 @@ static void x86_cpu_set_bit_prop(Object *obj, Visitor *v, const char *name,
+     X86CPU *cpu = X86_CPU(obj);
+     BitProperty *fp = opaque;
+     Error *local_err = NULL;
++    char *strval = NULL;
+     bool value;
+ 
+     if (dev->realized) {
+@@ -3724,7 +3735,15 @@ static void x86_cpu_set_bit_prop(Object *obj, Visitor *v, const char *name,
+         return;
+     }
+ 
+-    visit_type_bool(v, name, &value, &local_err);
++    visit_type_str(v, name, &strval, &local_err);
++    if (!local_err && !strcmp(strval, "force")) {
++        value = true;
++        cpu->forced_features[fp->w] |= fp->mask;
++    } else {
++        local_err = NULL;
++        visit_type_bool(v, name, &value, &local_err);
++    }
++
+     if (local_err) {
+         error_propagate(errp, local_err);
+         return;
+diff --git a/target/i386/cpu.h b/target/i386/cpu.h
+index 81c02c5..a458c3a 100644
+--- a/target/i386/cpu.h
++++ b/target/i386/cpu.h
+@@ -1230,6 +1230,9 @@ struct X86CPU {
+     /* Features that were filtered out because of missing host capabilities */
+     uint32_t filtered_features[FEATURE_WORDS];
+ 
++    /* Features that are force enabled despite incompatible accel */
++    uint32_t forced_features[FEATURE_WORDS];
++
+     /* Enable PMU CPUID bits. This can't be enabled by default yet because
+      * it doesn't have ABI stability guarantees, as it passes all PMU CPUID
+      * bits returned by GET_SUPPORTED_CPUID (that depend on host CPU and kernel

qemu-linux-user.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr 27 20:09:41 UTC 2017 - brogers@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9
+* Patches added:
+  0049-ACPI-don-t-call-acpi_pcihp_device_p.patch
+  0050-i386-Allow-cpuid-bit-override.patch
+
 -------------------------------------------------------------------
 Thu Apr 20 16:34:21 UTC 2017 - brogers@suse.com
 

qemu-linux-user.spec

@@ -74,6 +74,8 @@ Patch0045:      0045-tests-Add-scsi-disk-test.patch
 Patch0046:      0046-RFC-update-Linux-headers-from-irqs-.patch
 Patch0047:      0047-ARM-KVM-Enable-in-kernel-timers-wit.patch
 Patch0048:      0048-input-Add-trace-event-for-empty-key.patch
+Patch0049:      0049-ACPI-don-t-call-acpi_pcihp_device_p.patch
+Patch0050:      0050-i386-Allow-cpuid-bit-override.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 Source400:      update_git.sh
@@ -175,6 +177,8 @@ run cross-architecture builds.
 %patch0046 -p1
 %patch0047 -p1
 %patch0048 -p1
+%patch0049 -p1
+%patch0050 -p1
 
 %build
 ./configure \

qemu-testsuite.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 27 20:09:38 UTC 2017 - brogers@suse.com
+
+- Fix issue in shipping qemu v2.9.0, where pci-passthrough for Xen
+  HVM guests got broken (bsc#1034131)
+  0049-ACPI-don-t-call-acpi_pcihp_device_p.patch
+- Include experimental, unsupported feature to assist in some
+  performance analysis work.
+  0050-i386-Allow-cpuid-bit-override.patch
+
 -------------------------------------------------------------------
 Thu Apr 20 16:30:38 UTC 2017 - brogers@suse.com
 

qemu-testsuite.spec

@@ -178,6 +178,8 @@ Patch0045:      0045-tests-Add-scsi-disk-test.patch
 Patch0046:      0046-RFC-update-Linux-headers-from-irqs-.patch
 Patch0047:      0047-ARM-KVM-Enable-in-kernel-timers-wit.patch
 Patch0048:      0048-input-Add-trace-event-for-empty-key.patch
+Patch0049:      0049-ACPI-don-t-call-acpi_pcihp_device_p.patch
+Patch0050:      0050-i386-Allow-cpuid-bit-override.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -866,6 +868,8 @@ This package provides a service file for starting and stopping KSM.
 %patch0046 -p1
 %patch0047 -p1
 %patch0048 -p1
+%patch0049 -p1
+%patch0050 -p1
 
 pushd roms/ipxe
 %patch1100 -p1

qemu.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 27 20:09:38 UTC 2017 - brogers@suse.com
+
+- Fix issue in shipping qemu v2.9.0, where pci-passthrough for Xen
+  HVM guests got broken (bsc#1034131)
+  0049-ACPI-don-t-call-acpi_pcihp_device_p.patch
+- Include experimental, unsupported feature to assist in some
+  performance analysis work.
+  0050-i386-Allow-cpuid-bit-override.patch
+
 -------------------------------------------------------------------
 Thu Apr 20 16:30:38 UTC 2017 - brogers@suse.com
 

qemu.spec

@@ -178,6 +178,8 @@ Patch0045:      0045-tests-Add-scsi-disk-test.patch
 Patch0046:      0046-RFC-update-Linux-headers-from-irqs-.patch
 Patch0047:      0047-ARM-KVM-Enable-in-kernel-timers-wit.patch
 Patch0048:      0048-input-Add-trace-event-for-empty-key.patch
+Patch0049:      0049-ACPI-don-t-call-acpi_pcihp_device_p.patch
+Patch0050:      0050-i386-Allow-cpuid-bit-override.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -866,6 +868,8 @@ This package provides a service file for starting and stopping KSM.
 %patch0046 -p1
 %patch0047 -p1
 %patch0048 -p1
+%patch0049 -p1
+%patch0050 -p1
 
 pushd roms/ipxe
 %patch1100 -p1