On Tue, Dec 04, 2012 at 08:34:18PM -0500, Brad Smith wrote: > Here is an update to QEMU 1.3.0. > > I am looking for some testing of this update with some of the > more unusual configurations I'm sure people have cooked up > out there. I personally do not use the tap mode setup and > Stuart mentioned that there might be some breakage there > but following the README to make use of tap mode with > root and the qemu-ifup/qemu-ifdown scripts I noticed > this was not working with 1.2 either. Is this new? If > you have a setup using this mode do you see breakage > after an upgrade? Or am I doing something wrong?
I figured out what I was doing wrong when trying to use tap mode and it does work although I still need to figure out what is wrong when using the -monitor command line option. Here is an updated diff for 1.3.0 which fixes a crashing issue which affected OpenBSD. Still looking for any feedback. Index: Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.93 diff -u -p -r1.93 Makefile --- Makefile 12 Dec 2012 18:01:08 -0000 1.93 +++ Makefile 13 Dec 2012 01:04:33 -0000 @@ -1,10 +1,10 @@ # $OpenBSD: Makefile,v 1.93 2012/12/12 18:01:08 brad Exp $ -ONLY_FOR_ARCHS= amd64 arm i386 mips64 mips64el powerpc sparc sparc64 +ONLY_FOR_ARCHS= amd64 arm i386 mips64 mips64el powerpc sparc64 COMMENT= multi system emulator -DISTNAME= qemu-1.2.2 +DISTNAME= qemu-1.3.0 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ EXTRACT_SUFX= .tar.bz2 @@ -20,7 +20,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= GL SDL X11 c curl glib-2.0 gthread-2.0 jpeg m ncurses \ - png pthread util z + pixman-1 png pthread pthread-stubs util z MODULES= devel/gettext \ lang/python @@ -68,16 +68,13 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-vnc-tls \ --with-coroutine=sigaltstack -.if ${MACHINE_ARCH:Msparc} -CONFIGURE_ARGS+=--sparc_cpu=v7 -.endif - FLAVORS= debug FLAVOR?= .if ${FLAVOR:Mdebug} CFLAGS+= -O0 CONFIGURE_ARGS+=--enable-debug +INSTALL_STRIP= .else CONFIGURE_ARGS+=--disable-debug-info .endif Index: distinfo =================================================================== RCS file: /home/cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.24 diff -u -p -r1.24 distinfo --- distinfo 12 Dec 2012 18:01:08 -0000 1.24 +++ distinfo 3 Dec 2012 20:59:02 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu-1.2.2.tar.bz2) = J6ZmKRNs9s7+SHWl1vzgTrUhz8ngyiUjM1ynLEW+hiU= -SIZE (qemu-1.2.2.tar.bz2) = 9871919 +SHA256 (qemu-1.3.0.tar.bz2) = h4BV7AW8KP7P4tqX64vJkuhjVXW2fOvfxcoe3hcRQKg= +SIZE (qemu-1.3.0.tar.bz2) = 10286423 Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v retrieving revision 1.27 diff -u -p -r1.27 patch-configure --- patches/patch-configure 12 Dec 2012 18:01:08 -0000 1.27 +++ patches/patch-configure 13 Dec 2012 01:03:17 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.27 2012/12/12 18:01:08 brad Exp $ ---- configure.orig Tue Dec 11 17:04:49 2012 -+++ configure Tue Dec 11 19:47:53 2012 -@@ -2990,10 +2990,6 @@ fi +--- configure.orig Mon Dec 3 14:37:05 2012 ++++ configure Mon Dec 3 15:59:33 2012 +@@ -3066,10 +3066,6 @@ fi # End of CC checks # After here, no more $cc or $ld runs Index: patches/patch-qemu-thread-posix_c =================================================================== RCS file: patches/patch-qemu-thread-posix_c diff -N patches/patch-qemu-thread-posix_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-qemu-thread-posix_c 6 Dec 2012 04:19:00 -0000 @@ -0,0 +1,48 @@ +$OpenBSD$ +--- qemu-thread-posix.c.orig Wed Dec 5 23:12:18 2012 ++++ qemu-thread-posix.c Wed Dec 5 23:13:27 2012 +@@ -122,7 +122,7 @@ void qemu_sem_init(QemuSemaphore *sem, int init) + { + int rc; + +-#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) ++#if defined(__APPLE__) || defined(__NetBSD__) + rc = pthread_mutex_init(&sem->lock, NULL); + if (rc != 0) { + error_exit(rc, __func__); +@@ -147,7 +147,7 @@ void qemu_sem_destroy(QemuSemaphore *sem) + { + int rc; + +-#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) ++#if defined(__APPLE__) || defined(__NetBSD__) + rc = pthread_cond_destroy(&sem->cond); + if (rc < 0) { + error_exit(rc, __func__); +@@ -168,7 +168,7 @@ void qemu_sem_post(QemuSemaphore *sem) + { + int rc; + +-#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) ++#if defined(__APPLE__) || defined(__NetBSD__) + pthread_mutex_lock(&sem->lock); + if (sem->count == INT_MAX) { + rc = EINVAL; +@@ -206,7 +206,7 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms) + int rc; + struct timespec ts; + +-#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) ++#if defined(__APPLE__) || defined(__NetBSD__) + compute_abs_deadline(&ts, ms); + pthread_mutex_lock(&sem->lock); + --sem->count; +@@ -248,7 +248,7 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms) + + void qemu_sem_wait(QemuSemaphore *sem) + { +-#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) ++#if defined(__APPLE__) || defined(__NetBSD__) + pthread_mutex_lock(&sem->lock); + --sem->count; + while (sem->count < 0) { Index: patches/patch-qemu-thread-posix_h =================================================================== RCS file: patches/patch-qemu-thread-posix_h diff -N patches/patch-qemu-thread-posix_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-qemu-thread-posix_h 6 Dec 2012 04:18:32 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- qemu-thread-posix.h.orig Wed Dec 5 23:14:01 2012 ++++ qemu-thread-posix.h Wed Dec 5 23:14:15 2012 +@@ -12,7 +12,7 @@ struct QemuCond { + }; + + struct QemuSemaphore { +-#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) ++#if defined(__APPLE__) || defined(__NetBSD__) + pthread_mutex_t lock; + pthread_cond_t cond; + int count; Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v retrieving revision 1.23 diff -u -p -r1.23 PLIST --- pkg/PLIST 24 Sep 2012 17:55:36 -0000 1.23 +++ pkg/PLIST 24 Nov 2012 21:52:22 -0000 @@ -56,7 +56,6 @@ share/examples/qemu/target-x86_64.conf share/qemu/ share/qemu/bamboo.dtb share/qemu/bios.bin -share/qemu/cpus-x86_64.conf share/qemu/keymaps/ share/qemu/keymaps/ar share/qemu/keymaps/bepo Index: pkg/README =================================================================== RCS file: /home/cvs/ports/emulators/qemu/pkg/README,v retrieving revision 1.9 diff -u -p -r1.9 README --- pkg/README 8 Jul 2012 14:30:40 -0000 1.9 +++ pkg/README 6 Dec 2012 02:26:33 -0000 @@ -37,8 +37,8 @@ $OpenBSD: README,v 1.9 2012/07/08 14:30: NOTE: be sure to choose serial console during install. NOTE: -no-fd-bootchk permits booting faster when no floppy is in use, but is not supported for qemu-system-sparc. - NOTE: qemu-system-sparc currently fails with some - /etc/malloc.conf settings + NOTE: qemu-system-ppc* and qemu-system-sparc* currently fail with + J or S malloc flags 4. Compress the virtual disk: @@ -156,7 +156,7 @@ $OpenBSD: README,v 1.9 2012/07/08 14:30: # export ETHER=trunk101 # export BRIDGE=bridge101 - # qemu-system-i386 -net nic,vlan=0,model=e1000,macaddr=52:54:00:12:35:00 \ + # qemu-system-i386 -net nic,vlan=0,macaddr=52:54:00:12:35:00 \ -net tap,vlan=0 -vnc :0 -localtime -usb -usbdevice tablet \ -m 256 -no-fd-bootchk -hda virtual.img -monitor stdio {tun0 (bridge101 <-> trunk101)ifconfig: bridge101: No such process @@ -254,7 +254,7 @@ $OpenBSD: README,v 1.9 2012/07/08 14:30: ${TRUEPREFIX}/bin/qemu-system-i386 \ -daemonize \ -nographic \ - -net nic,vlan=0,model=e1000,macaddr=52:54:00:4e:62:8f \ + -net nic,vlan=0,macaddr=52:54:00:4e:62:8f \ -net tap,vlan=0,fd=3 \ -m 128 \ -hda $hddir/virtual.img \ -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
