Commit 128ab2ff authored by blueswir1's avatar blueswir1
Browse files

Preliminary OpenBSD host support (based on OpenBSD patches by Todd T. Fries)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5012 c046a42c-6fe2-441c-8c8c-71466251a162
parent 72c7b06c
......@@ -58,6 +58,12 @@
#include <sys/disk.h>
#endif
#ifdef __OpenBSD__
#include <sys/ioctl.h>
#include <sys/disklabel.h>
#include <sys/dkio.h>
#endif
//#define DEBUG_FLOPPY
//#define DEBUG_BLOCK
......@@ -745,6 +751,26 @@ static int raw_truncate(BlockDriverState *bs, int64_t offset)
return 0;
}
#ifdef __OpenBSD__
static int64_t raw_getlength(BlockDriverState *bs)
{
BDRVRawState *s = bs->opaque;
int fd = s->fd;
struct stat st;
if (fstat(fd, &st))
return -1;
if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
struct disklabel dl;
if (ioctl(fd, DIOCGDINFO, &dl))
return -1;
return (uint64_t)dl.d_secsize *
dl.d_partitions[DISKPART(st.st_rdev)].p_size;
} else
return st.st_size;
}
#else /* !__OpenBSD__ */
static int64_t raw_getlength(BlockDriverState *bs)
{
BDRVRawState *s = bs->opaque;
......@@ -791,6 +817,7 @@ static int64_t raw_getlength(BlockDriverState *bs)
}
return size;
}
#endif
static int raw_create(const char *filename, int64_t total_size,
const char *backing_file, int flags)
......
......@@ -150,6 +150,7 @@ audio_possible_drivers="oss sdl esd"
;;
OpenBSD)
bsd="yes"
openbsd="yes"
audio_drv_list="oss"
audio_possible_drivers="oss sdl esd"
;;
......@@ -1086,6 +1087,11 @@ EOF
echo "#define HAVE_BYTESWAP_H 1" >> $config_h
fi
fi
if [ "$openbsd" = "yes" ] ; then
echo "#define ENOTSUP 4096" >> $config_h
fi
if test "$darwin" = "yes" ; then
echo "CONFIG_DARWIN=yes" >> $config_mak
echo "#define CONFIG_DARWIN 1" >> $config_h
......
......@@ -34,6 +34,10 @@
#include <termios.h>
#endif
#ifdef __OpenBSD__
#define resize_term resizeterm
#endif
#define FONT_HEIGHT 16
#define FONT_WIDTH 8
......
......@@ -32,6 +32,9 @@
host headers do not allow that. */
#include <stddef.h>
#ifdef __OpenBSD__
#include <sys/types.h>
#else
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
......@@ -61,6 +64,7 @@ typedef signed long int64_t;
typedef signed long long int64_t;
#endif
#endif
#endif
/* XXX: This may be wrong for 64-bit ILP32 hosts. */
typedef void * host_reg_t;
......
......@@ -15,7 +15,9 @@
* Solaris 10 with GCC4 does not need these macros as they
* are defined in <iso/math_c99.h> with a compiler directive
*/
#if defined(HOST_SOLARIS) && (( HOST_SOLARIS <= 9 ) || ((HOST_SOLARIS >= 10) && (__GNUC__ <= 4)))
#if defined(HOST_SOLARIS) && (( HOST_SOLARIS <= 9 ) || ((HOST_SOLARIS >= 10) \
&& (__GNUC__ <= 4))) \
|| defined(__OpenBSD__)
/*
* C99 7.12.3 classification macros
* and
......@@ -24,6 +26,9 @@
* ... do not work on Solaris 10 using GNU CC 3.4.x.
* Try to workaround the missing / broken C99 math macros.
*/
#if defined(__OpenBSD__)
#define unordered(x, y) (isnan(x) || isnan(y))
#endif
#define isnormal(x) (fpclass(x) >= FP_NZERO)
#define isgreater(x, y) ((!unordered(x, y)) && ((x) > (y)))
......@@ -84,6 +89,11 @@ typedef union {
| Software IEC/IEEE floating-point rounding mode.
*----------------------------------------------------------------------------*/
#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
#if defined(__OpenBSD__)
#define FE_RM FP_RM
#define FE_RP FP_RP
#define FE_RZ FP_RZ
#endif
enum {
float_round_nearest_even = FP_RN,
float_round_down = FP_RM,
......
......@@ -68,7 +68,14 @@ void qemu_vfree(void *ptr)
#if defined(USE_KQEMU)
#ifdef __OpenBSD__
#include <sys/param.h>
#include <sys/types.h>
#include <sys/mount.h>
#else
#include <sys/vfs.h>
#endif
#include <sys/mman.h>
#include <fcntl.h>
......@@ -76,9 +83,14 @@ static void *kqemu_vmalloc(size_t size)
{
static int phys_ram_fd = -1;
static int phys_ram_size = 0;
void *ptr;
#ifdef __OpenBSD__ /* no need (?) for a dummy file on OpenBSD */
int map_anon = MAP_ANON;
#else
int map_anon = 0;
const char *tmpdir;
char phys_ram_file[1024];
void *ptr;
#ifdef HOST_SOLARIS
struct statvfs stfs;
#else
......@@ -140,9 +152,10 @@ static void *kqemu_vmalloc(size_t size)
}
size = (size + 4095) & ~4095;
ftruncate(phys_ram_fd, phys_ram_size + size);
#endif /* !__OpenBSD__ */
ptr = mmap(NULL,
size,
PROT_WRITE | PROT_READ, MAP_SHARED,
PROT_WRITE | PROT_READ, map_anon | MAP_SHARED,
phys_ram_fd, phys_ram_size);
if (ptr == MAP_FAILED) {
fprintf(stderr, "Could not map physical memory\n");
......
......@@ -2,6 +2,10 @@
#define QEMU_OSDEP_H
#include <stdarg.h>
#ifdef __OpenBSD__
#include <sys/types.h>
#include <sys/signal.h>
#endif
#ifndef glue
#define xglue(x, y) x ## y
......
......@@ -61,9 +61,12 @@
#include <arpa/inet.h>
#ifdef _BSD
#include <sys/stat.h>
#ifndef __APPLE__
#if !defined(__APPLE__) && !defined(__OpenBSD__)
#include <libutil.h>
#endif
#ifdef __OpenBSD__
#include <net/if.h>
#endif
#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
#include <freebsd/stdlib.h>
#else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment