OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

cpu: Change parent type to Device

Browse Source 
This finally makes the CPU class a subclass of the Device class,
allowing us to start using DeviceState properties on CPU subclasses.

It has no_user=1, as creating CPUs using -device doesn't work yet.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Eduardo Habkost 2012-12-05 14:49:13 -02:00 committed by Andreas Färber
parent 5d5b24d042
commit 961f839570
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/qom/cpu.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_CPU_H
#define QEMU_CPU_H
#include "qom/object.h"
#include "hw/qdev-core.h"
#include "qemu/thread.h"
/**
@ -46,7 +46,7 @@ typedef struct CPUState CPUState;
*/
typedef struct CPUClass {
/*< private >*/
ObjectClass parent_class;
DeviceClass parent_class;
/*< public >*/
void (*reset)(CPUState *cpu);
@ -66,7 +66,7 @@ struct kvm_run;
*/
struct CPUState {
/*< private >*/
Object parent_obj;
DeviceState parent_obj;
/*< public >*/
struct QemuThread *thread;

6
qom/cpu.c
View File

@ -36,14 +36,16 @@ static void cpu_common_reset(CPUState *cpu)
static void cpu_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
CPUClass *k = CPU_CLASS(klass);
k->reset = cpu_common_reset;
dc->no_user = 1;
}
static TypeInfo cpu_type_info = {
static const TypeInfo cpu_type_info = {
.name = TYPE_CPU,
.parent = TYPE_OBJECT,
.parent = TYPE_DEVICE,
.instance_size = sizeof(CPUState),
.abstract = true,
.class_size = sizeof(CPUClass),