From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFqVf-0008N5-Lp for qemu-devel@nongnu.org; Wed, 02 Dec 2009 09:48:51 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFqVZ-0008LU-4b for qemu-devel@nongnu.org; Wed, 02 Dec 2009 09:48:51 -0500 Received: from [199.232.76.173] (port=46858 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFqVX-0008L0-B6 for qemu-devel@nongnu.org; Wed, 02 Dec 2009 09:48:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44028) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFqVW-0001Pr-Nn for qemu-devel@nongnu.org; Wed, 02 Dec 2009 09:48:43 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB2EmfoK032356 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 09:48:42 -0500 Date: Wed, 2 Dec 2009 16:46:03 +0200 From: "Michael S. Tsirkin" Message-ID: <20091202144603.GC18519@redhat.com> References: <39c4db726d98ccfa1b1ed0b85caef2ee60f83971.1259754427.git.quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <39c4db726d98ccfa1b1ed0b85caef2ee60f83971.1259754427.git.quintela@redhat.com> Subject: [Qemu-devel] Re: [PATCH 16/41] virtio: Add num_pci_queues field List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org On Wed, Dec 02, 2009 at 01:04:14PM +0100, Juan Quintela wrote: > > 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, Hmm. Sticking pci specific fields here looks wrong. virtio pci proxy has nvectors which you could use. > -- > 1.6.5.2