From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgqlA-00074o-46 for qemu-devel@nongnu.org; Wed, 22 Oct 2014 03:55:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xgql3-0008Ao-Vc for qemu-devel@nongnu.org; Wed, 22 Oct 2014 03:55:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62223) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgql3-00088s-Nx for qemu-devel@nongnu.org; Wed, 22 Oct 2014 03:55:01 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9M7sxJI001257 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 22 Oct 2014 03:54:59 -0400 Date: Wed, 22 Oct 2014 10:58:34 +0300 From: "Michael S. Tsirkin" Message-ID: <20141022075834.GA4566@redhat.com> References: <1413895032-10116-1-git-send-email-marcel.a@redhat.com> <20141022061849.GA20771@redhat.com> <1413963261.2376.8.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1413963261.2376.8.camel@localhost.localdomain> 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 Wed, Oct 22, 2014 at 10:34:21AM +0300, Marcel Apfelbaum wrote: > On Wed, 2014-10-22 at 09:18 +0300, Michael S. Tsirkin wrote: > > 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? > Because rom_add_option will call eventually rom_insert > that will crash QEMU with the call to hw_error. So fix rom_insert to return an error code instead? > > And what about e.g. vga? > This logic would apply also to rom_add_vga, I was not > aware we can hotplug vga devices. Can we? > I can add it also to vga, of course. > > > I think the right thing to do is to propagate return codes correctly, > > and report the error where it occurs. > I can remove the error_report, but this gives an extra hint to user. Move it to rom_insert, instead of hw_error. > I didn't see any other way to propagate the error message. > Should I drop it? > > Thanks, > Marcel > > > > > -- > > > 1.8.3.1 > >