[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [qemu-xen master] Merge remote-tracking branch 'remotes/elmarco/tags/chardev-pull-request' into staging
commit 6c87d9f311dba0641bdc2df556056938a8bf2a12 Merge: 9f526fce49c6ac48114ed04914b5a76e4db75785 30827bad3852fd85d86995e7ccab429679442889 Author: Peter Maydell <peter.maydell@xxxxxxxxxx> AuthorDate: Mon Jul 13 09:34:24 2020 +0100 Commit: Peter Maydell <peter.maydell@xxxxxxxxxx> CommitDate: Mon Jul 13 09:34:24 2020 +0100 Merge remote-tracking branch 'remotes/elmarco/tags/chardev-pull-request' into staging # gpg: Signature made Mon 13 Jul 2020 09:23:19 BST # gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5 # gpg: issuer "marcandre.lureau@xxxxxxxxxx" # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>" [full] # gpg: aka "Marc-André Lureau <marcandre.lureau@xxxxxxxxx>" [full] # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * remotes/elmarco/tags/chardev-pull-request: chardev: Extract system emulation specific code chardev: Reduce "char-mux.h" scope, rename it "chardev-internal.h" chardev: Restrict msmouse / wctablet / testdev to system emulation tests/test-char: Remove unused "chardev/char-mux.h" include monitor/misc: Remove unused "chardev/char-mux.h" include char: fix use-after-free with dup chardev & reconnect chardev: don't abort on attempt to add duplicated chardev char-socket: initialize reconnect timer only when the timer doesn't start Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx> chardev/Makefile.objs | 3 +- chardev/char-fe.c | 2 +- chardev/char-mux.c | 2 +- chardev/char-socket.c | 5 +- chardev/char.c | 43 +++------------- chardev/chardev-internal.h | 65 ++++++++++++++++++++++++ chardev/chardev-sysemu.c | 69 +++++++++++++++++++++++++ include/chardev/char-mux.h | 61 ----------------------- monitor/misc.c | 1 - tests/test-char.c | 122 ++++++++++++++++++++++++++++++++++++++------- 10 files changed, 253 insertions(+), 120 deletions(-) -- generated by git-patchbot for /home/xen/git/qemu-xen.git#master
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |