summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2013-10-12 20:10:50 +0000
committerJuergen Lock <nox@FreeBSD.org>2013-10-12 20:10:50 +0000
commit8cf238d721d8535f9b741649a658349d9cbf3639 (patch)
treeba5c7f55817a7f147083b909d1415a5c1e5b8cc1 /emulators
parent- enable stage. (diff)
Update to 1.6.1 - announce message is here:
http://lists.nongnu.org/archive/html/qemu-devel/2013-10/msg01207.html
Notes
Notes: svn path=/head/; revision=330184
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu-devel/Makefile3
-rw-r--r--emulators/qemu-devel/distinfo4
-rw-r--r--emulators/qemu-devel/files/patch-hw-net-pcnet-pci.c48
3 files changed, 3 insertions, 52 deletions
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 08ee376da586..79197d979f75 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= qemu
-PORTVERSION= 1.6.0
-PORTREVISION= 4
+PORTVERSION= 1.6.1
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/:release \
LOCAL/nox:snapshot
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 1b30bbdb5c3b..79e4d3716b59 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qemu/1.6.0/qemu-1.6.0.tar.bz2) = 3132e58ada26d43b6924e8c2f07db80aa1e5022f3dcf03dee7d8bb9194b2cb48
-SIZE (qemu/1.6.0/qemu-1.6.0.tar.bz2) = 12040196
+SHA256 (qemu/1.6.1/qemu-1.6.1.tar.bz2) = fc736f44aa10478223c881310a7e40fc8386547e9cadf7d01ca4685951605294
+SIZE (qemu/1.6.1/qemu-1.6.1.tar.bz2) = 12041317
diff --git a/emulators/qemu-devel/files/patch-hw-net-pcnet-pci.c b/emulators/qemu-devel/files/patch-hw-net-pcnet-pci.c
deleted file mode 100644
index c8be3f88778a..000000000000
--- a/emulators/qemu-devel/files/patch-hw-net-pcnet-pci.c
+++ /dev/null
@@ -1,48 +0,0 @@
-From: aurelien@aurel32.net (Aurelien Jarno)
-Subject: [Qemu-devel] [PATCH] pcnet-pci: mark I/O and MMIO as LITTLE_ENDIAN
-Date: Wed, 28 Aug 2013 14:17:39 +0200
-Message-ID: <1377692259-19959-1-git-send-email-aurelien@aurel32.net>
-To: qemu-devel@nongnu.org
-Cc: Paolo Bonzini <pbonzini@redhat.com>, qemu-stable@nongnu.org,
- Aurelien Jarno <aurelien@aurel32.net>
-
-Now that the memory subsystem is propagating the endianness correctly,
-the pcnet-pci device should have its I/O ports and MMIO memory marked
-as LITTLE_ENDIAN, as PCI devices are little endian.
-
-This makes the pcnet-pci NIC to work again on big endian MIPS Malta
-(default NIC).
-
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
----
- hw/net/pcnet-pci.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
-index a893165..865f2f0 100644
---- a/hw/net/pcnet-pci.c
-+++ b/hw/net/pcnet-pci.c
-@@ -134,7 +134,7 @@ static void pcnet_ioport_write(void *opaque, hwaddr addr,
- static const MemoryRegionOps pcnet_io_ops = {
- .read = pcnet_ioport_read,
- .write = pcnet_ioport_write,
-- .endianness = DEVICE_NATIVE_ENDIAN,
-+ .endianness = DEVICE_LITTLE_ENDIAN,
- };
-
- static void pcnet_mmio_writeb(void *opaque, hwaddr addr, uint32_t val)
-@@ -256,7 +256,7 @@ static const MemoryRegionOps pcnet_mmio_ops = {
- .read = { pcnet_mmio_readb, pcnet_mmio_readw, pcnet_mmio_readl },
- .write = { pcnet_mmio_writeb, pcnet_mmio_writew, pcnet_mmio_writel },
- },
-- .endianness = DEVICE_NATIVE_ENDIAN,
-+ .endianness = DEVICE_LITTLE_ENDIAN,
- };
-
- static void pci_physical_memory_write(void *dma_opaque, hwaddr addr,
---
-1.7.10.4
-
-
-