cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to qemu 0.7.2

Browse Source
This commit is contained in:
todd 2005-10-25 03:25:44 +00:00
parent e0b84cc257
commit 6662259396
6 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emulators/qemu/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2005/09/26 20:47:56 todd Exp $
# $OpenBSD: Makefile,v 1.5 2005/10/25 03:25:44 todd Exp $
ONLY_FOR_ARCHS= i386 macppc # no success building on other archs yet
COMMENT= "multi system emulator"
DISTNAME= qemu-0.7.1
PKGNAME= qemu-0.7.1p1
DISTNAME= qemu-0.7.2
PKGNAME= qemu-0.7.2
CATEGORIES= emulators
HOMEPAGE= http://fabrice.bellard.free.fr/qemu/

8
emulators/qemu/distinfo
View File

@ -1,4 +1,4 @@
MD5 (qemu-0.7.1.tar.gz) = b0c80d2c082049a5b8ccbc7f55fe165b
RMD160 (qemu-0.7.1.tar.gz) = a1e8a9e934f6a7e585aed5ba99cbf3208f24bc6a
SHA1 (qemu-0.7.1.tar.gz) = 88388d41ed232df4b9d76688814c64cb58b08c9d
SIZE (qemu-0.7.1.tar.gz) = 1338521
MD5 (qemu-0.7.2.tar.gz) = 7d69dd96edf7ae5298a9a7283a0e9fb8
RMD160 (qemu-0.7.2.tar.gz) = 1d2dcc8f43ff4b4b9aa045c64e38c9a10140b13e
SHA1 (qemu-0.7.2.tar.gz) = 4daeccb57448eacc444152f30b5d84dfcca89dfe
SIZE (qemu-0.7.2.tar.gz) = 1341993

8
emulators/qemu/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.2 2005/08/11 01:15:17 todd Exp $
--- Makefile.orig Wed Apr 27 15:52:05 2005
+++ Makefile Thu Apr 28 15:49:11 2005
$OpenBSD: patch-Makefile,v 1.3 2005/10/25 03:25:44 todd Exp $
--- Makefile.orig Sun Sep 4 12:11:31 2005
+++ Makefile Mon Oct 24 21:55:47 2005
@@ -15,7 +15,7 @@ DOCS=qemu-doc.html qemu-tech.html qemu.1
all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
@ -48,7 +48,7 @@ $OpenBSD: patch-Makefile,v 1.2 2005/08/11 01:15:17 todd Exp $
done
ifdef CONFIG_KQEMU
cd kqemu ; ./install.sh
@@ -86,7 +91,7 @@ TAGS:
@@ -91,7 +96,7 @@ cscope:
# documentation
%.html: %.texi

24
emulators/qemu/patches/patch-Makefile_target
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_target,v 1.3 2005/09/26 20:47:56 todd Exp $
--- Makefile.target.orig Sun Jul 24 13:52:08 2005
+++ Makefile.target Mon Sep 26 13:06:13 2005
$OpenBSD: patch-Makefile_target,v 1.4 2005/10/25 03:25:44 todd Exp $
--- Makefile.target.orig Sun Sep 4 12:11:31 2005
+++ Makefile.target Mon Oct 24 21:59:30 2005
@@ -17,7 +17,7 @@ ifdef CONFIG_USER_ONLY
VPATH+=:$(SRC_PATH)/linux-user
DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
@ -10,6 +10,24 @@ $OpenBSD: patch-Makefile_target,v 1.3 2005/09/26 20:47:56 todd Exp $
#CFLAGS+=-Werror
LDFLAGS=-g
LIBS=
@@ -61,7 +61,7 @@ ifeq ($(ARCH),i386)
CFLAGS+=-fomit-frame-pointer
OP_CFLAGS=$(CFLAGS) -mpreferred-stack-boundary=2
ifeq ($(HAVE_GCC3_OPTIONS),yes)
-OP_CFLAGS+= -falign-functions=0 -fno-gcse
+OP_CFLAGS+= -falign-functions=0 -fno-gcse -mfpmath=387
else
OP_CFLAGS+= -malign-functions=0
endif
@@ -83,7 +83,7 @@ endif
endif
ifeq ($(ARCH),x86_64)
-OP_CFLAGS=$(CFLAGS) -falign-functions=0
+OP_CFLAGS=$(CFLAGS) -falign-functions=0 -mfpmath=387
LDFLAGS+=-Wl,-T,$(SRC_PATH)/x86_64.ld
endif
@@ -138,6 +138,12 @@ OP_CFLAGS=$(CFLAGS) -fomit-frame-pointer
LDFLAGS+=-Wl,-T,m68k.ld
endif

