hw/net: Constify all Property

Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-12-13 16:27:31 +00:00
parent 3002997310
commit e732f00f32
40 changed files with 41 additions and 41 deletions

View file

@ -829,7 +829,7 @@ static void allwinner_sun8i_emac_realize(DeviceState *dev, Error **errp)
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
} }
static Property allwinner_sun8i_emac_properties[] = { static const Property allwinner_sun8i_emac_properties[] = {
DEFINE_NIC_PROPERTIES(AwSun8iEmacState, conf), DEFINE_NIC_PROPERTIES(AwSun8iEmacState, conf),
DEFINE_PROP_UINT8("phy-addr", AwSun8iEmacState, mii_phy_addr, 0), DEFINE_PROP_UINT8("phy-addr", AwSun8iEmacState, mii_phy_addr, 0),
DEFINE_PROP_LINK("dma-memory", AwSun8iEmacState, dma_mr, DEFINE_PROP_LINK("dma-memory", AwSun8iEmacState, dma_mr,

View file

@ -462,7 +462,7 @@ static void aw_emac_realize(DeviceState *dev, Error **errp)
fifo8_create(&s->tx_fifo[1], TX_FIFO_SIZE); fifo8_create(&s->tx_fifo[1], TX_FIFO_SIZE);
} }
static Property aw_emac_properties[] = { static const Property aw_emac_properties[] = {
DEFINE_NIC_PROPERTIES(AwEmacState, conf), DEFINE_NIC_PROPERTIES(AwEmacState, conf),
DEFINE_PROP_UINT8("phy-addr", AwEmacState, phy_addr, 0), DEFINE_PROP_UINT8("phy-addr", AwEmacState, phy_addr, 0),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),

View file

@ -1784,7 +1784,7 @@ static const VMStateDescription vmstate_cadence_gem = {
} }
}; };
static Property gem_properties[] = { static const Property gem_properties[] = {
DEFINE_NIC_PROPERTIES(CadenceGEMState, conf), DEFINE_NIC_PROPERTIES(CadenceGEMState, conf),
DEFINE_PROP_UINT32("revision", CadenceGEMState, revision, DEFINE_PROP_UINT32("revision", CadenceGEMState, revision,
GEM_MODID_VALUE), GEM_MODID_VALUE),

View file

@ -2042,7 +2042,7 @@ static const VMStateDescription vmstate_canfd = {
} }
}; };
static Property canfd_core_properties[] = { static const Property canfd_core_properties[] = {
DEFINE_PROP_UINT8("rx-fifo0", XlnxVersalCANFDState, cfg.rx0_fifo, 0x40), DEFINE_PROP_UINT8("rx-fifo0", XlnxVersalCANFDState, cfg.rx0_fifo, 0x40),
DEFINE_PROP_UINT8("rx-fifo1", XlnxVersalCANFDState, cfg.rx1_fifo, 0x40), DEFINE_PROP_UINT8("rx-fifo1", XlnxVersalCANFDState, cfg.rx1_fifo, 0x40),
DEFINE_PROP_UINT8("tx-fifo", XlnxVersalCANFDState, cfg.tx_fifo, 0x20), DEFINE_PROP_UINT8("tx-fifo", XlnxVersalCANFDState, cfg.tx_fifo, 0x20),

View file

@ -1169,7 +1169,7 @@ static const VMStateDescription vmstate_can = {
} }
}; };
static Property xlnx_zynqmp_can_properties[] = { static const Property xlnx_zynqmp_can_properties[] = {
DEFINE_PROP_UINT32("ext_clk_freq", XlnxZynqMPCANState, cfg.ext_clk_freq, DEFINE_PROP_UINT32("ext_clk_freq", XlnxZynqMPCANState, cfg.ext_clk_freq,
CAN_DEFAULT_CLOCK), CAN_DEFAULT_CLOCK),
DEFINE_PROP_LINK("canbus", XlnxZynqMPCANState, canbus, TYPE_CAN_BUS, DEFINE_PROP_LINK("canbus", XlnxZynqMPCANState, canbus, TYPE_CAN_BUS,

View file

@ -931,7 +931,7 @@ static const VMStateDescription vmstate_dp8393x = {
} }
}; };
static Property dp8393x_properties[] = { static const Property dp8393x_properties[] = {
DEFINE_NIC_PROPERTIES(dp8393xState, conf), DEFINE_NIC_PROPERTIES(dp8393xState, conf),
DEFINE_PROP_LINK("dma_mr", dp8393xState, dma_mr, DEFINE_PROP_LINK("dma_mr", dp8393xState, dma_mr,
TYPE_MEMORY_REGION, MemoryRegion *), TYPE_MEMORY_REGION, MemoryRegion *),

View file

@ -1677,7 +1677,7 @@ static void pci_e1000_realize(PCIDevice *pci_dev, Error **errp)
e1000_flush_queue_timer, d); e1000_flush_queue_timer, d);
} }
static Property e1000_properties[] = { static const Property e1000_properties[] = {
DEFINE_NIC_PROPERTIES(E1000State, conf), DEFINE_NIC_PROPERTIES(E1000State, conf),
DEFINE_PROP_BIT("extra_mac_registers", E1000State, DEFINE_PROP_BIT("extra_mac_registers", E1000State,
compat_flags, E1000_FLAG_MAC_BIT, true), compat_flags, E1000_FLAG_MAC_BIT, true),

View file

@ -661,7 +661,7 @@ static PropertyInfo e1000e_prop_disable_vnet,
e1000e_prop_subsys_ven, e1000e_prop_subsys_ven,
e1000e_prop_subsys; e1000e_prop_subsys;
static Property e1000e_properties[] = { static const Property e1000e_properties[] = {
DEFINE_NIC_PROPERTIES(E1000EState, conf), DEFINE_NIC_PROPERTIES(E1000EState, conf),
DEFINE_PROP_SIGNED("disable_vnet_hdr", E1000EState, disable_vnet, false, DEFINE_PROP_SIGNED("disable_vnet_hdr", E1000EState, disable_vnet, false,
e1000e_prop_disable_vnet, bool), e1000e_prop_disable_vnet, bool),

View file

@ -2058,7 +2058,7 @@ static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s)
return eepro100_get_class_by_name(object_get_typename(OBJECT(s))); return eepro100_get_class_by_name(object_get_typename(OBJECT(s)));
} }
static Property e100_properties[] = { static const Property e100_properties[] = {
DEFINE_NIC_PROPERTIES(EEPRO100State, conf), DEFINE_NIC_PROPERTIES(EEPRO100State, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -414,7 +414,7 @@ static void etsec_instance_init(Object *obj)
sysbus_init_irq(sbd, &etsec->err_irq); sysbus_init_irq(sbd, &etsec->err_irq);
} }
static Property etsec_properties[] = { static const Property etsec_properties[] = {
DEFINE_NIC_PROPERTIES(eTSEC, conf), DEFINE_NIC_PROPERTIES(eTSEC, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -1254,7 +1254,7 @@ static const VMStateDescription vmstate_ftgmac100 = {
} }
}; };
static Property ftgmac100_properties[] = { static const Property ftgmac100_properties[] = {
DEFINE_PROP_BOOL("aspeed", FTGMAC100State, aspeed, false), DEFINE_PROP_BOOL("aspeed", FTGMAC100State, aspeed, false),
DEFINE_NIC_PROPERTIES(FTGMAC100State, conf), DEFINE_NIC_PROPERTIES(FTGMAC100State, conf),
DEFINE_PROP_BOOL("dma64", FTGMAC100State, dma64, false), DEFINE_PROP_BOOL("dma64", FTGMAC100State, dma64, false),
@ -1415,7 +1415,7 @@ static const VMStateDescription vmstate_aspeed_mii = {
} }
}; };
static Property aspeed_mii_properties[] = { static const Property aspeed_mii_properties[] = {
DEFINE_PROP_LINK("nic", AspeedMiiState, nic, TYPE_FTGMAC100, DEFINE_PROP_LINK("nic", AspeedMiiState, nic, TYPE_FTGMAC100,
FTGMAC100State *), FTGMAC100State *),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),

View file

@ -591,7 +591,7 @@ static const VMStateDescription igb_vmstate = {
} }
}; };
static Property igb_properties[] = { static const Property igb_properties[] = {
DEFINE_NIC_PROPERTIES(IGBState, conf), DEFINE_NIC_PROPERTIES(IGBState, conf),
DEFINE_PROP_BOOL("x-pcie-flr-init", IGBState, has_flr, true), DEFINE_PROP_BOOL("x-pcie-flr-init", IGBState, has_flr, true),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),

View file

@ -1222,7 +1222,7 @@ static void imx_eth_realize(DeviceState *dev, Error **errp)
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
} }
static Property imx_eth_properties[] = { static const Property imx_eth_properties[] = {
DEFINE_NIC_PROPERTIES(IMXFECState, conf), DEFINE_NIC_PROPERTIES(IMXFECState, conf),
DEFINE_PROP_UINT32("tx-ring-num", IMXFECState, tx_ring_num, 1), DEFINE_PROP_UINT32("tx-ring-num", IMXFECState, tx_ring_num, 1),
DEFINE_PROP_UINT32("phy-num", IMXFECState, phy_num, 0), DEFINE_PROP_UINT32("phy-num", IMXFECState, phy_num, 0),

View file

@ -1304,7 +1304,7 @@ static void lan9118_realize(DeviceState *dev, Error **errp)
ptimer_transaction_commit(s->timer); ptimer_transaction_commit(s->timer);
} }
static Property lan9118_properties[] = { static const Property lan9118_properties[] = {
DEFINE_NIC_PROPERTIES(lan9118_state, conf), DEFINE_NIC_PROPERTIES(lan9118_state, conf),
DEFINE_PROP_UINT32("mode_16bit", lan9118_state, mode_16bit, 0), DEFINE_PROP_UINT32("mode_16bit", lan9118_state, mode_16bit, 0),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),

View file

@ -137,7 +137,7 @@ static void lance_instance_init(Object *obj)
DEVICE(obj)); DEVICE(obj));
} }
static Property lance_properties[] = { static const Property lance_properties[] = {
DEFINE_PROP_LINK("dma", SysBusPCNetState, state.dma_opaque, DEFINE_PROP_LINK("dma", SysBusPCNetState, state.dma_opaque,
TYPE_DEVICE, DeviceState *), TYPE_DEVICE, DeviceState *),
DEFINE_NIC_PROPERTIES(SysBusPCNetState, state.conf), DEFINE_NIC_PROPERTIES(SysBusPCNetState, state.conf),

View file

@ -158,7 +158,7 @@ static void lasi_82596_instance_init(Object *obj)
DEVICE(obj)); DEVICE(obj));
} }
static Property lasi_82596_properties[] = { static const Property lasi_82596_properties[] = {
DEFINE_NIC_PROPERTIES(SysBusI82596State, state.conf), DEFINE_NIC_PROPERTIES(SysBusI82596State, state.conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -660,7 +660,7 @@ static void mcf_fec_instance_init(Object *obj)
} }
} }
static Property mcf_fec_properties[] = { static const Property mcf_fec_properties[] = {
DEFINE_NIC_PROPERTIES(mcf_fec_state, conf), DEFINE_NIC_PROPERTIES(mcf_fec_state, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -266,7 +266,7 @@ static void mipsnet_sysbus_reset(DeviceState *dev)
mipsnet_reset(s); mipsnet_reset(s);
} }
static Property mipsnet_properties[] = { static const Property mipsnet_properties[] = {
DEFINE_NIC_PROPERTIES(MIPSnetState, conf), DEFINE_NIC_PROPERTIES(MIPSnetState, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -546,7 +546,7 @@ static void msf2_emac_init(Object *obj)
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
} }
static Property msf2_emac_properties[] = { static const Property msf2_emac_properties[] = {
DEFINE_PROP_LINK("ahb-bus", MSF2EmacState, dma_mr, DEFINE_PROP_LINK("ahb-bus", MSF2EmacState, dma_mr,
TYPE_MEMORY_REGION, MemoryRegion *), TYPE_MEMORY_REGION, MemoryRegion *),
DEFINE_NIC_PROPERTIES(MSF2EmacState, conf), DEFINE_NIC_PROPERTIES(MSF2EmacState, conf),

View file

@ -371,7 +371,7 @@ static const VMStateDescription mv88w8618_eth_vmsd = {
} }
}; };
static Property mv88w8618_eth_properties[] = { static const Property mv88w8618_eth_properties[] = {
DEFINE_NIC_PROPERTIES(mv88w8618_eth_state, conf), DEFINE_NIC_PROPERTIES(mv88w8618_eth_state, conf),
DEFINE_PROP_LINK("dma-memory", mv88w8618_eth_state, dma_mr, DEFINE_PROP_LINK("dma-memory", mv88w8618_eth_state, dma_mr,
TYPE_MEMORY_REGION, MemoryRegion *), TYPE_MEMORY_REGION, MemoryRegion *),

View file

@ -79,7 +79,7 @@ static void isa_ne2000_realizefn(DeviceState *dev, Error **errp)
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->c.macaddr.a); qemu_format_nic_info_str(qemu_get_queue(s->nic), s->c.macaddr.a);
} }
static Property ne2000_isa_properties[] = { static const Property ne2000_isa_properties[] = {
DEFINE_PROP_UINT32("iobase", ISANE2000State, iobase, 0x300), DEFINE_PROP_UINT32("iobase", ISANE2000State, iobase, 0x300),
DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9), DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9),
DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c), DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c),

