From patchwork Wed Dec 2 12:04:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40019 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 41F20B7BEC for ; Thu, 3 Dec 2009 00:32:15 +1100 (EST) Received: from localhost ([127.0.0.1]:55954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFpJU-0000Ge-3d for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 08:32:12 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFnxr-0004PZ-Ab for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:47 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFnxm-0004O1-MB for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:46 -0500 Received: from [199.232.76.173] (port=42921 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFnxm-0004Nu-7K for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11881) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFnxl-0004Cl-Nt for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:42 -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 nB2C5eL3018239 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:05:40 -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 nB2C5ILC029769; Wed, 2 Dec 2009 07:05:39 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:12 +0100 Message-Id: <6d1a6e215c12f5b9a4ff2e09f7e20919baf05176.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 14/41] virtio: remove save/load_config for virtio 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 It was used only for PCI virtio devices, state that Signed-off-by: Juan Quintela --- hw/virtio-pci.c | 13 ------------- hw/virtio.c | 9 +++++---- hw/virtio.h | 5 +++-- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 4fe55aa..45d0adc 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -151,17 +151,6 @@ const VMStateDescription vmstate_virtio_pci_config = { } }; -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; @@ -413,8 +402,6 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, static const VirtIOBindings virtio_pci_bindings = { .notify = virtio_pci_notify, - .save_config = virtio_pci_save_config, - .load_config = virtio_pci_load_config, .save_queue = virtio_pci_save_queue, .load_queue = virtio_pci_load_queue, }; diff --git a/hw/virtio.c b/hw/virtio.c index 1f92171..c136005 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -619,8 +619,8 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) { int i; - if (vdev->binding->save_config) - vdev->binding->save_config(vdev->binding_opaque, f); + if (vdev->type == VIRTIO_PCI) + vmstate_save_state(f, &vmstate_virtio_pci_config, vdev->binding_opaque); qemu_put_8s(f, &vdev->status); qemu_put_8s(f, &vdev->isr); @@ -652,8 +652,9 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f) { int num, i, ret; - if (vdev->binding->load_config) { - ret = vdev->binding->load_config(vdev->binding_opaque, f); + if (vdev->type == VIRTIO_PCI) { + ret = vmstate_load_state(f, &vmstate_virtio_pci_config, vdev->binding_opaque, + vmstate_virtio_pci_config.version_id); if (ret) return ret; } diff --git a/hw/virtio.h b/hw/virtio.h index ec1ff4d..9d2e2cc 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -78,9 +78,7 @@ typedef struct VirtQueueElement typedef struct { void (*notify)(void * opaque, uint16_t vector); - void (*save_config)(void * opaque, QEMUFile *f); void (*save_queue)(void * opaque, int n, QEMUFile *f); - int (*load_config)(void * opaque, QEMUFile *f); int (*load_queue)(void * opaque, int n, QEMUFile *f); } VirtIOBindings; @@ -176,4 +174,7 @@ VirtIODevice *virtio_balloon_init(DeviceState *dev); void virtio_net_exit(VirtIODevice *vdev); +/* virtio-pci. */ +extern const VMStateDescription vmstate_virtio_pci_config; + #endif