From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Elena Ufimtseva" <elena.ufimtseva@oracle.com>,
"John G Johnson" <john.g.johnson@oracle.com>,
"Jagannathan Raman" <jag.raman@oracle.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 4/7] chardev: Reduce "char-mux.h" scope, rename it "chardev-internal.h"
Date: Thu, 23 Apr 2020 22:21:09 +0200 [thread overview]
Message-ID: <20200423202112.644-5-philmd@redhat.com> (raw)
In-Reply-To: <20200423202112.644-1-philmd@redhat.com>
No file out of chardev/ requires access to this header,
restrict its scope.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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
next prev parent reply other threads:[~2020-04-23 20:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 20:21 [PATCH 0/7] chardev: Reduce system emulation specific code Philippe Mathieu-Daudé
2020-04-23 20:21 ` [PATCH 1/7] monitor/misc: Remove unused "chardev/char-mux.h" include Philippe Mathieu-Daudé
2020-04-23 20:42 ` Marc-André Lureau
2020-04-23 20:21 ` [PATCH 2/7] tests/test-char: " Philippe Mathieu-Daudé
2020-04-23 20:51 ` Marc-André Lureau
2020-04-23 20:21 ` [PATCH 3/7] chardev: Restrict msmouse / wctablet / testdev to system emulation Philippe Mathieu-Daudé
2020-04-23 20:51 ` Marc-André Lureau
2020-04-23 20:21 ` Philippe Mathieu-Daudé [this message]
2020-04-23 21:34 ` [PATCH 4/7] chardev: Reduce "char-mux.h" scope, rename it "chardev-internal.h" Marc-André Lureau
2020-04-23 20:21 ` [PATCH 5/7] chardev: Extract system emulation specific code Philippe Mathieu-Daudé
2020-04-23 21:34 ` Marc-André Lureau
2020-04-24 13:19 ` Jag Raman
2020-04-23 20:21 ` [PATCH 6/7] stubs: Split machine-init-done as machine-init and machine-notify Philippe Mathieu-Daudé
2020-04-23 20:43 ` Marc-André Lureau
2020-04-23 20:21 ` [PATCH 7/7] multi-process: Refactor machine_init and exit notifiers Philippe Mathieu-Daudé
2020-04-24 3:49 ` [PATCH 0/7] chardev: Reduce system emulation specific code Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200423202112.644-5-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=elena.ufimtseva@oracle.com \
--cc=jag.raman@oracle.com \
--cc=john.g.johnson@oracle.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).