From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Tue, 13 Feb 2024 05:26:06 +0000 (+0100)
Subject: hw/ide/ahci: Remove SysbusAHCIState::num_ports field
X-Git-Tag: v9.0.0-rc0~59^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0bccc6a9af57d6adb73041e94d7cd5b1554fc0b;p=thirdparty%2Fqemu.git

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

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 33f7e83687c..041cc87c119 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 604d3a09941..c0b10c2bb4f 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"