Index: Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/Makefile,v retrieving revision 1.143 diff -u -p -r1.143 Makefile --- Makefile 19 Jul 2012 20:15:43 -0000 1.143 +++ Makefile 5 Sep 2012 22:01:09 -0000 @@ -6,7 +6,7 @@ # PORTNAME= qemu -PORTVERSION= 1.1.1 +PORTVERSION= 1.2.0 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -18,7 +18,7 @@ MAINTAINER= nox@FreeBSD.org COMMENT= QEMU CPU Emulator - development version HAS_CONFIGURE= yes -EXTRACT_SUFX= .tar.bz2 +USE_BZIP2= yes USE_GMAKE= yes USE_PERL5_BUILD= yes USE_PYTHON_BUILD= yes Index: distinfo =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/distinfo,v retrieving revision 1.65 diff -u -p -r1.65 distinfo --- distinfo 19 Jul 2012 20:15:43 -0000 1.65 +++ distinfo 5 Sep 2012 22:02:48 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu/1.1.1/qemu-1.1.1.tar.bz2) = 004a3032b504e70174c504d6c156b1ec3445abd9913602af0d7a5ac0703ddf5c -SIZE (qemu/1.1.1/qemu-1.1.1.tar.bz2) = 11712524 +SHA256 (qemu/1.2.0/qemu-1.2.0.tar.bz2) = c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 +SIZE (qemu/1.2.0/qemu-1.2.0.tar.bz2) = 9865186 Index: files/patch-90_security =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-90_security,v retrieving revision 1.9 diff -u -p -r1.9 patch-90_security --- files/patch-90_security 2 Dec 2011 19:28:07 -0000 1.9 +++ files/patch-90_security 5 Sep 2012 22:20:48 -0000 @@ -15,7 +15,7 @@ Index: qemu/hw/dma.c } Index: qemu/hw/fdc.c -@@ -1322,7 +1322,8 @@ +@@ -1445,7 +1445,8 @@ static uint32_t fdctrl_read_data(FDCtrl fd_sector(cur_drv)); return 0; } @@ -25,16 +25,16 @@ Index: qemu/hw/fdc.c FLOPPY_DPRINTF("error getting sector %d\n", fd_sector(cur_drv)); /* Sure, image size is too small... */ -@@ -1776,7 +1777,8 @@ +@@ -1905,7 +1906,8 @@ static void fdctrl_write_data(FDCtrl *fd if (pos == FD_SECTOR_LEN - 1 || fdctrl->data_pos == fdctrl->data_len) { cur_drv = get_cur_drv(fdctrl); - if (bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) { + if (cur_drv->bs == NULL || + bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) { - FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv)); + FLOPPY_DPRINTF("error writing sector %d\n", + fd_sector(cur_drv)); return; - } Index: qemu-0.8.2/hw/sb16.c =================================================================== --- qemu-0.8.2.orig/hw/sb16.c 2006-07-22 20:23:34.000000000 +0300 Index: files/patch-e1000-rx =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-e1000-rx,v retrieving revision 1.1 diff -u -p -r1.1 patch-e1000-rx --- files/patch-e1000-rx 1 Jun 2012 20:49:50 -0000 1.1 +++ files/patch-e1000-rx 5 Sep 2012 22:23:08 -0000 @@ -1,133 +0,0 @@ -Message-ID: <4FC741F1.4000905@redhat.com> -Date: Thu, 31 May 2012 12:03:29 +0200 -From: Paolo Bonzini -To: Jan Kiszka -References: <20120530202311.GA1768@onelab2.iet.unipi.it> - <20120530212333.GD2672@onelab2.iet.unipi.it> - <4FC69389.8050404@web.de> - - <4FC69B28.1000106@web.de> - - <4FC71FEB.9030100@redhat.com> <4FC72A95.4040808@web.de> -In-Reply-To: <4FC72A95.4040808@web.de> -Cc: Luigi Rizzo , rizzo@iet.unipi.it, - qemu-devel@nongnu.org, - Stefano Stabellini -Subject: Re: [Qemu-devel] Proposed patch: huge RX speedup for hw/e1000.c - -Il 31/05/2012 10:23, Jan Kiszka ha scritto: ->> > @@ -922,6 +923,7 @@ set_rdt(E1000State *s, int index, uint32_t val) ->> > { ->> > s->check_rxov = 0; ->> > s->mac_reg[index] = val & 0xffff; ->> > + qemu_notify_event(); -> This still looks like the wrong tool: Packets that can't be delivered -> are queued. - -Packets that are read from the tap but can't be delivered are queued; -packets that are left on the tap need qemu_notify_event to be flushed. - -> So we need to flush the queue and clear the blocked delivery -> there. qemu_flush_queued_packets appears more appropriate for this. - -Right, and qemu_flush_queued_packets needs to call qemu_notify_event -which makes the call in virtio-net unnecessary. - -Paolo - -diff --git a/hw/e1000.c b/hw/e1000.c -index 4573f13..43d933a 100644 ---- a/hw/e1000.c -+++ b/hw/e1000.c -@@ -295,6 +295,7 @@ set_rx_control(E1000State *s, int index, uint32_t val) - s->rxbuf_min_shift = ((val / E1000_RCTL_RDMTS_QUAT) & 3) + 1; - DBGOUT(RX, "RCTL: %d, mac_reg[RCTL] = 0x%x\n", s->mac_reg[RDT], - s->mac_reg[RCTL]); -+ qemu_flush_queued_packets(&s->nic->nc); - } - - static void -@@ -926,6 +927,9 @@ set_rdt(E1000State *s, int index, uint32_t val) - { - s->check_rxov = 0; - s->mac_reg[index] = val & 0xffff; -+ if (e1000_has_rxbufs(s, 1)) { -+ qemu_flush_queued_packets(&s->nic->nc); -+ } - } - - static void -diff --git a/hw/virtio-net.c b/hw/virtio-net.c -index 3f190d4..0974945 100644 ---- a/hw/virtio-net.c -+++ b/hw/virtio-net.c -@@ -447,10 +447,6 @@ static void virtio_net_handle_rx(VirtIODevice *vdev, VirtQueue *vq) - VirtIONet *n = to_virtio_net(vdev); - - qemu_flush_queued_packets(&n->nic->nc); -- -- /* We now have RX buffers, signal to the IO thread to break out of the -- * select to re-poll the tap file descriptor */ -- qemu_notify_event(); - } - - static int virtio_net_can_receive(VLANClientState *nc) -diff --git a/net.c b/net.c -index 1922d8a..fa846ae 100644 ---- a/net.c -+++ b/net.c -@@ -491,7 +491,12 @@ void qemu_flush_queued_packets(VLANClientState *vc) - queue = vc->send_queue; - } - -- qemu_net_queue_flush(queue); -+ if (qemu_net_queue_flush(queue)) { -+ /* We emptied the queue successfully, signal to the IO thread to repoll -+ * the file descriptor (for tap, for example). -+ */ -+ qemu_notify_event(); -+ } - } - - static ssize_t qemu_send_packet_async_with_flags(VLANClientState *sender, -diff --git a/net/queue.c b/net/queue.c -index 1ab5247..fd1c7e6 100644 ---- a/net/queue.c -+++ b/net/queue.c -@@ -232,7 +232,7 @@ void qemu_net_queue_purge(NetQueue *queue, VLANClientState *from) - } - } - --void qemu_net_queue_flush(NetQueue *queue) -+bool qemu_net_queue_flush(NetQueue *queue) - { - while (!QTAILQ_EMPTY(&queue->packets)) { - NetPacket *packet; -@@ -248,7 +248,7 @@ void qemu_net_queue_flush(NetQueue *queue) - packet->size); - if (ret == 0) { - QTAILQ_INSERT_HEAD(&queue->packets, packet, entry); -- break; -+ return 0; - } - - if (packet->sent_cb) { -@@ -257,4 +257,5 @@ void qemu_net_queue_flush(NetQueue *queue) - - g_free(packet); - } -+ return 1; - } -diff --git a/net/queue.h b/net/queue.h -index a31958e..4bf6d3c 100644 ---- a/net/queue.h -+++ b/net/queue.h -@@ -66,6 +66,6 @@ ssize_t qemu_net_queue_send_iov(NetQueue *queue, - NetPacketSent *sent_cb); - - void qemu_net_queue_purge(NetQueue *queue, VLANClientState *from); --void qemu_net_queue_flush(NetQueue *queue); -+bool qemu_net_queue_flush(NetQueue *queue); - - #endif /* QEMU_NET_QUEUE_H */ - Index: files/patch-z-arm-bsd-user-001 =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-z-arm-bsd-user-001,v retrieving revision 1.1 diff -u -p -r1.1 patch-z-arm-bsd-user-001 --- files/patch-z-arm-bsd-user-001 19 Jul 2012 20:15:43 -0000 1.1 +++ files/patch-z-arm-bsd-user-001 9 Sep 2012 03:17:36 -0000 @@ -289,6 +289,18 @@ #endif --- a/bsd-user/syscall.c.orig +++ b/bsd-user/syscall.c +@@ -96,6 +96,11 @@ static abi_long do_obreak(abi_ulong new_ + return 0; + } + ++abi_long do_brk(abi_ulong new_brk) ++{ ++ return do_obreak(new_brk); ++} ++ + #if defined(TARGET_I386) + static abi_long do_freebsd_sysarch(CPUX86State *env, int op, abi_ulong parms) + { @@ -157,6 +161,12 @@ static abi_long do_freebsd_sysarch(void } #endif Index: files/patch-bsd-user-qemu.h @@ -0,0 +1,31 @@ +--- a/bsd-user/qemu.h ++++ b/bsd-user/qemu.h +@@ -50,6 +50,10 @@ struct image_info { + abi_ulong entry; + abi_ulong code_offset; + abi_ulong data_offset; ++#if 1 ++ abi_ulong arg_start; ++ abi_ulong arg_end; ++#endif + int personality; + }; + +@@ -72,6 +76,17 @@ struct emulated_sigtable { + typedef struct TaskState { + struct TaskState *next; + int used; /* non zero if used */ ++#if 1 ++#ifdef TARGET_ARM ++ int swi_errno; ++#endif ++#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32) ++ /* Extra fields for semihosted binaries. */ ++ uint32_t heap_base; ++ uint32_t heap_limit; ++#endif ++ uint32_t stack_base; ++#endif + struct image_info *info; + + struct emulated_sigtable sigtab[TARGET_NSIG];