From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MvWFs-0006UO-4b
	for qemu-devel@nongnu.org; Wed, 07 Oct 2009 09:08:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MvWFn-0006OE-9b
	for qemu-devel@nongnu.org; Wed, 07 Oct 2009 09:08:31 -0400
Received: from [199.232.76.173] (port=36358 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MvWFn-0006Ns-48
	for qemu-devel@nongnu.org; Wed, 07 Oct 2009 09:08:27 -0400
Received: from qw-out-1920.google.com ([74.125.92.147]:62346)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1MvWFm-0000uW-Oj
	for qemu-devel@nongnu.org; Wed, 07 Oct 2009 09:08:26 -0400
Received: by qw-out-1920.google.com with SMTP id 5so1601208qwc.4
	for <qemu-devel@nongnu.org>; Wed, 07 Oct 2009 06:08:26 -0700 (PDT)
Message-ID: <4ACC92C8.8060700@codemonkey.ws>
Date: Wed, 07 Oct 2009 08:08:24 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [RFC PATCH v2 5/5] ne2k_isa: add property for option
	rom loading.
References: <1254918996-26050-1-git-send-email-kraxel@redhat.com>
	<1254918996-26050-6-git-send-email-kraxel@redhat.com>
In-Reply-To: <1254918996-26050-6-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org

Gerd Hoffmann wrote:
> Moving option rom loading from machine init to the (nic) drivers.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/ne2000-isa.c |    9 +++++++++
>  hw/ne2000.h     |    1 +
>  2 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
> index 7a24088..1d296a0 100644
> --- a/hw/ne2000-isa.c
> +++ b/hw/ne2000-isa.c
> @@ -27,6 +27,7 @@
>  #include "qdev.h"
>  #include "net.h"
>  #include "ne2000.h"
> +#include "loader.h"
>  
>  typedef struct ISANE2000State {
>      ISADevice dev;
> @@ -78,6 +79,13 @@ static int isa_ne2000_initfn(ISADevice *dev)
>          qemu_error("warning: no vlan specfied, ne2k_isa is unconnected\n");
>      }
>  
> +    if (s->pxe) {
> +        if (rom_add_option("pxe-ne2k_isa.bin") != 0) {
> +            qemu_error("warning: loading rom pxe-ne2k_isa.bin failed\n");
> +            s->pxe = 0;
> +        }
> +    }
> +
>   

Maybe we should make the filename a property instead of adding a pxe option?

Regards,

Anthony Liguori