From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgqYT-00005L-GO for qemu-devel@nongnu.org; Wed, 22 Oct 2014 03:42:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XgqYN-0004I9-BI for qemu-devel@nongnu.org; Wed, 22 Oct 2014 03:42:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgqYN-0004I3-3l for qemu-devel@nongnu.org; Wed, 22 Oct 2014 03:41:55 -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 s9M7frk9009623 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 22 Oct 2014 03:41:54 -0400 Message-ID: <1413963665.2376.12.camel@localhost.localdomain> From: Marcel Apfelbaum Date: Wed, 22 Oct 2014 10:41:05 +0300 In-Reply-To: <5446D8DA.6000003@redhat.com> References: <1413895032-10116-1-git-send-email-marcel.a@redhat.com> <5446D8DA.6000003@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] hw/pci: fixed crash when using rombar=0 for hotplugged devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, mst@redhat.com On Wed, 2014-10-22 at 00:06 +0200, Paolo Bonzini wrote: > > On 10/21/2014 02:37 PM, Marcel Apfelbaum wrote: > > ROM images must be loaded at startup. Usage of rombar=0 after that > > is not allowed, but should not crash QEMU. > > > > Check that the device is not hotplugged before trying to > > insert the rom file. > > I think it could also make sense to just ignore the option ROM and allow > the hotplug. We need a way to inform the user we did that, he *specifically* asked for a ROM he might need it. Thanks, Marcel > > Sooner or later we should drop the oldest compat machine types... > everything until 0.12 probably could go. > > Paolo > > > Signed-off-by: Marcel Apfelbaum > > --- > > hw/pci/pci.c | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > > index 6ce75aa..3907c90 100644 > > --- a/hw/pci/pci.c > > +++ b/hw/pci/pci.c > > @@ -1776,7 +1776,12 @@ static int pci_qdev_init(DeviceState *qdev) > > pci_dev->romfile = g_strdup(pc->romfile); > > is_default_rom = true; > > } > > - pci_add_option_rom(pci_dev, is_default_rom); > > + > > + rc = pci_add_option_rom(pci_dev, is_default_rom); > > + if (rc != 0) { > > + pci_unregister_device(DEVICE(pci_dev)); > > + return rc; > > + } > > > > return 0; > > } > > @@ -1940,6 +1945,10 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) > > if (class == 0x0300) { > > rom_add_vga(pdev->romfile); > > } else { > > + if (DEVICE(pdev)->hotplugged) { > > + error_report("PCI: rombar can't be 0 for hotplugged devices!"); > > + return -1; > > + } > > rom_add_option(pdev->romfile, -1); > > } > > return 0; > >