mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 17:53:56 -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
18
hw/vfio/ap.c
18
hw/vfio/ap.c
|
|
@ -28,16 +28,18 @@
|
|||
#include "hw/qdev-properties.h"
|
||||
#include "hw/s390x/ap-bridge.h"
|
||||
#include "exec/address-spaces.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define VFIO_AP_DEVICE_TYPE "vfio-ap"
|
||||
#define TYPE_VFIO_AP_DEVICE "vfio-ap"
|
||||
|
||||
typedef struct VFIOAPDevice {
|
||||
struct VFIOAPDevice {
|
||||
APDevice apdev;
|
||||
VFIODevice vdev;
|
||||
} VFIOAPDevice;
|
||||
};
|
||||
typedef struct VFIOAPDevice VFIOAPDevice;
|
||||
|
||||
#define VFIO_AP_DEVICE(obj) \
|
||||
OBJECT_CHECK(VFIOAPDevice, (obj), VFIO_AP_DEVICE_TYPE)
|
||||
DECLARE_INSTANCE_CHECKER(VFIOAPDevice, VFIO_AP_DEVICE,
|
||||
TYPE_VFIO_AP_DEVICE)
|
||||
|
||||
static void vfio_ap_compute_needs_reset(VFIODevice *vdev)
|
||||
{
|
||||
|
|
@ -70,7 +72,7 @@ static VFIOGroup *vfio_ap_get_group(VFIOAPDevice *vapdev, Error **errp)
|
|||
|
||||
if (!group_path) {
|
||||
error_setg(errp, "%s: no iommu_group found for %s: %s",
|
||||
VFIO_AP_DEVICE_TYPE, vapdev->vdev.sysfsdev, gerror->message);
|
||||
TYPE_VFIO_AP_DEVICE, vapdev->vdev.sysfsdev, gerror->message);
|
||||
g_error_free(gerror);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -174,8 +176,8 @@ static void vfio_ap_class_init(ObjectClass *klass, void *data)
|
|||
}
|
||||
|
||||
static const TypeInfo vfio_ap_info = {
|
||||
.name = VFIO_AP_DEVICE_TYPE,
|
||||
.parent = AP_DEVICE_TYPE,
|
||||
.name = TYPE_VFIO_AP_DEVICE,
|
||||
.parent = TYPE_AP_DEVICE,
|
||||
.instance_size = sizeof(VFIOAPDevice),
|
||||
.class_init = vfio_ap_class_init,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route)
|
|||
|
||||
static void vfio_intx_routing_notifier(PCIDevice *pdev)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(pdev);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(pdev);
|
||||
PCIINTxRoute route;
|
||||
|
||||
if (vdev->interrupt != VFIO_INT_INTx) {
|
||||
|
|
@ -456,7 +456,7 @@ static void vfio_update_kvm_msi_virq(VFIOMSIVector *vector, MSIMessage msg,
|
|||
static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,
|
||||
MSIMessage *msg, IOHandler *handler)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(pdev);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(pdev);
|
||||
VFIOMSIVector *vector;
|
||||
int ret;
|
||||
|
||||
|
|
@ -541,7 +541,7 @@ static int vfio_msix_vector_use(PCIDevice *pdev,
|
|||
|
||||
static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(pdev);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(pdev);
|
||||
VFIOMSIVector *vector = &vdev->msi_vectors[nr];
|
||||
|
||||
trace_vfio_msix_vector_release(vdev->vbasedev.name, nr);
|
||||
|
|
@ -1048,7 +1048,7 @@ static const MemoryRegionOps vfio_vga_ops = {
|
|||
*/
|
||||
static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(pdev);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(pdev);
|
||||
VFIORegion *region = &vdev->bars[bar].region;
|
||||
MemoryRegion *mmap_mr, *region_mr, *base_mr;
|
||||
PCIIORegion *r;
|
||||
|
|
@ -1094,7 +1094,7 @@ static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar)
|
|||
*/
|
||||
uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(pdev);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(pdev);
|
||||
uint32_t emu_bits = 0, emu_val = 0, phys_val = 0, val;
|
||||
|
||||
memcpy(&emu_bits, vdev->emulated_config_bits + addr, len);
|
||||
|
|
@ -1127,7 +1127,7 @@ uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len)
|
|||
void vfio_pci_write_config(PCIDevice *pdev,
|
||||
uint32_t addr, uint32_t val, int len)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(pdev);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(pdev);
|
||||
uint32_t val_le = cpu_to_le32(val);
|
||||
|
||||
trace_vfio_pci_write_config(vdev->vbasedev.name, addr, val, len);
|
||||
|
|
@ -2701,7 +2701,7 @@ static void vfio_unregister_req_notifier(VFIOPCIDevice *vdev)
|
|||
|
||||
static void vfio_realize(PCIDevice *pdev, Error **errp)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(pdev);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(pdev);
|
||||
VFIODevice *vbasedev_iter;
|
||||
VFIOGroup *group;
|
||||
char *tmp, *subsys, group_path[PATH_MAX], *group_name;
|
||||
|
|
@ -3033,7 +3033,7 @@ error:
|
|||
|
||||
static void vfio_instance_finalize(Object *obj)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(obj);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(obj);
|
||||
VFIOGroup *group = vdev->vbasedev.group;
|
||||
|
||||
vfio_display_finalize(vdev);
|
||||
|
|
@ -3057,7 +3057,7 @@ static void vfio_instance_finalize(Object *obj)
|
|||
|
||||
static void vfio_exitfn(PCIDevice *pdev)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(pdev);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(pdev);
|
||||
|
||||
vfio_unregister_req_notifier(vdev);
|
||||
vfio_unregister_err_notifier(vdev);
|
||||
|
|
@ -3075,7 +3075,7 @@ static void vfio_exitfn(PCIDevice *pdev)
|
|||
|
||||
static void vfio_pci_reset(DeviceState *dev)
|
||||
{
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(dev);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(dev);
|
||||
|
||||
trace_vfio_pci_reset(vdev->vbasedev.name);
|
||||
|
||||
|
|
@ -3115,7 +3115,7 @@ post_reset:
|
|||
static void vfio_instance_init(Object *obj)
|
||||
{
|
||||
PCIDevice *pci_dev = PCI_DEVICE(obj);
|
||||
VFIOPCIDevice *vdev = PCI_VFIO(obj);
|
||||
VFIOPCIDevice *vdev = VFIO_PCI(obj);
|
||||
|
||||
device_add_bootindex_property(obj, &vdev->bootindex,
|
||||
"bootindex", NULL,
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
#include "qemu/event_notifier.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define PCI_ANY_ID (~0)
|
||||
|
||||
|
|
@ -114,9 +115,11 @@ typedef struct VFIOMSIXInfo {
|
|||
} VFIOMSIXInfo;
|
||||
|
||||
#define TYPE_VFIO_PCI "vfio-pci"
|
||||
#define PCI_VFIO(obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI)
|
||||
typedef struct VFIOPCIDevice VFIOPCIDevice;
|
||||
DECLARE_INSTANCE_CHECKER(VFIOPCIDevice, VFIO_PCI,
|
||||
TYPE_VFIO_PCI)
|
||||
|
||||
typedef struct VFIOPCIDevice {
|
||||
struct VFIOPCIDevice {
|
||||
PCIDevice pdev;
|
||||
VFIODevice vbasedev;
|
||||
VFIOINTx intx;
|
||||
|
|
@ -173,7 +176,7 @@ typedef struct VFIOPCIDevice {
|
|||
VFIODisplay *dpy;
|
||||
Error *migration_blocker;
|
||||
Notifier irqchip_change_notifier;
|
||||
} VFIOPCIDevice;
|
||||
};
|
||||
|
||||
/* Use uin32_t for vendor & device so PCI_ANY_ID expands and cannot match hw */
|
||||
static inline bool vfio_pci_is(VFIOPCIDevice *vdev, uint32_t vendor, uint32_t device)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue