From patchwork Mon Aug 24 16:42:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31984 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 67245B7B61 for ; Tue, 25 Aug 2009 03:37:43 +1000 (EST) Received: from localhost ([127.0.0.1]:49611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfdUC-0006y1-D6 for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 13:37:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mfcg2-0001DI-M7 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mfcfx-00017M-Fz for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:49 -0400 Received: from [199.232.76.173] (port=33823 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfcfx-00017C-8q for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7000) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mfcfw-00036d-PH for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:45 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7OGjh0i020807 for ; Mon, 24 Aug 2009 12:45:44 -0400 Received: from localhost.localdomain (vpn1-4-157.ams2.redhat.com [10.36.4.157]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7OGjKUA024317; Mon, 24 Aug 2009 12:45:42 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 18:42:52 +0200 Message-Id: <7d089b517987b0bd2f4a0c5eef10266b111d5bf5.1251131364.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 18/26] We need PCINE2000State for save/load functions 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 Signed-off-by: Juan Quintela --- hw/ne2000.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/ne2000.c b/hw/ne2000.c index e5d8914..1c47c84 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -147,6 +147,11 @@ typedef struct NE2000State { uint8_t mem[NE2000_MEM_SIZE]; } NE2000State; +typedef struct PCINE2000State { + PCIDevice dev; + NE2000State ne2000; +} PCINE2000State; + static void ne2000_reset(NE2000State *s) { int i; @@ -771,11 +776,6 @@ void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd) /***********************************************************/ /* PCI NE2000 definitions */ -typedef struct PCINE2000State { - PCIDevice dev; - NE2000State ne2000; -} PCINE2000State; - static void ne2000_map(PCIDevice *pci_dev, int region_num, uint32_t addr, uint32_t size, int type) {