From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51585)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1XlH1T-0000Nx-MI
	for qemu-devel@nongnu.org; Mon, 03 Nov 2014 07:46:21 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1XlH1N-00006Z-Hh
	for qemu-devel@nongnu.org; Mon, 03 Nov 2014 07:46:15 -0500
Received: from mx1.redhat.com ([209.132.183.28]:58204)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1XlH1N-00006T-9o
	for qemu-devel@nongnu.org; Mon, 03 Nov 2014 07:46:09 -0500
Received: from int-mx13.intmail.prod.int.phx2.redhat.com
	(int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sA3Ck8bU003695
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=FAIL)
	for <qemu-devel@nongnu.org>; Mon, 3 Nov 2014 07:46:08 -0500
Date: Mon, 3 Nov 2014 14:46:05 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20141103124605.GA16216@redhat.com>
References: <1414431282-9839-1-git-send-email-marcel.a@redhat.com>
	<1414431282-9839-3-git-send-email-marcel.a@redhat.com>
	<87vbmwze25.fsf@blackfin.pond.sub.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87vbmwze25.fsf@blackfin.pond.sub.org>
Subject: Re: [Qemu-devel] [PATCH v4 2/2] hw/pci: fixed hotplug crash when
 using rombar=0 with devices having romfile
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Markus Armbruster <armbru@redhat.com>
Cc: marcel@redhat.com, pbonzini@redhat.com, alex.williamson@redhat.com, qemu-devel@nongnu.org, Marcel Apfelbaum <marcel.a@redhat.com>

On Mon, Nov 03, 2014 at 01:03:30PM +0100, Markus Armbruster wrote:
> Marcel Apfelbaum <marcel.a@redhat.com> writes:
> 
> > 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 <eblake@redhat.com>
> > Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
> > ---
> >  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 {
> 
> Unlike the function's other unsuccessful returns, this one is silent.
> Intentional?

Marcel, Markus, as I applied the patch already, if you want to
fix things up pls send a new patch on top.


Thanks!