ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/block/fdc-sysbus: Move iomem from FDCtrl to FDCtrlSysBus 

FDCtrl::iomem isn't used inside FDCtrl context but only inside FDCtrlSysBus
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-3-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:02 +01:00 committed by Michael S. Tsirkin
parent 271c5bb378
commit ff453ce281
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@
#ifndef HW_BLOCK_FDC_INTERNAL_H #ifndef HW_BLOCK_FDC_INTERNAL_H
#define HW_BLOCK_FDC_INTERNAL_H #define HW_BLOCK_FDC_INTERNAL_H
#include "exec/memory.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"
@ -91,7 +90,6 @@ typedef struct FDrive {
} FDrive; } FDrive;
struct FDCtrl { struct FDCtrl {
MemoryRegion iomem;
qemu_irq irq; qemu_irq irq;
/* Controller state */ /* Controller state */
QEMUTimer *result_timer; QEMUTimer *result_timer;

6
hw/block/fdc-sysbus.c
View File

@ -26,6 +26,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qom/object.h" #include "qom/object.h"
#include "exec/memory.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/block/fdc.h" #include "hw/block/fdc.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
@ -52,6 +53,7 @@ struct FDCtrlSysBus {
/*< public >*/ /*< public >*/
struct FDCtrl state; struct FDCtrl state;
MemoryRegion iomem;
}; };
static uint64_t fdctrl_read_mem(void *opaque, hwaddr reg, unsigned ize) static uint64_t fdctrl_read_mem(void *opaque, hwaddr reg, unsigned ize)
@ -146,11 +148,11 @@ static void sysbus_fdc_common_instance_init(Object *obj)
qdev_set_legacy_instance_id(dev, 0 /* io */, 2); /* FIXME */ qdev_set_legacy_instance_id(dev, 0 /* io */, 2); /* FIXME */
memory_region_init_io(&fdctrl->iomem, obj, memory_region_init_io(&sys->iomem, obj,
sbdc->use_strict_io ? &fdctrl_mem_strict_ops sbdc->use_strict_io ? &fdctrl_mem_strict_ops
: &fdctrl_mem_ops, : &fdctrl_mem_ops,
fdctrl, "fdc", 0x08); fdctrl, "fdc", 0x08);
sysbus_init_mmio(sbd, &fdctrl->iomem); sysbus_init_mmio(sbd, &sys->iomem);
sysbus_init_irq(sbd, &fdctrl->irq); sysbus_init_irq(sbd, &fdctrl->irq);
qdev_init_gpio_in(dev, fdctrl_handle_tc, 1); qdev_init_gpio_in(dev, fdctrl_handle_tc, 1);