From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NUPCH-0001U9-N0
	for qemu-devel@nongnu.org; Mon, 11 Jan 2010 13:41:01 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NUPCD-0001Oe-1j
	for qemu-devel@nongnu.org; Mon, 11 Jan 2010 13:41:01 -0500
Received: from [199.232.76.173] (port=56436 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NUPCC-0001OL-RP
	for qemu-devel@nongnu.org; Mon, 11 Jan 2010 13:40:56 -0500
Received: from mx1.redhat.com ([209.132.183.28]:56460)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mst@redhat.com>) id 1NUPCC-0006gh-33
	for qemu-devel@nongnu.org; Mon, 11 Jan 2010 13:40:56 -0500
Date: Mon, 11 Jan 2010 20:37:57 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20100111183757.GA13725@redhat.com>
References: <1262880810-16210-1-git-send-email-weil@mail.berlios.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1262880810-16210-1-git-send-email-weil@mail.berlios.de>
Subject: [Qemu-devel] Re: [PATCH] eepro100: Update ROM file support
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Weil <weil@mail.berlios.de>, kraxel@redhat.com
Cc: QEMU Developers <qemu-devel@nongnu.org>

On Thu, Jan 07, 2010 at 05:13:30PM +0100, Stefan Weil wrote:
> Use new way to associate ROM files to devices.
> 
> Currently, there is only a ROM file for i82559er
> included in QEMU, so the patch does not add
> .romfile for the other devices.
> 
> When flexible mode is fixed in eepro100, adding
> more ROM files will be possible. It should be
> possible to create them from pxe-i82559er.bin,
> because etherboot uses the same driver for all
> eepro100 devices (only PCI ids differ).
> 
> Maybe it is even possible to create a single
> pxe-i8255x.bin which supports all eepro100 devices
> (not supported with current etherboot).
> 
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Gerd, could you ack this patch please?
Thanks!

> ---
>  hw/eepro100.c |   11 +----------
>  1 files changed, 1 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/eepro100.c b/hw/eepro100.c
> index a21c984..b33dbb8 100644
> --- a/hw/eepro100.c
> +++ b/hw/eepro100.c
> @@ -40,7 +40,6 @@
>  #include <stddef.h>             /* offsetof */
>  #include <stdbool.h>
>  #include "hw.h"
> -#include "loader.h"             /* rom_add_option */
>  #include "pci.h"
>  #include "net.h"
>  #include "eeprom93xx.h"
> @@ -1894,15 +1893,6 @@ static int nic_init(PCIDevice *pci_dev, uint32_t device)
>      s->vmstate->name = s->nic->nc.model;
>      vmstate_register(-1, s->vmstate, s);
>  
> -    if (!pci_dev->qdev.hotplugged) {
> -        static int loaded = 0;
> -        if (!loaded) {
> -            char fname[32];
> -            snprintf(fname, sizeof(fname), "pxe-%s.bin", s->nic->nc.model);
> -            rom_add_option(fname);
> -            loaded = 1;
> -        }
> -    }
>      return 0;
>  }
>  
> @@ -2062,6 +2052,7 @@ static PCIDeviceInfo eepro100_info[] = {
>          .qdev.size = sizeof(EEPRO100State),
>          .init      = pci_i82559er_init,
>          .exit      = pci_nic_uninit,
> +        .romfile   = "pxe-i82559er.bin",
>          .qdev.props = (Property[]) {
>              DEFINE_NIC_PROPERTIES(EEPRO100State, conf),
>              DEFINE_PROP_END_OF_LIST(),
> -- 
> 1.6.5