OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ahci: Rename ICH_AHCI to ICH9_AHCI 

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>
This commit is contained in:
Eduardo Habkost 2020-09-02 18:42:40 -04:00
parent 8d34cfd8c8
commit aa3c41fb00
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/ide/ahci.c
View File

@ -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;

8
hw/ide/ich.c
View File

@ -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
include/hw/ide/ahci.h
View File

@ -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);