Am 15. Februar 2023 11:26:57 UTC schrieb "Philippe Mathieu-Daudé" <phi...@linaro.org>: >The intermediate ISAIDEState::irq variable just add noise, remove it. > >Signed-off-by: Philippe Mathieu-Daudé <phi...@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 <shen...@gmail.com>
- [PATCH 02/20] hw/ide/mmio: Use CamelCase for MMIO_... Philippe Mathieu-Daudé
- Re: [PATCH 02/20] hw/ide/mmio: Use CamelCase ... Alex Bennée
- [PATCH 03/20] hw/ide/mmio: Extract TYPE_MMIO_IDE d... Philippe Mathieu-Daudé
- Re: [PATCH 03/20] hw/ide/mmio: Extract TYPE_M... Alex Bennée
- Re: [PATCH 03/20] hw/ide/mmio: Extract TYPE_M... Richard Henderson
- [PATCH 04/20] hw/ide/isa: Extract TYPE_ISA_IDE dec... Philippe Mathieu-Daudé
- Re: [PATCH 04/20] hw/ide/isa: Extract TYPE_IS... Richard Henderson
- [PATCH 01/20] MAINTAINERS: Mark IDE and Floppy as ... Philippe Mathieu-Daudé
- Re: [PATCH 01/20] MAINTAINERS: Mark IDE and F... Alex Bennée
- [PATCH 05/20] hw/ide/isa: Remove intermediate ISAI... Philippe Mathieu-Daudé
- Re: [PATCH 05/20] hw/ide/isa: Remove intermed... Bernhard Beschow
- Re: [PATCH 05/20] hw/ide/isa: Remove intermed... Richard Henderson
- [PATCH 10/20] hw/ide: Rename ide_set_irq() -> i... Philippe Mathieu-Daudé
- Re: [PATCH 10/20] hw/ide: Rename ide_set_irq(... Richard Henderson
- [PATCH 12/20] hw/ide: Rename ide_register_restart_... Philippe Mathieu-Daudé
- Re: [PATCH 12/20] hw/ide: Rename ide_register... Richard Henderson
- [PATCH 09/20] hw/ide: Un-inline ide_set_irq() Philippe Mathieu-Daudé
- Re: [PATCH 09/20] hw/ide: Un-inline ide_set_i... Richard Henderson
- [PATCH 18/20] hw/ide/piix: Remove unused includes Philippe Mathieu-Daudé
- Re: [PATCH 18/20] hw/ide/piix: Remove unused ... Richard Henderson
- [PATCH 13/20] hw/ide: Rename ide_exec_cmd() -> ... Philippe Mathieu-Daudé