- Update to 0.10.1 - from the official changelog:

  - virtio-net: allow masking of notifications on empty queue (Alex Williamson)
  - e1000: fix rx descriptor low threshold logic (Alex Willaimson)
  - x86 tcg: add NULL checks to lsl instruction (Jan Kiszka)
  - kvm vga: fix screen corruption with -std-vga and Windows (Avi Kivity)
  - kvm vga: fix screen corruption with Ubuntu installations (Glauber Costa)
  - virtio-net: check right return size on sg list (Alex Williamson)
  - Make qemu_announce_self handle holes (live migration after hotplug)
    (Marcelo Tosatti)
  - Revert r6804-r6808 (qcow2 allocation info).  This series of changes added
    a high cost to startup for large qcow2 images (Anthony Liguori)
  - qemu-img: fix help message (Aurelien Jarno)
  - Fix build for non-default installs of SDL (Anthony Liguori)
  - Fix race condition in env->interrupt_request.  When using TCG and a dynticks
    host timer, this condition could cause TCG to get stuck in an infinite
    loop (Aurelien Jarno)
  - Fix reading encrypted hard disk passwords during early startup (Jan Kiszka)
  - Fix encrypted disk reporting in 'info block' (Jan Kiszka)
  - Fix console size with tiny displays (MusicPal) (Jan Kiszka)
  - Improve error handling in bdrv_open2 (Jan Kiszka)
  - Avoid leaking data in mux'ed character devices (Jan Kiszka)
  - Fix initial character device reset (no banner in monitor) (Jan Kiszka)
  - Fix cpuid KVM crash on i386 host (Lubomir Rintel)
  - Fix SLES10sp2 installation by adding ISTAT1 register to LSI SCSI emulation
    (Ryan Harper)

- Add physical CDROM fixes (still not perfect tho, see pkg-message)
- Add MAKE_JOBS_SAFE fix and mark as such

5 files changed, 298 insertions, 6 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 944c792182a5..c110152e1f21 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.10.0
-PORTREVISION=	1
+PORTVERSION=	0.10.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://bellard.org/qemu/
@@ -25,6 +24,7 @@ MAKE_ENV+=	BSD_MAKE="${MAKE}" LDFLAGS="${LDFLAGS}"
 MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	amd64 i386
 CONFLICTS=	qemu-devel-[0-9]*
+MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	KQEMU "Build with (alpha!) accelerator module" Off \
 		RTL8139_TIMER "allow use of re(4) nic with FreeBSD guests" Off \
@@ -33,6 +33,7 @@ OPTIONS=	KQEMU "Build with (alpha!) accelerator module" Off \
 		GNUTLS "gnutls dependency (vnc encryption)" On \
 		PCAP "pcap dependency (networking with bpf)" On \
 		CDROM_DMA "IDE CDROM DMA" On \
+		PHYS_CDROM "Physical CDROM fixes" On \
 		ADD_AUDIO "Emulate more audio hardware (experimental!)" Off \
 		ALL_TARGETS "Also build non-x86 targets" On
 
@@ -109,6 +110,9 @@ post-patch:
 .if defined(WITHOUT_CDROM_DMA)
 	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch
 .endif
+.if defined(WITH_PHYS_CDROM)
+	@cd ${WRKSRC} && ${PATCH} -p1 --quiet < ${FILESDIR}/phys-cdrom-freebsd-patch
+.endif
 	@${REINPLACE_CMD} -E \
 		-e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \
 		-e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index c86741bd8259..5c23c7165448 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,3 +1,3 @@
-MD5 (qemu/qemu-0.10.0.tar.gz) = 8dc50b834fa3f5f6a17d7bc3d0559e53
-SHA256 (qemu/qemu-0.10.0.tar.gz) = 3c5ecf320996ad243b7adc4798ad5dbfd58a6d5562cc0317a4cde7c7fb3edbb2
-SIZE (qemu/qemu-0.10.0.tar.gz) = 3657649
+MD5 (qemu/qemu-0.10.1.tar.gz) = 99b6da099343f6a32e02211aa5925154
+SHA256 (qemu/qemu-0.10.1.tar.gz) = c21170fc4ec80154263686813f7e5a14e6ecebf8320931cd3002119742757cb6
+SIZE (qemu/qemu-0.10.1.tar.gz) = 3658024
diff --git a/emulators/qemu/files/patch-fbsd b/emulators/qemu/files/patch-fbsd
index 8eb291442d1f..58aebeeb42c4 100644
--- a/emulators/qemu/files/patch-fbsd
+++ b/emulators/qemu/files/patch-fbsd
@@ -7,7 +7,7 @@ Index: qemu/Makefile
 +all: bsd/libmath.a $(TOOLS) $(DOCS) recurse-all
 +
 +bsd/libmath.a:
-+	( cd bsd ; $(BSD_MAKE) CC=$(CC) )
++	( cd bsd ; unset MAKEFLAGS ; $(BSD_MAKE) CC=$(CC) )
  
  SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
  
