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

q800: introduce Q800MachineState 

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>
This commit is contained in:
Mark Cave-Ayland 2023-06-21 09:53:32 +01:00 committed by Laurent Vivier
parent cbba124319
commit a8019229c4
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -1236,6 +1236,7 @@ F: include/hw/misc/mac_via.h
F: include/hw/nubus/* F: include/hw/nubus/*
F: include/hw/display/macfb.h F: include/hw/display/macfb.h
F: include/hw/block/swim.h F: include/hw/block/swim.h
F: include/hw/m68k/q800.h
virt virt
M: Laurent Vivier <laurent@vivier.eu> M: Laurent Vivier <laurent@vivier.eu>

2
hw/m68k/q800.c
View File

@ -38,6 +38,7 @@
#include "standard-headers/asm-m68k/bootinfo.h" #include "standard-headers/asm-m68k/bootinfo.h"
#include "standard-headers/asm-m68k/bootinfo-mac.h" #include "standard-headers/asm-m68k/bootinfo-mac.h"
#include "bootinfo.h" #include "bootinfo.h"
#include "hw/m68k/q800.h"
#include "hw/misc/mac_via.h" #include "hw/misc/mac_via.h"
#include "hw/input/adb.h" #include "hw/input/adb.h"
#include "hw/nubus/mac-nubus-bridge.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 = { static const TypeInfo q800_machine_typeinfo = {
.name = MACHINE_TYPE_NAME("q800"), .name = MACHINE_TYPE_NAME("q800"),
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
.instance_size = sizeof(Q800MachineState),
.class_init = q800_machine_class_init, .class_init = q800_machine_class_init,
}; };

40
include/hw/m68k/q800.h Normal file
View File

@ -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