mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 11:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

target-arm: Add virt class and machine types

Browse source 
Switch virt qemu machine support to use the newer object type, class, and
instance model. Added virt TypeInfo with static registration along with virt
specific class and machine structs. Also added virt class initialization
method.

Backports commit c29196904b2bad015edc553a5693c5c9e6f8177a from qemu
This commit is contained in:
Greg Bellows 2018-03-11 13:50:11 -04:00 committed by Lioncash
parent df4cfe6804
commit 125bd964d9
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 47 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
qemu/hw/arm/virt.c
View file

@ -39,6 +39,24 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
// Unicorn: Daughterboard member removed, as it's not necessary
// for Unicorn's purposes.
typedef struct {
MachineClass parent;
} VirtMachineClass;
typedef struct {
MachineState parent;
} VirtMachineState;
#define TYPE_VIRT_MACHINE "virt"
#define VIRT_MACHINE(uc, obj) \
OBJECT_CHECK((uc), VirtMachineState, (obj), TYPE_VIRT_MACHINE)
#define VIRT_MACHINE_GET_CLASS(uc, obj) \
OBJECT_GET_CLASS(uc, VirtMachineClass, obj, TYPE_VIRT_MACHINE)
#define VIRT_MACHINE_CLASS(uc, klass) \
OBJECT_CLASS_CHECK(uc, VirtMachineClass, klass, TYPE_VIRT_MACHINE)
static int machvirt_init(struct uc_struct *uc, MachineState *machine) static int machvirt_init(struct uc_struct *uc, MachineState *machine)
{ {
const char *cpu_model = machine->cpu_model; const char *cpu_model = machine->cpu_model;
@ -65,13 +83,35 @@ static int machvirt_init(struct uc_struct *uc, MachineState *machine)
return 0; return 0;
} }
static void virt_class_init(struct uc_struct *uc, ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(uc, oc);
mc->name = TYPE_VIRT_MACHINE;
mc->init = machvirt_init;
mc->max_cpus = 8;
mc->is_default = 1;
mc->arch = UC_ARCH_ARM64;
}
static const TypeInfo machvirt_info = {
TYPE_VIRT_MACHINE,
TYPE_MACHINE,
sizeof(VirtMachineClass),
sizeof(VirtMachineState),
NULL,
NULL,
NULL,
NULL,
NULL,
virt_class_init,
};
void machvirt_machine_init(struct uc_struct *uc) void machvirt_machine_init(struct uc_struct *uc)
{ {
static QEMUMachine machvirt_a15_machine = { 0 }; type_register_static(uc, &machvirt_info);
machvirt_a15_machine.name = "virt",
machvirt_a15_machine.init = machvirt_init,
machvirt_a15_machine.is_default = 1,
machvirt_a15_machine.arch = UC_ARCH_ARM64,
qemu_register_machine(uc, &machvirt_a15_machine, TYPE_MACHINE, NULL);
} }