qemu-devel 20070731 port update - please test!
Juergen Lock
nox at jelal.kn-bremen.de
Tue Jul 31 20:18:18 UTC 2007
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... :)
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 31 Jul 2007 16:49:11 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= qemu
-PORTVERSION= 0.9.0s.20070702
+PORTVERSION= 0.9.0s.20070731
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-07-31_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 31 Jul 2007 16:50:33 -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-07-31_05.tar.bz2) = f18b54459c53934138d4c302e7dd0164
+SHA256 (qemu/qemu-snapshot-2007-07-31_05.tar.bz2) = 16fcce3b7a8b606f318ed4af395a77ce0f05012d3d87fd1337f223ba57fa0716
+SIZE (qemu/qemu-snapshot-2007-07-31_05.tar.bz2) = 2043597
MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810
SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11
SIZE (qemu/patch3_cirrus) = 8817
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 <sys/param.h>
+#include <sys/module.h>
++#include <sys/linker.h>
+#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 <sys/param.h>
#include <sys/module.h>
+ #include <sys/linker.h>
+#include <dev/ppbus/ppi.h>
+#include <dev/ppbus/ppbconf.h>
#endif
Index: files/patch-pxa-gpsr
@@ -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];
+
Index: files/patch-spitz-hda
@@ -0,0 +1,11 @@
+Index: qemu/hw/spitz.c
+@@ -929,7 +929,8 @@
+
+ if (bs && bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) {
+ md = dscm1xxxx_init(bs);
+- pxa2xx_pcmcia_attach(cpu->pcmcia[0], md);
++ /* at least terrier microdrive is in socket 1 */
++ pxa2xx_pcmcia_attach(cpu->pcmcia[1], md);
+ }
+ }
+
More information about the freebsd-ports
mailing list