| Message ID | 20200423202112.644-5-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | chardev: Reduce system emulation specific code | expand |
On Thu, Apr 23, 2020 at 10:24 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > No file out of chardev/ requires access to this header, > restrict its scope. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@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 > >
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 */
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%)