From nobody Thu Jan 1 14:31:53 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697806901; cv=none; d=zohomail.com; s=zohoarc; b=bnGG56jWku5r+Ebzt6YXwYJG/URxZyMDcXsApyVUTmZQyo929HJrrgKUTqm23cfA5/9DlmHnr3MvXysWIlAwoEAPMHxNkqaLbbgG4sS5jtQ/Vk4W4OAUuLL9uuStYwpEUNOaUXcsHzADwMy1XyUCFX2mJSapy1QNVv7xKSnibMU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697806901; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j7d6/TDtpiHkxOz2wUVnlSf3kuJnT2Yu2Dp1B0ebjH4=; b=Pd4GY0+XCxhB3LreOuSvpWXUtCNdoQwxNL2AtKXspkSULOY5qh3478QHVFlX0bj4ly7nfsV/v/erTJkes/ZDdR5wuTqWs91vGXYb0V3oKIdYIKysMU5Gh6mnPBGYWqhvgHnBXjobzcqyrMwa9YAW5Wtasmd5kmHXlXIIVkkGqmQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697806901974998.8412108855266; Fri, 20 Oct 2023 06:01:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtp4j-000267-Qq; Fri, 20 Oct 2023 08:58:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtp4d-00023e-Ty for qemu-devel@nongnu.org; Fri, 20 Oct 2023 08:57:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtp4W-0003Lj-Vl for qemu-devel@nongnu.org; Fri, 20 Oct 2023 08:57:55 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-551-f0Dkc9yBM--Es0M2qvdxgw-1; Fri, 20 Oct 2023 08:57:33 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1B3A73C0F694; Fri, 20 Oct 2023 12:57:33 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94F27503B; Fri, 20 Oct 2023 12:57:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697806667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j7d6/TDtpiHkxOz2wUVnlSf3kuJnT2Yu2Dp1B0ebjH4=; b=Mjp7bDMvPGjKQ294Kna8Fdt+bLI1xvG2ym0uvrQy297jU5noxFJK8VFMRTiQ+4pymAipxL AakjPW80oM2kkEeuZSo9IOiqz+32EzLcP/nIMGl+FqMTO2s+DI5ubfFIjrYeVUhe7ZeUj8 tAU1cZ/PfTEnCeKPQ0UalrgiAv0xJOE= X-MC-Unique: f0Dkc9yBM--Es0M2qvdxgw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Christian Borntraeger , Eric Farman Cc: qemu-s390x@nongnu.org, Halil Pasic , David Hildenbrand , Claudio Imbrenda , Juan Quintela Subject: [PATCH 1/3] hw/s390x/s390-skeys: Don't call register_savevm_live() during instance_init() Date: Fri, 20 Oct 2023 14:57:26 +0200 Message-ID: <20231020125728.579747-2-thuth@redhat.com> In-Reply-To: <20231020125728.579747-1-thuth@redhat.com> References: <20231020125728.579747-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697806909362100001 Content-Type: text/plain; charset="utf-8" Since the instance_init() function immediately tries to set the property to "true", the s390_skeys_set_migration_enabled() tries to register a savevm handler during instance_init(). However, instance_init() functions can be called multiple times, e.g. for introspection of devices. That means multiple instances of devices can be created during runtime (which is fine as long as they all don't get realized, too), so the "Prevent double registration of savevm handler" check in the s390_skeys_set_migration_enabled() function does not work at all as expected (since there could be more than one instance). Thus we must not call register_savevm_live() from an instance_init() function at all. Move this to the realize() function instead. This way we can also get rid of the property getter and setter functions completely, simplifying the code along the way quite a bit. Signed-off-by: Thomas Huth Acked-by: David Hildenbrand Reviewed-by: Eric Farman --- hw/s390x/s390-skeys.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 5024faf411..8e9d9e41e8 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "hw/s390x/storage-keys.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" @@ -432,58 +433,38 @@ static int s390_storage_keys_load(QEMUFile *f, void *= opaque, int version_id) return ret; } =20 -static inline bool s390_skeys_get_migration_enabled(Object *obj, Error **e= rrp) -{ - S390SKeysState *ss =3D S390_SKEYS(obj); - - return ss->migration_enabled; -} - static SaveVMHandlers savevm_s390_storage_keys =3D { .save_state =3D s390_storage_keys_save, .load_state =3D s390_storage_keys_load, }; =20 -static inline void s390_skeys_set_migration_enabled(Object *obj, bool valu= e, - Error **errp) +static void s390_skeys_realize(DeviceState *dev, Error **errp) { - S390SKeysState *ss =3D S390_SKEYS(obj); - - /* Prevent double registration of savevm handler */ - if (ss->migration_enabled =3D=3D value) { - return; - } - - ss->migration_enabled =3D value; + S390SKeysState *ss =3D S390_SKEYS(dev); =20 if (ss->migration_enabled) { register_savevm_live(TYPE_S390_SKEYS, 0, 1, &savevm_s390_storage_keys, ss); - } else { - unregister_savevm(VMSTATE_IF(ss), TYPE_S390_SKEYS, ss); } } =20 -static void s390_skeys_instance_init(Object *obj) -{ - object_property_add_bool(obj, "migration-enabled", - s390_skeys_get_migration_enabled, - s390_skeys_set_migration_enabled); - object_property_set_bool(obj, "migration-enabled", true, NULL); -} +static Property s390_skeys_props[] =3D { + DEFINE_PROP_BOOL("migration-enabled", S390SKeysState, migration_enable= d, true), +}; =20 static void s390_skeys_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); =20 dc->hotpluggable =3D false; + dc->realize =3D s390_skeys_realize; + device_class_set_props(dc, s390_skeys_props); set_bit(DEVICE_CATEGORY_MISC, dc->categories); } =20 static const TypeInfo s390_skeys_info =3D { .name =3D TYPE_S390_SKEYS, .parent =3D TYPE_DEVICE, - .instance_init =3D s390_skeys_instance_init, .instance_size =3D sizeof(S390SKeysState), .class_init =3D s390_skeys_class_init, .class_size =3D sizeof(S390SKeysClass), --=20 2.41.0 From nobody Thu Jan 1 14:31:53 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697806789; cv=none; d=zohomail.com; s=zohoarc; b=PiRxT2cV1UtoDmdDdStYOlFHHVEnJqeVdQRYSlDDbNdraHzLffk3HBi7jihcsBXw27qjMFm2W5SZdiPLJSndMsSCuYXiKCpALvxty2QP9Ao1NhIsy/JZWKK6DF9LFk5AUQ3ykbRr6dwhi/8/gK8DHFKKsveJCzNlXe48mBK3bhs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697806789; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nrV7G3DrFjDs/BJZKCEEHFKRlqvIGvHSzO/+kQmaZlc=; b=KYt+VjojjyBrRfn348gL95FDqe8bzfdiNWAgaDwLovyUtnnpsi+Rt+yMt323judGpQ1t7s2afhAgl8YpGu1wQIQsgIFDD6cSLy51vsxFfBxrMg5FlDC2wak7GNY61AGWxNv/W2keuNglfm0HEpgM9iLuWMNt+26XhH3qZc8VEvE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697806789683193.19203681228566; Fri, 20 Oct 2023 05:59:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtp4h-00024e-JB; Fri, 20 Oct 2023 08:57:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtp4c-00022w-Tf for qemu-devel@nongnu.org; Fri, 20 Oct 2023 08:57:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtp4W-0003Li-VZ for qemu-devel@nongnu.org; Fri, 20 Oct 2023 08:57:53 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-577-isQj0l6_NDuXd7L38c-9ug-1; Fri, 20 Oct 2023 08:57:35 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D713A88B7AC; Fri, 20 Oct 2023 12:57:34 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 655D8503C; Fri, 20 Oct 2023 12:57:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697806666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nrV7G3DrFjDs/BJZKCEEHFKRlqvIGvHSzO/+kQmaZlc=; b=QA6TNVXoIt6X+8ig1kDPfI9jUsCYC+gCCQKgFLVJLKkvLHMPp1YZTEdcwLEQhtOBaydegQ tqpuP8r7jzXgAmonRRy3ir30df1bM7hd842mxjQ1cBCAjekotLMrloAXxWaRXXdVe1LPoW Nn24zd/ZK/BSHt/g9FQrJMUpsHxvemo= X-MC-Unique: isQj0l6_NDuXd7L38c-9ug-1 From: Thomas Huth To: qemu-devel@nongnu.org, Christian Borntraeger , Eric Farman Cc: qemu-s390x@nongnu.org, Halil Pasic , David Hildenbrand , Claudio Imbrenda , Juan Quintela Subject: [PATCH 2/3] hw/s390x/s390-stattrib: Simplify handling of the "migration-enabled" property Date: Fri, 20 Oct 2023 14:57:27 +0200 Message-ID: <20231020125728.579747-3-thuth@redhat.com> In-Reply-To: <20231020125728.579747-1-thuth@redhat.com> References: <20231020125728.579747-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697806791860100003 Content-Type: text/plain; charset="utf-8" There's no need for dedicated handlers here if they don't do anything special. Signed-off-by: Thomas Huth Acked-by: David Hildenbrand Reviewed-by: Eric Farman --- hw/s390x/s390-stattrib.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 220e845d12..52f9fc036e 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -13,6 +13,7 @@ #include "qemu/units.h" #include "migration/qemu-file.h" #include "migration/register.h" +#include "hw/qdev-properties.h" #include "hw/s390x/storage-attributes.h" #include "qemu/error-report.h" #include "exec/ram_addr.h" @@ -340,6 +341,10 @@ static void s390_stattrib_realize(DeviceState *dev, Er= ror **errp) } } =20 +static Property s390_stattrib_props[] =3D { + DEFINE_PROP_BOOL("migration-enabled", S390StAttribState, migration_ena= bled, true), +}; + static void s390_stattrib_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -347,22 +352,7 @@ static void s390_stattrib_class_init(ObjectClass *oc, = void *data) dc->hotpluggable =3D false; set_bit(DEVICE_CATEGORY_MISC, dc->categories); dc->realize =3D s390_stattrib_realize; -} - -static inline bool s390_stattrib_get_migration_enabled(Object *obj, - Error **errp) -{ - S390StAttribState *s =3D S390_STATTRIB(obj); - - return s->migration_enabled; -} - -static inline void s390_stattrib_set_migration_enabled(Object *obj, bool v= alue, - Error **errp) -{ - S390StAttribState *s =3D S390_STATTRIB(obj); - - s->migration_enabled =3D value; + device_class_set_props(dc, s390_stattrib_props); } =20 static SaveVMHandlers savevm_s390_stattrib_handlers =3D { @@ -383,10 +373,6 @@ static void s390_stattrib_instance_init(Object *obj) register_savevm_live(TYPE_S390_STATTRIB, 0, 0, &savevm_s390_stattrib_handlers, sas); =20 - object_property_add_bool(obj, "migration-enabled", - s390_stattrib_get_migration_enabled, - s390_stattrib_set_migration_enabled); - object_property_set_bool(obj, "migration-enabled", true, NULL); sas->migration_cur_gfn =3D 0; } =20 --=20 2.41.0 From nobody Thu Jan 1 14:31:53 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697806799; cv=none; d=zohomail.com; s=zohoarc; b=EZyL7NtQ2nCAtQhTUrfKMKo4RVwWYVxVh4Tr7EpzPFSSMkxXYRaDc6vYh0sjRKSQDprF82GRmAdx5NsZ0sMXT1jgenpAzc5Pex0B97AuTGCHiuAU/b14FVhE5BwJ2EIqds97fUZGU389u3Jn4L21mh3lR6re/oKRleU5ZMssMlY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697806799; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VABJ5KTK8UFDUwBj9mLNBPFGTkRXoAJZdRfYgjxMzfM=; b=Gpkqv4NnY/PtaSkOC8Sxdh8KFJwRsuJscwaAeTzGou05qYY804RJozyYrkQDiLHpmrA4/O2y1D39KNDsL8n/bi2znOXVwT9i2rhJW+e3OKE9G/ZybJ/RBOKKjWBcXHyFxko5A/QS++8fIHt3dbaojcDLv7/0kAQ3xHYnMx4PmqQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169780679980099.33523708833229; Fri, 20 Oct 2023 05:59:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtp4i-00025k-7y; Fri, 20 Oct 2023 08:58:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtp4d-00023J-Ai for qemu-devel@nongnu.org; Fri, 20 Oct 2023 08:57:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtp4Y-0003Lv-QT for qemu-devel@nongnu.org; Fri, 20 Oct 2023 08:57:55 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-80-K_9RO8Z4M-2FE0hyxwR6Cw-1; Fri, 20 Oct 2023 08:57:37 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9F5DC857D0A; Fri, 20 Oct 2023 12:57:36 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 278DB503B; Fri, 20 Oct 2023 12:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697806668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VABJ5KTK8UFDUwBj9mLNBPFGTkRXoAJZdRfYgjxMzfM=; b=epsq+NR/V47SnCTCr0dpTEWoPxK8pAbtIIu2p6X81psz3DaC2My6dcUwlASAx6on+TeH8y idaRF0UzcJL58NgDdOqBIi7YlcFiAD/n2188asAwo39zQ8LdDa8b/CTJ/GEQmIlZf47Nn1 Ww5oKHwTJFvWlYEGzHQ2wyAMUO5giJk= X-MC-Unique: K_9RO8Z4M-2FE0hyxwR6Cw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Christian Borntraeger , Eric Farman Cc: qemu-s390x@nongnu.org, Halil Pasic , David Hildenbrand , Claudio Imbrenda , Juan Quintela Subject: [PATCH 3/3] hw/s390x/s390-stattrib: Don't call register_savevm_live() during instance_init() Date: Fri, 20 Oct 2023 14:57:28 +0200 Message-ID: <20231020125728.579747-4-thuth@redhat.com> In-Reply-To: <20231020125728.579747-1-thuth@redhat.com> References: <20231020125728.579747-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697806801945100003 Content-Type: text/plain; charset="utf-8" We must not call register_savevm_live() from an instance_init() function (since this could be called multiple times during device introspection). Move this to the realize() function instead. Signed-off-by: Thomas Huth Acked-by: David Hildenbrand Reviewed-by: Eric Farman --- hw/s390x/s390-stattrib.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 52f9fc036e..3217263418 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -331,6 +331,17 @@ static const TypeInfo qemu_s390_stattrib_info =3D { =20 /* Generic abstract object: */ =20 +static SaveVMHandlers savevm_s390_stattrib_handlers =3D { + .save_setup =3D cmma_save_setup, + .save_live_iterate =3D cmma_save_iterate, + .save_live_complete_precopy =3D cmma_save_complete, + .state_pending_exact =3D cmma_state_pending, + .state_pending_estimate =3D cmma_state_pending, + .save_cleanup =3D cmma_save_cleanup, + .load_state =3D cmma_load, + .is_active =3D cmma_active, +}; + static void s390_stattrib_realize(DeviceState *dev, Error **errp) { bool ambiguous =3D false; @@ -339,6 +350,9 @@ static void s390_stattrib_realize(DeviceState *dev, Err= or **errp) if (ambiguous) { error_setg(errp, "storage_attributes device already exists"); } + + register_savevm_live(TYPE_S390_STATTRIB, 0, 0, + &savevm_s390_stattrib_handlers, sas); } =20 static Property s390_stattrib_props[] =3D { @@ -355,24 +369,10 @@ static void s390_stattrib_class_init(ObjectClass *oc,= void *data) device_class_set_props(dc, s390_stattrib_props); } =20 -static SaveVMHandlers savevm_s390_stattrib_handlers =3D { - .save_setup =3D cmma_save_setup, - .save_live_iterate =3D cmma_save_iterate, - .save_live_complete_precopy =3D cmma_save_complete, - .state_pending_exact =3D cmma_state_pending, - .state_pending_estimate =3D cmma_state_pending, - .save_cleanup =3D cmma_save_cleanup, - .load_state =3D cmma_load, - .is_active =3D cmma_active, -}; - static void s390_stattrib_instance_init(Object *obj) { S390StAttribState *sas =3D S390_STATTRIB(obj); =20 - register_savevm_live(TYPE_S390_STATTRIB, 0, 0, - &savevm_s390_stattrib_handlers, sas); - sas->migration_cur_gfn =3D 0; } =20 --=20 2.41.0