summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/qemu/Makefile5
-rw-r--r--emulators/qemu/PLIST4
-rw-r--r--emulators/qemu/distinfo23
-rw-r--r--emulators/qemu/patches/patch-configure19
-rw-r--r--emulators/qemu/patches/patch-default-configs_pci.mak8
-rw-r--r--emulators/qemu/patches/patch-hw_misc_ivshmem.c14
-rw-r--r--emulators/qemu/patches/patch-hw_ppc_mac__newworld.c12
-rw-r--r--emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c12
-rw-r--r--emulators/qemu/patches/patch-memory.c12
-rw-r--r--emulators/qemu/patches/patch-slirp_tcp__subr.c10
10 files changed, 62 insertions, 57 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 5f8f0dda9a7..eef7c1dca8c 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.148 2015/12/21 12:10:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.149 2016/05/15 01:25:15 ryoon Exp $
-DISTNAME= qemu-2.5.0
+DISTNAME= qemu-2.6.0
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
EXTRACT_SUFX= .tar.bz2
@@ -35,6 +35,7 @@ CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
CONFIGURE_ARGS+= --enable-curses
#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X
+CONFIGURE_ARGS+= --disable-opengl
CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
PKG_SYSCONFSUBDIR= qemu
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index a74116ad138..705718852fc 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2015/12/21 12:10:22 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.46 2016/05/15 01:25:15 ryoon Exp $
${PLIST.ivshmem}bin/ivshmem-client
${PLIST.ivshmem}bin/ivshmem-server
${PLIST.alpha}bin/qemu-alpha
@@ -128,11 +128,9 @@ share/qemu/pxe-ne2k_pci.rom
share/qemu/pxe-pcnet.rom
share/qemu/pxe-rtl8139.rom
share/qemu/pxe-virtio.rom
-share/qemu/q35-acpi-dsdt.aml
share/qemu/qemu-icon.bmp
share/qemu/qemu_logo_no_text.svg
share/qemu/s390-ccw.img
-share/qemu/s390-zipl.rom
share/qemu/sgabios.bin
share/qemu/slof.bin
share/qemu/spapr-rtas.bin
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 1930f7605fb..0feff506531 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.114 2016/03/24 15:21:10 khorben Exp $
+$NetBSD: distinfo,v 1.115 2016/05/15 01:25:15 ryoon Exp $
-SHA1 (qemu-2.5.0.tar.bz2) = ed6c02a267f9edf98058743f0f76a25743a0dfe7
-RMD160 (qemu-2.5.0.tar.bz2) = 51007a50ddbeae1ba2c986e0cb0b110efeae2dc9
-SHA512 (qemu-2.5.0.tar.bz2) = 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3
-Size (qemu-2.5.0.tar.bz2) = 25464996 bytes
+SHA1 (qemu-2.6.0.tar.bz2) = d558a11d681dd095b1d7cb03c5b723c9d3045020
+RMD160 (qemu-2.6.0.tar.bz2) = 97e41fab12ad15ba05e63229bf57a51a1564bd32
+SHA512 (qemu-2.6.0.tar.bz2) = 0d17075e52f7688cc05776ad7a76509d1f22ae8eda896fddb06c1fd6dea6da485422c8efb3ba118b054d9a413b7b02baba656a9131658dabdb71def50c92b215
+Size (qemu-2.6.0.tar.bz2) = 25755267 bytes
SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92
-SHA1 (patch-configure) = 668aff0a22a5800993645a4b40899e7694803ee6
-SHA1 (patch-default-configs_pci.mak) = 09567d0d56cdee3d72ae93c0609dee7ca749ef18
+SHA1 (patch-configure) = a24c31f005ee12ab56f19e3e8594b0a3bad955fc
+SHA1 (patch-default-configs_pci.mak) = 2162550a68de514c8fe9e255df88f8a0a07ee6c7
SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
+SHA1 (patch-hw_misc_ivshmem.c) = c1fdc8111286f2c760512189db4a854bfc6129d0
SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
-SHA1 (patch-hw_ppc_mac__newworld.c) = 9a0ec3ba0b6da2879fdaba6a7937fb16a02685f5
-SHA1 (patch-hw_ppc_mac__oldworld.c) = 46322c77c87be6d517c43466325c344db99cd463
-SHA1 (patch-memory.c) = f5193fb86a6fad5864477dafc4651d3d51147cc8
-SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820
+SHA1 (patch-hw_ppc_mac__newworld.c) = 5131bb6edf8b0acf6e7ed3b6bc7be962dc71eca6
+SHA1 (patch-hw_ppc_mac__oldworld.c) = b71667ab281dc23c9d971dc8754eeefc879bd1d7
+SHA1 (patch-memory.c) = 9f94de7799ef80931fb1de572e5603894f3fb328
+SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154
SHA1 (patch-tests_Makefile) = bd8997ea00eea05489335020ccae0e33dbcb84f9
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
index e711bddb01f..bf0263cd136 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.12 2016/03/24 15:21:10 khorben Exp $
+$NetBSD: patch-configure,v 1.13 2016/05/15 01:25:15 ryoon Exp $
Don't use gld on SunOS
add check for shm_open
avoid bad substitution
---- configure.orig 2015-12-16 22:04:48.000000000 +0000
+--- configure.orig 2016-05-11 15:56:07.000000000 +0000
+++ configure
-@@ -650,7 +650,6 @@ SunOS)
+@@ -624,7 +624,6 @@ SunOS)
solaris="yes"
make="${MAKE-gmake}"
install="${INSTALL-ginstall}"
@@ -56,7 +56,7 @@ avoid bad substitution
return clock_gettime(CLOCK_REALTIME, NULL);
}
EOF
-@@ -4568,7 +4593,9 @@ if test "$want_tools" = "yes" ; then
+@@ -4583,7 +4608,9 @@ if test "$want_tools" = "yes" ; then
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) $tools"
@@ -67,16 +67,7 @@ avoid bad substitution
fi
fi
if test "$softmmu" = yes ; then
-@@ -4758,7 +4785,7 @@ echo "GTK GL support $gtk_gl"
- echo "GNUTLS support $gnutls"
- echo "GNUTLS hash $gnutls_hash"
- echo "libgcrypt $gcrypt"
--echo "nettle $nettle ${nettle+($nettle_version)}"
-+echo "nettle $nettle ($nettle_version)"
- echo "libtasn1 $tasn1"
- echo "VTE support $vte"
- echo "curses support $curses"
-@@ -5049,6 +5076,9 @@ fi
+@@ -5074,6 +5101,9 @@ fi
if test "$fallocate_zero_range" = "yes" ; then
echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak
fi
diff --git a/emulators/qemu/patches/patch-default-configs_pci.mak b/emulators/qemu/patches/patch-default-configs_pci.mak
index 88e37d2e7f1..0ace043226f 100644
--- a/emulators/qemu/patches/patch-default-configs_pci.mak
+++ b/emulators/qemu/patches/patch-default-configs_pci.mak
@@ -1,11 +1,11 @@
-$NetBSD: patch-default-configs_pci.mak,v 1.1 2015/12/21 12:10:22 ryoon Exp $
+$NetBSD: patch-default-configs_pci.mak,v 1.2 2016/05/15 01:25:15 ryoon Exp $
---- default-configs/pci.mak.orig 2015-12-16 22:04:48.000000000 +0000
+--- default-configs/pci.mak.orig 2016-05-11 15:56:07.000000000 +0000
+++ default-configs/pci.mak
-@@ -35,5 +35,5 @@ CONFIG_SDHCI=y
+@@ -36,5 +36,5 @@ CONFIG_SDHCI=y
CONFIG_EDU=y
CONFIG_VGA=y
CONFIG_VGA_PCI=y
--CONFIG_IVSHMEM=$(CONFIG_POSIX)
+-CONFIG_IVSHMEM=$(CONFIG_EVENTFD)
+CONFIG_IVSHMEM=$(CONFIG_SHM_OPEN)
CONFIG_ROCKER=y
diff --git a/emulators/qemu/patches/patch-hw_misc_ivshmem.c b/emulators/qemu/patches/patch-hw_misc_ivshmem.c
new file mode 100644
index 00000000000..c1f54a557f3
--- /dev/null
+++ b/emulators/qemu/patches/patch-hw_misc_ivshmem.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-hw_misc_ivshmem.c,v 1.1 2016/05/15 01:25:15 ryoon Exp $
+
+--- hw/misc/ivshmem.c.orig 2016-05-11 15:56:09.000000000 +0000
++++ hw/misc/ivshmem.c
+@@ -567,7 +567,9 @@ static void process_msg_connect(IVShmemS
+ vector = peer->nb_eventfds++;
+
+ IVSHMEM_DPRINTF("eventfds[%d][%d] = %d\n", posn, vector, fd);
++#if defined(CONFIG_EVENTFD)
+ event_notifier_init_fd(&peer->eventfds[vector], fd);
++#endif
+ fcntl_setfl(fd, O_NONBLOCK); /* msix/irqfd poll non block */
+
+ if (posn == s->vm_id) {
diff --git a/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c b/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
index 69db887e3ea..d0e33a12920 100644
--- a/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
+++ b/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
+$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.3 2016/05/15 01:25:15 ryoon Exp $
Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
---- hw/ppc/mac_newworld.c.orig 2013-11-27 22:15:55.000000000 +0000
+--- hw/ppc/mac_newworld.c.orig 2016-05-11 15:56:09.000000000 +0000
+++ hw/ppc/mac_newworld.c
-@@ -125,7 +125,7 @@ static uint64_t translate_kernel_address
+@@ -131,7 +131,7 @@ static uint64_t translate_kernel_address
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
}
@@ -13,7 +13,7 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
{
return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
}
-@@ -252,7 +252,7 @@ static void ppc_core99_init(QEMUMachineI
+@@ -262,7 +262,7 @@ static void ppc_core99_init(MachineState
}
/* load initrd */
if (initrd_filename) {
@@ -22,8 +22,8 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
initrd_size = load_image_targphys(initrd_filename, initrd_base,
ram_size - initrd_base);
if (initrd_size < 0) {
-@@ -260,11 +260,11 @@ static void ppc_core99_init(QEMUMachineI
- initrd_filename);
+@@ -270,11 +270,11 @@ static void ppc_core99_init(MachineState
+ initrd_filename);
exit(1);
}
- cmdline_base = round_page(initrd_base + initrd_size);
diff --git a/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c b/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
index f8aab728723..68ee452fa2d 100644
--- a/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
+++ b/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-hw_ppc_mac__oldworld.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
+$NetBSD: patch-hw_ppc_mac__oldworld.c,v 1.3 2016/05/15 01:25:15 ryoon Exp $
Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
---- hw/ppc/mac_oldworld.c.orig 2013-11-27 22:15:55.000000000 +0000
+--- hw/ppc/mac_oldworld.c.orig 2016-05-11 15:56:09.000000000 +0000
+++ hw/ppc/mac_oldworld.c
-@@ -59,7 +59,7 @@ static uint64_t translate_kernel_address
+@@ -64,7 +64,7 @@ static uint64_t translate_kernel_address
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
}
@@ -13,7 +13,7 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
{
return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
}
-@@ -181,7 +181,7 @@ static void ppc_heathrow_init(QEMUMachin
+@@ -188,7 +188,7 @@ static void ppc_heathrow_init(MachineSta
}
/* load initrd */
if (initrd_filename) {
@@ -22,8 +22,8 @@ Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
initrd_size = load_image_targphys(initrd_filename, initrd_base,
ram_size - initrd_base);
if (initrd_size < 0) {
-@@ -189,11 +189,11 @@ static void ppc_heathrow_init(QEMUMachin
- initrd_filename);
+@@ -196,11 +196,11 @@ static void ppc_heathrow_init(MachineSta
+ initrd_filename);
exit(1);
}
- cmdline_base = round_page(initrd_base + initrd_size);
diff --git a/emulators/qemu/patches/patch-memory.c b/emulators/qemu/patches/patch-memory.c
index 9f9671af278..1d4988170f5 100644
--- a/emulators/qemu/patches/patch-memory.c
+++ b/emulators/qemu/patches/patch-memory.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-memory.c,v 1.9 2015/08/12 06:55:59 ryoon Exp $
+$NetBSD: patch-memory.c,v 1.10 2016/05/15 01:25:15 ryoon Exp $
---- memory.c.orig 2015-08-11 19:11:09.000000000 +0000
+--- memory.c.orig 2016-05-11 15:56:12.000000000 +0000
+++ memory.c
-@@ -396,7 +396,7 @@ static MemTxResult memory_region_read_a
+@@ -431,7 +431,7 @@ static MemTxResult memory_region_read_a
{
uint64_t tmp;
- tmp = mr->ops->read(mr->opaque, addr, size);
+ tmp = (mr->ops->read)(mr->opaque, addr, size);
- trace_memory_region_ops_read(mr, addr, tmp, size);
- *value |= (tmp & mask) << shift;
- return MEMTX_OK;
+ if (mr->subpage) {
+ trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, size);
+ } else if (mr == &io_mem_notdirty) {
diff --git a/emulators/qemu/patches/patch-slirp_tcp__subr.c b/emulators/qemu/patches/patch-slirp_tcp__subr.c
index fd650974c70..10d714fc161 100644
--- a/emulators/qemu/patches/patch-slirp_tcp__subr.c
+++ b/emulators/qemu/patches/patch-slirp_tcp__subr.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-slirp_tcp__subr.c,v 1.6 2014/01/15 18:26:20 wiz Exp $
+$NetBSD: patch-slirp_tcp__subr.c,v 1.7 2016/05/15 01:25:15 ryoon Exp $
---- slirp/tcp_subr.c.orig 2013-11-27 22:15:55.000000000 +0000
+--- slirp/tcp_subr.c.orig 2016-05-11 15:56:13.000000000 +0000
+++ slirp/tcp_subr.c
-@@ -340,6 +340,8 @@ int tcp_fconnect(struct socket *so)
+@@ -407,6 +407,8 @@ int tcp_fconnect(struct socket *so, unsi
socket_set_fast_reuse(s);
opt = 1;
qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt));
+ opt = 1;
+ qemu_setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
- addr.sin_family = AF_INET;
- if ((so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
+ addr = so->fhost.ss;
+ DEBUG_CALL(" connect()ing")
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 08:17:24 +0000