35
emulators/qemu/patches/patch-exec_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-exec_c,v 1.1 2005/08/11 01:15:17 todd Exp $
--- exec.c.orig Sun Jul 24 13:52:08 2005
+++ exec.c Tue Aug 9 22:34:49 2005
@@ -2168,7 +2168,7 @@ void cpu_physical_memory_rw(target_phys_
$OpenBSD: patch-exec_c,v 1.2 2005/10/25 03:25:44 todd Exp $
--- exec.c.orig Sun Sep 4 12:11:31 2005
+++ exec.c Mon Oct 24 21:55:47 2005
@@ -2176,7 +2176,7 @@ void cpu_physical_memory_rw(target_phys_
target_phys_addr_t page;
unsigned long pd;
PhysPageDesc *p;
@ -10,30 +10,3 @@ $OpenBSD: patch-exec_c,v 1.1 2005/08/11 01:15:17 todd Exp $
while (len > 0) {
page = addr & TARGET_PAGE_MASK;
l = (page + TARGET_PAGE_SIZE) - addr;
@@ -2180,22 +2180,22 @@ void cpu_physical_memory_rw(target_phys_
} else {
pd = p->phys_offset;
}
-
+
if (is_write) {
if ((pd & ~TARGET_PAGE_MASK) != 0) {
io_index = (pd >> IO_MEM_SHIFT) & (IO_MEM_NB_ENTRIES - 1);
if (l >= 4 && ((addr & 3) == 0)) {
- /* 32 bit read access */
+ /* 32 bit write access */
val = ldl_p(buf);
io_mem_write[io_index][2](io_mem_opaque[io_index], addr, val);
l = 4;
} else if (l >= 2 && ((addr & 1) == 0)) {
- /* 16 bit read access */
+ /* 16 bit write access */
val = lduw_p(buf);
io_mem_write[io_index][1](io_mem_opaque[io_index], addr, val);
l = 2;
} else {
- /* 8 bit access */
+ /* 8 bit write access */
val = ldub_p(buf);
io_mem_write[io_index][0](io_mem_opaque[io_index], addr, val);
l = 1;

16
emulators/qemu/patches/patch-vl_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-vl_c,v 1.2 2005/08/11 01:15:17 todd Exp $
--- vl.c.orig Sun Jul 24 13:52:08 2005
+++ vl.c Wed Aug 10 17:49:15 2005
$OpenBSD: patch-vl_c,v 1.3 2005/10/25 03:25:44 todd Exp $
--- vl.c.orig Sun Sep 4 12:11:31 2005
+++ vl.c Mon Oct 24 21:55:47 2005
@@ -42,7 +42,7 @@
#include <dirent.h>
#ifdef _BSD
@ -18,7 +18,7 @@ $OpenBSD: patch-vl_c,v 1.2 2005/08/11 01:15:17 todd Exp $
int sb16_enabled = 1;
int adlib_enabled = 1;
int gus_enabled = 1;
@@ -1610,11 +1611,35 @@ static int tun_open(char *ifname, int if
@@ -1637,11 +1638,35 @@ static int tun_open(char *ifname, int if
char *dev;
struct stat s;
@ -54,7 +54,7 @@ $OpenBSD: patch-vl_c,v 1.2 2005/08/11 01:15:17 todd Exp $
fstat(fd, &s);
dev = devname(s.st_rdev, S_IFCHR);
@@ -2819,6 +2844,7 @@ void help(void)
@@ -2846,6 +2871,7 @@ void help(void)
#if defined(TARGET_PPC) || defined(TARGET_SPARC)
"-g WxH[xDEPTH] Set the initial graphical resolution and depth\n"
#endif
@ -62,7 +62,7 @@ $OpenBSD: patch-vl_c,v 1.2 2005/08/11 01:15:17 todd Exp $
"\n"
"Network options:\n"
"-nics n simulate 'n' network cards [default=1]\n"
@@ -2932,6 +2958,7 @@ enum {
@@ -2959,6 +2985,7 @@ enum {
QEMU_OPTION_L,
QEMU_OPTION_no_code_copy,
QEMU_OPTION_pci,
@ -70,7 +70,7 @@ $OpenBSD: patch-vl_c,v 1.2 2005/08/11 01:15:17 todd Exp $
QEMU_OPTION_isa,
QEMU_OPTION_prep,
QEMU_OPTION_k,
@@ -3020,6 +3047,7 @@ const QEMUOption qemu_options[] = {
@@ -3047,6 +3074,7 @@ const QEMUOption qemu_options[] = {
/* temporary options */
{ "pci", 0, QEMU_OPTION_pci },
@ -78,7 +78,7 @@ $OpenBSD: patch-vl_c,v 1.2 2005/08/11 01:15:17 todd Exp $
{ "cirrusvga", 0, QEMU_OPTION_cirrusvga },
{ NULL },
};
@@ -3425,6 +3453,9 @@ int main(int argc, char **argv)
@@ -3452,6 +3480,9 @@ int main(int argc, char **argv)
break;
case QEMU_OPTION_pci:
pci_enabled = 1;