Skip to content

Commit 8110fa1

Browse files
committed
Use DECLARE_*CHECKER* macros
Generated using: $ ./scripts/codeconverter/converter.py -i \ --pattern=TypeCheckMacro $(git grep -l '' -- '*.[ch]') Reviewed-by: Daniel P. Berrangé <[email protected]> Reviewed-by: Juan Quintela <[email protected]> Message-Id: <[email protected]> Reviewed-by: Juan Quintela <[email protected]> Message-Id: <[email protected]> Message-Id: <[email protected]> Signed-off-by: Eduardo Habkost <[email protected]>
1 parent db1015e commit 8110fa1

File tree

791 files changed

+1989
-2425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

791 files changed

+1989
-2425
lines changed

accel/tcg/tcg-all.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ typedef struct TCGState TCGState;
4646

4747
#define TYPE_TCG_ACCEL ACCEL_CLASS_NAME("tcg")
4848

49-
#define TCG_STATE(obj) \
50-
OBJECT_CHECK(TCGState, (obj), TYPE_TCG_ACCEL)
49+
DECLARE_INSTANCE_CHECKER(TCGState, TCG_STATE,
50+
TYPE_TCG_ACCEL)
5151

5252
/* mask must never be zero, except for A20 change call */
5353
static void tcg_handle_interrupt(CPUState *cpu, int mask)

backends/cryptodev-builtin.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@
3737

3838
typedef struct CryptoDevBackendBuiltin
3939
CryptoDevBackendBuiltin;
40-
#define CRYPTODEV_BACKEND_BUILTIN(obj) \
41-
OBJECT_CHECK(CryptoDevBackendBuiltin, \
42-
(obj), TYPE_CRYPTODEV_BACKEND_BUILTIN)
40+
DECLARE_INSTANCE_CHECKER(CryptoDevBackendBuiltin, CRYPTODEV_BACKEND_BUILTIN,
41+
TYPE_CRYPTODEV_BACKEND_BUILTIN)
4342

4443

4544
typedef struct CryptoDevBackendBuiltinSession {

backends/cryptodev-vhost-user.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@
4040
#define TYPE_CRYPTODEV_BACKEND_VHOST_USER "cryptodev-vhost-user"
4141

4242
typedef struct CryptoDevBackendVhostUser CryptoDevBackendVhostUser;
43-
#define CRYPTODEV_BACKEND_VHOST_USER(obj) \
44-
OBJECT_CHECK(CryptoDevBackendVhostUser, \
45-
(obj), TYPE_CRYPTODEV_BACKEND_VHOST_USER)
43+
DECLARE_INSTANCE_CHECKER(CryptoDevBackendVhostUser, CRYPTODEV_BACKEND_VHOST_USER,
44+
TYPE_CRYPTODEV_BACKEND_VHOST_USER)
4645

4746

4847
struct CryptoDevBackendVhostUser {

backends/dbus-vmstate.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,8 @@ typedef struct DBusVMState DBusVMState;
2525
typedef struct DBusVMStateClass DBusVMStateClass;
2626

2727
#define TYPE_DBUS_VMSTATE "dbus-vmstate"
28-
#define DBUS_VMSTATE(obj) \
29-
OBJECT_CHECK(DBusVMState, (obj), TYPE_DBUS_VMSTATE)
30-
#define DBUS_VMSTATE_GET_CLASS(obj) \
31-
OBJECT_GET_CLASS(DBusVMStateClass, (obj), TYPE_DBUS_VMSTATE)
32-
#define DBUS_VMSTATE_CLASS(klass) \
33-
OBJECT_CLASS_CHECK(DBusVMStateClass, (klass), TYPE_DBUS_VMSTATE)
28+
DECLARE_OBJ_CHECKERS(DBusVMState, DBusVMStateClass,
29+
DBUS_VMSTATE, TYPE_DBUS_VMSTATE)
3430

3531
struct DBusVMStateClass {
3632
ObjectClass parent_class;

backends/hostmem-file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "qom/object.h"
2121

2222
typedef struct HostMemoryBackendFile HostMemoryBackendFile;
23-
#define MEMORY_BACKEND_FILE(obj) \
24-
OBJECT_CHECK(HostMemoryBackendFile, (obj), TYPE_MEMORY_BACKEND_FILE)
23+
DECLARE_INSTANCE_CHECKER(HostMemoryBackendFile, MEMORY_BACKEND_FILE,
24+
TYPE_MEMORY_BACKEND_FILE)
2525

2626

2727
struct HostMemoryBackendFile {

backends/hostmem-memfd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
2323

2424
typedef struct HostMemoryBackendMemfd HostMemoryBackendMemfd;
25-
#define MEMORY_BACKEND_MEMFD(obj) \
26-
OBJECT_CHECK(HostMemoryBackendMemfd, (obj), TYPE_MEMORY_BACKEND_MEMFD)
25+
DECLARE_INSTANCE_CHECKER(HostMemoryBackendMemfd, MEMORY_BACKEND_MEMFD,
26+
TYPE_MEMORY_BACKEND_MEMFD)
2727

2828

2929
struct HostMemoryBackendMemfd {

backends/rng-builtin.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
#include "qom/object.h"
1313

1414
typedef struct RngBuiltin RngBuiltin;
15-
#define RNG_BUILTIN(obj) OBJECT_CHECK(RngBuiltin, (obj), TYPE_RNG_BUILTIN)
15+
DECLARE_INSTANCE_CHECKER(RngBuiltin, RNG_BUILTIN,
16+
TYPE_RNG_BUILTIN)
1617

1718
struct RngBuiltin {
1819
RngBackend parent;

backends/rng-egd.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
#define TYPE_RNG_EGD "rng-egd"
2222
typedef struct RngEgd RngEgd;
23-
#define RNG_EGD(obj) OBJECT_CHECK(RngEgd, (obj), TYPE_RNG_EGD)
23+
DECLARE_INSTANCE_CHECKER(RngEgd, RNG_EGD,
24+
TYPE_RNG_EGD)
2425

2526
struct RngEgd {
2627
RngBackend parent;

backends/tpm/tpm_emulator.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646

4747
#define TYPE_TPM_EMULATOR "tpm-emulator"
4848
typedef struct TPMEmulator TPMEmulator;
49-
#define TPM_EMULATOR(obj) \
50-
OBJECT_CHECK(TPMEmulator, (obj), TYPE_TPM_EMULATOR)
49+
DECLARE_INSTANCE_CHECKER(TPMEmulator, TPM_EMULATOR,
50+
TYPE_TPM_EMULATOR)
5151

5252
#define TPM_EMULATOR_IMPLEMENTS_ALL_CAPS(S, cap) (((S)->caps & (cap)) == (cap))
5353

backends/tpm/tpm_passthrough.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737

3838
#define TYPE_TPM_PASSTHROUGH "tpm-passthrough"
3939
typedef struct TPMPassthruState TPMPassthruState;
40-
#define TPM_PASSTHROUGH(obj) \
41-
OBJECT_CHECK(TPMPassthruState, (obj), TYPE_TPM_PASSTHROUGH)
40+
DECLARE_INSTANCE_CHECKER(TPMPassthruState, TPM_PASSTHROUGH,
41+
TYPE_TPM_PASSTHROUGH)
4242

4343
/* data structures */
4444
struct TPMPassthruState {

0 commit comments

Comments
 (0)