Commit d203c643 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

char: fix alias devices regression 



Fix regression from commit 4d43a603, 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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 64175afc

include/chardev/char-parallel.h

+0 −5
Original line number Diff line number Diff line
@@ -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

include/chardev/char-serial.h

+0 −8
Original line number Diff line number Diff line
@@ -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;

include/qemu/osdep.h

+13 −0
Original line number Diff line number Diff line
@@ -284,6 +284,19 @@ void qemu_anon_ram_free(void *ptr, size_t size); 


#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)

#ifndef BUS_MCEERR_AR

#define BUS_MCEERR_AR 4