Index: head/emulators/qemu-sbruno/Makefile =================================================================== --- head/emulators/qemu-sbruno/Makefile (revision 446107) +++ head/emulators/qemu-sbruno/Makefile (revision 446108) @@ -1,307 +1,305 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.9.50.g20170711 +PORTVERSION= 2.9.50.g20170717 CATEGORIES= emulators -MASTER_SITES= GH \ - LOCAL/nox:dtc \ - http://people.freebsd.org/~nox/tmp/distfiles/:dtc +MASTER_SITES= GH PKGNAMESUFFIX?= -sbruno -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - dtc-v1.4.0${EXTRACT_SUFX}:dtc +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER= sbruno@FreeBSD.org COMMENT?= QEMU CPU Emulator - github bsd-user branch LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= seanbruno GH_PROJECT= ${PORTNAME}-bsd-user -GH_TAGNAME= 1c182c5 +GH_TAGNAME= cb766f5 HAS_CONFIGURE= yes USES= gmake pkgconfig bison perl5 python:2,build USE_PERL5= build PATCH_STRIP= -p1 MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 ONLY_FOR_ARCHS= amd64 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts? BROKEN_i386= aarch64 system target is currently broken for i386 hosts, disable for now while dealing with upstream BROKEN_powerpc64= fails to build: async.c: internal compiler error: Segmentation fault OPTIONS_DEFINE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ CDROM_DMA PCAP USBREDIR X86_TARGETS BSD_USER \ STATIC_LINK DOCS SAMBA_DESC= samba dependency (for -smb) GNUTLS_DESC= gnutls dependency (vnc encryption) SASL_DESC= cyrus-sasl dependency (vnc encryption) JPEG_DESC= jpeg dependency (vnc lossy compression) PNG_DESC= png dependency (vnc compression) CDROM_DMA_DESC= IDE CDROM DMA PCAP_DESC= pcap dependency (networking with bpf) USBREDIR_DESC= usb device network redirection (experimental!) X86_TARGETS_DESC= Don't build non-x86 system targets BSD_USER_DESC= Also build bsd-user targets (for testing) STATIC_LINK_DESC= Statically link the executables OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP .if !defined(QEMU_USER_STATIC) CONFLICTS_INSTALL= qemu-[0-9]* qemu-devel-* .endif .if defined(QEMU_USER_STATIC) .if exists(/usr/sbin/binmiscctl) USE_RC_SUBR= qemu_user_static SUB_LIST= NAME=qemu_user_static CONFIGURE_ARGS+= --disable-tools .endif .else # qemu-system-* targets require pixman to build, add an explicit dependency. USE_XORG= pixman .endif # When static linking we have a build dependency on libglib-2.0.a, otherwise # we use glib20 in the usual way (shared-lib runtime dependency). .if defined(QEMU_USER_STATIC) BUILD_DEPENDS+= ${LOCALBASE}/lib/libglib-2.0.a:devel/glib20 .else USE_GNOME+= glib20 +BUILD_DEPENDS+= ${LOCALBASE}/lib/libfdt.so:sysutils/dtc .endif .include CONFIGURE_ARGS+= --localstatedir=/var -CONFIGURE_ARGS+= --extra-ldflags=-L\"${LOCALBASE}/lib\" +CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib +CONFIGURE_ARGS+= --extra-cflags=-I${LOCALBASE}/include CONFIGURE_ARGS+= --disable-libssh2 PORTDOCS= docs qemu-doc.html .if defined(QEMU_USER_STATIC) .if ${ARCH} != "amd64" CONFIGURE_ARGS+= --target-list=i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user .else CONFIGURE_ARGS+= --target-list=i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user .endif .else .if ${PORT_OPTIONS:MX86_TARGETS} .if ${PORT_OPTIONS:MBSD_USER} .if ${ARCH} != "amd64" CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user .else CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user .endif .else CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu .endif .else .if empty(PORT_OPTIONS:MBSD_USER) CONFIGURE_ARGS+= --disable-bsd-user .else .if ${ARCH} != "amd64" CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu,aarch64-softmmu,alpha-softmmu,arm-softmmu,cris-softmmu,lm32-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mipsel-softmmu,mips64-softmmu,mips64el-softmmu,or32-softmmu,ppc-softmmu,ppcemb-softmmu,ppc64-softmmu,sh4-softmmu,sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,s390x-softmmu,xtensa-softmmu,xtensaeb-softmmu,unicore32-softmmu,moxie-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user .endif .endif .endif .endif .if empty(PORT_OPTIONS:MBSD_USER) PLIST_SUB+= BSD_USER="@comment " .else PLIST_SUB+= BSD_USER="" .if ${ARCH} == "sparc64" IGNORE= bsd-user targets not tested on sparc64 .endif .endif .if empty(PORT_OPTIONS:MBSD_USER) || ${ARCH} != "amd64" PLIST_SUB+= BSD_USER64="@comment " .else PLIST_SUB+= BSD_USER64="" .endif .if ${PORT_OPTIONS:MX86_TARGETS} PLIST_SUB+= NONX86="@comment " .else PLIST_SUB+= NONX86="" .endif .if defined(QEMU_USER_STATIC) PLIST_SUB+= SOFTMMU="@comment " PLIST_SUB+= STATIC="-static" .else PLIST_SUB+= SOFTMMU="" PLIST_SUB+= STATIC="" .endif WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC} --enable-docs \ --disable-linux-user --disable-linux-aio \ --disable-kvm --disable-xen \ --smbd=${LOCALBASE}/sbin/smbd \ --enable-debug \ --enable-debug-info \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" .if empty(PORT_OPTIONS:MX11) CONFIGURE_ARGS+= --disable-sdl .else CONFIGURE_ARGS+= --enable-sdl USE_SDL= sdl .endif .if empty(PORT_OPTIONS:MGTK2) CONFIGURE_ARGS+= --disable-gtk --disable-vte PLIST_SUB+= GTK2="@comment " .else USE_GNOME+= gtk20 vte USES+= gettext PLIST_SUB+= GTK2="" .endif .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:security/gnutls .endif .if empty(PORT_OPTIONS:MSASL) CONFIGURE_ARGS+= --disable-vnc-sasl .else LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 .endif .if empty(PORT_OPTIONS:MJPEG) CONFIGURE_ARGS+= --disable-vnc-jpeg .else USES+= jpeg .endif .if empty(PORT_OPTIONS:MPNG) CONFIGURE_ARGS+= --disable-vnc-png .else LIB_DEPENDS+= libpng.so:graphics/png .endif .if empty(PORT_OPTIONS:MCURL) CONFIGURE_ARGS+= --disable-curl .else LIB_DEPENDS+= libcurl.so:ftp/curl .endif .if empty(PORT_OPTIONS:MOPENGL) CONFIGURE_ARGS+= --disable-opengl .else USE_GL= yes .endif .if empty(PORT_OPTIONS:MUSBREDIR) CONFIGURE_ARGS+= --disable-usb-redir .else BUILD_DEPENDS+= usbredir>=0.6:net/usbredir RUN_DEPENDS+= usbredir>=0.6:net/usbredir .endif .if ${PORT_OPTIONS:MPCAP} CONFIGURE_ARGS+= --enable-pcap .else CONFIGURE_ARGS+= --disable-pcap .endif .if ${PORT_OPTIONS:MSTATIC_LINK} .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MX11} IGNORE= the X11 ui cannot be built static .endif CONFIGURE_ARGS+= --static .endif .if ${PORT_OPTIONS:MSAMBA} USES+= samba:run # smbd .endif .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= texi2html:textproc/texi2html USES+= makeinfo .else MAKE_ARGS+= NOPORTDOCS=1 .endif .if !defined(STRIP) || ${STRIP} == "" CONFIGURE_ARGS+=--disable-strip .endif .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif .if ${ARCH} == "powerpc" MAKE_ARGS+= ARCH=ppc .endif .if ${ARCH} == "powerpc64" MAKE_ARGS+= ARCH=ppc64 .endif .if ${ARCH} == "sparc64" CONFIGURE_ARGS+= --sparc_cpu=v9 .endif CONFIGURE_ARGS+= --python=${PYTHON_CMD} # clang in freebsd 10 is unable to assemble linuxboot_dma.bin .if (${OSVERSION} < 1100000) PLIST_SUB+= LINUXBOOT_DMA="@comment " .else PLIST_SUB+= LINUXBOOT_DMA="" .endif post-patch: - @${MV} ${WRKDIR}/dtc ${WRKSRC} @${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure # clang in freebsd 10 is unable to assemble linuxboot_dma.bin .if (${OSVERSION} < 1100000) @${REINPLACE_CMD} -E \ -e 's|linuxboot_dma.bin||' \ ${WRKSRC}/pc-bios/optionrom/Makefile @${REINPLACE_CMD} -E \ -e 's|linuxboot_dma.bin||' \ ${WRKSRC}/Makefile .endif #.if ${PORT_OPTIONS:MPCAP} # @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch #.endif .if empty(PORT_OPTIONS:MCDROM_DMA) @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch .endif @${REINPLACE_CMD} -E \ -e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \ ${WRKSRC}/qemu-doc.texi @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile.target @${REINPLACE_CMD} -E \ -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ -e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \ ${WRKSRC}/scripts/texi2pod.pl # XXX need to disable usb host code on head while it's not ported to the # new usb stack yet post-configure: @${REINPLACE_CMD} -E \ -e "s|^(HOST_USB=)bsd|\1stub|" \ ${WRKSRC}/config-host.mak .if !target(post-install) post-install: .if ${PORT_OPTIONS:MDOCS} @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) .endif ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-* .endif .include Index: head/emulators/qemu-sbruno/distinfo =================================================================== --- head/emulators/qemu-sbruno/distinfo (revision 446107) +++ head/emulators/qemu-sbruno/distinfo (revision 446108) @@ -1,5 +1,3 @@ -TIMESTAMP = 1499792378 -SHA256 (qemu/2.9.50.g20170711/seanbruno-qemu-bsd-user-2.9.50.g20170711-1c182c5_GH0.tar.gz) = 2abe9de521335fcf7b596ec344e11d394a185851f0e1ff49b67855087c87a973 -SIZE (qemu/2.9.50.g20170711/seanbruno-qemu-bsd-user-2.9.50.g20170711-1c182c5_GH0.tar.gz) = 14209487 -SHA256 (qemu/2.9.50.g20170711/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 -SIZE (qemu/2.9.50.g20170711/dtc-v1.4.0.tar.gz) = 131893 +TIMESTAMP = 1500307124 +SHA256 (qemu/2.9.50.g20170717/seanbruno-qemu-bsd-user-2.9.50.g20170717-cb766f5_GH0.tar.gz) = 324cb4c2001a0ccc9d20e244ea5a4b23ce52eae2bff9c3925d3fad8fce1287c1 +SIZE (qemu/2.9.50.g20170717/seanbruno-qemu-bsd-user-2.9.50.g20170717-cb766f5_GH0.tar.gz) = 14562773 Index: head/emulators/qemu-sbruno/pkg-message =================================================================== --- head/emulators/qemu-sbruno/pkg-message (revision 446107) +++ head/emulators/qemu-sbruno/pkg-message (revision 446108) @@ -1,182 +1,172 @@ FreeBSD host notes ================== - Needs to set net.link.tap.user_open sysctl in order to use /dev/tap* networking as non-root. Don't forget to adjust device node permissions in /etc/devfs.rules. - slirp (usermode networking) is fixed now in cvs, on FreeSBIE 1.0 guests you still have to manually do: echo nameserver 10.0.2.3 >/etc/resolv.conf but i've been told that that's normal. (fixed on FreeSBIE 1.1.) And you have to wait a bit for dhclient to do its thing; traffic to address 10.0.2.2 is routed to 127.1 on the host. - Expect timer problems when guest kernel HZ is > hosts, for example time sleep 1 takes 49 seconds and booting sleeps for minutes at the acd0 probe with a FreeSBIE 1.0 guest, thats because its kernel is built with HZ=5000, and FreeBSD's default is 100... (no longer a problem with FreeSBIE 1.1.) The linux 2.6 kernel uses 1000 by default btw. (changed to 250 later, and recent linux kernels now no longer have a fixed HZ, aka `tickless kernel'...) Enabling /dev/rtc doesn't seem to help either (not included since it needs a patch to emulators/rtc.) - Update: the above problem has gotten worse with FreeBSD guests somewhere before 8.0, mainly since the kernel now usually wants double or even quadruple number of timer irqs compared to HZ if it detects an apic (and at least early versions of FreeBSD 8 had a bug that essentially halved qemu's clock rate too); the only reason you usually don't see symptoms of this with FreeBSD 8 guests is they automatically reduce their HZ to 100 when running in a VM while the default for the host kernel is still HZ=1000. Workaround: you can disable the apic clock in the guest by setting hint.apic.0.clock="0" in loader.conf(5) (or manually at the loader prompt), if that doesn't work the only things you can do is either reduce the guest's HZ to, say, 100 by setting e.g. kern.hz="100" from the loader as above (which usually is a good idea in a VM anyway and FreeBSD 8 now does by itself as mentioned), or otherwise increase the host's HZ to 2000 or even 4000 from the loader in the same way. - The -smb option (smb-export local dir to guest using the default slirp networking) needs the samba port/package installed in addition to qemu. (SAMBA knob.) - If you want to use usb devices connected to the host in the guest yot need either recent 10-current (not tested yet much) or you can use usbredir over the network (see below); also unless you are running qemu as root you then need to fix permissions for /dev/ugen* device nodes: if you are on 5.x or later (devfs) put a rule in /etc/devfs.rules, activate it in /etc/rc.conf and run /etc/rc.d/devfs restart. Example devfs.rules: [ugen_ruleset=20] add path 'ugen*' mode 660 group operator corresponding rc.conf line: devfs_system_ruleset="ugen_ruleset" - If you want to test the new (in 0.15.0) usb network redirection (USBREDIR option) see this thread by Hans de Goede redhat.com>: http://thread.gmane.org/gmane.comp.emulators.qemu/110176/focus=110183 Quote: Example usage: 1) Start usbredirserver for a usb device: sudo usbredirserver 045e:0772 2) Start qemu with usb2 support + a chardev talking to usbredirserver + a usb-redir device using this chardev: qemu -usb \ -readconfig docs/ich9-ehci-uhci.cfg \ -chardev socket,id=usbredirchardev,host=localhost,port=4000 \ -device usb-redir,chardev=usbredirchardev,id=usbredirdev ... [you would replace docs/ich9-ehci-uhci.cfg with e.g. /usr/local/share/doc/qemu/docs/ich9-ehci-uhci.cfg, but turns out ehci was broken for me here with FreeBSD guests and the previous qemu version at least, I got: FETCHENTRY: entry at 22C5484 is of type 2 which is not supported yet processing error - resetting ehci HC Assertion failed: (0), function ehci_advance_state, file /data/ports/emulators/qemu-devel/work/qemu-0.15.0/hw/usb-ehci.c, line 2045. The new qemu version works better tho.] - Still usb: since the hub is no longer attached to the uchi controller and the wakeup mechanism, resume interrupt is not implemented yet linux guests will suspend the bus, i.e. they wont see devices usb_add'ed after its (linux') uhci module got loaded. Workaround: either add devices before linux loads the module or rmmod and modprobe it afterwards. [Not sure if this still applies to the new libusb host code used on recent 10-current.] - If you get repeated `atapi_poll called!' console messages with FreeBSD guests or other weird cdrom problems then thats probably because the guest has atapicam loaded, which for reasons still to be determined has problems with qemu's now by default enabled cdrom dma. You can build the port with CDROM_DMA disabled to disable it. [Looks like this is fixed in recent FreeBSD guest versions.] - If you build qemu wihout SDL and then get crashes running it try passing it -nographic. This should probably be default in that case... - qemu's network boot roms (-boot n) have a bug when bootfiles sizes are a multiple of blksize, if this affects you (like with FreeBSD's /boot/pxeboot) you can do like cp /boot/pxeboot pxeboot-qemu && chmod +w pxeboot-qemu && echo >>pxeboot-qemu and then use pxeboot-qemu. Actually you need recent btx code (from after 7.0 was released) because of the real mode boot problem, so use at least pxeboot from there. And I just did that for the pxeboot extracted out of ftp://ftp.freebsd.org/pub/FreeBSD/snapshots/200805/7.0-STABLE-200805-i386-bootonly.iso and placed it here: http://people.freebsd.org/~nox/qemu/pxeboot-qemu - If you use slirp (usernet, the default) and want to mount nfs into the guest and you are not running qemu as root, then mountd(8) on the exporting box needs to be run with -n in order to accept requests from ports >= 1024. - (not FreeBSD-specific:) There have been reports of qcow2 corruption with (at least) win2k guests on recent kvm (which uses similar qcow2 code than qemu now, see this thread: http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg00713.html - the consensus on that thread seems to be that qcow(2) code has always been experimental and you should use raw images if you want reliability; raw is also usually faster.) You should be able to migrate existing images to raw using qemu-img(1)'s convert function; raw doesn't support advanced features like snapshots tho. [a few important qcow2 bugfixed have been committed in the meantime so this _might_ be less of an issue now; and meanwhile there also is the new qed format - I don't know how stable that one is.] - (also not FreeBSD-specific:) It is recommended to pass raw images using the new -drive syntax, specifying format=raw explicitly in order to avoid malicious guests being able to exploit the format autodetection thats otherwise getting used. (Not that you should run malicious guests anyway, but this eleminates at least a known attack vector.) - qemu now has improved physical cdrom support, but still there is at least one known problem: you need to have the guest eject the disc if you want to change it/take it out, or otherwise the guest may continue using state (like size) of the old disc. (You can also do like `change ide1-cd0 /dev/acd0' in the monitor after taking out the disc if a guest cannot eject it itself.) - The default configuration location (qemu-ifup script etc.) has been changed from /etc to PREFIX/etc (usually /usr/local/etc). Move your files accordingly. - The pcap code (-net nic... -net pcap,ifname=...) should work properly now, with only one exception: Advanced features like TSO used on the host interface can cause oversize packets which now do get truncated to avoid confusing/panicing guests but of course still will cause retransmissions. So if you see slow throughput and `pcap_send: packet size > ..., truncating' messages on qemu's tty try disabling TSO etc on the host interface at least while using pcap. -- kqemu is no longer supported in qemu upstream after the 0.11 branch - was created, which means also not in this version. (Linux has moved - on to kvm now for qemu(-like) virtualization needs, so if you want qemu - to go faster and don't want to switch to virtualbox or stick to the older - emulators/qemu port which is at 0.11.1 atm and as such still supports - kqemu you should help getting the FreeBSD kvm port updated and - completed: - - http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD - )