* [PULL 1/6] yank: Remove dependency on qiochannel
2021-03-26 17:34 [PULL for 6.0 0/6] Yank fixes Lukas Straub
@ 2021-03-26 17:34 ` Lukas Straub
2021-03-26 17:35 ` [PULL 2/6] yank: Always link full yank code Lukas Straub
` (6 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Lukas Straub @ 2021-03-26 17:34 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 11229 bytes --]
Remove dependency on qiochannel by removing yank_generic_iochannel and
letting migration and chardev use their own yank function for
iochannel.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
MAINTAINERS | 1 +
chardev/char-socket.c | 21 ++++++++++++++-------
include/qemu/yank.h | 10 ----------
migration/channel.c | 6 ++++--
migration/meson.build | 1 +
migration/multifd.c | 3 ++-
migration/qemu-file-channel.c | 3 ++-
migration/yank_functions.c | 20 ++++++++++++++++++++
migration/yank_functions.h | 17 +++++++++++++++++
stubs/yank.c | 6 ------
util/yank.c | 8 --------
11 files changed, 61 insertions(+), 35 deletions(-)
create mode 100644 migration/yank_functions.c
create mode 100644 migration/yank_functions.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 9147e9a429..455775c4a3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2821,6 +2821,7 @@ M: Lukas Straub <lukasstraub2@web.de>
S: Odd fixes
F: util/yank.c
F: stubs/yank.c
+F: migration/yank_functions*
F: include/qemu/yank.h
F: qapi/yank.json
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index f618bdec28..1d455ecca4 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -402,6 +402,13 @@ static void remove_hup_source(SocketChardev *s)
}
}
+static void char_socket_yank_iochannel(void *opaque)
+{
+ QIOChannel *ioc = QIO_CHANNEL(opaque);
+
+ qio_channel_shutdown(ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
+}
+
static void tcp_chr_free_connection(Chardev *chr)
{
SocketChardev *s = SOCKET_CHARDEV(chr);
@@ -424,7 +431,7 @@ static void tcp_chr_free_connection(Chardev *chr)
(s->state == TCP_CHARDEV_STATE_CONNECTING
|| s->state == TCP_CHARDEV_STATE_CONNECTED)) {
yank_unregister_function(CHARDEV_YANK_INSTANCE(chr->label),
- yank_generic_iochannel,
+ char_socket_yank_iochannel,
QIO_CHANNEL(s->sioc));
}
object_unref(OBJECT(s->sioc));
@@ -946,7 +953,7 @@ static int tcp_chr_add_client(Chardev *chr, int fd)
tcp_chr_set_client_ioc_name(chr, sioc);
if (s->registered_yank) {
yank_register_function(CHARDEV_YANK_INSTANCE(chr->label),
- yank_generic_iochannel,
+ char_socket_yank_iochannel,
QIO_CHANNEL(sioc));
}
ret = tcp_chr_new_client(chr, sioc);
@@ -965,7 +972,7 @@ static void tcp_chr_accept(QIONetListener *listener,
tcp_chr_set_client_ioc_name(chr, cioc);
if (s->registered_yank) {
yank_register_function(CHARDEV_YANK_INSTANCE(chr->label),
- yank_generic_iochannel,
+ char_socket_yank_iochannel,
QIO_CHANNEL(cioc));
}
tcp_chr_new_client(chr, cioc);
@@ -985,7 +992,7 @@ static int tcp_chr_connect_client_sync(Chardev *chr, Error **errp)
}
if (s->registered_yank) {
yank_register_function(CHARDEV_YANK_INSTANCE(chr->label),
- yank_generic_iochannel,
+ char_socket_yank_iochannel,
QIO_CHANNEL(sioc));
}
tcp_chr_new_client(chr, sioc);
@@ -1005,7 +1012,7 @@ static void tcp_chr_accept_server_sync(Chardev *chr)
tcp_chr_set_client_ioc_name(chr, sioc);
if (s->registered_yank) {
yank_register_function(CHARDEV_YANK_INSTANCE(chr->label),
- yank_generic_iochannel,
+ char_socket_yank_iochannel,
QIO_CHANNEL(sioc));
}
tcp_chr_new_client(chr, sioc);
@@ -1138,7 +1145,7 @@ static void qemu_chr_socket_connected(QIOTask *task, void *opaque)
tcp_chr_change_state(s, TCP_CHARDEV_STATE_DISCONNECTED);
if (s->registered_yank) {
yank_unregister_function(CHARDEV_YANK_INSTANCE(chr->label),
- yank_generic_iochannel,
+ char_socket_yank_iochannel,
QIO_CHANNEL(sioc));
}
check_report_connect_error(chr, err);
@@ -1176,7 +1183,7 @@ static void tcp_chr_connect_client_async(Chardev *chr)
tcp_chr_set_client_ioc_name(chr, sioc);
if (s->registered_yank) {
yank_register_function(CHARDEV_YANK_INSTANCE(chr->label),
- yank_generic_iochannel,
+ char_socket_yank_iochannel,
QIO_CHANNEL(sioc));
}
/*
diff --git a/include/qemu/yank.h b/include/qemu/yank.h
index 5b93c70cbf..5375a1f195 100644
--- a/include/qemu/yank.h
+++ b/include/qemu/yank.h
@@ -73,16 +73,6 @@ void yank_unregister_function(const YankInstance *instance,
YankFn *func,
void *opaque);
-/**
- * yank_generic_iochannel: Generic yank function for iochannel
- *
- * This is a generic yank function which will call qio_channel_shutdown on the
- * provided QIOChannel.
- *
- * @opaque: QIOChannel to shutdown
- */
-void yank_generic_iochannel(void *opaque);
-
#define BLOCKDEV_YANK_INSTANCE(the_node_name) (&(YankInstance) { \
.type = YANK_INSTANCE_TYPE_BLOCK_NODE, \
.u.block_node.node_name = (the_node_name) })
diff --git a/migration/channel.c b/migration/channel.c
index 35fe234e9c..c9ee902021 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -20,6 +20,7 @@
#include "io/channel-tls.h"
#include "io/channel-socket.h"
#include "qemu/yank.h"
+#include "yank_functions.h"
/**
* @migration_channel_process_incoming - Create new incoming migration channel
@@ -38,7 +39,8 @@ void migration_channel_process_incoming(QIOChannel *ioc)
ioc, object_get_typename(OBJECT(ioc)));
if (object_dynamic_cast(OBJECT(ioc), TYPE_QIO_CHANNEL_SOCKET)) {
- yank_register_function(MIGRATION_YANK_INSTANCE, yank_generic_iochannel,
+ yank_register_function(MIGRATION_YANK_INSTANCE,
+ migration_yank_iochannel,
QIO_CHANNEL(ioc));
}
@@ -76,7 +78,7 @@ void migration_channel_connect(MigrationState *s,
if (!error) {
if (object_dynamic_cast(OBJECT(ioc), TYPE_QIO_CHANNEL_SOCKET)) {
yank_register_function(MIGRATION_YANK_INSTANCE,
- yank_generic_iochannel,
+ migration_yank_iochannel,
QIO_CHANNEL(ioc));
}
diff --git a/migration/meson.build b/migration/meson.build
index 9645f44005..2cfa8eed72 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -6,6 +6,7 @@ migration_files = files(
'vmstate.c',
'qemu-file-channel.c',
'qemu-file.c',
+ 'yank_functions.c',
)
softmmu_ss.add(migration_files)
diff --git a/migration/multifd.c b/migration/multifd.c
index 03527c564c..a6677c45c8 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -27,6 +27,7 @@
#include "qemu/yank.h"
#include "io/channel-socket.h"
+#include "yank_functions.h"
/* Multiple fd's */
@@ -989,7 +990,7 @@ int multifd_load_cleanup(Error **errp)
if (object_dynamic_cast(OBJECT(p->c), TYPE_QIO_CHANNEL_SOCKET)
&& OBJECT(p->c)->ref == 1) {
yank_unregister_function(MIGRATION_YANK_INSTANCE,
- yank_generic_iochannel,
+ migration_yank_iochannel,
QIO_CHANNEL(p->c));
}
diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
index afc3a7f642..876d05a540 100644
--- a/migration/qemu-file-channel.c
+++ b/migration/qemu-file-channel.c
@@ -28,6 +28,7 @@
#include "io/channel-socket.h"
#include "qemu/iov.h"
#include "qemu/yank.h"
+#include "yank_functions.h"
static ssize_t channel_writev_buffer(void *opaque,
@@ -108,7 +109,7 @@ static int channel_close(void *opaque, Error **errp)
if (object_dynamic_cast(OBJECT(ioc), TYPE_QIO_CHANNEL_SOCKET)
&& OBJECT(ioc)->ref == 1) {
yank_unregister_function(MIGRATION_YANK_INSTANCE,
- yank_generic_iochannel,
+ migration_yank_iochannel,
QIO_CHANNEL(ioc));
}
object_unref(OBJECT(ioc));
diff --git a/migration/yank_functions.c b/migration/yank_functions.c
new file mode 100644
index 0000000000..96c90e17dc
--- /dev/null
+++ b/migration/yank_functions.c
@@ -0,0 +1,20 @@
+/*
+ * migration yank functions
+ *
+ * Copyright (c) Lukas Straub <lukasstraub2@web.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "io/channel.h"
+#include "yank_functions.h"
+
+void migration_yank_iochannel(void *opaque)
+{
+ QIOChannel *ioc = QIO_CHANNEL(opaque);
+
+ qio_channel_shutdown(ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
+}
diff --git a/migration/yank_functions.h b/migration/yank_functions.h
new file mode 100644
index 0000000000..055ea22523
--- /dev/null
+++ b/migration/yank_functions.h
@@ -0,0 +1,17 @@
+/*
+ * migration yank functions
+ *
+ * Copyright (c) Lukas Straub <lukasstraub2@web.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+/**
+ * migration_yank_iochannel: yank function for iochannel
+ *
+ * This yank function will call qio_channel_shutdown on the provided QIOChannel.
+ *
+ * @opaque: QIOChannel to shutdown
+ */
+void migration_yank_iochannel(void *opaque);
diff --git a/stubs/yank.c b/stubs/yank.c
index 6090416065..11b24fc057 100644
--- a/stubs/yank.c
+++ b/stubs/yank.c
@@ -21,9 +21,3 @@ void yank_unregister_function(const YankInstance *instance,
void *opaque)
{
}
-
-void yank_generic_iochannel(void *opaque)
-{
-}
-
-
diff --git a/util/yank.c b/util/yank.c
index fc08f65209..abf47c346d 100644
--- a/util/yank.c
+++ b/util/yank.c
@@ -15,7 +15,6 @@
#include "qapi/qapi-commands-yank.h"
#include "qapi/qapi-visit-yank.h"
#include "qapi/clone-visitor.h"
-#include "io/channel.h"
#include "qemu/yank.h"
struct YankFuncAndParam {
@@ -151,13 +150,6 @@ void yank_unregister_function(const YankInstance *instance,
abort();
}
-void yank_generic_iochannel(void *opaque)
-{
- QIOChannel *ioc = QIO_CHANNEL(opaque);
-
- qio_channel_shutdown(ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
-}
-
void qmp_yank(YankInstanceList *instances,
Error **errp)
{
--
2.30.2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PULL 2/6] yank: Always link full yank code
2021-03-26 17:34 [PULL for 6.0 0/6] Yank fixes Lukas Straub
2021-03-26 17:34 ` [PULL 1/6] yank: Remove dependency on qiochannel Lukas Straub
@ 2021-03-26 17:35 ` Lukas Straub
2021-03-26 17:35 ` [PULL 3/6] chardev/char.c: Move object_property_try_add_child out of chardev_new Lukas Straub
` (5 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Lukas Straub @ 2021-03-26 17:35 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 2594 bytes --]
Yank now only depends on util and can be always linked in. Also remove
the stubs as they are not needed anymore.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
MAINTAINERS | 1 -
stubs/meson.build | 1 -
stubs/yank.c | 23 -----------------------
util/meson.build | 2 +-
4 files changed, 1 insertion(+), 26 deletions(-)
delete mode 100644 stubs/yank.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 455775c4a3..77259c031d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2820,7 +2820,6 @@ Yank feature
M: Lukas Straub <lukasstraub2@web.de>
S: Odd fixes
F: util/yank.c
-F: stubs/yank.c
F: migration/yank_functions*
F: include/qemu/yank.h
F: qapi/yank.json
diff --git a/stubs/meson.build b/stubs/meson.build
index 8a3e804cf0..be6f6d609e 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -46,7 +46,6 @@ stub_ss.add(files('vm-stop.c'))
stub_ss.add(files('win32-kbd-hook.c'))
stub_ss.add(files('cpu-synchronize-state.c'))
if have_block
- stub_ss.add(files('yank.c'))
stub_ss.add(files('replay-tools.c'))
endif
if have_system
diff --git a/stubs/yank.c b/stubs/yank.c
deleted file mode 100644
index 11b24fc057..0000000000
--- a/stubs/yank.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu/yank.h"
-
-bool yank_register_instance(const YankInstance *instance, Error **errp)
-{
- return true;
-}
-
-void yank_unregister_instance(const YankInstance *instance)
-{
-}
-
-void yank_register_function(const YankInstance *instance,
- YankFn *func,
- void *opaque)
-{
-}
-
-void yank_unregister_function(const YankInstance *instance,
- YankFn *func,
- void *opaque)
-{
-}
diff --git a/util/meson.build b/util/meson.build
index 984fba965f..510765cde4 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -43,6 +43,7 @@ util_ss.add(files('stats64.c'))
util_ss.add(files('systemd.c'))
util_ss.add(when: 'CONFIG_POSIX', if_true: files('drm.c'))
util_ss.add(files('guest-random.c'))
+util_ss.add(files('yank.c'))
if have_user
util_ss.add(files('selfmap.c'))
@@ -51,7 +52,6 @@ endif
if have_system
util_ss.add(files('crc-ccitt.c'))
util_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus.c'), gio])
- util_ss.add(files('yank.c'))
util_ss.add(when: 'CONFIG_LINUX', if_true: files('userfaultfd.c'))
endif
--
2.30.2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PULL 3/6] chardev/char.c: Move object_property_try_add_child out of chardev_new
2021-03-26 17:34 [PULL for 6.0 0/6] Yank fixes Lukas Straub
2021-03-26 17:34 ` [PULL 1/6] yank: Remove dependency on qiochannel Lukas Straub
2021-03-26 17:35 ` [PULL 2/6] yank: Always link full yank code Lukas Straub
@ 2021-03-26 17:35 ` Lukas Straub
2021-03-26 17:35 ` [PULL 4/6] chardev/char.c: Always pass id to chardev_new Lukas Straub
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Lukas Straub @ 2021-03-26 17:35 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 2844 bytes --]
Move object_property_try_add_child out of chardev_new into it's
callers. This is a preparation for the next patches to fix yank
with the chardev-change case.
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>
---
chardev/char.c | 42 ++++++++++++++++++++++++------------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/chardev/char.c b/chardev/char.c
index 140d6d9d36..48f321b3e1 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -975,7 +975,9 @@ static Chardev *chardev_new(const char *id, const char *typename,
qemu_char_open(chr, backend, &be_opened, &local_err);
if (local_err) {
- goto end;
+ error_propagate(errp, local_err);
+ object_unref(obj);
+ return NULL;
}
if (!chr->filename) {
@@ -985,22 +987,6 @@ static Chardev *chardev_new(const char *id, const char *typename,
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
- if (id) {
- object_property_try_add_child(get_chardevs_root(), id, obj,
- &local_err);
- if (local_err) {
- goto end;
- }
- object_unref(obj);
- }
-
-end:
- if (local_err) {
- error_propagate(errp, local_err);
- object_unref(obj);
- return NULL;
- }
-
return chr;
}
@@ -1009,6 +995,7 @@ Chardev *qemu_chardev_new(const char *id, const char *typename,
GMainContext *gcontext,
Error **errp)
{
+ Chardev *chr;
g_autofree char *genid = NULL;
if (!id) {
@@ -1016,7 +1003,19 @@ Chardev *qemu_chardev_new(const char *id, const char *typename,
id = genid;
}
- return chardev_new(id, typename, backend, gcontext, errp);
+ chr = chardev_new(id, typename, backend, gcontext, errp);
+ if (!chr) {
+ return NULL;
+ }
+
+ if (!object_property_try_add_child(get_chardevs_root(), id, OBJECT(chr),
+ errp)) {
+ object_unref(OBJECT(chr));
+ return NULL;
+ }
+ object_unref(OBJECT(chr));
+
+ return chr;
}
ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
@@ -1037,6 +1036,13 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
return NULL;
}
+ if (!object_property_try_add_child(get_chardevs_root(), id, OBJECT(chr),
+ errp)) {
+ object_unref(OBJECT(chr));
+ return NULL;
+ }
+ object_unref(OBJECT(chr));
+
ret = g_new0(ChardevReturn, 1);
if (CHARDEV_IS_PTY(chr)) {
ret->pty = g_strdup(chr->filename + 4);
--
2.30.2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PULL 4/6] chardev/char.c: Always pass id to chardev_new
2021-03-26 17:34 [PULL for 6.0 0/6] Yank fixes Lukas Straub
` (2 preceding siblings ...)
2021-03-26 17:35 ` [PULL 3/6] chardev/char.c: Move object_property_try_add_child out of chardev_new Lukas Straub
@ 2021-03-26 17:35 ` Lukas Straub
2021-03-26 17:35 ` [PULL 5/6] chardev: Fix yank with the chardev-change case Lukas Straub
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Lukas Straub @ 2021-03-26 17:35 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1550 bytes --]
Always pass the id to chardev_new, since it is needed to register
the yank instance for the chardev. Also, after checking that
nothing calls chardev_new with id=NULL, assert() that id!=NULL.
This fixes a crash when using chardev-change to change a chardev
to chardev-socket, which attempts to register a yank instance.
This in turn tries to dereference the NULL-pointer.
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>
---
chardev/char.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chardev/char.c b/chardev/char.c
index 48f321b3e1..75993f903f 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -967,6 +967,7 @@ static Chardev *chardev_new(const char *id, const char *typename,
bool be_opened = true;
assert(g_str_has_prefix(typename, "chardev-"));
+ assert(id);
obj = object_new(typename);
chr = CHARDEV(obj);
@@ -1095,12 +1096,11 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend,
return NULL;
}
- chr_new = chardev_new(NULL, object_class_get_name(OBJECT_CLASS(cc)),
+ chr_new = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)),
backend, chr->gcontext, errp);
if (!chr_new) {
return NULL;
}
- chr_new->label = g_strdup(id);
if (chr->be_open && !chr_new->be_open) {
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
--
2.30.2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PULL 5/6] chardev: Fix yank with the chardev-change case
2021-03-26 17:34 [PULL for 6.0 0/6] Yank fixes Lukas Straub
` (3 preceding siblings ...)
2021-03-26 17:35 ` [PULL 4/6] chardev/char.c: Always pass id to chardev_new Lukas Straub
@ 2021-03-26 17:35 ` Lukas Straub
2021-03-26 17:35 ` [PULL 6/6] tests: Add tests for " Lukas Straub
` (2 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Lukas Straub @ 2021-03-26 17:35 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 7472 bytes --]
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>
---
chardev/char-socket.c | 20 +++++++++++++++++---
chardev/char.c | 35 ++++++++++++++++++++++++++++-------
include/chardev/char.h | 3 +++
3 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 1d455ecca4..daa89fe5d1 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1126,7 +1126,13 @@ static void char_socket_finalize(Object *obj)
}
g_free(s->tls_authz);
if (s->registered_yank) {
- yank_unregister_instance(CHARDEV_YANK_INSTANCE(chr->label));
+ /*
+ * In the chardev-change special-case, we shouldn't unregister the yank
+ * instance, as it still may be needed.
+ */
+ if (!chr->handover_yank_instance) {
+ yank_unregister_instance(CHARDEV_YANK_INSTANCE(chr->label));
+ }
}
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
@@ -1424,8 +1430,14 @@ static void qmp_chardev_open_socket(Chardev *chr,
qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_FD_PASS);
}
- if (!yank_register_instance(CHARDEV_YANK_INSTANCE(chr->label), errp)) {
- return;
+ /*
+ * In the chardev-change special-case, we shouldn't register a new yank
+ * instance, as there already may be one.
+ */
+ if (!chr->handover_yank_instance) {
+ if (!yank_register_instance(CHARDEV_YANK_INSTANCE(chr->label), errp)) {
+ return;
+ }
}
s->registered_yank = true;
@@ -1567,6 +1579,8 @@ static void char_socket_class_init(ObjectClass *oc, void *data)
{
ChardevClass *cc = CHARDEV_CLASS(oc);
+ cc->supports_yank = true;
+
cc->parse = qemu_chr_parse_socket;
cc->open = qmp_chardev_open_socket;
cc->chr_wait_connected = tcp_chr_wait_connected;
diff --git a/chardev/char.c b/chardev/char.c
index 75993f903f..398f09df19 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -39,6 +39,7 @@
#include "qemu/option.h"
#include "qemu/id.h"
#include "qemu/coroutine.h"
+#include "qemu/yank.h"
#include "chardev-internal.h"
@@ -266,6 +267,7 @@ static void char_init(Object *obj)
{
Chardev *chr = CHARDEV(obj);
+ chr->handover_yank_instance = false;
chr->logfd = -1;
qemu_mutex_init(&chr->chr_write_lock);
@@ -959,6 +961,7 @@ void qemu_chr_set_feature(Chardev *chr,
static Chardev *chardev_new(const char *id, const char *typename,
ChardevBackend *backend,
GMainContext *gcontext,
+ bool handover_yank_instance,
Error **errp)
{
Object *obj;
@@ -971,6 +974,7 @@ static Chardev *chardev_new(const char *id, const char *typename,
obj = object_new(typename);
chr = CHARDEV(obj);
+ chr->handover_yank_instance = handover_yank_instance;
chr->label = g_strdup(id);
chr->gcontext = gcontext;
@@ -1004,7 +1008,7 @@ Chardev *qemu_chardev_new(const char *id, const char *typename,
id = genid;
}
- chr = chardev_new(id, typename, backend, gcontext, errp);
+ chr = chardev_new(id, typename, backend, gcontext, false, errp);
if (!chr) {
return NULL;
}
@@ -1032,7 +1036,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
}
chr = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)),
- backend, NULL, errp);
+ backend, NULL, false, errp);
if (!chr) {
return NULL;
}
@@ -1057,9 +1061,10 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend,
Error **errp)
{
CharBackend *be;
- const ChardevClass *cc;
+ const ChardevClass *cc, *cc_new;
Chardev *chr, *chr_new;
bool closed_sent = false;
+ bool handover_yank_instance;
ChardevReturn *ret;
chr = qemu_chr_find(id);
@@ -1091,13 +1096,20 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend,
return NULL;
}
- cc = char_get_class(ChardevBackendKind_str(backend->type), errp);
- if (!cc) {
+ cc = CHARDEV_GET_CLASS(chr);
+ cc_new = char_get_class(ChardevBackendKind_str(backend->type), errp);
+ if (!cc_new) {
return NULL;
}
- chr_new = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)),
- backend, chr->gcontext, errp);
+ /*
+ * The new chardev should not register a yank instance if the current
+ * chardev has registered one already.
+ */
+ handover_yank_instance = cc->supports_yank && cc_new->supports_yank;
+
+ chr_new = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc_new)),
+ backend, chr->gcontext, handover_yank_instance, errp);
if (!chr_new) {
return NULL;
}
@@ -1121,6 +1133,15 @@ ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend,
return NULL;
}
+ /* change successfull, clean up */
+ chr_new->handover_yank_instance = false;
+
+ /*
+ * When the old chardev is freed, it should not unregister the yank
+ * instance if the new chardev needs it.
+ */
+ chr->handover_yank_instance = handover_yank_instance;
+
object_unparent(OBJECT(chr));
object_property_add_child(get_chardevs_root(), chr_new->label,
OBJECT(chr_new));
diff --git a/include/chardev/char.h b/include/chardev/char.h
index 4181a2784a..7c0444f90d 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,
--
2.30.2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PULL 6/6] tests: Add tests for yank with the chardev-change case
2021-03-26 17:34 [PULL for 6.0 0/6] Yank fixes Lukas Straub
` (4 preceding siblings ...)
2021-03-26 17:35 ` [PULL 5/6] chardev: Fix yank with the chardev-change case Lukas Straub
@ 2021-03-26 17:35 ` Lukas Straub
2021-03-26 17:45 ` [PULL for 6.0 0/6] Yank fixes no-reply
2021-03-26 17:52 ` Peter Maydell
7 siblings, 0 replies; 12+ messages in thread
From: Lukas Straub @ 2021-03-26 17:35 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 8078 bytes --]
Add tests for yank with the chardev-change case.
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>
---
MAINTAINERS | 1 +
tests/unit/meson.build | 3 +-
tests/unit/test-yank.c | 200 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 203 insertions(+), 1 deletion(-)
create mode 100644 tests/unit/test-yank.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 77259c031d..accb683a55 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2821,6 +2821,7 @@ M: Lukas Straub <lukasstraub2@web.de>
S: Odd fixes
F: util/yank.c
F: migration/yank_functions*
+F: tests/unit/test-yank.c
F: include/qemu/yank.h
F: qapi/yank.json
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index 4bfe4627ba..b3bc2109da 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -123,7 +123,8 @@ if have_system
'test-util-sockets': ['socket-helpers.c'],
'test-base64': [],
'test-bufferiszero': [],
- 'test-vmstate': [migration, io]
+ 'test-vmstate': [migration, io],
+ 'test-yank': ['socket-helpers.c', qom, io, chardev]
}
if 'CONFIG_INOTIFY1' in config_host
tests += {'test-util-filemonitor': []}
diff --git a/tests/unit/test-yank.c b/tests/unit/test-yank.c
new file mode 100644
index 0000000000..1596a3b98e
--- /dev/null
+++ b/tests/unit/test-yank.c
@@ -0,0 +1,200 @@
+/*
+ * Tests for QEMU yank feature
+ *
+ * Copyright (c) Lukas Straub <lukasstraub2@web.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include <glib/gstdio.h>
+
+#include "qemu/config-file.h"
+#include "qemu/module.h"
+#include "qemu/option.h"
+#include "chardev/char-fe.h"
+#include "sysemu/sysemu.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-char.h"
+#include "qapi/qapi-types-char.h"
+#include "qapi/qapi-commands-yank.h"
+#include "qapi/qapi-types-yank.h"
+#include "io/channel-socket.h"
+#include "socket-helpers.h"
+
+typedef struct {
+ SocketAddress *addr;
+ bool old_yank;
+ bool new_yank;
+ bool fail;
+} CharChangeTestConfig;
+
+static int chardev_change(void *opaque)
+{
+ return 0;
+}
+
+static bool is_yank_instance_registered(void)
+{
+ YankInstanceList *list;
+ bool ret;
+
+ list = qmp_query_yank(&error_abort);
+
+ ret = !!list;
+
+ qapi_free_YankInstanceList(list);
+
+ return ret;
+}
+
+static void char_change_test(gconstpointer opaque)
+{
+ CharChangeTestConfig *conf = (gpointer) opaque;
+ SocketAddress *addr;
+ Chardev *chr;
+ CharBackend be;
+ ChardevReturn *ret;
+ QIOChannelSocket *ioc;
+
+ /*
+ * Setup a listener socket and determine its address
+ * so we know the TCP port for the client later
+ */
+ ioc = qio_channel_socket_new();
+ g_assert_nonnull(ioc);
+ qio_channel_socket_listen_sync(ioc, conf->addr, 1, &error_abort);
+ addr = qio_channel_socket_get_local_address(ioc, &error_abort);
+ g_assert_nonnull(addr);
+
+ ChardevBackend backend[2] = {
+ /* doesn't support yank */
+ { .type = CHARDEV_BACKEND_KIND_NULL },
+ /* supports yank */
+ {
+ .type = CHARDEV_BACKEND_KIND_SOCKET,
+ .u.socket.data = &(ChardevSocket) {
+ .addr = &(SocketAddressLegacy) {
+ .type = SOCKET_ADDRESS_LEGACY_KIND_INET,
+ .u.inet.data = &addr->u.inet
+ },
+ .has_server = true,
+ .server = false
+ }
+ } };
+
+ ChardevBackend fail_backend[2] = {
+ /* doesn't support yank */
+ {
+ .type = CHARDEV_BACKEND_KIND_UDP,
+ .u.udp.data = &(ChardevUdp) {
+ .remote = &(SocketAddressLegacy) {
+ .type = SOCKET_ADDRESS_LEGACY_KIND_UNIX,
+ .u.q_unix.data = &(UnixSocketAddress) {
+ .path = (char *)""
+ }
+ }
+ }
+ },
+ /* supports yank */
+ {
+ .type = CHARDEV_BACKEND_KIND_SOCKET,
+ .u.socket.data = &(ChardevSocket) {
+ .addr = &(SocketAddressLegacy) {
+ .type = SOCKET_ADDRESS_LEGACY_KIND_INET,
+ .u.inet.data = &(InetSocketAddress) {
+ .host = (char *)"127.0.0.1",
+ .port = (char *)"0"
+ }
+ },
+ .has_server = true,
+ .server = false
+ }
+ } };
+
+ g_assert(!is_yank_instance_registered());
+
+ ret = qmp_chardev_add("chardev", &backend[conf->old_yank], &error_abort);
+ qapi_free_ChardevReturn(ret);
+ chr = qemu_chr_find("chardev");
+ g_assert_nonnull(chr);
+
+ g_assert(is_yank_instance_registered() == conf->old_yank);
+
+ qemu_chr_wait_connected(chr, &error_abort);
+ qemu_chr_fe_init(&be, chr, &error_abort);
+ /* allow chardev-change */
+ qemu_chr_fe_set_handlers(&be, NULL, NULL,
+ NULL, chardev_change, NULL, NULL, true);
+
+ if (conf->fail) {
+ g_setenv("QTEST_SILENT_ERRORS", "1", 1);
+ ret = qmp_chardev_change("chardev", &fail_backend[conf->new_yank],
+ NULL);
+ g_assert_null(ret);
+ g_assert(be.chr == chr);
+ g_assert(is_yank_instance_registered() == conf->old_yank);
+ g_unsetenv("QTEST_SILENT_ERRORS");
+ } else {
+ ret = qmp_chardev_change("chardev", &backend[conf->new_yank],
+ &error_abort);
+ g_assert_nonnull(ret);
+ g_assert(be.chr != chr);
+ g_assert(is_yank_instance_registered() == conf->new_yank);
+ }
+
+ object_unparent(OBJECT(be.chr));
+ object_unref(OBJECT(ioc));
+ qapi_free_ChardevReturn(ret);
+ qapi_free_SocketAddress(addr);
+}
+
+static SocketAddress tcpaddr = {
+ .type = SOCKET_ADDRESS_TYPE_INET,
+ .u.inet.host = (char *)"127.0.0.1",
+ .u.inet.port = (char *)"0",
+};
+
+int main(int argc, char **argv)
+{
+ bool has_ipv4, has_ipv6;
+
+ qemu_init_main_loop(&error_abort);
+ socket_init();
+
+ g_test_init(&argc, &argv, NULL);
+
+ if (socket_check_protocol_support(&has_ipv4, &has_ipv6) < 0) {
+ g_printerr("socket_check_protocol_support() failed\n");
+ goto end;
+ }
+
+ if (!has_ipv4) {
+ goto end;
+ }
+
+ module_call_init(MODULE_INIT_QOM);
+ qemu_add_opts(&qemu_chardev_opts);
+
+#define CHAR_CHANGE_TEST(name, _old_yank, _new_yank) \
+ g_test_add_data_func("/yank/char_change/success/" # name, \
+ &(CharChangeTestConfig) { .addr = &tcpaddr, \
+ .old_yank = (_old_yank),\
+ .new_yank = (_new_yank),\
+ .fail = false }, \
+ char_change_test); \
+ g_test_add_data_func("/yank/char_change/fail/" # name, \
+ &(CharChangeTestConfig) { .addr = &tcpaddr, \
+ .old_yank = (_old_yank),\
+ .new_yank = (_new_yank),\
+ .fail = true }, \
+ char_change_test);
+
+ CHAR_CHANGE_TEST(to_yank, false, true);
+ CHAR_CHANGE_TEST(yank_to_yank, true, true);
+ CHAR_CHANGE_TEST(from_yank, true, false);
+
+end:
+ return g_test_run();
+}
--
2.30.2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PULL for 6.0 0/6] Yank fixes
2021-03-26 17:34 [PULL for 6.0 0/6] Yank fixes Lukas Straub
` (5 preceding siblings ...)
2021-03-26 17:35 ` [PULL 6/6] tests: Add tests for " Lukas Straub
@ 2021-03-26 17:45 ` no-reply
2021-03-26 17:52 ` Peter Maydell
7 siblings, 0 replies; 12+ messages in thread
From: no-reply @ 2021-03-26 17:45 UTC (permalink / raw)
To: lukasstraub2; +Cc: peter.maydell, qemu-devel
Patchew URL: https://patchew.org/QEMU/cover.1616779714.git.lukasstraub2@web.de/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: cover.1616779714.git.lukasstraub2@web.de
Subject: [PULL for 6.0 0/6] Yank fixes
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/cover.1616744509.git.lukasstraub2@web.de -> patchew/cover.1616744509.git.lukasstraub2@web.de
* [new tag] patchew/cover.1616779714.git.lukasstraub2@web.de -> patchew/cover.1616779714.git.lukasstraub2@web.de
Switched to a new branch 'test'
4d9d4dd tests: Add tests for yank with the chardev-change case
b7309a3 chardev: Fix yank with the chardev-change case
4d626de chardev/char.c: Always pass id to chardev_new
986704e chardev/char.c: Move object_property_try_add_child out of chardev_new
3a83f9a yank: Always link full yank code
4142c6d yank: Remove dependency on qiochannel
=== OUTPUT BEGIN ===
1/6 Checking commit 4142c6de8bf2 (yank: Remove dependency on qiochannel)
2/6 Checking commit 3a83f9a8f30f (yank: Always link full yank code)
3/6 Checking commit 986704eacfdf (chardev/char.c: Move object_property_try_add_child out of chardev_new)
4/6 Checking commit 4d626de1c86e (chardev/char.c: Always pass id to chardev_new)
5/6 Checking commit b7309a3515a2 (chardev: Fix yank with the chardev-change case)
6/6 Checking commit 4d9d4dda05e4 (tests: Add tests for yank with the chardev-change case)
ERROR: Macros with multiple statements should be enclosed in a do - while loop
#230: FILE: tests/unit/test-yank.c:180:
+#define CHAR_CHANGE_TEST(name, _old_yank, _new_yank) \
+ g_test_add_data_func("/yank/char_change/success/" # name, \
+ &(CharChangeTestConfig) { .addr = &tcpaddr, \
+ .old_yank = (_old_yank),\
+ .new_yank = (_new_yank),\
+ .fail = false }, \
+ char_change_test); \
+ g_test_add_data_func("/yank/char_change/fail/" # name, \
+ &(CharChangeTestConfig) { .addr = &tcpaddr, \
+ .old_yank = (_old_yank),\
+ .new_yank = (_new_yank),\
+ .fail = true }, \
+ char_change_test);
total: 1 errors, 0 warnings, 216 lines checked
Patch 6/6 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/cover.1616779714.git.lukasstraub2@web.de/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PULL for 6.0 0/6] Yank fixes
2021-03-26 17:34 [PULL for 6.0 0/6] Yank fixes Lukas Straub
` (6 preceding siblings ...)
2021-03-26 17:45 ` [PULL for 6.0 0/6] Yank fixes no-reply
@ 2021-03-26 17:52 ` Peter Maydell
2021-03-26 18:18 ` Lukas Straub
7 siblings, 1 reply; 12+ messages in thread
From: Peter Maydell @ 2021-03-26 17:52 UTC (permalink / raw)
To: Lukas Straub; +Cc: qemu-devel
On Fri, 26 Mar 2021 at 17:34, Lukas Straub <lukasstraub2@web.de> wrote:
>
> The following changes since commit 5ca634afcf83215a9a54ca6e66032325b5ffb5f6:
>
> Merge remote-tracking branch 'remotes/philmd/tags/sdmmc-20210322' into staging (2021-03-22 18:50:25 +0000)
>
> are available in the Git repository at:
>
> https://github.com/Lukey3332/qemu.git tags/pull-26-03-2021
>
> for you to fetch changes up to 7c2f1ddcaa1c97462cb0b834d5aa7368283aa67d:
>
> tests: Add tests for yank with the chardev-change case (2021-03-26 17:12:18 +0000)
>
> ----------------------------------------------------------------
> Yank fixes for 6.0:
> -Remove qiochannel dependency from the yank core code
> -Always link in the yank code to increase test coverage
> -Fix yank with chardev-change
> -Add tests for yank with chardev-change
Can we get these through some established submaintainer tree, please?
thanks
-- PMM
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PULL for 6.0 0/6] Yank fixes
2021-03-26 17:52 ` Peter Maydell
@ 2021-03-26 18:18 ` Lukas Straub
2021-03-26 20:56 ` Markus Armbruster
0 siblings, 1 reply; 12+ messages in thread
From: Lukas Straub @ 2021-03-26 18:18 UTC (permalink / raw)
To: Peter Maydell; +Cc: Marc-André Lureau, qemu-devel, Markus Armbruster
[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]
On Fri, 26 Mar 2021 17:52:40 +0000
Peter Maydell <peter.maydell@linaro.org> wrote:
> On Fri, 26 Mar 2021 at 17:34, Lukas Straub <lukasstraub2@web.de> wrote:
> >
> > The following changes since commit 5ca634afcf83215a9a54ca6e66032325b5ffb5f6:
> >
> > Merge remote-tracking branch 'remotes/philmd/tags/sdmmc-20210322' into staging (2021-03-22 18:50:25 +0000)
> >
> > are available in the Git repository at:
> >
> > https://github.com/Lukey3332/qemu.git tags/pull-26-03-2021
> >
> > for you to fetch changes up to 7c2f1ddcaa1c97462cb0b834d5aa7368283aa67d:
> >
> > tests: Add tests for yank with the chardev-change case (2021-03-26 17:12:18 +0000)
> >
> > ----------------------------------------------------------------
> > Yank fixes for 6.0:
> > -Remove qiochannel dependency from the yank core code
> > -Always link in the yank code to increase test coverage
> > -Fix yank with chardev-change
> > -Add tests for yank with chardev-change
>
> Can we get these through some established submaintainer tree, please?
>
> thanks
> -- PMM
I guess Marc-André Lureau or Markus Armbruster can take it trough their tree.
Regards,
Lukas Straub
--
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PULL for 6.0 0/6] Yank fixes
2021-03-26 18:18 ` Lukas Straub
@ 2021-03-26 20:56 ` Markus Armbruster
2021-03-26 21:00 ` Marc-André Lureau
0 siblings, 1 reply; 12+ messages in thread
From: Markus Armbruster @ 2021-03-26 20:56 UTC (permalink / raw)
To: Lukas Straub; +Cc: Peter Maydell, Marc-André Lureau, qemu-devel
Lukas Straub <lukasstraub2@web.de> writes:
> On Fri, 26 Mar 2021 17:52:40 +0000
> Peter Maydell <peter.maydell@linaro.org> wrote:
>
>> On Fri, 26 Mar 2021 at 17:34, Lukas Straub <lukasstraub2@web.de> wrote:
>> >
>> > The following changes since commit 5ca634afcf83215a9a54ca6e66032325b5ffb5f6:
>> >
>> > Merge remote-tracking branch 'remotes/philmd/tags/sdmmc-20210322' into staging (2021-03-22 18:50:25 +0000)
>> >
>> > are available in the Git repository at:
>> >
>> > https://github.com/Lukey3332/qemu.git tags/pull-26-03-2021
>> >
>> > for you to fetch changes up to 7c2f1ddcaa1c97462cb0b834d5aa7368283aa67d:
>> >
>> > tests: Add tests for yank with the chardev-change case (2021-03-26 17:12:18 +0000)
>> >
>> > ----------------------------------------------------------------
>> > Yank fixes for 6.0:
>> > -Remove qiochannel dependency from the yank core code
>> > -Always link in the yank code to increase test coverage
>> > -Fix yank with chardev-change
>> > -Add tests for yank with chardev-change
>>
>> Can we get these through some established submaintainer tree, please?
>>
>> thanks
>> -- PMM
>
> I guess Marc-André Lureau or Markus Armbruster can take it trough their tree.
My Easter break starts basically now. Marc-André, could you take care
of it? Alternatively, perhaps Eric?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PULL for 6.0 0/6] Yank fixes
2021-03-26 20:56 ` Markus Armbruster
@ 2021-03-26 21:00 ` Marc-André Lureau
0 siblings, 0 replies; 12+ messages in thread
From: Marc-André Lureau @ 2021-03-26 21:00 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Peter Maydell, Lukas Straub, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1581 bytes --]
Hi
On Sat, Mar 27, 2021 at 12:56 AM Markus Armbruster <armbru@redhat.com>
wrote:
> Lukas Straub <lukasstraub2@web.de> writes:
>
> > On Fri, 26 Mar 2021 17:52:40 +0000
> > Peter Maydell <peter.maydell@linaro.org> wrote:
> >
> >> On Fri, 26 Mar 2021 at 17:34, Lukas Straub <lukasstraub2@web.de> wrote:
> >> >
> >> > The following changes since commit
> 5ca634afcf83215a9a54ca6e66032325b5ffb5f6:
> >> >
> >> > Merge remote-tracking branch 'remotes/philmd/tags/sdmmc-20210322'
> into staging (2021-03-22 18:50:25 +0000)
> >> >
> >> > are available in the Git repository at:
> >> >
> >> > https://github.com/Lukey3332/qemu.git tags/pull-26-03-2021
> >> >
> >> > for you to fetch changes up to
> 7c2f1ddcaa1c97462cb0b834d5aa7368283aa67d:
> >> >
> >> > tests: Add tests for yank with the chardev-change case (2021-03-26
> 17:12:18 +0000)
> >> >
> >> > ----------------------------------------------------------------
> >> > Yank fixes for 6.0:
> >> > -Remove qiochannel dependency from the yank core code
> >> > -Always link in the yank code to increase test coverage
> >> > -Fix yank with chardev-change
> >> > -Add tests for yank with chardev-change
> >>
> >> Can we get these through some established submaintainer tree, please?
> >>
> >> thanks
> >> -- PMM
> >
> > I guess Marc-André Lureau or Markus Armbruster can take it trough their
> tree.
>
> My Easter break starts basically now. Marc-André, could you take care
> of it? Alternatively, perhaps Eric?
>
>
Yes, I will send a PR
Enjoy!
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 2562 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread