diff options
| author | Marc-André Lureau | 2017-06-07 19:33:29 +0200 |
|---|---|---|
| committer | Marc-André Lureau | 2017-06-08 15:57:36 +0200 |
| commit | d203c6439840de4e331f74208c57443f4d6a6229 (patch) | |
| tree | 6df1ce7afb4d045a187ddcefcc448b157df769e1 /include/chardev | |
| parent | arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (diff) | |
| download | qemu-d203c6439840de4e331f74208c57443f4d6a6229.tar.gz qemu-d203c6439840de4e331f74208c57443f4d6a6229.tar.xz qemu-d203c6439840de4e331f74208c57443f4d6a6229.zip | |
char: fix alias devices regression
Fix regression from commit 4d43a603c71, where the serial and parallel
headers got removed from char.c, which broke the alias table.
Move the HAVE_CHARDEV_SERIAL/HAVE_CHARDEV_PARPORT to osdep.h instead
of being in separate headers.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'include/chardev')
| -rw-r--r-- | include/chardev/char-parallel.h | 5 | ||||
| -rw-r--r-- | include/chardev/char-serial.h | 8 |
2 files changed, 0 insertions, 13 deletions
diff --git a/include/chardev/char-parallel.h b/include/chardev/char-parallel.h index 3284a1b96b..c09751fd6c 100644 --- a/include/chardev/char-parallel.h +++ b/include/chardev/char-parallel.h @@ -26,11 +26,6 @@ #include "chardev/char.h" -#if defined(__linux__) || defined(__FreeBSD__) || \ - defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#define HAVE_CHARDEV_PARPORT 1 -#endif - #define CHR_IOCTL_PP_READ_DATA 3 #define CHR_IOCTL_PP_WRITE_DATA 4 #define CHR_IOCTL_PP_READ_CONTROL 5 diff --git a/include/chardev/char-serial.h b/include/chardev/char-serial.h index cb2e59e82a..ad6891b26d 100644 --- a/include/chardev/char-serial.h +++ b/include/chardev/char-serial.h @@ -26,14 +26,6 @@ #include "chardev/char.h" -#ifdef _WIN32 -#define HAVE_CHARDEV_SERIAL 1 -#elif defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \ - || defined(__GLIBC__) -#define HAVE_CHARDEV_SERIAL 1 -#endif - #define CHR_IOCTL_SERIAL_SET_PARAMS 1 typedef struct { int speed; |