From fb435f43f3e56278326fa54559a009a269257d807e0ea7936ba7e17a78408d82 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Fri, 5 May 2017 15:05:43 +0000 Subject: [PATCH] Accepting request 493037 from home:bfrogers:branches:Virtualization Fix build issues for some older distros. Also includes fixing broken parts of spec file when not building x86 firmware. OBS-URL: https://build.opensuse.org/request/show/493037 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=338 --- 0001-XXX-dont-dump-core-on-sigabort.patch | 2 +- ...-qemu-binfmt-conf-Modify-default-pat.patch | 2 +- 0003-qemu-cvs-alsa_bitfield.patch | 4 +- 0004-qemu-cvs-alsa_ioctl.patch | 12 ++--- 0005-qemu-cvs-alsa_mmap.patch | 2 +- 0006-qemu-cvs-gettimeofday.patch | 2 +- 0007-qemu-cvs-ioctl_debug.patch | 2 +- 0008-qemu-cvs-ioctl_nodirection.patch | 2 +- ...-linux-user-add-binfmt-wrapper-for-a.patch | 6 +-- 0010-PPC-KVM-Disable-mmu-notifier-check.patch | 2 +- 0011-linux-user-fix-segfault-deadlock.patch | 2 +- ...-linux-user-binfmt-support-host-bina.patch | 2 +- 0013-linux-user-Fake-proc-cpuinfo.patch | 2 +- 0014-linux-user-XXX-disable-fiemap.patch | 2 +- 0015-slirp-nooutgoing.patch | 8 ++-- ...-vnc-password-file-and-incoming-conn.patch | 2 +- 0017-linux-user-use-target_ulong.patch | 4 +- ...-block-Add-support-for-DictZip-enabl.patch | 4 +- 0019-block-Add-tar-container-format.patch | 4 +- ...-Legacy-Patch-kvm-qemu-preXX-dictzip.patch | 2 +- ...-console-add-question-mark-escape-op.patch | 2 +- ...-Make-char-muxer-more-robust-wrt-sma.patch | 4 +- ...-linux-user-lseek-explicitly-cast-no.patch | 2 +- ...-configure-Enable-PIE-for-ppc-and-pp.patch | 2 +- ...-AIO-Reduce-number-of-threads-for-32.patch | 2 +- 0026-dictzip-Fix-on-big-endian-systems.patch | 2 +- ...-xen_disk-Add-suse-specific-flush-di.patch | 2 +- ...-qemu-bridge-helper-reduce-security-.patch | 2 +- ...-qemu-binfmt-conf-use-qemu-ARCH-binf.patch | 2 +- ...-configure-Fix-detection-of-seccomp-.patch | 2 +- ...-linux-user-properly-test-for-infini.patch | 2 +- ...-linux-user-remove-all-traces-of-qem.patch | 2 +- ...-roms-Makefile-pass-a-packaging-time.patch | 2 +- ...-Raise-soft-address-space-limit-to-h.patch | 2 +- ...-increase-x86_64-physical-bits-to-42.patch | 2 +- ...-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch | 2 +- 0037-i8254-Fix-migration-from-SLE11-SP2.patch | 2 +- ...-acpi_piix4-Fix-migration-from-SLE11.patch | 2 +- 0039-Fix-tigervnc-long-press-issue.patch | 2 +- 0040-fix-xen-hvm-direct-kernel-boot.patch | 2 +- ...-string-input-visitor-Fix-uint64-par.patch | 2 +- ...-test-string-input-visitor-Add-int-t.patch | 2 +- ...-test-string-input-visitor-Add-uint6.patch | 2 +- 0044-tests-Add-QOM-property-unit-tests.patch | 6 +-- 0045-tests-Add-scsi-disk-test.patch | 6 +-- ...-RFC-update-Linux-headers-from-irqs-.patch | 6 +-- ...-ARM-KVM-Enable-in-kernel-timers-wit.patch | 6 +-- ...-input-Add-trace-event-for-empty-key.patch | 4 +- ...-ACPI-don-t-call-acpi_pcihp_device_p.patch | 2 +- 0050-i386-Allow-cpuid-bit-override.patch | 4 +- qemu-testsuite.changes | 10 ++++ qemu-testsuite.spec | 46 ++++++++++++++++--- qemu.changes | 10 ++++ qemu.spec | 46 ++++++++++++++++--- qemu.spec.in | 46 ++++++++++++++++--- 55 files changed, 212 insertions(+), 96 deletions(-) diff --git a/0001-XXX-dont-dump-core-on-sigabort.patch b/0001-XXX-dont-dump-core-on-sigabort.patch index 8744e1fe..94dc0384 100644 --- a/0001-XXX-dont-dump-core-on-sigabort.patch +++ b/0001-XXX-dont-dump-core-on-sigabort.patch @@ -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 a67db04..a11728f 100644 +index a67db04e1a..a11728f6e0 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) diff --git a/0002-qemu-binfmt-conf-Modify-default-pat.patch b/0002-qemu-binfmt-conf-Modify-default-pat.patch index 1795f96b..b8d4f990 100644 --- a/0002-qemu-binfmt-conf-Modify-default-pat.patch +++ b/0002-qemu-binfmt-conf-Modify-default-pat.patch @@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh -index 0f1aa63..9fcd95a 100755 +index 0f1aa63872..9fcd95a435 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -264,7 +264,7 @@ BINFMT_SET=qemu_register_interpreter diff --git a/0003-qemu-cvs-alsa_bitfield.patch b/0003-qemu-cvs-alsa_bitfield.patch index 5089b060..50bd5d6b 100644 --- a/0003-qemu-cvs-alsa_bitfield.patch +++ b/0003-qemu-cvs-alsa_bitfield.patch @@ -13,7 +13,7 @@ Signed-off-by: Ulrich Hecht 2 files changed, 24 insertions(+) diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h -index f19ef4b..b2659e0 100644 +index f19ef4b230..b2659e0def 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 f19ef4b..b2659e0 100644 case TYPE_LONGLONG: case TYPE_ULONGLONG: diff --git a/thunk.c b/thunk.c -index 2dac366..0eb7286 100644 +index 2dac36666d..0eb72861fe 100644 --- a/thunk.c +++ b/thunk.c @@ -37,6 +37,7 @@ static inline const argtype *thunk_type_next(const argtype *type_ptr) diff --git a/0004-qemu-cvs-alsa_ioctl.patch b/0004-qemu-cvs-alsa_ioctl.patch index d6b3ab66..c46ca601 100644 --- a/0004-qemu-cvs-alsa_ioctl.patch +++ b/0004-qemu-cvs-alsa_ioctl.patch @@ -27,7 +27,7 @@ Signed-off-by: Bruce Rogers create mode 100644 linux-user/syscall_types_alsa.h diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h -index e6997ff..ea335de 100644 +index e6997ff230..ea335de680 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -359,6 +359,11 @@ @@ -44,7 +44,7 @@ index e6997ff..ea335de 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 0000000..c2aa542 +index 0000000000..c2aa542c3b --- /dev/null +++ b/linux-user/ioctls_alsa.h @@ -0,0 +1,467 @@ @@ -517,7 +517,7 @@ index 0000000..c2aa542 +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 0000000..e09a30d +index 0000000000..e09a30defb --- /dev/null +++ b/linux-user/ioctls_alsa_structs.h @@ -0,0 +1,1740 @@ @@ -2262,7 +2262,7 @@ index 0000000..e09a30d + unsigned char *code; +}; diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h -index 40c5027..a34551d 100644 +index 40c5027e93..a34551debc 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 40c5027..a34551d 100644 #define TARGET_SIGEV_MAX_SIZE 64 diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h -index 24631b0..80ac53a 100644 +index 24631b09be..80ac53a8ed 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 24631b0..80ac53a 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 0000000..fa7a18d +index 0000000000..fa7a18d755 --- /dev/null +++ b/linux-user/syscall_types_alsa.h @@ -0,0 +1,1330 @@ diff --git a/0005-qemu-cvs-alsa_mmap.patch b/0005-qemu-cvs-alsa_mmap.patch index f86fdaa5..75bd5cb1 100644 --- a/0005-qemu-cvs-alsa_mmap.patch +++ b/0005-qemu-cvs-alsa_mmap.patch @@ -12,7 +12,7 @@ Signed-off-by: Ulrich Hecht 1 file changed, 14 insertions(+) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 4888f53..a3fcea2 100644 +index 4888f53139..a3fcea263f 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) diff --git a/0006-qemu-cvs-gettimeofday.patch b/0006-qemu-cvs-gettimeofday.patch index 8d41fda3..f737a122 100644 --- a/0006-qemu-cvs-gettimeofday.patch +++ b/0006-qemu-cvs-gettimeofday.patch @@ -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 cec8428..03c3576 100644 +index cec8428589..03c3576dab 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, diff --git a/0007-qemu-cvs-ioctl_debug.patch b/0007-qemu-cvs-ioctl_debug.patch index 3956e822..13c7bb59 100644 --- a/0007-qemu-cvs-ioctl_debug.patch +++ b/0007-qemu-cvs-ioctl_debug.patch @@ -12,7 +12,7 @@ Signed-off-by: Ulrich Hecht 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 03c3576..891ee1c 100644 +index 03c3576dab..891ee1c6ea 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) diff --git a/0008-qemu-cvs-ioctl_nodirection.patch b/0008-qemu-cvs-ioctl_nodirection.patch index 280e408a..155f1e52 100644 --- a/0008-qemu-cvs-ioctl_nodirection.patch +++ b/0008-qemu-cvs-ioctl_nodirection.patch @@ -15,7 +15,7 @@ Signed-off-by: Ulrich Hecht 1 file changed, 6 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 891ee1c..2f82a7d 100644 +index 891ee1c6ea..2f82a7d1a6 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) diff --git a/0009-linux-user-add-binfmt-wrapper-for-a.patch b/0009-linux-user-add-binfmt-wrapper-for-a.patch index 25b4750b..e80adb6f 100644 --- a/0009-linux-user-add-binfmt-wrapper-for-a.patch +++ b/0009-linux-user-add-binfmt-wrapper-for-a.patch @@ -37,7 +37,7 @@ Signed-off-by: Andreas Färber create mode 100644 linux-user/binfmt.c diff --git a/Makefile.target b/Makefile.target -index 7df2b8c..85ae084 100644 +index 7df2b8c149..85ae084545 100644 --- a/Makefile.target +++ b/Makefile.target @@ -36,6 +36,10 @@ endif @@ -83,7 +83,7 @@ index 7df2b8c..85ae084 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 8c93058..607ca2d 100644 +index 8c93058100..607ca2dc92 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 8c93058..607ca2d 100644 +obj-binfmt-y = binfmt.o diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c new file mode 100644 -index 0000000..cd1f513 +index 0000000000..cd1f513b33 --- /dev/null +++ b/linux-user/binfmt.c @@ -0,0 +1,42 @@ diff --git a/0010-PPC-KVM-Disable-mmu-notifier-check.patch b/0010-PPC-KVM-Disable-mmu-notifier-check.patch index c0988e62..c8e924f8 100644 --- a/0010-PPC-KVM-Disable-mmu-notifier-check.patch +++ b/0010-PPC-KVM-Disable-mmu-notifier-check.patch @@ -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 c97ef4a..b47b3f9 100644 +index c97ef4a8da..b47b3f9096 100644 --- a/exec.c +++ b/exec.c @@ -1362,11 +1362,13 @@ static void *file_ram_alloc(RAMBlock *block, diff --git a/0011-linux-user-fix-segfault-deadlock.patch b/0011-linux-user-fix-segfault-deadlock.patch index 920a62e6..15f0469e 100644 --- a/0011-linux-user-fix-segfault-deadlock.patch +++ b/0011-linux-user-fix-segfault-deadlock.patch @@ -26,7 +26,7 @@ Signed-off-by: Andreas Färber 1 file changed, 4 insertions(+) diff --git a/user-exec.c b/user-exec.c -index a8f95fa..c262653 100644 +index a8f95fa1e1..c262653604 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/0012-linux-user-binfmt-support-host-bina.patch b/0012-linux-user-binfmt-support-host-bina.patch index 73ae2452..c796aca1 100644 --- a/0012-linux-user-binfmt-support-host-bina.patch +++ b/0012-linux-user-binfmt-support-host-bina.patch @@ -12,7 +12,7 @@ Signed-off-by: Alexander Graf 1 file changed, 26 insertions(+) diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c -index cd1f513..458f136 100644 +index cd1f513b33..458f136fb4 100644 --- a/linux-user/binfmt.c +++ b/linux-user/binfmt.c @@ -5,6 +5,9 @@ diff --git a/0013-linux-user-Fake-proc-cpuinfo.patch b/0013-linux-user-Fake-proc-cpuinfo.patch index bf2c386b..4dc26bdf 100644 --- a/0013-linux-user-Fake-proc-cpuinfo.patch +++ b/0013-linux-user-Fake-proc-cpuinfo.patch @@ -22,7 +22,7 @@ Signed-off-by: Andreas Färber 1 file changed, 20 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 2f82a7d..37b49bd 100644 +index 2f82a7d1a6..37b49bd406 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) diff --git a/0014-linux-user-XXX-disable-fiemap.patch b/0014-linux-user-XXX-disable-fiemap.patch index 25d72021..6e4e6184 100644 --- a/0014-linux-user-XXX-disable-fiemap.patch +++ b/0014-linux-user-XXX-disable-fiemap.patch @@ -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 37b49bd..983475a 100644 +index 37b49bd406..983475a0b9 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, diff --git a/0015-slirp-nooutgoing.patch b/0015-slirp-nooutgoing.patch index cab15035..76e4dbbf 100644 --- a/0015-slirp-nooutgoing.patch +++ b/0015-slirp-nooutgoing.patch @@ -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 99af8ed..4712277 100644 +index 99af8edf5f..4712277d7c 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 99af8ed..4712277 100644 "-singlestep always run in singlestep mode\n", QEMU_ARCH_ALL) STEXI diff --git a/slirp/socket.c b/slirp/socket.c -index 8692772..5c89064 100644 +index 86927722e1..5c89064e15 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -625,6 +625,8 @@ sorecvfrom(struct socket *so) @@ -59,7 +59,7 @@ index 8692772..5c89064 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 ed16e18..b2c7a8c 100644 +index ed16e1807f..b2c7a8cba0 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 ed16e18..b2c7a8c 100644 socket_set_fast_reuse(s); opt = 1; diff --git a/vl.c b/vl.c -index 0b4ed52..e0f2ec8 100644 +index 0b4ed5241c..e0f2ec86a9 100644 --- a/vl.c +++ b/vl.c @@ -168,6 +168,7 @@ int smp_threads = 1; diff --git a/0016-vnc-password-file-and-incoming-conn.patch b/0016-vnc-password-file-and-incoming-conn.patch index 5927ad5f..01577411 100644 --- a/0016-vnc-password-file-and-incoming-conn.patch +++ b/0016-vnc-password-file-and-incoming-conn.patch @@ -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 349cfc9..486d275 100644 +index 349cfc9d86..486d2759e4 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -59,6 +59,8 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 }; diff --git a/0017-linux-user-use-target_ulong.patch b/0017-linux-user-use-target_ulong.patch index 6307029b..71dc7211 100644 --- a/0017-linux-user-use-target_ulong.patch +++ b/0017-linux-user-use-target_ulong.patch @@ -17,7 +17,7 @@ Signed-off-by: Alexander Graf 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h -index 4edd7d0..2520864 100644 +index 4edd7d0c08..25208645e9 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 4edd7d0..2520864 100644 extern THREAD CPUState *thread_cpu; void cpu_loop(CPUArchState *env); diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 983475a..1472d72 100644 +index 983475a0b9..1472d72f27 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) diff --git a/0018-block-Add-support-for-DictZip-enabl.patch b/0018-block-Add-support-for-DictZip-enabl.patch index 964418c9..10a24795 100644 --- a/0018-block-Add-support-for-DictZip-enabl.patch +++ b/0018-block-Add-support-for-DictZip-enabl.patch @@ -47,7 +47,7 @@ Signed-off-by: Andreas Färber create mode 100644 block/dictzip.c diff --git a/block/Makefile.objs b/block/Makefile.objs -index de96f8e..bab24da 100644 +index de96f8ee80..bab24da2fb 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -21,6 +21,7 @@ block-obj-$(CONFIG_RBD) += rbd.o @@ -60,7 +60,7 @@ index de96f8e..bab24da 100644 block-obj-$(CONFIG_REPLICATION) += replication.o diff --git a/block/dictzip.c b/block/dictzip.c new file mode 100644 -index 0000000..4b7e2db +index 0000000000..4b7e2db817 --- /dev/null +++ b/block/dictzip.c @@ -0,0 +1,580 @@ diff --git a/0019-block-Add-tar-container-format.patch b/0019-block-Add-tar-container-format.patch index f8196a77..48ef48d2 100644 --- a/0019-block-Add-tar-container-format.patch +++ b/0019-block-Add-tar-container-format.patch @@ -48,7 +48,7 @@ Signed-off-by: Andreas Färber create mode 100644 block/tar.c diff --git a/block/Makefile.objs b/block/Makefile.objs -index bab24da..73c7b55 100644 +index bab24da2fb..73c7b55871 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -22,6 +22,7 @@ block-obj-$(CONFIG_GLUSTERFS) += gluster.o @@ -61,7 +61,7 @@ index bab24da..73c7b55 100644 block-obj-$(CONFIG_REPLICATION) += replication.o diff --git a/block/tar.c b/block/tar.c new file mode 100644 -index 0000000..508265e +index 0000000000..508265ed5e --- /dev/null +++ b/block/tar.c @@ -0,0 +1,370 @@ diff --git a/0020-Legacy-Patch-kvm-qemu-preXX-dictzip.patch b/0020-Legacy-Patch-kvm-qemu-preXX-dictzip.patch index 88069241..3b902191 100644 --- a/0020-Legacy-Patch-kvm-qemu-preXX-dictzip.patch +++ b/0020-Legacy-Patch-kvm-qemu-preXX-dictzip.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 508265e..734082a 100644 +index 508265ed5e..734082a011 100644 --- a/block/tar.c +++ b/block/tar.c @@ -73,7 +73,8 @@ static int str_ends(char *str, const char *end) diff --git a/0021-console-add-question-mark-escape-op.patch b/0021-console-add-question-mark-escape-op.patch index 7777580f..4ba055f6 100644 --- a/0021-console-add-question-mark-escape-op.patch +++ b/0021-console-add-question-mark-escape-op.patch @@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/console.c b/ui/console.c -index 419b098..9688457 100644 +index 419b098c11..9688457480 100644 --- a/ui/console.c +++ b/ui/console.c @@ -880,7 +880,7 @@ static void console_putchar(QemuConsole *s, int ch) diff --git a/0022-Make-char-muxer-more-robust-wrt-sma.patch b/0022-Make-char-muxer-more-robust-wrt-sma.patch index 81ca8612..7aee6ef6 100644 --- a/0022-Make-char-muxer-more-robust-wrt-sma.patch +++ b/0022-Make-char-muxer-more-robust-wrt-sma.patch @@ -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 5547a36..7b80dc8 100644 +index 5547a36a0a..7b80dc8ad7 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 5547a36..7b80dc8 100644 * set of muxes */ diff --git a/chardev/char-mux.h b/chardev/char-mux.h -index 9a2fffc..d5f419c 100644 +index 9a2fffce91..d5f419c8a9 100644 --- a/chardev/char-mux.h +++ b/chardev/char-mux.h @@ -35,6 +35,9 @@ typedef struct MuxChardev { diff --git a/0023-linux-user-lseek-explicitly-cast-no.patch b/0023-linux-user-lseek-explicitly-cast-no.patch index 814e2aeb..565ab3c3 100644 --- a/0023-linux-user-lseek-explicitly-cast-no.patch +++ b/0023-linux-user-lseek-explicitly-cast-no.patch @@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 1472d72..71d4f06 100644 +index 1472d72f27..71d4f06bdb 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, diff --git a/0024-configure-Enable-PIE-for-ppc-and-pp.patch b/0024-configure-Enable-PIE-for-ppc-and-pp.patch index e28c8567..50f0d57b 100644 --- a/0024-configure-Enable-PIE-for-ppc-and-pp.patch +++ b/0024-configure-Enable-PIE-for-ppc-and-pp.patch @@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index be4d326..3308560 100755 +index be4d326ae0..3308560f78 100755 --- a/configure +++ b/configure @@ -1600,7 +1600,7 @@ fi diff --git a/0025-AIO-Reduce-number-of-threads-for-32.patch b/0025-AIO-Reduce-number-of-threads-for-32.patch index 3da57b7d..eee84747 100644 --- a/0025-AIO-Reduce-number-of-threads-for-32.patch +++ b/0025-AIO-Reduce-number-of-threads-for-32.patch @@ -21,7 +21,7 @@ Signed-off-by: Alexander Graf 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/thread-pool.c b/util/thread-pool.c -index 610646d..2e34e98 100644 +index 610646d131..2e34e9846d 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) diff --git a/0026-dictzip-Fix-on-big-endian-systems.patch b/0026-dictzip-Fix-on-big-endian-systems.patch index ceb18676..a6d1e1b5 100644 --- a/0026-dictzip-Fix-on-big-endian-systems.patch +++ b/0026-dictzip-Fix-on-big-endian-systems.patch @@ -21,7 +21,7 @@ Signed-off-by: Andreas Färber 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/block/dictzip.c b/block/dictzip.c -index 4b7e2db..3235337 100644 +index 4b7e2db817..3235337164 100644 --- a/block/dictzip.c +++ b/block/dictzip.c @@ -156,6 +156,7 @@ static int dictzip_open(BlockDriverState *bs, QDict *options, int flags, Error * diff --git a/0027-xen_disk-Add-suse-specific-flush-di.patch b/0027-xen_disk-Add-suse-specific-flush-di.patch index d2dcc1bd..1396ae6c 100644 --- a/0027-xen_disk-Add-suse-specific-flush-di.patch +++ b/0027-xen_disk-Add-suse-specific-flush-di.patch @@ -17,7 +17,7 @@ Signed-off-by: Olaf Hering 1 file changed, 15 insertions(+) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c -index 456a2d5..94e755d 100644 +index 456a2d5694..94e755d3e8 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -111,6 +111,7 @@ struct XenBlkDev { diff --git a/0028-qemu-bridge-helper-reduce-security-.patch b/0028-qemu-bridge-helper-reduce-security-.patch index 89b578d5..ff4489f8 100644 --- a/0028-qemu-bridge-helper-reduce-security-.patch +++ b/0028-qemu-bridge-helper-reduce-security-.patch @@ -19,7 +19,7 @@ Signed-off-by: Andreas Färber 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c -index 5396fbf..f3710b8 100644 +index 5396fbfbb6..f3710b80a3 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) diff --git a/0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch b/0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch index 65528016..dfd453a9 100644 --- a/0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch +++ b/0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch @@ -13,7 +13,7 @@ Signed-off-by: Andreas Färber 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh -index 9fcd95a..f14a6ef 100755 +index 9fcd95a435..f14a6ef37b 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -206,7 +206,7 @@ qemu_check_systemd() { diff --git a/0030-configure-Fix-detection-of-seccomp-.patch b/0030-configure-Fix-detection-of-seccomp-.patch index a9ec0282..be564aa7 100644 --- a/0030-configure-Fix-detection-of-seccomp-.patch +++ b/0030-configure-Fix-detection-of-seccomp-.patch @@ -13,7 +13,7 @@ Signed-off-by: Andreas Färber 1 file changed, 3 insertions(+) diff --git a/configure b/configure -index 3308560..cb7589a 100755 +index 3308560f78..cb7589a8e7 100755 --- a/configure +++ b/configure @@ -1961,6 +1961,9 @@ if test "$seccomp" != "no" ; then diff --git a/0031-linux-user-properly-test-for-infini.patch b/0031-linux-user-properly-test-for-infini.patch index d42ea5d9..0181f8f8 100644 --- a/0031-linux-user-properly-test-for-infini.patch +++ b/0031-linux-user-properly-test-for-infini.patch @@ -16,7 +16,7 @@ Signed-off-by: Andreas Schwab 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 71d4f06..78f0ea4 100644 +index 71d4f06bdb..78f0ea4c58 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, diff --git a/0032-linux-user-remove-all-traces-of-qem.patch b/0032-linux-user-remove-all-traces-of-qem.patch index b78d99de..ab83f393 100644 --- a/0032-linux-user-remove-all-traces-of-qem.patch +++ b/0032-linux-user-remove-all-traces-of-qem.patch @@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 78f0ea4..1e56583 100644 +index 78f0ea4c58..1e56583d63 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7374,52 +7374,19 @@ int host_to_target_waitstatus(int status) diff --git a/0033-roms-Makefile-pass-a-packaging-time.patch b/0033-roms-Makefile-pass-a-packaging-time.patch index 2413b87d..73a5c408 100644 --- a/0033-roms-Makefile-pass-a-packaging-time.patch +++ b/0033-roms-Makefile-pass-a-packaging-time.patch @@ -20,7 +20,7 @@ Signed-off-by: Bruce Rogers 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/roms/Makefile b/roms/Makefile -index b5e5a69..89d69eb 100644 +index b5e5a69e91..89d69eb350 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -52,6 +52,12 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org" diff --git a/0034-Raise-soft-address-space-limit-to-h.patch b/0034-Raise-soft-address-space-limit-to-h.patch index 7637a793..e1a0a646 100644 --- a/0034-Raise-soft-address-space-limit-to-h.patch +++ b/0034-Raise-soft-address-space-limit-to-h.patch @@ -17,7 +17,7 @@ Signed-off-by: Bruce Rogers 1 file changed, 12 insertions(+) diff --git a/vl.c b/vl.c -index e0f2ec8..caad3f9 100644 +index e0f2ec86a9..caad3f93b3 100644 --- a/vl.c +++ b/vl.c @@ -26,6 +26,7 @@ diff --git a/0035-increase-x86_64-physical-bits-to-42.patch b/0035-increase-x86_64-physical-bits-to-42.patch index 395f79a0..0da674fe 100644 --- a/0035-increase-x86_64-physical-bits-to-42.patch +++ b/0035-increase-x86_64-physical-bits-to-42.patch @@ -19,7 +19,7 @@ Signed-off-by: Andreas Färber 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h -index c4602ca..81c02c5 100644 +index c4602ca80d..81c02c5a3b 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1488,7 +1488,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); diff --git a/0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch b/0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch index ad1ab5ce..e0725c4c 100644 --- a/0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch +++ b/0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch @@ -25,7 +25,7 @@ Signed-off-by: Bruce Rogers 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index 9f102aa..1c09005 100644 +index 9f102aa388..1c09005293 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, diff --git a/0037-i8254-Fix-migration-from-SLE11-SP2.patch b/0037-i8254-Fix-migration-from-SLE11-SP2.patch index 3f8cc97e..c44955ff 100644 --- a/0037-i8254-Fix-migration-from-SLE11-SP2.patch +++ b/0037-i8254-Fix-migration-from-SLE11-SP2.patch @@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber 1 file changed, 7 insertions(+) diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c -index e18299a..bc676c4 100644 +index e18299a482..bc676c4664 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) diff --git a/0038-acpi_piix4-Fix-migration-from-SLE11.patch b/0038-acpi_piix4-Fix-migration-from-SLE11.patch index 7fa4f307..19802f2c 100644 --- a/0038-acpi_piix4-Fix-migration-from-SLE11.patch +++ b/0038-acpi_piix4-Fix-migration-from-SLE11.patch @@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c -index a553a7e..c34f761 100644 +index a553a7e110..c34f761175 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -311,7 +311,7 @@ static const VMStateDescription vmstate_cpuhp_state = { diff --git a/0039-Fix-tigervnc-long-press-issue.patch b/0039-Fix-tigervnc-long-press-issue.patch index 97619b65..804bb842 100644 --- a/0039-Fix-tigervnc-long-press-issue.patch +++ b/0039-Fix-tigervnc-long-press-issue.patch @@ -24,7 +24,7 @@ Signed-off-by: Chunyan Liu 1 file changed, 19 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c -index 486d275..51d6f23 100644 +index 486d2759e4..51d6f2353f 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) diff --git a/0040-fix-xen-hvm-direct-kernel-boot.patch b/0040-fix-xen-hvm-direct-kernel-boot.patch index bcf59aa5..d32c7908 100644 --- a/0040-fix-xen-hvm-direct-kernel-boot.patch +++ b/0040-fix-xen-hvm-direct-kernel-boot.patch @@ -29,7 +29,7 @@ Signed-off-by: Chunyan Liu 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/core/loader.c b/hw/core/loader.c -index bf17b42..14dc6e1 100644 +index bf17b42cbe..14dc6e116f 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -55,6 +55,7 @@ diff --git a/0041-string-input-visitor-Fix-uint64-par.patch b/0041-string-input-visitor-Fix-uint64-par.patch index 370f0592..161a3c16 100644 --- a/0041-string-input-visitor-Fix-uint64-par.patch +++ b/0041-string-input-visitor-Fix-uint64-par.patch @@ -22,7 +22,7 @@ Signed-off-by: Andreas Färber 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c -index c089491..fedbda7 100644 +index c089491c24..fedbda7895 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) diff --git a/0042-test-string-input-visitor-Add-int-t.patch b/0042-test-string-input-visitor-Add-int-t.patch index 2eaa2193..1795b472 100644 --- a/0042-test-string-input-visitor-Add-int-t.patch +++ b/0042-test-string-input-visitor-Add-int-t.patch @@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber 1 file changed, 8 insertions(+) diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c -index 79313a7..e00194a 100644 +index 79313a7f7a..e00194a649 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, diff --git a/0043-test-string-input-visitor-Add-uint6.patch b/0043-test-string-input-visitor-Add-uint6.patch index a0a6436f..8150312d 100644 --- a/0043-test-string-input-visitor-Add-uint6.patch +++ b/0043-test-string-input-visitor-Add-uint6.patch @@ -15,7 +15,7 @@ Signed-off-by: Andreas Färber 1 file changed, 23 insertions(+) diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c -index e00194a..5587827 100644 +index e00194a649..558782796a 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, diff --git a/0044-tests-Add-QOM-property-unit-tests.patch b/0044-tests-Add-QOM-property-unit-tests.patch index 356c716e..7971a519 100644 --- a/0044-tests-Add-QOM-property-unit-tests.patch +++ b/0044-tests-Add-QOM-property-unit-tests.patch @@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber create mode 100644 tests/check-qom-props.c diff --git a/MAINTAINERS b/MAINTAINERS -index c60235e..a023f5d 100644 +index c60235eaf6..a023f5d70e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1419,6 +1419,7 @@ F: qom/ @@ -29,7 +29,7 @@ index c60235e..a023f5d 100644 QMP diff --git a/tests/Makefile.include b/tests/Makefile.include -index f3de81f..ca8f859 100644 +index f3de81fcfb..ca8f859f79 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 f3de81f..ca8f859 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 0000000..681e121 +index 0000000000..681e121c07 --- /dev/null +++ b/tests/check-qom-props.c @@ -0,0 +1,122 @@ diff --git a/0045-tests-Add-scsi-disk-test.patch b/0045-tests-Add-scsi-disk-test.patch index 54e62e03..3ff461d1 100644 --- a/0045-tests-Add-scsi-disk-test.patch +++ b/0045-tests-Add-scsi-disk-test.patch @@ -20,7 +20,7 @@ Signed-off-by: Andreas Färber create mode 100644 tests/scsi-disk-test.c diff --git a/MAINTAINERS b/MAINTAINERS -index a023f5d..9840d5b 100644 +index a023f5d70e..9840d5bb68 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -957,6 +957,7 @@ M: Paolo Bonzini @@ -32,7 +32,7 @@ index a023f5d..9840d5b 100644 T: git git://github.com/bonzini/qemu.git scsi-next diff --git a/tests/Makefile.include b/tests/Makefile.include -index ca8f859..85187d4 100644 +index ca8f859f79..85187d4b8c 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 ca8f859..85187d4 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 0000000..f19f93d +index 0000000000..f19f93d97a --- /dev/null +++ b/tests/scsi-disk-test.c @@ -0,0 +1,82 @@ diff --git a/0046-RFC-update-Linux-headers-from-irqs-.patch b/0046-RFC-update-Linux-headers-from-irqs-.patch index 73f2ccd5..1e672988 100644 --- a/0046-RFC-update-Linux-headers-from-irqs-.patch +++ b/0046-RFC-update-Linux-headers-from-irqs-.patch @@ -15,7 +15,7 @@ Signed-off-by: Alexander Graf 3 files changed, 12 insertions(+) diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h -index 1101d55..8a1654a 100644 +index 1101d55d2f..8a1654a55b 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 1101d55..8a1654a 100644 struct kvm_arch_memory_slot { diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h -index 651ec30..1bc8346 100644 +index 651ec30040..1bc8346f0d 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 651ec30..1bc8346 100644 struct kvm_arch_memory_slot { diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h -index 4e082a8..72f0d21 100644 +index 4e082a81b4..72f0d21103 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -883,6 +883,7 @@ struct kvm_ppc_resize_hpt { diff --git a/0047-ARM-KVM-Enable-in-kernel-timers-wit.patch b/0047-ARM-KVM-Enable-in-kernel-timers-wit.patch index 4b34ad42..39ccd12a 100644 --- a/0047-ARM-KVM-Enable-in-kernel-timers-wit.patch +++ b/0047-ARM-KVM-Enable-in-kernel-timers-wit.patch @@ -20,7 +20,7 @@ Signed-off-by: Alexander Graf 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c -index 5f62a03..a1d24a4 100644 +index 5f62a0321e..a1d24a4db6 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 5f62a03..a1d24a4 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 a8aabce..19cb596 100644 +index a8aabce7dd..19cb596449 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -702,6 +702,9 @@ struct ARMCPU { @@ -55,7 +55,7 @@ index a8aabce..19cb596 100644 static inline ARMCPU *arm_env_get_cpu(CPUARMState *env) diff --git a/target/arm/kvm.c b/target/arm/kvm.c -index 4555468..dccb326 100644 +index 45554682f2..dccb326615 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -174,6 +174,12 @@ int kvm_arch_init(MachineState *ms, KVMState *s) diff --git a/0048-input-Add-trace-event-for-empty-key.patch b/0048-input-Add-trace-event-for-empty-key.patch index 382c975b..e0c90c29 100644 --- a/0048-input-Add-trace-event-for-empty-key.patch +++ b/0048-input-Add-trace-event-for-empty-key.patch @@ -20,7 +20,7 @@ Signed-off-by: Bruce Rogers 2 files changed, 5 insertions(+) diff --git a/hw/input/hid.c b/hw/input/hid.c -index fa9cc4c..93887ec 100644 +index fa9cc4c616..93887ecc43 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 fa9cc4c..93887ec 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 f3bfbed..5a87818 100644 +index f3bfbede5c..5a87818b49 100644 --- a/hw/input/trace-events +++ b/hw/input/trace-events @@ -24,6 +24,7 @@ milkymist_softusb_pulse_irq(void) "Pulse IRQ" diff --git a/0049-ACPI-don-t-call-acpi_pcihp_device_p.patch b/0049-ACPI-don-t-call-acpi_pcihp_device_p.patch index c40be102..52d393d4 100644 --- a/0049-ACPI-don-t-call-acpi_pcihp_device_p.patch +++ b/0049-ACPI-don-t-call-acpi_pcihp_device_p.patch @@ -17,7 +17,7 @@ Signed-off-by: Bruce Rogers 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c -index c34f761..ae1cb26 100644 +index c34f761175..ae1cb26a82 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -385,7 +385,10 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev, diff --git a/0050-i386-Allow-cpuid-bit-override.patch b/0050-i386-Allow-cpuid-bit-override.patch index 0a38c930..012afd7a 100644 --- a/0050-i386-Allow-cpuid-bit-override.patch +++ b/0050-i386-Allow-cpuid-bit-override.patch @@ -22,7 +22,7 @@ Signed-off-by: Alexander Graf 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c -index 13c0985..6105fc5 100644 +index 13c0985f11..6105fc513e 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) @@ -87,7 +87,7 @@ index 13c0985..6105fc5 100644 error_propagate(errp, local_err); return; diff --git a/target/i386/cpu.h b/target/i386/cpu.h -index 81c02c5..a458c3a 100644 +index 81c02c5a3b..a458c3af9b 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1230,6 +1230,9 @@ struct X86CPU { diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index a3537b8e..5e21f3e4 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 4 20:14:25 UTC 2017 - brogers@suse.com + +- Fix building packages for some older distros. +- Further refine our handling of building firmware (or not) for + the various arch's and distro versions we build for. Note that + if we don't build x86 firmware, (eg: x86 Leap 42.1) the upstream + binary blobs are used, which may have migration incompatibilities + with previous versions of qemu provided. + ------------------------------------------------------------------- Thu Apr 27 20:09:38 UTC 2017 - brogers@suse.com diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 10b77bd7..b879396c 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -25,7 +25,7 @@ %ifarch %ix86 x86_64 # choice of building all from source or using provided binary x86 blobs -%if 0%{?suse_version} >= 1310 +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) %define build_x86_firmware_from_source 1 %endif %endif @@ -280,11 +280,17 @@ BuildRequires: libjpeg-devel %if 0%{?suse_version} >= 1310 BuildRequires: libnettle-devel %endif -%ifarch %ix86 aarch64 +%ifarch %ix86 x86_64 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 BuildRequires: libnuma-devel %endif %else +%ifarch aarch64 +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) +BuildRequires: libnuma-devel +%endif +%endif +%else %ifnarch %arm s390x BuildRequires: libnuma-devel %endif @@ -965,13 +971,21 @@ echo '%{version}' > roms/seabios/.version --enable-linux-aio \ --enable-lzo \ --disable-netmap \ -%ifarch %ix86 aarch64 +%ifarch %ix86 x86_64 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 --enable-numa \ %else --disable-numa \ %endif %else +%ifarch aarch64 +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) + --enable-numa \ +%endif +%else + --disable-numa \ +%endif +%else %ifarch %arm s390x --disable-numa \ %else @@ -1053,15 +1067,33 @@ make %{?_smp_mflags} V=1 # Firmware %ifarch s390x -cp pc-bios/s390-ccw/s390-ccw.img pc-bios/ +for i in %s390x_default_built_firmware +do + cp pc-bios/s390-ccw/$i pc-bios/ +done %endif %ifarch ppc64 -cp pc-bios/spapr-rtas/spapr-rtas.bin pc-bios/ +for i in %ppc64_only_default_built_firmware +do + cp pc-bios/spapr-rtas/$i pc-bios/ +done +%endif + +%ifarch %ix86 x86_64 +for i in %x86_default_built_firmware +do + cp pc-bios/optionrom/$i pc-bios/ +done +%ifarch x86_64 +for i in %x86_64_only_default_built_firmware +do + cp pc-bios/optionrom/$i pc-bios/ +done +%endif %endif %if %{build_x86_firmware_from_source} -cp pc-bios/optionrom/{multiboot.bin,linuxboot.bin,linuxboot_dma.bin,kvmvapic.bin} pc-bios/ make %{?_smp_mflags} -C roms bios make %{?_smp_mflags} -C roms seavgabios @@ -1496,7 +1528,7 @@ fi %files lang -f %name.lang %defattr(-, root, root) -%if %{build_x86_firmware_from_source} +%ifarch %ix86 x86_64 %files seabios %defattr(-, root, root) %dir %_datadir/%name diff --git a/qemu.changes b/qemu.changes index a3537b8e..5e21f3e4 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 4 20:14:25 UTC 2017 - brogers@suse.com + +- Fix building packages for some older distros. +- Further refine our handling of building firmware (or not) for + the various arch's and distro versions we build for. Note that + if we don't build x86 firmware, (eg: x86 Leap 42.1) the upstream + binary blobs are used, which may have migration incompatibilities + with previous versions of qemu provided. + ------------------------------------------------------------------- Thu Apr 27 20:09:38 UTC 2017 - brogers@suse.com diff --git a/qemu.spec b/qemu.spec index 0786771d..a3d4a90d 100644 --- a/qemu.spec +++ b/qemu.spec @@ -25,7 +25,7 @@ %ifarch %ix86 x86_64 # choice of building all from source or using provided binary x86 blobs -%if 0%{?suse_version} >= 1310 +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) %define build_x86_firmware_from_source 1 %endif %endif @@ -280,11 +280,17 @@ BuildRequires: libjpeg-devel %if 0%{?suse_version} >= 1310 BuildRequires: libnettle-devel %endif -%ifarch %ix86 aarch64 +%ifarch %ix86 x86_64 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 BuildRequires: libnuma-devel %endif %else +%ifarch aarch64 +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) +BuildRequires: libnuma-devel +%endif +%endif +%else %ifnarch %arm s390x BuildRequires: libnuma-devel %endif @@ -965,13 +971,21 @@ echo '%{version}' > roms/seabios/.version --enable-linux-aio \ --enable-lzo \ --disable-netmap \ -%ifarch %ix86 aarch64 +%ifarch %ix86 x86_64 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 --enable-numa \ %else --disable-numa \ %endif %else +%ifarch aarch64 +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) + --enable-numa \ +%endif +%else + --disable-numa \ +%endif +%else %ifarch %arm s390x --disable-numa \ %else @@ -1053,15 +1067,33 @@ make %{?_smp_mflags} V=1 # Firmware %ifarch s390x -cp pc-bios/s390-ccw/s390-ccw.img pc-bios/ +for i in %s390x_default_built_firmware +do + cp pc-bios/s390-ccw/$i pc-bios/ +done %endif %ifarch ppc64 -cp pc-bios/spapr-rtas/spapr-rtas.bin pc-bios/ +for i in %ppc64_only_default_built_firmware +do + cp pc-bios/spapr-rtas/$i pc-bios/ +done +%endif + +%ifarch %ix86 x86_64 +for i in %x86_default_built_firmware +do + cp pc-bios/optionrom/$i pc-bios/ +done +%ifarch x86_64 +for i in %x86_64_only_default_built_firmware +do + cp pc-bios/optionrom/$i pc-bios/ +done +%endif %endif %if %{build_x86_firmware_from_source} -cp pc-bios/optionrom/{multiboot.bin,linuxboot.bin,linuxboot_dma.bin,kvmvapic.bin} pc-bios/ make %{?_smp_mflags} -C roms bios make %{?_smp_mflags} -C roms seavgabios @@ -1496,7 +1528,7 @@ fi %files lang -f %name.lang %defattr(-, root, root) -%if %{build_x86_firmware_from_source} +%ifarch %ix86 x86_64 %files seabios %defattr(-, root, root) %dir %_datadir/%name diff --git a/qemu.spec.in b/qemu.spec.in index 55068678..608c50a6 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -24,7 +24,7 @@ %ifarch %ix86 x86_64 # choice of building all from source or using provided binary x86 blobs -%if 0%{?suse_version} >= 1310 +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) %define build_x86_firmware_from_source 1 %endif %endif @@ -231,11 +231,17 @@ BuildRequires: libjpeg-devel %if 0%{?suse_version} >= 1310 BuildRequires: libnettle-devel %endif -%ifarch %ix86 aarch64 +%ifarch %ix86 x86_64 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 BuildRequires: libnuma-devel %endif %else +%ifarch aarch64 +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) +BuildRequires: libnuma-devel +%endif +%endif +%else %ifnarch %arm s390x BuildRequires: libnuma-devel %endif @@ -867,13 +873,21 @@ echo '%{version}' > roms/seabios/.version --enable-linux-aio \ --enable-lzo \ --disable-netmap \ -%ifarch %ix86 aarch64 +%ifarch %ix86 x86_64 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 --enable-numa \ %else --disable-numa \ %endif %else +%ifarch aarch64 +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 ) + --enable-numa \ +%endif +%else + --disable-numa \ +%endif +%else %ifarch %arm s390x --disable-numa \ %else @@ -955,15 +969,33 @@ make %{?_smp_mflags} V=1 # Firmware %ifarch s390x -cp pc-bios/s390-ccw/s390-ccw.img pc-bios/ +for i in %s390x_default_built_firmware +do + cp pc-bios/s390-ccw/$i pc-bios/ +done %endif %ifarch ppc64 -cp pc-bios/spapr-rtas/spapr-rtas.bin pc-bios/ +for i in %ppc64_only_default_built_firmware +do + cp pc-bios/spapr-rtas/$i pc-bios/ +done +%endif + +%ifarch %ix86 x86_64 +for i in %x86_default_built_firmware +do + cp pc-bios/optionrom/$i pc-bios/ +done +%ifarch x86_64 +for i in %x86_64_only_default_built_firmware +do + cp pc-bios/optionrom/$i pc-bios/ +done +%endif %endif %if %{build_x86_firmware_from_source} -cp pc-bios/optionrom/{multiboot.bin,linuxboot.bin,linuxboot_dma.bin,kvmvapic.bin} pc-bios/ make %{?_smp_mflags} -C roms bios make %{?_smp_mflags} -C roms seavgabios @@ -1398,7 +1430,7 @@ fi %files lang -f %name.lang %defattr(-, root, root) -%if %{build_x86_firmware_from_source} +%ifarch %ix86 x86_64 %files seabios %defattr(-, root, root) %dir %_datadir/%name