From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgpCb-0001pE-KP for qemu-devel@nongnu.org; Wed, 22 Oct 2014 02:15:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XgpCV-0002uA-Er for qemu-devel@nongnu.org; Wed, 22 Oct 2014 02:15:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43210) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgpCV-0002tV-6H for qemu-devel@nongnu.org; Wed, 22 Oct 2014 02:15:15 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9M6FEKr025183 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 22 Oct 2014 02:15:14 -0400 Date: Wed, 22 Oct 2014 09:18:49 +0300 From: "Michael S. Tsirkin" Message-ID: <20141022061849.GA20771@redhat.com> References: <1413895032-10116-1-git-send-email-marcel.a@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1413895032-10116-1-git-send-email-marcel.a@redhat.com> 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: Marcel Apfelbaum Cc: qemu-devel@nongnu.org On Tue, Oct 21, 2014 at 03:37:12PM +0300, 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. > > 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; > } Fair enough for this chunk. > @@ -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; The message is confusing. rombar=0 is ok if you don't also try to force romfile. Generally why are you adding this logic in pci? And what about e.g. vga? I think the right thing to do is to propagate return codes correctly, and report the error where it occurs. > -- > 1.8.3.1