Re: [PATCH v2 02/12] hw/block/fdc-sysbus: Free struct FDCtrl from MemoryRegion

[BALATON Zoltan]

On Mon, 18 Dec 2023, Bernhard Beschow wrote:

FDCtrl::iomem isn't used inside FDCtrl context but only inside FDCtrlSysBus
context, so more it there.


Same comments as for patch 1 otherwise

Reviewed-by: BALATON Zoltan 


Signed-off-by: Bernhard Beschow 
---
hw/block/fdc-internal.h | 2 --
hw/block/fdc-sysbus.c   | 6 --
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/block/fdc-internal.h b/hw/block/fdc-internal.h
index fef2bfbbf5..e219623dc7 100644
--- a/hw/block/fdc-internal.h
+++ b/hw/block/fdc-internal.h
@@ -25,7 +25,6 @@
#ifndef HW_BLOCK_FDC_INTERNAL_H
#define HW_BLOCK_FDC_INTERNAL_H

-#include "exec/memory.h"
#include "hw/block/block.h"
#include "hw/block/fdc.h"
#include "qapi/qapi-types-block.h"
@@ -91,7 +90,6 @@ typedef struct FDrive {
} FDrive;

struct FDCtrl {
-MemoryRegion iomem;
qemu_irq irq;
/* Controller state */
QEMUTimer *result_timer;
diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c
index 86ea51d003..e197b97262 100644
--- a/hw/block/fdc-sysbus.c
+++ b/hw/block/fdc-sysbus.c
@@ -26,6 +26,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qom/object.h"
+#include "exec/memory.h"
#include "hw/sysbus.h"
#include "hw/block/fdc.h"
#include "migration/vmstate.h"
@@ -52,6 +53,7 @@ struct FDCtrlSysBus {
/*< public >*/

struct FDCtrl state;
+MemoryRegion iomem;
};

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 */

-memory_region_init_io(>iomem, obj,
+memory_region_init_io(>iomem, obj,
  sbdc->use_strict_io ? _mem_strict_ops
  : _mem_ops,
  fdctrl, "fdc", 0x08);
-sysbus_init_mmio(sbd, >iomem);
+sysbus_init_mmio(sbd, >iomem);

sysbus_init_irq(sbd, >irq);
qdev_init_gpio_in(dev, fdctrl_handle_tc, 1);

[PATCH v2 02/12] hw/block/fdc-sysbus: Free struct FDCtrl from MemoryRegion

[Bernhard Beschow]

FDCtrl::iomem isn't used inside FDCtrl context but only inside FDCtrlSysBus
context, so more it there.

Signed-off-by: Bernhard Beschow 
---
 hw/block/fdc-internal.h | 2 --
 hw/block/fdc-sysbus.c   | 6 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/block/fdc-internal.h b/hw/block/fdc-internal.h
index fef2bfbbf5..e219623dc7 100644
--- a/hw/block/fdc-internal.h
+++ b/hw/block/fdc-internal.h
@@ -25,7 +25,6 @@
 #ifndef HW_BLOCK_FDC_INTERNAL_H
 #define HW_BLOCK_FDC_INTERNAL_H
 
-#include "exec/memory.h"
 #include "hw/block/block.h"
 #include "hw/block/fdc.h"
 #include "qapi/qapi-types-block.h"
@@ -91,7 +90,6 @@ typedef struct FDrive {
 } FDrive;
 
 struct FDCtrl {
-MemoryRegion iomem;
 qemu_irq irq;
 /* Controller state */
 QEMUTimer *result_timer;
diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c
index 86ea51d003..e197b97262 100644
--- a/hw/block/fdc-sysbus.c
+++ b/hw/block/fdc-sysbus.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qom/object.h"
+#include "exec/memory.h"
 #include "hw/sysbus.h"
 #include "hw/block/fdc.h"
 #include "migration/vmstate.h"
@@ -52,6 +53,7 @@ struct FDCtrlSysBus {
 /*< public >*/
 
 struct FDCtrl state;
+MemoryRegion iomem;
 };
 
 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 */
 
-memory_region_init_io(>iomem, obj,
+memory_region_init_io(>iomem, obj,
   sbdc->use_strict_io ? _mem_strict_ops
   : _mem_ops,
   fdctrl, "fdc", 0x08);
-sysbus_init_mmio(sbd, >iomem);
+sysbus_init_mmio(sbd, >iomem);
 
 sysbus_init_irq(sbd, >irq);
 qdev_init_gpio_in(dev, fdctrl_handle_tc, 1);
-- 
2.43.0