Commit 94630665 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string 



Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190412165416.7977-12-philmd@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent e7a3c55a

hw/arm/exynos4_boards.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "hw/arm/arm.h"

#include "exec/address-spaces.h"

#include "hw/arm/exynos4210.h"

#include "hw/net/lan9118.h"

#include "hw/boards.h"



#undef DEBUG
@@ -92,7 +93,7 @@ static void lan9215_init(uint32_t base, qemu_irq irq) 
    /* This should be a 9215 but the 9118 is close enough */

    if (nd_table[0].used) {

        qemu_check_nic_model(&nd_table[0], "lan9118");

        dev = qdev_create(NULL, "lan9118");

        dev = qdev_create(NULL, TYPE_LAN9118);

        qdev_set_nic_properties(dev, &nd_table[0]);

        qdev_prop_set_uint32(dev, "mode_16bit", 1);

        qdev_init_nofail(dev);

hw/arm/mps2-tz.c

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include "hw/arm/armsse.h"

#include "hw/dma/pl080.h"

#include "hw/ssi/pl022.h"

#include "hw/net/lan9118.h"

#include "net/net.h"

#include "hw/core/split-irq.h"
@@ -244,7 +245,7 @@ static MemoryRegion *make_eth_dev(MPS2TZMachineState *mms, void *opaque, 
     * except that it doesn't support the checksum-offload feature.

     */

    qemu_check_nic_model(nd, "lan9118");

    mms->lan9118 = qdev_create(NULL, "lan9118");

    mms->lan9118 = qdev_create(NULL, TYPE_LAN9118);

    qdev_set_nic_properties(mms->lan9118, nd);

    qdev_init_nofail(mms->lan9118);

hw/net/lan9118.c

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ static const VMStateDescription vmstate_lan9118_packet = { 
    }

};



#define TYPE_LAN9118 "lan9118"

#define LAN9118(obj) OBJECT_CHECK(lan9118_state, (obj), TYPE_LAN9118)



typedef struct {

include/hw/net/lan9118.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include "hw/irq.h"

#include "net/net.h"



#define TYPE_LAN9118 "lan9118"



void lan9118_init(NICInfo *, uint32_t, qemu_irq);



#endif