mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/block/fdc-isa: Move portio_list from FDCtrl to FDCtrlISABus

Browse Source 
FDCtrl::portio_list isn't used inside FDCtrl context but only inside
FDCtrlISABus context, so move it there.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20240114123911.4877-2-shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Bernhard Beschow 2024-01-14 13:39:01 +01:00 committed by Michael S. Tsirkin
parent f70c1c068d
commit 271c5bb378
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/block/fdc-internal.h
View File

@ -26,7 +26,6 @@
#define HW_BLOCK_FDC_INTERNAL_H #define HW_BLOCK_FDC_INTERNAL_H
#include "exec/memory.h" #include "exec/memory.h"
#include "exec/ioport.h"
#include "hw/block/block.h" #include "hw/block/block.h"
#include "hw/block/fdc.h" #include "hw/block/fdc.h"
#include "qapi/qapi-types-block.h" #include "qapi/qapi-types-block.h"
@ -140,7 +139,6 @@ struct FDCtrl {
/* Timers state */ /* Timers state */
uint8_t timer0; uint8_t timer0;
uint8_t timer1; uint8_t timer1;
PortioList portio_list;
}; };
extern const FDFormat fd_formats[]; extern const FDFormat fd_formats[];

4
hw/block/fdc-isa.c
View File

@ -42,6 +42,7 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "exec/ioport.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qemu/module.h" #include "qemu/module.h"
@ -60,6 +61,7 @@ struct FDCtrlISABus {
uint32_t irq; uint32_t irq;
uint32_t dma; uint32_t dma;
struct FDCtrl state; struct FDCtrl state;
PortioList portio_list;
int32_t bootindexA; int32_t bootindexA;
int32_t bootindexB; int32_t bootindexB;
}; };
@ -91,7 +93,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp)
FDCtrl *fdctrl = &isa->state; FDCtrl *fdctrl = &isa->state;
Error *err = NULL; Error *err = NULL;
isa_register_portio_list(isadev, &fdctrl->portio_list, isa_register_portio_list(isadev, &isa->portio_list,
isa->iobase, fdc_portio_list, fdctrl, isa->iobase, fdc_portio_list, fdctrl,
"fdc"); "fdc");