From patchwork Wed Dec 2 12:04:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40022 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 A8BDBB7BE2 for ; Thu, 3 Dec 2009 00:40:36 +1100 (EST) Received: from localhost ([127.0.0.1]:41741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFpRZ-0007Zw-Ul for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 08:40:34 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFnxw-0004S6-2k for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:52 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFnxr-0004PT-3s for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:51 -0500 Received: from [199.232.76.173] (port=42925 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFnxq-0004PK-Pr for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57486) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFnxp-0004D5-O1 for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:46 -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 nB2C5icA022440 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:05:45 -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 nB2C5ILF029769; Wed, 2 Dec 2009 07:05:43 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:15 +0100 Message-Id: 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 17/41] virtio: split virtio_post_load() from virtio_load() 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 | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/hw/virtio.c b/hw/virtio.c index f549543..bb93e8c 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -656,6 +656,32 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) } } +static int virtio_post_load(void *opaque, int version_id) +{ + VirtIODevice *vdev = opaque; + int i, ret; + + for (i = 0; i < vdev->num_pci_queues; i++) { + if (vdev->vq[i].pa) { + virtqueue_init(&vdev->vq[i]); + } + if (vdev->type == VIRTIO_PCI) { + if (!virtio_pci_msix_present(vdev->binding_opaque)) { + vdev->vq[i].vector = VIRTIO_NO_VECTOR; + } + if (vdev->vq[i].vector != VIRTIO_NO_VECTOR) { + ret = virtio_pci_msix_vector_use(vdev->binding_opaque, + vdev->vq[i].vector); + if (ret) + return ret; + } + } + } + + virtio_notify_vector(vdev, VIRTIO_NO_VECTOR); + return 0; +} + int virtio_load(VirtIODevice *vdev, QEMUFile *f) { int i, ret; @@ -681,25 +707,12 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f) vdev->vq[i].pa = qemu_get_be64(f); qemu_get_be16s(f, &vdev->vq[i].last_avail_idx); - if (vdev->vq[i].pa) { - virtqueue_init(&vdev->vq[i]); - } - if (vdev->type == VIRTIO_PCI) { - if (virtio_pci_msix_present(vdev->binding_opaque)) { + if (vdev->type == VIRTIO_PCI && + virtio_pci_msix_present(vdev->binding_opaque)) { qemu_get_be16s(f, &vdev->vq[i].vector); - } else { - vdev->vq[i].vector = VIRTIO_NO_VECTOR; - } - if (vdev->vq[i].vector != VIRTIO_NO_VECTOR) { - ret = virtio_pci_msix_vector_use(vdev->binding_opaque, - vdev->vq[i].vector); - if (ret) - return ret; - } } } - - virtio_notify_vector(vdev, VIRTIO_NO_VECTOR); + virtio_post_load(vdev, 1); return 0; }