mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 02:24:58 -06:00
include/hw/qdev-properties: Remove DEFINE_PROP_END_OF_LIST
Now that all of the Property arrays are counted, we can remove the terminator object from each array. Update the assertions in device_class_set_props to match. With struct Property being 88 bytes, this was a rather large form of terminator. Saves 30k from qemu-system-aarch64. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Tested-by: Lei Yang <leiyang@redhat.com> Link: https://lore.kernel.org/r/20241218134251.4724-21-richard.henderson@linaro.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
ebe9685f12
commit
5fcabe628b
556 changed files with 7 additions and 624 deletions
|
@ -834,7 +834,6 @@ static const Property allwinner_sun8i_emac_properties[] = {
|
|||
DEFINE_PROP_UINT8("phy-addr", AwSun8iEmacState, mii_phy_addr, 0),
|
||||
DEFINE_PROP_LINK("dma-memory", AwSun8iEmacState, dma_mr,
|
||||
TYPE_MEMORY_REGION, MemoryRegion *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static int allwinner_sun8i_emac_post_load(void *opaque, int version_id)
|
||||
|
|
|
@ -465,7 +465,6 @@ static void aw_emac_realize(DeviceState *dev, Error **errp)
|
|||
static const Property aw_emac_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(AwEmacState, conf),
|
||||
DEFINE_PROP_UINT8("phy-addr", AwEmacState, phy_addr, 0),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_mii = {
|
||||
|
|
|
@ -1799,7 +1799,6 @@ static const Property gem_properties[] = {
|
|||
jumbo_max_len, 10240),
|
||||
DEFINE_PROP_LINK("dma", CadenceGEMState, dma_mr,
|
||||
TYPE_MEMORY_REGION, MemoryRegion *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void gem_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -2052,7 +2052,6 @@ static const Property canfd_core_properties[] = {
|
|||
CANFD_DEFAULT_CLOCK),
|
||||
DEFINE_PROP_LINK("canfdbus", XlnxVersalCANFDState, canfdbus, TYPE_CAN_BUS,
|
||||
CanBusState *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void canfd_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -1174,7 +1174,6 @@ static const Property xlnx_zynqmp_can_properties[] = {
|
|||
CAN_DEFAULT_CLOCK),
|
||||
DEFINE_PROP_LINK("canbus", XlnxZynqMPCANState, canbus, TYPE_CAN_BUS,
|
||||
CanBusState *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void xlnx_zynqmp_can_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -937,7 +937,6 @@ static const Property dp8393x_properties[] = {
|
|||
TYPE_MEMORY_REGION, MemoryRegion *),
|
||||
DEFINE_PROP_UINT8("it_shift", dp8393xState, it_shift, 0),
|
||||
DEFINE_PROP_BOOL("big_endian", dp8393xState, big_endian, false),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void dp8393x_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -1685,7 +1685,6 @@ static const Property e1000_properties[] = {
|
|||
compat_flags, E1000_FLAG_TSO_BIT, true),
|
||||
DEFINE_PROP_BIT("init-vet", E1000State,
|
||||
compat_flags, E1000_FLAG_VET_BIT, true),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
typedef struct E1000Info {
|
||||
|
|
|
@ -672,7 +672,6 @@ static const Property e1000e_properties[] = {
|
|||
e1000e_prop_subsys, uint16_t),
|
||||
DEFINE_PROP_BOOL("init-vet", E1000EState, init_vet, true),
|
||||
DEFINE_PROP_BOOL("migrate-timadj", E1000EState, timadj, true),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void e1000e_class_init(ObjectClass *class, void *data)
|
||||
|
|
|
@ -2060,7 +2060,6 @@ static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s)
|
|||
|
||||
static const Property e100_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(EEPRO100State, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void eepro100_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -416,7 +416,6 @@ static void etsec_instance_init(Object *obj)
|
|||
|
||||
static const Property etsec_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(eTSEC, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void etsec_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -1258,7 +1258,6 @@ static const Property ftgmac100_properties[] = {
|
|||
DEFINE_PROP_BOOL("aspeed", FTGMAC100State, aspeed, false),
|
||||
DEFINE_NIC_PROPERTIES(FTGMAC100State, conf),
|
||||
DEFINE_PROP_BOOL("dma64", FTGMAC100State, dma64, false),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void ftgmac100_class_init(ObjectClass *klass, void *data)
|
||||
|
@ -1418,7 +1417,6 @@ static const VMStateDescription vmstate_aspeed_mii = {
|
|||
static const Property aspeed_mii_properties[] = {
|
||||
DEFINE_PROP_LINK("nic", AspeedMiiState, nic, TYPE_FTGMAC100,
|
||||
FTGMAC100State *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void aspeed_mii_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -594,7 +594,6 @@ static const VMStateDescription igb_vmstate = {
|
|||
static const Property igb_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(IGBState, conf),
|
||||
DEFINE_PROP_BOOL("x-pcie-flr-init", IGBState, has_flr, true),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void igb_class_init(ObjectClass *class, void *data)
|
||||
|
|
|
@ -1229,7 +1229,6 @@ static const Property imx_eth_properties[] = {
|
|||
DEFINE_PROP_BOOL("phy-connected", IMXFECState, phy_connected, true),
|
||||
DEFINE_PROP_LINK("phy-consumer", IMXFECState, phy_consumer, TYPE_IMX_FEC,
|
||||
IMXFECState *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void imx_eth_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -1307,7 +1307,6 @@ static void lan9118_realize(DeviceState *dev, Error **errp)
|
|||
static const Property lan9118_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(lan9118_state, conf),
|
||||
DEFINE_PROP_UINT32("mode_16bit", lan9118_state, mode_16bit, 0),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void lan9118_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -141,7 +141,6 @@ static const Property lance_properties[] = {
|
|||
DEFINE_PROP_LINK("dma", SysBusPCNetState, state.dma_opaque,
|
||||
TYPE_DEVICE, DeviceState *),
|
||||
DEFINE_NIC_PROPERTIES(SysBusPCNetState, state.conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void lance_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -160,7 +160,6 @@ static void lasi_82596_instance_init(Object *obj)
|
|||
|
||||
static const Property lasi_82596_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(SysBusI82596State, state.conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void lasi_82596_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -662,7 +662,6 @@ static void mcf_fec_instance_init(Object *obj)
|
|||
|
||||
static const Property mcf_fec_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(mcf_fec_state, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void mcf_fec_class_init(ObjectClass *oc, void *data)
|
||||
|
|
|
@ -268,7 +268,6 @@ static void mipsnet_sysbus_reset(DeviceState *dev)
|
|||
|
||||
static const Property mipsnet_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(MIPSnetState, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void mipsnet_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -550,7 +550,6 @@ static const Property msf2_emac_properties[] = {
|
|||
DEFINE_PROP_LINK("ahb-bus", MSF2EmacState, dma_mr,
|
||||
TYPE_MEMORY_REGION, MemoryRegion *),
|
||||
DEFINE_NIC_PROPERTIES(MSF2EmacState, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_msf2_emac = {
|
||||
|
|
|
@ -375,7 +375,6 @@ static const Property mv88w8618_eth_properties[] = {
|
|||
DEFINE_NIC_PROPERTIES(mv88w8618_eth_state, conf),
|
||||
DEFINE_PROP_LINK("dma-memory", mv88w8618_eth_state, dma_mr,
|
||||
TYPE_MEMORY_REGION, MemoryRegion *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void mv88w8618_eth_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -83,7 +83,6 @@ static const Property ne2000_isa_properties[] = {
|
|||
DEFINE_PROP_UINT32("iobase", ISANE2000State, iobase, 0x300),
|
||||
DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9),
|
||||
DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void isa_ne2000_class_initfn(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -98,7 +98,6 @@ static void ne2000_instance_init(Object *obj)
|
|||
|
||||
static const Property ne2000_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(PCINE2000State, ne2000.c),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void ne2000_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -847,7 +847,6 @@ static const VMStateDescription vmstate_npcm7xx_emc = {
|
|||
|
||||
static const Property npcm7xx_emc_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(NPCM7xxEMCState, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void npcm7xx_emc_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -914,7 +914,6 @@ static const VMStateDescription vmstate_npcm_gmac = {
|
|||
|
||||
static const Property npcm_gmac_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(NPCMGMACState, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void npcm_gmac_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -745,7 +745,6 @@ static void qdev_open_eth_reset(DeviceState *dev)
|
|||
|
||||
static const Property open_eth_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(OpenEthState, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void open_eth_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -254,7 +254,6 @@ static void pcnet_instance_init(Object *obj)
|
|||
|
||||
static const Property pcnet_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(PCIPCNetState, state.conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void pcnet_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -1468,7 +1468,6 @@ static const Property rocker_properties[] = {
|
|||
switch_id, 0),
|
||||
DEFINE_PROP_ARRAY("ports", Rocker, fp_ports,
|
||||
fp_ports_peers, qdev_prop_netdev, NICPeers),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static const VMStateDescription rocker_vmsd = {
|
||||
|
|
|
@ -3412,7 +3412,6 @@ static void rtl8139_instance_init(Object *obj)
|
|||
|
||||
static const Property rtl8139_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(RTL8139State, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void rtl8139_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -790,7 +790,6 @@ static void smc91c111_realize(DeviceState *dev, Error **errp)
|
|||
|
||||
static const Property smc91c111_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(smc91c111_state, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void smc91c111_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -791,7 +791,6 @@ static const Property spapr_vlan_properties[] = {
|
|||
DEFINE_NIC_PROPERTIES(SpaprVioVlan, nicconf),
|
||||
DEFINE_PROP_BIT("use-rx-buffer-pools", SpaprVioVlan,
|
||||
compat_flags, SPAPRVLAN_FLAG_RX_BUF_POOLS_BIT, true),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static bool spapr_vlan_rx_buffer_pools_needed(void *opaque)
|
||||
|
|
|
@ -499,7 +499,6 @@ static void stellaris_enet_realize(DeviceState *dev, Error **errp)
|
|||
|
||||
static const Property stellaris_enet_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(stellaris_enet_state, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void stellaris_enet_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -1427,7 +1427,6 @@ static const Property sungem_properties[] = {
|
|||
* override.
|
||||
*/
|
||||
DEFINE_PROP_UINT32("phy_addr", SunGEMState, phy_addr, 0),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_sungem = {
|
||||
|
|
|
@ -179,7 +179,6 @@ struct SunHMEState {
|
|||
|
||||
static const Property sunhme_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(SunHMEState, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void sunhme_reset_tx(SunHMEState *s)
|
||||
|
|
|
@ -1009,7 +1009,6 @@ static void tulip_instance_init(Object *obj)
|
|||
|
||||
static const Property tulip_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(TULIPState, c),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void tulip_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -4057,7 +4057,6 @@ static const Property virtio_net_properties[] = {
|
|||
VIRTIO_NET_F_GUEST_USO6, true),
|
||||
DEFINE_PROP_BIT64("host_uso", VirtIONet, host_features,
|
||||
VIRTIO_NET_F_HOST_USO, true),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void virtio_net_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -2477,7 +2477,6 @@ static const Property vmxnet3_properties[] = {
|
|||
VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT, false),
|
||||
DEFINE_PROP_BIT("x-disable-pcie", VMXNET3State, compat_flags,
|
||||
VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT, false),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void vmxnet3_realize(DeviceState *qdev, Error **errp)
|
||||
|
|
|
@ -558,7 +558,6 @@ static void xen_netdev_unrealize(XenDevice *xendev)
|
|||
static const Property xen_netdev_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(XenNetDev, conf),
|
||||
DEFINE_PROP_INT32("idx", XenNetDev, dev, -1),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void xen_netdev_class_init(ObjectClass *class, void *data)
|
||||
|
|
|
@ -416,7 +416,6 @@ static void xgmac_enet_realize(DeviceState *dev, Error **errp)
|
|||
|
||||
static const Property xgmac_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(XgmacState, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void xgmac_enet_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -1005,7 +1005,6 @@ static const Property xilinx_enet_properties[] = {
|
|||
tx_data_dev, TYPE_STREAM_SINK, StreamSink *),
|
||||
DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIEnet,
|
||||
tx_control_dev, TYPE_STREAM_SINK, StreamSink *),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void xilinx_enet_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -255,7 +255,6 @@ static const Property xilinx_ethlite_properties[] = {
|
|||
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_NIC_PROPERTIES(struct xlx_ethlite, conf),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void xilinx_ethlite_class_init(ObjectClass *klass, void *data)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue