Here is an update to QEMU 1.4.0. Comments? OK?
Index: Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.99 diff -u -p -r1.99 Makefile --- Makefile 2 Feb 2013 23:51:45 -0000 1.99 +++ Makefile 16 Feb 2013 19:05:07 -0000 @@ -4,8 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc COMMENT= multi system emulator -DISTNAME= qemu-1.3.1 -REVISION= 0 +DISTNAME= qemu-1.4.0 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ EXTRACT_SUFX= .tar.bz2 @@ -20,7 +19,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= GL SDL X11 c curl glib-2.0 gthread-2.0 jpeg m ncurses \ +WANTLIB= GL SDL X11 c curl glib-2.0 gnutls gthread-2.0 jpeg m ncurses \ pixman-1 png pthread pthread-stubs util z MODULES= devel/gettext \ @@ -30,7 +29,8 @@ LIB_DEPENDS= devel/glib2 \ devel/sdl \ graphics/jpeg \ graphics/png \ - net/curl + net/curl \ + security/gnutls MODPY_RUNDEP= No @@ -66,7 +66,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-uuid \ --disable-usb-redir \ --disable-vnc-sasl \ - --disable-vnc-tls \ --with-coroutine=sigaltstack FLAVORS= debug Index: distinfo =================================================================== RCS file: /home/cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.25 diff -u -p -r1.25 distinfo --- distinfo 2 Feb 2013 11:30:34 -0000 1.25 +++ distinfo 16 Feb 2013 19:05:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu-1.3.1.tar.bz2) = N3Ln7wybQXgZXtz5DnEfEroSP0Zfzwn7Q7Vr2srKDq8= -SIZE (qemu-1.3.1.tar.bz2) = 10283677 +SHA256 (qemu-1.4.0.tar.bz2) = BmKX7XdAj7dYiInCcahc88JZrVXJOTFZiOYGLXcI7ag= +SIZE (qemu-1.4.0.tar.bz2) = 10419510 Index: patches/patch-cache-utils_c =================================================================== RCS file: patches/patch-cache-utils_c diff -N patches/patch-cache-utils_c --- patches/patch-cache-utils_c 25 May 2011 07:43:48 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-cache-utils_c,v 1.4 2011/05/25 07:43:48 sthen Exp $ ---- cache-utils.c.orig Mon May 23 20:11:43 2011 -+++ cache-utils.c Mon May 23 20:16:02 2011 -@@ -55,9 +55,16 @@ static void ppc_init_cacheline_sizes(void) - qemu_cache_conf.icache_bsize = cacheline; - } - } --#endif - --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#elif defined(__OpenBSD__) -+ -+static void ppc_init_cacheline_sizes(void) -+{ -+ qemu_cache_conf.dcache_bsize = 32; -+ qemu_cache_conf.icache_bsize = 32; -+} -+ -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include <errno.h> - #include <stdio.h> - #include <stdlib.h> Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v retrieving revision 1.29 diff -u -p -r1.29 patch-configure --- patches/patch-configure 2 Feb 2013 23:51:45 -0000 1.29 +++ patches/patch-configure 2 Feb 2013 23:53:20 -0000 @@ -1,48 +1,12 @@ $OpenBSD: patch-configure,v 1.29 2013/02/02 23:51:45 brad Exp $ - -Build option ROM .S files with separate preprocessor and -assembler steps because the C compiler could be unsuitable. - ---- configure.orig Mon Jan 28 16:05:15 2013 -+++ configure Sat Feb 2 12:46:09 2013 -@@ -252,6 +252,8 @@ done +--- configure.orig Fri Feb 1 20:21:48 2013 ++++ configure Sat Feb 2 07:47:01 2013 +@@ -3158,8 +3158,6 @@ fi + if test "$gcov" = "yes" ; then + CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" + LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" +-elif test "$debug" = "no" ; then +- CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS" + fi - cc="${CC-${cross_prefix}gcc}" - ar="${AR-${cross_prefix}ar}" -+as="${AS-${cross_prefix}as}" -+cpp="${CPP-$cc -E}" - objcopy="${OBJCOPY-${cross_prefix}objcopy}" - ld="${LD-${cross_prefix}ld}" - libtool="${LIBTOOL-${cross_prefix}libtool}" -@@ -3066,10 +3068,6 @@ fi - # End of CC checks - # After here, no more $cc or $ld runs --if test "$debug" = "no" ; then -- CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS" --fi -- - # Disable zero malloc errors for official releases unless explicitly told to - # enable/disable - if test -z "$zero_malloc" ; then -@@ -3652,6 +3650,8 @@ echo "CC_I386=$cc_i386" >> $config_host_mak - echo "HOST_CC=$host_cc" >> $config_host_mak - echo "OBJCC=$objcc" >> $config_host_mak - echo "AR=$ar" >> $config_host_mak -+echo "AS=$as" >> $config_host_mak -+echo "CPP=$cpp" >> $config_host_mak - echo "OBJCOPY=$objcopy" >> $config_host_mak - echo "LD=$ld" >> $config_host_mak - echo "WINDRES=$windres" >> $config_host_mak -@@ -4209,9 +4209,10 @@ for rom in seabios vgabios ; do - config_mak=roms/$rom/config.mak - echo "# Automatically generated by configure - do not modify" > $config_mak - echo "SRC_PATH=$source_path/roms/$rom" >> $config_mak -+ echo "AS=$as" >> $config_mak - echo "CC=$cc" >> $config_mak - echo "BCC=bcc" >> $config_mak -- echo "CPP=${cross_prefix}cpp" >> $config_mak -+ echo "CPP=$cpp" >> $config_mak - echo "OBJCOPY=objcopy" >> $config_mak - echo "IASL=iasl" >> $config_mak - echo "LD=$ld" >> $config_mak Index: patches/patch-hw_pxa2xx_c =================================================================== RCS file: patches/patch-hw_pxa2xx_c diff -N patches/patch-hw_pxa2xx_c --- patches/patch-hw_pxa2xx_c 2 Feb 2013 23:51:45 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ -$OpenBSD: patch-hw_pxa2xx_c,v 1.1 2013/02/02 23:51:45 brad Exp $ - -When the pxa2xx performance counter related cp14 registers were converted -from a switch-statement implementation to the new table driven cpregs -format in commit dc2a9045c, the crn and crm values for all these -registers were accidentally transposed. - ---- hw/pxa2xx.c.orig Sat Feb 2 10:36:23 2013 -+++ hw/pxa2xx.c Sat Feb 2 10:40:33 2013 -@@ -343,23 +343,23 @@ static int pxa2xx_cpccnt_read(CPUARMState *env, const - } - - static const ARMCPRegInfo pxa_cp_reginfo[] = { -- /* cp14 crn==1: perf registers */ -- { .name = "CPPMNC", .cp = 14, .crn = 1, .crm = 0, .opc1 = 0, .opc2 = 0, -+ /* cp14 crm==1: perf registers */ -+ { .name = "CPPMNC", .cp = 14, .crn = 0, .crm = 1, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, - .readfn = pxa2xx_cppmnc_read, .writefn = pxa2xx_cppmnc_write }, - { .name = "CPCCNT", .cp = 14, .crn = 1, .crm = 1, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, - .readfn = pxa2xx_cpccnt_read, .writefn = arm_cp_write_ignore }, -- { .name = "CPINTEN", .cp = 14, .crn = 1, .crm = 4, .opc1 = 0, .opc2 = 0, -+ { .name = "CPINTEN", .cp = 14, .crn = 4, .crm = 1, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, -- { .name = "CPFLAG", .cp = 14, .crn = 1, .crm = 5, .opc1 = 0, .opc2 = 0, -+ { .name = "CPFLAG", .cp = 14, .crn = 5, .crm = 1, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, -- { .name = "CPEVTSEL", .cp = 14, .crn = 1, .crm = 8, .opc1 = 0, .opc2 = 0, -+ { .name = "CPEVTSEL", .cp = 14, .crn = 8, .crm = 1, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, -- /* cp14 crn==2: performance count registers */ -- { .name = "CPPMN0", .cp = 14, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 0, -+ /* cp14 crm==2: performance count registers */ -+ { .name = "CPPMN0", .cp = 14, .crn = 0, .crm = 2, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, -- { .name = "CPPMN1", .cp = 14, .crn = 2, .crm = 1, .opc1 = 0, .opc2 = 0, -+ { .name = "CPPMN1", .cp = 14, .crn = 1, .crm = 2, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, - { .name = "CPPMN2", .cp = 14, .crn = 2, .crm = 2, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, Index: patches/patch-rules_mak =================================================================== RCS file: patches/patch-rules_mak diff -N patches/patch-rules_mak --- patches/patch-rules_mak 2 Feb 2013 23:51:45 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-rules_mak,v 1.3 2013/02/02 23:51:45 brad Exp $ - -Build option ROM .S files with separate preprocessor and -assembler steps because the C compiler could be unsuitable. - ---- rules.mak.orig Sat Feb 2 12:44:07 2013 -+++ rules.mak Sat Feb 2 12:44:47 2013 -@@ -25,8 +25,11 @@ else - $(call quiet-command,$(LIBTOOL) --mode=compile --quiet --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@") - endif - --%.o: %.S -- $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@") -+%.asm: %.S -+ $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -o $@ $<," CPP $(TARGET_DIR)$@") -+ -+%.o: %.asm -+ $(call quiet-command,$(AS) $(ASFLAGS) -o $@ $<," AS $(TARGET_DIR)$@") - - %.o: %.m - $(call quiet-command,$(OBJCC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@") Index: patches/patch-util_cache-utils_c =================================================================== RCS file: patches/patch-util_cache-utils_c diff -N patches/patch-util_cache-utils_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-util_cache-utils_c 2 Feb 2013 12:50:08 -0000 @@ -0,0 +1,22 @@ +$OpenBSD$ +--- util/cache-utils.c.orig Sat Feb 2 07:47:18 2013 ++++ util/cache-utils.c Sat Feb 2 07:49:46 2013 +@@ -55,9 +55,16 @@ static void ppc_init_cacheline_sizes(void) + qemu_cache_conf.icache_bsize = cacheline; + } + } +-#endif + +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#elif defined(__OpenBSD__) ++ ++static void ppc_init_cacheline_sizes(void) ++{ ++ qemu_cache_conf.dcache_bsize = 32; ++ qemu_cache_conf.icache_bsize = 32; ++} ++ ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #include <errno.h> + #include <stdio.h> + #include <stdlib.h> Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v retrieving revision 1.24 diff -u -p -r1.24 PLIST --- pkg/PLIST 2 Feb 2013 11:30:34 -0000 1.24 +++ pkg/PLIST 2 Feb 2013 14:29:57 -0000 @@ -54,6 +54,7 @@ share/examples/qemu/target-x86_64.conf @sample ${SYSCONFDIR}/qemu/ @sample ${SYSCONFDIR}/qemu/target-x86_64.conf share/qemu/ +share/qemu/acpi-dsdt.aml share/qemu/bamboo.dtb share/qemu/bios.bin share/qemu/keymaps/ @@ -109,6 +110,7 @@ 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/s390-zipl.rom share/qemu/sgabios.bin -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
