From patchwork Wed Dec 2 12:04:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40021 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 021FEB7BDE for ; Thu, 3 Dec 2009 00:38:36 +1100 (EST) Received: from localhost ([127.0.0.1]:41021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFpPd-0006DB-4H for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 08:38:33 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFnxv-0004RG-1L for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:51 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFnxp-0004P1-Oj for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:49 -0500 Received: from [199.232.76.173] (port=42924 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFnxp-0004Oy-DY for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38915) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFnxo-0004D1-S9 for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:45 -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 nB2C5hB6019299 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:05:43 -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 nB2C5ILE029769; Wed, 2 Dec 2009 07:05:42 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:14 +0100 Message-Id: <39c4db726d98ccfa1b1ed0b85caef2ee60f83971.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 16/41] virtio: Add num_pci_queues field 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.c | 32 +++++++++++++++++++------------- hw/virtio.h | 2 ++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/hw/virtio.c b/hw/virtio.c index b565bf9..f549543 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -615,10 +615,24 @@ void virtio_notify_config(VirtIODevice *vdev) virtio_notify_vector(vdev, vdev->config_vector); } +static void virtio_pre_save(void *opaque) +{ + VirtIODevice *vdev = opaque; + int i; + + for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { + if (vdev->vq[i].vring.num == 0) + break; + } + vdev->num_pci_queues = i; +} + void virtio_save(VirtIODevice *vdev, QEMUFile *f) { int i; + virtio_pre_save(vdev); + if (vdev->type == VIRTIO_PCI) vmstate_save_state(f, &vmstate_virtio_pci_config, vdev->binding_opaque); @@ -629,17 +643,9 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) qemu_put_be32(f, vdev->config_len); qemu_put_buffer(f, vdev->config, vdev->config_len); - for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { - if (vdev->vq[i].vring.num == 0) - break; - } - - qemu_put_be32(f, i); - - for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { - if (vdev->vq[i].vring.num == 0) - break; + qemu_put_sbe32s(f, &vdev->num_pci_queues); + for (i = 0; i < vdev->num_pci_queues; i++) { qemu_put_be32(f, vdev->vq[i].vring.num); qemu_put_be64(f, vdev->vq[i].pa); qemu_put_be16s(f, &vdev->vq[i].last_avail_idx); @@ -652,7 +658,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) int virtio_load(VirtIODevice *vdev, QEMUFile *f) { - int num, i, ret; + int i, ret; if (vdev->type == VIRTIO_PCI) { ret = vmstate_load_state(f, &vmstate_virtio_pci_config, vdev->binding_opaque, @@ -668,9 +674,9 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f) vdev->config_len = qemu_get_be32(f); qemu_get_buffer(f, vdev->config, vdev->config_len); - num = qemu_get_be32(f); + qemu_get_sbe32s(f, &vdev->num_pci_queues); - for (i = 0; i < num; i++) { + for (i = 0; i < vdev->num_pci_queues; i++) { vdev->vq[i].vring.num = qemu_get_be32(f); vdev->vq[i].pa = qemu_get_be64(f); qemu_get_be16s(f, &vdev->vq[i].last_avail_idx); diff --git a/hw/virtio.h b/hw/virtio.h index 91a6c10..d849f44 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -111,6 +111,8 @@ struct VirtIODevice const VirtIOBindings *binding; void *binding_opaque; uint16_t device_id; + /* fields used only by vmstate */ + int32_t num_pci_queues; }; VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,