diff --git a/emulators/qemu/files/phys-cdrom-freebsd-patch b/emulators/qemu/files/phys-cdrom-freebsd-patch
new file mode 100644
index 000000000000..6f477c4339cb
--- /dev/null
+++ b/emulators/qemu/files/phys-cdrom-freebsd-patch
@@ -0,0 +1,282 @@
+Index: qemu/block-raw-posix.c
+@@ -55,6 +55,7 @@
+ #ifdef __FreeBSD__
+ #include <signal.h>
+ #include <sys/disk.h>
++#include <sys/cdio.h>
+ #endif
+ 
+ #ifdef __OpenBSD__
+@@ -105,6 +106,9 @@
+     int fd_got_error;
+     int fd_media_changed;
+ #endif
++#if defined(__FreeBSD__)
++    int cd_open_flags;
++#endif
+     uint8_t* aligned_buf;
+ } BDRVRawState;
+ 
+@@ -112,6 +116,12 @@
+ 
+ static int fd_open(BlockDriverState *bs);
+ 
++#if defined(__FreeBSD__)
++static int cd_open(BlockDriverState *bs);
++#endif
++
++static int raw_is_inserted(BlockDriverState *bs);
++
+ static int raw_open(BlockDriverState *bs, const char *filename, int flags)
+ {
+     BDRVRawState *s = bs->opaque;
+@@ -747,6 +757,9 @@
+     int64_t size;
+ #ifdef _BSD
+     struct stat sb;
++#ifdef __FreeBSD__
++    int reopened = 0;
++#endif
+ #endif
+ #ifdef __sun__
+     struct dk_minfo minfo;
+@@ -759,6 +772,9 @@
+         return ret;
+ 
+ #ifdef _BSD
++#ifdef __FreeBSD__
++again:
++#endif
+     if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) {
+ #ifdef DIOCGMEDIASIZE
+ 	if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
+@@ -768,6 +784,19 @@
+ #else
+         size = lseek(fd, 0LL, SEEK_END);
+ #endif
++#ifdef __FreeBSD__
++        switch(s->type) {
++        case FTYPE_CD:
++            /* XXX FreeBSD acd returns UINT_MAX sectors for an empty drive */
++            if (size == 2048LL * (unsigned)-1)
++                size = 0;
++            /* XXX no disc?  maybe we need to reopen... */
++            if (size <= 0 && !reopened && cd_open(bs) >= 0) {
++                reopened = 1;
++                goto again;
++            }
++        }
++#endif
+     } else
+ #endif
+ #ifdef __sun__
+@@ -958,6 +987,14 @@
+         bs->sg = 1;
+     }
+ #endif
++#if defined(__FreeBSD__)
++    if (strstart(filename, "/dev/cd", NULL) ||
++        strstart(filename, "/dev/acd", NULL)) {
++        s->type = FTYPE_CD;
++        s->cd_open_flags = open_flags;
++    }
++#endif
++    s->fd = -1;
+     fd = open(filename, open_flags, 0644);
+     if (fd < 0) {
+         ret = -errno;
+@@ -966,6 +1003,11 @@
+         return ret;
+     }
+     s->fd = fd;
++#if defined(__FreeBSD__)
++    /* make sure the door isnt locked at this time */
++    if (s->type == FTYPE_CD)
++        ioctl (s->fd, CDIOCALLOW);
++#endif
+ #if defined(__linux__)
+     /* close fd so that we can reopen it as needed */
+     if (s->type == FTYPE_FD) {
+@@ -1132,7 +1174,116 @@
+ 
+     return ioctl(s->fd, req, buf);
+ }
+-#else
++#elif defined(__FreeBSD__)
++
++static int fd_open(BlockDriverState *bs)
++{
++    BDRVRawState *s = bs->opaque;
++
++    /* this is just to ensure s->fd is sane (its called by io ops) */
++    if (s->fd >= 0)
++        return 0;
++    return -EIO;
++}
++
++static int cd_open(BlockDriverState *bs)
++{
++#if defined(__FreeBSD__)
++    BDRVRawState *s = bs->opaque;
++    int fd;
++
++    switch(s->type) {
++    case FTYPE_CD:
++        /* XXX force reread of possibly changed/newly loaded disc,
++         * FreeBSD seems to not notice sometimes... */
++        if (s->fd >= 0)
++            close (s->fd);
++        fd = open(bs->filename, s->cd_open_flags, 0644);
++        if (fd < 0) {
++            s->fd = -1;
++            return -EIO;
++        }
++        s->fd = fd;
++        /* make sure the door isnt locked at this time */
++        ioctl (s->fd, CDIOCALLOW);
++    }
++#endif
++    return 0;
++}
++
++static int raw_is_inserted(BlockDriverState *bs)
++{
++    BDRVRawState *s = bs->opaque;
++
++    switch(s->type) {
++    case FTYPE_CD:
++        return (raw_getlength(bs) > 0);
++    case FTYPE_FD:
++        /* XXX handle this */
++        /* FALLTHRU */
++    default:
++        return 1;
++    }
++}
++
++static int raw_media_changed(BlockDriverState *bs)
++{
++    return -ENOTSUP;
++}
++
++static int raw_eject(BlockDriverState *bs, int eject_flag)
++{
++    BDRVRawState *s = bs->opaque;
++
++    switch(s->type) {
++    case FTYPE_CD:
++        if (s->fd < 0)
++            return -ENOTSUP;
++        (void) ioctl (s->fd, CDIOCALLOW);
++        if (eject_flag) {
++            if (ioctl (s->fd, CDIOCEJECT) < 0)
++                perror("CDIOCEJECT");
++        } else {
++            if (ioctl (s->fd, CDIOCCLOSE) < 0)
++                perror("CDIOCCLOSE");
++        }
++        if (cd_open(bs) < 0)
++            return -ENOTSUP;
++        break;
++    case FTYPE_FD:
++        /* XXX handle this */
++        /* FALLTHRU */
++    default:
++        return -ENOTSUP;
++    }
++    return 0;
++}
++
++static int raw_set_locked(BlockDriverState *bs, int locked)
++{
++    BDRVRawState *s = bs->opaque;
++
++    switch(s->type) {
++    case FTYPE_CD:
++        if (s->fd < 0)
++            return -ENOTSUP;
++        if (ioctl (s->fd, (locked ? CDIOCPREVENT : CDIOCALLOW)) < 0) {
++            /* Note: an error can happen if the distribution automatically
++               mounts the CD-ROM */
++            //        perror("CDROM_LOCKDOOR");
++        }
++        break;
++    default:
++        return -ENOTSUP;
++    }
++    return 0;
++}
++
++static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
++{
++    return -ENOTSUP;
++}
++#else /* !linux && !FreeBSD */
+ 
+ static int fd_open(BlockDriverState *bs)
+ {
+@@ -1163,7 +1314,7 @@
+ {
+     return -ENOTSUP;
+ }
+-#endif /* !linux */
++#endif /* !linux && !FreeBSD */
+ 
+ BlockDriver bdrv_host_device = {
+     "host_device",
+Index: qemu/hw/scsi-disk.c
+@@ -417,16 +417,26 @@
+     switch (command) {
+     case 0x0:
+ 	DPRINTF("Test Unit Ready\n");
++        if (!bdrv_is_inserted(s->bdrv))
++            goto notready;
+ 	break;
+     case 0x03:
+         DPRINTF("Request Sense (len %d)\n", len);
+         if (len < 4)
+             goto fail;
+         memset(outbuf, 0, 4);
++        r->buf_len = 4;
++        if (s->sense == SENSE_NOT_READY && len >= 18) {
++            memset(outbuf, 0, 18);
++            r->buf_len = 18;
++            outbuf[7] = 10;
++            /* asc 0x3a, ascq 0: Medium not present */
++            outbuf[12] = 0x3a;
++            outbuf[13] = 0;
++        }
+         outbuf[0] = 0xf0;
+         outbuf[1] = 0;
+         outbuf[2] = s->sense;
+-        r->buf_len = 4;
+         break;
+     case 0x12:
+         DPRINTF("Inquiry (len %d)\n", len);
+@@ -725,6 +735,10 @@
+         break;
+     case 0x1b:
+         DPRINTF("Start Stop Unit\n");
++        if (bdrv_get_type_hint(s->bdrv) == BDRV_TYPE_CDROM &&
++            (buf[4] & 2))
++            /* load/eject medium */
++            bdrv_eject(s->bdrv, !(buf[4] & 1));
+ 	break;
+     case 0x1e:
+         DPRINTF("Prevent Allow Medium Removal (prevent = %d)\n", buf[4] & 3);
+@@ -754,6 +768,7 @@
+             outbuf[7] = 0;
+             r->buf_len = 8;
+         } else {
++        notready:
+             scsi_command_complete(r, STATUS_CHECK_CONDITION, SENSE_NOT_READY);
+             return 0;
+         }
+@@ -790,6 +805,7 @@
+             start_track = buf[6];
+             bdrv_get_geometry(s->bdrv, &nb_sectors);
+             DPRINTF("Read TOC (track %d format %d msf %d)\n", start_track, format, msf >> 1);
++            nb_sectors /= s->cluster_size;
+             switch(format) {
+             case 0:
+                 toclen = cdrom_read_toc(nb_sectors, outbuf, msf, start_track);
diff --git a/emulators/qemu/pkg-message b/emulators/qemu/pkg-message
index 37fb0481253e..ca01aef56fa6 100644
--- a/emulators/qemu/pkg-message
+++ b/emulators/qemu/pkg-message
@@ -134,6 +134,12 @@ 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.)
+- The patch currently applied by the PHYS_CDROM knob improves physical
+cdrom support, but still has 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.