On Mon, Nov 21, 2011 at 10:33:16PM -0500, Brad wrote: > On Tue, Nov 15, 2011 at 03:59:41PM -0500, Brad wrote: > > The QEMU 1.0 release is coming up soon. Looking for some testing of the > > rc2 release. Let me know how it goes. > > 1.0-rc3..
An updated diff for rc3. This could use more testing on amd64 and i386. Index: Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.79 diff -u -p -r1.79 Makefile --- Makefile 7 Nov 2011 21:37:30 -0000 1.79 +++ Makefile 22 Nov 2011 01:04:58 -0000 @@ -1,12 +1,10 @@ # $OpenBSD: Makefile,v 1.79 2011/11/07 21:37:30 sthen Exp $ -# no success building on other archs yet -ONLY_FOR_ARCHS = amd64 arm i386 mips64 mips64el powerpc sparc sparc64 +ONLY_FOR_ARCHS= amd64 hppa i386 mips64 mips64el powerpc sparc sparc64 COMMENT = multi system emulator -DISTNAME = qemu-0.15.1 -REVISION= 1 +DISTNAME= qemu-1.0-rc3 CATEGORIES = emulators MASTER_SITES = http://wiki.qemu.org/download/ \ ${MASTER_SITE_SAVANNAH:=qemu/} @@ -21,18 +19,36 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c curl jpeg m ncurses ossaudio png pthread util z +WANTLIB= GL SDL X11 c curl glib-2.0 gthread-2.0 jpeg m ncurses \ + png pthread util z +MODULES= devel/gettext \ + lang/python BUILD_DEPENDS = textproc/texi2html -LIB_DEPENDS = graphics/jpeg \ +LIB_DEPENDS= devel/glib2 \ + devel/sdl \ + graphics/jpeg \ graphics/png \ net/curl +MODPY_RUNDEP= No + MAKE_ENV = V=1 FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples -EXTRA_CFLAGS= -I${LOCALBASE}/include -EXTRA_LDFLAGS= -L${LOCALBASE}/lib +# +# Workaround GCC 4.2.1 bug which results in GCC generating +# out-of-range branches. +# +.if ${MACHINE_ARCH} == "hppa" +CFLAGS+= -Dinline= +.endif + +EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib + +# until the system headers are fixed properly. +EXTRA_CFLAGS+= -Wno-redundant-decls VMEM_WARNING = Yes @@ -41,12 +57,14 @@ CONFIGURE_STYLE = simple CONFIGURE_ARGS = --prefix=${PREFIX} \ --sysconfdir=${SYSCONFDIR} \ --mandir=${PREFIX}/man \ + --python=${MODPY_BIN} \ --smbd=${LOCALBASE}/libexec/smbd \ --cc="${CC}" \ --host-cc="${CC}" \ --extra-cflags="${EXTRA_CFLAGS}" \ --extra-ldflags="${EXTRA_LDFLAGS}" \ - --disable-guest-agent \ + --audio-drv-list=sdl \ + --disable-libiscsi \ --disable-smartcard-nss \ --disable-spice \ --disable-uuid \ @@ -65,32 +83,14 @@ CONFIGURE_ARGS += --disable-bsd-user PKG_ARGS += -Dbsduser=0 .endif -FLAVORS = debug no_x11 +FLAVORS= debug FLAVOR ?= -.if ${FLAVOR:L:Mno_x11} -CONFIGURE_ARGS += --disable-sdl --disable-opengl -.else -WANTLIB += GL SDL X11 - -LIB_DEPENDS += devel/sdl - -EXTRA_CFLAGS += -I${X11BASE}/include -EXTRA_LDFLAGS += -L${X11BASE}/lib -.endif - -# until the system headers are fixed properly. -EXTRA_CFLAGS += -Wno-redundant-decls - .if ${FLAVOR:L:Mdebug} CONFIGURE_ARGS += --enable-debug .endif -# Currently, the regression tests are utterly broken. -REGRESS_TARGET = test - -pre-configure: - @perl -pi -e 's|/dev/dsp|/dev/audio|g' ${WRKSRC}/audio/ossaudio.c +NO_REGRESS= Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu Index: distinfo =================================================================== RCS file: /home/cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.17 diff -u -p -r1.17 distinfo --- distinfo 17 Oct 2011 20:27:17 -0000 1.17 +++ distinfo 22 Nov 2011 01:01:03 -0000 @@ -1,5 +1,5 @@ -MD5 (qemu-0.15.1.tar.gz) = NPF3N7qvGzSVyJzW1KYH7Q== -RMD160 (qemu-0.15.1.tar.gz) = /Rz96U+WVpr2ccyW0cLkutUk/WE= -SHA1 (qemu-0.15.1.tar.gz) = MM87Tau0tdjvrbIPNk64GB8xdoE= -SHA256 (qemu-0.15.1.tar.gz) = dwWxTZuOTfSgsXkJgOYYCEJh6NrvBnKhqnqDCg89tbo= -SIZE (qemu-0.15.1.tar.gz) = 9576745 +MD5 (qemu-1.0-rc3.tar.gz) = nOOFVUPJnITiXdm2152etQ== +RMD160 (qemu-1.0-rc3.tar.gz) = 0jl+0ryFFeu/wb3DFEy1OWSScSE= +SHA1 (qemu-1.0-rc3.tar.gz) = vVikfLFLh9feaRJnma+895PQtfk= +SHA256 (qemu-1.0-rc3.tar.gz) = W3aUIW8M4fCjjghkCJ42YmAmB0ZXjYlWCye/sgAUevA= +SIZE (qemu-1.0-rc3.tar.gz) = 10847355 Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v retrieving revision 1.20 diff -u -p -r1.20 patch-configure --- patches/patch-configure 17 Oct 2011 20:27:17 -0000 1.20 +++ patches/patch-configure 22 Nov 2011 07:06:01 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.20 2011/10/17 20:27:17 sthen Exp $ ---- configure.orig Wed Oct 12 12:41:43 2011 -+++ configure Thu Oct 13 05:12:57 2011 -@@ -229,13 +229,11 @@ sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}" +--- configure.orig Mon Nov 21 19:11:07 2011 ++++ configure Tue Nov 22 02:05:44 2011 +@@ -235,13 +235,11 @@ sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}" # default flags for all hosts QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" @@ -10,34 +10,21 @@ $OpenBSD: patch-configure,v 1.20 2011/10 QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" - QEMU_INCLUDES="-I. -I\$(SRC_PATH)" + QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu" -LDFLAGS="-g $LDFLAGS" # make source path absolute source_path=`cd "$source_path"; pwd` -@@ -281,6 +279,12 @@ elif check_define __s390__ ; then - else - cpu="s390" - fi -+elif check_define __ARMEB__ ; then -+ cpu="armv4b" -+elif check_define __ARMEL__ ; then -+ cpu="armv4l" -+elif check_define __hppa__ ; then -+ cpu="hppa" - else - cpu=`uname -m` - fi -@@ -301,7 +305,7 @@ case "$cpu" in - armv*l) - cpu="armv4l" - ;; -- parisc|parisc64) -+ hppa|parisc|parisc64) - cpu="hppa" - ;; - mips*) -@@ -2557,8 +2561,9 @@ fi +@@ -1110,7 +1108,7 @@ fi + + if test "$pie" = ""; then + case "$cpu-$targetos" in +- i386-Linux|x86_64-Linux) ++ i386-Linux|x86_64-Linux|i386-OpenBSD|x86_64-OpenBSD) + ;; + *) + pie="no" +@@ -2668,8 +2666,9 @@ fi # End of CC checks # After here, no more $cc or $ld runs Index: patches/patch-hw_e1000_c =================================================================== RCS file: patches/patch-hw_e1000_c diff -N patches/patch-hw_e1000_c --- patches/patch-hw_e1000_c 19 Oct 2011 08:12:06 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -$OpenBSD: patch-hw_e1000_c,v 1.2 2011/10/19 08:12:06 sthen Exp $ - -- Use MII status register for link up/down. -- The Capabilities Pointer is NULL, so this bit shouldn't be set. - ---- hw/e1000.c.orig Wed Oct 12 12:41:43 2011 -+++ hw/e1000.c Sat Oct 15 05:19:04 2011 -@@ -624,10 +624,13 @@ e1000_set_link_status(VLANClientState *nc) - E1000State *s = DO_UPCAST(NICState, nc, nc)->opaque; - uint32_t old_status = s->mac_reg[STATUS]; - -- if (nc->link_down) -+ if (nc->link_down) { - s->mac_reg[STATUS] &= ~E1000_STATUS_LU; -- else -+ s->phy_reg[PHY_STATUS] &= ~MII_SR_LINK_STATUS; -+ } else { - s->mac_reg[STATUS] |= E1000_STATUS_LU; -+ s->phy_reg[PHY_STATUS] |= MII_SR_LINK_STATUS; -+ } - - if (s->mac_reg[STATUS] != old_status) - set_ics(s, 0, E1000_ICR_LSC); -@@ -1164,8 +1167,6 @@ static int pci_e1000_init(PCIDevice *pci_dev) - - pci_conf = d->dev.config; - -- /* TODO: we have no capabilities, so why is this bit set? */ -- pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST); - /* TODO: RST# value should be 0, PCI spec 6.2.4 */ - pci_conf[PCI_CACHE_LINE_SIZE] = 0x10; - Index: patches/patch-hw_e1000_hw_h =================================================================== RCS file: patches/patch-hw_e1000_hw_h diff -N patches/patch-hw_e1000_hw_h --- patches/patch-hw_e1000_hw_h 28 Aug 2011 11:21:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-hw_e1000_hw_h,v 1.1 2011/08/28 11:21:05 sthen Exp $ - -use MII status register for link up/down - ---- hw/e1000_hw.h.orig Fri Aug 26 02:21:00 2011 -+++ hw/e1000_hw.h Fri Aug 26 02:21:40 2011 -@@ -349,6 +349,23 @@ - #define M88E1000_PHY_VCO_REG_BIT8 0x100 /* Bits 8 & 11 are adjusted for */ - #define M88E1000_PHY_VCO_REG_BIT11 0x800 /* improved BER performance */ - -+/* PHY Status Register */ -+#define MII_SR_EXTENDED_CAPS 0x0001 /* Extended register capabilities */ -+#define MII_SR_JABBER_DETECT 0x0002 /* Jabber Detected */ -+#define MII_SR_LINK_STATUS 0x0004 /* Link Status 1 = link */ -+#define MII_SR_AUTONEG_CAPS 0x0008 /* Auto Neg Capable */ -+#define MII_SR_REMOTE_FAULT 0x0010 /* Remote Fault Detect */ -+#define MII_SR_AUTONEG_COMPLETE 0x0020 /* Auto Neg Complete */ -+#define MII_SR_PREAMBLE_SUPPRESS 0x0040 /* Preamble may be suppressed */ -+#define MII_SR_EXTENDED_STATUS 0x0100 /* Ext. status info in Reg 0x0F */ -+#define MII_SR_100T2_HD_CAPS 0x0200 /* 100T2 Half Duplex Capable */ -+#define MII_SR_100T2_FD_CAPS 0x0400 /* 100T2 Full Duplex Capable */ -+#define MII_SR_10T_HD_CAPS 0x0800 /* 10T Half Duplex Capable */ -+#define MII_SR_10T_FD_CAPS 0x1000 /* 10T Full Duplex Capable */ -+#define MII_SR_100X_HD_CAPS 0x2000 /* 100X Half Duplex Capable */ -+#define MII_SR_100X_FD_CAPS 0x4000 /* 100X Full Duplex Capable */ -+#define MII_SR_100T4_CAPS 0x8000 /* 100T4 Capable */ -+ - /* Interrupt Cause Read */ - #define E1000_ICR_TXDW 0x00000001 /* Transmit desc written back */ - #define E1000_ICR_TXQE 0x00000002 /* Transmit Queue empty */ Index: patches/patch-target-i386_translate_c =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-target-i386_translate_c,v retrieving revision 1.5 diff -u -p -r1.5 patch-target-i386_translate_c --- patches/patch-target-i386_translate_c 16 Aug 2011 21:24:42 -0000 1.5 +++ patches/patch-target-i386_translate_c 7 Nov 2011 22:42:41 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-target-i386_translate_c,v 1.5 2011/08/16 21:24:42 sthen Exp $ ---- target-i386/translate.c.orig Sat Jul 23 13:05:22 2011 -+++ target-i386/translate.c Mon Jul 25 19:29:57 2011 -@@ -4856,20 +4856,24 @@ static target_ulong disas_insn(DisasContext *s, target +--- target-i386/translate.c.orig Mon Nov 7 16:24:56 2011 ++++ target-i386/translate.c Mon Nov 7 17:39:18 2011 +@@ -4870,20 +4870,24 @@ static target_ulong disas_insn(DisasContext *s, target tcg_gen_sub_tl(t2, cpu_regs[R_EAX], t0); gen_extu(ot, t2); tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, label1); Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v retrieving revision 1.19 diff -u -p -r1.19 PLIST --- pkg/PLIST 16 Aug 2011 21:24:42 -0000 1.19 +++ pkg/PLIST 8 Nov 2011 11:29:52 -0000 @@ -5,12 +5,14 @@ @pkgpath emulators/qemu,kqemu @pkgpath emulators/qemu-old[,no_x11] %%bsduser%% -@bin bin/qemu +@bin bin/qemu-ga @bin bin/qemu-img @bin bin/qemu-io @bin bin/qemu-nbd +@bin bin/qemu-system-alpha @bin bin/qemu-system-arm @bin bin/qemu-system-cris +@bin bin/qemu-system-i386 @bin bin/qemu-system-lm32 @bin bin/qemu-system-m68k @bin bin/qemu-system-microblaze @@ -28,6 +30,8 @@ @bin bin/qemu-system-sparc @bin bin/qemu-system-sparc64 @bin bin/qemu-system-x86_64 +@bin bin/qemu-system-xtensa +@bin bin/qemu-system-xtensaeb @man man/man1/qemu-img.1 @man man/man1/qemu.1 @man man/man8/qemu-nbd.8 @@ -92,6 +96,7 @@ share/qemu/multiboot.bin share/qemu/openbios-ppc share/qemu/openbios-sparc32 share/qemu/openbios-sparc64 +share/qemu/palcode-clipper share/qemu/petalogix-ml605.dtb share/qemu/petalogix-s3adsp1800.dtb share/qemu/ppc_rom.bin @@ -102,6 +107,7 @@ share/qemu/pxe-pcnet.rom share/qemu/pxe-rtl8139.rom share/qemu/pxe-virtio.rom share/qemu/s390-zipl.rom +share/qemu/sgabios.bin share/qemu/slof.bin share/qemu/spapr-rtas.bin share/qemu/vgabios-cirrus.bin -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
