diff options
| author | Thomas Huth <huth@tuxfamily.org> | 2017-01-08 12:51:55 +0100 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2017-01-20 10:36:38 +0800 |
| commit | 6ac38ed42b3468e37f9ce681b65c796a3be4e387 (patch) | |
| tree | 77be0d9a0f9129cb704e19fdeff7333925cc5dda /include/hw | |
| parent | d5aa3e6e0cd6259003790769c448d4fbb5b5c810 (diff) | |
| download | qemu-6ac38ed42b3468e37f9ce681b65c796a3be4e387.tar.gz | |
m68k: QOMify the MCF Fast Ethernet Controller device
When running qemu-system-m68k with the "-net" parameter (for example
simply "-net nic -net user"), there is currently a confusing warning
message saying:
Warning: requested NIC (anonymous, model mcf_fec) was not created
(not supported by this machine?)
This seems to happen because the MCF NIC has never been adapted to
the currently expected QEMU device behavior. Thus let's QOMify the
NIC now to get rid of the warning message.
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/m68k/mcf.h | 4 | ||||
| -rw-r--r-- | include/hw/m68k/mcf_fec.h | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/include/hw/m68k/mcf.h b/include/hw/m68k/mcf.h index fdae229502..bf43998d9b 100644 --- a/include/hw/m68k/mcf.h +++ b/include/hw/m68k/mcf.h @@ -21,10 +21,6 @@ qemu_irq *mcf_intc_init(struct MemoryRegion *sysmem, hwaddr base, M68kCPU *cpu); -/* mcf_fec.c */ -void mcf_fec_init(struct MemoryRegion *sysmem, NICInfo *nd, - hwaddr base, qemu_irq *irq); - /* mcf5206.c */ qemu_irq *mcf5206_init(struct MemoryRegion *sysmem, uint32_t base, M68kCPU *cpu); diff --git a/include/hw/m68k/mcf_fec.h b/include/hw/m68k/mcf_fec.h new file mode 100644 index 0000000000..7f029f7b59 --- /dev/null +++ b/include/hw/m68k/mcf_fec.h @@ -0,0 +1,13 @@ +/* + * Definitions for the ColdFire Fast Ethernet Controller emulation. + * + * This code is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#define TYPE_MCF_FEC_NET "mcf-fec" +#define MCF_FEC_NET(obj) OBJECT_CHECK(mcf_fec_state, (obj), TYPE_MCF_FEC_NET) + +#define FEC_NUM_IRQ 13 |