[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/24] q800: introduce Q800MachineState
From: |
Laurent Vivier |
Subject: |
[PULL 03/24] q800: introduce Q800MachineState |
Date: |
Thu, 22 Jun 2023 09:55:23 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This provides an overall container and owner for Machine-related objects such
as MemoryRegions.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-4-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
MAINTAINERS | 1 +
include/hw/m68k/q800.h | 40 ++++++++++++++++++++++++++++++++++++++++
hw/m68k/q800.c | 2 ++
3 files changed, 43 insertions(+)
create mode 100644 include/hw/m68k/q800.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 88b5a7ee0a79..748a66fbaa30 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1236,6 +1236,7 @@ F: include/hw/misc/mac_via.h
F: include/hw/nubus/*
F: include/hw/display/macfb.h
F: include/hw/block/swim.h
+F: include/hw/m68k/q800.h
virt
M: Laurent Vivier <laurent@vivier.eu>
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
new file mode 100644
index 000000000000..f3bc17aa1bdc
--- /dev/null
+++ b/include/hw/m68k/q800.h
@@ -0,0 +1,40 @@
+/*
+ * QEMU Motorla 680x0 Macintosh hardware System Emulator
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef HW_Q800_H
+#define HW_Q800_H
+
+#include "hw/boards.h"
+#include "qom/object.h"
+
+/*
+ * The main Q800 machine
+ */
+
+struct Q800MachineState {
+ MachineState parent_obj;
+};
+
+#define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")
+OBJECT_DECLARE_SIMPLE_TYPE(Q800MachineState, Q800_MACHINE)
+
+#endif
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 465c510c186e..c0256c8a904c 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -38,6 +38,7 @@
#include "standard-headers/asm-m68k/bootinfo.h"
#include "standard-headers/asm-m68k/bootinfo-mac.h"
#include "bootinfo.h"
+#include "hw/m68k/q800.h"
#include "hw/misc/mac_via.h"
#include "hw/input/adb.h"
#include "hw/nubus/mac-nubus-bridge.h"
@@ -749,6 +750,7 @@ static void q800_machine_class_init(ObjectClass *oc, void
*data)
static const TypeInfo q800_machine_typeinfo = {
.name = MACHINE_TYPE_NAME("q800"),
.parent = TYPE_MACHINE,
+ .instance_size = sizeof(Q800MachineState),
.class_init = q800_machine_class_init,
};
--
2.40.1
- [PULL 00/24] Q800 for 8.1 patches, Laurent Vivier, 2023/06/22
- [PULL 01/24] q800: fix up minor spacing issues in hw_compat_q800 GlobalProperty array, Laurent Vivier, 2023/06/22
- [PULL 04/24] q800: rename q800_init() to q800_machine_init(), Laurent Vivier, 2023/06/22
- [PULL 12/24] q800: move VIA1 device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 03/24] q800: introduce Q800MachineState,
Laurent Vivier <=
- [PULL 02/24] q800: add missing space after parent object in GLUEState, Laurent Vivier, 2023/06/22
- [PULL 10/24] q800: introduce mac-io container memory region, Laurent Vivier, 2023/06/22
- [PULL 17/24] q800: move escc_orgate device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 14/24] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, Laurent Vivier, 2023/06/22
- [PULL 21/24] q800: don't access Nubus bus directly from the mac-nubus-bridge device, Laurent Vivier, 2023/06/22
- [PULL 15/24] q800: move dp8393x device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 09/24] q800: move GLUE device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 23/24] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Laurent Vivier, 2023/06/22
- [PULL 24/24] mac_via: fix rtc command decoding for the PRAM seconds registers, Laurent Vivier, 2023/06/22
- [PULL 08/24] q800-glue.c: switch TypeInfo registration to use DEFINE_TYPES() macro, Laurent Vivier, 2023/06/22