Commit 7a188f2b authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/net/ne2000: Extract the PCI device from the chipset common code 



The ne2000.c file contains functions common the the ISA and PCI
devices. To allow to build with one or another, extract the PCI
specific part into a new file.

This fix an issue where the NE2000_ISA Kconfig had to pull the
full PCI core objects.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190504123538.14952-1-philmd@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d09ecd8c

hw/net/Kconfig

+5 −2
Original line number Diff line number Diff line 
config DP8393X

    bool



config NE2000_COMMON

    bool



config NE2000_PCI

    bool

    default y if PCI_DEVICES

    depends on PCI

    select NE2000_COMMON



config EEPRO100_PCI

    bool
@@ -51,8 +55,7 @@ config NE2000_ISA 
    bool

    default y

    depends on ISA_BUS

    depends on PCI # for NE2000State

    select NE2000_PCI

    select NE2000_COMMON



config OPENCORES_ETH

    bool

hw/net/Makefile.objs

+2 −1
Original line number Diff line number Diff line 
common-obj-$(CONFIG_DP8393X) += dp8393x.o

common-obj-$(CONFIG_XEN) += xen_nic.o

common-obj-$(CONFIG_NE2000_COMMON) += ne2000.o



# PCI network cards

common-obj-$(CONFIG_NE2000_PCI) += ne2000.o

common-obj-$(CONFIG_NE2000_PCI) += ne2000-pci.o

common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o

common-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o

common-obj-$(CONFIG_PCNET_COMMON) += pcnet.o

hw/net/ne2000-pci.c

0 → 100644
+132 −0
Original line number Diff line number Diff line 
/*

 * QEMU NE2000 emulation (PCI bus)

 *

 * Copyright (c) 2003-2004 Fabrice Bellard

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */

#include "qemu/osdep.h"

#include "hw/pci/pci.h"

#include "ne2000.h"

#include "sysemu/sysemu.h"



typedef struct PCINE2000State {

    PCIDevice dev;

    NE2000State ne2000;

} PCINE2000State;



static const VMStateDescription vmstate_pci_ne2000 = {

    .name = "ne2000",

    .version_id = 3,

    .minimum_version_id = 3,

    .fields = (VMStateField[]) {

        VMSTATE_PCI_DEVICE(dev, PCINE2000State),

        VMSTATE_STRUCT(ne2000, PCINE2000State, 0, vmstate_ne2000, NE2000State),

        VMSTATE_END_OF_LIST()

    }

};



static NetClientInfo net_ne2000_info = {

    .type = NET_CLIENT_DRIVER_NIC,

    .size = sizeof(NICState),

    .receive = ne2000_receive,

};



static void pci_ne2000_realize(PCIDevice *pci_dev, Error **errp)

{

    PCINE2000State *d = DO_UPCAST(PCINE2000State, dev, pci_dev);

    NE2000State *s;

    uint8_t *pci_conf;



    pci_conf = d->dev.config;

    pci_conf[PCI_INTERRUPT_PIN] = 1; /* interrupt pin A */



    s = &d->ne2000;

    ne2000_setup_io(s, DEVICE(pci_dev), 0x100);

    pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io);

    s->irq = pci_allocate_irq(&d->dev);



    qemu_macaddr_default_if_unset(&s->c.macaddr);

    ne2000_reset(s);



    s->nic = qemu_new_nic(&net_ne2000_info, &s->c,

                          object_get_typename(OBJECT(pci_dev)),

                          pci_dev->qdev.id, s);

    qemu_format_nic_info_str(qemu_get_queue(s->nic), s->c.macaddr.a);

}



static void pci_ne2000_exit(PCIDevice *pci_dev)

{

    PCINE2000State *d = DO_UPCAST(PCINE2000State, dev, pci_dev);

    NE2000State *s = &d->ne2000;



    qemu_del_nic(s->nic);

    qemu_free_irq(s->irq);

}



static void ne2000_instance_init(Object *obj)

{

    PCIDevice *pci_dev = PCI_DEVICE(obj);

    PCINE2000State *d = DO_UPCAST(PCINE2000State, dev, pci_dev);

    NE2000State *s = &d->ne2000;



    device_add_bootindex_property(obj, &s->c.bootindex,

                                  "bootindex", "/ethernet-phy@0",

                                  &pci_dev->qdev, NULL);

}



static Property ne2000_properties[] = {

    DEFINE_NIC_PROPERTIES(PCINE2000State, ne2000.c),

    DEFINE_PROP_END_OF_LIST(),

};



static void ne2000_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->realize = pci_ne2000_realize;

    k->exit = pci_ne2000_exit;

    k->romfile = "efi-ne2k_pci.rom",

    k->vendor_id = PCI_VENDOR_ID_REALTEK;

    k->device_id = PCI_DEVICE_ID_REALTEK_8029;

    k->class_id = PCI_CLASS_NETWORK_ETHERNET;

    dc->vmsd = &vmstate_pci_ne2000;

    dc->props = ne2000_properties;

    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);

}



static const TypeInfo ne2000_info = {

    .name          = "ne2k_pci",

    .parent        = TYPE_PCI_DEVICE,

    .instance_size = sizeof(PCINE2000State),

    .class_init    = ne2000_class_init,

    .instance_init = ne2000_instance_init,

    .interfaces = (InterfaceInfo[]) {

        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

        { },

    },

};



static void ne2000_register_types(void)

{

    type_register_static(&ne2000_info);

}



type_init(ne2000_register_types)

hw/net/ne2000.c

+0 −105
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 * THE SOFTWARE.

 */

#include "qemu/osdep.h"

#include "hw/pci/pci.h"

#include "net/eth.h"

#include "ne2000.h"

#include "sysemu/sysemu.h"
@@ -118,11 +117,6 @@ 
#define ENTSR_CDH 0x40	/* The collision detect "heartbeat" signal was lost. */

#define ENTSR_OWC 0x80  /* There was an out-of-window collision. */



typedef struct PCINE2000State {

    PCIDevice dev;

    NE2000State ne2000;

} PCINE2000State;



void ne2000_reset(NE2000State *s)

{

    int i;
@@ -644,17 +638,6 @@ const VMStateDescription vmstate_ne2000 = { 
    }

};



static const VMStateDescription vmstate_pci_ne2000 = {

    .name = "ne2000",

    .version_id = 3,

    .minimum_version_id = 3,

    .fields = (VMStateField[]) {

        VMSTATE_PCI_DEVICE(dev, PCINE2000State),

        VMSTATE_STRUCT(ne2000, PCINE2000State, 0, vmstate_ne2000, NE2000State),

        VMSTATE_END_OF_LIST()

    }

};



static uint64_t ne2000_read(void *opaque, hwaddr addr,

                            unsigned size)

{
@@ -711,91 +694,3 @@ void ne2000_setup_io(NE2000State *s, DeviceState *dev, unsigned size) 
{

    memory_region_init_io(&s->io, OBJECT(dev), &ne2000_ops, s, "ne2000", size);

}
 


static NetClientInfo net_ne2000_info = {

    .type = NET_CLIENT_DRIVER_NIC,

    .size = sizeof(NICState),

    .receive = ne2000_receive,

};



static void pci_ne2000_realize(PCIDevice *pci_dev, Error **errp)

{

    PCINE2000State *d = DO_UPCAST(PCINE2000State, dev, pci_dev);

    NE2000State *s;

    uint8_t *pci_conf;



    pci_conf = d->dev.config;

    pci_conf[PCI_INTERRUPT_PIN] = 1; /* interrupt pin A */



    s = &d->ne2000;

    ne2000_setup_io(s, DEVICE(pci_dev), 0x100);

    pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io);

    s->irq = pci_allocate_irq(&d->dev);



    qemu_macaddr_default_if_unset(&s->c.macaddr);

    ne2000_reset(s);



    s->nic = qemu_new_nic(&net_ne2000_info, &s->c,

                          object_get_typename(OBJECT(pci_dev)), pci_dev->qdev.id, s);

    qemu_format_nic_info_str(qemu_get_queue(s->nic), s->c.macaddr.a);

}



static void pci_ne2000_exit(PCIDevice *pci_dev)

{

    PCINE2000State *d = DO_UPCAST(PCINE2000State, dev, pci_dev);

    NE2000State *s = &d->ne2000;



    qemu_del_nic(s->nic);

    qemu_free_irq(s->irq);

}



static void ne2000_instance_init(Object *obj)

{

    PCIDevice *pci_dev = PCI_DEVICE(obj);

    PCINE2000State *d = DO_UPCAST(PCINE2000State, dev, pci_dev);

    NE2000State *s = &d->ne2000;



    device_add_bootindex_property(obj, &s->c.bootindex,

                                  "bootindex", "/ethernet-phy@0",

                                  &pci_dev->qdev, NULL);

}



static Property ne2000_properties[] = {

    DEFINE_NIC_PROPERTIES(PCINE2000State, ne2000.c),

    DEFINE_PROP_END_OF_LIST(),

};



static void ne2000_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->realize = pci_ne2000_realize;

    k->exit = pci_ne2000_exit;

    k->romfile = "efi-ne2k_pci.rom",

    k->vendor_id = PCI_VENDOR_ID_REALTEK;

    k->device_id = PCI_DEVICE_ID_REALTEK_8029;

    k->class_id = PCI_CLASS_NETWORK_ETHERNET;

    dc->vmsd = &vmstate_pci_ne2000;

    dc->props = ne2000_properties;

    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);

}



static const TypeInfo ne2000_info = {

    .name          = "ne2k_pci",

    .parent        = TYPE_PCI_DEVICE,

    .instance_size = sizeof(PCINE2000State),

    .class_init    = ne2000_class_init,

    .instance_init = ne2000_instance_init,

    .interfaces = (InterfaceInfo[]) {

        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

        { },

    },

};



static void ne2000_register_types(void)

{

    type_register_static(&ne2000_info);

}



type_init(ne2000_register_types)