View file

@ -96,7 +96,7 @@ static void ne2000_instance_init(Object *obj)
&pci_dev->qdev); &pci_dev->qdev);
} }
static Property ne2000_properties[] = { static const Property ne2000_properties[] = {
DEFINE_NIC_PROPERTIES(PCINE2000State, ne2000.c), DEFINE_NIC_PROPERTIES(PCINE2000State, ne2000.c),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -845,7 +845,7 @@ static const VMStateDescription vmstate_npcm7xx_emc = {
}, },
}; };
static Property npcm7xx_emc_properties[] = { static const Property npcm7xx_emc_properties[] = {
DEFINE_NIC_PROPERTIES(NPCM7xxEMCState, conf), DEFINE_NIC_PROPERTIES(NPCM7xxEMCState, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -912,7 +912,7 @@ static const VMStateDescription vmstate_npcm_gmac = {
}, },
}; };
static Property npcm_gmac_properties[] = { static const Property npcm_gmac_properties[] = {
DEFINE_NIC_PROPERTIES(NPCMGMACState, conf), DEFINE_NIC_PROPERTIES(NPCMGMACState, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -743,7 +743,7 @@ static void qdev_open_eth_reset(DeviceState *dev)
open_eth_reset(d); open_eth_reset(d);
} }
static Property open_eth_properties[] = { static const Property open_eth_properties[] = {
DEFINE_NIC_PROPERTIES(OpenEthState, conf), DEFINE_NIC_PROPERTIES(OpenEthState, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -252,7 +252,7 @@ static void pcnet_instance_init(Object *obj)
DEVICE(obj)); DEVICE(obj));
} }
static Property pcnet_properties[] = { static const Property pcnet_properties[] = {
DEFINE_NIC_PROPERTIES(PCIPCNetState, state.conf), DEFINE_NIC_PROPERTIES(PCIPCNetState, state.conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -1459,7 +1459,7 @@ static void rocker_reset(DeviceState *dev)
DPRINTF("Reset done\n"); DPRINTF("Reset done\n");
} }
static Property rocker_properties[] = { static const Property rocker_properties[] = {
DEFINE_PROP_STRING("name", Rocker, name), DEFINE_PROP_STRING("name", Rocker, name),
DEFINE_PROP_STRING("world", Rocker, world_name), DEFINE_PROP_STRING("world", Rocker, world_name),
DEFINE_PROP_MACADDR("fp_start_macaddr", Rocker, DEFINE_PROP_MACADDR("fp_start_macaddr", Rocker,

View file

@ -3410,7 +3410,7 @@ static void rtl8139_instance_init(Object *obj)
DEVICE(obj)); DEVICE(obj));
} }
static Property rtl8139_properties[] = { static const Property rtl8139_properties[] = {
DEFINE_NIC_PROPERTIES(RTL8139State, conf), DEFINE_NIC_PROPERTIES(RTL8139State, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -788,7 +788,7 @@ static void smc91c111_realize(DeviceState *dev, Error **errp)
/* ??? Save/restore. */ /* ??? Save/restore. */
} }
static Property smc91c111_properties[] = { static const Property smc91c111_properties[] = {
DEFINE_NIC_PROPERTIES(smc91c111_state, conf), DEFINE_NIC_PROPERTIES(smc91c111_state, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -786,7 +786,7 @@ static target_ulong h_change_logical_lan_mac(PowerPCCPU *cpu,
return H_SUCCESS; return H_SUCCESS;
} }
static Property spapr_vlan_properties[] = { static const Property spapr_vlan_properties[] = {
DEFINE_SPAPR_PROPERTIES(SpaprVioVlan, sdev), DEFINE_SPAPR_PROPERTIES(SpaprVioVlan, sdev),
DEFINE_NIC_PROPERTIES(SpaprVioVlan, nicconf), DEFINE_NIC_PROPERTIES(SpaprVioVlan, nicconf),
DEFINE_PROP_BIT("use-rx-buffer-pools", SpaprVioVlan, DEFINE_PROP_BIT("use-rx-buffer-pools", SpaprVioVlan,

View file

@ -497,7 +497,7 @@ static void stellaris_enet_realize(DeviceState *dev, Error **errp)
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
} }
static Property stellaris_enet_properties[] = { static const Property stellaris_enet_properties[] = {
DEFINE_NIC_PROPERTIES(stellaris_enet_state, conf), DEFINE_NIC_PROPERTIES(stellaris_enet_state, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -1420,7 +1420,7 @@ static void sungem_instance_init(Object *obj)
DEVICE(obj)); DEVICE(obj));
} }
static Property sungem_properties[] = { static const Property sungem_properties[] = {
DEFINE_NIC_PROPERTIES(SunGEMState, conf), DEFINE_NIC_PROPERTIES(SunGEMState, conf),
/* Phy address should be 0 for most Apple machines except /* Phy address should be 0 for most Apple machines except
* for K2 in which case it's 1. Will be set by a machine * for K2 in which case it's 1. Will be set by a machine

View file

@ -177,7 +177,7 @@ struct SunHMEState {
uint16_t miiregs[HME_MII_REGS_SIZE]; uint16_t miiregs[HME_MII_REGS_SIZE];
}; };
static Property sunhme_properties[] = { static const Property sunhme_properties[] = {
DEFINE_NIC_PROPERTIES(SunHMEState, conf), DEFINE_NIC_PROPERTIES(SunHMEState, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -1007,7 +1007,7 @@ static void tulip_instance_init(Object *obj)
&pci_dev->qdev); &pci_dev->qdev);
} }
static Property tulip_properties[] = { static const Property tulip_properties[] = {
DEFINE_NIC_PROPERTIES(TULIPState, c), DEFINE_NIC_PROPERTIES(TULIPState, c),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -3985,7 +3985,7 @@ static const VMStateDescription vmstate_virtio_net = {
.dev_unplug_pending = dev_unplug_pending, .dev_unplug_pending = dev_unplug_pending,
}; };
static Property virtio_net_properties[] = { static const Property virtio_net_properties[] = {
DEFINE_PROP_BIT64("csum", VirtIONet, host_features, DEFINE_PROP_BIT64("csum", VirtIONet, host_features,
VIRTIO_NET_F_CSUM, true), VIRTIO_NET_F_CSUM, true),
DEFINE_PROP_BIT64("guest_csum", VirtIONet, host_features, DEFINE_PROP_BIT64("guest_csum", VirtIONet, host_features,

View file

@ -2471,7 +2471,7 @@ static const VMStateDescription vmstate_vmxnet3 = {
} }
}; };
static Property vmxnet3_properties[] = { static const Property vmxnet3_properties[] = {
DEFINE_NIC_PROPERTIES(VMXNET3State, conf), DEFINE_NIC_PROPERTIES(VMXNET3State, conf),
DEFINE_PROP_BIT("x-old-msi-offsets", VMXNET3State, compat_flags, DEFINE_PROP_BIT("x-old-msi-offsets", VMXNET3State, compat_flags,
VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT, false), VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT, false),

View file

@ -555,7 +555,7 @@ static void xen_netdev_unrealize(XenDevice *xendev)
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
static Property xen_netdev_properties[] = { static const Property xen_netdev_properties[] = {
DEFINE_NIC_PROPERTIES(XenNetDev, conf), DEFINE_NIC_PROPERTIES(XenNetDev, conf),
DEFINE_PROP_INT32("idx", XenNetDev, dev, -1), DEFINE_PROP_INT32("idx", XenNetDev, dev, -1),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),

View file

@ -414,7 +414,7 @@ static void xgmac_enet_realize(DeviceState *dev, Error **errp)
s->conf.macaddr.a[0]; s->conf.macaddr.a[0];
} }
static Property xgmac_properties[] = { static const Property xgmac_properties[] = {
DEFINE_NIC_PROPERTIES(XgmacState, conf), DEFINE_NIC_PROPERTIES(XgmacState, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

View file

@ -996,7 +996,7 @@ static void xilinx_enet_init(Object *obj)
sysbus_init_mmio(sbd, &s->iomem); sysbus_init_mmio(sbd, &s->iomem);
} }
static Property xilinx_enet_properties[] = { static const Property xilinx_enet_properties[] = {
DEFINE_PROP_UINT32("phyaddr", XilinxAXIEnet, c_phyaddr, 7), DEFINE_PROP_UINT32("phyaddr", XilinxAXIEnet, c_phyaddr, 7),
DEFINE_PROP_UINT32("rxmem", XilinxAXIEnet, c_rxmem, 0x1000), DEFINE_PROP_UINT32("rxmem", XilinxAXIEnet, c_rxmem, 0x1000),
DEFINE_PROP_UINT32("txmem", XilinxAXIEnet, c_txmem, 0x1000), DEFINE_PROP_UINT32("txmem", XilinxAXIEnet, c_txmem, 0x1000),

View file

@ -251,7 +251,7 @@ static void xilinx_ethlite_init(Object *obj)
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
} }
static Property xilinx_ethlite_properties[] = { static const Property xilinx_ethlite_properties[] = {
DEFINE_PROP_UINT32("tx-ping-pong", struct xlx_ethlite, c_tx_pingpong, 1), DEFINE_PROP_UINT32("tx-ping-pong", struct xlx_ethlite, c_tx_pingpong, 1),
DEFINE_PROP_UINT32("rx-ping-pong", struct xlx_ethlite, c_rx_pingpong, 1), DEFINE_PROP_UINT32("rx-ping-pong", struct xlx_ethlite, c_rx_pingpong, 1),
DEFINE_NIC_PROPERTIES(struct xlx_ethlite, conf), DEFINE_NIC_PROPERTIES(struct xlx_ethlite, conf),