Commit ffa0f7eb authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Marc-André Lureau
Browse files

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: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200423202112.644-5-philmd@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent c383efd5

chardev/char-fe.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

chardev/char-mux.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

chardev/char.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include "qemu/id.h"

#include "qemu/coroutine.h"



#include "chardev/char-mux.h"

#include "chardev-internal.h"



/***********************************************************/

/* character device */

include/chardev/char-mux.h→chardev/chardev-internal.h

+4 −3
Original line number Diff line number Diff line 
/*

 * 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];