From patchwork Tue Apr 6 11:44:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 49503 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 27606B7D13 for ; Tue, 6 Apr 2010 22:04:14 +1000 (EST) Received: from localhost ([127.0.0.1]:43791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7N5-0002ua-Lu for incoming@patchwork.ozlabs.org; Tue, 06 Apr 2010 07:55:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nz7Ds-0000iF-6s for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:45:36 -0400 Received: from [140.186.70.92] (port=35210 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7Dq-0000hg-TX for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:45:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nz7Dp-0000No-GZ for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:45:34 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:50556) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nz7Dp-0000Ne-37 for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:45:33 -0400 Received: from flocke.weilnetz.de (p54ADF876.dip.t-dialin.net [84.173.248.118]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MNyIR-1NrfEG0Qe3-0070pJ; Tue, 06 Apr 2010 13:45:31 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1Nz7Dc-0007zL-8E; Tue, 06 Apr 2010 13:45:20 +0200 From: Stefan Weil To: QEMU Developers Date: Tue, 6 Apr 2010 13:44:06 +0200 Message-Id: <1270554249-24861-7-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> References: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX18ecUbAJP3ubtOVlVD9y1JVdAXWebjsmj1YP+X lYAKcv/dq+JjZVCbrKuGMnS/Lt1AAj3UVhCNVlFOUzBACCM1ez pfe0q9GztXOZl9reFlXu18lsQZUewbJCJAHw6SMcKB6hIdOasO YSQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 6/9] eepro100: Support compilation without EEPROM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 /* Handler for memory-mapped I/O */ s->mmio_index =