Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in at 2012-10-19 13:36:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu", Maintainer is "AFaerber@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2012-09-16 23:47:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2012-10-19 13:36:13.000000000 +0200
@@ -1,0 +2,15 @@
+Tue Oct 10 18:14:59 UTC 2012 - agraf@suse.com
+
+- use ulong for syscall parameters. fixes lseek with big files
+
+-------------------------------------------------------------------
+Tue Oct 10 17:16:20 UTC 2012 - agraf@suse.com
+
+- Add more block ioctl handlers for kiwi
+
+-------------------------------------------------------------------
+Tue Oct 9 19:55:32 UTC 2012 - afaerber@suse.de
+
+- Sync qemu.spec.in file, please don't forget!
+
+-------------------------------------------------------------------
New:
----
0034-linux-user-add-more-blk-ioctls.patc.patch
0035-linux-user-use-target_ulong.patch.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.BVH8r0/_old 2012-10-19 13:36:15.000000000 +0200
+++ /var/tmp/diff_new_pack.BVH8r0/_new 2012-10-19 13:36:15.000000000 +0200
@@ -57,6 +57,8 @@
Patch0031: 0031-linux-user-XXX-disable-fiemap.patch.patch
Patch0032: 0032-slirp-nooutgoing.patch.patch
Patch0033: 0033-vnc-password-file-and-incoming-conn.patch
+Patch0034: 0034-linux-user-add-more-blk-ioctls.patc.patch
+Patch0035: 0035-linux-user-use-target_ulong.patch.patch
# this is to make lint happy
Source300: rpmlintrc
Source302: bridge.conf
@@ -208,6 +210,8 @@
%patch0031 -p1
%patch0032 -p1
%patch0033 -p1
+%patch0034 -p1
+%patch0035 -p1
%build
# build QEMU
++++++ 0011-block-vmdk-Support-creation-of-SCSI.patch ++++++
--- /var/tmp/diff_new_pack.BVH8r0/_old 2012-10-19 13:36:15.000000000 +0200
+++ /var/tmp/diff_new_pack.BVH8r0/_new 2012-10-19 13:36:15.000000000 +0200
@@ -3,7 +3,7 @@
Date: Tue, 14 Apr 2009 16:37:42 +0200
Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img
MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Ulrich Hecht
++++++ 0012-configure-Enable-mipsn32-linux-user.patch ++++++
--- /var/tmp/diff_new_pack.BVH8r0/_old 2012-10-19 13:36:15.000000000 +0200
+++ /var/tmp/diff_new_pack.BVH8r0/_new 2012-10-19 13:36:15.000000000 +0200
@@ -3,7 +3,7 @@
Date: Wed, 25 Aug 2010 14:23:43 +0200
Subject: [PATCH] configure: Enable mipsn32*-linux-user builds
MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Ulrich Hecht
++++++ 0013-linux-user-add-binfmt-wrapper-for-a.patch ++++++
--- /var/tmp/diff_new_pack.BVH8r0/_old 2012-10-19 13:36:15.000000000 +0200
+++ /var/tmp/diff_new_pack.BVH8r0/_new 2012-10-19 13:36:15.000000000 +0200
@@ -3,7 +3,7 @@
Date: Fri, 30 Sep 2011 19:40:36 +0200
Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
When using qemu's linux-user binaries through binfmt, argv[0] gets lost
++++++ 0021-use-libexecdir-instead-of-ignoring-.patch ++++++
--- /var/tmp/diff_new_pack.BVH8r0/_old 2012-10-19 13:36:15.000000000 +0200
+++ /var/tmp/diff_new_pack.BVH8r0/_new 2012-10-19 13:36:15.000000000 +0200
@@ -1,10 +1,9 @@
From 50cab0124e30c58c786c181b8b1909c659a7d458 Mon Sep 17 00:00:00 2001
From: Michael Tokarev
Date: Thu, 7 Jun 2012 01:11:00 +0400
-Subject: [PATCH] use --libexecdir instead of ignoring it first and
- reinventing it later
+Subject: [PATCH] use --libexecdir instead of ignoring it first and reinventing it later
MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Commit 7b93fadf3a38d1ed65ea5536a52efc2772c6e3b8 "Add basic version
++++++ 0023-linux-user-fix-segmentation-fault-p.patch ++++++
--- /var/tmp/diff_new_pack.BVH8r0/_old 2012-10-19 13:36:15.000000000 +0200
+++ /var/tmp/diff_new_pack.BVH8r0/_new 2012-10-19 13:36:15.000000000 +0200
@@ -3,7 +3,7 @@
Date: Mon, 25 Jun 2012 19:02:32 +0200
Subject: [PATCH] linux-user: fix segmentation fault passing with g2h(x) != x
MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
When forwarding a segmentation fault into the guest process, we were passing
++++++ 0032-slirp-nooutgoing.patch.patch ++++++
--- /var/tmp/diff_new_pack.BVH8r0/_old 2012-10-19 13:36:16.000000000 +0200
+++ /var/tmp/diff_new_pack.BVH8r0/_new 2012-10-19 13:36:16.000000000 +0200
@@ -1,5 +1,5 @@
From 512ceb1779ce40a1f2a91fad147210bfa5996512 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
+From: =?utf-8?q?Andreas=20F=C3=A4rber?=
Date: Wed, 29 Aug 2012 18:42:56 +0200
Subject: [PATCH] slirp: -nooutgoing
++++++ 0033-vnc-password-file-and-incoming-conn.patch ++++++
--- /var/tmp/diff_new_pack.BVH8r0/_old 2012-10-19 13:36:16.000000000 +0200
+++ /var/tmp/diff_new_pack.BVH8r0/_new 2012-10-19 13:36:16.000000000 +0200
@@ -1,5 +1,5 @@
From 25c622437e7c59a99e35fe9318cb5ec11c7cff4a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
+From: =?utf-8?q?Andreas=20F=C3=A4rber?=
Date: Wed, 29 Aug 2012 20:06:01 +0200
Subject: [PATCH] vnc: password-file= and incoming-connections=
++++++ 0034-linux-user-add-more-blk-ioctls.patc.patch ++++++
From 23f4e9a5b32491e772cf130786a561dff4afdbf3 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Wed, 10 Oct 2012 10:21:20 +0200
Subject: [PATCH] linux-user: add more blk ioctls
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(+), 0 deletions(-)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 5027c74..4522c14 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -71,6 +71,24 @@
#ifdef BLKGETSIZE64
IOCTL(BLKGETSIZE64, IOC_R, MK_PTR(TYPE_ULONGLONG))
#endif
+#ifdef BLKDISCARD
+ IOCTL(BLKDISCARD, IOC_W, MK_PTR(MK_STRUCT(STRUCT_blkdiscard)))
+#endif
+#ifdef BLKIOMIN
+ IOCTL(BLKIOMIN, IOC_R, MK_PTR(TYPE_INT))
+#endif
+#ifdef BLKIOOPT
+ IOCTL(BLKIOOPT, IOC_R, MK_PTR(TYPE_INT))
+#endif
+#ifdef BLKALIGNOFF
+ IOCTL(BLKALIGNOFF, IOC_R, MK_PTR(TYPE_INT))
+#endif
+#ifdef BLKPBSZGET
+ IOCTL(BLKPBSZGET, IOC_R, MK_PTR(TYPE_INT))
+#endif
+#ifdef BLKDISCARDZEROES
+ IOCTL(BLKDISCARDZEROES, IOC_R, MK_PTR(TYPE_INT))
+#endif
IOCTL(BLKFLSBUF, 0, TYPE_NULL)
IOCTL(BLKRASET, 0, TYPE_INT)
IOCTL(BLKRAGET, IOC_R, MK_PTR(TYPE_LONG))
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index d618414..2583dfb 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -885,6 +885,12 @@ struct target_pollfd {
#define TARGET_BLKGETSIZE64 TARGET_IOR(0x12,114,abi_ulong)
/* return device size in bytes
(u64 *arg) */
+#define TARGET_BLKDISCARD TARGET_IO(0x12,119)
+#define TARGET_BLKIOMIN TARGET_IO(0x12,120)
+#define TARGET_BLKIOOPT TARGET_IO(0x12,121)
+#define TARGET_BLKALIGNOFF TARGET_IO(0x12,122)
+#define TARGET_BLKPBSZGET TARGET_IO(0x12,123)
+#define TARGET_BLKDISCARDZEROES TARGET_IO(0x12,124)
#define TARGET_FIBMAP TARGET_IO(0x00,1) /* bmap access */
#define TARGET_FIGETBSZ TARGET_IO(0x00,2) /* get the block size used for bmap */
#define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap)
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
index 7897e37..dd78619 100644
--- a/linux-user/syscall_types.h
+++ b/linux-user/syscall_types.h
@@ -71,6 +71,9 @@ STRUCT(kbentry,
STRUCT(kbsentry,
TYPE_CHAR, MK_ARRAY(TYPE_CHAR, 512))
+STRUCT(blkdiscard,
+ MK_ARRAY(TYPE_LONGLONG, 2))
+
STRUCT(audio_buf_info,
TYPE_INT, TYPE_INT, TYPE_INT, TYPE_INT)
++++++ 0035-linux-user-use-target_ulong.patch.patch ++++++
From 3a1a6614255d40ee993f536e56cacbe92339f5d2 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 9 Oct 2012 09:06:49 +0200
Subject: [PATCH] linux-user: use target_ulong
Linux syscalls pass pointers or data length or other information of that sort
to the kernel. This is all stuff you don't want to have sign extended.
Otherwise a host 64bit variable parameter with a size parameter will extend
it to a negative number, breaking lseek for example.
Pass syscall arguments as ulong always.
Signed-off-by: Alexander Graf
---
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
index 175d502..c7ee759 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -194,10 +194,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
void target_set_brk(abi_ulong new_brk);
abi_long do_brk(abi_ulong new_brk);
void syscall_init(void);
-abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
- abi_long arg2, abi_long arg3, abi_long arg4,
- abi_long arg5, abi_long arg6, abi_long arg7,
- abi_long arg8);
+abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+ abi_ulong arg2, abi_ulong arg3, abi_ulong arg4,
+ abi_ulong arg5, abi_ulong arg6, abi_ulong arg7,
+ abi_ulong arg8);
void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
extern THREAD CPUArchState *thread_env;
void cpu_loop(CPUArchState *env);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index f9e7f33..e3a4d24 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5222,10 +5222,10 @@ int syscall_restartable(int syscall_nr)
/* do_syscall() should always have a single exit point at the end so
that actions, such as logging of syscall results, can be performed.
All errnos that do_syscall() returns must be -TARGET_<errcode>. */
-abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
- abi_long arg2, abi_long arg3, abi_long arg4,
- abi_long arg5, abi_long arg6, abi_long arg7,
- abi_long arg8)
+abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
+ abi_ulong arg2, abi_ulong arg3, abi_ulong arg4,
+ abi_ulong arg5, abi_ulong arg6, abi_ulong arg7,
+ abi_ulong arg8)
{
abi_long ret;
struct stat st;
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.BVH8r0/_old 2012-10-19 13:36:16.000000000 +0200
+++ /var/tmp/diff_new_pack.BVH8r0/_new 2012-10-19 13:36:16.000000000 +0200
@@ -45,7 +45,9 @@
BuildRequires: libjpeg-devel
BuildRequires: libpcap-devel
BuildRequires: libpng-devel
-BuildRequires: mozilla-nss-devel >= 3.12.8
+%if 0%{?suse_version} > 1220
+BuildRequires: makeinfo
+%endif
BuildRequires: ncurses-devel
# we must not install the qemu package when under qemu build
%if 0%{?qemu_user_space_build:1}
@@ -176,6 +178,7 @@
--enable-linux-user \
--disable-system \
--static --disable-linux-aio \
+ --disable-strip \
--extra-cflags="$QEMU_OPT_FLAGS"
%if 0%{?suse_version} == 1140
# -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org