Hello community,
here is the log from the commit of package qemu for openSUSE:Factory
checked in at Wed Apr 1 18:57:32 CEST 2009.
--------
--- qemu/qemu.changes 2008-10-08 17:46:49.000000000 +0200
+++ qemu/qemu.changes 2009-03-27 12:20:34.000000000 +0100
@@ -1,0 +2,60 @@
+Fri Mar 27 12:20:21 CET 2009 - crrodriguez@suse.de
+
+- BuildRequire zlib-devel-static
+
+-------------------------------------------------------------------
+Tue Mar 24 15:33:47 CET 2009 - uli@suse.de
+
+- update -> release (0.10.1)
+ - fixes bnc #435135 (CVE-2008-4539, SWAMP #22179), #362956
+ (CVE-2008-1945, CVE-2008-0928), #461565 (CVE-2008-2382)
+ - Kernel Virtual Machine acceleration support
+ - GDB XML register description support
+ - Intel e1000 emulation
+ - HPET emulation
+ - VirtIO paravirtual device support
+ - Marvell 88w8618 / MusicPal emulation
+ - Nokia N-series tablet emulation / OMAP2 processor emulation
+ - PCI hotplug support
+ - Curses display support
+ - qemu-nbd utility to mount supported block formats
+ - Altivec support in PPC emulation and new firmware (OpenBIOS)
+ - Multiple VNC clients are now supported
+ - TLS encryption is now supported in VNC
+ - MIPS Magnum R4000 machine (Hervé Poussineau)
+ - Braille support (Samuel Thibault)
+ - Freecom MusicPal system emulation (Jan Kiszka)
+ - OMAP242x and Nokia N800, N810 machines (Andrzej Zaborowski)
+ - EsounD audio driver (Frederick Reeve)
+ - Gravis Ultrasound GF1 sound card (Tibor "TS" Schütz)
+ - Many, many, bug fixes and new features
+ - virtio-net: allow masking of notifications on empty queue (Alex
+ Williamson)
+ - e1000: fix rx descriptor low threshold logic (Alex Willaimson)
+ - x86 tcg: add NULL checks to lsl instruction (Jan Kiszka)
+ - kvm vga: fix screen corruption with -std-vga and Windows (Avi Kivity)
+ - kvm vga: fix screen corruption with Ubuntu installations (Glauber Costa)
+ - virtio-net: check right return size on sg list (Alex Williamson)
+ - Make qemu_announce_self handle holes (live migration after hotplug)
+ (Marcelo Tosatti)
+ - Revert r6804-r6808 (qcow2 allocation info). This series of changes
+ added a high cost to startup for large qcow2 images (Anthony Liguori)
+ - qemu-img: fix help message (Aurelien Jarno)
+ - Fix build for non-default installs of SDL (Anthony Liguori)
+ - Fix race condition in env->interrupt_request. When using TCG and a
+ dynticks host timer, this condition could cause TCG to get stuck in an
+ infinite loop (Aurelien Jarno)
+ - Fix reading encrypted hard disk passwords during early startup (Jan
+ Kiszka)
+ - Fix encrypted disk reporting in 'info block' (Jan Kiszka)
+ - Fix console size with tiny displays (MusicPal) (Jan Kiszka)
+ - Improve error handling in bdrv_open2 (Jan Kiszka)
+ - Avoid leaking data in mux'ed character devices (Jan Kiszka)
+ - Fix initial character device reset (no banner in monitor) (Jan Kiszka)
+ - Fix cpuid KVM crash on i386 host (Lubomir Rintel)
+ - Fix SLES10sp2 installation by adding ISTAT1 register to LSI SCSI
+ emulation (Ryan Harper)
+- s390x TCG backend
+- i386-linux-user NPTL support
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kvm_bios.bin
qemu-0.7.1-jobsignals.patch
qemu-0.9.0-kvm-bios.patch
qemu-0.9.0-kvm-kqemu-window-caption.patch
qemu-0.9.0-kvm.patch
qemu-20081008.tar.bz2
qemu-cvs-ia64.patch
qemu-cvs-ppcspe.patch
qemu-cvs-svm2.patch
qemu-svn-nodyngen.patch
New:
----
qemu-0.10.1.tar.bz2
qemu-svn-i386-nptl.patch
qemu-svn-s390.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.G21519/_old 2009-04-01 18:39:17.000000000 +0200
+++ /var/tmp/diff_new_pack.G21519/_new 2009-04-01 18:39:17.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package qemu (Version 0.9.2svn20081008)
+# spec file for package qemu (Version 0.10.1)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -19,23 +19,19 @@
Name: qemu
-BuildRequires: SDL-devel bison e2fsprogs-devel libgnutls-devel libpcap-devel ncurses-devel
+BuildRequires: SDL-devel bison e2fsprogs-devel libgnutls-devel libpcap-devel ncurses-devel zlib-devel-static
Url: http://fabrice.bellard.free.fr/qemu/
License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT
Group: System/Emulators/PC
Summary: Universal CPU emulator
-Version: 0.9.2svn20081008
+Version: 0.10.1
Release: 1
-Source: %name-20081008.tar.bz2
+Source: %name-%version.tar.bz2
Patch1: qemu-0.9.0.cvs-binfmt.patch
Patch6: qemu-0.7.0-amd64.patch
Patch8: qemu-cvs-pthread.patch
-Patch14: qemu-0.7.1-jobsignals.patch
#Patch19: qemu-0.9.0-nousbdevfs.patch
Patch34: qemu-0.9.0-migration.patch
-Patch37: qemu-0.9.0-kvm.patch
-Patch38: qemu-0.9.0-kvm-bios.patch
-Patch39: qemu-0.9.0-kvm-kqemu-window-caption.patch
Patch50: qemu-cvs-newpath.patch
Patch53: qemu-cvs-sched_getaffinity.patch
Patch56: qemu-cvs-ipc.patch
@@ -49,21 +45,17 @@
Patch64: qemu-cvs-nofadvise64.patch
Patch65: qemu-cvs-flash.patch
Patch66: qemu-cvs-mmap-amd64.patch
-#Patch67: qemu-cvs-noppcemb.patch
-Patch69: qemu-cvs-ia64.patch
-Patch82: qemu-cvs-svm2.patch
-Patch83: qemu-cvs-ppcspe.patch
Patch85: qemu-img-vmdk-scsi.patch
Patch86: qemu-svn-ncurses.patch
-Patch87: qemu-svn-nodyngen.patch
Patch88: qemu-svn-pcap.patch
Patch90: qemu-nonvoid_return.patch
#Patch91: qemu-svn-dirent.patch
-Source200: kvm_bios.bin
+Patch92: qemu-svn-s390.patch
+Patch93: qemu-svn-i386-nptl.patch
# this is to make lint happy
Source300: rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 ppc sparc x86_64 ia64 s390 ppc64
+ExclusiveArch: %ix86 ppc sparc %arm x86_64 s390x ppc64
%description
QEMU is an extremely well-performing CPU emulator that allows you to
@@ -79,12 +71,11 @@
Fabrice Bellard
%prep
-%setup -q -n %name
+%setup -q
ln -s fpu/*.h .
%patch1 -p1
%patch6
%patch8 -p1
-%patch14
#%patch19
%patch50 -p1
%patch53 -p1
@@ -99,18 +90,15 @@
%patch64 -p1
%patch65 -p1
%patch66 -p1
-#%patch67 -p1
-%patch69
-%patch83
%patch85 -p1
%patch86
-%patch87
%patch88
%patch90
#%patch91
+%patch92
+%patch93
%build
-cp -p %SOURCE200 pc-bios/
# build QEMU
mkdir -p dynamic
# build qemu-system without kqemu support
@@ -118,20 +106,19 @@
--interp-prefix=/usr/share/qemu/qemu-i386 \
--audio-card-list="ac97 adlib cs4231a gus" \
--audio-drv-list="alsa sdl" --enable-mixemu \
- --disable-gcc-check \
--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user
-make %{?jobs:-j%{jobs}}
-mv */qemu */qemu-* dynamic || true
+make %{?jobs:-j%{jobs}} V=1
+make qemu-img V=1
+mv */qemu */qemu-* qemu-img dynamic || true
make clean
# build userland emus
./configure --prefix=/usr \
--interp-prefix=/usr/share/qemu/qemu-i386 \
--enable-linux-user \
--disable-system \
- --static --disable-gcc-check \
+ --static \
--extra-cflags="$QEMU_OPT_FLAGS"
-make %{?jobs:-j%{jobs}}
-make qemu-img
+make %{?jobs:-j%{jobs}} V=1
%install
install -d -m 755 $RPM_BUILD_ROOT/usr/bin
@@ -146,7 +133,7 @@
install -m 644 pc-bios/*.bin pc-bios/video.x pc-bios/openbios-sparc* $RPM_BUILD_ROOT/usr/share/qemu
install -d -m 755 $RPM_BUILD_ROOT/usr/sbin
install -m 755 qemu-binfmt-conf.sh $RPM_BUILD_ROOT/usr/sbin
-install -m 755 qemu-img $RPM_BUILD_ROOT/usr/bin
+install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/usr/bin
install -d -m 755 $RPM_BUILD_ROOT/usr/share/qemu/keymaps
install -m 644 keymaps/[a-z]* $RPM_BUILD_ROOT/usr/share/qemu/keymaps
%ifnarch %ix86 x86_64
@@ -174,6 +161,60 @@
%endif
%changelog
+* Fri Mar 27 2009 crrodriguez@suse.de
+- BuildRequire zlib-devel-static
+* Tue Mar 24 2009 uli@suse.de
+- update -> release (0.10.1)
+ - fixes bnc #435135 (CVE-2008-4539, SWAMP #22179), #362956
+ (CVE-2008-1945, CVE-2008-0928), #461565 (CVE-2008-2382)
+ - Kernel Virtual Machine acceleration support
+ - GDB XML register description support
+ - Intel e1000 emulation
+ - HPET emulation
+ - VirtIO paravirtual device support
+ - Marvell 88w8618 / MusicPal emulation
+ - Nokia N-series tablet emulation / OMAP2 processor emulation
+ - PCI hotplug support
+ - Curses display support
+ - qemu-nbd utility to mount supported block formats
+ - Altivec support in PPC emulation and new firmware (OpenBIOS)
+ - Multiple VNC clients are now supported
+ - TLS encryption is now supported in VNC
+ - MIPS Magnum R4000 machine (Hervé Poussineau)
+ - Braille support (Samuel Thibault)
+ - Freecom MusicPal system emulation (Jan Kiszka)
+ - OMAP242x and Nokia N800, N810 machines (Andrzej Zaborowski)
+ - EsounD audio driver (Frederick Reeve)
+ - Gravis Ultrasound GF1 sound card (Tibor "TS" Schütz)
+ - Many, many, bug fixes and new features
+ - virtio-net: allow masking of notifications on empty queue (Alex
+ Williamson)
+ - e1000: fix rx descriptor low threshold logic (Alex Willaimson)
+ - x86 tcg: add NULL checks to lsl instruction (Jan Kiszka)
+ - kvm vga: fix screen corruption with -std-vga and Windows (Avi Kivity)
+ - kvm vga: fix screen corruption with Ubuntu installations (Glauber Costa)
+ - virtio-net: check right return size on sg list (Alex Williamson)
+ - Make qemu_announce_self handle holes (live migration after hotplug)
+ (Marcelo Tosatti)
+ - Revert r6804-r6808 (qcow2 allocation info). This series of changes
+ added a high cost to startup for large qcow2 images (Anthony Liguori)
+ - qemu-img: fix help message (Aurelien Jarno)
+ - Fix build for non-default installs of SDL (Anthony Liguori)
+ - Fix race condition in env->interrupt_request. When using TCG and a
+ dynticks host timer, this condition could cause TCG to get stuck in an
+ infinite loop (Aurelien Jarno)
+ - Fix reading encrypted hard disk passwords during early startup (Jan
+ Kiszka)
+ - Fix encrypted disk reporting in 'info block' (Jan Kiszka)
+ - Fix console size with tiny displays (MusicPal) (Jan Kiszka)
+ - Improve error handling in bdrv_open2 (Jan Kiszka)
+ - Avoid leaking data in mux'ed character devices (Jan Kiszka)
+ - Fix initial character device reset (no banner in monitor) (Jan Kiszka)
+ - Fix cpuid KVM crash on i386 host (Lubomir Rintel)
+ - Fix SLES10sp2 installation by adding ISTAT1 register to LSI SCSI
+ emulation (Ryan Harper)
+- s390x TCG backend
+- i386-linux-user NPTL support
* Wed Oct 08 2008 uli@suse.de
- update -> current SVN
- fixes PPC hosts
@@ -258,7 +299,7 @@
- disable only SNDRV_SB_CSP_IOCTL_LOAD_CODE for _IOC_SIZEBITS < 14
* Thu Aug 09 2007 olh@suse.de
- disable some alsa SB ioctl declarations
-* Tue Aug 07 2007 olh@suse.de
+* Mon Aug 06 2007 olh@suse.de
- remove inclusion of linux/compiler.h
* Mon Jul 30 2007 uli@suse.de
- fixed for S/390
@@ -287,7 +328,7 @@
* Thu Jun 14 2007 agraf@suse.de
- made wine work (set FS register to 0 on init)
- suppressed robust_list warnings
-* Thu Jun 14 2007 agraf@suse.de
+* Wed Jun 13 2007 agraf@suse.de
- made flash player 9 work on ppc
- fixed FUTEX_WAKE_OP on machines where endianness differs
- made mmap on x86_64 use the MAP_32BIT flag
@@ -315,7 +356,7 @@
- applied strace patch for debugging (by Stuart R. Anderson)
* Wed Apr 04 2007 agraf@suse.de
- fixed initrd loading on x86
-* Fri Mar 30 2007 ro@suse.de
+* Thu Mar 29 2007 ro@suse.de
- added bison to BuildRequires
* Tue Feb 20 2007 uli@suse.de
- added better fix by Robert Schiele (bug #241950)
@@ -368,9 +409,9 @@
* Wed Mar 08 2006 uli@suse.de
- split giant patch
- added NWFPE glue code fix
-* Wed Mar 08 2006 schwab@suse.de
-- More fixes for ia64 port.
* Tue Mar 07 2006 schwab@suse.de
+- More fixes for ia64 port.
+* Mon Mar 06 2006 schwab@suse.de
- Remove obsolete hunk from ia64 patch.
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
@@ -386,7 +427,7 @@
- updated linker scripts for new binutils release
* Sat Sep 17 2005 dmueller@suse.de
- update to 0.7.2
-* Tue Aug 16 2005 schwab@suse.de
+* Mon Aug 15 2005 schwab@suse.de
- Don't package /emul/ia32-linux on ia64.
* Mon Aug 15 2005 schwab@suse.de
- Fix compilation on ia64.
++++++ qemu-20081008.tar.bz2 -> qemu-0.10.1.tar.bz2 ++++++
++++ 167766 lines of diff (skipped)
++++++ qemu-cvs-ipc.patch ++++++
--- /var/tmp/diff_new_pack.G21519/_old 2009-04-01 18:39:26.000000000 +0200
+++ /var/tmp/diff_new_pack.G21519/_new 2009-04-01 18:39:26.000000000 +0200
@@ -1,11 +1,11 @@
Index: qemu/linux-user/syscall.c
================================================================================
---- qemu/linux-user/syscall.c
-+++ qemu/linux-user/syscall.c
+--- qemu-0.10.1/linux-user/syscall.c
++++ qemu-0.10.1/linux-user/syscall.c
@@ -29,7 +29,7 @@
+ #include
#include
#include
- #include
-#include
+#include
#include
@@ -21,15 +21,15 @@
#include
#include
#include
-@@ -154,6 +157,7 @@
-
+@@ -158,6 +161,7 @@
+ #define __NR_sys_exit __NR_exit
#define __NR_sys_sched_getaffinity __NR_sched_getaffinity
+#define __NR_sys_ipc __NR_ipc
#define __NR_sys_uname __NR_uname
#define __NR_sys_faccessat __NR_faccessat
#define __NR_sys_fchmodat __NR_fchmodat
-@@ -261,6 +265,10 @@
+@@ -266,6 +270,10 @@
#if defined(TARGET_NR_tkill) && defined(__NR_tkill)
_syscall2(int,sys_tkill,int,tid,int,sig)
#endif
@@ -40,29 +40,7 @@
#ifdef __NR_sys_sched_getaffinity
_syscall3(int,sys_sched_getaffinity,pid_t,pid,unsigned int,cpusetsize,void*,mask)
#endif
-@@ -1639,6 +1647,21 @@
- abi_ulong __unused2;
- };
-
-+struct target_ipc64_perm
-+{
-+ int key;
-+ unsigned int uid;
-+ unsigned int gid;
-+ unsigned int cuid;
-+ unsigned int cgid;
-+ unsigned short mode;
-+ unsigned short __pad1;
-+ unsigned short seq;
-+ unsigned short __pad2;
-+ target_ulong __unused1;
-+ target_ulong __unused2;
-+};
-+
- struct target_semid_ds
- {
- struct target_ipc_perm sem_perm;
-@@ -1651,6 +1674,18 @@
+@@ -1687,6 +1695,18 @@
abi_ulong __unused4;
};
@@ -81,7 +59,7 @@
static inline abi_long target_to_host_ipc_perm(struct ipc_perm *host_ip,
abi_ulong target_addr)
{
-@@ -1689,6 +1724,43 @@
+@@ -1725,6 +1745,43 @@
return 0;
}
@@ -125,7 +103,7 @@
static inline abi_long target_to_host_semid_ds(struct semid_ds *host_sd,
abi_ulong target_addr)
{
-@@ -1719,6 +1791,32 @@
+@@ -1755,6 +1812,32 @@
return 0;
}
@@ -158,7 +136,7 @@
union semun {
int val;
struct semid_ds *buf;
-@@ -1731,6 +1829,10 @@
+@@ -1767,6 +1850,10 @@
unsigned short int *array;
};
@@ -169,7 +147,7 @@
static inline abi_long target_to_host_semun(int cmd,
union semun *host_su,
abi_ulong target_addr,
-@@ -1743,7 +1845,15 @@
+@@ -1779,7 +1866,15 @@
case IPC_SET:
if (!lock_user_struct(VERIFY_READ, target_su, target_addr, 1))
return -TARGET_EFAULT;
@@ -186,7 +164,7 @@
host_su->buf = ds;
unlock_user_struct(target_su, target_addr, 0);
break;
-@@ -1779,7 +1889,14 @@
+@@ -1815,7 +1910,14 @@
case IPC_SET:
if (lock_user_struct(VERIFY_WRITE, target_su, target_addr, 0))
return -TARGET_EFAULT;
@@ -202,7 +180,7 @@
unlock_user_struct(target_su, target_addr, 1);
break;
case GETVAL:
-@@ -1807,7 +1924,8 @@
+@@ -1843,7 +1945,8 @@
{
union semun arg;
struct semid_ds dsarg;
@@ -212,7 +190,7 @@
abi_long ret = 0;
switch( cmd ) {
-@@ -1836,13 +1954,23 @@
+@@ -1872,13 +1975,23 @@
ret = get_errno(semctl(first, second, cmd, arg));
host_to_target_semun(cmd,ptr,&arg,&dsarg);
break;
@@ -237,8 +215,8 @@
}
return ret;
-@@ -1866,6 +1994,41 @@
- abi_ulong __unused5;
+@@ -1908,6 +2021,41 @@
+ abi_ulong __unused5;
};
+struct target_shmid64_ds {
@@ -279,7 +257,7 @@
static inline abi_long target_to_host_msqid_ds(struct msqid_ds *host_md,
abi_ulong target_addr)
{
-@@ -2094,11 +2257,59 @@
+@@ -2193,11 +2341,59 @@
case IPCOP_shmctl:
switch(second) {
case IPC_RMID:
@@ -339,3 +317,48 @@
goto unimplemented;
}
break;
+--- qemu-0.10.1/linux-user/syscall_defs.h
++++ qemu-0.10.1/linux-user/syscall_defs.h
+@@ -2001,3 +2001,18 @@
+ #include "socket.h"
+
+ #include "errno_defs.h"
++
++struct target_ipc64_perm
++{
++ int key;
++ uint32_t uid;
++ uint32_t gid;
++ uint32_t cuid;
++ uint32_t cgid;
++ unsigned short mode;
++ unsigned short __pad1;
++ unsigned short seq;
++ unsigned short __pad2;
++ abi_ulong __unused1;
++ abi_ulong __unused2;
++};
+--- qemu-0.10.1/linux-user/x86_64/syscall.h
++++ qemu-0.10.1/linux-user/x86_64/syscall.h
+@@ -61,21 +61,6 @@
+ };
+ #endif
+
+-struct target_ipc64_perm
+-{
+- int key;
+- uint32_t uid;
+- uint32_t gid;
+- uint32_t cuid;
+- uint32_t cgid;
+- unsigned short mode;
+- unsigned short __pad1;
+- unsigned short seq;
+- unsigned short __pad2;
+- abi_ulong __unused1;
+- abi_ulong __unused2;
+-};
+-
+ struct target_msqid64_ds {
+ struct target_ipc64_perm msg_perm;
+ unsigned int msg_stime; /* last msgsnd time */
++++++ qemu-cvs-mmap-amd64.patch ++++++
--- /var/tmp/diff_new_pack.G21519/_old 2009-04-01 18:39:26.000000000 +0200
+++ /var/tmp/diff_new_pack.G21519/_new 2009-04-01 18:39:26.000000000 +0200
@@ -1,10 +1,10 @@
Index: qemu/linux-user/mmap.c
================================================================================
---- qemu/linux-user/mmap.c
-+++ qemu/linux-user/mmap.c
-@@ -27,6 +27,10 @@
-
+--- qemu-0.10.1/linux-user/mmap.c
++++ qemu-0.10.1/linux-user/mmap.c
+@@ -33,6 +33,10 @@
#include "qemu.h"
+ #include "qemu-common.h"
+#if !defined(MAP_32BIT)
+#define MAP_32BIT 0
@@ -13,7 +13,7 @@
//#define DEBUG_MMAP
#if defined(USE_NPTL)
-@@ -211,7 +215,7 @@
+@@ -232,7 +236,7 @@
if (prot1 == 0) {
/* no page was there, so we allocate one */
void *p = mmap(host_start, qemu_host_page_size, prot,
@@ -22,12 +22,3 @@
if (p == MAP_FAILED)
return -1;
prot1 = prot;
-@@ -551,7 +555,7 @@
-
- mmap_lock();
- /* XXX: use 5 args syscall */
-- host_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags);
-+ host_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags | MAP_32BIT);
- if (host_addr == -1) {
- new_addr = -1;
- } else {
++++++ qemu-cvs-newpath.patch ++++++
--- /var/tmp/diff_new_pack.G21519/_old 2009-04-01 18:39:26.000000000 +0200
+++ /var/tmp/diff_new_pack.G21519/_new 2009-04-01 18:39:26.000000000 +0200
@@ -1,7 +1,7 @@
Index: qemu.bkp/linux-user/path.c
================================================================================
---- qemu/linux-user/path.c
-+++ qemu/linux-user/path.c
+--- qemu-0.10.1/linux-user/path.c
++++ qemu-0.10.1/linux-user/path.c
@@ -1,159 +1,81 @@
/* Code to mangle pathnames into those matching a given prefix.
eg. open("/lib/foo.so") => open("/usr/gnemul/i386-linux/lib/foo.so");
@@ -176,7 +176,7 @@
+
/* Only do absolute paths: quick and dirty, but should mostly be OK.
Could do relative by tracking cwd. */
-- if (!base || name[0] != '/')
+- if (!base || !name || name[0] != '/')
- return name;
+ if (!list_head || result[0] != '/')
+ goto exit;
++++++ qemu-cvs-sched_getaffinity.patch ++++++
--- /var/tmp/diff_new_pack.G21519/_old 2009-04-01 18:39:27.000000000 +0200
+++ /var/tmp/diff_new_pack.G21519/_new 2009-04-01 18:39:27.000000000 +0200
@@ -1,16 +1,16 @@
Index: qemu.bkp/linux-user/syscall.c
================================================================================
---- qemu/linux-user/syscall.c
-+++ qemu/linux-user/syscall.c
-@@ -152,6 +152,7 @@
- }
+--- qemu-0.10.1/linux-user/syscall.c
++++ qemu-0.10.1/linux-user/syscall.c
+@@ -157,6 +157,7 @@
+ #define __NR_sys_exit __NR_exit
+#define __NR_sys_sched_getaffinity __NR_sched_getaffinity
#define __NR_sys_uname __NR_uname
#define __NR_sys_faccessat __NR_faccessat
#define __NR_sys_fchmodat __NR_fchmodat
-@@ -242,6 +243,9 @@
+@@ -265,6 +266,9 @@
#if defined(TARGET_NR_tkill) && defined(__NR_tkill)
_syscall2(int,sys_tkill,int,tid,int,sig)
#endif
@@ -20,7 +20,7 @@
#ifdef __NR_exit_group
_syscall1(int,exit_group,int,error_code)
#endif
-@@ -5857,6 +5861,17 @@
+@@ -6090,6 +6094,17 @@
break;
#endif
++++++ qemu-svn-i386-nptl.patch ++++++
Index: linux-user/syscall.c
================================================================================
--- configure
+++ configure
@@ -1610,6 +1610,7 @@
echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
echo "#define CONFIG_KVM 1" >> $config_h
fi
+ target_nptl="yes"
;;
x86_64)
echo "TARGET_ARCH=x86_64" >> $config_mak
--- linux-user/syscall.c
+++ linux-user/syscall.c
@@ -3175,8 +3175,14 @@
flags &= ~CLONE_NPTL_FLAGS2;
/* TODO: Implement CLONE_CHILD_CLEARTID. */
- if (nptl_flags & CLONE_SETTLS)
+ if (nptl_flags & CLONE_SETTLS) {
+#if defined(TARGET_I386) && defined(TARGET_ABI32)
+ do_set_thread_area(new_env, newtls);
+ cpu_x86_load_seg(new_env, R_GS, new_env->segs[R_GS].selector);
+#else
cpu_set_tls (new_env, newtls);
+#endif
+ }
/* Grab a mutex so that thread setup appears atomic. */
pthread_mutex_lock(&clone_lock);
@@ -3247,8 +3253,14 @@
if (flags & CLONE_PARENT_SETTID)
put_user_u32(gettid(), parent_tidptr);
ts = (TaskState *)env->opaque;
- if (flags & CLONE_SETTLS)
+ if (flags & CLONE_SETTLS) {
+#if defined(TARGET_I386) && defined(TARGET_ABI32)
+ do_set_thread_area(env, newtls);
+ cpu_x86_load_seg(env, R_GS, env->segs[R_GS].selector);
+#else
cpu_set_tls (env, newtls);
+#endif
+ }
/* TODO: Implement CLONE_CHILD_CLEARTID. */
#endif
} else {
++++++ qemu-svn-ncurses.patch ++++++
--- /var/tmp/diff_new_pack.G21519/_old 2009-04-01 18:39:27.000000000 +0200
+++ /var/tmp/diff_new_pack.G21519/_new 2009-04-01 18:39:27.000000000 +0200
@@ -1,15 +1,15 @@
--- configure
+++ configure
-@@ -799,7 +799,7 @@
+@@ -949,7 +949,7 @@
#include
int main(void) { return curses_version(); }
EOF
-- if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses 2> /dev/null ; then
-+ if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lncurses 2> /dev/null ; then
+- if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then
++ if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lncurses > /dev/null 2> /dev/null ; then
curses=yes
fi
fi # test "$curses"
-@@ -1102,7 +1102,7 @@
+@@ -1427,7 +1427,7 @@
if test "$curses" = "yes" ; then
echo "#define CONFIG_CURSES 1" >> $config_h
echo "CONFIG_CURSES=yes" >> $config_mak
++++++ qemu-svn-pcap.patch ++++++
--- /var/tmp/diff_new_pack.G21519/_old 2009-04-01 18:39:27.000000000 +0200
+++ /var/tmp/diff_new_pack.G21519/_new 2009-04-01 18:39:27.000000000 +0200
@@ -2,7 +2,7 @@
================================================================================
--- Makefile.target
+++ Makefile.target
-@@ -644,6 +644,9 @@
+@@ -690,6 +690,9 @@
ifdef CONFIG_SLIRP
CPPFLAGS+=-I$(SRC_PATH)/slirp
endif
@@ -14,7 +14,7 @@
# specific flags are needed for non soft mmu emulator
--- configure
+++ configure
-@@ -92,6 +92,7 @@
+@@ -160,6 +160,7 @@
gdbstub="yes"
slirp="yes"
vde="yes"
@@ -22,7 +22,7 @@
fmod_lib=""
fmod_inc=""
oss_lib=""
-@@ -296,6 +297,8 @@
+@@ -392,6 +393,8 @@
;;
--disable-vde) vde="no"
;;
@@ -31,7 +31,7 @@
--disable-kqemu) kqemu="no"
;;
--disable-brlapi) brlapi="no"
-@@ -1204,6 +1207,10 @@
+@@ -1353,6 +1356,10 @@
echo "#define CONFIG_VDE 1" >> $config_h
echo "VDE_LIBS=-lvdeplug" >> $config_mak
fi
@@ -42,25 +42,14 @@
for card in $audio_card_list; do
def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`
echo "$def=yes" >> $config_mak
---- vl.c
-+++ vl.c
-@@ -106,6 +106,10 @@
-
- #include "qemu_socket.h"
-
-+#if defined(CONFIG_PCAP)
-+#include
-+#endif
-+
- #if defined(CONFIG_SLIRP)
- #include "libslirp.h"
- #endif
-@@ -4305,6 +4309,104 @@
+--- net.c
++++ net.c
+@@ -689,6 +689,104 @@
#endif /* CONFIG_SLIRP */
+#if defined(CONFIG_PCAP)
-+
++#include
+typedef struct PCAPState {
+ VLANClientState *vc;
+ pcap_t *handle;
@@ -87,7 +76,7 @@
+ pcap_dispatch(s->handle, 1, (pcap_handler)&pcap_callback, (u_char *)s->vc);
+}
+
-+static int net_pcap_init(VLANState *vlan, char *ifname)
++static int net_pcap_init(VLANState *vlan, const char *model, const char *name, char *ifname)
+{
+ PCAPState *s;
+ char errbuf[PCAP_ERRBUF_SIZE];
@@ -136,7 +125,7 @@
+ }
+#endif /* BIOCIMMEDIATE */
+
-+ s->vc = qemu_new_vlan_client(vlan, pcap_receive, NULL, s);
++ s->vc = qemu_new_vlan_client(vlan, model, name, pcap_receive, NULL, s);
+ snprintf(s->vc->info_str, sizeof(s->vc->info_str), "pcap redirector");
+ if ((fd = pcap_get_selectable_fd(s->handle)) < 0) {
+ fprintf(stderr, "qemu: pcap_get_selectable_fd failed\n");
@@ -160,30 +149,35 @@
#if !defined(_WIN32)
typedef struct TAPState {
-@@ -5235,6 +5337,15 @@
- ret = net_slirp_init(vlan);
- } else
- #endif
+@@ -1656,7 +1754,17 @@
+ }
+ vlan->nb_host_devs++;
+ ret = net_slirp_init(vlan, device, name);
+- } else if (!strcmp(device, "channel")) {
++ } else
+#ifdef CONFIG_PCAP
+ if (!strcmp(device, "pcap")) {
+ char ifname[64];
+ if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0)
-+ ret = net_pcap_init(vlan, NULL);
++ ret = net_pcap_init(vlan, device, name, NULL);
+ else
-+ ret = net_pcap_init(vlan, ifname);
++ ret = net_pcap_init(vlan, device, name, ifname);
+ } else
+#endif
- #ifdef _WIN32
- if (!strcmp(device, "tap")) {
- char ifname[64];
-@@ -8108,6 +8219,10 @@
- " connect the user mode network stack to VLAN 'n' and send\n"
- " hostname 'host' to DHCP clients\n"
++ if (!strcmp(device, "channel")) {
+ long port;
+ char name[20], *devname;
+ struct VMChannel *vmc;
+--- vl.c
++++ vl.c
+@@ -3990,6 +3994,10 @@
+ " use '[down]script=no' to disable script execution;\n"
+ " use 'fd=h' to connect to an already opened TAP interface\n"
#endif
+#ifdef CONFIG_PCAP
+ "-net pcap[,vlan=n][,ifname=name]\n"
+ " connect the host network interface using PCAP to VLAN 'n'\n"
+#endif
- #ifdef _WIN32
- "-net tap[,vlan=n],ifname=name\n"
- " connect the host TAP network interface to VLAN 'n'\n"
+ "-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port]\n"
+ " connect the vlan 'n' to another VLAN using a socket connection\n"
+ "-net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port]\n"
++++++ qemu-svn-s390.patch ++++++
++++ 1481 lines (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org