From patchwork Wed Dec 2 12:04:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5EBCFB7BDF for ; Thu, 3 Dec 2009 00:27:35 +1100 (EST) Received: from localhost ([127.0.0.1]:36098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFpEy-0005g0-Bm for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 08:27:32 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFnxp-0004P7-Rn for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFnxj-0004N9-Vu for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:44 -0500 Received: from [199.232.76.173] (port=42919 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFnxj-0004Mu-G5 for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22147) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFnxi-0004CN-On for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:39 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5b5r002250 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:05:38 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5ILA029769; Wed, 2 Dec 2009 07:05:36 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:10 +0100 Message-Id: <1d7703a5ad842eb7f60547e08b41d15f966303e2.1259754427.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 12/41] virtio-pci: port pci config to vmstate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/virtio-pci.c | 72 ++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 50 insertions(+), 22 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index a2179de..4fe55aa 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -105,35 +105,28 @@ static void virtio_pci_notify(void *opaque, uint16_t vector) qemu_set_irq(proxy->pci_dev.irq[0], proxy->vdev->isr & 1); } -static void virtio_pci_save_config(void * opaque, QEMUFile *f) +static bool is_msix(void *opaque, int version_id) { VirtIOPCIProxy *proxy = opaque; - pci_device_save(&proxy->pci_dev, f); - if (msix_present(&proxy->pci_dev)) { - msix_save(&proxy->pci_dev, f); - qemu_put_be16(f, proxy->vdev->config_vector); - } + return msix_present(&proxy->pci_dev); } -static void virtio_pci_save_queue(void * opaque, int n, QEMUFile *f) -{ - VirtIOPCIProxy *proxy = opaque; - if (msix_present(&proxy->pci_dev)) - qemu_put_be16(f, virtio_queue_vector(proxy->vdev, n)); -} +static const VMStateDescription vmstate_msix_vector = { + .name = "msix_vector", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_UINT16(config_vector, VirtIODevice), + VMSTATE_END_OF_LIST() + } +}; -static int virtio_pci_load_config(void * opaque, QEMUFile *f) +static int virtio_pci_post_load(void * opaque, int version_id) { VirtIOPCIProxy *proxy = opaque; - int ret; - ret = pci_device_load(&proxy->pci_dev, f); - if (ret) { - return ret; - } - if (msix_present(&proxy->pci_dev)) { - msix_load(&proxy->pci_dev, f); - qemu_get_be16s(f, &proxy->vdev->config_vector); - } else { + + if (!msix_present(&proxy->pci_dev)) { proxy->vdev->config_vector = VIRTIO_NO_VECTOR; } if (proxy->vdev->config_vector != VIRTIO_NO_VECTOR) { @@ -142,6 +135,41 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f) return 0; } +const VMStateDescription vmstate_virtio_pci_config = { + .name = "pci_config", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .post_load = virtio_pci_post_load, + .fields = (VMStateField []) { + VMSTATE_PCI_DEVICE(pci_dev, VirtIOPCIProxy), + VMSTATE_STRUCT_TEST(pci_dev, VirtIOPCIProxy, is_msix, 0, + vmstate_msix, PCIDevice), + VMSTATE_STRUCT_POINTER_TEST(vdev, VirtIOPCIProxy, is_msix, + vmstate_msix_vector, VirtIODevice *), + VMSTATE_END_OF_LIST() + } +}; + +static void virtio_pci_save_config(void * opaque, QEMUFile *f) +{ + vmstate_save_state(f, &vmstate_virtio_pci_config, opaque); +} + +static int virtio_pci_load_config(void * opaque, QEMUFile *f) +{ + return vmstate_load_state(f, &vmstate_virtio_pci_config, opaque, + vmstate_virtio_pci_config.version_id); +} + +static void virtio_pci_save_queue(void * opaque, int n, QEMUFile *f) +{ + VirtIOPCIProxy *proxy = opaque; + if (msix_present(&proxy->pci_dev)) + qemu_put_be16(f, virtio_queue_vector(proxy->vdev, n)); +} + + static int virtio_pci_load_queue(void * opaque, int n, QEMUFile *f) { VirtIOPCIProxy *proxy = opaque;