[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/7] chardev: Reduce "char-mux.h" scope, rename it "chardev-inter
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 4/7] chardev: Reduce "char-mux.h" scope, rename it "chardev-internal.h" |
Date: |
Thu, 23 Apr 2020 22:21:09 +0200 |
No file out of chardev/ requires access to this header,
restrict its scope.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
include/chardev/char-mux.h => chardev/chardev-internal.h | 7 ++++---
chardev/char-fe.c | 2 +-
chardev/char-mux.c | 2 +-
chardev/char.c | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
rename include/chardev/char-mux.h => chardev/chardev-internal.h (96%)
diff --git a/include/chardev/char-mux.h b/chardev/chardev-internal.h
similarity index 96%
rename from include/chardev/char-mux.h
rename to 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];
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 e77564060d..b672a41150 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -39,7 +39,7 @@
#include "qemu/option.h"
#include "qemu/id.h"
-#include "chardev/char-mux.h"
+#include "chardev-internal.h"
/***********************************************************/
/* character device */
--
2.21.1
- [PATCH 0/7] chardev: Reduce system emulation specific code, Philippe Mathieu-Daudé, 2020/04/23
- [PATCH 1/7] monitor/misc: Remove unused "chardev/char-mux.h" include, Philippe Mathieu-Daudé, 2020/04/23
- [PATCH 2/7] tests/test-char: Remove unused "chardev/char-mux.h" include, Philippe Mathieu-Daudé, 2020/04/23
- [PATCH 3/7] chardev: Restrict msmouse / wctablet / testdev to system emulation, Philippe Mathieu-Daudé, 2020/04/23
- [PATCH 4/7] chardev: Reduce "char-mux.h" scope, rename it "chardev-internal.h",
Philippe Mathieu-Daudé <=
- [PATCH 6/7] stubs: Split machine-init-done as machine-init and machine-notify, Philippe Mathieu-Daudé, 2020/04/23
- [PATCH 7/7] multi-process: Refactor machine_init and exit notifiers, Philippe Mathieu-Daudé, 2020/04/23
- [PATCH 5/7] chardev: Extract system emulation specific code, Philippe Mathieu-Daudé, 2020/04/23
- Re: [PATCH 0/7] chardev: Reduce system emulation specific code, Richard Henderson, 2020/04/23