From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DE88C3A59D for ; Thu, 22 Aug 2019 10:59:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F9FD233A0 for ; Thu, 22 Aug 2019 10:59:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F9FD233A0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0ko7-0007Lj-66 for qemu-devel@archiver.kernel.org; Thu, 22 Aug 2019 06:59:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46033) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0klF-0003l3-E3 for qemu-devel@nongnu.org; Thu, 22 Aug 2019 06:56:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0klC-0007FQ-2E for qemu-devel@nongnu.org; Thu, 22 Aug 2019 06:56:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33708) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i0klB-0007Dv-Ld for qemu-devel@nongnu.org; Thu, 22 Aug 2019 06:56:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CD74C307D965 for ; Thu, 22 Aug 2019 10:56:04 +0000 (UTC) Received: from work-vm (ovpn-117-231.ams2.redhat.com [10.36.117.231]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 26FC11001B17; Thu, 22 Aug 2019 10:56:00 +0000 (UTC) Date: Thu, 22 Aug 2019 11:55:58 +0100 From: "Dr. David Alan Gilbert" To: =?iso-8859-1?Q?Marc-Andr=E9?= Lureau Message-ID: <20190822105558.GF3277@work-vm> References: <20190808150325.21939-1-marcandre.lureau@redhat.com> <20190808150325.21939-3-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20190808150325.21939-3-marcandre.lureau@redhat.com> User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 22 Aug 2019 10:56:04 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v2 2/2] Add dbus-vmstate object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , qemu-devel@nongnu.org, Juan Quintela Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Marc-Andr=E9 Lureau (marcandre.lureau@redhat.com) wrote: > When instanciated, this object will connect to the given D-Bus > bus. During migration, it will take the data from org.qemu.VMState1 > instances. >=20 > See documentation for further details. I'll leave the main review to someone who understands the details of DBUS, however from the migration side: > Signed-off-by: Marc-Andr=E9 Lureau > + > +static int > +dbus_load_state(QEMUFile *f, void *opaque, int version_id) > +{ > + DBusVMState *self =3D DBUS_VMSTATE(opaque); > + uint8_t *data =3D NULL; > + int ret =3D -1; > + char id[256]; > + unsigned int size; Higher level question; do you actually need a separate ID, or does the ID that's stored by the migration code in the section name give you enough uniqueness? > + if (qemu_get_counted_string(f, id) =3D=3D 0) { > + error_report("Invalid vmstate Id"); > + goto end; I generally prefer to include something telling me where the error has come from, just to make it easier to track down if I see the error in a log; e.g. use __func__ > + } > + > + if (g_strcmp0(id, self->id)) { > + error_report("Invalid vmstate Id: %s !=3D %s", id, self->id); > + goto end; > + } > + > + size =3D qemu_get_be32(f); > + if (size > DBUS_VMSTATE_SIZE_LIMIT) { > + error_report("Invalid vmstate size: %u", size); > + goto end; > + } > + > + data =3D g_malloc(size); > + if (qemu_get_buffer(f, data, size) !=3D size) { > + error_report("Failed to read %u bytes", size); > + goto end; > + } > + > + if (dbus_load_state_proxy(self->proxy, data, size) < 0) { > + error_report("Failed to restore Id '%s'", id); > + goto end; > + } > + > + ret =3D 0; > + > +end: > + g_clear_pointer(&data, g_free); > + return ret; > +} > + > +static void > +dbus_save_state(QEMUFile *f, void *opaque) > +{ > + DBusVMState *self =3D DBUS_VMSTATE(opaque); > + GVariant *result =3D NULL, *child =3D NULL; > + const uint8_t *data; > + size_t size; > + GError *err =3D NULL; > + > + result =3D g_dbus_proxy_call_sync(self->proxy, "Save", > + NULL, G_DBUS_CALL_FLAGS_NO_AUTO_ST= ART, > + -1, NULL, &err); > + if (!result) { > + error_report("Failed to Save: %s", err->message); > + g_clear_error(&err); > + goto end; > + } > + > + child =3D g_variant_get_child_value(result, 0); > + data =3D g_variant_get_fixed_array(child, &size, sizeof(char)); > + if (!data) { > + error_report("Failed to Save: not a byte array"); > + goto end; > + } > + if (size > DBUS_VMSTATE_SIZE_LIMIT) { > + error_report("Too much vmstate data to save: %zu", size); > + goto end; > + } > + > + qemu_put_counted_string(f, self->id); > + qemu_put_be32(f, size); > + qemu_put_buffer(f, data, size); > + > +end: > + g_clear_pointer(&child, g_variant_unref); > + g_clear_pointer(&result, g_variant_unref); > +} > + > +static const SaveVMHandlers savevm_handlers =3D { > + .save_state =3D dbus_save_state, > + .load_state =3D dbus_load_state, > +}; > + > +static void > +dbus_vmstate_complete(UserCreatable *uc, Error **errp) > +{ > + DBusVMState *self =3D DBUS_VMSTATE(uc); > + GError *err =3D NULL; > + GDBusConnection *bus =3D NULL; > + GDBusProxy *proxy =3D NULL; > + char *idstr =3D NULL; > + > + if (!self->dbus_addr) { > + error_setg(errp, QERR_MISSING_PARAMETER, "addr"); > + return; > + } > + > + bus =3D g_dbus_connection_new_for_address_sync(self->dbus_addr, > + G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT, > + NULL, NULL, &err); > + if (err) { > + error_setg(errp, "failed to connect to DBus: '%s'", err->messa= ge); > + g_clear_error(&err); > + return; > + } > + > + self->bus =3D bus; > + > + proxy =3D g_dbus_proxy_new_sync(bus, > + G_DBUS_PROXY_FLAGS_NONE, > + (GDBusInterfaceInfo *) &vmstate1_interface_info, > + NULL, > + "/org/qemu/VMState1", > + "org.qemu.VMState1", > + NULL, &err); > + > + if (err) { > + error_setg(errp, "failed to create DBus proxy: '%s'", err->mes= sage); > + g_clear_error(&err); > + return; > + } > + > + self->proxy =3D proxy; > + > + self->id =3D dbus_proxy_get_id(proxy, &err); > + if (!self->id) { > + error_setg(errp, "failed to get DBus Id: '%s'", err->message); > + g_clear_error(&err); > + return; > + } > + > + idstr =3D get_idstr(self); > + if (register_savevm_live(NULL, idstr, 0, 0, > + &savevm_handlers, self) < 0) { > + error_setg(errp, "Failed to register savevm handler"); > + } Can you try and avoid register_savevm_live if possible and just wire a vmsd onto the class like most other devices? We don't have many register_savevm_live calls, and I'd like to get them down to just the iterative devices. Dave > + g_free(idstr); > +} > + > +static void > +dbus_vmstate_finalize(Object *o) > +{ > + DBusVMState *self =3D DBUS_VMSTATE(o); > + char *idstr =3D get_idstr(self); > + > + unregister_savevm(NULL, idstr, self); > + > + g_clear_object(&self->bus); > + g_clear_object(&self->proxy); > + g_free(self->dbus_addr); > + g_free(self->id); > + g_free(idstr); > +} > + > +static char * > +get_dbus_addr(Object *o, Error **errp) > +{ > + DBusVMState *self =3D DBUS_VMSTATE(o); > + > + return g_strdup(self->dbus_addr); > +} > + > +static void > +set_dbus_addr(Object *o, const char *str, Error **errp) > +{ > + DBusVMState *self =3D DBUS_VMSTATE(o); > + > + g_free(self->dbus_addr); > + self->dbus_addr =3D g_strdup(str); > +} > + > +static void > +dbus_vmstate_class_init(ObjectClass *oc, void *data) > +{ > + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); > + > + ucc->complete =3D dbus_vmstate_complete; > + > + object_class_property_add_str(oc, "addr", > + get_dbus_addr, set_dbus_addr, > + &error_abort); > +} > + > +static const TypeInfo dbus_vmstate_info =3D { > + .name =3D TYPE_DBUS_VMSTATE, > + .parent =3D TYPE_OBJECT, > + .instance_size =3D sizeof(DBusVMState), > + .instance_finalize =3D dbus_vmstate_finalize, > + .class_size =3D sizeof(DBusVMStateClass), > + .class_init =3D dbus_vmstate_class_init, > + .interfaces =3D (InterfaceInfo[]) { > + { TYPE_USER_CREATABLE }, > + { } > + } > +}; > + > +static void > +register_types(void) > +{ > + type_register_static(&dbus_vmstate_info); > +} > + > +type_init(register_types); > diff --git a/configure b/configure > index 714e7fb6a1..e5b34f5ca7 100755 > --- a/configure > +++ b/configure > @@ -3665,10 +3665,16 @@ if $pkg_config --atleast-version=3D$glib_req_ve= r gio-2.0; then > gio=3Dyes > gio_cflags=3D$($pkg_config --cflags gio-2.0) > gio_libs=3D$($pkg_config --libs gio-2.0) > + gdbus_codegen=3D$($pkg_config --variable=3Dgdbus_codegen gio-2.0) > else > gio=3Dno > fi > =20 > +if $pkg_config --atleast-version=3D$glib_req_ver gio-unix-2.0; then > + gio_cflags=3D"$gio_cflags $($pkg_config --cflags gio-unix-2.0)" > + gio_libs=3D"$gio_libs $($pkg_config --libs gio-unix-2.0)" > +fi > + > # Sanity check that the current size_t matches the > # size that glib thinks it should be. This catches > # problems on multi-arch where people try to build > @@ -6830,6 +6836,7 @@ if test "$gio" =3D "yes" ; then > echo "CONFIG_GIO=3Dy" >> $config_host_mak > echo "GIO_CFLAGS=3D$gio_cflags" >> $config_host_mak > echo "GIO_LIBS=3D$gio_libs" >> $config_host_mak > + echo "GDBUS_CODEGEN=3D$gdbus_codegen" >> $config_host_mak > fi > echo "CONFIG_TLS_PRIORITY=3D\"$tls_priority\"" >> $config_host_mak > if test "$gnutls" =3D "yes" ; then > diff --git a/docs/interop/dbus-vmstate.rst b/docs/interop/dbus-vmstate.= rst > new file mode 100644 > index 0000000000..4a32a183fb > --- /dev/null > +++ b/docs/interop/dbus-vmstate.rst > @@ -0,0 +1,63 @@ > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > +DBus VMState > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > + > +Introduction > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > + > +Helper processes may have their state migrated with the help of > +QEMU "dbus-vmstate" objects. > + > +At this point, the connection to the helper is done in DBus > +peer-to-peer mode (no initial Hello, and no bus name for > +communication). The helper must be listening to the given address. > + > +Helper may save arbitrary data to be transferred in the migration > +stream and restored/loaded on destination. > + > +The data amount to be transferred is limited to 1Mb. The state must be > +saved quickly (a few seconds maximum). (DBus imposes a time limit on > +reply anyway, and migration would fail if the data isn't given quickly > +enough) > + > +Interface > +=3D=3D=3D=3D=3D=3D=3D=3D=3D > + > +On /org/qemu/VMState1 object path: > + > +.. code:: xml > + > + > + > + > + > + > + > + > + > + > + > +"Id" property > +------------- > + > +A utf8 encoded string that identifies the helper uniquely. > +Must be <256 bytes. > + > +Load(in u8[] bytes) method > +-------------------------- > + > +The method called on destination with the state to restore. > + > +The helper may be initially started in a waiting state (with > +an --incoming argument for example), and it may resume on load > +success. > + > +An error may be returned to the caller. > + > +Save(out u8[] bytes) method > +--------------------------- > + > +The method called on the source to get the current state to be > +migrated. The helper should continue to run normally. > + > +An error may be returned to the caller. > diff --git a/docs/interop/index.rst b/docs/interop/index.rst > index b4bfcab417..6bb173cfa6 100644 > --- a/docs/interop/index.rst > +++ b/docs/interop/index.rst > @@ -13,6 +13,7 @@ Contents: > :maxdepth: 2 > =20 > bitmaps > + dbus-vmstate > live-block-operations > pr-helper > vhost-user > diff --git a/tests/Makefile.include b/tests/Makefile.include > index fd7fdb8658..2c610086a7 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -157,7 +157,9 @@ check-qtest-pci-$(CONFIG_RTL8139_PCI) +=3D tests/rt= l8139-test$(EXESUF) > check-qtest-pci-$(CONFIG_VGA) +=3D tests/display-vga-test$(EXESUF) > check-qtest-pci-$(CONFIG_HDA) +=3D tests/intel-hda-test$(EXESUF) > check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) +=3D tests/ivshmem-test$(EXES= UF) > - > +ifneq ($(GDBUS_CODEGEN),) > +check-qtest-pci-$(CONFIG_GIO) +=3D tests/dbus-vmstate-test$(EXESUF) > +endif > check-qtest-i386-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXES= UF) > check-qtest-i386-y +=3D tests/fdc-test$(EXESUF) > check-qtest-i386-y +=3D tests/ide-test$(EXESUF) > @@ -618,6 +620,18 @@ tests/qapi-schema/doc-good.test.texi: $(SRC_PATH)/= tests/qapi-schema/doc-good.jso > @mv tests/qapi-schema/doc-good-qapi-doc.texi $@ > @rm -f tests/qapi-schema/doc-good-qapi-*.[ch] tests/qapi-schema/doc-g= ood-qmp-*.[ch] > =20 > +tests/dbus-vmstate1.h tests/dbus-vmstate1.c: tests/dbus-vmstate1-gen-t= imestamp ; > +tests/dbus-vmstate1-gen-timestamp: $(SRC_PATH)/tests/dbus-vmstate1.xml > + $(call quiet-command,$(GDBUS_CODEGEN) $< \ > + --interface-prefix org.qemu --generate-c-code tests/dbus-vmstate1, \ > + "GEN","$(@:%-timestamp=3D%)") > + @>$@ > + > +tests/dbus-vmstate1.o-cflags :=3D $(GIO_CFLAGS) > +tests/dbus-vmstate1.o-libs :=3D $(GIO_LIBS) > + > +tests/dbus-vmstate-test.o: tests/dbus-vmstate1.h > + > tests/test-string-output-visitor$(EXESUF): tests/test-string-output-vi= sitor.o $(test-qapi-obj-y) > tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visi= tor.o $(test-qapi-obj-y) > tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-= y) tests/test-qapi-events.o > @@ -820,6 +834,7 @@ tests/test-filter-mirror$(EXESUF): tests/test-filte= r-mirror.o $(qtest-obj-y) > tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o = $(qtest-obj-y) > tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(= qtest-obj-y) > tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-serv= er/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) > +tests/dbus-vmstate-test$(EXESUF): tests/dbus-vmstate-test.o tests/dbus= -vmstate1.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) > tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-uti= l-obj-y) libvhost-user.a > tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y) > tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o > @@ -1172,6 +1187,7 @@ check-clean: > rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) > rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$= (target)-y)) $(check-qtest-generic-y)) > rm -f tests/test-qapi-gen-timestamp > + rm -f tests/dbus-vmstate1-gen-timestamp > rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) > =20 > clean: check-clean > diff --git a/tests/dbus-vmstate-test.c b/tests/dbus-vmstate-test.c > new file mode 100644 > index 0000000000..45d44916d2 > --- /dev/null > +++ b/tests/dbus-vmstate-test.c > @@ -0,0 +1,371 @@ > +#include "qemu/osdep.h" > +#include > +#include > +#include "libqtest.h" > +#include "qemu-common.h" > +#include "dbus-vmstate1.h" > + > +static char *workdir; > + > +typedef struct TestServerId { > + const char *name; > + const char *data; > + size_t size; > +} TestServerId; > + > +static const TestServerId idA =3D { > + "idA", "I'am\0idA!", sizeof("I'am\0idA!") > +}; > + > +static const TestServerId idB =3D { > + "idB", "I'am\0idB!", sizeof("I'am\0idB!") > +}; > + > +typedef struct TestServer { > + const TestServerId *id; > + bool save_called; > + bool load_called; > + GDBusObjectManagerServer *om; > + GDBusServer *server; > +} TestServer; > + > +typedef struct Test { > + bool migrate_fail; > + TestServer srcA; > + TestServer dstA; > + TestServer srcB; > + TestServer dstB; > + GMainLoop *loop, *dbus_loop; > + QTestState *src_qemu; > +} Test; > + > +GMutex mutex; > +GCond cond; > + > +static gboolean > +vmstate_load(VMState1 *object, GDBusMethodInvocation *invocation, > + const gchar *arg_data, gpointer user_data) > +{ > + TestServer *h =3D user_data; > + GVariant *args, *var; > + const uint8_t *data; > + size_t size; > + > + args =3D g_dbus_method_invocation_get_parameters(invocation); > + var =3D g_variant_get_child_value(args, 0); > + data =3D g_variant_get_fixed_array(var, &size, sizeof(char)); > + g_assert_cmpuint(size, =3D=3D, h->id->size); > + g_assert(!memcmp(data, h->id->data, h->id->size)); > + h->load_called =3D true; > + g_variant_unref(var); > + > + g_dbus_method_invocation_return_value(invocation, g_variant_new("(= )")); > + return TRUE; > +} > + > +static gboolean > +vmstate_save(VMState1 *object, GDBusMethodInvocation *invocation, > + gpointer user_data) > +{ > + TestServer *h =3D user_data; > + GVariant *var; > + > + var =3D g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, > + h->id->data, h->id->size, sizeof(c= har)); > + g_dbus_method_invocation_return_value(invocation, > + g_variant_new("(@ay)", var))= ; > + h->save_called =3D true; > + > + return TRUE; > +} > + > +static void > +connection_closed(GDBusConnection *connection, > + gboolean remote_peer_vanished, > + GError *Error, > + gpointer user_data) > +{ > + TestServer *h =3D user_data; > + > + g_clear_object(&h->om); > + g_clear_object(&connection); > +} > + > +static GDBusObjectManagerServer * > +get_omserver(GDBusConnection *conn, gpointer user_data) > +{ > + TestServer *h =3D user_data; > + GDBusObjectManagerServer *om; > + GDBusObjectSkeleton *sk; > + VMState1 *v; > + > + om =3D g_dbus_object_manager_server_new("/org/qemu"); > + sk =3D g_dbus_object_skeleton_new("/org/qemu/VMState1"); > + > + v =3D vmstate1_skeleton_new(); > + g_object_set(v, "id", h->id->name, NULL); > + g_signal_connect(v, "handle-load", G_CALLBACK(vmstate_load), user_= data); > + g_signal_connect(v, "handle-save", G_CALLBACK(vmstate_save), user_= data); > + > + g_dbus_object_skeleton_add_interface(sk, G_DBUS_INTERFACE_SKELETON= (v)); > + g_dbus_object_manager_server_export(om, sk); > + g_dbus_object_manager_server_set_connection(om, conn); > + > + g_clear_object(&v); > + g_clear_object(&sk); > + > + return om; > +} > + > +static gboolean > +on_new_connection(GDBusServer *server, > + GDBusConnection *connection, > + gpointer user_data) > +{ > + TestServer *h =3D user_data; > + > + g_object_ref(connection); > + g_signal_connect(connection, "closed", > + G_CALLBACK(connection_closed), user_data); > + h->om =3D get_omserver(connection, user_data); > + > + return TRUE; > +} > + > +static gboolean > +allow_mechanism_cb(GDBusAuthObserver *observer, > + const gchar *mechanism, > + gpointer user_data) > +{ > + return g_strcmp0(mechanism, "EXTERNAL") =3D=3D 0; > +} > + > +static gboolean > +authorize_authenticated_peer_cb(GDBusAuthObserver *observer, > + GIOStream *stream, > + GCredentials *credentials, > + gpointer user_data) > +{ > + gboolean authorized =3D FALSE; > + > + if (credentials !=3D NULL) { > + GCredentials *own_credentials =3D g_credentials_new(); > + > + if (g_credentials_is_same_user(credentials, own_credentials, N= ULL)) { > + authorized =3D TRUE; > + } > + > + g_clear_object(&own_credentials); > + } > + > + return authorized; > +} > + > +static GDBusServer * > +server_start(TestServer *h, const char *p, const TestServerId *id) > +{ > + GDBusAuthObserver *observer =3D NULL; > + GDBusServer *server =3D NULL; > + gchar *guid =3D NULL; > + GError *error =3D NULL; > + char *addr =3D NULL; > + > + h->id =3D id; > + addr =3D g_strdup_printf("unix:path=3D%s/dbus-%s%s", workdir, p, h= ->id->name); > + guid =3D g_dbus_generate_guid(); > + observer =3D g_dbus_auth_observer_new(); > + g_signal_connect(observer, "allow-mechanism", > + G_CALLBACK(allow_mechanism_cb), h); > + g_signal_connect(observer, "authorize-authenticated-peer", > + G_CALLBACK(authorize_authenticated_peer_cb), h); > + > + server =3D g_dbus_server_new_sync(addr, > + G_DBUS_SERVER_FLAGS_NONE, > + guid, > + observer, > + NULL, /* GCancellable */ > + &error); > + g_dbus_server_start(server); > + g_clear_object(&observer); > + g_free(guid); > + > + if (server =3D=3D NULL) { > + g_printerr("Error creating server at address %s: %s\n", > + addr, error->message); > + g_error_free(error); > + return NULL; > + } > + > + g_signal_connect(server, "new-connection", > + G_CALLBACK(on_new_connection), h); > + > + g_free(addr); > + return server; > +} > + > + > +static gpointer > +dbus_thread(gpointer p) > +{ > + Test *test =3D p; > + GMainContext *context =3D g_main_context_new(); > + GMainLoop *loop =3D g_main_loop_new(context, FALSE); > + > + g_main_context_push_thread_default(context); > + > + g_mutex_lock(&mutex); > + test->srcA.server =3D server_start(&test->srcA, "src", &idA); > + test->srcB.server =3D server_start(&test->srcB, "src", &idB); > + test->dstA.server =3D server_start(&test->dstA, "dst", &idA); > + test->dstB.server =3D server_start(&test->dstB, "dst", &idB); > + test->dbus_loop =3D loop; > + g_cond_signal(&cond); > + g_mutex_unlock(&mutex); > + > + g_main_loop_run(loop); > + > + g_main_loop_unref(loop); > + g_main_context_unref(context); > + > + g_mutex_lock(&mutex); > + g_clear_object(&test->srcA.server); > + g_clear_object(&test->srcB.server); > + g_clear_object(&test->dstA.server); > + g_clear_object(&test->dstB.server); > + g_mutex_unlock(&mutex); > + > + return NULL; > +} > + > +static gboolean > +wait_for_migration_complete(gpointer user_data) > +{ > + Test *test =3D user_data; > + QDict *rsp_return; > + bool stop =3D false; > + const char *status; > + > + qtest_qmp_send(test->src_qemu, "{ 'execute': 'query-migrate' }"); > + rsp_return =3D qtest_qmp_receive_success(test->src_qemu, NULL, NUL= L); > + status =3D qdict_get_str(rsp_return, "status"); > + if (g_str_equal(status, "completed") || g_str_equal(status, "faile= d")) { > + stop =3D true; > + g_assert_cmpstr(status, =3D=3D, > + test->migrate_fail ? "failed" : "completed"); > + } > + qobject_unref(rsp_return); > + > + if (stop) { > + g_main_loop_quit(test->loop); > + } > + return stop ? G_SOURCE_REMOVE : G_SOURCE_CONTINUE; > +} > + > +static void migrate(QTestState *who, const char *uri) > +{ > + QDict *args, *rsp; > + > + args =3D qdict_new(); > + qdict_put_str(args, "uri", uri); > + > + rsp =3D qtest_qmp(who, "{ 'execute': 'migrate', 'arguments': %p }"= , args); > + > + g_assert(qdict_haskey(rsp, "return")); > + qobject_unref(rsp); > +} > + > +static void > +test_dbus_vmstate(Test *test) > +{ > + QTestState *src_qemu =3D NULL, *dst_qemu =3D NULL; > + char *src_qemu_args =3D NULL, *dst_qemu_args =3D NULL; > + char *uri =3D g_strdup_printf("unix:%s/migsocket", workdir); > + GThread *t =3D g_thread_new("dbus", dbus_thread, test); > + > + g_mutex_lock(&mutex); > + while (!test->dbus_loop) { > + g_cond_wait(&cond, &mutex); > + } > + > + src_qemu_args =3D > + g_strdup_printf("-object dbus-vmstate,id=3DdvA,addr=3D%s " > + "-object dbus-vmstate,id=3DdvB,addr=3D%s", > + g_dbus_server_get_client_address(test->srcA.se= rver), > + g_dbus_server_get_client_address(test->srcB.se= rver)); > + > + > + dst_qemu_args =3D > + g_strdup_printf("-object dbus-vmstate,id=3DdvA,addr=3D%s " > + "-object dbus-vmstate,id=3DdvB,addr=3D%s " > + "-incoming %s", > + g_dbus_server_get_client_address(test->dstA.se= rver), > + g_dbus_server_get_client_address(test->dstB.se= rver), > + uri); > + > + src_qemu =3D qtest_init(src_qemu_args); > + dst_qemu =3D qtest_init(dst_qemu_args); > + > + test->loop =3D g_main_loop_new(NULL, TRUE); > + > + migrate(src_qemu, uri); > + test->src_qemu =3D src_qemu; > + g_timeout_add_seconds(1, wait_for_migration_complete, test); > + > + g_main_loop_run(test->loop); > + g_main_loop_unref(test->loop); > + > + g_free(uri); > + qtest_quit(dst_qemu); > + qtest_quit(src_qemu); > + g_free(dst_qemu_args); > + g_free(src_qemu_args); > + > + g_main_loop_quit(test->dbus_loop); > + g_mutex_unlock(&mutex); > + > + g_thread_join(t); > +} > + > +static void > +check_migrated(TestServer *s, TestServer *d) > +{ > + assert(s->save_called); > + assert(!s->load_called); > + assert(!d->save_called); > + assert(d->load_called); > +} > + > +static void > +test_dbus_vmstate_migrate(void) > +{ > + Test test =3D { }; > + > + test_dbus_vmstate(&test); > + > + check_migrated(&test.srcA, &test.dstA); > + check_migrated(&test.srcB, &test.dstB); > +} > + > +int > +main(int argc, char **argv) > +{ > + GError *err =3D NULL; > + int ret; > + > + g_test_init(&argc, &argv, NULL); > + > + workdir =3D g_dir_make_tmp("dbus-vmstate-test-XXXXXX", &err); > + if (!workdir) { > + g_error("Unable to create temporary dir: %s\n", err->message); > + } > + > + qtest_add_func("/dbus-vmstate/migrate", > + test_dbus_vmstate_migrate); > + > + ret =3D g_test_run(); > + > + rmdir(workdir); > + g_free(workdir); > + > + return ret; > +} > diff --git a/tests/dbus-vmstate1.xml b/tests/dbus-vmstate1.xml > new file mode 100644 > index 0000000000..cc8563be4c > --- /dev/null > +++ b/tests/dbus-vmstate1.xml > @@ -0,0 +1,12 @@ > + > + > + > + > + > + > + > + > + > + > + > + > --=20 > 2.23.0.rc1 >=20 -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK