From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MfXNX-00068m-ME for qemu-devel@nongnu.org; Mon, 24 Aug 2009 07:06:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MfXNQ-000637-Lg for qemu-devel@nongnu.org; Mon, 24 Aug 2009 07:06:21 -0400 Received: from [199.232.76.173] (port=49190 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfXNQ-00062w-El for qemu-devel@nongnu.org; Mon, 24 Aug 2009 07:06:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63210) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MfXNP-0006vD-P3 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 07:06:16 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7OB6F4B019982 for ; Mon, 24 Aug 2009 07:06:15 -0400 From: Juan Quintela Date: Mon, 24 Aug 2009 13:03:29 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 08/22] ne2000: change pci_dev to is_pci List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- hw/ne2000.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/ne2000.c b/hw/ne2000.c index 7ac4fd3..33477b6 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -142,7 +142,7 @@ typedef struct NE2000State { uint8_t mult[8]; /* multicast mask array */ qemu_irq irq; int isa_io_base; - PCIDevice *pci_dev; + int is_pci; VLANClientState *vc; uint8_t macaddr[6]; uint8_t mem[NE2000_MEM_SIZE]; @@ -654,8 +654,8 @@ static void ne2000_save(QEMUFile* f,void* opaque) NE2000State* s = opaque; uint32_t tmp; - if (s->pci_dev) - pci_device_save(s->pci_dev, f); + if (s->is_pci) + pci_device_save(&s->dev, f); qemu_put_8s(f, &s->rxcr); @@ -689,8 +689,8 @@ static int ne2000_load(QEMUFile* f,void* opaque,int version_id) if (version_id > 3) return -EINVAL; - if (s->pci_dev && version_id >= 3) { - ret = pci_device_load(s->pci_dev, f); + if (s->is_pci && version_id >= 3) { + ret = pci_device_load(&s->dev, f); if (ret < 0) return ret; } @@ -813,7 +813,7 @@ static void pci_ne2000_init(PCIDevice *pci_dev) pci_register_bar(&s->dev, 0, 0x100, PCI_ADDRESS_SPACE_IO, ne2000_map); s->irq = s->dev.irq[0]; - s->pci_dev = &s->dev; + s->is_pci = 1; qdev_get_macaddr(&s->dev.qdev, s->macaddr); ne2000_reset(s); s->vc = qdev_get_vlan_client(&s->dev.qdev, -- 1.6.2.5