[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6746] Support for DragonFly BSD (Hasso Tepper)
From: |
Blue Swirl |
Subject: |
[Qemu-devel] [6746] Support for DragonFly BSD (Hasso Tepper) |
Date: |
Sat, 07 Mar 2009 20:06:23 +0000 |
Revision: 6746
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6746
Author: blueswir1
Date: 2009-03-07 20:06:23 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Support for DragonFly BSD (Hasso Tepper)
Modified Paths:
--------------
trunk/audio/sdlaudio.c
trunk/block-raw-posix.c
trunk/block.c
trunk/configure
trunk/exec.c
trunk/net.c
trunk/osdep.c
trunk/qemu-char.c
trunk/savevm.c
trunk/usb-bsd.c
trunk/vl.c
Modified: trunk/audio/sdlaudio.c
===================================================================
--- trunk/audio/sdlaudio.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/audio/sdlaudio.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -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 <pthread.h>
#endif
#include <signal.h>
Modified: trunk/block-raw-posix.c
===================================================================
--- trunk/block-raw-posix.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/block-raw-posix.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -63,6 +63,11 @@
#include <sys/dkio.h>
#endif
+#ifdef __DragonFly__
+#include <sys/ioctl.h>
+#include <sys/diskslice.h>
+#endif
+
//#define DEBUG_FLOPPY
//#define DEBUG_BLOCK
@@ -762,6 +767,15 @@
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;
Modified: trunk/block.c
===================================================================
--- trunk/block.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/block.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -35,8 +35,10 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
+#ifndef __DragonFly__
#include <sys/disk.h>
#endif
+#endif
#define SECTOR_BITS 9
#define SECTOR_SIZE (1 << SECTOR_BITS)
Modified: trunk/configure
===================================================================
--- trunk/configure 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/configure 2009-03-07 20:06:23 UTC (rev 6746)
@@ -229,6 +229,15 @@
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"
Modified: trunk/exec.c
===================================================================
--- trunk/exec.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/exec.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -454,7 +454,7 @@
exit(1);
}
}
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
{
int flags;
void *addr = NULL;
Modified: trunk/net.c
===================================================================
--- trunk/net.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/net.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -54,7 +54,7 @@
#include <sys/select.h>
#ifdef _BSD
#include <sys/stat.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h>
#else
#include <util.h>
Modified: trunk/osdep.c
===================================================================
--- trunk/osdep.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/osdep.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -92,7 +92,7 @@
void *ptr;
/* no need (?) for a dummy file on OpenBSD/FreeBSD */
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
int map_anon = MAP_ANON;
#else
int map_anon = 0;
@@ -159,7 +159,7 @@
}
size = (size + 4095) & ~4095;
ftruncate(phys_ram_fd, phys_ram_size + size);
-#endif /* !(__OpenBSD__ || __FreeBSD__) */
+#endif /* !(__OpenBSD__ || __FreeBSD__ || __DragonFly__) */
ptr = mmap(NULL,
size,
PROT_WRITE | PROT_READ, map_anon | MAP_SHARED,
Modified: trunk/qemu-char.c
===================================================================
--- trunk/qemu-char.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/qemu-char.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -67,6 +67,10 @@
#include <libutil.h>
#include <dev/ppbus/ppi.h>
#include <dev/ppbus/ppbconf.h>
+#elif defined(__DragonFly__)
+#include <libutil.h>
+#include <dev/misc/ppi/ppi.h>
+#include <bus/ppbus/ppbconf.h>
#else
#include <util.h>
#endif
@@ -806,7 +810,7 @@
#endif
#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
- || defined(__NetBSD__) || defined(__OpenBSD__)
+ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
typedef struct {
int fd;
@@ -934,7 +938,7 @@
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
@@ -1280,7 +1284,7 @@
}
#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;
@@ -2153,13 +2157,13 @@
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
Modified: trunk/savevm.c
===================================================================
--- trunk/savevm.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/savevm.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -54,7 +54,7 @@
#include <sys/select.h>
#ifdef _BSD
#include <sys/stat.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h>
#else
#include <util.h>
Modified: trunk/usb-bsd.c
===================================================================
--- trunk/usb-bsd.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/usb-bsd.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -34,7 +34,11 @@
#undef USB_SPEED_LOW
#include <sys/ioctl.h>
+#ifndef __DragonFly__
#include <dev/usb/usb.h>
+#else
+#include <bus/usb/usb.h>
+#endif
#include <signal.h>
/* This value has maximum potential at 16.
@@ -68,7 +72,7 @@
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 @@
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 @@
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]);
Modified: trunk/vl.c
===================================================================
--- trunk/vl.c 2009-03-07 18:59:05 UTC (rev 6745)
+++ trunk/vl.c 2009-03-07 20:06:23 UTC (rev 6746)
@@ -55,7 +55,7 @@
#include <sys/select.h>
#ifdef _BSD
#include <sys/stat.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h>
#else
#include <util.h>
@@ -759,7 +759,8 @@
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__)
{
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
@@ -771,7 +772,8 @@
static int64_t get_clock(void)
{
-#if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
+#if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD_version >=
500000) \
+ || defined(__DragonFly__)
if (use_rt_clock) {
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6746] Support for DragonFly BSD (Hasso Tepper),
Blue Swirl <=