mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

char: fix alias devices regression

Browse Source 
Fix regression from commit 4d43a603c7, 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>
This commit is contained in:
Marc-André Lureau 2017-06-07 21:33:29 +04:00
parent 64175afc69
commit d203c64398
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/chardev/char-parallel.h
View File

@ -26,11 +26,6 @@
#include "chardev/char.h" #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_READ_DATA 3
#define CHR_IOCTL_PP_WRITE_DATA 4 #define CHR_IOCTL_PP_WRITE_DATA 4
#define CHR_IOCTL_PP_READ_CONTROL 5 #define CHR_IOCTL_PP_READ_CONTROL 5

8
include/chardev/char-serial.h
View File

@ -26,14 +26,6 @@
#include "chardev/char.h" #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 #define CHR_IOCTL_SERIAL_SET_PARAMS 1
typedef struct { typedef struct {
int speed; int speed;

13
include/qemu/osdep.h
View File

@ -284,6 +284,19 @@ void qemu_anon_ram_free(void *ptr, size_t size);
#endif #endif
#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
#if defined(__linux__) || defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#define HAVE_CHARDEV_PARPORT 1
#endif
#if defined(CONFIG_LINUX) #if defined(CONFIG_LINUX)
#ifndef BUS_MCEERR_AR #ifndef BUS_MCEERR_AR
#define BUS_MCEERR_AR 4 #define BUS_MCEERR_AR 4