@samitouri / QOSamiQemu / commits / 3e39f23a6d

hw/net/ftgmac100: convert to use Resettable interface

Replace the legacy reset callback registered via device_class_set_legacy_reset() with the Resettable interface. Signed-off-by: Kane Chen <kane_chen@aspeedtech.com> Reviewed-by: Jamin Lin <jamin_lin@aspeedtech.com> Link: https://lore.kernel.org/qemu-devel/20260525044129.3133916-20-kane_chen@aspeedtech.com Signed-off-by: Cédric Le Goater <clg@redhat.com>

Kane Chen committed May 25, 2026 at 04:41 UTC 3e39f23a6d38f1c6d11db34766cc28fe25547198
1 file changed +8 -6
hw/net/ftgmac100.c
+8 -6
@@ -723,9 +723,9 @@ static void ftgmac100_do_reset(FTGMAC100State *s, bool sw_reset)
723 phy_reset(s);
724 }
725
726 -static void ftgmac100_reset(DeviceState *d)
726 +static void ftgmac100_reset_hold(Object *obj, ResetType type)
727 {
728 - ftgmac100_do_reset(FTGMAC100(d), false);
728 + ftgmac100_do_reset(FTGMAC100(obj), false);
729 }
730
731 static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size)
@@ -1269,9 +1269,10 @@ static const Property ftgmac100_properties[] = {
1269 static void ftgmac100_class_init(ObjectClass *klass, const void *data)
1270 {
1271 DeviceClass *dc = DEVICE_CLASS(klass);
1272 + ResettableClass *rc = RESETTABLE_CLASS(klass);
1273
1274 dc->vmsd = &vmstate_ftgmac100;
1274 - device_class_set_legacy_reset(dc, ftgmac100_reset);
1275 + rc->phases.hold = ftgmac100_reset_hold;
1276 device_class_set_props(dc, ftgmac100_properties);
1277 set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
1278 dc->realize = ftgmac100_realize;
@@ -1387,9 +1388,9 @@ static const MemoryRegionOps aspeed_mii_ops = {
1388 .endianness = DEVICE_LITTLE_ENDIAN,
1389 };
1390
1390 -static void aspeed_mii_reset(DeviceState *dev)
1391 +static void aspeed_mii_reset_hold(Object *obj, ResetType type)
1392 {
1392 - AspeedMiiState *s = ASPEED_MII(dev);
1393 + AspeedMiiState *s = ASPEED_MII(obj);
1394
1395 s->phycr = 0;
1396 s->phydata = 0;
@@ -1428,9 +1429,10 @@ static const Property aspeed_mii_properties[] = {
1429 static void aspeed_mii_class_init(ObjectClass *klass, const void *data)
1430 {
1431 DeviceClass *dc = DEVICE_CLASS(klass);
1432 + ResettableClass *rc = RESETTABLE_CLASS(klass);
1433
1434 dc->vmsd = &vmstate_aspeed_mii;
1433 - device_class_set_legacy_reset(dc, aspeed_mii_reset);
1435 + rc->phases.hold = aspeed_mii_reset_hold;
1436 dc->realize = aspeed_mii_realize;
1437 dc->desc = "Aspeed MII controller";
1438 device_class_set_props(dc, aspeed_mii_properties);