From owner-freebsd-emulation@FreeBSD.ORG Thu Aug 2 18:37:16 2007 Return-Path: Delivered-To: freebsd-emulation@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D61816A418; Thu, 2 Aug 2007 18:37:16 +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 6A5BC13C4B7; Thu, 2 Aug 2007 18:37:15 +0000 (UTC) (envelope-from nox@saturn.kn-bremen.de) Received: by gwyn.kn-bremen.de (Postfix, from userid 10) id 4222F20516E; Thu, 2 Aug 2007 20:37:13 +0200 (CEST) Received: from saturn.kn-bremen.de (nox@localhost [127.0.0.1]) by saturn.kn-bremen.de (8.13.8/8.13.6) with ESMTP id l72IaGui020752; Thu, 2 Aug 2007 20:36:16 +0200 (CEST) (envelope-from nox@saturn.kn-bremen.de) Received: (from nox@localhost) by saturn.kn-bremen.de (8.13.8/8.13.6/Submit) id l72IaGIB020751; Thu, 2 Aug 2007 20:36:16 +0200 (CEST) (envelope-from nox) From: Juergen Lock Date: Thu, 2 Aug 2007 20:36:15 +0200 To: freebsd-emulation@FreeBSD.org, freebsd-ports@FreeBSD.org, matthieu Message-ID: <20070802183615.GA20576@saturn.kn-bremen.de> Mail-Followup-To: freebsd-emulation@FreeBSD.org, freebsd-ports@FreeBSD.org, matthieu References: <20070731201608.GA30162@saturn.kn-bremen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070731201608.GA30162@saturn.kn-bremen.de> User-Agent: Mutt/1.5.16 (2007-06-09) Cc: Subject: update rerolled - 20070802 (was: qemu-devel 20070731 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, 02 Aug 2007 18:37:16 -0000 On Tue, Jul 31, 2007 at 10:16:08PM +0200, Juergen Lock wrote: > Hi! > > Again I want to update the qemu-devel port (mainly because I played > with arm terrier/akita emulation as you can read on the qemu list, > but there are also other fixes) and need your help with testing. > It now also should respect ifname=tapX with -net tap (modified patch > after matthieu morel, Cc'd, I hope I didn't break it... :) Okay there were some late commits which I'd like to include (like, an acpi fix, also arm fixes), so I rerolled the update. Again, please test, to make sure the late commits don't cause regressions... Thanx and enjoy, Juergen Index: Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/Makefile,v retrieving revision 1.79 diff -u -r1.79 Makefile --- Makefile 10 Jul 2007 20:24:58 -0000 1.79 +++ Makefile 2 Aug 2007 16:30:19 -0000 @@ -6,7 +6,7 @@ # PORTNAME= qemu -PORTVERSION= 0.9.0s.20070702 +PORTVERSION= 0.9.0s.20070802 CATEGORIES= emulators MASTER_SITES= http://qemu.org/:release \ http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \ @@ -15,7 +15,7 @@ http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \ http://people.freebsd.org/~maho/qemu/:misc PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-snapshot-2007-07-02_05 +DISTNAME= ${PORTNAME}-snapshot-2007-08-02_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.47 diff -u -r1.47 distinfo --- distinfo 10 Jul 2007 20:24:58 -0000 1.47 +++ distinfo 2 Aug 2007 16:30:47 -0000 @@ -1,6 +1,6 @@ -MD5 (qemu/qemu-snapshot-2007-07-02_05.tar.bz2) = 624b513bbd86e0c7529344584639fba1 -SHA256 (qemu/qemu-snapshot-2007-07-02_05.tar.bz2) = 62474848fda0dacb1c6238b33b6b272e49dfa3821352ec57f38388246e0aa8c2 -SIZE (qemu/qemu-snapshot-2007-07-02_05.tar.bz2) = 2003505 +MD5 (qemu/qemu-snapshot-2007-08-02_05.tar.bz2) = 35332948d2a3647c4b29b27c9fc9b5a5 +SHA256 (qemu/qemu-snapshot-2007-08-02_05.tar.bz2) = b3931bf1d3787cf854b2687bd8bd568aba1d5bb2fde798189a56935cb502cd56 +SIZE (qemu/qemu-snapshot-2007-08-02_05.tar.bz2) = 2054955 MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11 SIZE (qemu/patch3_cirrus) = 8817 Index: files/patch-90_security =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-90_security,v retrieving revision 1.2 diff -u -r1.2 patch-90_security --- files/patch-90_security 10 Jul 2007 20:24:58 -0000 1.2 +++ files/patch-90_security 2 Aug 2007 16:39:44 -0000 @@ -1,7 +1,4 @@ Index: qemu-0.8.2/hw/cirrus_vga.c -=================================================================== ---- qemu-0.8.2.orig/hw/cirrus_vga.c 2007-04-20 06:05:59.000000000 +0300 -+++ qemu-0.8.2/hw/cirrus_vga.c 2007-04-20 06:05:59.000000000 +0300 @@ -217,6 +217,20 @@ #define CIRRUS_HOOK_NOT_HANDLED 0 #define CIRRUS_HOOK_HANDLED 1 @@ -23,7 +20,7 @@ struct CirrusVGAState; typedef void (*cirrus_bitblt_rop_t) (struct CirrusVGAState *s, uint8_t * dst, const uint8_t * src, -@@ -589,7 +603,7 @@ static void cirrus_invalidate_region(Cir +@@ -636,7 +650,7 @@ for (y = 0; y < lines; y++) { off_cur = off_begin; @@ -32,7 +29,7 @@ off_cur &= TARGET_PAGE_MASK; while (off_cur < off_cur_end) { cpu_physical_memory_set_dirty(s->vram_offset + off_cur); -@@ -604,7 +618,11 @@ static int cirrus_bitblt_common_patternc +@@ -651,7 +665,11 @@ { uint8_t *dst; @@ -45,7 +42,7 @@ (*s->cirrus_rop) (s, dst, src, s->cirrus_blt_dstpitch, 0, s->cirrus_blt_width, s->cirrus_blt_height); -@@ -620,8 +638,11 @@ static int cirrus_bitblt_solidfill(Cirru +@@ -667,8 +685,11 @@ { cirrus_fill_t rop_func; @@ -58,7 +55,7 @@ s->cirrus_blt_dstpitch, s->cirrus_blt_width, s->cirrus_blt_height); cirrus_invalidate_region(s, s->cirrus_blt_dstaddr, -@@ -640,8 +661,8 @@ static int cirrus_bitblt_solidfill(Cirru +@@ -687,8 +708,8 @@ static int cirrus_bitblt_videotovideo_patterncopy(CirrusVGAState * s) { return cirrus_bitblt_common_patterncopy(s, @@ -69,9 +66,9 @@ } static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h) -@@ -691,8 +712,10 @@ static void cirrus_do_copy(CirrusVGAStat +@@ -738,8 +759,10 @@ if (notify) - video_hw_update(); + vga_hw_update(); - (*s->cirrus_rop) (s, s->vram_ptr + s->cirrus_blt_dstaddr, - s->vram_ptr + s->cirrus_blt_srcaddr, @@ -82,7 +79,7 @@ s->cirrus_blt_dstpitch, s->cirrus_blt_srcpitch, s->cirrus_blt_width, s->cirrus_blt_height); -@@ -718,8 +741,14 @@ static int cirrus_bitblt_videotovideo_co +@@ -765,8 +788,14 @@ s->cirrus_blt_srcaddr - s->start_addr, s->cirrus_blt_width, s->cirrus_blt_height); } else { @@ -99,7 +96,7 @@ s->cirrus_blt_dstpitch, s->cirrus_blt_srcpitch, s->cirrus_blt_width, s->cirrus_blt_height); -@@ -751,8 +780,9 @@ static void cirrus_bitblt_cputovideo_nex +@@ -798,8 +827,9 @@ } else { /* at least one scan line */ do { @@ -111,7 +108,7 @@ cirrus_invalidate_region(s, s->cirrus_blt_dstaddr, 0, s->cirrus_blt_width, 1); s->cirrus_blt_dstaddr += s->cirrus_blt_dstpitch; -@@ -1852,7 +1882,7 @@ static void cirrus_mem_writeb_mode4and5_ +@@ -1917,7 +1947,7 @@ unsigned val = mem_value; uint8_t *dst; @@ -120,7 +117,7 @@ for (x = 0; x < 8; x++) { if (val & 0x80) { *dst = s->cirrus_shadow_gr1; -@@ -1875,7 +1905,7 @@ static void cirrus_mem_writeb_mode4and5_ +@@ -1940,7 +1970,7 @@ unsigned val = mem_value; uint8_t *dst; Index: files/patch-ac =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-ac,v retrieving revision 1.3 diff -u -r1.3 patch-ac --- files/patch-ac 10 Mar 2007 17:03:05 -0000 1.3 +++ files/patch-ac 31 Jul 2007 16:52:56 -0000 @@ -1,10 +1,10 @@ Index: qemu/configure -@@ -204,7 +204,7 @@ +@@ -540,7 +540,7 @@ + sdl_too_old=no if test -z "$sdl" ; then - --sdl_config="sdl-config" -+sdl_config="${SDL_CONFIG}" - sdl=no - sdl_static=no +- sdl_config="sdl-config" ++ sdl_config="${SDL_CONFIG}" + sdl=no + sdl_static=no Index: files/patch-bt =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-bt,v retrieving revision 1.5 diff -u -r1.5 patch-bt --- files/patch-bt 10 Jul 2007 20:24:59 -0000 1.5 +++ files/patch-bt 31 Jul 2007 18:42:56 -0000 @@ -1,15 +1,17 @@ Index: qemu/vl.c -@@ -76,6 +76,9 @@ +@@ -76,6 +76,11 @@ #endif #endif #endif +#ifdef __FreeBSD__ ++#include +#include ++#include +#endif #if defined(CONFIG_SLIRP) #include "libslirp.h" -@@ -1059,6 +1062,34 @@ +@@ -3407,6 +3410,34 @@ #endif /* CONFIG_SLIRP */ @@ -42,9 +44,9 @@ +#endif + #if !defined(_WIN32) - #ifdef _BSD - static int tun_open(char *ifname, int ifname_size) -@@ -1067,11 +1098,55 @@ + + typedef struct TAPState { +@@ -3470,11 +3501,59 @@ char *dev; struct stat s; @@ -61,12 +63,14 @@ + i = 0; +#endif + for (; i < 10; i++) { -+ if (i == -1) -+ strcpy(dname, "/dev/tap"); ++ if (*ifname) ++ snprintf(dname, sizeof dname, "/dev/%s", ifname); ++ else if (i == -1) ++ strcpy(dname, "/dev/tap"); + else -+ snprintf(dname, sizeof dname, "%s%d", -+ "/dev/tap", i); -+ fd = open(dname, O_RDWR); ++ snprintf(dname, sizeof dname, "%s%d", ++ "/dev/tap", i); ++ TFR(fd = open(dname, O_RDWR)); + if (fd >= 0) + break; + else if (errno == ENXIO || errno == ENOENT) { @@ -81,17 +85,19 @@ + } + if (errno != ENOENT || ++enoentcount > 3) { + err = errno; -+ break; ++ break; + } + } else + err = errno; ++ if (*ifname) ++ break; + } + if (fd < 0) { + fprintf(stderr, "warning: could not open %s (%s): no virtual network emulation\n", dname, strerror(err)); + return -1; + } +#else - fd = open("/dev/tap", O_RDWR); + TFR(fd = open("/dev/tap", O_RDWR)); if (fd < 0) { - fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n"); + fprintf(stderr, "warning: could not open /dev/tap (%s): no virtual network emulation\n", strerror(errno)); Index: files/patch-vl.c-ppbus =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-vl.c-ppbus,v retrieving revision 1.4 diff -u -r1.4 patch-vl.c-ppbus --- files/patch-vl.c-ppbus 10 Jul 2007 20:24:59 -0000 1.4 +++ files/patch-vl.c-ppbus 31 Jul 2007 18:40:53 -0000 @@ -1,8 +1,10 @@ Index: qemu/vl.c -@@ -78,6 +78,8 @@ +@@ -78,8 +78,10 @@ #endif #ifdef __FreeBSD__ + #include #include + #include +#include +#include #endif Index: files/patch-hw-pxa2xx_gpio.c @@ -0,0 +1,11 @@ +Index: qemu/hw/pxa2xx_gpio.c +@@ -152,6 +152,9 @@ + case GPDR: /* GPIO Pin-Direction registers */ + return s->dir[bank]; + ++ case GPSR: /* GPIO Pin-Output Set registers */ ++ return s->olevel[bank]; ++ + case GRER: /* GPIO Rising-Edge Detect Enable registers */ + return s->rising[bank]; +