It's abstract and derived directly from TYPE_OBJECT. Prepare a virtual reset method.
Signed-off-by: Andreas Färber <afaer...@suse.de> Cc: Anthony Liguori <anth...@codemonkey.ws> Cc: Peter Maydell <peter.mayd...@linaro.org> --- include/qemu/cpu.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++ qom/Makefile | 1 + qom/cpu.c | 50 +++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 0 deletions(-) create mode 100644 include/qemu/cpu.h create mode 100644 qom/cpu.c diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h new file mode 100644 index 0000000..22c7404 --- /dev/null +++ b/include/qemu/cpu.h @@ -0,0 +1,73 @@ +/* + * QEMU CPU model + * + * Copyright (c) 2012 SUSE LINUX Products GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see + * <http://www.gnu.org/licenses/old-licenses/gpl-2.0> + */ +#ifndef QEMU_CPU_H +#define QEMU_CPU_H + +#include "qemu/object.h" + +#define TYPE_CPU "cpu" + +#define CPU(obj) OBJECT_CHECK(CPU, (obj), TYPE_CPU) +#define CPU_CLASS(class) OBJECT_CLASS_CHECK(CPUClass, (class), TYPE_CPU) +#define CPU_GET_CLASS(obj) OBJECT_GET_CLASS(CPUClass, (obj), TYPE_CPU) + +typedef struct CPU CPU; + +/** + * CPUClass: + * @reset: Callback to reset the #CPU to its initial state. + * + * Represents a CPU family or model. + */ +typedef struct CPUClass { + ObjectClass parent_class; + + void (*reset)(CPU *cpu); +} CPUClass; + +/** + * CPU: + * + * State of one CPU core or thread. + */ +struct CPU { + Object parent_obj; + + /* TODO Move common fields from CPUState here. */ +}; + + +/* TODO Rename to cpu_reset once all CPUState is converted to QOM. */ +/** + * cpu_do_reset: + * @cpu: The CPU whose state is to be reset. + */ +void cpu_do_reset(CPU *cpu); + +/** + * cpu_common_reset: + * @cpu: The CPU whose common state is to be reset. + * + * To be used by derived classes. + */ +void cpu_common_reset(CPU *cpu); + + +#endif diff --git a/qom/Makefile b/qom/Makefile index f33f0be..0a1c8e0 100644 --- a/qom/Makefile +++ b/qom/Makefile @@ -1 +1,2 @@ qom-y = object.o container.o +qom-y += cpu.o diff --git a/qom/cpu.c b/qom/cpu.c new file mode 100644 index 0000000..a60823f --- /dev/null +++ b/qom/cpu.c @@ -0,0 +1,50 @@ +/* + * QEMU CPU model + * + * Copyright (c) 2012 SUSE LINUX Products GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see + * <http://www.gnu.org/licenses/old-licenses/gpl-2.0> + */ + +#include "qemu/cpu.h" +#include "qemu-common.h" + +void cpu_do_reset(CPU *cpu) +{ + CPUClass *klass = CPU_GET_CLASS(cpu); + + if (klass->reset != NULL) { + (*klass->reset)(cpu); + } +} + +void cpu_common_reset(CPU *cpu) +{ +} + +static TypeInfo cpu_type_info = { + .name = TYPE_CPU, + .parent = TYPE_OBJECT, + .instance_size = sizeof(CPU), + .abstract = true, + .class_size = sizeof(CPUClass), +}; + +static void cpu_register_types(void) +{ + type_register_static(&cpu_type_info); +} + +type_init(cpu_register_types) -- 1.7.7
