[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/33] ahci: Rename ICH_AHCI to ICH9_AHCI
From: |
Eduardo Habkost |
Subject: |
[PULL 19/33] ahci: Rename ICH_AHCI to ICH9_AHCI |
Date: |
Thu, 10 Sep 2020 14:20:58 -0400 |
Make the type checking macro name consistent with the TYPE_*
constant.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200902224311.1321159-33-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/ide/ahci.h | 2 +-
hw/ide/ahci.c | 4 ++--
hw/ide/ich.c | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
index 4cf6813d80..da3cddcc65 100644
--- a/include/hw/ide/ahci.h
+++ b/include/hw/ide/ahci.h
@@ -54,7 +54,7 @@ typedef struct AHCIState {
typedef struct AHCIPCIState AHCIPCIState;
#define TYPE_ICH9_AHCI "ich9-ahci"
-DECLARE_INSTANCE_CHECKER(AHCIPCIState, ICH_AHCI,
+DECLARE_INSTANCE_CHECKER(AHCIPCIState, ICH9_AHCI,
TYPE_ICH9_AHCI)
int32_t ahci_get_num_ports(PCIDevice *dev);
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index b696c6291a..ee1d47ff75 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1819,7 +1819,7 @@ type_init(sysbus_ahci_register_types)
int32_t ahci_get_num_ports(PCIDevice *dev)
{
- AHCIPCIState *d = ICH_AHCI(dev);
+ AHCIPCIState *d = ICH9_AHCI(dev);
AHCIState *ahci = &d->ahci;
return ahci->ports;
@@ -1827,7 +1827,7 @@ int32_t ahci_get_num_ports(PCIDevice *dev)
void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd)
{
- AHCIPCIState *d = ICH_AHCI(dev);
+ AHCIPCIState *d = ICH9_AHCI(dev);
AHCIState *ahci = &d->ahci;
int i;
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index eff3188fff..51cd2f38b7 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -91,14 +91,14 @@ static const VMStateDescription vmstate_ich9_ahci = {
static void pci_ich9_reset(DeviceState *dev)
{
- AHCIPCIState *d = ICH_AHCI(dev);
+ AHCIPCIState *d = ICH9_AHCI(dev);
ahci_reset(&d->ahci);
}
static void pci_ich9_ahci_init(Object *obj)
{
- struct AHCIPCIState *d = ICH_AHCI(obj);
+ struct AHCIPCIState *d = ICH9_AHCI(obj);
ahci_init(&d->ahci, DEVICE(obj));
}
@@ -108,7 +108,7 @@ static void pci_ich9_ahci_realize(PCIDevice *dev, Error
**errp)
struct AHCIPCIState *d;
int sata_cap_offset;
uint8_t *sata_cap;
- d = ICH_AHCI(dev);
+ d = ICH9_AHCI(dev);
int ret;
ahci_realize(&d->ahci, DEVICE(dev), pci_get_address_space(dev), 6);
@@ -154,7 +154,7 @@ static void pci_ich9_ahci_realize(PCIDevice *dev, Error
**errp)
static void pci_ich9_uninit(PCIDevice *dev)
{
struct AHCIPCIState *d;
- d = ICH_AHCI(dev);
+ d = ICH9_AHCI(dev);
msi_uninit(dev);
ahci_uninit(&d->ahci);
--
2.26.2
- [PULL 04/33] qom: Allow class type name to be specified in OBJECT_DECLARE*, (continued)
- [PULL 04/33] qom: Allow class type name to be specified in OBJECT_DECLARE*, Eduardo Habkost, 2020/09/10
- [PULL 08/33] Delete duplicate QOM typedefs, Eduardo Habkost, 2020/09/10
- [PULL 12/33] Use OBJECT_DECLARE_TYPE where possible, Eduardo Habkost, 2020/09/10
- [PULL 11/33] Use DECLARE_*CHECKER* when possible (--force mode), Eduardo Habkost, 2020/09/10
- [PULL 14/33] gpex: Fix type checking function name, Eduardo Habkost, 2020/09/10
- [PULL 13/33] Use OBJECT_DECLARE_SIMPLE_TYPE when possible, Eduardo Habkost, 2020/09/10
- [PULL 07/33] codeconverter: script for automating QOM code cleanups, Eduardo Habkost, 2020/09/10
- [PULL 15/33] ap-device: Rename AP_DEVICE_TYPE to TYPE_AP_DEVICE, Eduardo Habkost, 2020/09/10
- [PULL 17/33] vfio: Rename VFIO_AP_DEVICE_TYPE to TYPE_VFIO_AP_DEVICE, Eduardo Habkost, 2020/09/10
- [PULL 16/33] dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV, Eduardo Habkost, 2020/09/10
- [PULL 19/33] ahci: Rename ICH_AHCI to ICH9_AHCI,
Eduardo Habkost <=
- [PULL 18/33] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID, Eduardo Habkost, 2020/09/10
- [PULL 27/33] tusb6010: Rename TUSB to TUSB6010, Eduardo Habkost, 2020/09/10
- [PULL 20/33] esp: Rename ESP_STATE to ESP, Eduardo Habkost, 2020/09/10
- [PULL 21/33] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER, Eduardo Habkost, 2020/09/10
- [PULL 10/33] Use DECLARE_*CHECKER* macros, Eduardo Habkost, 2020/09/10
- [PULL 23/33] sabre: Rename SABRE_DEVICE to SABRE, Eduardo Habkost, 2020/09/10
- [PULL 24/33] usb: Rename USB_SERIAL_DEV to USB_SERIAL, Eduardo Habkost, 2020/09/10
- [PULL 22/33] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC, Eduardo Habkost, 2020/09/10
- [PULL 28/33] xilinx_axidma: Use typedef name for instance_size, Eduardo Habkost, 2020/09/10
- [PULL 29/33] omap_intc: Use typedef name for instance_size, Eduardo Habkost, 2020/09/10