From nobody Mon Feb 9 14:44:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568292174; cv=none; d=zoho.com; s=zohoarc; b=NkRrJt9RmxsKJC2JCTR1NDVQH8GgqRQ9csAl0ppbR8SIWkjcONTzgicIg+rkSkbTAYb3ACXJ8xulja9SpqMitzViXrVVyV7lv44W1NXA0bJuDtHZl7XTcoSaszrjXb6eLjRhc1OSOwGUK5A2ED6FZanl0TdGBG7UtZI5LGDeC8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568292174; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=MzscqXmJi7Ja6tnRwWg2UrfoXUFY2xIXopAk1g5JURM=; b=DJ2kLpmdYFAVD64wBBfrFX9tGOcKy3lO68zA5fFvcs9bQOwcAHMnh2hPLI4wBfneeZZN6WJCCejIha0nCCRqsbCvSnM1HWgudNdYe4JuJ/Y+GWQhwzEmK5hul9k6YfDxQraCewadJKOyV6oGPWj3hVKNQ5iKYJ5P/Pk4eJmp7u8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568292174006337.08655458021985; Thu, 12 Sep 2019 05:42:54 -0700 (PDT) Received: from localhost ([::1]:34072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OQx-0001gF-He for importer@patchew.org; Thu, 12 Sep 2019 08:42:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51391) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OAG-0002sM-Ga for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8OAF-0007OG-IS for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43508) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8OAF-0007O8-D6 for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BAF0230A7B89 for ; Thu, 12 Sep 2019 12:25:30 +0000 (UTC) Received: from localhost (ovpn-112-63.ams2.redhat.com [10.36.112.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8A1560F82; Thu, 12 Sep 2019 12:25:26 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 12 Sep 2019 16:25:09 +0400 Message-Id: <20190912122514.22504-2-marcandre.lureau@redhat.com> In-Reply-To: <20190912122514.22504-1-marcandre.lureau@redhat.com> References: <20190912122514.22504-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 12 Sep 2019 12:25:30 +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: [Qemu-devel] [PATCH v3 1/6] migration: fix vmdesc leak on vmstate_save() error 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: berrange@redhat.com, quintela@redhat.com, mprivozn@redhat.com, dgilbert@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Dr. David Alan Gilbert --- migration/qjson.h | 2 ++ migration/savevm.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/migration/qjson.h b/migration/qjson.h index 41664f2d71..1786bb5864 100644 --- a/migration/qjson.h +++ b/migration/qjson.h @@ -24,4 +24,6 @@ void json_start_object(QJSON *json, const char *name); const char *qjson_get_str(QJSON *json); void qjson_finish(QJSON *json); =20 +G_DEFINE_AUTOPTR_CLEANUP_FUNC(QJSON, qjson_destroy) + #endif /* QEMU_QJSON_H */ diff --git a/migration/savevm.c b/migration/savevm.c index 4a86128ac4..6caa35a679 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1290,7 +1290,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(Q= EMUFile *f, bool in_postcopy, bool inactivate_disks) { - QJSON *vmdesc; + g_autoptr(QJSON) vmdesc =3D NULL; int vmdesc_len; SaveStateEntry *se; int ret; @@ -1351,7 +1351,6 @@ int qemu_savevm_state_complete_precopy_non_iterable(Q= EMUFile *f, qemu_put_be32(f, vmdesc_len); qemu_put_buffer(f, (uint8_t *)qjson_get_str(vmdesc), vmdesc_len); } - qjson_destroy(vmdesc); =20 return 0; } --=20 2.23.0 From nobody Mon Feb 9 14:44:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568291481; cv=none; d=zoho.com; s=zohoarc; b=dioQi0dhzeni0ucTCRGAGoYc5uE3XbblQ/tXaFAbM68VNxfk5K+k78ZGW6mHWPm4C2tJreJHfdSUwbM8Ag/0jo88poxHaWAbr6ngsUUi3JRukp2C0ZvpkgEFOK2iBqG6Wwgdd+GlXJLAXWtEXTB0V8Hw45Oj61KiULs2CGuq/Xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568291481; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=48OGDm6SnKNEmvg66By8Z29TgjPcDwnMeRL10pdJaFo=; b=frlMe1xDR7GU0fx0UlrjT4aqNHUtpqKqdMADfH6epkHkDKSTx2R3olXnezNeoEqX7dpPtKmCKD3nu2ZiJ69NILFLGti1Br7UWqg6Auh6GaOI4MYhyrmz2CtBQ6R4nnu1g5w9PnSn67+66My8kfRdBIBVBFzC8k8e5xA0u5aIU6A= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568291481041510.6115950896525; Thu, 12 Sep 2019 05:31:21 -0700 (PDT) Received: from localhost ([::1]:33952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OFn-0007Ah-Te for importer@patchew.org; Thu, 12 Sep 2019 08:31:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51406) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OAP-00033a-2n for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8OAN-0007Qc-Ne for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15380) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8OAN-0007QR-GO for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:39 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D9CA083F40 for ; Thu, 12 Sep 2019 12:25:38 +0000 (UTC) Received: from localhost (ovpn-112-63.ams2.redhat.com [10.36.112.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BEEA600C4; Thu, 12 Sep 2019 12:25:34 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 12 Sep 2019 16:25:10 +0400 Message-Id: <20190912122514.22504-3-marcandre.lureau@redhat.com> In-Reply-To: <20190912122514.22504-1-marcandre.lureau@redhat.com> References: <20190912122514.22504-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 12 Sep 2019 12:25:38 +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: [Qemu-devel] [PATCH v3 2/6] vmstate: add qom interface to get id 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: berrange@redhat.com, quintela@redhat.com, mprivozn@redhat.com, dgilbert@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add an interface to get the instance id, instead of depending on Device and qdev_get_dev_path(). Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/core/Makefile.objs | 1 + hw/core/qdev.c | 14 ++++++++++++++ hw/core/vmstate-if.c | 23 +++++++++++++++++++++++ include/hw/vmstate-if.h | 32 ++++++++++++++++++++++++++++++++ include/migration/register.h | 2 ++ include/migration/vmstate.h | 2 ++ tests/Makefile.include | 1 + 7 files changed, 75 insertions(+) create mode 100644 hw/core/vmstate-if.c create mode 100644 include/hw/vmstate-if.h diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index fd0550d1d9..0edd9e635d 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -9,6 +9,7 @@ common-obj-y +=3D hotplug.o common-obj-$(CONFIG_SOFTMMU) +=3D nmi.o common-obj-$(CONFIG_SOFTMMU) +=3D vm-change-state-handler.o common-obj-y +=3D cpu.o +common-obj-y +=3D vmstate-if.o =20 common-obj-$(CONFIG_EMPTY_SLOT) +=3D empty_slot.o common-obj-$(CONFIG_XILINX_AXI) +=3D stream.o diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 60d66c2f39..7e083dfcae 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -1047,9 +1047,18 @@ static void device_unparent(Object *obj) } } =20 +static char * +device_vmstate_if_get_id(VMStateIf *obj) +{ + DeviceState *dev =3D DEVICE(obj); + + return qdev_get_dev_path(dev); +} + static void device_class_init(ObjectClass *class, void *data) { DeviceClass *dc =3D DEVICE_CLASS(class); + VMStateIfClass *vc =3D VMSTATE_IF_CLASS(class); =20 class->unparent =3D device_unparent; =20 @@ -1061,6 +1070,7 @@ static void device_class_init(ObjectClass *class, voi= d *data) */ dc->hotpluggable =3D true; dc->user_creatable =3D true; + vc->get_id =3D device_vmstate_if_get_id; } =20 void device_class_set_parent_reset(DeviceClass *dc, @@ -1118,6 +1128,10 @@ static const TypeInfo device_type_info =3D { .class_init =3D device_class_init, .abstract =3D true, .class_size =3D sizeof(DeviceClass), + .interfaces =3D (InterfaceInfo[]) { + { TYPE_VMSTATE_IF }, + { } + } }; =20 static void qdev_register_types(void) diff --git a/hw/core/vmstate-if.c b/hw/core/vmstate-if.c new file mode 100644 index 0000000000..d0b2392b0a --- /dev/null +++ b/hw/core/vmstate-if.c @@ -0,0 +1,23 @@ +/* + * VMState interface + * + * Copyright (c) 2009-2017 Red Hat Inc + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/vmstate-if.h" + +static const TypeInfo vmstate_if_info =3D { + .name =3D TYPE_VMSTATE_IF, + .parent =3D TYPE_INTERFACE, + .class_size =3D sizeof(VMStateIfClass), +}; + +static void vmstate_register_types(void) +{ + type_register_static(&vmstate_if_info); +} + +type_init(vmstate_register_types); diff --git a/include/hw/vmstate-if.h b/include/hw/vmstate-if.h new file mode 100644 index 0000000000..92682f5bc2 --- /dev/null +++ b/include/hw/vmstate-if.h @@ -0,0 +1,32 @@ +#ifndef VMSTATE_IF_H +#define VMSTATE_IF_H + +#include "qom/object.h" + +#define TYPE_VMSTATE_IF "vmstate-if" + +#define VMSTATE_IF_CLASS(klass) \ + OBJECT_CLASS_CHECK(VMStateIfClass, (klass), TYPE_VMSTATE_IF) +#define VMSTATE_IF_GET_CLASS(obj) \ + OBJECT_GET_CLASS(VMStateIfClass, (obj), TYPE_VMSTATE_IF) +#define VMSTATE_IF(obj) \ + INTERFACE_CHECK(VMStateIf, (obj), TYPE_VMSTATE_IF) + +typedef struct VMStateIf VMStateIf; + +typedef struct VMStateIfClass { + InterfaceClass parent_class; + + char * (*get_id)(VMStateIf *obj); +} VMStateIfClass; + +static inline char *vmstate_if_get_id(VMStateIf *vmif) +{ + if (!vmif) { + return NULL; + } + + return VMSTATE_IF_GET_CLASS(vmif)->get_id(vmif); +} + +#endif /* VMSTATE_IF_H */ diff --git a/include/migration/register.h b/include/migration/register.h index 3d0b9833c6..74f1578b29 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -14,6 +14,8 @@ #ifndef MIGRATION_REGISTER_H #define MIGRATION_REGISTER_H =20 +#include "hw/vmstate-if.h" + typedef struct SaveVMHandlers { /* This runs inside the iothread lock. */ SaveStateHandler *save_state; diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 1fbfd099dd..bdcf8a1652 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -27,6 +27,8 @@ #ifndef QEMU_VMSTATE_H #define QEMU_VMSTATE_H =20 +#include "hw/vmstate-if.h" + typedef struct VMStateInfo VMStateInfo; typedef struct VMStateField VMStateField; =20 diff --git a/tests/Makefile.include b/tests/Makefile.include index f5ac09549c..d4502a30eb 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -566,6 +566,7 @@ tests/test-qdev-global-props$(EXESUF): tests/test-qdev-= global-props.o \ hw/core/irq.o \ hw/core/fw-path-provider.o \ hw/core/reset.o \ + hw/core/vmstate-if.o \ $(test-qapi-obj-y) tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ migration/vmstate.o migration/vmstate-types.o migration/qemu-file.o \ --=20 2.23.0 From nobody Mon Feb 9 14:44:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568291481; cv=none; d=zoho.com; s=zohoarc; b=NbG65vPMPHQRDj1cAlbu0D44d18gN7Ec+1RPfO7fVD588bXjD6uszeQaaEWCwBsSWg84ux5yENkbddXv5PkWoxywDurPf2RyGUhwLg/rrVzdgOs3XbEq8fPu9uRAizsukxzGFb1NuVXO1SoFYtna2o7yxoVFJKk+wCxVjWuWAok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568291481; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=385o1aDcC+PlkEP9MCe3oibRY+n2llDgE6YwkoYhj9k=; b=nKvjDClPpNXZLgUGg6dl0LcBNOHnUMmGpuCKexGi3G5StoIAq/l1cu/NZDSycFd8zNdKPuYwdglbDFEP6AQZJdB2/YGqG5JmZeAI76tpKEvNGtwJWCPdo3ePcXF+AJeZE+8H35VLp4bpuobmQK58V1FEYjD130s1PgA4M6y6A7k= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568291481734362.23513152825126; Thu, 12 Sep 2019 05:31:21 -0700 (PDT) Received: from localhost ([::1]:33950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OFm-00079E-E3 for importer@patchew.org; Thu, 12 Sep 2019 08:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51441) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OAY-0003Gb-Tg for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8OAW-0007Ti-QY for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46624) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8OAW-0007TQ-J0 for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC7EE300DA6E for ; Thu, 12 Sep 2019 12:25:47 +0000 (UTC) Received: from localhost (ovpn-112-63.ams2.redhat.com [10.36.112.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AFDA5C258; Thu, 12 Sep 2019 12:25:42 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 12 Sep 2019 16:25:11 +0400 Message-Id: <20190912122514.22504-4-marcandre.lureau@redhat.com> In-Reply-To: <20190912122514.22504-1-marcandre.lureau@redhat.com> References: <20190912122514.22504-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 12 Sep 2019 12:25:47 +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: [Qemu-devel] [PATCH v3 3/6] vmstate: replace DeviceState with VMStateIf 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: berrange@redhat.com, quintela@redhat.com, mprivozn@redhat.com, dgilbert@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Replace DeviceState dependency with VMStateIf on vmstate API. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Halil Pasic Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Dr. David Alan Gilbert --- docs/devel/migration.rst | 2 +- hw/block/onenand.c | 2 +- hw/core/qdev.c | 7 ++++--- hw/ide/cmd646.c | 2 +- hw/ide/isa.c | 2 +- hw/ide/piix.c | 2 +- hw/ide/via.c | 2 +- hw/misc/max111x.c | 2 +- hw/net/eepro100.c | 4 ++-- hw/net/vmxnet3.c | 2 +- hw/nvram/eeprom93xx.c | 4 ++-- hw/ppc/spapr_drc.c | 9 +++++---- hw/ppc/spapr_iommu.c | 4 ++-- hw/s390x/s390-skeys.c | 2 +- include/migration/register.h | 4 ++-- include/migration/vmstate.h | 8 ++++---- migration/savevm.c | 26 +++++++++++++------------- stubs/vmstate.c | 4 ++-- 18 files changed, 45 insertions(+), 43 deletions(-) diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index f7668ae389..c9932194d9 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -183,7 +183,7 @@ another to load the state back. =20 .. code:: c =20 - int register_savevm_live(DeviceState *dev, + int register_savevm_live(VMStateIf *obj, const char *idstr, int instance_id, int version_id, diff --git a/hw/block/onenand.c b/hw/block/onenand.c index fcc5a69b90..9c233c12e4 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -822,7 +822,7 @@ static void onenand_realize(DeviceState *dev, Error **e= rrp) onenand_mem_setup(s); sysbus_init_irq(sbd, &s->intr); sysbus_init_mmio(sbd, &s->container); - vmstate_register(dev, + vmstate_register(VMSTATE_IF(dev), ((s->shift & 0x7f) << 24) | ((s->id.man & 0xff) << 16) | ((s->id.dev & 0xff) << 8) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 7e083dfcae..ad18c0383d 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -849,7 +849,8 @@ static void device_set_realized(Object *obj, bool value= , Error **errp) dev->canonical_path =3D object_get_canonical_path(OBJECT(dev)); =20 if (qdev_get_vmsd(dev)) { - if (vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev)= , dev, + if (vmstate_register_with_alias_id(VMSTATE_IF(dev), + -1, qdev_get_vmsd(dev), dev, dev->instance_id_alias, dev->alias_required_for_ver= sion, &local_err) < 0) { @@ -884,7 +885,7 @@ static void device_set_realized(Object *obj, bool value= , Error **errp) local_errp); } if (qdev_get_vmsd(dev)) { - vmstate_unregister(dev, qdev_get_vmsd(dev), dev); + vmstate_unregister(VMSTATE_IF(dev), qdev_get_vmsd(dev), dev); } if (dc->unrealize) { local_errp =3D local_err ? NULL : &local_err; @@ -908,7 +909,7 @@ child_realize_fail: } =20 if (qdev_get_vmsd(dev)) { - vmstate_unregister(dev, qdev_get_vmsd(dev), dev); + vmstate_unregister(VMSTATE_IF(dev), qdev_get_vmsd(dev), dev); } =20 post_realize_fail: diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index f3ccd11c79..01a982acbc 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -301,7 +301,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Erro= r **errp) ide_register_restart_cb(&d->bus[i]); } =20 - vmstate_register(DEVICE(dev), 0, &vmstate_ide_pci, d); + vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_pci, d); qemu_register_reset(cmd646_reset, d); } =20 diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 7b6e283679..9c7f88b2d5 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -75,7 +75,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **e= rrp) ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2); isa_init_irq(isadev, &s->irq, s->isairq); ide_init2(&s->bus, s->irq); - vmstate_register(dev, 0, &vmstate_ide_isa, s); + vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s); ide_register_restart_cb(&s->bus); } =20 diff --git a/hw/ide/piix.c b/hw/ide/piix.c index fba6bc8bff..cbaee9e2cc 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -159,7 +159,7 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error = **errp) bmdma_setup_bar(d); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); =20 - vmstate_register(DEVICE(dev), 0, &vmstate_ide_pci, d); + vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_pci, d); =20 pci_piix_init_ports(d); } diff --git a/hw/ide/via.c b/hw/ide/via.c index 7087dc676e..6b9d4c6d78 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -193,7 +193,7 @@ static void via_ide_realize(PCIDevice *dev, Error **err= p) bmdma_setup_bar(d); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); =20 - vmstate_register(DEVICE(dev), 0, &vmstate_ide_pci, d); + vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_pci, d); =20 for (i =3D 0; i < 2; i++) { ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c index a713149f16..211008ce02 100644 --- a/hw/misc/max111x.c +++ b/hw/misc/max111x.c @@ -146,7 +146,7 @@ static int max111x_init(SSISlave *d, int inputs) s->input[7] =3D 0x80; s->com =3D 0; =20 - vmstate_register(dev, -1, &vmstate_max111x, s); + vmstate_register(VMSTATE_IF(dev), -1, &vmstate_max111x, s); return 0; } =20 diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index cc2dd8b1c9..cc71a7a036 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -1815,7 +1815,7 @@ static void pci_nic_uninit(PCIDevice *pci_dev) { EEPRO100State *s =3D DO_UPCAST(EEPRO100State, dev, pci_dev); =20 - vmstate_unregister(&pci_dev->qdev, s->vmstate, s); + vmstate_unregister(VMSTATE_IF(&pci_dev->qdev), s->vmstate, s); g_free(s->vmstate); eeprom93xx_free(&pci_dev->qdev, s->eeprom); qemu_del_nic(s->nic); @@ -1874,7 +1874,7 @@ static void e100_nic_realize(PCIDevice *pci_dev, Erro= r **errp) =20 s->vmstate =3D g_memdup(&vmstate_eepro100, sizeof(vmstate_eepro100)); s->vmstate->name =3D qemu_get_queue(s->nic)->model; - vmstate_register(&pci_dev->qdev, -1, s->vmstate, s); + vmstate_register(VMSTATE_IF(&pci_dev->qdev), -1, s->vmstate, s); } =20 static void eepro100_instance_init(Object *obj) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index b07adeed9c..8625e93dc9 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2247,7 +2247,7 @@ static void vmxnet3_pci_uninit(PCIDevice *pci_dev) =20 VMW_CBPRN("Starting uninit..."); =20 - unregister_savevm(dev, "vmxnet3-msix", s); + unregister_savevm(VMSTATE_IF(dev), "vmxnet3-msix", s); =20 vmxnet3_net_uninit(s); =20 diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 5b01b9b03f..07f09549ed 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -321,7 +321,7 @@ eeprom_t *eeprom93xx_new(DeviceState *dev, uint16_t nwo= rds) /* Output DO is tristate, read results in 1. */ eeprom->eedo =3D 1; logout("eeprom =3D 0x%p, nwords =3D %u\n", eeprom, nwords); - vmstate_register(dev, 0, &vmstate_eeprom, eeprom); + vmstate_register(VMSTATE_IF(dev), 0, &vmstate_eeprom, eeprom); return eeprom; } =20 @@ -329,7 +329,7 @@ void eeprom93xx_free(DeviceState *dev, eeprom_t *eeprom) { /* Destroy EEPROM. */ logout("eeprom =3D 0x%p\n", eeprom); - vmstate_unregister(dev, &vmstate_eeprom, eeprom); + vmstate_unregister(VMSTATE_IF(dev), &vmstate_eeprom, eeprom); g_free(eeprom); } =20 diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 62f1a42592..17aeac3801 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -511,7 +511,7 @@ static void realize(DeviceState *d, Error **errp) error_propagate(errp, err); return; } - vmstate_register(DEVICE(drc), spapr_drc_index(drc), &vmstate_spapr_drc, + vmstate_register(VMSTATE_IF(drc), spapr_drc_index(drc), &vmstate_spapr= _drc, drc); trace_spapr_drc_realize_complete(spapr_drc_index(drc)); } @@ -523,7 +523,7 @@ static void unrealize(DeviceState *d, Error **errp) gchar *name; =20 trace_spapr_drc_unrealize(spapr_drc_index(drc)); - vmstate_unregister(DEVICE(drc), &vmstate_spapr_drc, drc); + vmstate_unregister(VMSTATE_IF(drc), &vmstate_spapr_drc, drc); root_container =3D container_get(object_get_root(), DRC_CONTAINER_PATH= ); name =3D g_strdup_printf("%x", spapr_drc_index(drc)); object_property_del(root_container, name, errp); @@ -619,7 +619,8 @@ static void realize_physical(DeviceState *d, Error **er= rp) return; } =20 - vmstate_register(DEVICE(drcp), spapr_drc_index(SPAPR_DR_CONNECTOR(drcp= )), + vmstate_register(VMSTATE_IF(drcp), + spapr_drc_index(SPAPR_DR_CONNECTOR(drcp)), &vmstate_spapr_drc_physical, drcp); qemu_register_reset(drc_physical_reset, drcp); } @@ -635,7 +636,7 @@ static void unrealize_physical(DeviceState *d, Error **= errp) return; } =20 - vmstate_unregister(DEVICE(drcp), &vmstate_spapr_drc_physical, drcp); + vmstate_unregister(VMSTATE_IF(drcp), &vmstate_spapr_drc_physical, drcp= ); qemu_unregister_reset(drc_physical_reset, drcp); } =20 diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index e87b3d50f7..b9e7854da9 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -315,7 +315,7 @@ static void spapr_tce_table_realize(DeviceState *dev, E= rror **errp) =20 QLIST_INSERT_HEAD(&spapr_tce_tables, tcet, list); =20 - vmstate_register(DEVICE(tcet), tcet->liobn, &vmstate_spapr_tce_table, + vmstate_register(VMSTATE_IF(tcet), tcet->liobn, &vmstate_spapr_tce_tab= le, tcet); } =20 @@ -418,7 +418,7 @@ static void spapr_tce_table_unrealize(DeviceState *dev,= Error **errp) { SpaprTceTable *tcet =3D SPAPR_TCE_TABLE(dev); =20 - vmstate_unregister(DEVICE(tcet), &vmstate_spapr_tce_table, tcet); + vmstate_unregister(VMSTATE_IF(tcet), &vmstate_spapr_tce_table, tcet); =20 QLIST_REMOVE(tcet, list); =20 diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index d4807f7777..16b9bbf04d 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -392,7 +392,7 @@ static inline void s390_skeys_set_migration_enabled(Obj= ect *obj, bool value, register_savevm_live(NULL, TYPE_S390_SKEYS, 0, 1, &savevm_s390_storage_keys, ss); } else { - unregister_savevm(DEVICE(ss), TYPE_S390_SKEYS, ss); + unregister_savevm(VMSTATE_IF(ss), TYPE_S390_SKEYS, ss); } } =20 diff --git a/include/migration/register.h b/include/migration/register.h index 74f1578b29..f22f180286 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -70,13 +70,13 @@ typedef struct SaveVMHandlers { int (*resume_prepare)(MigrationState *s, void *opaque); } SaveVMHandlers; =20 -int register_savevm_live(DeviceState *dev, +int register_savevm_live(VMStateIf *obj, const char *idstr, int instance_id, int version_id, const SaveVMHandlers *ops, void *opaque); =20 -void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque); +void unregister_savevm(VMStateIf *obj, const char *idstr, void *opaque); =20 #endif diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index bdcf8a1652..1911e37d72 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -1116,22 +1116,22 @@ int vmstate_save_state_v(QEMUFile *f, const VMState= Description *vmsd, bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque); =20 /* Returns: 0 on success, -1 on failure */ -int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, +int vmstate_register_with_alias_id(VMStateIf *obj, int instance_id, const VMStateDescription *vmsd, void *base, int alias_id, int required_for_version, Error **errp); =20 /* Returns: 0 on success, -1 on failure */ -static inline int vmstate_register(DeviceState *dev, int instance_id, +static inline int vmstate_register(VMStateIf *obj, int instance_id, const VMStateDescription *vmsd, void *opaque) { - return vmstate_register_with_alias_id(dev, instance_id, vmsd, + return vmstate_register_with_alias_id(obj, instance_id, vmsd, opaque, -1, 0, NULL); } =20 -void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd, +void vmstate_unregister(VMStateIf *obj, const VMStateDescription *vmsd, void *opaque); =20 struct MemoryRegion; diff --git a/migration/savevm.c b/migration/savevm.c index 6caa35a679..7902da16e6 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -684,7 +684,7 @@ static void savevm_state_handler_insert(SaveStateEntry = *nse) of the system, so instance_id should be removed/replaced. Meanwhile pass -1 as instance_id if you do not already have a clearly distinguishing id for all instances of your device class. */ -int register_savevm_live(DeviceState *dev, +int register_savevm_live(VMStateIf *obj, const char *idstr, int instance_id, int version_id, @@ -704,8 +704,8 @@ int register_savevm_live(DeviceState *dev, se->is_ram =3D 1; } =20 - if (dev) { - char *id =3D qdev_get_dev_path(dev); + if (obj) { + char *id =3D vmstate_if_get_id(obj); if (id) { if (snprintf(se->idstr, sizeof(se->idstr), "%s/", id) >=3D sizeof(se->idstr)) { @@ -736,17 +736,17 @@ int register_savevm_live(DeviceState *dev, return 0; } =20 -void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque) +void unregister_savevm(VMStateIf *obj, const char *idstr, void *opaque) { SaveStateEntry *se, *new_se; char id[256] =3D ""; =20 - if (dev) { - char *path =3D qdev_get_dev_path(dev); - if (path) { - pstrcpy(id, sizeof(id), path); + if (obj) { + char *oid =3D vmstate_if_get_id(obj); + if (oid) { + pstrcpy(id, sizeof(id), oid); pstrcat(id, sizeof(id), "/"); - g_free(path); + g_free(oid); } } pstrcat(id, sizeof(id), idstr); @@ -760,7 +760,7 @@ void unregister_savevm(DeviceState *dev, const char *id= str, void *opaque) } } =20 -int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, +int vmstate_register_with_alias_id(VMStateIf *obj, int instance_id, const VMStateDescription *vmsd, void *opaque, int alias_id, int required_for_version, @@ -778,8 +778,8 @@ int vmstate_register_with_alias_id(DeviceState *dev, in= t instance_id, se->vmsd =3D vmsd; se->alias_id =3D alias_id; =20 - if (dev) { - char *id =3D qdev_get_dev_path(dev); + if (obj) { + char *id =3D vmstate_if_get_id(obj); if (id) { if (snprintf(se->idstr, sizeof(se->idstr), "%s/", id) >=3D sizeof(se->idstr)) { @@ -810,7 +810,7 @@ int vmstate_register_with_alias_id(DeviceState *dev, in= t instance_id, return 0; } =20 -void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd, +void vmstate_unregister(VMStateIf *obj, const VMStateDescription *vmsd, void *opaque) { SaveStateEntry *se, *new_se; diff --git a/stubs/vmstate.c b/stubs/vmstate.c index e1e89b87f0..6951d9fdc5 100644 --- a/stubs/vmstate.c +++ b/stubs/vmstate.c @@ -3,7 +3,7 @@ =20 const VMStateDescription vmstate_dummy =3D {}; =20 -int vmstate_register_with_alias_id(DeviceState *dev, +int vmstate_register_with_alias_id(VMStateIf *obj, int instance_id, const VMStateDescription *vmsd, void *base, int alias_id, @@ -13,7 +13,7 @@ int vmstate_register_with_alias_id(DeviceState *dev, return 0; } =20 -void vmstate_unregister(DeviceState *dev, +void vmstate_unregister(VMStateIf *obj, const VMStateDescription *vmsd, void *opaque) { --=20 2.23.0 From nobody Mon Feb 9 14:44:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568291840; cv=none; d=zoho.com; s=zohoarc; b=SLWTAMHfQYtiTT07rj6hExl8fhKz0Mns5ulUlz/GSm8MQcri/qRSPpEP9CjZbugwF4uiJ+Kv1fC8drRBXjiSFcqZsV5RxG3Ztn4X7vhdB34T2XQrL6pAIO4fCLp3z2Aj49xUispmAU7TQktzMGr55jgDKaMsNj2r2EeeGddSgkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568291840; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=CUKGD9iz+Tiq8F1Qj8Bg2pkOiDc+TaQa3Ot5Kt0F7IU=; b=EHtx9ZvzVfzlsNnMUG7uuye0gHIeurf897NRYH72bjTFceReXKSK8wXxm+r+j+WYl7W/Wi2+0bN4xWQovOJSqKHshcfwh60mDJ/GFnQYerf8vX2t+7Kz2tRhBtBfVF6D7aiGqpHQQqzaj3Rb9OYv/SzAZI3XFFP+zVcVqPIlMJg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156829184005420.91628848611299; Thu, 12 Sep 2019 05:37:20 -0700 (PDT) Received: from localhost ([::1]:34002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OLe-00041K-4H for importer@patchew.org; Thu, 12 Sep 2019 08:37:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51487) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OAh-0003LH-51 for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:26:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8OAf-0007Wp-7b for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31176) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8OAe-0007WA-Ve for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:25:57 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D1FF9811BF for ; Thu, 12 Sep 2019 12:25:55 +0000 (UTC) Received: from localhost (ovpn-112-63.ams2.redhat.com [10.36.112.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 625084518; Thu, 12 Sep 2019 12:25:52 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 12 Sep 2019 16:25:12 +0400 Message-Id: <20190912122514.22504-5-marcandre.lureau@redhat.com> In-Reply-To: <20190912122514.22504-1-marcandre.lureau@redhat.com> References: <20190912122514.22504-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 12 Sep 2019 12:25:55 +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: [Qemu-devel] [PATCH v3 4/6] tests: add qtest_expect_exit_status() 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: berrange@redhat.com, quintela@redhat.com, mprivozn@redhat.com, dgilbert@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Modify the behaviour of qtest_quit() to check against the expected exit status value. The default remains 0. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/libqtest.c | 41 ++++++++++++++++++++++------------------- tests/libqtest.h | 9 +++++++++ 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 0a6b91737e..1f7910e583 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -44,6 +44,7 @@ struct QTestState bool big_endian; bool irq_level[MAX_IRQ]; GString *rx; + int exit_status; }; =20 static GHookList abrt_hooks; @@ -123,27 +124,29 @@ static void kill_qemu(QTestState *s) assert(pid =3D=3D s->qemu_pid); } =20 - /* - * We expect qemu to exit with status 0; anything else is - * fishy and should be logged with as much detail as possible. - */ wstatus =3D s->wstatus; - if (wstatus) { - if (WIFEXITED(wstatus)) { - fprintf(stderr, "%s:%d: kill_qemu() tried to terminate QEMU " - "process but encountered exit status %d\n", - __FILE__, __LINE__, WEXITSTATUS(wstatus)); - } else if (WIFSIGNALED(wstatus)) { - int sig =3D WTERMSIG(wstatus); - const char *signame =3D strsignal(sig) ?: "unknown ???"; - const char *dump =3D WCOREDUMP(wstatus) ? " (core dumped)" : "= "; - - fprintf(stderr, "%s:%d: kill_qemu() detected QEMU death " - "from signal %d (%s)%s\n", - __FILE__, __LINE__, sig, signame, dump); + if (WIFEXITED(wstatus)) { + if (WEXITSTATUS(wstatus) =3D=3D s->exit_status) { + return; } - abort(); + fprintf(stderr, "%s:%d: kill_qemu() tried to terminate QEMU " + "process but encountered exit status %d\n", + __FILE__, __LINE__, WEXITSTATUS(wstatus)); + } else if (WIFSIGNALED(wstatus)) { + int sig =3D WTERMSIG(wstatus); + const char *signame =3D strsignal(sig) ?: "unknown ???"; + const char *dump =3D WCOREDUMP(wstatus) ? " (core dumped)" : ""; + + fprintf(stderr, "%s:%d: kill_qemu() detected QEMU death " + "from signal %d (%s)%s\n", + __FILE__, __LINE__, sig, signame, dump); } + abort(); +} + +void qtest_expect_exit_status(QTestState *s, int status) +{ + s->exit_status =3D status; } =20 static void kill_qemu_hook_func(void *s) @@ -213,7 +216,7 @@ QTestState *qtest_init_without_qmp_handshake(const char= *extra_args) gchar *command; const char *qemu_binary =3D qtest_qemu_binary(); =20 - s =3D g_new(QTestState, 1); + s =3D g_new0(QTestState, 1); =20 socket_path =3D g_strdup_printf("/tmp/qtest-%d.sock", getpid()); qmp_socket_path =3D g_strdup_printf("/tmp/qtest-%d.qmp", getpid()); diff --git a/tests/libqtest.h b/tests/libqtest.h index c8cffe5d68..d41229d7fd 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -82,6 +82,15 @@ QTestState *qtest_init_with_serial(const char *extra_arg= s, int *sock_fd); */ void qtest_quit(QTestState *s); =20 +/** + * qtest_expect_exit_status: + * @s: #QTestState instance to operate on. + * @status: the expected exit status + * + * Set the expected exit status when calling qtest_quit(). + */ +void qtest_expect_exit_status(QTestState *s, int status); + /** * qtest_qmp_fds: * @s: #QTestState instance to operate on. --=20 2.23.0 From nobody Mon Feb 9 14:44:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568292252; cv=none; d=zoho.com; s=zohoarc; b=BPiBzHWcv04icrew6OKPTXE6OIrozBUM3kxCDhMJEGMyBc+o2NRw0jolwhILacWuQZazy+db8DxoozfLd8Pjt96Ky+RFV5zLAYSBvuTJcs2fuXe3sjFh9vvnnPBF/aftu4nGRvVKvJ/DZM0bgiYUks0wSyQT8/ew5pU7q4eR+70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568292252; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=n+2PbJbZ5puIOLzfd8PrBZa72E5rXwQ7CNEK4Va0aDY=; b=a+J+wK+XlKtpS6/3Gy0Rd1lWE6WNduNdqreYXKkyn9n+jVOfLBhWj+/0E9NFXzVZstlF3zPBMJPe5RoAQKSxDp/qAsZiiWXIbQdiQE5KB1JuEfT11ovOyPvc0ZAIT37mQsvNqwou14iGJ2uRmjQSyUiKras0VzWXhhWPtwPBiqA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568292252152111.08564866474478; Thu, 12 Sep 2019 05:44:12 -0700 (PDT) Received: from localhost ([::1]:34092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OSJ-0003TF-0Q for importer@patchew.org; Thu, 12 Sep 2019 08:44:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51525) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OAm-0003Os-FJ for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:26:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8OAl-0007aJ-7a for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:26:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46680) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8OAl-0007ZW-0K for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:26:03 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CCB6D3082B45 for ; Thu, 12 Sep 2019 12:26:00 +0000 (UTC) Received: from localhost (ovpn-112-63.ams2.redhat.com [10.36.112.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08A0F5F700; Thu, 12 Sep 2019 12:25:59 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 12 Sep 2019 16:25:13 +0400 Message-Id: <20190912122514.22504-6-marcandre.lureau@redhat.com> In-Reply-To: <20190912122514.22504-1-marcandre.lureau@redhat.com> References: <20190912122514.22504-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 12 Sep 2019 12:26:00 +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: [Qemu-devel] [PATCH v3 5/6] docs: start a document to describe D-Bus usage 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: berrange@redhat.com, quintela@redhat.com, mprivozn@redhat.com, dgilbert@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau --- docs/interop/dbus.rst | 73 ++++++++++++++++++++++++++++++++++++++++++ docs/interop/index.rst | 1 + 2 files changed, 74 insertions(+) create mode 100644 docs/interop/dbus.rst diff --git a/docs/interop/dbus.rst b/docs/interop/dbus.rst new file mode 100644 index 0000000000..c08f026edc --- /dev/null +++ b/docs/interop/dbus.rst @@ -0,0 +1,73 @@ +=3D=3D=3D=3D=3D +D-Bus +=3D=3D=3D=3D=3D + +Introduction +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +QEMU may be running with various helper processes involved: + - vhost-user* processes (gpu, virtfs, input, etc...) + - TPM emulation (or other devices) + - user networking (slirp) + - network services (DHCP/DNS, samba/ftp etc) + - background tasks (compression, streaming etc) + - client UI + - admin & cli + +Having several processes allows stricter security rules, as well as +greater modularity. + +While QEMU itself uses QMP as primary IPC (and Spice/VNC for remote +display), D-Bus is the de facto IPC of choice on Unix systems. The +wire format is machine friendly, good bindings exist for various +languages, and there are various tools available. + +Using a bus, helper processes can discover and communicate with each +other easily, without going through QEMU. The bus topology is also +easier to apprehend and debug than a mesh. However, it is wise to +consider the security aspects of it. + +Security +=3D=3D=3D=3D=3D=3D=3D=3D + +A QEMU D-Bus bus should be private to a single VM. Thus, only +cooperative tasks are running on the same bus to serve the VM. + +D-Bus, the protocol and standard, doesn't have mechanisms to enforce +security between peers once the connection is established. Peers may +have additional mechanisms to enforce security rules, based for +example on UNIX credentials. + +dbus-daemon can enforce various policies based on the UID/GID of the +processes that are connected to it. It is thus a good idea to run +helpers as different UID from QEMU and set appropriate policies (so +helper processes are only allowed to talk to qemu for example). + +For example, this allows only ``qemu`` user to talk to ``qemu-helper`` +``org.qemu.Helper1`` service: + +.. code:: xml + + + + + + + + + + + +dbus-daemon can also perfom SELinux checks based on the security +context of the source and the target. For example, ``virtiofs_t`` +could be allowed to send a message to ``svirt_t``, but ``virtiofs_t`` +wouldn't be allowed to send a message to ``virtiofs_t``. + +Guidelines +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +When implementing new D-Bus interfaces, it is recommended to follow +the "D-Bus API Design Guidelines": +https://dbus.freedesktop.org/doc/dbus-api-design.html + +The "org.qemu*" prefix is reserved for the QEMU project. diff --git a/docs/interop/index.rst b/docs/interop/index.rst index b4bfcab417..fa4478ce2e 100644 --- a/docs/interop/index.rst +++ b/docs/interop/index.rst @@ -13,6 +13,7 @@ Contents: :maxdepth: 2 =20 bitmaps + dbus live-block-operations pr-helper vhost-user --=20 2.23.0 From nobody Mon Feb 9 14:44:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568291793; cv=none; d=zoho.com; s=zohoarc; b=Ga5MbZiJ8LSOZLfqA3TP3GMEe0/1SoT5NiAEGwO3I7/1iH6x8Y/LIJWY3vvcxF0rTg3rBHL5WAPJA2DToJfCvdARl2Dk4NQ0QFJFDp2JiqVOnJa5kWnvinyJ4fccxfSvj9HS0ssEEvqbcqJKGpoF23p0VACHi4iF+gQtuuoteYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568291793; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=5JCbyUBFBmP2eFMl6xjJRSZEd3iZikFuZ0Sp4roEays=; b=m/umPNzVePQlR+G90u0zw8Trg7cdNnn4cqgwf8EojWRAXF1/5DuUCW/8UvRnEc9l82qtaMOtE2WHf3g9sEVkU0FnszfW7H1XRNRAGhrVdTXRMonmL3Ea5V7EC3bwNmkDnCquK5P4NxzFL60NIuoYXW8om7W8XWbtVkweF7Vt4Vw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568291793724539.4523254790371; Thu, 12 Sep 2019 05:36:33 -0700 (PDT) Received: from localhost ([::1]:33998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OKt-0002x4-MG for importer@patchew.org; Thu, 12 Sep 2019 08:36:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51557) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8OAy-0003cH-KU for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:26:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8OAu-0007dN-MZ for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:26:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44404) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8OAu-0007cy-BA for qemu-devel@nongnu.org; Thu, 12 Sep 2019 08:26:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ABF0658E23 for ; Thu, 12 Sep 2019 12:26:11 +0000 (UTC) Received: from localhost (ovpn-112-63.ams2.redhat.com [10.36.112.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FF6C5D9CA; Thu, 12 Sep 2019 12:26:05 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 12 Sep 2019 16:25:14 +0400 Message-Id: <20190912122514.22504-7-marcandre.lureau@redhat.com> In-Reply-To: <20190912122514.22504-1-marcandre.lureau@redhat.com> References: <20190912122514.22504-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 12 Sep 2019 12:26:11 +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: [Qemu-devel] [PATCH v3 6/6] 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: berrange@redhat.com, quintela@redhat.com, mprivozn@redhat.com, dgilbert@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When instanciated, this object will connect to the given D-Bus bus. During migration, it will take the data from org.qemu.VMState1 instances. See documentation for further details. Signed-off-by: Marc-Andr=C3=A9 Lureau --- MAINTAINERS | 6 + backends/Makefile.objs | 4 + backends/dbus-vmstate.c | 530 ++++++++++++++++++++++++++++++++++ configure | 7 + docs/interop/dbus-vmstate.rst | 68 +++++ docs/interop/index.rst | 1 + tests/Makefile.include | 19 +- tests/dbus-vmstate-daemon.sh | 95 ++++++ tests/dbus-vmstate-test.c | 386 +++++++++++++++++++++++++ tests/dbus-vmstate1.xml | 12 + 10 files changed, 1127 insertions(+), 1 deletion(-) create mode 100644 backends/dbus-vmstate.c create mode 100644 docs/interop/dbus-vmstate.rst create mode 100755 tests/dbus-vmstate-daemon.sh create mode 100644 tests/dbus-vmstate-test.c create mode 100644 tests/dbus-vmstate1.xml diff --git a/MAINTAINERS b/MAINTAINERS index 50eaf005f4..f641870c40 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2153,6 +2153,12 @@ F: tests/migration-test.c F: docs/devel/migration.rst F: qapi/migration.json =20 +DBus VMState +M: Marc-Andr=C3=A9 Lureau +S: Maintained +F: backends/dbus-vmstate.c +F: tests/dbus-vmstate* + Seccomp M: Eduardo Otubo S: Supported diff --git a/backends/Makefile.objs b/backends/Makefile.objs index f0691116e8..28a847cd57 100644 --- a/backends/Makefile.objs +++ b/backends/Makefile.objs @@ -17,3 +17,7 @@ endif common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) +=3D vhost-u= ser.o =20 common-obj-$(CONFIG_LINUX) +=3D hostmem-memfd.o + +common-obj-$(CONFIG_GIO) +=3D dbus-vmstate.o +dbus-vmstate.o-cflags =3D $(GIO_CFLAGS) +dbus-vmstate.o-libs =3D $(GIO_LIBS) diff --git a/backends/dbus-vmstate.c b/backends/dbus-vmstate.c new file mode 100644 index 0000000000..559f5430c5 --- /dev/null +++ b/backends/dbus-vmstate.c @@ -0,0 +1,530 @@ +/* + * QEMU dbus-vmstate + * + * Copyright (C) 2019 Red Hat Inc + * + * Authors: + * Marc-Andr=C3=A9 Lureau + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/units.h" +#include "qemu/error-report.h" +#include "qapi/error.h" +#include "qom/object_interfaces.h" +#include "qapi/qmp/qerror.h" +#include "migration/vmstate.h" +#include + +typedef struct DBusVMState DBusVMState; +typedef struct DBusVMStateClass DBusVMStateClass; + +#define TYPE_DBUS_VMSTATE "dbus-vmstate" +#define DBUS_VMSTATE(obj) \ + OBJECT_CHECK(DBusVMState, (obj), TYPE_DBUS_VMSTATE) +#define DBUS_VMSTATE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(DBusVMStateClass, (obj), TYPE_DBUS_VMSTATE) +#define DBUS_VMSTATE_CLASS(klass) \ + OBJECT_CLASS_CHECK(DBusVMStateClass, (klass), TYPE_DBUS_VMSTATE) + +struct DBusVMStateClass { + ObjectClass parent_class; +}; + +struct DBusVMState { + Object parent; + + GDBusConnection *bus; + char *dbus_addr; + char *id_list; + + uint32_t data_size; + uint8_t *data; +}; + +static const GDBusPropertyInfo vmstate_property_info[] =3D { + { -1, (char *) "Id", (char *) "s", + G_DBUS_PROPERTY_INFO_FLAGS_READABLE, NULL }, +}; + +static const GDBusPropertyInfo * const vmstate_property_info_pointers[] = =3D { + &vmstate_property_info[0], + NULL +}; + +static const GDBusInterfaceInfo vmstate1_interface_info =3D { + -1, + (char *) "org.qemu.VMState1", + (GDBusMethodInfo **) NULL, + (GDBusSignalInfo **) NULL, + (GDBusPropertyInfo **) &vmstate_property_info_pointers, + NULL, +}; + +#define DBUS_VMSTATE_SIZE_LIMIT (1 * MiB) + +static char ** +dbus_get_vmstate1_names(DBusVMState *self, GError **err) +{ + g_autoptr(GDBusProxy) proxy =3D NULL; + g_autoptr(GVariant) result =3D NULL; + g_autoptr(GVariant) child =3D NULL; + + proxy =3D g_dbus_proxy_new_sync(self->bus, G_DBUS_PROXY_FLAGS_NONE, NU= LL, + "org.freedesktop.DBus", + "/org/freedesktop/DBus", + "org.freedesktop.DBus", + NULL, err); + if (!proxy) { + return NULL; + } + + result =3D g_dbus_proxy_call_sync(proxy, "ListQueuedOwners", + g_variant_new("(s)", "org.qemu.VMState= 1"), + G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, NULL, err); + if (!result) { + return NULL; + } + + child =3D g_variant_get_child_value(result, 0); + return g_variant_dup_strv(child, NULL); +} + +static GHashTable * +get_id_list_set(DBusVMState *self) +{ + g_auto(GStrv) ids =3D NULL; + g_autoptr(GHashTable) set =3D NULL; + int i; + + if (!self->id_list) { + return NULL; + } + + ids =3D g_strsplit(self->id_list, ",", -1); + set =3D g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); + for (i =3D 0; ids[i]; i++) { + g_hash_table_add(set, ids[i]); + ids[i] =3D NULL; + } + + return g_steal_pointer(&set); +} + +static GHashTable * +dbus_get_proxies(DBusVMState *self, GError **err) +{ + g_autoptr(GError) local_err =3D NULL; + g_autoptr(GHashTable) proxies =3D NULL; + g_autoptr(GHashTable) ids =3D NULL; + g_auto(GStrv) names =3D NULL; + size_t i; + + ids =3D get_id_list_set(self); + proxies =3D g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, g_object_unref); + + names =3D dbus_get_vmstate1_names(self, &local_err); + if (!names) { + if (g_error_matches(local_err, + G_DBUS_ERROR, G_DBUS_ERROR_NAME_HAS_NO_OWNER))= { + return proxies; + } + g_propagate_error(err, local_err); + return NULL; + } + + for (i =3D 0; names[i]; i++) { + g_autoptr(GDBusProxy) proxy =3D NULL; + g_autoptr(GVariant) result =3D NULL; + g_autofree char *id =3D NULL; + size_t size; + + proxy =3D g_dbus_proxy_new_sync(self->bus, G_DBUS_PROXY_FLAGS_NONE, + (GDBusInterfaceInfo *) &vmstate1_interface_info, + names[i], + "/org/qemu/VMState1", + "org.qemu.VMState1", + NULL, err); + if (!proxy) { + return NULL; + } + + result =3D g_dbus_proxy_get_cached_property(proxy, "Id"); + if (!result) { + g_set_error_literal(err, G_IO_ERROR, G_IO_ERROR_FAILED, + "VMState Id property is missing."); + return NULL; + } + + id =3D g_variant_dup_string(result, &size); + if (ids && !g_hash_table_remove(ids, id)) { + g_clear_pointer(&id, g_free); + g_clear_object(&proxy); + continue; + } + if (size =3D=3D 0 || size >=3D 256) { + g_set_error(err, G_IO_ERROR, G_IO_ERROR_FAILED, + "VMState Id '%s' is invalid.", id); + return NULL; + } + + if (!g_hash_table_insert(proxies, id, proxy)) { + g_set_error(err, G_IO_ERROR, G_IO_ERROR_FAILED, + "Duplicated VMState Id '%s'", id); + return NULL; + } + id =3D NULL; + proxy =3D NULL; + + g_clear_pointer(&result, g_variant_unref); + } + + if (ids) { + g_autofree char **left =3D NULL; + + left =3D (char **)g_hash_table_get_keys_as_array(ids, NULL); + if (*left) { + g_autofree char *leftids =3D g_strjoinv(",", left); + g_set_error(err, G_IO_ERROR, G_IO_ERROR_FAILED, + "Required VMState Id are missing: %s", leftids); + return NULL; + } + } + + return g_steal_pointer(&proxies); +} + +static int +dbus_load_state_proxy(GDBusProxy *proxy, const uint8_t *data, size_t size) +{ + g_autoptr(GError) err =3D NULL; + g_autoptr(GVariant) result =3D NULL; + g_autoptr(GVariant) value =3D NULL; + + value =3D g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, + data, size, sizeof(char)); + result =3D g_dbus_proxy_call_sync(proxy, "Load", + g_variant_new("(@ay)", + g_steal_pointer(&value)), + G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, NULL, &err); + if (!result) { + error_report("Failed to Load: %s", err->message); + return -1; + } + + return 0; +} + +static int dbus_vmstate_post_load(void *opaque, int version_id) +{ + DBusVMState *self =3D DBUS_VMSTATE(opaque); + g_autoptr(GInputStream) m =3D NULL; + g_autoptr(GDataInputStream) s =3D NULL; + g_autoptr(GError) err =3D NULL; + g_autoptr(GHashTable) proxies =3D NULL; + uint32_t nelem; + + proxies =3D dbus_get_proxies(self, &err); + if (!proxies) { + error_report("Failed to get proxies: %s", err->message); + return -1; + } + + m =3D g_memory_input_stream_new_from_data(self->data, self->data_size,= NULL); + s =3D g_data_input_stream_new(m); + g_data_input_stream_set_byte_order(s, G_DATA_STREAM_BYTE_ORDER_BIG_END= IAN); + + nelem =3D g_data_input_stream_read_uint32(s, NULL, &err); + if (err) { + goto error; + } + + while (nelem > 0) { + GDBusProxy *proxy =3D NULL; + uint32_t len; + gsize bytes_read, avail; + char id[256]; + + len =3D g_data_input_stream_read_uint32(s, NULL, &err); + if (err) { + goto error; + } + if (len >=3D 256) { + error_report("Invalid DBus vmstate proxy name %u", len); + return -1; + } + if (!g_input_stream_read_all(G_INPUT_STREAM(s), id, len, + &bytes_read, NULL, &err)) { + goto error; + } + g_return_val_if_fail(bytes_read =3D=3D len, -1); + id[len] =3D 0; + + proxy =3D g_hash_table_lookup(proxies, id); + if (!proxy) { + error_report("Failed to find proxy Id '%s'", id); + return -1; + } + + len =3D g_data_input_stream_read_uint32(s, NULL, &err); + avail =3D g_buffered_input_stream_get_available( + G_BUFFERED_INPUT_STREAM(s)); + + if (len > DBUS_VMSTATE_SIZE_LIMIT || len > avail) { + error_report("Invalid vmstate size: %u", len); + return -1; + } + + if (dbus_load_state_proxy(proxy, + g_buffered_input_stream_peek_buffer(G_BUFFERED_INPUT_STREA= M(s), + NULL), + len) < 0) { + error_report("Failed to restore Id '%s'", id); + return -1; + } + + if (!g_seekable_seek(G_SEEKABLE(s), len, G_SEEK_CUR, NULL, &err)) { + goto error; + } + + nelem -=3D 1; + } + + return 0; + +error: + error_report("Failed to read from stream: %s", err->message); + return -1; +} + +static void +dbus_save_state_proxy(gpointer key, + gpointer value, + gpointer user_data) +{ + GDataOutputStream *s =3D user_data; + const char *id =3D key; + GDBusProxy *proxy =3D value; + g_autoptr(GVariant) result =3D NULL; + g_autoptr(GVariant) child =3D NULL; + g_autoptr(GError) err =3D NULL; + const uint8_t *data; + gsize size; + + result =3D g_dbus_proxy_call_sync(proxy, "Save", + NULL, G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, NULL, &err); + if (!result) { + error_report("Failed to Save: %s", err->message); + return; + } + + 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"); + return; + } + if (size > DBUS_VMSTATE_SIZE_LIMIT) { + error_report("Too large vmstate data to save: %lu", size); + return; + } + + if (!g_data_output_stream_put_uint32(s, strlen(id), NULL, &err) || + !g_data_output_stream_put_string(s, id, NULL, &err) || + !g_data_output_stream_put_uint32(s, size, NULL, &err) || + !g_output_stream_write_all(G_OUTPUT_STREAM(s), + data, size, NULL, NULL, &err)) { + error_report("Failed to write to stream: %s", err->message); + } +} + +static int dbus_vmstate_pre_save(void *opaque) +{ + DBusVMState *self =3D DBUS_VMSTATE(opaque); + g_autoptr(GOutputStream) m =3D NULL; + g_autoptr(GDataOutputStream) s =3D NULL; + g_autoptr(GHashTable) proxies =3D NULL; + g_autoptr(GError) err =3D NULL; + + proxies =3D dbus_get_proxies(self, &err); + if (!proxies) { + error_report("Failed to get proxies: %s", err->message); + return -1; + } + + m =3D g_memory_output_stream_new_resizable(); + s =3D g_data_output_stream_new(m); + g_data_output_stream_set_byte_order(s, G_DATA_STREAM_BYTE_ORDER_BIG_EN= DIAN); + + if (!g_data_output_stream_put_uint32(s, g_hash_table_size(proxies), + NULL, &err)) { + error_report("Failed to write to stream: %s", err->message); + return -1; + } + + g_hash_table_foreach(proxies, dbus_save_state_proxy, s); + + if (g_memory_output_stream_get_size(G_MEMORY_OUTPUT_STREAM(m)) + > UINT32_MAX) { + error_report("DBus vmstate buffer is too large"); + return -1; + } + + if (!g_output_stream_close(G_OUTPUT_STREAM(m), NULL, &err)) { + error_report("Failed to close stream: %s", err->message); + return -1; + } + + g_free(self->data); + self->data_size =3D + g_memory_output_stream_get_size(G_MEMORY_OUTPUT_STREAM(m)); + self->data =3D + g_memory_output_stream_steal_data(G_MEMORY_OUTPUT_STREAM(m)); + + return 0; +} + +static const VMStateDescription dbus_vmstate =3D { + .name =3D TYPE_DBUS_VMSTATE, + .version_id =3D 0, + .pre_save =3D dbus_vmstate_pre_save, + .post_load =3D dbus_vmstate_post_load, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(data_size, DBusVMState), + VMSTATE_VBUFFER_ALLOC_UINT32(data, DBusVMState, 0, 0, data_size), + VMSTATE_END_OF_LIST() + } +}; + +static void +dbus_vmstate_complete(UserCreatable *uc, Error **errp) +{ + DBusVMState *self =3D DBUS_VMSTATE(uc); + GError *err =3D NULL; + GDBusConnection *bus; + + if (!object_resolve_path_type("", TYPE_DBUS_VMSTATE, NULL)) { + error_setg(errp, "There is already an instance of %s", + TYPE_DBUS_VMSTATE); + return; + } + + 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 | + G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION, + NULL, NULL, &err); + if (err) { + error_setg(errp, "failed to connect to DBus: '%s'", err->message); + g_clear_error(&err); + } + + self->bus =3D bus; + + if (vmstate_register(VMSTATE_IF(self), -1, &dbus_vmstate, self) < 0) { + error_setg(errp, "Failed to register vmstate"); + } +} + +static void +dbus_vmstate_finalize(Object *o) +{ + DBusVMState *self =3D DBUS_VMSTATE(o); + + vmstate_unregister(VMSTATE_IF(self), &dbus_vmstate, self); + + g_clear_object(&self->bus); + g_free(self->dbus_addr); + g_free(self->id_list); + g_free(self->data); +} + +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 char * +get_id_list(Object *o, Error **errp) +{ + DBusVMState *self =3D DBUS_VMSTATE(o); + + return g_strdup(self->id_list); +} + +static void +set_id_list(Object *o, const char *str, Error **errp) +{ + DBusVMState *self =3D DBUS_VMSTATE(o); + + g_free(self->id_list); + self->id_list =3D g_strdup(str); +} + +static char * +dbus_vmstate_get_id(VMStateIf *vmif) +{ + return g_strdup(TYPE_DBUS_VMSTATE); +} + +static void +dbus_vmstate_class_init(ObjectClass *oc, void *data) +{ + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + VMStateIfClass *vc =3D VMSTATE_IF_CLASS(oc); + + ucc->complete =3D dbus_vmstate_complete; + vc->get_id =3D dbus_vmstate_get_id; + + object_class_property_add_str(oc, "addr", + get_dbus_addr, set_dbus_addr, + &error_abort); + object_class_property_add_str(oc, "id-list", + get_id_list, set_id_list, + &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 }, + { TYPE_VMSTATE_IF }, + { } + } +}; + +static void +register_types(void) +{ + type_register_static(&dbus_vmstate_info); +} + +type_init(register_types); diff --git a/configure b/configure index 95134c0180..0a6eb2ebcd 100755 --- a/configure +++ b/configure @@ -3665,10 +3665,16 @@ if $pkg_config --atleast-version=3D$glib_req_ver gi= o-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 @@ -6831,6 +6837,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..78070be1bd --- /dev/null +++ b/docs/interop/dbus-vmstate.rst @@ -0,0 +1,68 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +D-Bus VMState +=3D=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 + +The QEMU dbus-vmstate object aim is to migrate helpers data running on +a QEMU D-Bus bus. (refer to the :doc:`dbus` document for +recommendation on D-Bus usage) + +Upon migration, QEMU will go through the queue of +``org.qemu.VMState1`` D-Bus name owners and query their ``Id``. It +must be unique among the helpers. + +It will then save arbitrary data of each Id to be transferred in the +migration stream and restored/loaded at the corresponding destination +helper. + +The data amount to be transferred is limited to 1Mb. The state must be +saved quickly (a few seconds maximum). (D-Bus imposes a time limit on +reply anyway, and migration would fail if data isn't given quickly +enough) + +dbus-vmstate object can be configured with the expected list of +helpers by setting its ``id-list`` property, with a coma-separated +``Id`` list. + +Interface +=3D=3D=3D=3D=3D=3D=3D=3D=3D + +On object path ``/org/qemu/VMState1``, the following +``org.qemu.VMState1`` interface should be implemented: + +.. code:: xml + + + + + + + + + + + +"Id" property +------------- + +A string that identifies the helper uniquely. + +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 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 fa4478ce2e..75832f44ac 100644 --- a/docs/interop/index.rst +++ b/docs/interop/index.rst @@ -14,6 +14,7 @@ Contents: =20 bitmaps dbus + dbus-vmstate live-block-operations pr-helper vhost-user diff --git a/tests/Makefile.include b/tests/Makefile.include index d4502a30eb..eb40e8a5e7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -158,7 +158,9 @@ check-qtest-pci-$(CONFIG_RTL8139_PCI) +=3D tests/rtl813= 9-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$(EXESUF) - +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$(EXESUF) check-qtest-i386-y +=3D tests/fdc-test$(EXESUF) check-qtest-i386-y +=3D tests/ide-test$(EXESUF) @@ -620,6 +622,19 @@ tests/qapi-schema/doc-good.test.texi: $(SRC_PATH)/test= s/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-good-= qmp-*.[ch] =20 +tests/dbus-vmstate1.h tests/dbus-vmstate1.c: tests/dbus-vmstate1-gen-times= tamp ; +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-vmstate-test.o-cflags :=3D -DSRCDIR=3D"$(SRC_PATH)" +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-visito= r.o $(test-qapi-obj-y) tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.= o $(test-qapi-obj-y) tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-events.o @@ -822,6 +837,7 @@ tests/test-filter-mirror$(EXESUF): tests/test-filter-mi= rror.o $(qtest-obj-y) tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qt= est-obj-y) tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtes= t-obj-y) tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/i= vshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) +tests/dbus-vmstate-test$(EXESUF): tests/dbus-vmstate-test.o tests/dbus-vms= tate1.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-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 @@ -1176,6 +1192,7 @@ check-clean: rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-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-daemon.sh b/tests/dbus-vmstate-daemon.sh new file mode 100755 index 0000000000..c4394ac918 --- /dev/null +++ b/tests/dbus-vmstate-daemon.sh @@ -0,0 +1,95 @@ +#!/bin/sh + +# dbus-daemon wrapper script for dbus-vmstate testing +# +# This script allows to tweak the dbus-daemon policy during the test +# to test different configurations. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# Copyright (C) 2019 Red Hat, Inc. + +write_config() +{ + CONF=3D"$1" + cat > "$CONF" < + session + unix:tmpdir=3D/tmp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + contexts/dbus_contexts + + +EOF +} + +ARGS=3D +for arg in "$@" +do + case $arg in + --config-file=3D*) + CONF=3D"${arg#*=3D}" + write_config "$CONF" + ARGS=3D"$ARGS $1" + shift + ;; + *) + ARGS=3D"$ARGS $1" + shift + ;; + esac +done + +exec dbus-daemon $ARGS diff --git a/tests/dbus-vmstate-test.c b/tests/dbus-vmstate-test.c new file mode 100644 index 0000000000..bcf2372e15 --- /dev/null +++ b/tests/dbus-vmstate-test.c @@ -0,0 +1,386 @@ +#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; +} TestServer; + +typedef struct Test { + const char *id_list; + bool migrate_fail; + bool without_dst_b; + TestServer srcA; + TestServer dstA; + TestServer srcB; + TestServer dstB; + GMainLoop *loop; + QTestState *src_qemu; +} Test; + +static gboolean +vmstate_load(VMState1 *object, GDBusMethodInvocation *invocation, + const gchar *arg_data, gpointer user_data) +{ + TestServer *h =3D user_data; + g_autoptr(GVariant) var =3D NULL; + GVariant *args; + 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_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(char)= ); + g_dbus_method_invocation_return_value(invocation, + g_variant_new("(@ay)", var)); + h->save_called =3D true; + + return TRUE; +} + +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, NULL); + status =3D qdict_get_str(rsp_return, "status"); + if (g_str_equal(status, "completed") || g_str_equal(status, "failed"))= { + 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 }", ar= gs); + + g_assert(qdict_haskey(rsp, "return")); + qobject_unref(rsp); +} + +typedef struct WaitNamed { + GMainLoop *loop; + bool named; +} WaitNamed; + +static void +named_cb(GDBusConnection *connection, + const gchar *name, + gpointer user_data) +{ + WaitNamed *t =3D user_data; + + t->named =3D true; + g_main_loop_quit(t->loop); +} + +static GDBusConnection * +get_connection(Test *test, guint *ownid) +{ + g_autofree gchar *addr =3D NULL; + WaitNamed *wait; + GError *err =3D NULL; + GDBusConnection *c; + + wait =3D g_new0(WaitNamed, 1); + wait->loop =3D test->loop; + addr =3D g_dbus_address_get_for_bus_sync(G_BUS_TYPE_SESSION, NULL, &er= r); + g_assert_no_error(err); + + c =3D g_dbus_connection_new_for_address_sync( + addr, + G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION | + G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT, + NULL, NULL, &err); + g_assert_no_error(err); + *ownid =3D g_bus_own_name_on_connection(c, "org.qemu.VMState1", + G_BUS_NAME_OWNER_FLAGS_NONE, + named_cb, named_cb, wait, g_free= ); + if (!wait->named) { + g_main_loop_run(wait->loop); + } + + return c; +} + +static GDBusObjectManagerServer * +get_server(GDBusConnection *conn, TestServer *s, const TestServerId *id) +{ + g_autoptr(GDBusObjectSkeleton) sk =3D NULL; + g_autoptr(VMState1Skeleton) v =3D NULL; + GDBusObjectManagerServer *os; + + s->id =3D id; + os =3D g_dbus_object_manager_server_new("/org/qemu"); + sk =3D g_dbus_object_skeleton_new("/org/qemu/VMState1"); + + v =3D VMSTATE1_SKELETON(vmstate1_skeleton_new()); + g_object_set(v, "id", id->name, NULL); + + g_signal_connect(v, "handle-load", G_CALLBACK(vmstate_load), s); + g_signal_connect(v, "handle-save", G_CALLBACK(vmstate_save), s); + + g_dbus_object_skeleton_add_interface(sk, G_DBUS_INTERFACE_SKELETON(v)); + g_dbus_object_manager_server_export(os, sk); + g_dbus_object_manager_server_set_connection(os, conn); + + return os; +} + +static void +set_id_list(Test *test, QTestState *s) +{ + if (!test->id_list) { + return; + } + + g_assert(!qmp_rsp_is_err(qtest_qmp(s, + "{ 'execute': 'qom-set', 'arguments': " + "{ 'path': '/objects/dv', 'property': 'id-list', 'value': %s } }", + test->id_list))); +} +static void +test_dbus_vmstate(Test *test) +{ + g_autofree char *src_qemu_args =3D NULL; + g_autofree char *dst_qemu_args =3D NULL; + g_autoptr(GTestDBus) srcbus =3D NULL; + g_autoptr(GTestDBus) dstbus =3D NULL; + g_autoptr(GDBusConnection) srcconnA =3D NULL; + g_autoptr(GDBusConnection) srcconnB =3D NULL; + g_autoptr(GDBusConnection) dstconnA =3D NULL; + g_autoptr(GDBusConnection) dstconnB =3D NULL; + g_autoptr(GDBusObjectManagerServer) srcserverA =3D NULL; + g_autoptr(GDBusObjectManagerServer) srcserverB =3D NULL; + g_autoptr(GDBusObjectManagerServer) dstserverA =3D NULL; + g_autoptr(GDBusObjectManagerServer) dstserverB =3D NULL; + g_auto(GStrv) srcaddr =3D NULL; + g_auto(GStrv) dstaddr =3D NULL; + g_autofree char *uri =3D NULL; + QTestState *src_qemu =3D NULL, *dst_qemu =3D NULL; + guint ownsrcA, ownsrcB, owndstA, owndstB; + + uri =3D g_strdup_printf("unix:%s/migsocket", workdir); + + test->loop =3D g_main_loop_new(NULL, TRUE); + + srcbus =3D g_test_dbus_new(G_TEST_DBUS_NONE); + g_test_dbus_up(srcbus); + srcconnA =3D get_connection(test, &ownsrcA); + srcserverA =3D get_server(srcconnA, &test->srcA, &idA); + srcconnB =3D get_connection(test, &ownsrcB); + srcserverB =3D get_server(srcconnB, &test->srcB, &idB); + + /* remove ,guid=3Dfoo part */ + srcaddr =3D g_strsplit(g_test_dbus_get_bus_address(srcbus), ",", 2); + src_qemu_args =3D + g_strdup_printf("-object dbus-vmstate,id=3Ddv,addr=3D%s", srcaddr[= 0]); + + dstbus =3D g_test_dbus_new(G_TEST_DBUS_NONE); + g_test_dbus_up(dstbus); + dstconnA =3D get_connection(test, &owndstA); + dstserverA =3D get_server(dstconnA, &test->dstA, &idA); + if (!test->without_dst_b) { + dstconnB =3D get_connection(test, &owndstB); + dstserverB =3D get_server(dstconnB, &test->dstB, &idB); + } + + dstaddr =3D g_strsplit(g_test_dbus_get_bus_address(dstbus), ",", 2); + dst_qemu_args =3D + g_strdup_printf("-object dbus-vmstate,id=3Ddv,addr=3D%s -incoming = %s", + dstaddr[0], uri); + + src_qemu =3D qtest_init(src_qemu_args); + dst_qemu =3D qtest_init(dst_qemu_args); + set_id_list(test, src_qemu); + set_id_list(test, dst_qemu); + + 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); + + if (test->migrate_fail) { + qtest_expect_exit_status(dst_qemu, 1); + } + qtest_quit(dst_qemu); + qtest_quit(src_qemu); + g_bus_unown_name(ownsrcA); + g_bus_unown_name(ownsrcB); + g_bus_unown_name(owndstA); + if (!test->without_dst_b) { + g_bus_unown_name(owndstB); + } +} + +static void +check_not_migrated(TestServer *s, TestServer *d) +{ + assert(!s->save_called); + assert(!s->load_called); + assert(!d->save_called); + assert(!d->load_called); +} + +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_without_list(void) +{ + Test test =3D { 0, }; + + test_dbus_vmstate(&test); + + check_migrated(&test.srcA, &test.dstA); + check_migrated(&test.srcB, &test.dstB); +} + +static void +test_dbus_vmstate_with_list(void) +{ + Test test =3D { .id_list =3D "idA,idB" }; + + test_dbus_vmstate(&test); + + check_migrated(&test.srcA, &test.dstA); + check_migrated(&test.srcB, &test.dstB); +} + +static void +test_dbus_vmstate_only_a(void) +{ + Test test =3D { .id_list =3D "idA" }; + + test_dbus_vmstate(&test); + + check_migrated(&test.srcA, &test.dstA); + check_not_migrated(&test.srcB, &test.dstB); +} + +static void +test_dbus_vmstate_missing_src(void) +{ + Test test =3D { .id_list =3D "idA,idC", .migrate_fail =3D true }; + + test_dbus_vmstate(&test); + check_not_migrated(&test.srcA, &test.dstA); + check_not_migrated(&test.srcB, &test.dstB); +} + +static void +test_dbus_vmstate_missing_dst(void) +{ + Test test =3D { .id_list =3D "idA,idB", + .without_dst_b =3D true, + .migrate_fail =3D true }; + + test_dbus_vmstate(&test); + + assert(test.srcA.save_called); + assert(test.srcB.save_called); + assert(!test.dstB.save_called); +} + +int +main(int argc, char **argv) +{ + GError *err =3D NULL; + g_autofree char *dbus_daemon =3D NULL; + int ret; + + dbus_daemon =3D g_build_filename(G_STRINGIFY(SRCDIR), + "tests", + "dbus-vmstate-daemon.sh", + NULL); + g_setenv("G_TEST_DBUS_DAEMON", dbus_daemon, true); + + 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); + exit(1); + } + + qtest_add_func("/dbus-vmstate/without-list", + test_dbus_vmstate_without_list); + qtest_add_func("/dbus-vmstate/with-list", + test_dbus_vmstate_with_list); + qtest_add_func("/dbus-vmstate/only-a", + test_dbus_vmstate_only_a); + qtest_add_func("/dbus-vmstate/missing-src", + test_dbus_vmstate_missing_src); + qtest_add_func("/dbus-vmstate/missing-dst", + test_dbus_vmstate_missing_dst); + + 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