From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:53022)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1RkBK7-0006Ut-8e
	for qemu-devel@nongnu.org; Mon, 09 Jan 2012 04:15:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1RkBK6-0002mp-Ip
	for qemu-devel@nongnu.org; Mon, 09 Jan 2012 04:15:23 -0500
Received: from mx1.redhat.com ([209.132.183.28]:31734)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1RkBK6-0002mk-9j
	for qemu-devel@nongnu.org; Mon, 09 Jan 2012 04:15:22 -0500
Message-ID: <4F0AB023.5040705@redhat.com>
Date: Mon, 09 Jan 2012 10:15:15 +0100
From: Gerd Hoffmann <kraxel@redhat.com>
MIME-Version: 1.0
References: <alpine.LFD.2.02.1201081253310.14379@bbs.intern>
In-Reply-To: <alpine.LFD.2.02.1201081253310.14379@bbs.intern>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] network: Added option to disable NIC
	option roms
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: Gerhard Wiesinger <lists@wiesinger.com>
Cc: Kevin O'Connor <kevin@koconnor.net>, qemu-devel@nongnu.org, Gleb Natapov <gleb@redhat.com>

  Hi,

>      if (!pci_dev->qdev.hotplugged) {
>          static int loaded = 0;
> -        if (!loaded) {
> +        if (!loaded &&
> pci_has_not_explicitly_disabled_option_romfile(pci_dev)) {
>              rom_add_option("pxe-ne2k_pci.rom", -1);
>              loaded = 1;
>          }

I think you can just remove this altogether and add a .romfile = "..."
entry instead like it is done for the other nics.

cheers,
  Gerd