[v1] hw/ide: QOM/QDev housekeeping

[PATCH 05/20] hw/ide/isa: Remove intermediate ISAIDEState::irq variable

Posted by Philippe Mathieu-Daudé 2 years, 11 months ago

The intermediate ISAIDEState::irq variable just add noise, remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/ide/isa.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 5c3e83a0fc..ad47e0899e 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -45,7 +45,6 @@ struct ISAIDEState {
     uint32_t  iobase;
     uint32_t  iobase2;
     uint32_t  irqnum;
-    qemu_irq  irq;
 };
 
 static void isa_ide_reset(DeviceState *d)
@@ -73,8 +72,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp)
 
     ide_bus_init(&s->bus, sizeof(s->bus), dev, 0, 2);
     ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2);
-    s->irq = isa_get_irq(isadev, s->irqnum);
-    ide_init2(&s->bus, s->irq);
+    ide_init2(&s->bus, isa_get_irq(isadev, s->irqnum));
     vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s);
     ide_register_restart_cb(&s->bus);
 }
-- 
2.38.1

Re: [PATCH 05/20] hw/ide/isa: Remove intermediate ISAIDEState::irq variable

Posted by Richard Henderson 2 years, 11 months ago

On 2/15/23 01:26, Philippe Mathieu-Daudé wrote:
> The intermediate ISAIDEState::irq variable just add noise, remove it.
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
>   hw/ide/isa.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH 05/20] hw/ide/isa: Remove intermediate ISAIDEState::irq variable

Posted by Bernhard Beschow 2 years, 11 months ago


Am 15. Februar 2023 11:26:57 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>The intermediate ISAIDEState::irq variable just add noise, remove it.
>
>Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>---
> hw/ide/isa.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/hw/ide/isa.c b/hw/ide/isa.c
>index 5c3e83a0fc..ad47e0899e 100644
>--- a/hw/ide/isa.c
>+++ b/hw/ide/isa.c
>@@ -45,7 +45,6 @@ struct ISAIDEState {
>     uint32_t  iobase;
>     uint32_t  iobase2;
>     uint32_t  irqnum;
>-    qemu_irq  irq;
> };
> 
> static void isa_ide_reset(DeviceState *d)
>@@ -73,8 +72,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp)
> 
>     ide_bus_init(&s->bus, sizeof(s->bus), dev, 0, 2);
>     ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2);
>-    s->irq = isa_get_irq(isadev, s->irqnum);
>-    ide_init2(&s->bus, s->irq);
>+    ide_init2(&s->bus, isa_get_irq(isadev, s->irqnum));
>     vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s);
>     ide_register_restart_cb(&s->bus);
> }

Reviewed-by: Bernhard Beschow <shentey@gmail.com>