Commit cb8b8ef4 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



# gpg: Signature made Fri 02 Jun 2017 20:12:48 BST
# 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/chrfe-pull-request:
  char: move char devices to chardev/
  char: make chr_fe_deinit() optionaly delete backend
  char: rename functions that are not part of fe
  char: move CharBackend handling in char-fe unit
  char: generalize qemu_chr_write_all()
  be-hci: use backend functions
  chardev: serial & parallel declaration to own headers
  chardev: move headers to include/chardev
  Remove/replace sysemu/char.h inclusion
  char-win: close file handle except with console
  char-win: rename hcom->file
  char-win: rename win_chr_init/poll win_chr_serial_init/poll
  char-win: remove WinChardev.len
  char-win: simplify win_chr_read()
  char: cast ARRAY_SIZE() as signed to silent warning on empty array

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c6e84fbd 6b10e573

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -1238,13 +1238,12 @@ M: Paolo Bonzini <pbonzini@redhat.com> 
M: Marc-André Lureau <marcandre.lureau@redhat.com>

S: Maintained

F: chardev/

F: backends/msmouse.c

F: backends/testdev.c

F: include/chardev/



Character Devices (Braille)

M: Samuel Thibault <samuel.thibault@ens-lyon.org>

S: Maintained

F: backends/baum.c

F: chardev/baum.c



Command line option argument parsing

M: Markus Armbruster <armbru@redhat.com>

Makefile.objs

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ common-obj-$(CONFIG_LINUX) += fsdev/ 


common-obj-y += migration/



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



common-obj-y += audio/

common-obj-y += hw/

common-obj-y += accel.o
@@ -70,6 +68,7 @@ common-obj-y += tpm.o 
common-obj-$(CONFIG_SLIRP) += slirp/



common-obj-y += backends/

common-obj-y += chardev/



common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
@@ -121,6 +120,7 @@ trace-events-subdirs += io 
trace-events-subdirs += migration

trace-events-subdirs += block

trace-events-subdirs += backends

trace-events-subdirs += chardev

trace-events-subdirs += hw/block

trace-events-subdirs += hw/block/dataplane

trace-events-subdirs += hw/char

backends/Makefile.objs

+0 −4
Original line number Diff line number Diff line 
common-obj-y += rng.o rng-egd.o

common-obj-$(CONFIG_POSIX) += rng-random.o



common-obj-y += msmouse.o wctablet.o testdev.o

common-obj-$(CONFIG_BRLAPI) += baum.o

baum.o-cflags := $(SDL_CFLAGS)



common-obj-$(CONFIG_TPM) += tpm.o



common-obj-y += hostmem.o hostmem-ram.o

backends/rng-egd.c

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include "qemu/osdep.h"

#include "sysemu/rng.h"

#include "sysemu/char.h"

#include "chardev/char-fe.h"

#include "qapi/error.h"

#include "qapi/qmp/qerror.h"
@@ -145,7 +145,7 @@ static void rng_egd_finalize(Object *obj) 
{

    RngEgd *s = RNG_EGD(obj);



    qemu_chr_fe_deinit(&s->chr);

    qemu_chr_fe_deinit(&s->chr, false);

    g_free(s->chr_name);

}

backends/trace-events

+0 −10
Original line number Diff line number Diff line 
# See docs/tracing.txt for syntax documentation.



# backends/wctablet.c

wct_init(void) ""

wct_cmd_re(void) ""

wct_cmd_st(void) ""

wct_cmd_sp(void) ""

wct_cmd_ts(int input) "0x%02x"

wct_cmd_other(const char *cmd) "%s"

wct_speed(int speed) "%d"