mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
QOM boilerplate cleanup
Documentation build fix: * memory: Remove kernel-doc comment marker (Eduardo Habkost) QOM cleanups: * Rename QOM macros for consistency between TYPE_* and type checking constants (Eduardo Habkost) QOM new macros: * OBJECT_DECLARE_* and OBJECT_DEFINE_* macros (Daniel P. Berrangé) * DECLARE_*_CHECKER macros (Eduardo Habkost) Automated QOM boilerplate changes: * Automated changes to use DECLARE_*_CHECKER (Eduardo Habkost * Automated changes to use OBJECT_DECLARE* (Eduardo Habkost) -----BEGIN PGP SIGNATURE----- iQJIBAABCAAyFiEEWjIv1avE09usz9GqKAeTb5hNxaYFAl9abc0UHGVoYWJrb3N0 QHJlZGhhdC5jb20ACgkQKAeTb5hNxaYU9Q/8CyK1w2SlItxBhos7zojqnZ9TP1Jt b1YCApQJ+bKSPAUDyefajQA0D9HeR9bFlreiOprQnmZWOqeOvnRIxNGvelJRqRRu KcIA5DIfVMJRkKJQEXairrGdnPmFLWSLEb7AmwxyAhp5G51PCP/3kbudi3T/vrNr OaccUejs5UgImPfO8Fm+0zqZPmblq/xmtU0p77FvDxGNFPPG8ddpu7eKksGD7FYd 5bTJTtUhONYG9EJMUD2TBxnJoy1pi6AYUu4+2T211RpBcxeiyNSSitI8fZTk6BGl 33VwQib9SXjGaE8VsSvHDHhLLec7sqqr2JH3rfvyKF6BOptKWzmSzFdbo2mrRkSy 8jfCImQgTBBMAHBWP+MFTeKuzfhikZx2DbBLzpppHMMvCca6Zc+oYgR2FbVwuPsw H2YL+8Wx4Ws6RXe147toNDRbv75vnS7F3fU800Pcur5VHJWTgSpT/tggzmVPWsdU GeUgceYlXyVk5/fC89ZhhtD9eurfBSzQR4eN7/nie2wD6PFMpZkOjHwLn40uWsyq xRO0F4uYghNU1N8z6NBhEYLTBtEcS1HFEisSLQrnTQH9W0I7mBx3MaZib/uK7NLC b2gT0hossTT8Z46Z8ynoZarwO5EquAMWEQtc9hfZGWacrQEpjVm2DMYMfu83krWb xhgl+mpKqVasAPk= =RjXc -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging QOM boilerplate cleanup Documentation build fix: * memory: Remove kernel-doc comment marker (Eduardo Habkost) QOM cleanups: * Rename QOM macros for consistency between TYPE_* and type checking constants (Eduardo Habkost) QOM new macros: * OBJECT_DECLARE_* and OBJECT_DEFINE_* macros (Daniel P. Berrangé) * DECLARE_*_CHECKER macros (Eduardo Habkost) Automated QOM boilerplate changes: * Automated changes to use DECLARE_*_CHECKER (Eduardo Habkost * Automated changes to use OBJECT_DECLARE* (Eduardo Habkost) # gpg: Signature made Thu 10 Sep 2020 19:17:49 BST # gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6 # gpg: issuer "ehabkost@redhat.com" # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full] # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-next-pull-request: (33 commits) virtio-vga: Use typedef name for instance_size vhost-user-vga: Use typedef name for instance_size xilinx_axienet: Use typedef name for instance_size lpc_ich9: Use typedef name for instance_size omap_intc: Use typedef name for instance_size xilinx_axidma: Use typedef name for instance_size tusb6010: Rename TUSB to TUSB6010 pc87312: Rename TYPE_PC87312_SUPERIO to TYPE_PC87312 vfio: Rename PCI_VFIO to VFIO_PCI usb: Rename USB_SERIAL_DEV to USB_SERIAL sabre: Rename SABRE_DEVICE to SABRE rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER esp: Rename ESP_STATE to ESP ahci: Rename ICH_AHCI to ICH9_AHCI vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID vfio: Rename VFIO_AP_DEVICE_TYPE to TYPE_VFIO_AP_DEVICE dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV ap-device: Rename AP_DEVICE_TYPE to TYPE_AP_DEVICE gpex: Fix type checking function name ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
f4ef8c9cc1
827 changed files with 7851 additions and 4406 deletions
|
|
@ -16,6 +16,7 @@
|
|||
#include "migration/vmstate.h"
|
||||
#include "qemu/bcd.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
/* Size of NVRAM including both the user-accessible area and the
|
||||
* secondary register area.
|
||||
|
|
@ -29,9 +30,11 @@
|
|||
#define CTRL_OSF 0x20
|
||||
|
||||
#define TYPE_DS1338 "ds1338"
|
||||
#define DS1338(obj) OBJECT_CHECK(DS1338State, (obj), TYPE_DS1338)
|
||||
typedef struct DS1338State DS1338State;
|
||||
DECLARE_INSTANCE_CHECKER(DS1338State, DS1338,
|
||||
TYPE_DS1338)
|
||||
|
||||
typedef struct DS1338State {
|
||||
struct DS1338State {
|
||||
I2CSlave parent_obj;
|
||||
|
||||
int64_t offset;
|
||||
|
|
@ -39,7 +42,7 @@ typedef struct DS1338State {
|
|||
uint8_t nvram[NVRAM_SIZE];
|
||||
int32_t ptr;
|
||||
bool addr_byte;
|
||||
} DS1338State;
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_ds1338 = {
|
||||
.name = "ds1338",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
#include "hw/irq.h"
|
||||
|
||||
#include "hw/arm/exynos4210.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define DEBUG_RTC 0
|
||||
|
||||
|
|
@ -84,10 +85,11 @@
|
|||
#define RTC_BASE_FREQ 32768
|
||||
|
||||
#define TYPE_EXYNOS4210_RTC "exynos4210.rtc"
|
||||
#define EXYNOS4210_RTC(obj) \
|
||||
OBJECT_CHECK(Exynos4210RTCState, (obj), TYPE_EXYNOS4210_RTC)
|
||||
typedef struct Exynos4210RTCState Exynos4210RTCState;
|
||||
DECLARE_INSTANCE_CHECKER(Exynos4210RTCState, EXYNOS4210_RTC,
|
||||
TYPE_EXYNOS4210_RTC)
|
||||
|
||||
typedef struct Exynos4210RTCState {
|
||||
struct Exynos4210RTCState {
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
MemoryRegion iomem;
|
||||
|
|
@ -113,7 +115,7 @@ typedef struct Exynos4210RTCState {
|
|||
qemu_irq alm_irq; /* alarm irq */
|
||||
|
||||
struct tm current_tm; /* current time */
|
||||
} Exynos4210RTCState;
|
||||
};
|
||||
|
||||
#define TICCKSEL(value) ((value & (0x0F << 4)) >> 4)
|
||||
|
||||
|
|
|
|||
|
|
@ -14,14 +14,17 @@
|
|||
#include "qemu/timer.h"
|
||||
#include "qemu/bcd.h"
|
||||
#include "hw/i2c/i2c.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_M41T80 "m41t80"
|
||||
#define M41T80(obj) OBJECT_CHECK(M41t80State, (obj), TYPE_M41T80)
|
||||
typedef struct M41t80State M41t80State;
|
||||
DECLARE_INSTANCE_CHECKER(M41t80State, M41T80,
|
||||
TYPE_M41T80)
|
||||
|
||||
typedef struct M41t80State {
|
||||
struct M41t80State {
|
||||
I2CSlave parent_obj;
|
||||
int8_t addr;
|
||||
} M41t80State;
|
||||
};
|
||||
|
||||
static void m41t80_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -30,26 +30,25 @@
|
|||
#include "m48t59-internal.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_M48TXX_ISA "isa-m48txx"
|
||||
#define M48TXX_ISA_GET_CLASS(obj) \
|
||||
OBJECT_GET_CLASS(M48txxISADeviceClass, (obj), TYPE_M48TXX_ISA)
|
||||
#define M48TXX_ISA_CLASS(klass) \
|
||||
OBJECT_CLASS_CHECK(M48txxISADeviceClass, (klass), TYPE_M48TXX_ISA)
|
||||
#define M48TXX_ISA(obj) \
|
||||
OBJECT_CHECK(M48txxISAState, (obj), TYPE_M48TXX_ISA)
|
||||
typedef struct M48txxISADeviceClass M48txxISADeviceClass;
|
||||
typedef struct M48txxISAState M48txxISAState;
|
||||
DECLARE_OBJ_CHECKERS(M48txxISAState, M48txxISADeviceClass,
|
||||
M48TXX_ISA, TYPE_M48TXX_ISA)
|
||||
|
||||
typedef struct M48txxISAState {
|
||||
struct M48txxISAState {
|
||||
ISADevice parent_obj;
|
||||
M48t59State state;
|
||||
uint32_t io_base;
|
||||
MemoryRegion io;
|
||||
} M48txxISAState;
|
||||
};
|
||||
|
||||
typedef struct M48txxISADeviceClass {
|
||||
struct M48txxISADeviceClass {
|
||||
ISADeviceClass parent_class;
|
||||
M48txxInfo info;
|
||||
} M48txxISADeviceClass;
|
||||
};
|
||||
|
||||
static M48txxInfo m48txx_isa_info[] = {
|
||||
{
|
||||
|
|
|
|||
|
|
@ -40,14 +40,13 @@
|
|||
|
||||
#include "m48t59-internal.h"
|
||||
#include "migration/vmstate.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_M48TXX_SYS_BUS "sysbus-m48txx"
|
||||
#define M48TXX_SYS_BUS_GET_CLASS(obj) \
|
||||
OBJECT_GET_CLASS(M48txxSysBusDeviceClass, (obj), TYPE_M48TXX_SYS_BUS)
|
||||
#define M48TXX_SYS_BUS_CLASS(klass) \
|
||||
OBJECT_CLASS_CHECK(M48txxSysBusDeviceClass, (klass), TYPE_M48TXX_SYS_BUS)
|
||||
#define M48TXX_SYS_BUS(obj) \
|
||||
OBJECT_CHECK(M48txxSysBusState, (obj), TYPE_M48TXX_SYS_BUS)
|
||||
typedef struct M48txxSysBusDeviceClass M48txxSysBusDeviceClass;
|
||||
typedef struct M48txxSysBusState M48txxSysBusState;
|
||||
DECLARE_OBJ_CHECKERS(M48txxSysBusState, M48txxSysBusDeviceClass,
|
||||
M48TXX_SYS_BUS, TYPE_M48TXX_SYS_BUS)
|
||||
|
||||
/*
|
||||
* Chipset docs:
|
||||
|
|
@ -56,16 +55,16 @@
|
|||
* http://www.st.com/stonline/products/literature/od/7001/m48t59y.pdf
|
||||
*/
|
||||
|
||||
typedef struct M48txxSysBusState {
|
||||
struct M48txxSysBusState {
|
||||
SysBusDevice parent_obj;
|
||||
M48t59State state;
|
||||
MemoryRegion io;
|
||||
} M48txxSysBusState;
|
||||
};
|
||||
|
||||
typedef struct M48txxSysBusDeviceClass {
|
||||
struct M48txxSysBusDeviceClass {
|
||||
SysBusDeviceClass parent_class;
|
||||
M48txxInfo info;
|
||||
} M48txxSysBusDeviceClass;
|
||||
};
|
||||
|
||||
static M48txxInfo m48txx_sysbus_info[] = {
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,16 +16,19 @@
|
|||
#include "qemu/timer.h"
|
||||
#include "hw/rtc/sun4v-rtc.h"
|
||||
#include "trace.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
|
||||
#define TYPE_SUN4V_RTC "sun4v_rtc"
|
||||
#define SUN4V_RTC(obj) OBJECT_CHECK(Sun4vRtc, (obj), TYPE_SUN4V_RTC)
|
||||
typedef struct Sun4vRtc Sun4vRtc;
|
||||
DECLARE_INSTANCE_CHECKER(Sun4vRtc, SUN4V_RTC,
|
||||
TYPE_SUN4V_RTC)
|
||||
|
||||
typedef struct Sun4vRtc {
|
||||
struct Sun4vRtc {
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
MemoryRegion iomem;
|
||||
} Sun4vRtc;
|
||||
};
|
||||
|
||||
static uint64_t sun4v_rtc_read(void *opaque, hwaddr addr,
|
||||
unsigned size)
|
||||
|
|
|
|||
|
|
@ -29,13 +29,16 @@
|
|||
#include "sysemu/sysemu.h"
|
||||
#include "qemu/bcd.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define VERBOSE 1
|
||||
|
||||
#define TYPE_TWL92230 "twl92230"
|
||||
#define TWL92230(obj) OBJECT_CHECK(MenelausState, (obj), TYPE_TWL92230)
|
||||
typedef struct MenelausState MenelausState;
|
||||
DECLARE_INSTANCE_CHECKER(MenelausState, TWL92230,
|
||||
TYPE_TWL92230)
|
||||
|
||||
typedef struct MenelausState {
|
||||
struct MenelausState {
|
||||
I2CSlave parent_obj;
|
||||
|
||||
int firstbyte;
|
||||
|
|
@ -71,7 +74,7 @@ typedef struct MenelausState {
|
|||
uint16_t rtc_next_vmstate;
|
||||
qemu_irq out[4];
|
||||
uint8_t pwrbtn_state;
|
||||
} MenelausState;
|
||||
};
|
||||
|
||||
static inline void menelaus_update(MenelausState *s)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue