Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at Mon May 31 18:20:22 CEST 2010. -------- --- qemu/qemu.changes 2010-05-19 19:38:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/qemu.changes 2010-05-28 18:59:38.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 28 18:57:23 CEST 2010 - uli@suse.de + +- update -> 0.12.4 + see http://wiki.qemu.org/ChangeLog for changes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 0009-qemu-cvs-newpath.patch 0010-qemu-cvs-sched_getaffinity.patch 0011-qemu-cvs-mmap-amd64.patch 0012-qemu-cvs-pthread.patch 0013-qemu-img-vmdk-scsi.patch 0014-qemu-nonvoid_return.patch 0015-pcap-network-emulation.patch 0016-i386-linux-user-NPTL-support.patch 0017-qemu-0.11-git-ioctl_mount.patch 0018-qemu-0.11-git-user-linux-ppc-uid16_fix.patch 0019-Rewrite-mmap_find_vma-to-work-fine-on-64-bit-hosts.patch 0020-TCG-sync-op-32-bit-targets-fixed.patch 0021-S-390-CPU-emulation.patch 0022-S-390-host-target-build-system-support.patch 0023-S-390-host-support-for-TCG.patch 0024-linux-user-S-390-64-bit-s390x-support.patch 0025-linux-user-don-t-do-locking-in-single-threaded-proc.patch 0026-linux-user-dup3-fallocate-syscalls.patch 0027-linux-user-fcntl-fixes-for-LTP.patch 0028-linux-user-enable-getdents-for-32-bit-systems.patch 0029-linux-user-define-a-couple-of-syscalls-for-non-uid1.patch 0030-linux-user-getpriority-errno-fix.patch 0031-linux-user-fadvise64-implementation.patch 0032-linux-user-zero-fstat-buffer-to-initialize-nsec-fie.patch 0033-dup3-check-fallocate-check-fixed.patch qemu-0.11.0.tar.bz2 New: ---- 0009-qemu-cvs-sched_getaffinity.patch 0010-qemu-cvs-mmap-amd64.patch 0011-qemu-img-vmdk-scsi.patch 0012-qemu-nonvoid_return.patch 0013-i386-linux-user-NPTL-support.patch 0014-qemu-0.11-git-ioctl_mount.patch 0015-qemu-0.11-git-user-linux-ppc-uid16_fix.patch 0016-S-390-support.patch qemu-0.12.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.wdO3Iw/_old 2010-05-31 18:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wdO3Iw/_new 2010-05-31 18:20:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qemu (Version 0.11.0) +# spec file for package qemu (Version 0.12.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,14 @@ Name: qemu -BuildRequires: SDL-devel bison bluez-devel curl-devel cyrus-sasl-devel e2fsprogs-devel libaio-devel libgnutls-devel libpcap-devel ncurses-devel zlib-devel-static +BuildRequires: SDL-devel bison bluez-devel curl-devel cyrus-sasl-devel e2fsprogs-devel libaio libaio-devel libgnutls-devel libpcap-devel ncurses-devel zlib-devel-static Url: http://fabrice.bellard.free.fr/qemu/ License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) Group: System/Emulators/PC Summary: Universal CPU emulator -Version: 0.11.0 -Release: 6 -Source: %name-0.11.0.tar.bz2 +Version: 0.12.4 +Release: 1 +Source: %name-%version.tar.bz2 Patch1: 0001-qemu-0.7.0-amd64.patch Patch2: 0002-qemu-0.9.0.cvs-binfmt.patch Patch3: 0003-qemu-cvs-alsa_bitfield.patch @@ -35,31 +35,14 @@ Patch6: 0006-qemu-cvs-gettimeofday.patch Patch7: 0007-qemu-cvs-ioctl_debug.patch Patch8: 0008-qemu-cvs-ioctl_nodirection.patch -Patch9: 0009-qemu-cvs-newpath.patch -Patch10: 0010-qemu-cvs-sched_getaffinity.patch -Patch11: 0011-qemu-cvs-mmap-amd64.patch -Patch12: 0012-qemu-cvs-pthread.patch -Patch13: 0013-qemu-img-vmdk-scsi.patch -Patch14: 0014-qemu-nonvoid_return.patch -Patch15: 0015-pcap-network-emulation.patch -Patch16: 0016-i386-linux-user-NPTL-support.patch -Patch17: 0017-qemu-0.11-git-ioctl_mount.patch -Patch18: 0018-qemu-0.11-git-user-linux-ppc-uid16_fix.patch -Patch19: 0019-Rewrite-mmap_find_vma-to-work-fine-on-64-bit-hosts.patch -Patch20: 0020-TCG-sync-op-32-bit-targets-fixed.patch -Patch21: 0021-S-390-CPU-emulation.patch -Patch22: 0022-S-390-host-target-build-system-support.patch -Patch23: 0023-S-390-host-support-for-TCG.patch -Patch24: 0024-linux-user-S-390-64-bit-s390x-support.patch -Patch25: 0025-linux-user-don-t-do-locking-in-single-threaded-proc.patch -Patch26: 0026-linux-user-dup3-fallocate-syscalls.patch -Patch27: 0027-linux-user-fcntl-fixes-for-LTP.patch -Patch28: 0028-linux-user-enable-getdents-for-32-bit-systems.patch -Patch29: 0029-linux-user-define-a-couple-of-syscalls-for-non-uid1.patch -Patch30: 0030-linux-user-getpriority-errno-fix.patch -Patch31: 0031-linux-user-fadvise64-implementation.patch -Patch32: 0032-linux-user-zero-fstat-buffer-to-initialize-nsec-fie.patch -Patch33: 0033-dup3-check-fallocate-check-fixed.patch +Patch9: 0009-qemu-cvs-sched_getaffinity.patch +Patch10: 0010-qemu-cvs-mmap-amd64.patch +Patch11: 0011-qemu-img-vmdk-scsi.patch +Patch12: 0012-qemu-nonvoid_return.patch +Patch13: 0013-i386-linux-user-NPTL-support.patch +Patch14: 0014-qemu-0.11-git-ioctl_mount.patch +Patch15: 0015-qemu-0.11-git-user-linux-ppc-uid16_fix.patch +Patch16: 0016-S-390-support.patch # this is to make lint happy Source300: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,7 +63,7 @@ Fabrice Bellard <fabrice.bellard@free.fr> %prep -%setup -q -n qemu-0.11.0 +%setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -96,27 +79,10 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 %ifarch s390x ppc64 x86_64 # s390 target only builds on 64-bit machines -%patch22 -p1 +%patch16 -p1 %endif -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 %build # build QEMU @@ -143,7 +109,7 @@ --interp-prefix=/usr/share/qemu/qemu-i386 \ --enable-linux-user \ --disable-system \ - --static \ + --static --disable-linux-aio \ --extra-cflags="$QEMU_OPT_FLAGS" make %{?jobs:-j%{jobs}} V=1 ++++++ 0001-qemu-0.7.0-amd64.patch ++++++ --- /var/tmp/diff_new_pack.wdO3Iw/_old 2010-05-31 18:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wdO3Iw/_new 2010-05-31 18:20:12.000000000 +0200 @@ -1,7 +1,7 @@ -From 827af866df5674253ef563bd244277d31a93ba32 Mon Sep 17 00:00:00 2001 +From 8c7a6ec1220237db1e270244b1f1d90dd3d54204 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:17:39 +0200 -Subject: [PATCH 01/33] qemu-0.7.0-amd64 +Subject: [PATCH 01/16] qemu-0.7.0-amd64 No clue why this is necessary or useful, nothing found in any changelogs. --- @@ -9,10 +9,10 @@ 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/x86_64.ld b/x86_64.ld -index 878dafb..142e641 100644 +index 24ea77d..52a696e 100644 --- a/x86_64.ld +++ b/x86_64.ld -@@ -59,8 +59,6 @@ SECTIONS +@@ -58,8 +58,6 @@ SECTIONS .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } .rodata1 : { *(.rodata1) } .eh_frame_hdr : { *(.eh_frame_hdr) } @@ -21,7 +21,7 @@ /* Adjust the address for the data segment. We want to adjust up to the same address within the page on the next page up. */ . = ALIGN (0x100000) - ((0x100000 - .) & (0x100000 - 1)); . = DATA_SEGMENT_ALIGN (0x100000, 0x1000); -@@ -86,8 +84,8 @@ SECTIONS +@@ -85,8 +83,8 @@ SECTIONS .data1 : { *(.data1) } .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } @@ -33,5 +33,5 @@ .ctors : { -- -1.6.2.1 +1.6.4.2 ++++++ 0002-qemu-0.9.0.cvs-binfmt.patch ++++++ --- /var/tmp/diff_new_pack.wdO3Iw/_old 2010-05-31 18:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wdO3Iw/_new 2010-05-31 18:20:12.000000000 +0200 @@ -1,7 +1,7 @@ -From 496da9d6ffd6f42570cbed52adba37fea769d2ab Mon Sep 17 00:00:00 2001 +From af10e52cdaf296681cf093f9269acf3080a01f5c Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:18:44 +0200 -Subject: [PATCH 02/33] qemu-0.9.0.cvs-binfmt +Subject: [PATCH 02/16] qemu-0.9.0.cvs-binfmt Fixes binfmt_misc setup script: - x86_64 is i386-compatible @@ -81,5 +81,5 @@ + echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:' > /proc/sys/fs/binfmt_misc/register fi -- -1.6.2.1 +1.6.4.2 ++++++ 0003-qemu-cvs-alsa_bitfield.patch ++++++ --- /var/tmp/diff_new_pack.wdO3Iw/_old 2010-05-31 18:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wdO3Iw/_new 2010-05-31 18:20:12.000000000 +0200 @@ -1,7 +1,7 @@ -From 4675ae349f0d4e489f1298f1cbf246dfa7124d79 Mon Sep 17 00:00:00 2001 +From d4ec93547c43a157b88b923b612653c9527ec2a6 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:20:50 +0200 -Subject: [PATCH 03/33] qemu-cvs-alsa_bitfield +Subject: [PATCH 03/16] qemu-cvs-alsa_bitfield Implements TYPE_INTBITFIELD partially. (required for ALSA support) @@ -79,5 +79,5 @@ case TYPE_LONGLONG: case TYPE_ULONGLONG: -- -1.6.2.1 +1.6.4.2 ++++++ 0004-qemu-cvs-alsa_ioctl.patch ++++++ --- /var/tmp/diff_new_pack.wdO3Iw/_old 2010-05-31 18:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wdO3Iw/_new 2010-05-31 18:20:12.000000000 +0200 @@ -1,7 +1,7 @@ -From ab27a247cbab3c5f780e14a3ad822a5e12955d8f Mon Sep 17 00:00:00 2001 +From 91d6aa16e2794b006ac997ccebd2c7c7da671f32 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:23:27 +0200 -Subject: [PATCH 04/33] qemu-cvs-alsa_ioctl +Subject: [PATCH 04/16] qemu-cvs-alsa_ioctl Implements ALSA ioctls on PPC hosts. @@ -19,10 +19,10 @@ create mode 100644 linux-user/syscall_types_alsa.h diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h -index 685cc71..aee5a88 100644 +index 769e1bc..fca824c 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h -@@ -301,6 +301,11 @@ +@@ -304,6 +304,11 @@ IOCTL(VFAT_IOCTL_READDIR_BOTH, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2))) IOCTL(VFAT_IOCTL_READDIR_SHORT, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2))) @@ -2254,16 +2254,16 @@ + unsigned char *code; +}; diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h -index ac5dbc5..78c6488 100644 +index 2d45753..77ae416 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h -@@ -2138,3 +2138,4 @@ struct target_mq_attr { +@@ -2161,3 +2161,4 @@ struct target_mq_attr { #define FUTEX_CLOCK_REALTIME 256 #define FUTEX_CMD_MASK ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME) +#include "ioctls_alsa_structs.h" diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h -index d3f3df9..1fa48d0 100644 +index 340dbd3..1b92423 100644 --- a/linux-user/syscall_types.h +++ b/linux-user/syscall_types.h @@ -80,6 +80,11 @@ STRUCT(count_info, @@ -3622,5 +3622,5 @@ +) + -- -1.6.2.1 +1.6.4.2 ++++++ 0005-qemu-cvs-alsa_mmap.patch ++++++ --- /var/tmp/diff_new_pack.wdO3Iw/_old 2010-05-31 18:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wdO3Iw/_new 2010-05-31 18:20:12.000000000 +0200 @@ -1,7 +1,7 @@ -From ed5099e1cc655c77344863855abe5c20c1b6eb0b Mon Sep 17 00:00:00 2001 +From 8dc126f05ef5f8d0105d5d1b77493a27df8b4e30 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:24:15 +0200 -Subject: [PATCH 05/33] qemu-cvs-alsa_mmap +Subject: [PATCH 05/16] qemu-cvs-alsa_mmap Hack to prevent ALSA from using mmap() interface to simplify emulation. @@ -11,11 +11,11 @@ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index e05caa0..c33e5fe 100644 +index 144fb7c..1ea202b 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c -@@ -321,6 +321,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size) - return addr; +@@ -328,6 +328,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size) + return h2g(ptr); } +#define SNDRV_PCM_MMAP_OFFSET_STATUS 0x80000000 @@ -24,7 +24,7 @@ /* NOTE: all the constants are the HOST ones */ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, int flags, int fd, abi_ulong offset) -@@ -356,6 +359,17 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, +@@ -363,6 +366,17 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, } #endif @@ -43,5 +43,5 @@ errno = EINVAL; goto fail; -- -1.6.2.1 +1.6.4.2 ++++++ 0006-qemu-cvs-gettimeofday.patch ++++++ --- /var/tmp/diff_new_pack.wdO3Iw/_old 2010-05-31 18:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wdO3Iw/_new 2010-05-31 18:20:12.000000000 +0200 @@ -1,7 +1,7 @@ -From 69aca2fcdf61fbd4a5c0123a7e64cf99862076ff Mon Sep 17 00:00:00 2001 +From fdeb1b8a61335d7c8537725cd1d7997053ce1d27 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:25:41 +0200 -Subject: [PATCH 06/33] qemu-cvs-gettimeofday +Subject: [PATCH 06/16] qemu-cvs-gettimeofday No clue what this is for. --- @@ -9,10 +9,10 @@ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 7b57323..70d3b2d 100644 +index e38552c..63eef34 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5063,6 +5063,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, +@@ -5101,6 +5101,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, case TARGET_NR_gettimeofday: { struct timeval tv; @@ -22,5 +22,5 @@ if (!is_error(ret)) { if (copy_to_user_timeval(arg1, &tv)) -- -1.6.2.1 +1.6.4.2 ++++++ 0007-qemu-cvs-ioctl_debug.patch ++++++ --- /var/tmp/diff_new_pack.wdO3Iw/_old 2010-05-31 18:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wdO3Iw/_new 2010-05-31 18:20:12.000000000 +0200 @@ -1,7 +1,7 @@ -From 4ec256fd6d555ec61f0a1bd530ff66860937b232 Mon Sep 17 00:00:00 2001 +From 6d88562dea1c1e0ae1367b89353a546c0e725513 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:26:33 +0200 -Subject: [PATCH 07/33] qemu-cvs-ioctl_debug +Subject: [PATCH 07/16] qemu-cvs-ioctl_debug Extends unsupported ioctl debug output. @@ -11,10 +11,10 @@ 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 70d3b2d..ce5283c 100644 +index 63eef34..1540e77 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -2890,7 +2890,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) +@@ -2896,7 +2896,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) ie = ioctl_entries; for(;;) { if (ie->target_cmd == 0) { @@ -29,5 +29,5 @@ } if (ie->target_cmd == cmd) -- -1.6.2.1 +1.6.4.2 ++++++ 0008-qemu-cvs-ioctl_nodirection.patch ++++++ --- /var/tmp/diff_new_pack.wdO3Iw/_old 2010-05-31 18:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wdO3Iw/_new 2010-05-31 18:20:12.000000000 +0200 @@ -1,7 +1,7 @@ -From 5a0ba0e95920618c8ae38f4842d9dd56943f4343 Mon Sep 17 00:00:00 2001 +From 8fdbbf0d63c4de94c308c165283d7ea57f1cbf60 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:27:36 +0200 -Subject: [PATCH 08/33] qemu-cvs-ioctl_nodirection +Subject: [PATCH 08/16] qemu-cvs-ioctl_nodirection the direction given in the ioctl should be correct so we can assume the communication is uni-directional. The alsa developers did not like this @@ -14,10 +14,10 @@ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index ce5283c..b7230c7 100644 +index 1540e77..3f810c3 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -2920,6 +2920,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) +@@ -2926,6 +2926,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) arg_type++; target_size = thunk_type_size(arg_type, 0); switch(ie->access) { @@ -29,7 +29,7 @@ case IOC_R: ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp)); if (!is_error(ret)) { -@@ -2938,6 +2943,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) +@@ -2944,6 +2949,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) unlock_user(argptr, arg, 0); ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp)); break; @@ -38,5 +38,5 @@ case IOC_RW: argptr = lock_user(VERIFY_READ, arg, target_size, 1); -- -1.6.2.1 +1.6.4.2 ++++++ 0010-qemu-cvs-sched_getaffinity.patch -> 0009-qemu-cvs-sched_getaffinity.patch ++++++ --- qemu/0010-qemu-cvs-sched_getaffinity.patch 2009-10-12 16:47:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/0009-qemu-cvs-sched_getaffinity.patch 2010-05-28 18:59:34.000000000 +0200 @@ -1,7 +1,7 @@ -From 72e306e63740a51a1c82f39cabb65df65ce2c215 Mon Sep 17 00:00:00 2001 +From a6f58c0e024cda6f06d788f6d03b699c8c736fdf Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:30:16 +0200 -Subject: [PATCH 10/33] qemu-cvs-sched_getaffinity +Subject: [PATCH 09/16] qemu-cvs-sched_getaffinity Implements sched_getaffinity syscall. @@ -11,10 +11,10 @@ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index b7230c7..faf41b1 100644 +index 3f810c3..a74869e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -152,6 +152,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \ +@@ -156,6 +156,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \ } @@ -22,7 +22,7 @@ #define __NR_sys_uname __NR_uname #define __NR_sys_faccessat __NR_faccessat #define __NR_sys_fchmodat __NR_fchmodat -@@ -213,6 +214,9 @@ _syscall3(int,sys_tgkill,int,tgid,int,pid,int,sig) +@@ -215,6 +216,9 @@ _syscall3(int,sys_tgkill,int,tgid,int,pid,int,sig) #if defined(TARGET_NR_tkill) && defined(__NR_tkill) _syscall2(int,sys_tkill,int,tid,int,sig) #endif @@ -32,10 +32,10 @@ #ifdef __NR_exit_group _syscall1(int,exit_group,int,error_code) #endif -@@ -6979,6 +6983,18 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, +@@ -7045,6 +7049,18 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, + ret = get_errno(fallocate(arg1, arg2, arg3, arg4)); break; #endif - #endif /* CONFIG_SPLICE */ + +#ifdef TARGET_NR_sched_getaffinity + case TARGET_NR_sched_getaffinity: @@ -52,5 +52,5 @@ unimplemented: gemu_log("qemu: Unsupported syscall: %d\n", num); -- -1.6.2.1 +1.6.4.2 ++++++ 0011-qemu-cvs-mmap-amd64.patch -> 0010-qemu-cvs-mmap-amd64.patch ++++++ --- qemu/0011-qemu-cvs-mmap-amd64.patch 2009-10-12 16:47:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/0010-qemu-cvs-mmap-amd64.patch 2010-05-28 18:59:35.000000000 +0200 @@ -1,7 +1,7 @@ -From 5c8849d886cafd1626c1d36c572c3ccee5c88d5d Mon Sep 17 00:00:00 2001 +From b22d5f62f9765ec734d7b14886d7aed5b61acf8b Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:34:05 +0200 -Subject: [PATCH 11/33] qemu-cvs-mmap-amd64 +Subject: [PATCH 10/16] qemu-cvs-mmap-amd64 Map stuff to address space < 4GB on AMD64. This patch got continually smaller as most cases were this was an issue were dealt with in other ways. May @@ -13,7 +13,7 @@ 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index c33e5fe..9ca8f6f 100644 +index 1ea202b..74b0d4b 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -31,6 +31,10 @@ @@ -26,7 +26,7 @@ + //#define DEBUG_MMAP - #if defined(USE_NPTL) + #if defined(CONFIG_USE_NPTL) @@ -230,7 +234,7 @@ static int mmap_frag(abi_ulong real_start, if (prot1 == 0) { /* no page was there, so we allocate one */ @@ -37,5 +37,5 @@ return -1; prot1 = prot; -- -1.6.2.1 +1.6.4.2 ++++++ 0013-qemu-img-vmdk-scsi.patch -> 0011-qemu-img-vmdk-scsi.patch ++++++ --- qemu/0013-qemu-img-vmdk-scsi.patch 2009-10-12 16:47:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/0011-qemu-img-vmdk-scsi.patch 2010-05-28 18:59:35.000000000 +0200 @@ -1,7 +1,7 @@ -From 75e8da1c5ca1b61a9a97fcc385eb5c6b9f83130f Mon Sep 17 00:00:00 2001 +From afdac5e4c878653b9f4a038bebdcf98a01397a39 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:37:42 +0200 -Subject: [PATCH 13/33] qemu-img-vmdk-scsi +Subject: [PATCH 11/16] qemu-img-vmdk-scsi Support creation of SCSI VMDK images in qemu-img. @@ -37,7 +37,7 @@ /* write the descriptor */ lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET); diff --git a/block_int.h b/block_int.h -index 8898d91..d482050 100644 +index 9a3b2e0..85e8a72 100644 --- a/block_int.h +++ b/block_int.h @@ -30,6 +30,7 @@ @@ -49,18 +49,18 @@ #define BLOCK_OPT_SIZE "size" #define BLOCK_OPT_ENCRYPT "encryption" diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx -index ddb86f0..be94d22 100644 +index 641bd87..949ae97 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -16,9 +16,9 @@ STEXI ETEXI DEF("create", img_create, -- "create [-F fmt] [-b base_image] [-f fmt] [-o options] filename [size]") -+ "create [-s] [-F fmt] [-b base_image] [-f fmt] [-o options] filename [size]") +- "create [-f fmt] [-o options] filename [size]") ++ "create [-s] [-f fmt] [-o options] filename [size]") STEXI --@item create [-F @var{base_fmt}] [-b @var{base_image}] [-f @var{fmt}] [-o @var{options}] @var{filename} [@var{size}] -+@item create [-s] [-F @var{base_fmt}] [-b @var{base_image}] [-f @var{fmt}] [-o @var{options}] @var{filename} [@var{size}] +-@item create [-f @var{fmt}] [-o @var{options}] @var{filename} [@var{size}] ++@item create [-s] [-f @var{fmt}] [-o @var{options}] @var{filename} [@var{size}] ETEXI DEF("commit", img_commit, @@ -68,19 +68,19 @@ ETEXI DEF("convert", img_convert, -- "convert [-c] [-f fmt] [-O output_fmt] [-o options] [-B output_base_image] filename [filename2 [...]] output_filename") -+ "convert [-c] [-s] [-f fmt] [-O output_fmt] [-o options] [-B output_base_image] filename [filename2 [...]] output_filename") +- "convert [-c] [-f fmt] [-O output_fmt] [-o options] filename [filename2 [...]] output_filename") ++ "convert [-c] [-s] [-f fmt] [-O output_fmt] [-o options] filename [filename2 [...]] output_filename") STEXI --@item convert [-c] [-f @var{fmt}] [-O @var{output_fmt}] [-o @var{options}] [-B @var{output_base_image}] @var{filename} [@var{filename2} [...]] @var{output_filename} -+@item convert [-c] [-s] [-f @var{fmt}] [-O @var{output_fmt}] [-o @var{options}] [-B @var{output_base_image}] @var{filename} [@var{filename2} [...]] @var{output_filename} +-@item convert [-c] [-f @var{fmt}] [-O @var{output_fmt}] [-o @var{options}] @var{filename} [@var{filename2} [...]] @var{output_filename} ++@item convert [-c] [-s] [-f @var{fmt}] [-O @var{output_fmt}] [-o @var{options}] @var{filename} [@var{filename2} [...]] @var{output_filename} ETEXI DEF("info", img_info, diff --git a/qemu-img.c b/qemu-img.c -index 070fe2e..2adeb56 100644 +index 2824178..4b6663f 100644 --- a/qemu-img.c +++ b/qemu-img.c -@@ -259,7 +259,7 @@ static int img_create(int argc, char **argv) +@@ -253,7 +253,7 @@ static int img_create(int argc, char **argv) flags = 0; for(;;) { @@ -89,7 +89,7 @@ if (c == -1) break; switch(c) { -@@ -278,6 +278,9 @@ static int img_create(int argc, char **argv) +@@ -272,6 +272,9 @@ static int img_create(int argc, char **argv) case 'e': flags |= BLOCK_FLAG_ENCRYPT; break; @@ -99,7 +99,7 @@ case '6': flags |= BLOCK_FLAG_COMPAT6; break; -@@ -357,6 +360,8 @@ static int img_create(int argc, char **argv) +@@ -354,6 +357,8 @@ static int img_create(int argc, char **argv) printf("Formatting '%s', fmt=%s ", filename, fmt); print_option_parameters(param); @@ -108,7 +108,7 @@ puts(""); ret = bdrv_create(drv, filename, param); -@@ -551,7 +556,7 @@ static int img_convert(int argc, char **argv) +@@ -548,7 +553,7 @@ static int img_convert(int argc, char **argv) out_baseimg = NULL; flags = 0; for(;;) { @@ -117,7 +117,7 @@ if (c == -1) break; switch(c) { -@@ -573,6 +578,9 @@ static int img_convert(int argc, char **argv) +@@ -570,6 +575,9 @@ static int img_convert(int argc, char **argv) case 'e': flags |= BLOCK_FLAG_ENCRYPT; break; @@ -127,7 +127,7 @@ case '6': flags |= BLOCK_FLAG_COMPAT6; break; -@@ -639,6 +647,9 @@ static int img_convert(int argc, char **argv) +@@ -637,6 +645,9 @@ static int img_convert(int argc, char **argv) } } @@ -138,5 +138,5 @@ ret = bdrv_create(drv, out_filename, param); free_option_parameters(param); -- -1.6.2.1 +1.6.4.2 ++++++ 0014-qemu-nonvoid_return.patch -> 0012-qemu-nonvoid_return.patch ++++++ --- qemu/0014-qemu-nonvoid_return.patch 2009-10-12 16:47:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/0012-qemu-nonvoid_return.patch 2010-05-28 18:59:35.000000000 +0200 @@ -1,7 +1,7 @@ -From 29b517b3811d8745eb73e95fe18552eb1f0153af Mon Sep 17 00:00:00 2001 +From 44ce0d8cef307cd7b6e82242f896559916886f30 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Tue, 14 Apr 2009 16:38:20 +0200 -Subject: [PATCH 14/33] qemu-nonvoid_return +Subject: [PATCH 12/16] qemu-nonvoid_return Squelches GCC warnings about undefined return values. @@ -12,10 +12,10 @@ 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/mpcore.c b/hw/mpcore.c -index 907bd99..a682695 100644 +index b4db191..ef0c705 100644 --- a/hw/mpcore.c +++ b/hw/mpcore.c -@@ -108,6 +108,7 @@ static uint32_t mpcore_timer_read(mpcore_timer_state *s, int offset) +@@ -104,6 +104,7 @@ static uint32_t mpcore_timer_read(mpcore_timer_state *s, int offset) default: return 0; } @@ -24,7 +24,7 @@ static void mpcore_timer_write(mpcore_timer_state *s, int offset, diff --git a/target-m68k/translate.c b/target-m68k/translate.c -index b37578b..feaa155 100644 +index 99cf6dd..18875d9 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -440,6 +440,7 @@ static inline int opsize_bytes(int opsize) @@ -36,5 +36,5 @@ /* Assign value to a register. If the width is less than the register width -- -1.6.2.1 +1.6.4.2 ++++++ 0016-i386-linux-user-NPTL-support.patch -> 0013-i386-linux-user-NPTL-support.patch ++++++ --- qemu/0016-i386-linux-user-NPTL-support.patch 2009-10-12 16:47:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/0013-i386-linux-user-NPTL-support.patch 2010-05-28 18:59:35.000000000 +0200 @@ -1,7 +1,7 @@ -From e770ff83915791d048ca88da6c3877cb54bf063e Mon Sep 17 00:00:00 2001 +From b7c83887c1c86140ffaab86d4d1fca5a81e86c2d Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Thu, 16 Apr 2009 15:14:12 +0200 -Subject: [PATCH 16/33] i386-linux-user NPTL support +Subject: [PATCH 13/16] i386-linux-user NPTL support Makes NPTL binaries run by implementing TLS. @@ -12,10 +12,10 @@ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 4ce7bc1..4f79498 100755 +index 5f463b0..0ec7ff0 100755 --- a/configure +++ b/configure -@@ -1904,6 +1904,7 @@ TARGET_ABI_DIR="" +@@ -2283,6 +2283,7 @@ TARGET_ABI_DIR="" case "$target_arch2" in i386) target_phys_bits=32 @@ -24,10 +24,10 @@ x86_64) TARGET_BASE_ARCH=i386 diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index faf41b1..87ceac7 100644 +index a74869e..ec67a14 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -3575,8 +3575,14 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, +@@ -3584,8 +3584,14 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, ts->child_tidptr = child_tidptr; } @@ -43,7 +43,7 @@ /* Grab a mutex so that thread setup appears atomic. */ pthread_mutex_lock(&clone_lock); -@@ -3648,8 +3654,14 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, +@@ -3657,8 +3663,14 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, if (flags & CLONE_PARENT_SETTID) put_user_u32(gettid(), parent_tidptr); ts = (TaskState *)env->opaque; @@ -60,5 +60,5 @@ ts->child_tidptr = child_tidptr; #endif -- -1.6.2.1 +1.6.4.2 ++++++ 0017-qemu-0.11-git-ioctl_mount.patch -> 0014-qemu-0.11-git-ioctl_mount.patch ++++++ --- qemu/0017-qemu-0.11-git-ioctl_mount.patch 2009-10-12 16:47:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/0014-qemu-0.11-git-ioctl_mount.patch 2010-05-28 18:59:36.000000000 +0200 @@ -1,17 +1,17 @@ -From df6df89350799107b3395665943c4df7eeba87e0 Mon Sep 17 00:00:00 2001 +From 7c670471903f85dfbcbfce2a7b7829bd08559c3c Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Wed, 17 Jun 2009 14:54:48 +0200 -Subject: [PATCH 17/33] qemu-0.11-git-ioctl_mount +Subject: [PATCH 14/16] qemu-0.11-git-ioctl_mount --- linux-user/ioctls.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h -index aee5a88..a0fb052 100644 +index fca824c..2cec892 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h -@@ -310,7 +310,7 @@ +@@ -313,7 +313,7 @@ IOCTL(LOOP_CLR_FD, 0, TYPE_INT) IOCTL(LOOP_SET_STATUS, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info))) IOCTL(LOOP_GET_STATUS, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info))) @@ -21,5 +21,5 @@ IOCTL(LOOP_GET_STATUS64, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info64))) #endif -- -1.6.2.1 +1.6.4.2 ++++++ 0018-qemu-0.11-git-user-linux-ppc-uid16_fix.patch -> 0015-qemu-0.11-git-user-linux-ppc-uid16_fix.patch ++++++ --- qemu/0018-qemu-0.11-git-user-linux-ppc-uid16_fix.patch 2009-10-12 16:47:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/qemu/0015-qemu-0.11-git-user-linux-ppc-uid16_fix.patch 2010-05-28 18:59:36.000000000 +0200 @@ -1,7 +1,7 @@ -From 015bd9be8314b3ce6d97d1bc9614874aee9b0e52 Mon Sep 17 00:00:00 2001 +From 7871becde1196cc4d89b1e27de4e03858ef8f265 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <uli@suse.de> Date: Wed, 17 Jun 2009 15:08:38 +0200 -Subject: [PATCH 18/33] qemu-0.11-git-user-linux-ppc-uid16_fix +Subject: [PATCH 15/16] qemu-0.11-git-user-linux-ppc-uid16_fix --- linux-user/ppc/syscall_nr.h | 30 +++++++++++++++--------------- @@ -99,7 +99,7 @@ #define TARGET_NR_capget 183 #define TARGET_NR_capset 184 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h -index 78c6488..0cbe396 100644 +index 77ae416..e734fec 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -49,7 +49,7 @@ @@ -112,5 +112,5 @@ #define USE_UID16 #endif -- -1.6.2.1 +1.6.4.2 ++++++ 0022-S-390-host-target-build-system-support.patch -> 0016-S-390-support.patch ++++++ ++++ 7809 lines (skipped) ++++ between qemu/0022-S-390-host-target-build-system-support.patch ++++ and /mounts/work_src_done/STABLE/qemu/0016-S-390-support.patch ++++++ qemu-0.11.0.tar.bz2 -> qemu-0.12.4.tar.bz2 ++++++ ++++ 197637 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org