Support for DragonFly BSD
PATCH 1/1 Support for DragonFly BSD
The attached patch against trunk allows qemu to compile and work on DragonFly BSD platform (BSD usermode emulation targets disabled though). The patch is mostly straightforward, only few comments.
* Missing "monitor.h" include is a recent regression in trunk and with this snippet removed the patch applies cleanly to the 0.10.0.
* Using /usr/bin/env should be generally a good idea. Most systems besides Linux doesn't have perl in /usr/bin.
regards,
Signature · 1 line
Hasso Tepper
savevm.c +1 -1
@@ -63,7 +63,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>
usb-bsd.c +8 -3
@@ -27,6 +27,7 @@#include "qemu-common.h" #include "console.h" #include "hw/usb.h" +#include "monitor.h" /* usb.h declares these */ #undef USB_SPEED_HIGH
@@ -34,7 +35,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 +73,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 +326,7 @@ USBDevice *usb_host_device_open(const chreturn 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 +416,7 @@ static int usb_host_scan(void *opaque, Uif (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 ]);
osdep.c +2 -2
@@ -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__)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__) */ ptr = mmap(NULL, size, PROT_WRITE | PROT_READ, map_anon | MAP_SHARED,
vl.c +5 -3
@@ -75,7 +75,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>
@@ -756,7 +756,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__) {struct timespec ts;if (clock_gettime (CLOCK_MONOTONIC , &ts) ==0 ) {
@@ -768,7 +769,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__)if (use_rt_clock) {struct timespec ts;clock_gettime (CLOCK_MONOTONIC , &ts);
block-raw-posix.c +14 -0
@@ -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 @@ static int64_t raw_getlength(BlockDriveif (!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 ;
net.c +1 -1
@@ -59,7 +59,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>
sdlaudio.c +1 -1
@@ -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>
qemu-char.c +9 -5
@@ -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 @@ 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;
@@ -934,7 +938,7 @@ static CharDriverState *qemu_chr_open_ptPtyCharDriver *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 @@ 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;
@@ -2153,13 +2157,13 @@ CharDriverState *qemu_chr_open(const chaif (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
exec.c +1 -1
@@ -454,7 +454,7 @@ static void code_gen_alloc(unsigned long exit(1); } } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) {int flags;void *addr =NULL ;
texi2pod.pl +1 -1
@@ -1,4 +1,4 @@ -#! /usr/bin/perl -w +#! /usr/bin/env perl -w # Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
block.c +2 -0
@@ -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)
configure +9 -0
@@ -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"
Quoted 9 lines · Hasso Tepper
The attached patch against trunk allows qemu to compile and work on DragonFly BSD platform (BSD usermode emulation targets disabled though). The patch is mostly straightforward, only few comments.
* Missing "
monitor.h" include is a recent regression in trunk and with this snippet removed the patch applies cleanly to the 0.10.0.* Using
/usr/bin/envshould be generally a good idea. Most systems besides Linux doesn't have perl in/usr/bin.
Neither is any good actually - NFS unfriendly. Makefile should be changed instead to run perl on texi2pod.
Signature · 1 line
mailto:[email protected]
Quoted 3 lines
* Using
/usr/bin/envshould be generally a good idea. Most systems besides
Linux doesn't have perl in/usr/bin.
While it's an interesting idea in princible, I found it not working any better than hardcoding perl or python paths itself... For example, BeOS has no /usr at all, and has env in /bin, which makes it useless for really cross-platform use... (it's beyond me why env is not in /bin/ elsewhere anyway.)
Just my 2c.
François.
Quoted 6 lines · Hasso Tepper
The attached patch against trunk allows qemu to compile and work on
DragonFly BSD platform (BSD usermode emulation targets disabled though). The patch is mostly straightforward, only few comments.* Missing "
monitor.h" include is a recent regression in trunk and with this snippet removed the patch applies cleanly to the 0.10.0.
We can remove the console.h include as well. I'll commit my fix for this next.
Quoted 2 lines
* Using
/usr/bin/envshould be generally a good idea. Most systems besides Linux doesn't have perl in/usr/bin.
Based on the discussions, I think this part should not be applied.
Other parts look OK.
Quoted 9 lines · Hasso Tepper
The attached patch against trunk allows qemu to compile and work on
DragonFly BSD platform (BSD usermode emulation targets disabled though). The patch is mostly straightforward, only few comments.* Missing "
monitor.h" include is a recent regression in trunk and with this snippet removed the patch applies cleanly to the 0.10.0.* Using
/usr/bin/envshould be generally a good idea. Most systems besides Linux doesn't have perl in/usr/bin.
Applied except for the env part, thanks.
Maybe configure should determine the location of Perl and generate some PERL_PATH stuff in config.mak.
Quoted 1 line · Blue Swirl
Applied except for the env part, thanks.
To the 0.10.0 branch as well, please? :)
Quoted 2 lines
Maybe configure should determine the location of Perl and generate some
PERL_PATHstuff in config.mak.
Yeah, probably the best way. I only wonder what's the portable way to determine the location of perl.
regards,
Signature · 1 line
Hasso Tepper
Am 08.03.2009 um 16:11 schrieb Hasso Tepper:
Quoted 6 lines
Quoted 2 lines · Blue Swirl
Maybe configure should determine the location of Perl and generate some
PERL_PATHstuff in config.mak.Yeah, probably the best way. I only wonder what's the portable way to determine the location of perl.
Some sequence like this?
-perl=/my/perl
$PERL/usr/bin/env perlwhich perl/usr/bin/perl
Andreas
Quoted 14 lines · Andreas Färber
Am 08.03.2009 um 16:11 schrieb Hasso Tepper:
Quoted 9 lines
Quoted 3 lines · Blue Swirl
Maybe configure should determine the location of Perl and generate some
PERL_PATHstuff in config.mak.Yeah, probably the best way. I only wonder what's the portable way to determine the location of perl.
Quoted 7 lines
Some sequence like this?
-perl=/my/perl
$PERL
/usr/bin/envperl
which perl
/usr/bin/perl
How about this patch instead? Perl should be in $PATH. If not, PEBKAC.
Makefile +3 -3
@@ -292,15 +292,15 @@ texi2dvi $< qemu.1: qemu-doc.texi - $(SRC_PATH)/texi2pod.pl $< qemu.pod + perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu.pod pod2man --section=1 --center=" " --release=" " qemu.pod > $@ qemu-img.1: qemu-img.texi - $(SRC_PATH)/texi2pod.pl $< qemu-img.pod + perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-img.pod pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@ qemu-nbd.8: qemu-nbd.texi - $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod + perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@ info: qemu-doc.info qemu-tech.info
Quoted 1 line · Blue Swirl
How about this patch instead? Perl should be in $PATH. If not, PEBKAC.
I agree.
Signature · 1 line
Hasso Tepper
Quoted 17 lines · Blue Swirl
Quoted 16 lines · Andreas FЪЪrber
Am 08.03.2009 um 16:11 schrieb Hasso Tepper:
Quoted 9 lines
Quoted 3 lines · Blue Swirl
Maybe configure should determine the location of Perl and generate some
PERL_PATHstuff in config.mak.Yeah, probably the best way. I only wonder what's the portable way to determine the location of perl.
Some sequence like this?
Quoted 7 lines
Quoted 5 lines
-perl=/my/perl
$PERL
/usr/bin/envperl
which perl
/usr/bin/perlHow about this patch instead? Perl should be in $PATH. If not, PEBKAC.
Looks good.
Signature · 1 line
mailto:[email protected]