rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 184030 from home:bfrogers:branches:Virtualization

Browse Source 
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
This commit is contained in:
Andreas Färber 2013-07-22 22:21:56 +00:00 committed by Git OBS Bridge
parent 8b669de23e
commit 924fec7f05
43 changed files with 186 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-XXX-dont-dump-core-on-sigabort.patc.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] XXX dont dump core on sigabort
---
linux-user/signal.c | 6 ++++++
1 file changed, 6 insertions(+)
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 1055507..7af7caa 100644

6
0002-XXX-work-around-SA_RESTART-race-wit.patch
View File

@ -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/main.c | 25 +++++++++-----
linux-user/qemu.h | 3 ++
linux-user/signal.c | 22 +++++++++++++
linux-user/syscall.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++-
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

2
0003-qemu-0.9.0.cvs-binfmt.patch.patch
View File

@ -11,7 +11,7 @@ Fixes binfmt_misc setup script:
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
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

2
0004-qemu-cvs-alsa_bitfield.patch.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
---
include/exec/user/thunk.h | 3 +++
thunk.c | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+)
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

2
0005-qemu-cvs-alsa_ioctl.patch.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
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

2
0006-qemu-cvs-alsa_mmap.patch.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/mmap.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index b412e3f..46523de 100644

2
0007-qemu-cvs-gettimeofday.patch.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] qemu-cvs-gettimeofday
No clue what this is for.
---
linux-user/syscall.c | 2 ++
1 file changed, 2 insertions(+)
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1d3406f..94eb877 100644

2
0008-qemu-cvs-ioctl_debug.patch.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/syscall.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 94eb877..a171128 100644

2
0009-qemu-cvs-ioctl_nodirection.patch.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/syscall.c | 6 ++++++
1 file changed, 6 insertions(+)
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index a171128..01fbfb7 100644

2
0012-linux-user-Ignore-timer_create-sysc.patch
View File

@ -9,7 +9,7 @@ about it breaks some %check tests in OBS, so better ignore it silently.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 5 +++++
1 file changed, 5 insertions(+)
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 01fbfb7..14c98ac 100644

2
0013-linux-user-be-silent-about-capget-f.patch
View File

@ -10,7 +10,7 @@ implementation and go on with life :)
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 14c98ac..58c5f70 100644

2
0014-PPC-KVM-Disable-mmu-notifier-check..patch
View File

@ -10,7 +10,7 @@ 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(+)
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/exec.c b/exec.c
index aec65c5..53c937d 100644

2
0015-linux-user-fix-segfault-deadlock.pa.patch
View File

@ -23,7 +23,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
---
include/exec/spinlock.h | 10 ++++++++++
user-exec.c | 4 ++++
2 files changed, 14 insertions(+)
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/include/exec/spinlock.h b/include/exec/spinlock.h
index a72edda..e460e12 100644

2
0016-linux-user-binfmt-support-host-bina.patch
View File

@ -9,7 +9,7 @@ trying to run, let's just use that instead as it will be a lot faster.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/binfmt.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
index cd1f513..87dc4c6 100644

2
0017-linux-user-arm-no-tb_flush-on-reset.patch
View File

@ -11,7 +11,7 @@ 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(+)
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 496a59f..ad60f82 100644

2
0018-linux-user-Ignore-broken-loop-ioctl.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
linux-user/linux_loop.h | 1 +
linux-user/syscall.c | 7 +++++++
linux-user/syscall_defs.h | 1 +
4 files changed, 10 insertions(+)
4 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 6af0cb7..bb76c56 100644

2
0019-linux-user-fix-segmentation-fault-p.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
user-exec.c | 6 ++++++
1 file changed, 6 insertions(+)
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/user-exec.c b/user-exec.c
index aa15bee..2fe945a 100644

2
0021-linux-user-Run-multi-threaded-code-.patch
View File

@ -16,7 +16,7 @@ This gets Java 1.7 working for me again on my test box.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 9 +++++++++
1 file changed, 9 insertions(+)
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 689bd33..38cee23 100644

2
0022-linux-user-lock-tb-flushing-too.pat.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
translate-all.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/translate-all.c b/translate-all.c
index da93608..7e2e6fc 100644

2
0023-linux-user-Fake-proc-cpuinfo.patch.patch
View File

@ -14,7 +14,7 @@ has happened.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 38cee23..18c7447 100644

2
0024-linux-user-implement-FS_IOC_GETFLAG.patch
View File

