Here is an update to QEMU 2.1.0-rc2 for testing and feedback.
Also I don't really use the bits in the README, but someone (I can't
remember who) pointed out that with QEMU 2.0 the combination of the
-daemonize and -nographic command line parameters is no longer valid.
I was wondering if someone who is more familiar with what the README
bits are doing could suggest appropriate command line parameters
that would be valid for the more modern releases of QEMU.
$ qemu-system-i386 -daemonize -nographic
-nographic can not be used with -daemonize
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.116
diff -u -p -u -p -r1.116 Makefile
--- Makefile 25 Apr 2014 20:59:43 -0000 1.116
+++ Makefile 16 Jul 2014 19:28:35 -0000
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc
COMMENT= multi system emulator
-DISTNAME= qemu-2.0.0
+DISTNAME= qemu-2.1.0-rc2
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
EXTRACT_SUFX= .tar.bz2
@@ -65,6 +65,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--disable-bsd-user \
--disable-libiscsi \
--disable-libusb \
+ --disable-lzo \
--disable-smartcard-nss \
--disable-spice \
--disable-uuid \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 distinfo
--- distinfo 25 Apr 2014 20:59:43 -0000 1.35
+++ distinfo 16 Jul 2014 18:19:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-2.0.0.tar.bz2) = YMwaoMrTnOyJH5cL7WDKikhPBxra1JQxI1mawiNUOjs=
-SIZE (qemu-2.0.0.tar.bz2) = 12839647
+SHA256 (qemu-2.1.0-rc2.tar.bz2) = 0pcp55jzEcJPHmtRPMqquDFirkuRmEnCiYpFhO/C+vE=
+SIZE (qemu-2.1.0-rc2.tar.bz2) = 23551394
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 patch-configure
--- patches/patch-configure 25 Apr 2014 20:59:43 -0000 1.41
+++ patches/patch-configure 16 Jul 2014 18:20:11 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.41 2014/04/25 20:59:43 brad Exp $
---- configure.orig Mon Apr 14 19:31:26 2014
-+++ configure Mon Apr 14 20:47:16 2014
-@@ -3910,8 +3910,6 @@ fi
+--- configure.orig Tue Jul 15 17:49:14 2014
++++ configure Wed Jul 16 14:19:59 2014
+@@ -3990,8 +3990,6 @@ fi
if test "$gcov" = "yes" ; then
CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
Index: patches/patch-tcg_ppc_tcg-target_c
===================================================================
RCS file: patches/patch-tcg_ppc_tcg-target_c
diff -N patches/patch-tcg_ppc_tcg-target_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tcg_ppc_tcg-target_c 4 Jul 2014 22:33:05 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- tcg/ppc/tcg-target.c.orig Fri Jul 4 18:29:45 2014
++++ tcg/ppc/tcg-target.c Fri Jul 4 18:32:59 2014
+@@ -2717,4 +2717,11 @@ static void __attribute__((constructor)) tcg_cache_ini
+ dcache_bsize = cacheline;
+ icache_bsize = cacheline;
+ }
++
++#elif defined(__OpenBSD__)
++static void __attribute__((constructor)) tcg_cache_init(void)
++{
++ dcache_bsize = 32;
++ icache_bsize = 32;
++}
+ #endif
Index: patches/patch-util_cache-utils_c
===================================================================
RCS file: patches/patch-util_cache-utils_c
diff -N patches/patch-util_cache-utils_c
--- patches/patch-util_cache-utils_c 25 Apr 2014 20:59:43 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-util_cache-utils_c,v 1.2 2014/04/25 20:59:43 brad Exp $
---- util/cache-utils.c.orig Thu Mar 13 23:10:11 2014
-+++ util/cache-utils.c Sun Mar 16 09:06:40 2014
-@@ -81,6 +81,12 @@ void qemu_cache_utils_init(void)
- qemu_cache_conf.dcache_bsize = cacheline;
- qemu_cache_conf.icache_bsize = cacheline;
- }
-+#elif defined(__OpenBSD__)
-+void qemu_cache_utils_init(void)
-+{
-+ qemu_cache_conf.dcache_bsize = 32;
-+ qemu_cache_conf.icache_bsize = 32;
-+}
- #endif
-
- #endif /* _ARCH_PPC */
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 PLIST
--- pkg/PLIST 25 Apr 2014 20:59:43 -0000 1.29
+++ pkg/PLIST 16 Jul 2014 19:23:15 -0000
@@ -139,6 +139,7 @@ share/qemu/s390-zipl.rom
share/qemu/sgabios.bin
share/qemu/slof.bin
share/qemu/spapr-rtas.bin
+share/qemu/u-boot.e500
share/qemu/vgabios-cirrus.bin
share/qemu/vgabios-qxl.bin
share/qemu/vgabios-stdvga.bin
Index: pkg/README
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/pkg/README,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 README
--- pkg/README 3 Jan 2013 08:30:54 -0000 1.10
+++ pkg/README 29 Apr 2014 02:53:23 -0000
@@ -8,13 +8,13 @@ $OpenBSD: README,v 1.10 2013/01/03 08:30
1. Get a bootable CDROM image:
- $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd52.iso
+ $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd55.iso
or to use a 64-bit client OS or SPARC, respectively:
- $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd52.iso
+ $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd55.iso
- $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/sparc/cd52.iso
+ $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/sparc/cd55.iso
2. Create a virtual disk image:
@@ -23,15 +23,15 @@ $OpenBSD: README,v 1.10 2013/01/03 08:30
3. Install the OS:
$ qemu-system-i386 -m 32 -monitor stdio -no-fd-bootchk \
- -hda virtual.img -cdrom cd52.iso -boot d
+ -hda virtual.img -cdrom cd55.iso -boot d
or:
$ qemu-system-x86_64 -m 32 -monitor stdio -no-fd-bootchk \
- -hda virtual.img -cdrom cd52.iso -boot d
+ -hda virtual.img -cdrom cd55.iso -boot d
$ qemu-system-sparc -m 32 -monitor stdio \
- -hda virtual.img -cdrom cd52.iso -boot d
+ -hda virtual.img -cdrom cd55.iso -boot d
NOTE: start this inside an xterm or equivalent.
NOTE: be sure to choose serial console during install.
@@ -198,7 +198,7 @@ $OpenBSD: README,v 1.10 2013/01/03 08:30
accomplish this, both in effect the same solution:
a. qemu-system-i386 -vnc :0 -serial stdio .. virtual.img \
- -cdrom install52.iso -boot d
+ -cdrom install55.iso -boot d
- this option permits you to use VNC from some system to
connect to the QEMU instance and 'set tty com0' at the
@@ -206,7 +206,7 @@ $OpenBSD: README,v 1.10 2013/01/03 08:30
- you may then disconnect VNC and use the terminal from
which you started QEMU to do the install.
- b. qemu-system-i386 -nographic .. virtual.img -fda floppy52.fs -boot a
+ b. qemu-system-i386 -nographic .. virtual.img -fda floppy55.fs -boot a
- this maps both the serial port and the (qemu) monitor
prompt to the terminal QEMU was started on.
@@ -215,7 +215,7 @@ $OpenBSD: README,v 1.10 2013/01/03 08:30
- preparation of the floppy image to force serial console
mode is straightforward:
- vnconfig vnd0 floppy52.fs
+ vnconfig vnd0 floppy55.fs
mount /dev/vnd0c /mnt
mkdir /mnt/etc
echo set tty com0 > /mnt/etc/boot.conf
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
