From nobody Sun May 19 11:31:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1595494888; cv=none; d=zohomail.com; s=zohoarc; b=gJ0yxrEEx590q8DVVLYRqncz21RGK6Dq2sLAYr01yegqHvMri9sSZ57U+qNrdl3lCgxlUBH9LrXXb2HRXGvB5KBF8OTGcrAZJHUB9lD3DZ/fZntO0mD7yj+AoWLogKxOWSRb/yTlwO93sKkXuUd3UXEGWQ3gb8ieId+lZR0/9SY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595494888; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=jhrx5nydjgJZg1qzG8iRjHpnyCmHjuUzwVfAZ+B2StM=; b=ZW4MkyX27w2v7O9gSzJKZp8G0tJMFfvvu7ZnZ2t3ptXk2L+cs02WYVzo0aT6oMVAuNSqA9plbjnx15iEvJ6DgtmkEFYGeTKeVKd4VK/PBX47bh+Zg1NjPKhmPAye+o+xV7Pf82swOCTAsqBj0NlSbWBJieFQRUNaSLwp96XqJ2c= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=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 159549488799015.555336478963795; Thu, 23 Jul 2020 02:01:27 -0700 (PDT) Received: from localhost ([::1]:47216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyX6T-00042n-SX for importer@patchew.org; Thu, 23 Jul 2020 05:01:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyX5T-0003ST-Ef for qemu-devel@nongnu.org; Thu, 23 Jul 2020 05:00:23 -0400 Received: from mga07.intel.com ([134.134.136.100]:6705) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyX5Q-0006Nl-Ld for qemu-devel@nongnu.org; Thu, 23 Jul 2020 05:00:23 -0400 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2020 02:00:10 -0700 Received: from arthur-vostro-3668.sh.intel.com ([10.239.159.135]) by orsmga005.jf.intel.com with ESMTP; 23 Jul 2020 02:00:08 -0700 IronPort-SDR: yi/vCICxfg1/+wAzar/BbzJ4EH2Z+xxqWA2PMm1ucwWG4hCFAtb/O/IJpucef1E1PlWH/ZqRmu xR7r59fJ4Vdg== X-IronPort-AV: E=McAfee;i="6000,8403,9690"; a="215102994" X-IronPort-AV: E=Sophos;i="5.75,386,1589266800"; d="scan'208";a="215102994" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: 5LOe/PSFBk1/CfLxhBIMwEnojD/Lx40ZwX8jLkcTgo4zlyzmMJXP4Bln77aHZqL0tqHqOpbqzx 0s4uOz1Ar94A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,386,1589266800"; d="scan'208";a="462770332" From: Zeng Guang To: jslaby@suse.cz, david@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v2] hw/misc/edu: support pci device state migration Date: Thu, 23 Jul 2020 16:43:55 +0800 Message-Id: <20200723084355.18370-1-guang.zeng@intel.com> X-Mailer: git-send-email 2.17.1 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=134.134.136.100; envelope-from=guang.zeng@intel.com; helo=mga07.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/23 05:00:15 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zeng Guang , wei.w.wang@intel.com, chao.gao@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently edu device doesn't support live migration. Part of PCI configuration information would be lost after migration. PCI device state in source VM: Bus 0, device 3, function 0: Class 0255: PCI device 1234:11e8 PCI subsystem 1af4:1100 IRQ 11, pin A BAR0: 32 bit memory at 0xfea00000 [0xfeafffff]. id "" PCI device state in destination VM: Bus 0, device 3, function 0: Class 0255: PCI device 1234:11e8 PCI subsystem 1af4:1100 IRQ 0, pin A BAR0: 32 bit memory at 0xffffffffffffffff [0x000ffffe]. id "" Add VMState for edu device to support migration. Signed-off-by: Gao Chao Signed-off-by: Zeng Guang Reviewed-by: Wei Wang Reviewed-by: Peter Maydell --- hw/misc/edu.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/hw/misc/edu.c b/hw/misc/edu.c index ec617e63f3..5f3fecac41 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -27,6 +27,7 @@ #include "hw/pci/pci.h" #include "hw/hw.h" #include "hw/pci/msi.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/main-loop.h" /* iothread mutex */ #include "qemu/module.h" @@ -70,7 +71,7 @@ typedef struct { dma_addr_t cmd; } dma; QEMUTimer dma_timer; - char dma_buf[DMA_SIZE]; + uint8_t dma_buf[DMA_SIZE]; uint64_t dma_mask; } EduState; =20 @@ -405,6 +406,28 @@ static void edu_instance_init(Object *obj) &edu->dma_mask, OBJ_PROP_FLAG_READWRITE= ); } =20 +static const VMStateDescription vmstate_edu =3D { + .name =3D "edu", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_PCI_DEVICE(pdev, EduState), + VMSTATE_BOOL(stopping, EduState), + VMSTATE_UINT32(addr4, EduState), + VMSTATE_UINT32(fact, EduState), + VMSTATE_UINT32(status, EduState), + VMSTATE_UINT32(irq_status, EduState), + VMSTATE_UINT64(dma.src, EduState), + VMSTATE_UINT64(dma.dst, EduState), + VMSTATE_UINT64(dma.cnt, EduState), + VMSTATE_UINT64(dma.cmd, EduState), + VMSTATE_TIMER(dma_timer, EduState), + VMSTATE_BUFFER(dma_buf, EduState), + VMSTATE_UINT64(dma_mask, EduState), + VMSTATE_END_OF_LIST() + } +}; + static void edu_class_init(ObjectClass *class, void *data) { DeviceClass *dc =3D DEVICE_CLASS(class); @@ -415,6 +438,7 @@ static void edu_class_init(ObjectClass *class, void *da= ta) k->vendor_id =3D PCI_VENDOR_ID_QEMU; k->device_id =3D 0x11e8; k->revision =3D 0x10; + dc->vmsd =3D &vmstate_edu; k->class_id =3D PCI_CLASS_OTHERS; set_bit(DEVICE_CATEGORY_MISC, dc->categories); } --=20 2.17.1