Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MjTFT-0004gg-9m for qemu-devel@nongnu.org; Fri, 04 Sep 2009 03:30:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MjTFR-0004gH-TF for qemu-devel@nongnu.org; Fri, 04 Sep 2009 03:30:18 -0400 Received: from [199.232.76.173] (port=51939 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MjTFR-0004gE-Ql for qemu-devel@nongnu.org; Fri, 04 Sep 2009 03:30:17 -0400 Received: from mx20.gnu.org ([199.232.41.8]:23648) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MjTFQ-0000RH-Sz for qemu-devel@nongnu.org; Fri, 04 Sep 2009 03:30:17 -0400 Received: from mx39.mail.ru ([94.100.176.53]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MjTFO-0000C7-0z for qemu-devel@nongnu.org; Fri, 04 Sep 2009 03:30:14 -0400 Received: from [77.246.231.10] (port=11765 helo=asau.local) by mx39.mail.ru with asmtp id 1MjTFK-000NZU-00 for qemu-devel@nongnu.org; Fri, 04 Sep 2009 11:30:10 +0400 From: Aleksej Saushev Date: Fri, 04 Sep 2009 11:30:09 +0400 Message-ID: <87ljkv416m.fsf@inbox.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] [patch] NetBSD and Dragonfly support List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Hello! Please, consider merging following differences against QEMU 0.10.6 to support NetBSD and Dragonfly. Collective work of pkgsrc project. $NetBSD: patch-av,v 1.3 2007/10/07 21:21:00 heinz Exp $ Provide trunc() implementation for NetBSD 3 and Dragonfly --- fpu/softfloat-native.c.orig 2007-02-06 00:01:54.000000000 +0100 +++ fpu/softfloat-native.c @@ -3,6 +3,20 @@ #include "softfloat.h" #include +#if defined(__DragonFly__) || defined(__NetBSD__) +# include +#endif + +#if (defined(__DragonFly__) && __DragonFly_version < 195000) || (defined(__NetBSD__) && __NetBSD_Version__ <= 399001700) +static double trunc( double val ) +{ + if (val > 0) + return floor(val); + else + return ceil(val); +} +#endif + void set_float_rounding_mode(int val STATUS_PARAM) { STATUS(float_rounding_mode) = val; $NetBSD: patch-da,v 1.1 2009/08/31 10:18:49 hasso Exp $ --- audio/sdlaudio.c.orig 2009-08-30 08:33:14 +0300 +++ audio/sdlaudio.c 2009-08-30 08:41:26 +0300 @@ -29,7 +29,7 @@ #ifndef _WIN32 #ifdef __sun__ #define _POSIX_PTHREAD_SEMANTICS 1 -#elif defined(__OpenBSD__) || defined(__FreeBSD__) +#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) #include #endif #include $NetBSD: patch-db,v 1.1 2009/08/31 10:18:49 hasso Exp $ --- block-raw-posix.c.orig 2009-07-17 03:56:22 +0300 +++ block-raw-posix.c 2009-08-30 15:51:48 +0300 @@ -63,6 +63,11 @@ #include #endif +#ifdef __DragonFly__ +#include +#include +#endif + //#define DEBUG_FLOPPY //#define DEBUG_BLOCK @@ -766,6 +771,15 @@ static int64_t raw_getlength(BlockDrive if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) { #ifdef DIOCGMEDIASIZE if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) +#elif defined(DIOCGPART) + { + struct partinfo pi; + if (ioctl(fd, DIOCGPART, &pi) == 0) + size = pi.media_size; + else + size = 0; + } + if (size == 0) #endif #ifdef CONFIG_COCOA size = LONG_LONG_MAX; $NetBSD: patch-dc,v 1.1 2009/08/31 10:18:49 hasso Exp $ --- block.c.orig 2009-07-17 03:56:22 +0300 +++ block.c 2009-08-30 15:53:21 +0300 @@ -35,8 +35,10 @@ #include #include #include +#ifndef __DragonFly__ #include #endif +#endif #define SECTOR_BITS 9 #define SECTOR_SIZE (1 << SECTOR_BITS) $NetBSD: patch-dd,v 1.1 2009/08/31 10:18:49 hasso Exp $ --- configure.orig 2009-07-17 03:56:22 +0300 +++ configure 2009-08-30 19:37:40 +0300 @@ -228,6 +228,15 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64 kqemu="yes" fi ;; +DragonFly) +bsd="yes" +audio_drv_list="oss" +audio_possible_drivers="oss sdl esd pa" +if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then + kqemu="yes" +fi +aio="no" +;; NetBSD) bsd="yes" audio_drv_list="oss" $NetBSD: patch-de,v 1.2 2009/08/31 14:30:50 tnn Exp $ --- exec.c.orig 2009-07-17 02:56:22.000000000 +0200 +++ exec.c @@ -454,7 +454,7 @@ static void code_gen_alloc(unsigned long exit(1); } } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) { int flags; void *addr = NULL; $NetBSD: patch-df,v 1.1 2009/08/31 10:18:49 hasso Exp $ --- net.c.orig 2009-08-30 08:33:13 +0300 +++ net.c 2009-08-30 15:58:08 +0300 @@ -59,7 +59,7 @@ #include #ifdef _BSD #include -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) #include #else #include $NetBSD: patch-dg,v 1.2 2009/08/31 14:34:07 tnn Exp $ --- osdep.c.orig 2009-07-17 02:56:24.000000000 +0200 +++ osdep.c @@ -90,7 +90,7 @@ static void *kqemu_vmalloc(size_t size) void *ptr; /* no need (?) for a dummy file on OpenBSD/FreeBSD */ -#if defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) int map_anon = MAP_ANON; #else int map_anon = 0; @@ -157,7 +157,7 @@ static void *kqemu_vmalloc(size_t size) } size = (size + 4095) & ~4095; ftruncate(phys_ram_fd, phys_ram_size + size); -#endif /* !(__OpenBSD__ || __FreeBSD__) */ +#endif /* !(__OpenBSD__ || __FreeBSD__ || __DragonFly__ || __NetBSD__) */ ptr = mmap(NULL, size, PROT_WRITE | PROT_READ, map_anon | MAP_SHARED, $NetBSD: patch-dh,v 1.1 2009/08/31 10:18:49 hasso Exp $ --- qemu-char.c.orig 2009-07-17 03:56:24 +0300 +++ qemu-char.c 2009-08-30 16:00:34 +0300 @@ -66,6 +66,10 @@ #include #include #include +#elif defined(__DragonFly__) +#include +#include +#include #else #include #endif @@ -798,7 +802,7 @@ void cfmakeraw (struct termios *termios_ #endif #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) + || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) typedef struct { int fd; @@ -928,7 +932,7 @@ static CharDriverState *qemu_chr_open_pt PtyCharDriver *s; struct termios tty; int slave_fd, len; -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__DragonFly__) char pty_name[PATH_MAX]; #define q_ptsname(x) pty_name #else @@ -1274,7 +1278,7 @@ static CharDriverState *qemu_chr_open_pp } #endif /* __linux__ */ -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__DragonFly__) static int pp_ioctl(CharDriverState *chr, int cmd, void *arg) { int fd = (int)chr->opaque; @@ -2162,13 +2166,13 @@ CharDriverState *qemu_chr_open(const cha if (strstart(filename, "/dev/parport", NULL)) { chr = qemu_chr_open_pp(filename); } else -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) if (strstart(filename, "/dev/ppi", NULL)) { chr = qemu_chr_open_pp(filename); } else #endif #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) + || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) if (strstart(filename, "/dev/", NULL)) { chr = qemu_chr_open_tty(filename); } else $NetBSD: patch-di,v 1.1 2009/08/31 10:18:49 hasso Exp $ --- savevm.c.orig 2009-08-30 08:33:14 +0300 +++ savevm.c 2009-08-30 16:01:20 +0300 @@ -63,7 +63,7 @@ #include #ifdef _BSD #include -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) #include #else #include $NetBSD: patch-dj,v 1.1 2009/08/31 10:18:49 hasso Exp $ --- usb-bsd.c.orig 2009-07-17 03:56:26 +0300 +++ usb-bsd.c 2009-08-30 16:01:57 +0300 @@ -34,7 +34,11 @@ #undef USB_SPEED_LOW #include +#ifndef __DragonFly__ #include +#else +#include +#endif #include /* This value has maximum potential at 16. @@ -68,7 +72,7 @@ static int ensure_ep_open(USBHostDevice ep = UE_GET_ADDR(ep); if (dev->ep_fd[ep] < 0) { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) snprintf(buf, sizeof(buf) - 1, "%s.%d", dev->devpath, ep); #else snprintf(buf, sizeof(buf) - 1, "%s.%02d", dev->devpath, ep); @@ -321,7 +325,7 @@ USBDevice *usb_host_device_open(const ch return NULL; } -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) snprintf(ctlpath, PATH_MAX, "/dev/%s", bus_info.udi_devnames[0]); #else snprintf(ctlpath, PATH_MAX, "/dev/%s.00", bus_info.udi_devnames[0]); @@ -411,7 +415,7 @@ static int usb_host_scan(void *opaque, U if (strncmp(bus_info.udi_devnames[0], "ugen", 4) != 0) continue; -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) snprintf(devbuf, sizeof(devbuf) - 1, "/dev/%s", bus_info.udi_devnames[0]); #else snprintf(devbuf, sizeof(devbuf) - 1, "/dev/%s.00", bus_info.udi_devnames[0]); $NetBSD: patch-dk,v 1.3 2009/08/31 14:49:21 tnn Exp $ --- vl.c.orig 2009-07-17 02:56:26.000000000 +0200 +++ vl.c @@ -74,7 +74,7 @@ #include #ifdef _BSD #include -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) #include #else #include @@ -755,7 +755,8 @@ static int use_rt_clock; static void init_get_clock(void) { use_rt_clock = 0; -#if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000) +#if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000) \ + || defined(__DragonFly__) || defined(__NetBSD__) { struct timespec ts; if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) { @@ -767,7 +768,8 @@ static void init_get_clock(void) static int64_t get_clock(void) { -#if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000) +#if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000) \ + || defined(__DragonFly__) || defined(__NetBSD__) if (use_rt_clock) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); $NetBSD: patch-dl,v 1.2 2009/08/31 13:07:04 asau Exp $ --- cpu-exec.c.orig 2009-07-17 04:56:22.000000000 +0400 +++ cpu-exec.c 2009-08-31 16:38:35.000000000 +0400 @@ -1156,6 +1156,18 @@ # define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.eip)) # define TRAP_sig(context) ((context)->uc_mcontext->es.trapno) # define ERROR_sig(context) ((context)->uc_mcontext->es.err) +#elif defined (__NetBSD__) +# include + +# define EIP_sig(context) ((context)->uc_mcontext.__gregs[_REG_EIP]) +# define TRAP_sig(context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO]) +# define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) +#elif defined (__FreeBSD__) || defined(__DragonFly__) +# include + +# define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.mc_eip)) +# define TRAP_sig(context) ((context)->uc_mcontext.mc_trapno) +# define ERROR_sig(context) ((context)->uc_mcontext.mc_err) #else # define EIP_sig(context) ((context)->uc_mcontext.gregs[REG_EIP]) # define TRAP_sig(context) ((context)->uc_mcontext.gregs[REG_TRAPNO]) @@ -1166,7 +1178,11 @@ void *puc) { siginfo_t *info = pinfo; +#if defined(__NetBSD__) || defined (__FreeBSD__) || defined(__DragonFly__) + ucontext_t *uc = puc; +#else struct ucontext *uc = puc; +#endif unsigned long pc; int trapno; $NetBSD: patch-dm,v 1.1 2009/08/31 10:18:49 hasso Exp $ --- exec-all.h.orig 2009-08-31 11:12:02 +0300 +++ exec-all.h 2009-08-31 11:12:15 +0300 @@ -35,7 +35,7 @@ typedef struct TranslationBlock TranslationBlock; /* XXX: make safe guess about sizes */ -#define MAX_OP_PER_INSTR 64 +#define MAX_OP_PER_INSTR 128 /* A Call op needs up to 6 + 2N parameters (N = number of arguments). */ #define MAX_OPC_PARAM 10 #define OPC_BUF_SIZE 512 -- CE3OH...