Use OBJECT_DECLARE_SIMPLE_TYPE when possible

This converts existing DECLARE_INSTANCE_CHECKER usage to
OBJECT_DECLARE_SIMPLE_TYPE when possible.

$ ./scripts/codeconverter/converter.py -i \
  --pattern=AddObjectDeclareSimpleType $(git grep -l '' -- '*.[ch]')

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Paul Durrant <paul@xen.org>
Message-Id: <20200916182519.415636-6-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2020-09-16 14:25:19 -04:00
parent a489d1951c
commit 8063396bf3
505 changed files with 609 additions and 1795 deletions

View file

@ -30,9 +30,7 @@
*/
#define TYPE_AW_SUN8I_EMAC "allwinner-sun8i-emac"
typedef struct AwSun8iEmacState AwSun8iEmacState;
DECLARE_INSTANCE_CHECKER(AwSun8iEmacState, AW_SUN8I_EMAC,
TYPE_AW_SUN8I_EMAC)
OBJECT_DECLARE_SIMPLE_TYPE(AwSun8iEmacState, AW_SUN8I_EMAC)
/** @} */

View file

@ -31,9 +31,7 @@
#include "qom/object.h"
#define TYPE_AW_EMAC "allwinner-emac"
typedef struct AwEmacState AwEmacState;
DECLARE_INSTANCE_CHECKER(AwEmacState, AW_EMAC,
TYPE_AW_EMAC)
OBJECT_DECLARE_SIMPLE_TYPE(AwEmacState, AW_EMAC)
/*
* Allwinner EMAC register list

View file

@ -27,9 +27,7 @@
#include "qom/object.h"
#define TYPE_CADENCE_GEM "cadence_gem"
typedef struct CadenceGEMState CadenceGEMState;
DECLARE_INSTANCE_CHECKER(CadenceGEMState, CADENCE_GEM,
TYPE_CADENCE_GEM)
OBJECT_DECLARE_SIMPLE_TYPE(CadenceGEMState, CADENCE_GEM)
#include "net/net.h"
#include "hw/sysbus.h"

View file

@ -12,9 +12,7 @@
#include "qom/object.h"
#define TYPE_FTGMAC100 "ftgmac100"
typedef struct FTGMAC100State FTGMAC100State;
DECLARE_INSTANCE_CHECKER(FTGMAC100State, FTGMAC100,
TYPE_FTGMAC100)
OBJECT_DECLARE_SIMPLE_TYPE(FTGMAC100State, FTGMAC100)
#include "hw/sysbus.h"
#include "net/net.h"
@ -70,9 +68,7 @@ struct FTGMAC100State {
};
#define TYPE_ASPEED_MII "aspeed-mmi"
typedef struct AspeedMiiState AspeedMiiState;
DECLARE_INSTANCE_CHECKER(AspeedMiiState, ASPEED_MII,
TYPE_ASPEED_MII)
OBJECT_DECLARE_SIMPLE_TYPE(AspeedMiiState, ASPEED_MII)
/*
* AST2600 MII controller

View file

@ -26,9 +26,7 @@
#include "qom/object.h"
#define TYPE_IMX_FEC "imx.fec"
typedef struct IMXFECState IMXFECState;
DECLARE_INSTANCE_CHECKER(IMXFECState, IMX_FEC,
TYPE_IMX_FEC)
OBJECT_DECLARE_SIMPLE_TYPE(IMXFECState, IMX_FEC)
#define TYPE_IMX_ENET "imx.enet"

View file

@ -29,9 +29,7 @@
#include "qom/object.h"
#define TYPE_MSS_EMAC "msf2-emac"
typedef struct MSF2EmacState MSF2EmacState;
DECLARE_INSTANCE_CHECKER(MSF2EmacState, MSS_EMAC,
TYPE_MSS_EMAC)
OBJECT_DECLARE_SIMPLE_TYPE(MSF2EmacState, MSS_EMAC)
#define R_MAX (0x1a0 / 4)
#define PHY_MAX_REGS 32