[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 10/16] hw/isa: Use the QOM DEVICE() macro to access
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PULL 10/16] hw/isa: Use the QOM DEVICE() macro to access DeviceState.qdev |
Date: |
Thu, 6 Jun 2019 13:06:19 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
Rather than looking inside the definition of a DeviceState with
"s->qdev", use the QOM prefered style: "DEVICE(s)".
This patch was generated using the following Coccinelle script:
// Use DEVICE() macros to access DeviceState.qdev
@use_device_macro_to_access_qdev@
expression obj;
identifier dev;
@@
-&obj->dev.qdev
+DEVICE(obj)
Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
hw/isa/lpc_ich9.c | 2 +-
hw/isa/vt82c686.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 031ee9cd933d..35d17246e940 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -412,7 +412,7 @@ void ich9_lpc_pm_init(PCIDevice *lpc_pci, bool smm_enabled)
true);
}
- ich9_lpc_reset(&lpc->d.qdev);
+ ich9_lpc_reset(DEVICE(lpc));
}
/* APM */
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 85d0532dd5b5..d46754f61cfb 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -369,7 +369,7 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error
**errp)
pci_conf[0x90] = s->smb_io_base | 1;
pci_conf[0x91] = s->smb_io_base >> 8;
pci_conf[0xd2] = 0x90;
- pm_smbus_init(&s->dev.qdev, &s->smb, false);
+ pm_smbus_init(DEVICE(s), &s->smb, false);
memory_region_add_subregion(get_system_io(), s->smb_io_base, &s->smb.io);
apm_init(dev, &s->apm, NULL, s);
--
2.21.0
- [Qemu-trivial] [PULL 03/16] vhost: fix incorrect print type, (continued)
- [Qemu-trivial] [PULL 03/16] vhost: fix incorrect print type, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 11/16] hw/usb-storage: Use the QOM DEVICE() macro to access DeviceState.qdev, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 08/16] hw/pci-bridge: Use the QOM BUS() macro to access BusState.qbus, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 04/16] util: Adjust qemu_guest_getrandom_nofail for Coverity, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 05/16] test: Fix make target check-report.tap, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 09/16] hw/s390x/event-facility: Use the QOM BUS() macro to access BusState.qbus, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 16/16] hw/watchdog/wdt_i6300esb: Use DEVICE() macro to access DeviceState.qdev, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 13/16] hw/audio/ac97: Use the QOM DEVICE() macro to access DeviceState.qdev, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 12/16] hw/vfio/pci: Use the QOM DEVICE() macro to access DeviceState.qdev, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 10/16] hw/isa: Use the QOM DEVICE() macro to access DeviceState.qdev,
Laurent Vivier <=
- [Qemu-trivial] [PULL 15/16] hw/scsi: Use the QOM BUS() macro to access BusState.qbus, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 01/16] hw/rdma: Delete unused headers inclusion, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 14/16] hw/sd: Use the QOM BUS() macro to access BusState.qbus, Laurent Vivier, 2019/06/06
- [Qemu-trivial] [PULL 02/16] migration: fix a typo, Laurent Vivier, 2019/06/06
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/16] Trivial branch patches, Peter Maydell, 2019/06/06