aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLukas Straub <lukasstraub2@web.de>2021-03-30 20:13:31 +0200
committerMarc-André Lureau <marcandre.lureau@redhat.com>2021-04-01 15:27:44 +0400
commitfeb774ca3fc08afc1404f75c06fbaeea5fdbcd19 (patch)
tree3d5cdf7905c4a4c2353d9c8d8295e4f7664514c1 /include
parentf36b0efd7f1a4b0383e1e36bc1c450ba4d8b7c6c (diff)
downloadqemu-feb774ca3fc08afc1404f75c06fbaeea5fdbcd19.zip
qemu-feb774ca3fc08afc1404f75c06fbaeea5fdbcd19.tar.gz
qemu-feb774ca3fc08afc1404f75c06fbaeea5fdbcd19.tar.bz2
chardev: Fix yank with the chardev-change case
When changing from chardev-socket (which supports yank) to chardev-socket again, it fails, because the new chardev attempts to register a new yank instance. This in turn fails, as there still is the yank instance from the current chardev. Also, the old chardev shouldn't unregister the yank instance when it is freed. To fix this, now the new chardev only registers a yank instance if the current chardev doesn't support yank and thus hasn't registered one already. Also, when the old chardev is freed, it now only unregisters the yank instance if the new chardev doesn't need it. If the initialization of the new chardev fails, it still has chr->handover_yank_instance set and won't unregister the yank instance when it is freed. s->registered_yank is always true here, as chardev-change only works on user-visible chardevs and those are guraranteed to register a yank instance as they are initialized via chardev_new() qemu_char_open() cc->open() (qmp_chardev_open_socket()). Signed-off-by: Lukas Straub <lukasstraub2@web.de> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Tested-by: Li Zhang <li.zhang@cloud.ionos.com> Message-Id: <9637888d7591d2971975188478bb707299a1dc04.1617127849.git.lukasstraub2@web.de>
Diffstat (limited to 'include')
-rw-r--r--include/chardev/char.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/chardev/char.h b/include/chardev/char.h
index 4181a27..7c0444f 100644
--- a/include/chardev/char.h
+++ b/include/chardev/char.h
@@ -65,6 +65,8 @@ struct Chardev {
char *filename;
int logfd;
int be_open;
+ /* used to coordinate the chardev-change special-case: */
+ bool handover_yank_instance;
GSource *gsource;
GMainContext *gcontext;
DECLARE_BITMAP(features, QEMU_CHAR_FEATURE_LAST);
@@ -251,6 +253,7 @@ struct ChardevClass {
ObjectClass parent_class;
bool internal; /* TODO: eventually use TYPE_USER_CREATABLE */
+ bool supports_yank;
void (*parse)(QemuOpts *opts, ChardevBackend *backend, Error **errp);
void (*open)(Chardev *chr, ChardevBackend *backend,