Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in at 2014-01-19 21:42:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2013-12-17 10:03:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes 2014-01-23 15:55:24.000000000 +0100
@@ -1,0 +2,11 @@
+Sat Jan 18 01:19:27 UTC 2014 - afaerber@suse.de
+
+- Added patch to implement BLKPG ioctl that broke kiwi image builds
+ 0040-linux-user-Implement-BLKPG-ioctl.pa.patch
+
+-------------------------------------------------------------------
+Fri Jan 17 17:40:21 UTC 2014 - afaerber@suse.de
+
+- Bump copyright in qemu-linux-user.spec.in
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2014-01-14 20:00:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2014-01-23 15:55:24.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Jan 17 17:34:57 UTC 2014 - afaerber@suse.de
+
+- Bump copyright in qemu.spec.in
+- Use vte-devel instead of vte2-devel and force using Gtk3,
+ reported by Takashi and Dirk (bnc#840607, bnc#849587).
+
+-------------------------------------------------------------------
New:
----
0040-linux-user-Implement-BLKPG-ioctl.pa.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu-linux-user.spec ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -64,6 +64,7 @@
Patch0037: 0037-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0038: 0038-roms-Build-vgabios.bin.patch.patch
Patch0039: 0039-configure-Enable-PIE-for-ppc-and-pp.patch
+Patch0040: 0040-linux-user-Implement-BLKPG-ioctl.pa.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: rpmlintrc
@@ -155,6 +156,7 @@
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
+%patch0040 -p1
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -71,6 +71,7 @@
Patch0037: 0037-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0038: 0038-roms-Build-vgabios.bin.patch.patch
Patch0039: 0039-configure-Enable-PIE-for-ppc-and-pp.patch
+Patch0040: 0040-linux-user-Implement-BLKPG-ioctl.pa.patch
# Please do not add patches manually here, run update_git.sh.
# roms/ipxe patches
@@ -134,8 +135,12 @@
BuildRequires: usbredir-devel
%endif
%if 0%{?suse_version} >= 1210
+%if 0%{?suse_version} >= 1220
+BuildRequires: vte-devel
+%else
BuildRequires: vte2-devel
%endif
+%endif
%ifarch x86_64
BuildRequires: xen-devel
%endif
@@ -299,6 +304,7 @@
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
+%patch0040 -p1
%patch1000 -p1
%patch1001 -p1
@@ -330,6 +336,9 @@
--enable-curses \
%if 0%{?suse_version} >= 1210
--enable-gtk \
+%if 0%{?suse_version} >= 1220
+ --with-gtkabi=3.0 \
+%endif
%endif
--enable-linux-aio \
--enable-sdl \
++++++ 0001-XXX-dont-dump-core-on-sigabort.patc.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -4,8 +4,8 @@
Subject: [PATCH] XXX dont dump core on sigabort
---
- linux-user/signal.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ linux-user/signal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 7751c47..a9874b1 100644
++++++ 0002-XXX-work-around-SA_RESTART-race-wit.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -5,10 +5,10 @@
[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
++++++ 0003-qemu-0.9.0.cvs-binfmt.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -10,8 +10,8 @@
Signed-off-by: Ulrich Hecht
---
- scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++-----------------
- 1 files changed, 20 insertions(+), 17 deletions(-)
+ scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++-----------------
+ 1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 0da2618..dc652f0 100644
++++++ 0004-qemu-cvs-alsa_bitfield.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -8,9 +8,9 @@
Signed-off-by: Alexander Graf
Signed-off-by: Ulrich Hecht
---
- include/exec/user/thunk.h | 3 +++
- thunk.c | 21 +++++++++++++++++++++
- 2 files changed, 24 insertions(+), 0 deletions(-)
+ include/exec/user/thunk.h | 3 +++
+ thunk.c | 21 +++++++++++++++++++++
+ 2 files changed, 24 insertions(+)
diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
index 87025c3..6c35e64 100644
++++++ 0005-qemu-cvs-alsa_ioctl.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -14,7 +14,7 @@
linux-user/syscall_defs.h | 2 +
linux-user/syscall_types.h | 5 +
linux-user/syscall_types_alsa.h | 1336 +++++++++++++++++++++++++++++
- 6 files changed, 3555 insertions(+), 0 deletions(-)
+ 6 files changed, 3555 insertions(+)
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
++++++ 0006-qemu-cvs-alsa_mmap.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -8,8 +8,8 @@
Signed-off-by: Alexander Graf
Signed-off-by: Ulrich Hecht
---
- linux-user/mmap.c | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
+ linux-user/mmap.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index a249f0c..34a5615 100644
++++++ 0007-qemu-cvs-gettimeofday.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -5,8 +5,8 @@
No clue what this is for.
---
- linux-user/syscall.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 6097420..aef4fb6 100644
++++++ 0008-qemu-cvs-ioctl_debug.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -8,8 +8,8 @@
Signed-off-by: Alexander Graf
Signed-off-by: Ulrich Hecht
---
- linux-user/syscall.c | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ linux-user/syscall.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index aef4fb6..c8c9e1a 100644
++++++ 0009-qemu-cvs-ioctl_nodirection.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -11,8 +11,8 @@
Signed-off-by: Alexander Graf
Signed-off-by: Ulrich Hecht
---
- linux-user/syscall.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index c8c9e1a..2b4e263 100644
++++++ 0010-block-vmdk-Support-creation-of-SCSI.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -12,10 +12,10 @@
[AF: Rebased onto skipping of image creation in v1.7]
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
++++++ 0011-linux-user-add-binfmt-wrapper-for-a.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -27,10 +27,10 @@
[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
++++++ 0012-linux-user-Ignore-timer_create-sysc.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -8,8 +8,8 @@
Signed-off-by: Alexander Graf
---
- linux-user/syscall.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 5 +++++
+ 1 file changed, 5 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 2b4e263..e423def 100644
++++++ 0013-linux-user-be-silent-about-capget-f.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -9,8 +9,8 @@
Signed-off-by: Alexander Graf
---
- linux-user/syscall.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ linux-user/syscall.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index e423def..d5b3d02 100644
++++++ 0014-PPC-KVM-Disable-mmu-notifier-check..patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -9,8 +9,8 @@
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 files changed, 2 insertions(+), 0 deletions(-)
+ exec.c | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/exec.c b/exec.c
index 95c4356..58b0647 100644
++++++ 0015-linux-user-fix-segfault-deadlock.pa.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -21,9 +21,9 @@
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(+), 0 deletions(-)
+ include/exec/spinlock.h | 10 ++++++++++
+ user-exec.c | 4 ++++
+ 2 files changed, 14 insertions(+)
diff --git a/include/exec/spinlock.h b/include/exec/spinlock.h
index a72edda..e460e12 100644
++++++ 0016-linux-user-binfmt-support-host-bina.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -8,8 +8,8 @@
Signed-off-by: Alexander Graf
---
- linux-user/binfmt.c | 25 +++++++++++++++++++++++++
- 1 files changed, 25 insertions(+), 0 deletions(-)
+ linux-user/binfmt.c | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
index cd1f513..87dc4c6 100644
++++++ 0017-linux-user-arm-no-tb_flush-on-reset.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -10,8 +10,8 @@
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 files changed, 4 insertions(+), 0 deletions(-)
+ target-arm/cpu.c | 4 ++++
+ 1 file changed, 4 insertions(+)
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index d40f2a7..3113456 100644
++++++ 0018-linux-user-Ignore-broken-loop-ioctl.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -11,11 +11,11 @@
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(+), 0 deletions(-)
+ 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(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 1c9d67f..b743309 100644
++++++ 0019-linux-user-lock-tcg.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -13,9 +13,9 @@
[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
++++++ 0020-linux-user-Run-multi-threaded-code-.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -15,8 +15,8 @@
Signed-off-by: Alexander Graf
---
- linux-user/syscall.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5113d22..7be6873 100644
++++++ 0021-linux-user-lock-tb-flushing-too.pat.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -10,8 +10,8 @@
[AF: Rebased onto exec.c/translate-all.c split for 1.4]
Signed-off-by: Andreas Färber
---
- translate-all.c | 20 ++++++++++++++++++--
- 1 files changed, 18 insertions(+), 2 deletions(-)
+ translate-all.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/translate-all.c b/translate-all.c
index aeda54d..6cfba5a 100644
++++++ 0022-linux-user-Fake-proc-cpuinfo.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -18,8 +18,8 @@
[AF: Rebased for v1.6 and v1.7]
Signed-off-by: Andreas Färber
---
- linux-user/syscall.c | 20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7be6873..e678f9b 100644
++++++ 0023-linux-user-implement-FS_IOC_GETFLAG.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -11,9 +11,9 @@
- use TYPE_LONG instead of TYPE_INT
---
- linux-user/ioctls.h | 1 +
- linux-user/syscall_defs.h | 2 ++
- 2 files changed, 3 insertions(+), 0 deletions(-)
+ linux-user/ioctls.h | 1 +
+ linux-user/syscall_defs.h | 2 ++
+ 2 files changed, 3 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index b743309..f273ccb 100644
++++++ 0024-linux-user-implement-FS_IOC_SETFLAG.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -11,9 +11,9 @@
- use TYPE_LONG instead of TYPE_INT
---
- linux-user/ioctls.h | 1 +
- linux-user/syscall_defs.h | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ linux-user/ioctls.h | 1 +
+ linux-user/syscall_defs.h | 1 +
+ 2 files changed, 2 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index f273ccb..a5f3514 100644
++++++ 0025-linux-user-XXX-disable-fiemap.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -5,8 +5,8 @@
agraf: fiemap breaks in libarchive. Disable it for now.
---
- linux-user/syscall.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ linux-user/syscall.c | 5 +++++
+ 1 file changed, 5 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index e678f9b..7fc61fe 100644
++++++ 0026-slirp-nooutgoing.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -5,11 +5,11 @@
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(+), 0 deletions(-)
+ qemu-options.hx | 10 ++++++++++
+ slirp/socket.c | 8 ++++++++
+ slirp/tcp_subr.c | 13 +++++++++++++
+ vl.c | 9 +++++++++
+ 4 files changed, 40 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
index 8b94264..179cf72 100644
++++++ 0027-vnc-password-file-and-incoming-conn.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -5,8 +5,8 @@
TBD (from SUSE Studio team)
---
- ui/vnc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 71 insertions(+), 0 deletions(-)
+ ui/vnc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 71 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
index 5601cc3..d5796e6 100644
++++++ 0028-linux-user-add-more-blk-ioctls.patc.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -7,10 +7,10 @@
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(+), 0 deletions(-)
+ linux-user/ioctls.h | 18 ++++++++++++++++++
+ linux-user/syscall_defs.h | 6 ++++++
+ linux-user/syscall_types.h | 3 +++
+ 3 files changed, 27 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index a5f3514..a96a419 100644
++++++ 0029-linux-user-use-target_ulong.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -12,8 +12,8 @@
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
++++++ 0030-block-Add-support-for-DictZip-enabl.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -28,9 +28,9 @@
[AF: Error **errp added for bdrv_file_open, bdrv_delete -> bdrv_unref]
Signed-off-by: Andreas Färber
---
- block/Makefile.objs | 1 +
- block/dictzip.c | 596 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 597 insertions(+), 0 deletions(-)
+ block/Makefile.objs | 1 +
+ block/dictzip.c | 596 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 597 insertions(+)
create mode 100644 block/dictzip.c
diff --git a/block/Makefile.objs b/block/Makefile.objs
++++++ 0031-block-Add-tar-container-format.patc.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -29,9 +29,9 @@
[AF: bdrv_file_open got an Error **errp argument, bdrv_delete -> brd_unref]
Signed-off-by: Andreas Färber
---
- block/Makefile.objs | 1 +
- block/tar.c | 386 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 387 insertions(+), 0 deletions(-)
+ block/Makefile.objs | 1 +
+ block/tar.c | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 387 insertions(+)
create mode 100644 block/tar.c
diff --git a/block/Makefile.objs b/block/Makefile.objs
++++++ 0032-Legacy-Patch-kvm-qemu-preXX-dictzip.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -4,8 +4,8 @@
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
---
- block/tar.c | 13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
+ block/tar.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/block/tar.c b/block/tar.c
index 24ed37b..c324240 100644
++++++ 0033-Legacy-Patch-kvm-qemu-preXX-report-.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -4,8 +4,8 @@
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch
---
- net/net.c | 22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
+ net/net.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
diff --git a/net/net.c b/net/net.c
index 0a88e68..0716a72 100644
++++++ 0034-console-add-question-mark-escape-op.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -12,8 +12,8 @@
Signed-off-by: Alexander Graf
---
- ui/console.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ ui/console.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/console.c b/ui/console.c
index 199ba69..f7894f8 100644
++++++ 0035-Make-char-muxer-more-robust-wrt-sma.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -18,8 +18,8 @@
This patch fixes input when using -nographic on s390 for me.
---
- qemu-char.c | 16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
+ qemu-char.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
index e00f84c..60faa71 100644
++++++ 0036-linux-user-lseek-explicitly-cast-no.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -12,8 +12,8 @@
Signed-off-by: Alexander Graf
---
- linux-user/syscall.c | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
+ linux-user/syscall.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index b794666..4f7327a 100644
++++++ 0037-virtfs-proxy-helper-Provide-__u64-f.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:25.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:25.000000000 +0100
@@ -8,8 +8,8 @@
[AF: Extend to ppc64]
---
- fsdev/virtfs-proxy-helper.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ fsdev/virtfs-proxy-helper.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 713a7b2..b8da77d 100644
++++++ 0038-roms-Build-vgabios.bin.patch.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:26.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:26.000000000 +0100
@@ -4,8 +4,8 @@
Subject: [PATCH] roms: Build vgabios.bin
---
- roms/Makefile | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ roms/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/roms/Makefile b/roms/Makefile
index 10d5a65..3bb1f48 100644
++++++ 0039-configure-Enable-PIE-for-ppc-and-pp.patch ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:26.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:26.000000000 +0100
@@ -10,8 +10,8 @@
[AF: Rebased for v1.7]
Signed-off-by: Andreas Färber
---
- configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 0666228..d508d50 100755
++++++ 0040-linux-user-Implement-BLKPG-ioctl.pa.patch ++++++
From bcbf3e6efa6b8fd95f2eee2194f40781c952f7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Sat, 18 Jan 2014 02:15:05 +0100
Subject: [PATCH] linux-user: Implement BLKPG ioctl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Färber
---
linux-user/ioctls.h | 1 +
linux-user/syscall.c | 1 +
linux-user/syscall_defs.h | 1 +
linux-user/syscall_types.h | 13 +++++++++++++
4 files changed, 16 insertions(+)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index a96a419..ffd6d09 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -95,6 +95,7 @@
IOCTL(BLKRAGET, IOC_R, MK_PTR(TYPE_LONG))
IOCTL(BLKSSZGET, IOC_R, MK_PTR(TYPE_LONG))
IOCTL(BLKBSZGET, IOC_R, MK_PTR(TYPE_INT))
+ IOCTL(BLKPG, IOC_W, MK_PTR(MK_STRUCT(STRUCT_blkpg_ioctl_arg)))
#ifdef FIBMAP
IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG))
#endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 4f7327a..ef82a0e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -107,6 +107,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include
#include
#include
+#include
#include "linux_loop.h"
#include "cpu-uname.h"
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 2d41202..3cdd471 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -895,6 +895,7 @@ struct target_pollfd {
#define TARGET_BLKSECTSET TARGET_IO(0x12,102)/* set max sectors per request (ll_rw_blk.c) */
#define TARGET_BLKSECTGET TARGET_IO(0x12,103)/* get max sectors per request (ll_rw_blk.c) */
#define TARGET_BLKSSZGET TARGET_IO(0x12,104)/* get block device sector size */
+#define TARGET_BLKPG TARGET_IO(0x12,105)/* Partition table and disk geometry handling */
/* A jump here: 108-111 have been used for various private purposes. */
#define TARGET_BLKBSZGET TARGET_IOR(0x12, 112, abi_ulong)
#define TARGET_BLKBSZSET TARGET_IOW(0x12, 113, abi_ulong)
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
index dd78619..56e344c 100644
--- a/linux-user/syscall_types.h
+++ b/linux-user/syscall_types.h
@@ -248,3 +248,16 @@ STRUCT(fiemap,
TYPE_INT, /* fm_mapped_extents */
TYPE_INT, /* fm_extent_count */
TYPE_INT) /* fm_reserved */
+
+STRUCT(blkpg_partition,
+ TYPE_LONGLONG, /* start */
+ TYPE_LONGLONG, /* length */
+ TYPE_INT, /* pno */
+ MK_ARRAY(TYPE_CHAR, BLKPG_DEVNAMELTH), /* devname */
+ MK_ARRAY(TYPE_CHAR, BLKPG_VOLNAMELTH)) /* volname */
+
+STRUCT(blkpg_ioctl_arg,
+ TYPE_INT, /* op */
+ TYPE_INT, /* flags */
+ TYPE_INT, /* datalen */
+ MK_PTR(MK_STRUCT(STRUCT_blkpg_partition))) /* data */
++++++ qemu-linux-user.spec.in ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:26.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package qemu-linux-user
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.1HIvbM/_old 2014-01-23 15:55:26.000000000 +0100
+++ /var/tmp/diff_new_pack.1HIvbM/_new 2014-01-23 15:55:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package qemu
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -96,8 +96,12 @@
BuildRequires: usbredir-devel
%endif
%if 0%{?suse_version} >= 1210
+%if 0%{?suse_version} >= 1220
+BuildRequires: vte-devel
+%else
BuildRequires: vte2-devel
%endif
+%endif
%ifarch x86_64
BuildRequires: xen-devel
%endif
@@ -110,11 +114,11 @@
%endif
Requires: /usr/sbin/groupadd
Requires: pwdutils
-Requires: timezone
Requires: qemu-ipxe
Requires: qemu-seabios
Requires: qemu-sgabios
Requires: qemu-vgabios
+Requires: timezone
Recommends: qemu-tools
%define firmware_files {acpi-dsdt.aml bios.bin q35-acpi-dsdt.aml sgabios.bin vgabios.bin vgabios-cirrus.bin vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin optionrom/linuxboot.bin optionrom/multiboot.bin optionrom/kvmvapic.bin pxe-e1000.rom pxe-pcnet.rom pxe-ne2k_pci.rom pxe-rtl8139.rom pxe-eepro100.rom pxe-virtio.rom}
@@ -254,6 +258,9 @@
--enable-curses \
%if 0%{?suse_version} >= 1210
--enable-gtk \
+%if 0%{?suse_version} >= 1220
+ --with-gtkabi=3.0 \
+%endif
%endif
--enable-linux-aio \
--enable-sdl \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org