From owner-freebsd-emulation@FreeBSD.ORG Thu Oct 26 20:19:51 2006 Return-Path: X-Original-To: freebsd-emulation@freebsd.org Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A8E116A415; Thu, 26 Oct 2006 20:19:51 +0000 (UTC) (envelope-from nox@saturn.kn-bremen.de) Received: from gwyn.kn-bremen.de (gwyn.kn-bremen.de [212.63.36.242]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72D6143D45; Thu, 26 Oct 2006 20:19:49 +0000 (GMT) (envelope-from nox@saturn.kn-bremen.de) Received: from gwyn.kn-bremen.de (gwyn [127.0.0.1]) by gwyn.kn-bremen.de (8.13.4/8.13.4/Debian-3sarge3) with ESMTP id k9QKJmJd006683 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 26 Oct 2006 22:19:48 +0200 Received: from saturn.kn-bremen.de (uucp@localhost) by gwyn.kn-bremen.de (8.13.4/8.13.4/Submit) with UUCP id k9QKJmHa006681; Thu, 26 Oct 2006 22:19:48 +0200 Received: from saturn.kn-bremen.de (nox@localhost [127.0.0.1]) by saturn.kn-bremen.de (8.13.6/8.13.6) with ESMTP id k9QKHrDN051847; Thu, 26 Oct 2006 22:17:53 +0200 (CEST) (envelope-from nox@saturn.kn-bremen.de) Received: (from nox@localhost) by saturn.kn-bremen.de (8.13.6/8.13.6/Submit) id k9QKHqAb051846; Thu, 26 Oct 2006 22:17:52 +0200 (CEST) (envelope-from nox) From: Juergen Lock Date: Thu, 26 Oct 2006 22:17:52 +0200 To: freebsd-emulation@freebsd.org, freebsd-ports@freebsd.org Message-ID: <20061026201752.GA51540@saturn.kn-bremen.de> Mail-Followup-To: freebsd-emulation@freebsd.org, freebsd-ports@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11 Cc: Subject: experimental qemu port update, please test X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Oct 2006 20:19:51 -0000 While ports are still in freeze, I'd like to take the opportunity to let you test an experimental port update of today's cvs snapshot with any guests you have. qemu cvs now uses aio, so make sure you kldload that (or put it into your kernel) before running the updated qemu. (Btw did 4.x have aio? If not we need to add an IGNORE now I guess...) New files: files/patch-Makefile files/patch-vl.c-serial files/patch-vl.h Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/Makefile,v retrieving revision 1.57 diff -u -r1.57 Makefile --- Makefile 20 Sep 2006 11:20:47 -0000 1.57 +++ Makefile 26 Oct 2006 19:10:21 -0000 @@ -6,16 +6,16 @@ # PORTNAME= qemu -PORTVERSION= 0.8.2 -PORTREVISION= 2 +PORTVERSION= 0.8.2s.20061026 CATEGORIES= emulators MASTER_SITES= http://www.qemu.org/:release \ + http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \ http://people.fruitsalad.org/nox/qemu/:snapshot \ http://www.volny.cz/xnavara/qemu/:snapshot \ - http://qemu.dad-answers.com/download/qemu/:snapshot \ http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \ http://people.freebsd.org/~maho/qemu/:misc -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release +DISTNAME= ${PORTNAME}-snapshot-2006-10-26_05 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot .if defined (WITH_HACKS_CIRRUS) || defined (WITH_HACKS) DISTFILES+= patch3_cirrus:misc .endif @@ -34,6 +34,7 @@ .endif HAS_CONFIGURE= yes +USE_BZIP2= yes USE_GMAKE= yes USE_GETOPT_LONG= yes USE_SDL= sdl Index: distinfo =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/distinfo,v retrieving revision 1.32 diff -u -r1.32 distinfo --- distinfo 7 Aug 2006 16:10:26 -0000 1.32 +++ distinfo 26 Oct 2006 19:10:48 -0000 @@ -1,6 +1,6 @@ -MD5 (qemu/qemu-0.8.2.tar.gz) = 5b3a89eb2f256a8a6f3bb07f7b3f1b07 -SHA256 (qemu/qemu-0.8.2.tar.gz) = 2a20d811296c859d678bdd002222aa7ca7951a641327234f3af144e822d078f3 -SIZE (qemu/qemu-0.8.2.tar.gz) = 1810909 +MD5 (qemu/qemu-snapshot-2006-10-26_05.tar.bz2) = ec77ef5e0ff45c5bcdae16078b10e5bd +SHA256 (qemu/qemu-snapshot-2006-10-26_05.tar.bz2) = 991b4111742eebe963685c902c13bde9e279832d29c27241edc0620a45611367 +SIZE (qemu/qemu-snapshot-2006-10-26_05.tar.bz2) = 1494227 MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11 SIZE (qemu/patch3_cirrus) = 8817 Index: pkg-message =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/pkg-message,v retrieving revision 1.15 diff -u -r1.15 pkg-message --- pkg-message 2 Sep 2006 19:50:46 -0000 1.15 +++ pkg-message 26 Oct 2006 19:20:45 -0000 @@ -56,4 +56,6 @@ (the rtl8139c+ that model=rtl8139 emulates needs less cpu than qemu's default ne2k nic which is driven by ed(4), it has not been made default only because it may not work with all guests yet.) +- qemu now uses aio, so if you get `Bad system call' crashes that is +because aio is not (kld)loaded. ==== Index: files/patch-Makefile @@ -0,0 +1,11 @@ +Index: qemu/Makefile +@@ -28,7 +28,8 @@ + ifndef CONFIG_DARWIN + ifndef CONFIG_WIN32 + ifndef CONFIG_SOLARIS +-LIBS+=-lrt ++# XXX need ifndef CONFIG_BSD ++# LIBS+=-lrt + endif + endif + endif Index: files/patch-vl.c-serial @@ -0,0 +1,14 @@ +Index: qemu/vl.c +@@ -1591,8 +1591,8 @@ + cfsetospeed(&tty, spd); + + tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP +- |INLCR|IGNCR|ICRNL|IXON); +- tty.c_oflag |= OPOST; ++ |INLCR|IGNCR|ICRNL|IXON|IMAXBEL); ++ tty.c_oflag &= ~OPOST; /* Don't do any output processing! */ + tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN|ISIG); + tty.c_cflag &= ~(CSIZE|PARENB|PARODD|CRTSCTS); + switch(data_bits) { + + Index: files/patch-vl.h @@ -0,0 +1,12 @@ +Index: qemu/vl.h +@@ -73,6 +73,10 @@ + #define PRIo64 "I64o" + #endif + ++#ifndef ENOMEDIUM ++#define ENOMEDIUM 4097 ++#endif ++ + #ifdef QEMU_TOOL + + /* we use QEMU_TOOL in the command line tools which do not depend on