new experimental qemu-devel port update, please test! (was: Re: experimental qemu-devel port (update), please test!)

Thu Mar 22 20:15:47 UTC 2007

On Mon, Mar 19, 2007 at 02:12:40PM -0500, Eric Anderson wrote:
> On 03/03/07 13:32, Juergen Lock wrote:
> >In article <45E5CDE3.7030509 at centtech.com> anderson at centtech.com (Eric 
> >Anderson)writes:
> >
> >>On 02/24/07 13:27, Juergen Lock wrote:
> >>>On Sat, Feb 24, 2007 at 08:17:23PM +0100, Juergen Lock wrote:
> >>>>In article <45DB10D3.8040807 at centtech.com> you write:
> >>>>>Is anyone else experiencing a nearly useless qemu experience with the 
> >>>>>latest versions?
> >>>>>
> >>>>>I'm running -CURRENT from yesterday, and the latest qemu port (and 
> >>>>>kqemu).
> >>>>>
> >>>>>These combinations segfault:
> >>>>>
> >>>>>Anything with the -vnc option, when disconnecting the vnc viewer, will 
> >>>>>segfault:
> >>>>>sudo qemu -hda /alt/images/fs.img -hdb /alt/images/swapfile -net nic 
> >>>>>-net tap -snapshot -vnc :1 -serial /dev/ttyv8 -kernel-kqemu
> >>>>>
> >>>>>This used to work nicely, now it dies when I connect to port 1111:
> >>>>>sudo qemu -hda /alt/images/fs.img -hdb /alt/images/swapfile -net nic 
> >>>>>-net tap -snapshot -serial telnet::1111,server,nowait -std-vga 
> >>>>>-monitor stdio -full-screen -kernel-kqemu
> >>>>>
> >>>>>Which, when it dies, ktrace shows me:
> >>>>>...
> >>>>Hmm I don't know much about the code in question, you may have more
> >>>>luck reposting this on the qemu list:
> >>>>	http://lists.gnu.org/mailman/listinfo/qemu-devel
> >>>And just when I posted this...  There were just patches posted on that
> >>>list that fix vnc disconnect segfaults, so I think the next port update
> >>>will fix at least that problem.
> >>Thanks!  I've been hoping to see the update, but still not there yet.. 
> >>:(  Oh well.
> >
> >Sorry things are going a little slow around here...  But now I have
> >the following update for you all to test:
> >
> >1. copy the qemu port dir (/usr/ports/emulators/qemu) to
> >   emulators/qemu-devel
> >2. apply the patch below in emulators
> >3. deinstall qemu
> >3. run `make install' in the new qemu-devel port dir (you probably
> >   cannot use portinstall/portupgrade unless you add the new port to
> >   INDEX yourself, that is until it is committed...)
> >4. test!
> >
> > Should you want to go back, deinstall qemu-devel and then install the
> >originall qemu port again.
> >
> >>   I wonder if that will also fix my telnet issue with qemu.
> >
> > Not sure, but now you should be able to check yourself. :)
> 
> 
> I see you now have an official qemu-devel port.  I just started using it 
>  after my port updated, and now tap networking does not work.
> 
> I get:
> Could not initialize device 'tap'
> 
> When starting like:
> sudo qemu \
> -hda /alt/images/swapfile \
> -localtime \
> -boot n \
> -net nic,model=rtl8139 \
> -net tap \
> -option-rom /alt/images/eb-5.4.2-rtl8139.zrom \
> -kernel-kqemu \
> -serial telnet::1111,server,nowait \
> -parallel none \
> -monitor stdio  \
> -vnc 10.99.99.1:9 \
> -usb" &
> 
> Which has been working fine with the previous qemu-devel "port" you 
> posted here.
> 
> kldstat shows if_tap is getting loaded, and my qemu-ifup script is 
> running, setting up the tap interface.

Hmm.  There was a tap commit in the meantime, could you try the
following experimental update?  Everyone else is also invited to
test for regressions etc...

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/qemu-devel/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile

--- Makefile	10 Mar 2007 17:15:07 -0000	1.71
+++ Makefile	22 Mar 2007 01:06:35 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.9.0s.20070309
+PORTVERSION=	0.9.0s.20070322
 CATEGORIES=	emulators
 MASTER_SITES=	http://qemu.org/:release \
 		http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \
@@ -14,7 +14,7 @@
 		http://www.volny.cz/xnavara/qemu/:snapshot \
 		http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \
 		http://people.freebsd.org/~maho/qemu/:misc
-DISTNAME=	${PORTNAME}-snapshot-2007-03-09_05
+DISTNAME=	${PORTNAME}-snapshot-2007-03-22_05
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 DIST_SUBDIR=	qemu
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/emulators/qemu-devel/distinfo,v
retrieving revision 1.43
diff -u -r1.43 distinfo
--- distinfo	10 Mar 2007 17:15:07 -0000	1.43
+++ distinfo	22 Mar 2007 19:24:03 -0000
@@ -1,6 +1,6 @@
-MD5 (qemu/qemu-snapshot-2007-03-09_05.tar.bz2) = e3899581b8628a6eeb1ba33e18aab632
-SHA256 (qemu/qemu-snapshot-2007-03-09_05.tar.bz2) = bb8cf3e70492fce405074436a3001f06e6193d58c313862b4c5d165c2beace74
-SIZE (qemu/qemu-snapshot-2007-03-09_05.tar.bz2) = 1667747
+MD5 (qemu/qemu-snapshot-2007-03-22_05.tar.bz2) = b1d9d1b68094a9679b77d8b08796a7e4
+SHA256 (qemu/qemu-snapshot-2007-03-22_05.tar.bz2) = be19f224e83fd90064f26b8d09fe018c4de7d27663f11544d494ac52d03808fa
+SIZE (qemu/qemu-snapshot-2007-03-22_05.tar.bz2) = 1685829
 MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810
 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11
 SIZE (qemu/patch3_cirrus) = 8817
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/qemu-devel/pkg-plist,v
retrieving revision 1.19
diff -u -r1.19 pkg-plist
--- pkg-plist	10 Mar 2007 17:03:05 -0000	1.19
+++ pkg-plist	22 Mar 2007 00:07:42 -0000
@@ -4,6 +4,7 @@
 bin/qemu-system-mips
 bin/qemu-system-mipsel
 bin/qemu-system-ppc
+bin/qemu-system-ppc64
 bin/qemu-system-sparc
 bin/qemu-system-x86_64
 %%PORTDOCS%%%%DOCSDIR%%/qemu-doc.html
Index: files/patch-Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile
--- files/patch-Makefile	10 Mar 2007 17:15:07 -0000	1.4
+++ files/patch-Makefile	21 Mar 2007 23:53:11 -0000
@@ -1,5 +1,5 @@
 Index: qemu/Makefile
-@@ -19,14 +19,19 @@
+@@ -19,7 +19,11 @@
  BASE_LDFLAGS += -static
  endif
  ifdef BUILD_DOCS
@@ -11,16 +11,7 @@
  else
  DOCS=
  endif
- 
- ifndef CONFIG_DARWIN
- ifndef CONFIG_WIN32
--LIBS+=-lrt
-+# XXX need ifndef CONFIG_BSD
-+# LIBS+=-lrt
- endif
- endif
- 
-@@ -64,8 +69,10 @@
+@@ -60,8 +64,10 @@
  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
  
  install-doc: $(DOCS)
Index: files/patch-be
===================================================================
RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-be,v
retrieving revision 1.5
diff -u -r1.5 patch-be
--- files/patch-be	10 Mar 2007 17:03:05 -0000	1.5
+++ files/patch-be	21 Mar 2007 23:54:22 -0000
@@ -1,15 +1,3 @@
-Index: qemu/Makefile.target
-@@ -404,7 +404,9 @@
- ifndef CONFIG_DARWIN
- ifndef CONFIG_WIN32
- ifndef CONFIG_SOLARIS
--VL_LIBS=-lutil -lrt
-+#VL_LIBS=-lutil -lrt
-+# XXX this cant be just merged back...
-+VL_LIBS=-lutil
- endif
- endif
- endif
 Index: qemu/vl.c
 @@ -541,7 +541,7 @@
  static void init_get_clock(void)
