From patchwork Mon Sep 14 13:31:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Vugenfirer X-Patchwork-Id: 33582 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 bilbo.ozlabs.org (Postfix) with ESMTPS id A428EB7257 for ; Mon, 14 Sep 2009 23:22:37 +1000 (EST) Received: from localhost ([127.0.0.1]:43907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MnBVq-0000LB-0z for incoming@patchwork.ozlabs.org; Mon, 14 Sep 2009 09:22:34 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MnBVI-0000KE-FA for qemu-devel@nongnu.org; Mon, 14 Sep 2009 09:22:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MnBVD-0000CL-Ph for qemu-devel@nongnu.org; Mon, 14 Sep 2009 09:22:00 -0400 Received: from [199.232.76.173] (port=45986 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MnBVD-0000C5-Ma for qemu-devel@nongnu.org; Mon, 14 Sep 2009 09:21:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45669) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MnBVD-0006V5-3m for qemu-devel@nongnu.org; Mon, 14 Sep 2009 09:21:55 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8EDLrTQ012633 for ; Mon, 14 Sep 2009 09:21:53 -0400 Received: from localhost.localdomain ([10.35.16.57]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8EDLo1J010183; Mon, 14 Sep 2009 09:21:51 -0400 From: Yan Vugenfirer To: qemu-devel@nongnu.org Date: Mon, 14 Sep 2009 09:31:26 -0400 Message-Id: <1252935086-8856-1-git-send-email-yvugenfi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Yan Vugenfirer Subject: [Qemu-devel] [PATCH] VirtIO: Fix QEMU crash during Windows PNP tests 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: Yan Vugenfirer --- hw/virtio-pci.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index f812ab7..a0a22c4 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -364,8 +364,17 @@ static void virtio_map(PCIDevice *pci_dev, int region_num, static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, uint32_t val, int len) { + VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + + if (PCI_COMMAND == address) { + if (!(val & PCI_COMMAND_MASTER)) { + proxy->vdev->status &= ~VIRTIO_CONFIG_S_DRIVER_OK; + } + } + pci_default_write_config(pci_dev, address, val, len); - msix_write_config(pci_dev, address, val, len); + if(proxy->vdev->nvectors) + msix_write_config(pci_dev, address, val, len); } static const VirtIOBindings virtio_pci_bindings = { @@ -407,11 +416,12 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev, msix_bar_size(&proxy->pci_dev), PCI_ADDRESS_SPACE_MEM, msix_mmio_map); - proxy->pci_dev.config_write = virtio_write_config; proxy->pci_dev.unregister = msix_uninit; } else vdev->nvectors = 0; + proxy->pci_dev.config_write = virtio_write_config; + size = VIRTIO_PCI_REGION_SIZE(&proxy->pci_dev) + vdev->config_len; if (size & (size-1)) size = 1 << qemu_fls(size);