Commit 2d6752d3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/elmarco/tags/chr-split-pull-request' into staging 



# gpg: Signature made Tue 31 Jan 2017 19:32:40 GMT
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/chr-split-pull-request: (41 commits)
  char: headers clean-up
  char: move parallel chardev in its own file
  char: move serial chardev to its own file
  char: move pty chardev in its own file
  char: move pipe chardev in its own file
  char: move console in its own file
  char: move stdio in its own file
  char: move file chardev in its own file
  char: move udp chardev in its own file
  char: move socket chardev to its own file
  char: move win-stdio into its own file
  char: move win chardev base class in its own file
  char: move fd chardev in its own file
  char: move QIOChannel-related stuff to char-io.h
  char: remove unused READ_RETRIES
  char: rename and move to header CHR_READ_BUF_LEN
  char: move ringbuf/memory to its own file
  char: move mux to its own file
  char: move null chardev to its own file
  char: make null_chr_write() the default method
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6fe791b5 213dcb06

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1194,8 +1194,9 @@ T: git git://github.com/jnsnow/qemu.git bitmaps 


Character device backends

M: Paolo Bonzini <pbonzini@redhat.com>

M: Marc-André Lureau <marcandre.lureau@redhat.com>

S: Maintained

F: qemu-char.c

F: chardev/

F: backends/msmouse.c

F: backends/testdev.c

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ endif 


dummy := $(call unnest-vars,, \

                stub-obj-y \

                chardev-obj-y \

                util-obj-y \

                qga-obj-y \

                ivshmem-client-obj-y \
@@ -223,7 +224,8 @@ subdir-dtc:dtc/libfdt dtc/tests 
dtc/%:

	mkdir -p $@



$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))

$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(chardev-obj-y) \

	$(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))



ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))

# Only keep -O and -g cflags

Makefile.objs

+3 −2
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ stub-obj-y = stubs/ crypto/ 
util-obj-y = util/ qobject/ qapi/

util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o



chardev-obj-y = chardev/



#######################################################################

# block-obj-y is code used by both qemu system emulation and qemu-img
@@ -51,8 +53,7 @@ common-obj-$(CONFIG_POSIX) += os-posix.o 
common-obj-$(CONFIG_LINUX) += fsdev/



common-obj-y += migration/

common-obj-y += qemu-char.o #aio.o

common-obj-y += page_cache.o

common-obj-y += page_cache.o #aio.o



common-obj-$(CONFIG_SPICE) += spice-qemu-char.o

Makefile.target

+3 −1
Original line number Diff line number Diff line
@@ -172,12 +172,14 @@ all-obj-y := $(obj-y) 
target-obj-y :=

block-obj-y :=

common-obj-y :=

chardev-obj-y :=

include $(SRC_PATH)/Makefile.objs

dummy := $(call unnest-vars,,target-obj-y)

target-obj-y-save := $(target-obj-y)

dummy := $(call unnest-vars,.., \

               block-obj-y \

               block-obj-m \

               chardev-obj-y \

               crypto-obj-y \

               crypto-aes-obj-y \

               qom-obj-y \
@@ -188,7 +190,7 @@ target-obj-y := $(target-obj-y-save) 
all-obj-y += $(common-obj-y)

all-obj-y += $(target-obj-y)

all-obj-y += $(qom-obj-y)

all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)

all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y)

all-obj-$(CONFIG_USER_ONLY) += $(crypto-aes-obj-y)

all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y)

all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y)

backends/baum.c

+3 −8
Original line number Diff line number Diff line
@@ -616,9 +616,9 @@ static void baum_chr_read(void *opaque) 
    }

}



static void baum_chr_free(Chardev *chr)

static void char_braille_finalize(Object *obj)

{

    BaumChardev *baum = BAUM_CHARDEV(chr);

    BaumChardev *baum = BAUM_CHARDEV(obj);



    timer_free(baum->cellCount_timer);

    if (baum->brlapi) {
@@ -659,23 +659,18 @@ static void char_braille_class_init(ObjectClass *oc, void *data) 
    cc->open = baum_chr_open;

    cc->chr_write = baum_chr_write;

    cc->chr_accept_input = baum_chr_accept_input;

    cc->chr_free = baum_chr_free;

}



static const TypeInfo char_braille_type_info = {

    .name = TYPE_CHARDEV_BRAILLE,

    .parent = TYPE_CHARDEV,

    .instance_size = sizeof(BaumChardev),

    .instance_finalize = char_braille_finalize,

    .class_init = char_braille_class_init,

};



static void register_types(void)

{

    static const CharDriver driver = {

        .kind = CHARDEV_BACKEND_KIND_BRAILLE,

    };



    register_char_driver(&driver);

    type_register_static(&char_braille_type_info);

}