| Message ID | 20210115201206.17347-10-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hw/m68k/next-cube: refactor to fix Coverity issue | expand |
Am Fri, 15 Jan 2021 20:12:04 +0000 schrieb Peter Maydell <peter.maydell@linaro.org>: > The fields scsi_irq, scsi_dma, scsi_reset and fd_irq in > NeXTState are all unused, except in commented out > "this should do something like this" code. Remove the > unused fields. As and when the functionality that might > use them is added, we can put in the correct kind of > wiring (which might or might not need to be a qemu_irq, > but which in any case will need to be in the NeXTPC > device, not in NeXTState). > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/m68k/next-cube.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c > index 3c83b874c56..dd0a2a5aea0 100644 > --- a/hw/m68k/next-cube.c > +++ b/hw/m68k/next-cube.c > @@ -74,10 +74,6 @@ struct NeXTState { > MachineState parent; > > next_dma dma[10]; > - qemu_irq *scsi_irq; > - qemu_irq scsi_dma; > - qemu_irq scsi_reset; > - qemu_irq *fd_irq; > }; > > #define TYPE_NEXT_PC "next-pc" Yeah, I've never managed to get the SCSI controller running. Old patch is available here: https://gitlab.com/huth/qemu/-/commit/14e9ff46f8261203a15f13d8c8bfb7faf6471d44 But yes, we can add the variables back in case somebody gets this working again, so: Reviewed-by: Thomas Huth <huth@tuxfamily.org>
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 3c83b874c56..dd0a2a5aea0 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -74,10 +74,6 @@ struct NeXTState { MachineState parent; next_dma dma[10]; - qemu_irq *scsi_irq; - qemu_irq scsi_dma; - qemu_irq scsi_reset; - qemu_irq *fd_irq; }; #define TYPE_NEXT_PC "next-pc"
The fields scsi_irq, scsi_dma, scsi_reset and fd_irq in NeXTState are all unused, except in commented out "this should do something like this" code. Remove the unused fields. As and when the functionality that might use them is added, we can put in the correct kind of wiring (which might or might not need to be a qemu_irq, but which in any case will need to be in the NeXTPC device, not in NeXTState). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/m68k/next-cube.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.20.1