diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-09-14 18:14:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-09-14 18:14:56 +0100 |
| commit | 831aaf24967a49d7750090b9dcfd6bf356f16529 (patch) | |
| tree | a3565c0b50a7509f2a30c902e50903eb2506b7bd /chardev/char-mux.c | |
| parent | 4c9af1ea1457782cf0adb293179335ef6de942aa (diff) | |
| parent | 78e3e1d046e64b86e8c9bf3011d5a2a795b5e373 (diff) | |
| download | focaccia-qemu-831aaf24967a49d7750090b9dcfd6bf356f16529.tar.gz focaccia-qemu-831aaf24967a49d7750090b9dcfd6bf356f16529.zip | |
Merge remote-tracking branch 'remotes/marcandre/tags/misc-pull-request' into staging
chardev & doc misc # gpg: Signature made Tue 14 Sep 2021 13:59:10 BST # gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5 # gpg: issuer "marcandre.lureau@redhat.com" # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full] # gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full] # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * remotes/marcandre/tags/misc-pull-request: chardev: add some comments about the class methods chardev: remove needless class method chardev: Propagate error from logfile opening meson.build: fix comment typo docs: add supported host CPU architectures section Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'chardev/char-mux.c')
| -rw-r--r-- | chardev/char-mux.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 5baf419010..ada0c6866f 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -386,10 +386,9 @@ void suspend_mux_open(void) static int chardev_options_parsed_cb(Object *child, void *opaque) { Chardev *chr = (Chardev *)child; - ChardevClass *class = CHARDEV_GET_CLASS(chr); - if (!chr->be_open && class->chr_options_parsed) { - class->chr_options_parsed(chr); + if (!chr->be_open && CHARDEV_IS_MUX(chr)) { + open_muxes(chr); } return 0; @@ -412,7 +411,6 @@ static void char_mux_class_init(ObjectClass *oc, void *data) cc->chr_accept_input = mux_chr_accept_input; cc->chr_add_watch = mux_chr_add_watch; cc->chr_be_event = mux_chr_be_event; - cc->chr_options_parsed = open_muxes; cc->chr_update_read_handler = mux_chr_update_read_handlers; } |