From patchwork Sun Jul 5 10:24:41 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: 34119 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 n65APOdL012086 for ; Sun, 5 Jul 2009 10:25:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753627AbZGEKZS (ORCPT ); Sun, 5 Jul 2009 06:25:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753953AbZGEKZS (ORCPT ); Sun, 5 Jul 2009 06:25:18 -0400 Received: from mx2.redhat.com ([66.187.237.31]:48026 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753583AbZGEKZR (ORCPT ); Sun, 5 Jul 2009 06:25:17 -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 n65APK9T031183; Sun, 5 Jul 2009 06:25:20 -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 n65APJpi031686; Sun, 5 Jul 2009 06:25:19 -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 n65APGu4001235; Sun, 5 Jul 2009 06:25:16 -0400 Date: Sun, 5 Jul 2009 13:24:41 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, avi@redhat.com, kvm@vger.kernel.org, aliguori@us.ibm.com, kwolf@redhat.com Subject: [PATCHv3 3/3] qemu/virtio: mark msi vectors used on load Message-ID: <20090705102441.GC3833@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 Which msi vectors are used 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/msix.c | 1 + hw/virtio-pci.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 98c62a5..46925d9 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -301,6 +301,7 @@ void msix_load(PCIDevice *dev, QEMUFile *f) if (!dev->cap_present & QEMU_PCI_CAP_MSIX) return; + msix_free_irq_entries(dev); qemu_get_buffer(f, dev->msix_table_page, n * MSIX_ENTRY_SIZE); qemu_get_buffer(f, dev->msix_table_page + MSIX_PAGE_PENDING, (n + 7) / 8); } diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index f7da503..66c779e 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -129,8 +129,10 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f) 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); + return msix_vector_use(&proxy->pci_dev, proxy->vdev->config_vector); + } return 0; } @@ -142,7 +144,7 @@ static int virtio_pci_load_queue(void * opaque, int n, QEMUFile *f) return 0; qemu_get_be16s(f, &vector); virtio_queue_set_vector(proxy->vdev, n, vector); - return 0; + return msix_vector_use(&proxy->pci_dev, vector); } static void virtio_pci_reset(void *opaque)