From patchwork Sun Jul 5 13:02:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 34134 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n65D3KsY000494 for ; Sun, 5 Jul 2009 13:03:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755978AbZGENDN (ORCPT ); Sun, 5 Jul 2009 09:03:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756418AbZGENDN (ORCPT ); Sun, 5 Jul 2009 09:03:13 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56123 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756242AbZGENDM (ORCPT ); Sun, 5 Jul 2009 09:03:12 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n65D3DGh029117; Sun, 5 Jul 2009 09:03:13 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n65D3CGo018227; Sun, 5 Jul 2009 09:03:12 -0400 Received: from redhat.com (vpn-6-125.tlv.redhat.com [10.35.6.125]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n65D394J018590; Sun, 5 Jul 2009 09:03:10 -0400 Date: Sun, 5 Jul 2009 16:02:34 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, avi@redhat.com, kvm@vger.kernel.org, aliguori@us.ibm.com, kwolf@redhat.com, glommer@redhat.com, blauwirbel@gmail.com Subject: [PATCHv5 5/5] qemu/virtio: mark msi vectors used on load Message-ID: <20090705130234.GF5417@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Usage of msi vectors is controlled by the guest and so needs to be restored on load. Do this for msi vectors used by the virtio device. Signed-off-by: Michael S. Tsirkin --- hw/virtio-pci.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index f7da503..19ba5b8 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -126,11 +126,18 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f) VirtIOPCIProxy *proxy = opaque; int ret; ret = pci_device_load(&proxy->pci_dev, f); - if (ret) + if (ret) { return ret; + } msix_load(&proxy->pci_dev, f); - if (msix_present(&proxy->pci_dev)) + if (msix_present(&proxy->pci_dev)) { qemu_get_be16s(f, &proxy->vdev->config_vector); + } else { + proxy->vdev->config_vector = VIRTIO_NO_VECTOR; + } + if (proxy->vdev->config_vector != VIRTIO_NO_VECTOR) { + return msix_vector_use(&proxy->pci_dev, proxy->vdev->config_vector); + } return 0; } @@ -138,10 +145,15 @@ static int virtio_pci_load_queue(void * opaque, int n, QEMUFile *f) { VirtIOPCIProxy *proxy = opaque; uint16_t vector; - if (!msix_present(&proxy->pci_dev)) - return 0; - qemu_get_be16s(f, &vector); + if (msix_present(&proxy->pci_dev)) { + qemu_get_be16s(f, &vector); + } else { + vector = VIRTIO_NO_VECTOR; + } virtio_queue_set_vector(proxy->vdev, n, vector); + if (vector != VIRTIO_NO_VECTOR) { + return msix_vector_use(&proxy->pci_dev, vector); + } return 0; }