aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-04-01 17:08:48 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-04-01 17:08:48 +0100
commit415fa2fe91e2a49fe8d56d6aacc8f8db82c74775 (patch)
tree69112f0167a7926dc7d735b9c2dbd879f6720fc2 /tests
parent00084bab87c43be20638de7f191d1a1faed134cc (diff)
parentd3a0bb7706520928f8493fabaee76532b5b1adb4 (diff)
downloadqemu-415fa2fe91e2a49fe8d56d6aacc8f8db82c74775.zip
qemu-415fa2fe91e2a49fe8d56d6aacc8f8db82c74775.tar.gz
qemu-415fa2fe91e2a49fe8d56d6aacc8f8db82c74775.tar.bz2
Merge remote-tracking branch 'remotes/marcandre/tags/for-6.0-pull-request' into staging
For 6.0 misc patches under my radar. V2: - "tests: Add tests for yank with the chardev-change case" updated - drop the readthedoc theme patch # gpg: Signature made Thu 01 Apr 2021 12:54:52 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/for-6.0-pull-request: tests: Add tests for yank with the chardev-change case chardev: Fix yank with the chardev-change case chardev/char.c: Always pass id to chardev_new chardev/char.c: Move object_property_try_add_child out of chardev_new yank: Always link full yank code yank: Remove dependency on qiochannel docs: simplify each section title dbus-vmstate: Increase the size of input stream buffer used during load util: fix use-after-free in module_load_one Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/meson.build3
-rw-r--r--tests/unit/test-yank.c249
2 files changed, 251 insertions, 1 deletions
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index 4bfe462..b3bc210 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 0000000..2383d29
--- /dev/null
+++ b/tests/unit/test-yank.c
@@ -0,0 +1,249 @@
+/*
+ * 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 gpointer accept_thread(gpointer data)
+{
+ QIOChannelSocket *ioc = data;
+ QIOChannelSocket *cioc;
+
+ cioc = qio_channel_socket_accept(ioc, &error_abort);
+ object_unref(OBJECT(cioc));
+
+ return NULL;
+}
+
+static void char_change_test(gconstpointer opaque)
+{
+ CharChangeTestConfig *conf = (gpointer) opaque;
+ SocketAddress *addr;
+ Chardev *chr;
+ CharBackend be;
+ ChardevReturn *ret;
+ QIOChannelSocket *ioc;
+ QemuThread thread;
+
+ /*
+ * 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());
+
+ if (conf->old_yank) {
+ qemu_thread_create(&thread, "accept", accept_thread,
+ ioc, QEMU_THREAD_JOINABLE);
+ }
+
+ 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);
+ if (conf->old_yank) {
+ qemu_thread_join(&thread);
+ }
+
+ 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 {
+ if (conf->new_yank) {
+ qemu_thread_create(&thread, "accept", accept_thread,
+ ioc, QEMU_THREAD_JOINABLE);
+ }
+ ret = qmp_chardev_change("chardev", &backend[conf->new_yank],
+ &error_abort);
+ if (conf->new_yank) {
+ qemu_thread_join(&thread);
+ }
+ 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);
+
+ g_test_add_data_func("/yank/char_change/success/to_yank",
+ &(CharChangeTestConfig) { .addr = &tcpaddr,
+ .old_yank = false,
+ .new_yank = true,
+ .fail = false },
+ char_change_test);
+ g_test_add_data_func("/yank/char_change/fail/to_yank",
+ &(CharChangeTestConfig) { .addr = &tcpaddr,
+ .old_yank = false,
+ .new_yank = true,
+ .fail = true },
+ char_change_test);
+
+ g_test_add_data_func("/yank/char_change/success/yank_to_yank",
+ &(CharChangeTestConfig) { .addr = &tcpaddr,
+ .old_yank = true,
+ .new_yank = true,
+ .fail = false },
+ char_change_test);
+ g_test_add_data_func("/yank/char_change/fail/yank_to_yank",
+ &(CharChangeTestConfig) { .addr = &tcpaddr,
+ .old_yank = true,
+ .new_yank = true,
+ .fail = true },
+ char_change_test);
+
+ g_test_add_data_func("/yank/char_change/success/from_yank",
+ &(CharChangeTestConfig) { .addr = &tcpaddr,
+ .old_yank = true,
+ .new_yank = false,
+ .fail = false },
+ char_change_test);
+ g_test_add_data_func("/yank/char_change/fail/from_yank",
+ &(CharChangeTestConfig) { .addr = &tcpaddr,
+ .old_yank = true,
+ .new_yank = false,
+ .fail = true },
+ char_change_test);
+
+end:
+ return g_test_run();
+}