@ -13,7 +13,7 @@ v1 -> v2:
---
linux-user/ioctls.h | 1 +
linux-user/syscall_defs.h | 2 ++
2 files changed, 3 insertions(+)
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index bb76c56..85b5bfd 100644

2
0025-linux-user-implement-FS_IOC_SETFLAG.patch
View File

@ -13,7 +13,7 @@ v1 -> v2
---
linux-user/ioctls.h | 1 +
linux-user/syscall_defs.h | 1 +
2 files changed, 2 insertions(+)
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 85b5bfd..229cd6f 100644

2
0026-linux-user-XXX-disable-fiemap.patch.patch
View File

@ -6,7 +6,7 @@ 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(+)
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 18c7447..7512b56 100644

2
0027-slirp-nooutgoing.patch.patch
View File

@ -9,7 +9,7 @@ TBD (from SUSE Studio team)
slirp/socket.c | 8 ++++++++
slirp/tcp_subr.c | 13 +++++++++++++
vl.c | 9 +++++++++
4 files changed, 40 insertions(+)
4 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index fb62b75..2cd52ab 100644

4
0028-vnc-password-file-and-incoming-conn.patch
View File

@ -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

2
0029-linux-user-add-more-blk-ioctls.patc.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
linux-user/ioctls.h | 18 ++++++++++++++++++
linux-user/syscall_defs.h | 6 ++++++
linux-user/syscall_types.h | 3 +++
3 files changed, 27 insertions(+)
3 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 229cd6f..3323176 100644

4
0031-Add-support-for-DictZip-enabled-gzi.patch
View File

@ -28,8 +28,8 @@ Signed-off-by: Tim Hardeck <thardeck@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
block/Makefile.objs | 1 +
block/dictzip.c | 596 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 597 insertions(+)
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

4
0032-Add-tar-container-format.patch.patch
View File

@ -29,8 +29,8 @@ Signed-off-by: Tim Hardeck <thardeck@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
block/Makefile.objs | 1 +
block/tar.c | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 387 insertions(+)
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

2
0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
---
block/tar.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/block/tar.c b/block/tar.c
index 87bf552..bf24c98 100644

2
0034-Legacy-Patch-kvm-qemu-preXX-report-.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch
---
net/net.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/net/net.c b/net/net.c
index 43a74e4..e1e7843 100644

2
0035-console-add-question-mark-escape-op.patch
View File

@ -13,7 +13,7 @@ outputting guest serial consoles to the graphical console emulator.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
ui/console.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ui/console.c b/ui/console.c
index b30853f..02d67b7 100644

2
0036-Make-char-muxer-more-robust-wrt-sma.patch
View File

@ -19,7 +19,7 @@ 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(+)
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index cff2896..206bd07 100644

2
0037-linux-user-lseek-explicitly-cast-no.patch
View File

@ -13,7 +13,7 @@ absolute positioned which we need to maintain as unsigned.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index c1eceb2..232f70d 100644

2
0038-virtfs-proxy-helper-Provide-__u64-f.patch
View File

@ -9,7 +9,7 @@ Fixes the build on SLE 11 SP2.
[AF: Extend to ppc64]
---
fsdev/virtfs-proxy-helper.c | 7 +++++++
1 file changed, 7 insertions(+)
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

34
0039-gtk-don-t-use-g_object_unref-on-Gdk.patch Normal file
View File

@ -0,0 +1,34 @@
From 354ada837cfa3f1bac346b8565569e62afcc89c1 Mon Sep 17 00:00:00 2001
From: Anthony Liguori <aliguori@us.ibm.com>
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 <kraxel@redhat.com>
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
v1 -> v2
- Fix summary to agree with code (Peter)
(cherry picked from commit 171392406d8e230d62e5ebf4805f71460854b8ec)
[bnc#830459]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
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,

43
0040-gtk-Fix-compiler-warning-GTK-3-depr.patch Normal file
View File

@ -0,0 +1,43 @@
From d054b88496c4699ecaf821072ddd6be0edc46815 Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
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 <sw@weilnetz.de>
Message-id: 1371391987-10795-1-git-send-email-sw@weilnetz.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 030b4b7debf659dcd6fc66826564285fdce5057d)
[bnc#830459]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
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,

4
qemu-linux-user.spec
View File

@ -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 \

5
qemu.changes
View File

@ -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

4
qemu.spec
View File

@ -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 \