Commit 71e72a19bafda97c9e97b089499fdc050e96a631
Committed by
Anthony Liguori
1 parent
43da3c08
rename HOST_BSD to CONFIG_BSD
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing
12 changed files
with
22 additions
and
22 deletions
block.c
... | ... | @@ -22,7 +22,7 @@ |
22 | 22 | * THE SOFTWARE. |
23 | 23 | */ |
24 | 24 | #include "config-host.h" |
25 | -#ifdef HOST_BSD | |
25 | +#ifdef CONFIG_BSD | |
26 | 26 | /* include native header before sys-queue.h */ |
27 | 27 | #include <sys/queue.h> |
28 | 28 | #endif |
... | ... | @@ -32,7 +32,7 @@ |
32 | 32 | #include "block_int.h" |
33 | 33 | #include "module.h" |
34 | 34 | |
35 | -#ifdef HOST_BSD | |
35 | +#ifdef CONFIG_BSD | |
36 | 36 | #include <sys/types.h> |
37 | 37 | #include <sys/stat.h> |
38 | 38 | #include <sys/ioctl.h> | ... | ... |
block/raw-posix.c
... | ... | @@ -779,7 +779,7 @@ static int64_t raw_getlength(BlockDriverState *bs) |
779 | 779 | BDRVRawState *s = bs->opaque; |
780 | 780 | int fd = s->fd; |
781 | 781 | int64_t size; |
782 | -#ifdef HOST_BSD | |
782 | +#ifdef CONFIG_BSD | |
783 | 783 | struct stat sb; |
784 | 784 | #ifdef __FreeBSD__ |
785 | 785 | int reopened = 0; |
... | ... | @@ -795,7 +795,7 @@ static int64_t raw_getlength(BlockDriverState *bs) |
795 | 795 | if (ret < 0) |
796 | 796 | return ret; |
797 | 797 | |
798 | -#ifdef HOST_BSD | |
798 | +#ifdef CONFIG_BSD | |
799 | 799 | #ifdef __FreeBSD__ |
800 | 800 | again: |
801 | 801 | #endif | ... | ... |
configure
... | ... | @@ -1747,7 +1747,7 @@ fi |
1747 | 1747 | # XXX: suppress that |
1748 | 1748 | if [ "$bsd" = "yes" ] ; then |
1749 | 1749 | echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_host_h |
1750 | - echo "#define HOST_BSD 1" >> $config_host_h | |
1750 | + echo "#define CONFIG_BSD 1" >> $config_host_h | |
1751 | 1751 | fi |
1752 | 1752 | |
1753 | 1753 | echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_host_h | ... | ... |
dyngen-exec.h
fpu/softfloat-native.c
... | ... | @@ -9,7 +9,7 @@ |
9 | 9 | void set_float_rounding_mode(int val STATUS_PARAM) |
10 | 10 | { |
11 | 11 | STATUS(float_rounding_mode) = val; |
12 | -#if defined(HOST_BSD) && !defined(__APPLE__) || \ | |
12 | +#if defined(CONFIG_BSD) && !defined(__APPLE__) || \ | |
13 | 13 | (defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10) |
14 | 14 | fpsetround(val); |
15 | 15 | #elif defined(__arm__) |
... | ... | @@ -26,7 +26,7 @@ void set_floatx80_rounding_precision(int val STATUS_PARAM) |
26 | 26 | } |
27 | 27 | #endif |
28 | 28 | |
29 | -#if defined(HOST_BSD) || \ | |
29 | +#if defined(CONFIG_BSD) || \ | |
30 | 30 | (defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10) |
31 | 31 | #define lrint(d) ((int32_t)rint(d)) |
32 | 32 | #define llrint(d) ((int64_t)rint(d)) | ... | ... |
fpu/softfloat-native.h
1 | 1 | /* Native implementation of soft float functions */ |
2 | 2 | #include <math.h> |
3 | 3 | |
4 | -#if (defined(HOST_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) | |
4 | +#if (defined(CONFIG_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) | |
5 | 5 | #include <ieeefp.h> |
6 | 6 | #define fabsf(f) ((float)fabs(f)) |
7 | 7 | #else |
... | ... | @@ -112,7 +112,7 @@ typedef union { |
112 | 112 | /*---------------------------------------------------------------------------- |
113 | 113 | | Software IEC/IEEE floating-point rounding mode. |
114 | 114 | *----------------------------------------------------------------------------*/ |
115 | -#if (defined(HOST_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) | |
115 | +#if (defined(CONFIG_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) | |
116 | 116 | #if defined(__OpenBSD__) |
117 | 117 | #define FE_RM FP_RM |
118 | 118 | #define FE_RP FP_RP | ... | ... |
fpu/softfloat.h
... | ... | @@ -90,7 +90,7 @@ typedef int64_t sbits64; |
90 | 90 | #define FLOAT128 |
91 | 91 | #else |
92 | 92 | /* native float support */ |
93 | -#if (defined(__i386__) || defined(__x86_64__)) && !defined(HOST_BSD) | |
93 | +#if (defined(__i386__) || defined(__x86_64__)) && !defined(CONFIG_BSD) | |
94 | 94 | #define FLOATX80 |
95 | 95 | #endif |
96 | 96 | #endif /* !CONFIG_SOFTFLOAT */ | ... | ... |
net.c
... | ... | @@ -29,7 +29,7 @@ |
29 | 29 | #include <sys/time.h> |
30 | 30 | #include <zlib.h> |
31 | 31 | |
32 | -/* Needed early for HOST_BSD etc. */ | |
32 | +/* Needed early for CONFIG_BSD etc. */ | |
33 | 33 | #include "config-host.h" |
34 | 34 | |
35 | 35 | #ifndef _WIN32 |
... | ... | @@ -52,7 +52,7 @@ |
52 | 52 | #include <dirent.h> |
53 | 53 | #include <netdb.h> |
54 | 54 | #include <sys/select.h> |
55 | -#ifdef HOST_BSD | |
55 | +#ifdef CONFIG_BSD | |
56 | 56 | #include <sys/stat.h> |
57 | 57 | #if defined(__FreeBSD__) || defined(__DragonFly__) |
58 | 58 | #include <libutil.h> |
... | ... | @@ -1435,7 +1435,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan, |
1435 | 1435 | return s; |
1436 | 1436 | } |
1437 | 1437 | |
1438 | -#if defined (HOST_BSD) || defined (__FreeBSD_kernel__) | |
1438 | +#if defined (CONFIG_BSD) || defined (__FreeBSD_kernel__) | |
1439 | 1439 | static int tap_open(char *ifname, int ifname_size) |
1440 | 1440 | { |
1441 | 1441 | int fd; | ... | ... |
osdep.c
... | ... | @@ -36,12 +36,12 @@ |
36 | 36 | /* FIXME: This file should be target independent. However it has kqemu |
37 | 37 | hacks, so must be built for every target. */ |
38 | 38 | |
39 | -/* Needed early for HOST_BSD etc. */ | |
39 | +/* Needed early for CONFIG_BSD etc. */ | |
40 | 40 | #include "config-host.h" |
41 | 41 | |
42 | 42 | #ifdef _WIN32 |
43 | 43 | #include <windows.h> |
44 | -#elif defined(HOST_BSD) | |
44 | +#elif defined(CONFIG_BSD) | |
45 | 45 | #include <stdlib.h> |
46 | 46 | #else |
47 | 47 | #include <malloc.h> |
... | ... | @@ -210,7 +210,7 @@ void *qemu_memalign(size_t alignment, size_t size) |
210 | 210 | if (ret != 0) |
211 | 211 | abort(); |
212 | 212 | return ptr; |
213 | -#elif defined(HOST_BSD) | |
213 | +#elif defined(CONFIG_BSD) | |
214 | 214 | return oom_check(valloc(size)); |
215 | 215 | #else |
216 | 216 | return oom_check(memalign(alignment, size)); | ... | ... |
qemu-char.c
savevm.c
... | ... | @@ -29,7 +29,7 @@ |
29 | 29 | #include <sys/time.h> |
30 | 30 | #include <zlib.h> |
31 | 31 | |
32 | -/* Needed early for HOST_BSD etc. */ | |
32 | +/* Needed early for CONFIG_BSD etc. */ | |
33 | 33 | #include "config-host.h" |
34 | 34 | |
35 | 35 | #ifndef _WIN32 |
... | ... | @@ -52,7 +52,7 @@ |
52 | 52 | #include <dirent.h> |
53 | 53 | #include <netdb.h> |
54 | 54 | #include <sys/select.h> |
55 | -#ifdef HOST_BSD | |
55 | +#ifdef CONFIG_BSD | |
56 | 56 | #include <sys/stat.h> |
57 | 57 | #if defined(__FreeBSD__) || defined(__DragonFly__) |
58 | 58 | #include <libutil.h> | ... | ... |
vl.c
... | ... | @@ -29,7 +29,7 @@ |
29 | 29 | #include <sys/time.h> |
30 | 30 | #include <zlib.h> |
31 | 31 | |
32 | -/* Needed early for HOST_BSD etc. */ | |
32 | +/* Needed early for CONFIG_BSD etc. */ | |
33 | 33 | #include "config-host.h" |
34 | 34 | /* Needed early to override system queue definitions on BSD */ |
35 | 35 | #include "sys-queue.h" |
... | ... | @@ -56,7 +56,7 @@ |
56 | 56 | #include <dirent.h> |
57 | 57 | #include <netdb.h> |
58 | 58 | #include <sys/select.h> |
59 | -#ifdef HOST_BSD | |
59 | +#ifdef CONFIG_BSD | |
60 | 60 | #include <sys/stat.h> |
61 | 61 | #if defined(__FreeBSD__) || defined(__DragonFly__) |
62 | 62 | #include <libutil.h> | ... | ... |