From nobody Tue May 7 19:29:53 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622717006; cv=none; d=zohomail.com; s=zohoarc; b=QhS7/f2Mz/0Uu+A/GUoCiOvps5UPbovCdZKX7PffJbN0F7p34wUq4KE88eTyDpQ8A1OE4wlc6yA2jukBmQBFoaPSRiSJ6uFwVnS04LTn5M4IMihXuStyv8sfo377e6yMUtFWIqhkG8a3/dnxMPiyCPaZBEAlxOxU5leeZBcJw4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622717006; 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; bh=8WpsCzicMOuLZhhP0URMwZ3hPid1C5q1WEze+3bRcPQ=; b=VsDwNkSm9cUpI82cYdw2O023JuayiJQJieD41fWMcN+GVVgMfXUwM5mGqdWm0M0IJP6F4uPmcaF2QK5Z+LDD11TxaFzj8f4zzjFRF6tZpUEaO1rOe9KeBNfy+5G/rZzEvJv4qjQ8jOvofMNCkp99W/fPCwXHzGnhpqoYSzn35cA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1622717006066557.2716643944904; Thu, 3 Jun 2021 03:43:26 -0700 (PDT) Received: from localhost ([::1]:48646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lokov-0000Qf-2N for importer2@patchew.org; Thu, 03 Jun 2021 06:43:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loknR-0006Yy-Th for qemu-devel@nongnu.org; Thu, 03 Jun 2021 06:41:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loknN-0007oO-V9 for qemu-devel@nongnu.org; Thu, 03 Jun 2021 06:41:53 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-566-aSIwYG4DMxiBecGflqoYBw-1; Thu, 03 Jun 2021 06:41:46 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 230F98018A7; Thu, 3 Jun 2021 10:41:45 +0000 (UTC) Received: from thuth.com (ovpn-112-76.ams2.redhat.com [10.36.112.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7501E5D9F0; Thu, 3 Jun 2021 10:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622716909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8WpsCzicMOuLZhhP0URMwZ3hPid1C5q1WEze+3bRcPQ=; b=P89T/9DlyB1raguHpzm901NB6tfSVtCDYlQhaZr+iPsgZkhy4QO8/xvWf/tioW9sky4Uut ev3CMNhvve9jPJGrTWEe7t0RZLnpURJmAoDAnpDyvvzyq8rfwN1gXh7XtLSWFVqZk0eies xa5Z4zjusSv5OmpInz/Ob0i0z2IcQRg= X-MC-Unique: aSIwYG4DMxiBecGflqoYBw-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PATCH 1/2] hw/hyperv/vmbus: Wire up vmstate_vmbus_dev Date: Thu, 3 Jun 2021 12:41:38 +0200 Message-Id: <20210603104139.556512-2-thuth@redhat.com> In-Reply-To: <20210603104139.556512-1-thuth@redhat.com> References: <20210603104139.556512-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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+importer2=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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.37, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , "Maciej S . Szmigiero" , Jon Doron , Roman Kagan Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The vmstate_vmbus_dev structure is currently completely unused. Looks like this has been forgotten to get wired up in the vmbus_dev_class_init() function. Signed-off-by: Thomas Huth --- hw/hyperv/vmbus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 984caf898d..2384103cb0 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -2445,6 +2445,7 @@ static void vmbus_dev_class_init(ObjectClass *klass, = void *data) kdev->realize =3D vmbus_dev_realize; kdev->unrealize =3D vmbus_dev_unrealize; kdev->reset =3D vmbus_dev_reset; + kdev->vmsd =3D &vmstate_vmbus_dev; } =20 static Property vmbus_dev_instanceid =3D --=20 2.27.0 From nobody Tue May 7 19:29:53 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622717012; cv=none; d=zohomail.com; s=zohoarc; b=aTne/TV8gMEMS09Qr1FoM9PG9XT5WIqXvEDTFufHXgr6xK4m7edRjqJ+LUrHALmgOs54qqXFDHallnaqkh53KbmlZPjTsChVJ1dNXHXCl2St43j5JQCg3WbYnYq9wDBSg4LZLTwTT6RBirDD0FeqhIAEIsUZkC8K5NJmevQZyxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622717012; 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; bh=y3UMpXCncniSOWDV8V/g8EmeW8WrqTc482DfhD9JHiY=; b=lUdkxE9sX7f1EC/hrlKqZw2sRXy+Iku5xneXS7Vn6K8D307izwDSHtZacFB6EFUA9U1VCBHhPbvs9DaITgc8gu712aJROaRhC4NYiv8w4a0+4aL84pia+e98328Gt+7VyKnx+s4rBTjLwnL6Foq/FzTKudeh3YrCdApFQK/BfPk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1622717012402654.6970581781152; Thu, 3 Jun 2021 03:43:32 -0700 (PDT) Received: from localhost ([::1]:49192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lokp1-0000n6-E6 for importer2@patchew.org; Thu, 03 Jun 2021 06:43:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loknR-0006Y7-HZ for qemu-devel@nongnu.org; Thu, 03 Jun 2021 06:41:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loknO-0007pf-RY for qemu-devel@nongnu.org; Thu, 03 Jun 2021 06:41:53 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-588-yoTHtjk2PoqjW3XmiLbVpA-1; Thu, 03 Jun 2021 06:41:48 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1585F107ACE3; Thu, 3 Jun 2021 10:41:47 +0000 (UTC) Received: from thuth.com (ovpn-112-76.ams2.redhat.com [10.36.112.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80A9D5D9F0; Thu, 3 Jun 2021 10:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622716910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y3UMpXCncniSOWDV8V/g8EmeW8WrqTc482DfhD9JHiY=; b=DtV2KJT1OQBl0GGZwycOzHRo7CPuE6xN3agNeHkox+L526KzYQ1BTs4/41SgcS5UZHCssj JBnTBJmKLFKmwgMDm/vd5N7y41REd0CvBy4Kme44XinWVtckzfHOECQpSWPupeW/Ekqx1L i1IOaghZqvqKmZLNBZix8cW1bAUrxBI= X-MC-Unique: yoTHtjk2PoqjW3XmiLbVpA-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PATCH 2/2] hw/hyperv/vmbus: Make vmstate_vmbus_dev static Date: Thu, 3 Jun 2021 12:41:39 +0200 Message-Id: <20210603104139.556512-3-thuth@redhat.com> In-Reply-To: <20210603104139.556512-1-thuth@redhat.com> References: <20210603104139.556512-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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+importer2=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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.37, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , "Maciej S . Szmigiero" , Jon Doron , Roman Kagan Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" vmstate_vmbus_dev is only used in vmbus.c, no need to export this via the vmbus.h header file. Signed-off-by: Thomas Huth --- hw/hyperv/vmbus.c | 28 ++++++++++++++-------------- include/hw/hyperv/vmbus.h | 3 --- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 2384103cb0..f05e419682 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -2438,6 +2438,20 @@ static void vmbus_dev_unrealize(DeviceState *dev) free_channels(vdev); } =20 +static const VMStateDescription vmstate_vmbus_dev =3D { + .name =3D TYPE_VMBUS_DEVICE, + .version_id =3D 0, + .minimum_version_id =3D 0, + .fields =3D (VMStateField[]) { + VMSTATE_UINT8_ARRAY(instanceid.data, VMBusDevice, 16), + VMSTATE_UINT16(num_channels, VMBusDevice), + VMSTATE_STRUCT_VARRAY_POINTER_UINT16(channels, VMBusDevice, + num_channels, vmstate_channel, + VMBusChannel), + VMSTATE_END_OF_LIST() + } +}; + static void vmbus_dev_class_init(ObjectClass *klass, void *data) { DeviceClass *kdev =3D DEVICE_CLASS(klass); @@ -2464,20 +2478,6 @@ static void vmbus_dev_instance_init(Object *obj) } } =20 -const VMStateDescription vmstate_vmbus_dev =3D { - .name =3D TYPE_VMBUS_DEVICE, - .version_id =3D 0, - .minimum_version_id =3D 0, - .fields =3D (VMStateField[]) { - VMSTATE_UINT8_ARRAY(instanceid.data, VMBusDevice, 16), - VMSTATE_UINT16(num_channels, VMBusDevice), - VMSTATE_STRUCT_VARRAY_POINTER_UINT16(channels, VMBusDevice, - num_channels, vmstate_channel, - VMBusChannel), - VMSTATE_END_OF_LIST() - } -}; - /* vmbus generic device base */ static const TypeInfo vmbus_dev_type_info =3D { .name =3D TYPE_VMBUS_DEVICE, diff --git a/include/hw/hyperv/vmbus.h b/include/hw/hyperv/vmbus.h index f98bea3888..7fab984e62 100644 --- a/include/hw/hyperv/vmbus.h +++ b/include/hw/hyperv/vmbus.h @@ -13,7 +13,6 @@ #include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "hw/qdev-core.h" -#include "migration/vmstate.h" #include "hw/hyperv/vmbus-proto.h" #include "qemu/uuid.h" #include "qom/object.h" @@ -85,8 +84,6 @@ struct VMBusDevice { AddressSpace *dma_as; }; =20 -extern const VMStateDescription vmstate_vmbus_dev; - /* * A unit of work parsed out of a message in the receive (i.e. guest->host) * ring buffer of a channel. It's supposed to be subclassed (through --=20 2.27.0