[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 54/56] hw/ide/ahci: Remove SysbusAHCIState::num_ports field
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 54/56] hw/ide/ahci: Remove SysbusAHCIState::num_ports field |
Date: |
Thu, 15 Feb 2024 18:57:48 +0100 |
No need to duplicate AHCIState::ports, directly access it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240213081201.78951-9-philmd@linaro.org>
---
include/hw/ide/ahci.h | 1 -
hw/ide/ahci.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
index 604d3a0994..c0b10c2bb4 100644
--- a/include/hw/ide/ahci.h
+++ b/include/hw/ide/ahci.h
@@ -63,7 +63,6 @@ struct SysbusAHCIState {
/*< public >*/
AHCIState ahci;
- uint32_t num_ports;
};
#define TYPE_ALLWINNER_AHCI "allwinner-ahci"
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 33f7e83687..041cc87c11 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1862,12 +1862,11 @@ static void sysbus_ahci_realize(DeviceState *dev, Error
**errp)
{
SysbusAHCIState *s = SYSBUS_AHCI(dev);
- s->ahci.ports = s->num_ports;
ahci_realize(&s->ahci, dev, &address_space_memory);
}
static Property sysbus_ahci_properties[] = {
- DEFINE_PROP_UINT32("num-ports", SysbusAHCIState, num_ports, 1),
+ DEFINE_PROP_UINT32("num-ports", SysbusAHCIState, ahci.ports, 1),
DEFINE_PROP_END_OF_LIST(),
};
--
2.41.0
- [PULL 45/56] MAINTAINERS: Add myself as reviewer for TCG Plugins, (continued)
- [PULL 45/56] MAINTAINERS: Add myself as reviewer for TCG Plugins, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 44/56] MAINTAINERS: replace Fabien by myself as Leon3 maintainer, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 47/56] hw/i386/q35: Use DEVICE() cast macro with PCIDevice object, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 48/56] hw/ide/ahci: Expose AHCIPCIState structure, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 49/56] hw/ide/ahci: Rename AHCI PCI function as 'pdev', Philippe Mathieu-Daudé, 2024/02/15
- [PULL 50/56] hw/ide/ahci: Inline ahci_get_num_ports(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 46/56] hw/i386/q35: Simplify pc_q35_init() since PCI is always enabled, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 52/56] hw/ide/ahci: Convert AHCIState::ports to unsigned, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 51/56] hw/ide/ahci: Pass AHCI context to ahci_ide_create_devs(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 53/56] hw/ide/ahci: Do not pass 'ports' argument to ahci_realize(), Philippe Mathieu-Daudé, 2024/02/15
- [PULL 54/56] hw/ide/ahci: Remove SysbusAHCIState::num_ports field,
Philippe Mathieu-Daudé <=
- [PULL 56/56] hw/ide/ich9: Use AHCIPCIState typedef, Philippe Mathieu-Daudé, 2024/02/15
- [PULL 55/56] hw/ide/ahci: Move SysBus definitions to 'ahci-sysbus.h', Philippe Mathieu-Daudé, 2024/02/15
- Re: [PULL 00/56] Misc HW patches for 2024-02-15, Peter Maydell, 2024/02/16