aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2024-02-13 06:26:06 +0100
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2024-02-15 16:58:46 +0100
commitb0bccc6a9af57d6adb73041e94d7cd5b1554fc0b (patch)
treeb12406bc4d67ffe3c46f00fbe7f68c6b229ba7c0
parentbe02150167044e34d3c5ec5d9e84e8470e9a8166 (diff)
downloadqemu-b0bccc6a9af57d6adb73041e94d7cd5b1554fc0b.zip
qemu-b0bccc6a9af57d6adb73041e94d7cd5b1554fc0b.tar.gz
qemu-b0bccc6a9af57d6adb73041e94d7cd5b1554fc0b.tar.bz2
hw/ide/ahci: Remove SysbusAHCIState::num_ports field
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>
-rw-r--r--hw/ide/ahci.c3
-rw-r--r--include/hw/ide/ahci.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 33f7e83..041cc87 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(),
};
diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
index 604d3a0..c0b10c2 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"