From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nz7fM-0004Pe-VA for qemu-devel@nongnu.org; Tue, 06 Apr 2010 08:14:01 -0400 Received: from [140.186.70.92] (port=54770 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7fL-0004Nd-Hg for qemu-devel@nongnu.org; Tue, 06 Apr 2010 08:14:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nz7fK-0003vi-C3 for qemu-devel@nongnu.org; Tue, 06 Apr 2010 08:13:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51711) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nz7fK-0003vM-3f for qemu-devel@nongnu.org; Tue, 06 Apr 2010 08:13:58 -0400 Date: Tue, 6 Apr 2010 15:10:17 +0300 From: "Michael S. Tsirkin" Message-ID: <20100406121017.GD16539@redhat.com> References: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> <1270554249-24861-7-git-send-email-weil@mail.berlios.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1270554249-24861-7-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] Re: [PATCH 6/9] eepro100: Support compilation without EEPROM List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: QEMU Developers On Tue, Apr 06, 2010 at 01:44:06PM +0200, Stefan Weil wrote: > To emulate hardware without an EEPROM, > EEPROM_SIZE may be set to 0. > > Signed-off-by: Stefan Weil > --- > hw/eepro100.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/hw/eepro100.c b/hw/eepro100.c > index cedc427..e12ee23 100644 > --- a/hw/eepro100.c > +++ b/hw/eepro100.c > @@ -1866,9 +1866,11 @@ static int e100_nic_init(PCIDevice *pci_dev) > > e100_pci_reset(s, e100_device); > > +#if EEPROM_SIZE > 0 > /* Add 64 * 2 EEPROM. i82557 and i82558 support a 64 word EEPROM, > * i82559 and later support 64 or 256 word EEPROM. */ > s->eeprom = eeprom93xx_new(EEPROM_SIZE); > +#endif I expect long-term EEPROM_SIZE will stop being a compile-time constant then? > > /* Handler for memory-mapped I/O */ > s->mmio_index = > -- > 1.7.0