From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7vyz-0005sk-Ec for qemu-devel@nongnu.org; Wed, 14 Mar 2012 17:43:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7vym-0005mC-FF for qemu-devel@nongnu.org; Wed, 14 Mar 2012 17:43:44 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34990 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7vym-0005lt-4A for qemu-devel@nongnu.org; Wed, 14 Mar 2012 17:43:32 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id EEFAE8FE69 for ; Wed, 14 Mar 2012 22:43:30 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 14 Mar 2012 22:42:56 +0100 Message-Id: <1331761376-20362-44-git-send-email-afaerber@suse.de> In-Reply-To: <1331761376-20362-1-git-send-email-afaerber@suse.de> References: <1331761376-20362-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 43/43] qom: Introduce CPU class List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Reintroduce CPUState as QOM object: It's abstract and derived directly from TYPE_OBJECT for compatibility with the user emulators. The identifier CPUState avoids conflicts between CPU() and the struct. Introduce $(qom-twice-y) to build it separately for system and for user emulators. Prepare a virtual reset method, (re)introduce cpu_reset() as wrapper. Signed-off-by: Andreas F=C3=A4rber Reviewed-by: Anthony Liguori --- Makefile.objs | 3 ++ configure | 1 + include/qemu/cpu.h | 75 ++++++++++++++++++++++++++++++++++++++++++++++= ++++++ qom/Makefile | 1 + qom/cpu.c | 58 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 138 insertions(+), 0 deletions(-) create mode 100644 include/qemu/cpu.h create mode 100644 qom/cpu.c diff --git a/Makefile.objs b/Makefile.objs index f71ea17..226b01d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -14,6 +14,7 @@ universal-obj-y +=3D $(qobject-obj-y) # QOM include $(SRC_PATH)/qom/Makefile qom-obj-y =3D $(addprefix qom/, $(qom-y)) +qom-obj-twice-y =3D $(addprefix qom/, $(qom-twice-y)) =20 universal-obj-y +=3D $(qom-obj-y) =20 @@ -93,6 +94,7 @@ fsdev-obj-$(CONFIG_VIRTFS) +=3D $(addprefix fsdev/, $(f= sdev-nested-y)) =20 common-obj-y =3D $(block-obj-y) blockdev.o common-obj-y +=3D $(net-obj-y) +common-obj-y +=3D $(qom-obj-twice-y) common-obj-$(CONFIG_LINUX) +=3D $(fsdev-obj-$(CONFIG_LINUX)) common-obj-y +=3D readline.o console.o cursor.o common-obj-y +=3D $(oslib-obj-y) @@ -200,6 +202,7 @@ user-obj-y +=3D cutils.o cache-utils.o user-obj-y +=3D module.o user-obj-y +=3D qemu-user.o user-obj-y +=3D $(trace-obj-y) +user-obj-y +=3D $(qom-obj-twice-y) =20 ###################################################################### # libhw diff --git a/configure b/configure index fe4fc4f..afe7395 100755 --- a/configure +++ b/configure @@ -3921,6 +3921,7 @@ fi d=3Dlibuser mkdir -p $d mkdir -p $d/trace +mkdir -p $d/qom symlink $source_path/Makefile.user $d/Makefile =20 if test "$docs" =3D "yes" ; then diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h new file mode 100644 index 0000000..4291279 --- /dev/null +++ b/include/qemu/cpu.h @@ -0,0 +1,75 @@ +/* + * 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 + * + */ +#ifndef QEMU_CPU_H +#define QEMU_CPU_H + +#include "qemu/object.h" + +/** + * SECTION:cpu + * @section_id: QEMU-cpu + * @title: CPU Class + * @short_description: Base class for all CPUs + */ + +#define TYPE_CPU "cpu" + +#define CPU(obj) OBJECT_CHECK(CPUState, (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 CPUState CPUState; + +/** + * CPUClass: + * @reset: Callback to reset the #CPU to its initial state. + * + * Represents a CPU family or model. + */ +typedef struct CPUClass { + /*< private >*/ + ObjectClass parent_class; + /*< public >*/ + + void (*reset)(CPUState *cpu); +} CPUClass; + +/** + * CPUState: + * + * State of one CPU core or thread. + */ +struct CPUState { + /*< private >*/ + Object parent_obj; + /*< public >*/ + + /* TODO Move common fields from CPUState here. */ +}; + + +/** + * cpu_reset: + * @cpu: The CPU whose state is to be reset. + */ +void cpu_reset(CPUState *cpu); + + +#endif diff --git a/qom/Makefile b/qom/Makefile index 885a263..34c6de5 100644 --- a/qom/Makefile +++ b/qom/Makefile @@ -1 +1,2 @@ qom-y =3D object.o container.o qom-qobject.o +qom-twice-y =3D cpu.o diff --git a/qom/cpu.c b/qom/cpu.c new file mode 100644 index 0000000..5b36046 --- /dev/null +++ b/qom/cpu.c @@ -0,0 +1,58 @@ +/* + * 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 + * + */ + +#include "qemu/cpu.h" +#include "qemu-common.h" + +void cpu_reset(CPUState *cpu) +{ + CPUClass *klass =3D CPU_GET_CLASS(cpu); + + if (klass->reset !=3D NULL) { + (*klass->reset)(cpu); + } +} + +static void cpu_common_reset(CPUState *cpu) +{ +} + +static void cpu_class_init(ObjectClass *klass, void *data) +{ + CPUClass *k =3D CPU_CLASS(klass); + + k->reset =3D cpu_common_reset; +} + +static TypeInfo cpu_type_info =3D { + .name =3D TYPE_CPU, + .parent =3D TYPE_OBJECT, + .instance_size =3D sizeof(CPUState), + .abstract =3D true, + .class_size =3D sizeof(CPUClass), + .class_init =3D cpu_class_init, +}; + +static void cpu_register_types(void) +{ + type_register_static(&cpu_type_info); +} + +type_init(cpu_register_types) --=20 1.7.7