From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XioCu-0006Jw-LB for qemu-devel@nongnu.org; Mon, 27 Oct 2014 13:35:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XioCo-0002C7-GB for qemu-devel@nongnu.org; Mon, 27 Oct 2014 13:35:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XioCn-0002Bv-QO for qemu-devel@nongnu.org; Mon, 27 Oct 2014 13:35:46 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9RHZi8Y025979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 27 Oct 2014 13:35:45 -0400 From: Marcel Apfelbaum Date: Mon, 27 Oct 2014 19:34:42 +0200 Message-Id: <1414431282-9839-3-git-send-email-marcel.a@redhat.com> In-Reply-To: <1414431282-9839-1-git-send-email-marcel.a@redhat.com> References: <1414431282-9839-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH v4 2/2] hw/pci: fixed hotplug crash when using rombar=0 with devices having romfile List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, armbru@redhat.com, alex.williamson@redhat.com, marcel@redhat.com, pbonzini@redhat.com Hot-plugging a device that has a romfile (either supplied by user or built-in) using rombar=0 option is a user error, do not allow the device to be hot-plugged. Reviewed-by: Eric Blake Signed-off-by: Marcel Apfelbaum --- hw/pci/pci.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 36226eb..371699c 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1942,6 +1942,15 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) * for 0.11 compatibility. */ int class = pci_get_word(pdev->config + PCI_CLASS_DEVICE); + + /* + * Hot-plugged devices can't use the option ROM + * if the rom bar is disabled. + */ + if (DEVICE(pdev)->hotplugged) { + return -1; + } + if (class == 0x0300) { rom_add_vga(pdev->romfile); } else { -- 1.8.3.1