On Fri, Dec 02, 2011 at 07:52:15PM -0500, Brad wrote: > On Thu, Dec 01, 2011 at 07:08:16PM -0500, Brad wrote: > > Here is an update to QEMU 1.0. > > Updated with some tweaking of the README.
Update the dist sites so there is a second dist site with the dist file. Index: Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.80 diff -u -p -r1.80 Makefile --- Makefile 2 Dec 2011 14:36:14 -0000 1.80 +++ Makefile 7 Dec 2011 03:20:10 -0000 @@ -1,15 +1,13 @@ # $OpenBSD: Makefile,v 1.80 2011/12/02 14:36:14 espie Exp $ -# no success building on other archs yet -ONLY_FOR_ARCHS = amd64 arm i386 mips64 mips64el powerpc sparc sparc64 +ONLY_FOR_ARCHS= amd64 i386 mips64 mips64el powerpc sparc sparc64 COMMENT = multi system emulator -DISTNAME = qemu-0.15.1 -REVISION= 1 +DISTNAME= qemu-1.0 CATEGORIES = emulators MASTER_SITES = http://wiki.qemu.org/download/ \ - ${MASTER_SITE_SAVANNAH:=qemu/} + http://comstyle.com/source/ HOMEPAGE = http://www.qemu.org/ @@ -21,18 +19,28 @@ 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 +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 +49,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 +75,14 @@ CONFIGURE_ARGS += --disable-bsd-user PKG_ARGS += -Dbsduser=0 .endif -FLAVORS = debug no_x11 +FLAVORS= debug FLAVOR ?= -.if ${FLAVOR: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: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 1 Dec 2011 22:17:33 -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.tar.gz) = pks2BnoZFFEyOw0067RJVA== +RMD160 (qemu-1.0.tar.gz) = OmCu9s/rumiWvbEsmVJdpUVhcv0= +SHA1 (qemu-1.0.tar.gz) = fcsbNRZVTW2JnXSIzURNu3ch/O4= +SHA256 (qemu-1.0.tar.gz) = R2dLfaVZ1eG0TMQBr5rFrZYtFOnu3hJWexPkuEGYlzc= +SIZE (qemu-1.0.tar.gz) = 10848714 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 28 Nov 2011 23:32:55 -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 28 17:22:15 2011 ++++ configure Mon Nov 28 18:32:45 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 +@@ -1116,7 +1114,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" +@@ -2684,8 +2682,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 Index: pkg/README =================================================================== RCS file: /home/cvs/ports/emulators/qemu/pkg/README,v retrieving revision 1.5 diff -u -p -r1.5 README --- pkg/README 2 Jun 2011 13:41:38 -0000 1.5 +++ pkg/README 3 Dec 2011 00:45:17 -0000 @@ -8,11 +8,11 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: 1. Get a bootable CDROM image: - $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd49.iso + $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/i386/cd50.iso or to use a 64-bit client OS: - $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd49.iso + $ ftp ftp://ftp.openbsd.org/pub/OpenBSD/snapshots/amd64/cd50.iso 2. Create a virtual disk image: @@ -20,13 +20,13 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: 3. Install the OS: - $ qemu -m 32 -monitor stdio -no-fd-bootchk \ - -hda virtual.img -cdrom cd49.iso -boot d + $ qemu-system-i386 -m 32 -monitor stdio -no-fd-bootchk \ + -hda virtual.img -cdrom cd50.iso -boot d or: $ qemu-system-x86_64 -m 32 -monitor stdio -no-fd-bootchk \ - -hda virtual.img -cdrom cd49.iso -boot d + -hda virtual.img -cdrom cd50.iso -boot d NOTE: start this inside an xterm or equivalent. NOTE: be sure to choose serial console during install. @@ -38,12 +38,12 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: $ qemu-img convert -c -O qcow2 virtual.img v.tmp && \ mv v.tmp virtual.img - NOTE: do not do this while qemu is running / using this virtual + NOTE: do not do this while QEMU is running / using this virtual disk. 5. Boot normally from the virtual disk: - $ qemu -m 32 -nographic -no-fd-bootchk -hda virtual.img + $ qemu-system-i386 -m 32 -nographic -no-fd-bootchk -hda virtual.img or: @@ -53,39 +53,39 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: 1. Default Settings - By default, qemu sets up the equivalent of the following networking: + By default, QEMU sets up the equivalent of the following networking: -net nic,vlan=0,model=e1000,macaddr=52:54:00:12:34:56 -net user,vlan=0 Also, inside this virtual usermode network, it uses the 10.0.2.0/24 - and serves dhcp from inside this virtual network. Static address - can be used if one cannot or does not want to do dhcp in the + and serves DHCP from inside this virtual network. Static address + can be used if one cannot or does not want to do DHCP in the guest OS: Guest OS IP : 10.0.2.15 Default Gateway : 10.0.2.2 Nameserver : 10.0.2.3 - It is sufficient for most operations, qemu itself performs NAT - and then makes userland network calls for tcp/udp operations. - icmp and other things are not possible in this mode. + It is sufficient for most operations, QEMU itself performs NAT + and then makes userland network calls for TCP/UDP operations. + ICMP and other things are not possible in this mode. - NOTE: If you use one '-net' cmdline argument, qemu assumes you + NOTE: If you use one '-net' cmdline argument, QEMU assumes you know what you want and clears defaults for the rest of the -net defaults. NOTE: The guest mode networking does not currently support IPv6, - and qemu will complain that it cannot find a dns server - if /etc/resolv.conf contains only IPv6 dns servers. + and QEMU will complain that it cannot find a DNS server + if /etc/resolv.conf contains only IPv6 DNS servers. 2. tap mode - Sometimes it is desirable to configure qemu to access a network + Sometimes it is desirable to configure QEMU to access a network via layer2 directly. One way of doing this without having to run - qemu as root is to let root open /dev/tunN and pass the file - descriptor to qemu. The tun(4) interface should preferrably be - configured before starting qemu: + QEMU as root is to let root open /dev/tunN and pass the file + descriptor to QEMU. The tun(4) interface should preferrably be + configured before starting QEMU: $ sudo ifconfig tun0 192.168.0.254 link0 @@ -101,9 +101,9 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: After configuring the virtual network we can use sudo to let root open the tunnel device and then use sudo again to drop - privileges and start qemu: + privileges and start QEMU: - $ sudo sh -c "sudo -u $USER qemu -nographic -net nic \ + $ sudo sh -c "sudo -u $USER qemu-system-i386 -nographic -net nic \ -net tap,fd=3 -no-fd-bootchk -hda virtual.img 3<>/dev/tun0" NOTE: sudo calls closefrom(2). In order to have more than one @@ -111,18 +111,18 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: Defaults closefrom_override - then calling sudo via 'sudo -C 5 -u $USER qemu ..' is - required. See sudoers(5) and sudo(8) for details. + then calling sudo via 'sudo -C 5 -u $USER qemu-system-i386 ..' + is required. See sudoers(5) and sudo(8) for details. - An alternative to the procedure described above is to have qemu + An alternative to the procedure described above is to have QEMU set up the network via ${SYSCONFDIR}/qemu-ifup. This is not - recommended however, since you would have to run qemu as root, + recommended however, since you would have to run QEMU as root, and there is no way to drop from root privileges at this point. ${SYSCONFDIR}/qemu-ifup contains some default settings that permit one to do the following: - # qemu -net nic -net tap -no-fd-bootchk -hda virtual.img + # qemu-system-i386 -net nic -net tap -no-fd-bootchk -hda virtual.img It presumes you wish the tun(4) interface to talk to the interface holding the default IPv4 route (falling back to trunk0 if no @@ -132,10 +132,10 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: Setting the environment variables ETHER and BRIDGE will override these settings, respectively. - When starting qemu, the script attempts to output useful + When starting QEMU, the script attempts to output useful information, but there are also error messages that occur as - well. On my laptop, I want to route / nat natively using pf and - also have layer2 access to the qemu networks. I thus have this + well. On my laptop, I want to route / nat natively using PF and + also have layer2 access to the QEMU networks. I thus have this as /etc/hostname.trunk101: inet6 fe80::1c 64 lladdr 00:03:25:0d:7a:2c @@ -143,11 +143,11 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: inet6 alias 2001:240:58a:45::1c I have dhcpd configured to run on trunk101, and also run rtadvd. - For qemu, the startup looks like this: + For QEMU, the startup looks like this: # export ETHER=trunk101 # export BRIDGE=bridge101 - # qemu -net nic,vlan=0,model=e1000,macaddr=52:54:00:12:35:00 \ + # qemu-system-i386 -net nic,vlan=0,model=e1000,macaddr=52:54:00:12:35:00 \ -net tap,vlan=0 -vnc :0 -localtime -usb -usbdevice tablet \ -m 256 -no-fd-bootchk -hda virtual.img -monitor stdio {tun0 (bridge101 <-> trunk101)ifconfig: bridge101: No such process @@ -170,16 +170,16 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: port 6 ifpriority 0 ifcost 0 Addresses (max cache: 100, timeout: 240): - NOTE: When running multiple qemu sessions simultaneously on the - same bridge, care must be taken because the network mac - address defaults to 52:54:00:12:34:56 for every qemu + NOTE: When running multiple QEMU sessions simultaneously on the + same bridge, care must be taken because the network MAC + address defaults to 52:54:00:12:34:56 for every QEMU instance. To change this, observe the macaddr= syntax in - the above example and choose a unique lladdr per qemu nic. + the above example and choose a unique lladdr per QEMU nic. ==> Mice - NOTE: Certain OS's work much better with the tablet usb device - than the normal ps2 mouse handling. See the above example + NOTE: Certain OS's work much better with the USB tablet device + than the normal PS/2 mouse handling. See the above example for usage. ==> Serial Console @@ -188,25 +188,25 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: X may not be available, and so on. There are two ways to accomplish this, both in effect the same solution: - a. qemu -vnc :0 -serial stdio .. virtual.img \ + a. qemu-system-i386 -vnc :0 -serial stdio .. virtual.img \ -cdrom install43.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 + - this option permits you to use VNC from some system to + connect to the QEMU instance and 'set tty com0' at the 'boot>' prompt. - - you may then disconnect vnc and use the terminal from - which you started qemu to do the install. + - you may then disconnect VNC and use the terminal from + which you started QEMU to do the install. - b. qemu -nographic .. virtual.img -fda floppy49.fs -boot a + b. qemu-system-i386 -nographic .. virtual.img -fda floppy50.fs -boot a - this maps both the serial port and the (qemu) monitor - prompt to the terminal qemu was started on. - - to flip between them, Ctrl-a c; see the qemu man page for + prompt to the terminal QEMU was started on. + - to flip between them, Ctrl-a c; see the QEMU man page for other commands that work in -nographic mode. - preparation of the floppy image to force serial console mode is straightforward: - vnconfig vnd0 floppy49.fs + vnconfig vnd0 floppy50.fs mount /dev/vnd0c /mnt mkdir /mnt/etc echo set tty com0 > /mnt/etc/boot.conf @@ -216,17 +216,17 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: .. be sure to choose 'yes' for setting com0 to be the serial console. - NOTE: OpenBSD poweroff does work with qemu, which actually causes - qemu itself to exit. This is a good thing, as it is + NOTE: OpenBSD poweroff does work with QEMU, which actually causes + QEMU itself to exit. This is a good thing, as it is currently not possible to set what block device is booted - from at runtime from qemu. So if you start an installation - booting from a cdrom, you will always boot off a cdrom - every time you reboot that qemu session until you exit and - start qemu again booting off the virtual hard drive. + from at runtime from QEMU. So if you start an installation + booting from a CD-ROM, you will always boot off a CD-ROM + every time you reboot that QEMU session until you exit and + start QEMU again booting off the virtual hard drive. -==> daemonized qemu +==> daemonized QEMU - Sometimes you want qemu to start as part of a system script. + Sometimes you want QEMU to start as part of a system script. Adding to some of the above, the -daemonize option comes in handy, as well as the telnet: designator for -serial and monitor. @@ -242,7 +242,7 @@ $OpenBSD: README,v 1.5 2011/06/02 13:41: ifconfig bridge101 add trunk101 add tun0 up sh -c "sudo -u $USER \ - ${TRUEPREFIX}/bin/qemu \ + ${TRUEPREFIX}/bin/qemu-system-i386 \ -daemonize \ -nographic \ -net nic,vlan=0,model=e1000,macaddr=52:54:00:4e:62:8f \ -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
