From a96ee70a76f3d39ec427d72b15b4bde8961448fd88aa033e649dc196e03e3248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 22 Jul 2013 22:21:56 +0000 Subject: [PATCH] Accepting request 184030 from home:bfrogers:branches:Virtualization Fix for bnc#830459. OBS-URL: https://build.opensuse.org/request/show/184030 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=148 --- ...-XXX-dont-dump-core-on-sigabort.patc.patch | 4 +- ...-XXX-work-around-SA_RESTART-race-wit.patch | 8 ++-- 0003-qemu-0.9.0.cvs-binfmt.patch.patch | 4 +- 0004-qemu-cvs-alsa_bitfield.patch.patch | 6 +-- 0005-qemu-cvs-alsa_ioctl.patch.patch | 2 +- 0006-qemu-cvs-alsa_mmap.patch.patch | 4 +- 0007-qemu-cvs-gettimeofday.patch.patch | 4 +- 0008-qemu-cvs-ioctl_debug.patch.patch | 4 +- 0009-qemu-cvs-ioctl_nodirection.patch.patch | 4 +- ...-block-vmdk-Support-creation-of-SCSI.patch | 8 ++-- ...-linux-user-add-binfmt-wrapper-for-a.patch | 8 ++-- ...-linux-user-Ignore-timer_create-sysc.patch | 4 +- ...-linux-user-be-silent-about-capget-f.patch | 4 +- ...-PPC-KVM-Disable-mmu-notifier-check..patch | 4 +- ...-linux-user-fix-segfault-deadlock.pa.patch | 6 +-- ...-linux-user-binfmt-support-host-bina.patch | 4 +- ...-linux-user-arm-no-tb_flush-on-reset.patch | 4 +- ...-linux-user-Ignore-broken-loop-ioctl.patch | 10 ++--- ...-linux-user-fix-segmentation-fault-p.patch | 4 +- 0020-linux-user-lock-tcg.patch.patch | 6 +-- ...-linux-user-Run-multi-threaded-code-.patch | 4 +- ...-linux-user-lock-tb-flushing-too.pat.patch | 4 +- 0023-linux-user-Fake-proc-cpuinfo.patch.patch | 4 +- ...-linux-user-implement-FS_IOC_GETFLAG.patch | 6 +-- ...-linux-user-implement-FS_IOC_SETFLAG.patch | 6 +-- ...-linux-user-XXX-disable-fiemap.patch.patch | 4 +- 0027-slirp-nooutgoing.patch.patch | 10 ++--- ...-vnc-password-file-and-incoming-conn.patch | 4 +- ...-linux-user-add-more-blk-ioctls.patc.patch | 8 ++-- 0030-linux-user-use-target_ulong.patch.patch | 4 +- ...-Add-support-for-DictZip-enabled-gzi.patch | 6 +-- 0032-Add-tar-container-format.patch.patch | 6 +-- ...-Legacy-Patch-kvm-qemu-preXX-dictzip.patch | 4 +- ...-Legacy-Patch-kvm-qemu-preXX-report-.patch | 4 +- ...-console-add-question-mark-escape-op.patch | 4 +- ...-Make-char-muxer-more-robust-wrt-sma.patch | 4 +- ...-linux-user-lseek-explicitly-cast-no.patch | 4 +- ...-virtfs-proxy-helper-Provide-__u64-f.patch | 4 +- ...-gtk-don-t-use-g_object_unref-on-Gdk.patch | 34 +++++++++++++++ ...-gtk-Fix-compiler-warning-GTK-3-depr.patch | 43 +++++++++++++++++++ qemu-linux-user.spec | 4 ++ qemu.changes | 5 +++ qemu.spec | 4 ++ 43 files changed, 186 insertions(+), 96 deletions(-) create mode 100644 0039-gtk-don-t-use-g_object_unref-on-Gdk.patch create mode 100644 0040-gtk-Fix-compiler-warning-GTK-3-depr.patch diff --git a/0001-XXX-dont-dump-core-on-sigabort.patc.patch b/0001-XXX-dont-dump-core-on-sigabort.patc.patch index 47e2770e..388c17be 100644 --- a/0001-XXX-dont-dump-core-on-sigabort.patc.patch +++ b/0001-XXX-dont-dump-core-on-sigabort.patc.patch @@ -4,8 +4,8 @@ Date: Mon, 21 Nov 2011 23:50:36 +0100 Subject: [PATCH] XXX dont dump core on sigabort --- - linux-user/signal.c | 6 ++++++ - 1 file changed, 6 insertions(+) + linux-user/signal.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 1055507..7af7caa 100644 diff --git a/0002-XXX-work-around-SA_RESTART-race-wit.patch b/0002-XXX-work-around-SA_RESTART-race-wit.patch index c3b7aa5e..ecf2fb58 100644 --- a/0002-XXX-work-around-SA_RESTART-race-wit.patch +++ b/0002-XXX-work-around-SA_RESTART-race-wit.patch @@ -5,10 +5,10 @@ Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only) [AF: CPUState -> CPUArchState, adapt to reindentation] --- - linux-user/main.c | 25 +++++++++------ - linux-user/qemu.h | 3 ++ - linux-user/signal.c | 22 +++++++++++++ - linux-user/syscall.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++- + linux-user/main.c | 25 +++++++++----- + linux-user/qemu.h | 3 ++ + linux-user/signal.c | 22 ++++++++++++ + linux-user/syscall.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 130 insertions(+), 10 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c diff --git a/0003-qemu-0.9.0.cvs-binfmt.patch.patch b/0003-qemu-0.9.0.cvs-binfmt.patch.patch index a9e11f84..d85ca669 100644 --- a/0003-qemu-0.9.0.cvs-binfmt.patch.patch +++ b/0003-qemu-0.9.0.cvs-binfmt.patch.patch @@ -10,8 +10,8 @@ Fixes binfmt_misc setup script: Signed-off-by: Ulrich Hecht --- - scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++----------------- - 1 file changed, 20 insertions(+), 17 deletions(-) + scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++----------------- + 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 0da2618..dc652f0 100644 diff --git a/0004-qemu-cvs-alsa_bitfield.patch.patch b/0004-qemu-cvs-alsa_bitfield.patch.patch index 8eca887e..25d71e34 100644 --- a/0004-qemu-cvs-alsa_bitfield.patch.patch +++ b/0004-qemu-cvs-alsa_bitfield.patch.patch @@ -8,9 +8,9 @@ Implements TYPE_INTBITFIELD partially. (required for ALSA support) Signed-off-by: Alexander Graf Signed-off-by: Ulrich Hecht --- - include/exec/user/thunk.h | 3 +++ - thunk.c | 21 +++++++++++++++++++++ - 2 files changed, 24 insertions(+) + include/exec/user/thunk.h | 3 +++ + thunk.c | 21 +++++++++++++++++++++ + 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h index 87025c3..6c35e64 100644 diff --git a/0005-qemu-cvs-alsa_ioctl.patch.patch b/0005-qemu-cvs-alsa_ioctl.patch.patch index 1d758463..51d20f76 100644 --- a/0005-qemu-cvs-alsa_ioctl.patch.patch +++ b/0005-qemu-cvs-alsa_ioctl.patch.patch @@ -14,7 +14,7 @@ Signed-off-by: Ulrich Hecht linux-user/syscall_defs.h | 2 + linux-user/syscall_types.h | 5 + linux-user/syscall_types_alsa.h | 1336 +++++++++++++++++++++++++++++ - 6 files changed, 3555 insertions(+) + 6 files changed, 3555 insertions(+), 0 deletions(-) create mode 100644 linux-user/ioctls_alsa.h create mode 100644 linux-user/ioctls_alsa_structs.h create mode 100644 linux-user/syscall_types_alsa.h diff --git a/0006-qemu-cvs-alsa_mmap.patch.patch b/0006-qemu-cvs-alsa_mmap.patch.patch index 015121d3..25ad401f 100644 --- a/0006-qemu-cvs-alsa_mmap.patch.patch +++ b/0006-qemu-cvs-alsa_mmap.patch.patch @@ -8,8 +8,8 @@ Hack to prevent ALSA from using mmap() interface to simplify emulation. Signed-off-by: Alexander Graf Signed-off-by: Ulrich Hecht --- - linux-user/mmap.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) + linux-user/mmap.c | 14 ++++++++++++++ + 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index b412e3f..46523de 100644 diff --git a/0007-qemu-cvs-gettimeofday.patch.patch b/0007-qemu-cvs-gettimeofday.patch.patch index c7925920..2cedb47f 100644 --- a/0007-qemu-cvs-gettimeofday.patch.patch +++ b/0007-qemu-cvs-gettimeofday.patch.patch @@ -5,8 +5,8 @@ Subject: [PATCH] qemu-cvs-gettimeofday No clue what this is for. --- - linux-user/syscall.c | 2 ++ - 1 file changed, 2 insertions(+) + linux-user/syscall.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1d3406f..94eb877 100644 diff --git a/0008-qemu-cvs-ioctl_debug.patch.patch b/0008-qemu-cvs-ioctl_debug.patch.patch index 465af1ff..e4d6eaba 100644 --- a/0008-qemu-cvs-ioctl_debug.patch.patch +++ b/0008-qemu-cvs-ioctl_debug.patch.patch @@ -8,8 +8,8 @@ Extends unsupported ioctl debug output. Signed-off-by: Alexander Graf Signed-off-by: Ulrich Hecht --- - linux-user/syscall.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + linux-user/syscall.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 94eb877..a171128 100644 diff --git a/0009-qemu-cvs-ioctl_nodirection.patch.patch b/0009-qemu-cvs-ioctl_nodirection.patch.patch index c2b91c39..899eadf4 100644 --- a/0009-qemu-cvs-ioctl_nodirection.patch.patch +++ b/0009-qemu-cvs-ioctl_nodirection.patch.patch @@ -11,8 +11,8 @@ IOC_RW. Signed-off-by: Alexander Graf Signed-off-by: Ulrich Hecht --- - linux-user/syscall.c | 6 ++++++ - 1 file changed, 6 insertions(+) + linux-user/syscall.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a171128..01fbfb7 100644 diff --git a/0010-block-vmdk-Support-creation-of-SCSI.patch b/0010-block-vmdk-Support-creation-of-SCSI.patch index d82d6152..91efcb4b 100644 --- a/0010-block-vmdk-Support-creation-of-SCSI.patch +++ b/0010-block-vmdk-Support-creation-of-SCSI.patch @@ -11,10 +11,10 @@ Signed-off-by: Ulrich Hecht [AF: Rebased onto upstream VMDK SCSI support] Signed-off-by: Andreas Färber --- - block.c | 6 +++++- - block/vmdk.c | 9 ++++++++- - include/block/block_int.h | 2 ++ - qemu-img.c | 8 +++++++- + block.c | 6 +++++- + block/vmdk.c | 9 ++++++++- + include/block/block_int.h | 2 ++ + qemu-img.c | 8 +++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c diff --git a/0011-linux-user-add-binfmt-wrapper-for-a.patch b/0011-linux-user-add-binfmt-wrapper-for-a.patch index 0e526420..f5d6edc9 100644 --- a/0011-linux-user-add-binfmt-wrapper-for-a.patch +++ b/0011-linux-user-add-binfmt-wrapper-for-a.patch @@ -27,10 +27,10 @@ Signed-off-by: Alexander Graf [AF: Rebased onto new Makefile infrastructure] Signed-off-by: Andreas Färber --- - Makefile.target | 12 ++++++++++++ - linux-user/Makefile.objs | 2 ++ - linux-user/binfmt.c | 42 ++++++++++++++++++++++++++++++++++++++++++ - scripts/qemu-binfmt-conf.sh | 34 +++++++++++++++++----------------- + Makefile.target | 12 ++++++++++++ + linux-user/Makefile.objs | 2 ++ + linux-user/binfmt.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + scripts/qemu-binfmt-conf.sh | 34 +++++++++++++++++----------------- 4 files changed, 73 insertions(+), 17 deletions(-) create mode 100644 linux-user/binfmt.c diff --git a/0012-linux-user-Ignore-timer_create-sysc.patch b/0012-linux-user-Ignore-timer_create-sysc.patch index dd35715c..8055aa2d 100644 --- a/0012-linux-user-Ignore-timer_create-sysc.patch +++ b/0012-linux-user-Ignore-timer_create-sysc.patch @@ -8,8 +8,8 @@ about it breaks some %check tests in OBS, so better ignore it silently. Signed-off-by: Alexander Graf --- - linux-user/syscall.c | 5 +++++ - 1 file changed, 5 insertions(+) + linux-user/syscall.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 01fbfb7..14c98ac 100644 diff --git a/0013-linux-user-be-silent-about-capget-f.patch b/0013-linux-user-be-silent-about-capget-f.patch index c2da27aa..513946dd 100644 --- a/0013-linux-user-be-silent-about-capget-f.patch +++ b/0013-linux-user-be-silent-about-capget-f.patch @@ -9,8 +9,8 @@ implementation and go on with life :) Signed-off-by: Alexander Graf --- - linux-user/syscall.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + linux-user/syscall.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 14c98ac..58c5f70 100644 diff --git a/0014-PPC-KVM-Disable-mmu-notifier-check..patch b/0014-PPC-KVM-Disable-mmu-notifier-check..patch index 523c78ae..55acf0c8 100644 --- a/0014-PPC-KVM-Disable-mmu-notifier-check..patch +++ b/0014-PPC-KVM-Disable-mmu-notifier-check..patch @@ -9,8 +9,8 @@ check for MMU notifiers that on 970 can not be implemented properly. So disable the check for mmu notifiers on PowerPC guests, making KVM guests work there, even if possibly racy in some odd circumstances. --- - exec.c | 2 ++ - 1 file changed, 2 insertions(+) + exec.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/exec.c b/exec.c index aec65c5..53c937d 100644 diff --git a/0015-linux-user-fix-segfault-deadlock.pa.patch b/0015-linux-user-fix-segfault-deadlock.pa.patch index 71f1b926..652fb7c7 100644 --- a/0015-linux-user-fix-segfault-deadlock.pa.patch +++ b/0015-linux-user-fix-segfault-deadlock.pa.patch @@ -21,9 +21,9 @@ Reported-by: Fabio Erculiani Signed-off-by: Alexander Graf Signed-off-by: Andreas Färber --- - include/exec/spinlock.h | 10 ++++++++++ - user-exec.c | 4 ++++ - 2 files changed, 14 insertions(+) + include/exec/spinlock.h | 10 ++++++++++ + user-exec.c | 4 ++++ + 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/exec/spinlock.h b/include/exec/spinlock.h index a72edda..e460e12 100644 diff --git a/0016-linux-user-binfmt-support-host-bina.patch b/0016-linux-user-binfmt-support-host-bina.patch index 990eebf1..a7e3b12e 100644 --- a/0016-linux-user-binfmt-support-host-bina.patch +++ b/0016-linux-user-binfmt-support-host-bina.patch @@ -8,8 +8,8 @@ trying to run, let's just use that instead as it will be a lot faster. Signed-off-by: Alexander Graf --- - linux-user/binfmt.c | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) + linux-user/binfmt.c | 25 +++++++++++++++++++++++++ + 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c index cd1f513..87dc4c6 100644 diff --git a/0017-linux-user-arm-no-tb_flush-on-reset.patch b/0017-linux-user-arm-no-tb_flush-on-reset.patch index 05d80a64..272749e9 100644 --- a/0017-linux-user-arm-no-tb_flush-on-reset.patch +++ b/0017-linux-user-arm-no-tb_flush-on-reset.patch @@ -10,8 +10,8 @@ tb_flush on reset. So something in our thread creation is broken. But for now, let's revert the change to at least get a working build again. --- - target-arm/cpu.c | 4 ++++ - 1 file changed, 4 insertions(+) + target-arm/cpu.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 496a59f..ad60f82 100644 diff --git a/0018-linux-user-Ignore-broken-loop-ioctl.patch b/0018-linux-user-Ignore-broken-loop-ioctl.patch index 4b3488ad..52464e85 100644 --- a/0018-linux-user-Ignore-broken-loop-ioctl.patch +++ b/0018-linux-user-Ignore-broken-loop-ioctl.patch @@ -11,11 +11,11 @@ So let's silently ignore that bogus ioctl. Signed-off-by: Alexander Graf --- - linux-user/ioctls.h | 1 + - linux-user/linux_loop.h | 1 + - linux-user/syscall.c | 7 +++++++ - linux-user/syscall_defs.h | 1 + - 4 files changed, 10 insertions(+) + linux-user/ioctls.h | 1 + + linux-user/linux_loop.h | 1 + + linux-user/syscall.c | 7 +++++++ + linux-user/syscall_defs.h | 1 + + 4 files changed, 10 insertions(+), 0 deletions(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index 6af0cb7..bb76c56 100644 diff --git a/0019-linux-user-fix-segmentation-fault-p.patch b/0019-linux-user-fix-segmentation-fault-p.patch index 728c5db3..d7f962b6 100644 --- a/0019-linux-user-fix-segmentation-fault-p.patch +++ b/0019-linux-user-fix-segmentation-fault-p.patch @@ -19,8 +19,8 @@ Signed-off-by: Alexander Graf [AF: Rebased onto AREG0 fix for v1.2, squashed fixup by agraf] Signed-off-by: Andreas Färber --- - user-exec.c | 6 ++++++ - 1 file changed, 6 insertions(+) + user-exec.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/user-exec.c b/user-exec.c index aa15bee..2fe945a 100644 diff --git a/0020-linux-user-lock-tcg.patch.patch b/0020-linux-user-lock-tcg.patch.patch index be53acba..2f9b09f3 100644 --- a/0020-linux-user-lock-tcg.patch.patch +++ b/0020-linux-user-lock-tcg.patch.patch @@ -13,9 +13,9 @@ Signed-off-by: Alexander Graf [AF: Rebased onto exec.c/translate-all.c split for 1.4] Signed-off-by: Andreas Färber --- - linux-user/mmap.c | 3 +++ - tcg/tcg.c | 36 ++++++++++++++++++++++++++++++++++-- - tcg/tcg.h | 6 ++++++ + linux-user/mmap.c | 3 +++ + tcg/tcg.c | 36 ++++++++++++++++++++++++++++++++++-- + tcg/tcg.h | 6 ++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c diff --git a/0021-linux-user-Run-multi-threaded-code-.patch b/0021-linux-user-Run-multi-threaded-code-.patch index de9c6440..10949f51 100644 --- a/0021-linux-user-Run-multi-threaded-code-.patch +++ b/0021-linux-user-Run-multi-threaded-code-.patch @@ -15,8 +15,8 @@ This gets Java 1.7 working for me again on my test box. Signed-off-by: Alexander Graf --- - linux-user/syscall.c | 9 +++++++++ - 1 file changed, 9 insertions(+) + linux-user/syscall.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 689bd33..38cee23 100644 diff --git a/0022-linux-user-lock-tb-flushing-too.pat.patch b/0022-linux-user-lock-tb-flushing-too.pat.patch index a2a6a6e8..5e877e9e 100644 --- a/0022-linux-user-lock-tb-flushing-too.pat.patch +++ b/0022-linux-user-lock-tb-flushing-too.pat.patch @@ -10,8 +10,8 @@ Signed-off-by: Alexander Graf [AF: Rebased onto exec.c/translate-all.c split for 1.4] Signed-off-by: Andreas Färber --- - translate-all.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) + translate-all.c | 20 ++++++++++++++++++-- + 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/translate-all.c b/translate-all.c index da93608..7e2e6fc 100644 diff --git a/0023-linux-user-Fake-proc-cpuinfo.patch.patch b/0023-linux-user-Fake-proc-cpuinfo.patch.patch index a1f8e6c7..754bd3ad 100644 --- a/0023-linux-user-Fake-proc-cpuinfo.patch.patch +++ b/0023-linux-user-Fake-proc-cpuinfo.patch.patch @@ -13,8 +13,8 @@ has happened. Signed-off-by: Alexander Graf --- - linux-user/syscall.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) + linux-user/syscall.c | 20 ++++++++++++++++++++ + 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 38cee23..18c7447 100644 diff --git a/0024-linux-user-implement-FS_IOC_GETFLAG.patch b/0024-linux-user-implement-FS_IOC_GETFLAG.patch index 04f77c2f..c9fbdaa9 100644 --- a/0024-linux-user-implement-FS_IOC_GETFLAG.patch +++ b/0024-linux-user-implement-FS_IOC_GETFLAG.patch @@ -11,9 +11,9 @@ v1 -> v2: - use TYPE_LONG instead of TYPE_INT --- - linux-user/ioctls.h | 1 + - linux-user/syscall_defs.h | 2 ++ - 2 files changed, 3 insertions(+) + linux-user/ioctls.h | 1 + + linux-user/syscall_defs.h | 2 ++ + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index bb76c56..85b5bfd 100644 diff --git a/0025-linux-user-implement-FS_IOC_SETFLAG.patch b/0025-linux-user-implement-FS_IOC_SETFLAG.patch index 53138cf1..d039609a 100644 --- a/0025-linux-user-implement-FS_IOC_SETFLAG.patch +++ b/0025-linux-user-implement-FS_IOC_SETFLAG.patch @@ -11,9 +11,9 @@ v1 -> v2 - use TYPE_LONG instead of TYPE_INT --- - linux-user/ioctls.h | 1 + - linux-user/syscall_defs.h | 1 + - 2 files changed, 2 insertions(+) + linux-user/ioctls.h | 1 + + linux-user/syscall_defs.h | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index 85b5bfd..229cd6f 100644 diff --git a/0026-linux-user-XXX-disable-fiemap.patch.patch b/0026-linux-user-XXX-disable-fiemap.patch.patch index 1b006c36..3c9df5b3 100644 --- a/0026-linux-user-XXX-disable-fiemap.patch.patch +++ b/0026-linux-user-XXX-disable-fiemap.patch.patch @@ -5,8 +5,8 @@ Subject: [PATCH] linux-user: XXX disable fiemap agraf: fiemap breaks in libarchive. Disable it for now. --- - linux-user/syscall.c | 5 +++++ - 1 file changed, 5 insertions(+) + linux-user/syscall.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 18c7447..7512b56 100644 diff --git a/0027-slirp-nooutgoing.patch.patch b/0027-slirp-nooutgoing.patch.patch index 9be5ce49..00923067 100644 --- a/0027-slirp-nooutgoing.patch.patch +++ b/0027-slirp-nooutgoing.patch.patch @@ -5,11 +5,11 @@ Subject: [PATCH] slirp: -nooutgoing TBD (from SUSE Studio team) --- - qemu-options.hx | 10 ++++++++++ - slirp/socket.c | 8 ++++++++ - slirp/tcp_subr.c | 13 +++++++++++++ - vl.c | 9 +++++++++ - 4 files changed, 40 insertions(+) + qemu-options.hx | 10 ++++++++++ + slirp/socket.c | 8 ++++++++ + slirp/tcp_subr.c | 13 +++++++++++++ + vl.c | 9 +++++++++ + 4 files changed, 40 insertions(+), 0 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index fb62b75..2cd52ab 100644 diff --git a/0028-vnc-password-file-and-incoming-conn.patch b/0028-vnc-password-file-and-incoming-conn.patch index 74ed16a3..b14dc6b2 100644 --- a/0028-vnc-password-file-and-incoming-conn.patch +++ b/0028-vnc-password-file-and-incoming-conn.patch @@ -5,8 +5,8 @@ Subject: [PATCH] vnc: password-file= and incoming-connections= TBD (from SUSE Studio team) --- - ui/vnc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 71 insertions(+) + ui/vnc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index dfc7459..b3ca308 100644 diff --git a/0029-linux-user-add-more-blk-ioctls.patc.patch b/0029-linux-user-add-more-blk-ioctls.patc.patch index c22edc8e..20c211c4 100644 --- a/0029-linux-user-add-more-blk-ioctls.patc.patch +++ b/0029-linux-user-add-more-blk-ioctls.patc.patch @@ -7,10 +7,10 @@ Implement a few more ioctls that operate on block devices. Signed-off-by: Alexander Graf --- - linux-user/ioctls.h | 18 ++++++++++++++++++ - linux-user/syscall_defs.h | 6 ++++++ - linux-user/syscall_types.h | 3 +++ - 3 files changed, 27 insertions(+) + linux-user/ioctls.h | 18 ++++++++++++++++++ + linux-user/syscall_defs.h | 6 ++++++ + linux-user/syscall_types.h | 3 +++ + 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index 229cd6f..3323176 100644 diff --git a/0030-linux-user-use-target_ulong.patch.patch b/0030-linux-user-use-target_ulong.patch.patch index 178f3189..af65c5ed 100644 --- a/0030-linux-user-use-target_ulong.patch.patch +++ b/0030-linux-user-use-target_ulong.patch.patch @@ -12,8 +12,8 @@ Pass syscall arguments as ulong always. Signed-off-by: Alexander Graf --- - linux-user/qemu.h | 8 ++++---- - linux-user/syscall.c | 8 ++++---- + linux-user/qemu.h | 8 ++++---- + linux-user/syscall.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h diff --git a/0031-Add-support-for-DictZip-enabled-gzi.patch b/0031-Add-support-for-DictZip-enabled-gzi.patch index 9ae20681..e198f70e 100644 --- a/0031-Add-support-for-DictZip-enabled-gzi.patch +++ b/0031-Add-support-for-DictZip-enabled-gzi.patch @@ -27,9 +27,9 @@ Signed-off-by: Andreas Färber Signed-off-by: Tim Hardeck Signed-off-by: Andreas Färber --- - block/Makefile.objs | 1 + - block/dictzip.c | 596 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 597 insertions(+) + block/Makefile.objs | 1 + + block/dictzip.c | 596 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 597 insertions(+), 0 deletions(-) create mode 100644 block/dictzip.c diff --git a/block/Makefile.objs b/block/Makefile.objs diff --git a/0032-Add-tar-container-format.patch.patch b/0032-Add-tar-container-format.patch.patch index 1df967bc..a59863a2 100644 --- a/0032-Add-tar-container-format.patch.patch +++ b/0032-Add-tar-container-format.patch.patch @@ -28,9 +28,9 @@ Signed-off-by: Andreas Färber Signed-off-by: Tim Hardeck Signed-off-by: Andreas Färber --- - block/Makefile.objs | 1 + - block/tar.c | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 387 insertions(+) + block/Makefile.objs | 1 + + block/tar.c | 386 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 387 insertions(+), 0 deletions(-) create mode 100644 block/tar.c diff --git a/block/Makefile.objs b/block/Makefile.objs diff --git a/0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch b/0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch index c546e0f2..2762c579 100644 --- a/0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch +++ b/0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch @@ -4,8 +4,8 @@ Date: Wed, 12 Dec 2012 19:11:30 +0100 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch --- - block/tar.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) + block/tar.c | 13 +++++++++++-- + 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/block/tar.c b/block/tar.c index 87bf552..bf24c98 100644 diff --git a/0034-Legacy-Patch-kvm-qemu-preXX-report-.patch b/0034-Legacy-Patch-kvm-qemu-preXX-report-.patch index 4b5f83c5..eea4991e 100644 --- a/0034-Legacy-Patch-kvm-qemu-preXX-report-.patch +++ b/0034-Legacy-Patch-kvm-qemu-preXX-report-.patch @@ -4,8 +4,8 @@ Date: Wed, 12 Dec 2012 19:11:31 +0100 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch --- - net/net.c | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) + net/net.c | 22 ++++++++++++++++++++++ + 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/net/net.c b/net/net.c index 43a74e4..e1e7843 100644 diff --git a/0035-console-add-question-mark-escape-op.patch b/0035-console-add-question-mark-escape-op.patch index 4c7c2adf..bcb8f5df 100644 --- a/0035-console-add-question-mark-escape-op.patch +++ b/0035-console-add-question-mark-escape-op.patch @@ -12,8 +12,8 @@ outputting guest serial consoles to the graphical console emulator. Signed-off-by: Alexander Graf --- - ui/console.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + ui/console.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/console.c b/ui/console.c index b30853f..02d67b7 100644 diff --git a/0036-Make-char-muxer-more-robust-wrt-sma.patch b/0036-Make-char-muxer-more-robust-wrt-sma.patch index 86d6eeec..fd6b277f 100644 --- a/0036-Make-char-muxer-more-robust-wrt-sma.patch +++ b/0036-Make-char-muxer-more-robust-wrt-sma.patch @@ -18,8 +18,8 @@ it polls again after a while to check if the guest is now receiving input. This patch fixes input when using -nographic on s390 for me. --- - qemu-char.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + qemu-char.c | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index cff2896..206bd07 100644 diff --git a/0037-linux-user-lseek-explicitly-cast-no.patch b/0037-linux-user-lseek-explicitly-cast-no.patch index 477f3613..7aefbe2a 100644 --- a/0037-linux-user-lseek-explicitly-cast-no.patch +++ b/0037-linux-user-lseek-explicitly-cast-no.patch @@ -12,8 +12,8 @@ absolute positioned which we need to maintain as unsigned. Signed-off-by: Alexander Graf --- - linux-user/syscall.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + linux-user/syscall.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c1eceb2..232f70d 100644 diff --git a/0038-virtfs-proxy-helper-Provide-__u64-f.patch b/0038-virtfs-proxy-helper-Provide-__u64-f.patch index 0cb4f2d2..df4b4544 100644 --- a/0038-virtfs-proxy-helper-Provide-__u64-f.patch +++ b/0038-virtfs-proxy-helper-Provide-__u64-f.patch @@ -8,8 +8,8 @@ Fixes the build on SLE 11 SP2. [AF: Extend to ppc64] --- - fsdev/virtfs-proxy-helper.c | 7 +++++++ - 1 file changed, 7 insertions(+) + fsdev/virtfs-proxy-helper.c | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index 713a7b2..b8da77d 100644 diff --git a/0039-gtk-don-t-use-g_object_unref-on-Gdk.patch b/0039-gtk-don-t-use-g_object_unref-on-Gdk.patch new file mode 100644 index 00000000..fd71cf08 --- /dev/null +++ b/0039-gtk-don-t-use-g_object_unref-on-Gdk.patch @@ -0,0 +1,34 @@ +From 354ada837cfa3f1bac346b8565569e62afcc89c1 Mon Sep 17 00:00:00 2001 +From: Anthony Liguori +Date: Mon, 3 Jun 2013 15:37:23 -0500 +Subject: [PATCH] gtk: don't use g_object_unref on GdkCursor + +It's not a GObject. + +Cc: Gerd Hoffman +Reported-by: Michael Tokarev +Signed-off-by: Anthony Liguori +--- +v1 -> v2 + - Fix summary to agree with code (Peter) +(cherry picked from commit 171392406d8e230d62e5ebf4805f71460854b8ec) +[bnc#830459] + +Signed-off-by: Bruce Rogers +--- + ui/gtk.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ui/gtk.c b/ui/gtk.c +index 52c3f95..79fa1d5 100644 +--- a/ui/gtk.c ++++ b/ui/gtk.c +@@ -377,7 +377,7 @@ static void gd_cursor_define(DisplayChangeListener *dcl, + pixbuf, c->hot_x, c->hot_y); + gdk_window_set_cursor(gtk_widget_get_window(s->drawing_area), cursor); + g_object_unref(pixbuf); +- g_object_unref(cursor); ++ gdk_cursor_unref(cursor); + } + + static void gd_switch(DisplayChangeListener *dcl, diff --git a/0040-gtk-Fix-compiler-warning-GTK-3-depr.patch b/0040-gtk-Fix-compiler-warning-GTK-3-depr.patch new file mode 100644 index 00000000..8819fbdb --- /dev/null +++ b/0040-gtk-Fix-compiler-warning-GTK-3-depr.patch @@ -0,0 +1,43 @@ +From d054b88496c4699ecaf821072ddd6be0edc46815 Mon Sep 17 00:00:00 2001 +From: Stefan Weil +Date: Sun, 16 Jun 2013 16:13:07 +0200 +Subject: [PATCH] gtk: Fix compiler warning (GTK 3 deprecated function) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With GTK 3, the function gdk_cursor_unref is deprecated: + +qemu/ui/gtk.c: In function ‘gd_cursor_define’: +qemu/ui/gtk.c:380:5: error: + ‘gdk_cursor_unref’ is deprecated (declared at /usr/include/gtk-3.0/gdk/gdkcursor.h:233): Use 'g_object_unref' instead [-Werror=deprecated-declarations] + +Fix the gcc compiler warning by using conditional compilation. + +Signed-off-by: Stefan Weil +Message-id: 1371391987-10795-1-git-send-email-sw@weilnetz.de +Signed-off-by: Anthony Liguori +(cherry picked from commit 030b4b7debf659dcd6fc66826564285fdce5057d) +[bnc#830459] + +Signed-off-by: Bruce Rogers +--- + ui/gtk.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/ui/gtk.c b/ui/gtk.c +index 79fa1d5..d8baea8 100644 +--- a/ui/gtk.c ++++ b/ui/gtk.c +@@ -377,7 +377,11 @@ static void gd_cursor_define(DisplayChangeListener *dcl, + pixbuf, c->hot_x, c->hot_y); + gdk_window_set_cursor(gtk_widget_get_window(s->drawing_area), cursor); + g_object_unref(pixbuf); ++#if !GTK_CHECK_VERSION(3, 0, 0) + gdk_cursor_unref(cursor); ++#else ++ g_object_unref(cursor); ++#endif + } + + static void gd_switch(DisplayChangeListener *dcl, diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index a0c2e2aa..f8739a19 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -63,6 +63,8 @@ Patch0035: 0035-console-add-question-mark-escape-op.patch Patch0036: 0036-Make-char-muxer-more-robust-wrt-sma.patch Patch0037: 0037-linux-user-lseek-explicitly-cast-no.patch Patch0038: 0038-virtfs-proxy-helper-Provide-__u64-f.patch +Patch0039: 0039-gtk-don-t-use-g_object_unref-on-Gdk.patch +Patch0040: 0040-gtk-Fix-compiler-warning-GTK-3-depr.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: rpmlintrc @@ -153,6 +155,8 @@ run cross-architecture builds. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 +%patch0039 -p1 +%patch0040 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ diff --git a/qemu.changes b/qemu.changes index 1cc3690b..6dbea123 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 22 21:34:00 UTC 2013 - brogers@suse.com + +- Fix segfault that occurs from using -vga qxl (bnc#830459) + ------------------------------------------------------------------- Tue Jun 18 13:58:35 UTC 2013 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 549007f7..e3bfa47a 100644 --- a/qemu.spec +++ b/qemu.spec @@ -63,6 +63,8 @@ Patch0035: 0035-console-add-question-mark-escape-op.patch Patch0036: 0036-Make-char-muxer-more-robust-wrt-sma.patch Patch0037: 0037-linux-user-lseek-explicitly-cast-no.patch Patch0038: 0038-virtfs-proxy-helper-Provide-__u64-f.patch +Patch0039: 0039-gtk-don-t-use-g_object_unref-on-Gdk.patch +Patch0040: 0040-gtk-Fix-compiler-warning-GTK-3-depr.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: rpmlintrc @@ -213,6 +215,8 @@ This sub-package contains the guest agent. %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 +%patch0039 -p1 +%patch0040 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \