mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 17:23:56 -06:00
Move QOM typedefs and add missing includes
Some typedefs and macros are defined after the type check macros. This makes it difficult to automatically replace their definitions with OBJECT_DECLARE_TYPE. Patch generated using: $ ./scripts/codeconverter/converter.py -i \ --pattern=QOMStructTypedefSplit $(git grep -l '' -- '*.[ch]') which will split "typdef struct { ... } TypedefName" declarations. Followed by: $ ./scripts/codeconverter/converter.py -i --pattern=MoveSymbols \ $(git grep -l '' -- '*.[ch]') which will: - move the typedefs and #defines above the type check macros - add missing #include "qom/object.h" lines if necessary Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Message-Id: <20200831210740.126168-9-ehabkost@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Message-Id: <20200831210740.126168-10-ehabkost@redhat.com> Message-Id: <20200831210740.126168-11-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
1c8eef0227
commit
db1015e92e
796 changed files with 3378 additions and 1823 deletions
|
@ -29,8 +29,9 @@
|
|||
#include "tpm_prop.h"
|
||||
#include "tpm_ppi.h"
|
||||
#include "trace.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
typedef struct CRBState {
|
||||
struct CRBState {
|
||||
DeviceState parent_obj;
|
||||
|
||||
TPMBackend *tpmbe;
|
||||
|
@ -43,7 +44,8 @@ typedef struct CRBState {
|
|||
|
||||
bool ppi_enabled;
|
||||
TPMPPI ppi;
|
||||
} CRBState;
|
||||
};
|
||||
typedef struct CRBState CRBState;
|
||||
|
||||
#define CRB(obj) OBJECT_CHECK(CRBState, (obj), TYPE_TPM_CRB)
|
||||
|
||||
|
|
|
@ -26,9 +26,11 @@
|
|||
#include "hw/ppc/spapr.h"
|
||||
#include "hw/ppc/spapr_vio.h"
|
||||
#include "trace.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define DEBUG_SPAPR 0
|
||||
|
||||
typedef struct SpaprTpmState SpaprTpmState;
|
||||
#define VIO_SPAPR_VTPM(obj) \
|
||||
OBJECT_CHECK(SpaprTpmState, (obj), TYPE_TPM_SPAPR)
|
||||
|
||||
|
@ -64,7 +66,7 @@ typedef struct TpmCrq {
|
|||
|
||||
#define TPM_SPAPR_BUFFER_MAX 4096
|
||||
|
||||
typedef struct {
|
||||
struct SpaprTpmState {
|
||||
SpaprVioDevice vdev;
|
||||
|
||||
TpmCrq crq; /* track single TPM command */
|
||||
|
@ -84,7 +86,7 @@ typedef struct {
|
|||
TPMVersion be_tpm_version;
|
||||
|
||||
size_t be_buffer_size;
|
||||
} SpaprTpmState;
|
||||
};
|
||||
|
||||
/*
|
||||
* Send a request to the TPM.
|
||||
|
|
|
@ -29,14 +29,16 @@
|
|||
#include "hw/acpi/tpm.h"
|
||||
#include "tpm_prop.h"
|
||||
#include "tpm_tis.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
typedef struct TPMStateISA {
|
||||
struct TPMStateISA {
|
||||
/*< private >*/
|
||||
ISADevice parent_obj;
|
||||
|
||||
/*< public >*/
|
||||
TPMState state; /* not a QOM object */
|
||||
} TPMStateISA;
|
||||
};
|
||||
typedef struct TPMStateISA TPMStateISA;
|
||||
|
||||
#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj), TYPE_TPM_TIS_ISA)
|
||||
|
||||
|
|
|
@ -29,14 +29,16 @@
|
|||
#include "tpm_prop.h"
|
||||
#include "hw/sysbus.h"
|
||||
#include "tpm_tis.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
typedef struct TPMStateSysBus {
|
||||
struct TPMStateSysBus {
|
||||
/*< private >*/
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
/*< public >*/
|
||||
TPMState state; /* not a QOM object */
|
||||
} TPMStateSysBus;
|
||||
};
|
||||
typedef struct TPMStateSysBus TPMStateSysBus;
|
||||
|
||||
#define TPM_TIS_SYSBUS(obj) OBJECT_CHECK(TPMStateSysBus, (obj), TYPE_TPM_TIS_SYSBUS)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue