diff options
| author | Philippe Mathieu-Daudé | 2020-04-23 22:21:09 +0200 |
|---|---|---|
| committer | Marc-André Lureau | 2020-07-13 09:59:47 +0200 |
| commit | ffa0f7eb57f3fbb4947e5bf12040108481ea46c3 (patch) | |
| tree | c2fd6dd3564bcd9ca2b1de140caa4ac54f09f6ed | |
| parent | chardev: Restrict msmouse / wctablet / testdev to system emulation (diff) | |
| download | qemu-ffa0f7eb57f3fbb4947e5bf12040108481ea46c3.tar.gz qemu-ffa0f7eb57f3fbb4947e5bf12040108481ea46c3.tar.xz qemu-ffa0f7eb57f3fbb4947e5bf12040108481ea46c3.zip | |
chardev: Reduce "char-mux.h" scope, rename it "chardev-internal.h"
No file out of chardev/ requires access to this header,
restrict its scope.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200423202112.644-5-philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
| -rw-r--r-- | chardev/char-fe.c | 2 | ||||
| -rw-r--r-- | chardev/char-mux.c | 2 | ||||
| -rw-r--r-- | chardev/char.c | 2 | ||||
| -rw-r--r-- | chardev/chardev-internal.h (renamed from include/chardev/char-mux.h) | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/chardev/char-fe.c b/chardev/char-fe.c index f3530a90e6..474715c5a9 100644 --- a/chardev/char-fe.c +++ b/chardev/char-fe.c @@ -29,7 +29,7 @@ #include "chardev/char-fe.h" #include "chardev/char-io.h" -#include "chardev/char-mux.h" +#include "chardev-internal.h" int qemu_chr_fe_write(CharBackend *be, const uint8_t *buf, int len) { diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 46c44af67c..6f980bb836 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -29,7 +29,7 @@ #include "chardev/char.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" -#include "chardev/char-mux.h" +#include "chardev-internal.h" /* MUX driver for serial I/O splitting */ diff --git a/chardev/char.c b/chardev/char.c index a0626d04d5..807be52300 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -40,7 +40,7 @@ #include "qemu/id.h" #include "qemu/coroutine.h" -#include "chardev/char-mux.h" +#include "chardev-internal.h" /***********************************************************/ /* character device */ diff --git a/include/chardev/char-mux.h b/chardev/chardev-internal.h index 417fe32eed..e0264ac349 100644 --- a/include/chardev/char-mux.h +++ b/chardev/chardev-internal.h @@ -1,5 +1,5 @@ /* - * QEMU System Emulator + * QEMU Character device internals * * Copyright (c) 2003-2008 Fabrice Bellard * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#ifndef CHAR_MUX_H -#define CHAR_MUX_H +#ifndef CHARDEV_INTERNAL_H +#define CHARDEV_INTERNAL_H #include "chardev/char.h" #include "chardev/char-fe.h" @@ -30,6 +30,7 @@ #define MAX_MUX 4 #define MUX_BUFFER_SIZE 32 /* Must be a power of 2. */ #define MUX_BUFFER_MASK (MUX_BUFFER_SIZE - 1) + typedef struct MuxChardev { Chardev parent; CharBackend *backends[MAX_MUX]; |