Commit dd83b06a authored by Andreas Färber's avatar Andreas Färber
Browse files

qom: Introduce CPU class 



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: default avatarAndreas Färber <afaerber@suse.de>
Reviewed-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 9349b4f9

Makefile.objs

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ universal-obj-y += $(qobject-obj-y) 
# QOM

include $(SRC_PATH)/qom/Makefile

qom-obj-y = $(addprefix qom/, $(qom-y))

qom-obj-twice-y = $(addprefix qom/, $(qom-twice-y))



universal-obj-y += $(qom-obj-y)
@@ -93,6 +94,7 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) 


common-obj-y = $(block-obj-y) blockdev.o

common-obj-y += $(net-obj-y)

common-obj-y += $(qom-obj-twice-y)

common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))

common-obj-y += readline.o console.o cursor.o

common-obj-y += $(oslib-obj-y)
@@ -200,6 +202,7 @@ user-obj-y += cutils.o cache-utils.o 
user-obj-y += module.o

user-obj-y += qemu-user.o

user-obj-y += $(trace-obj-y)

user-obj-y += $(qom-obj-twice-y)



######################################################################

# libhw

configure

+1 −0
Original line number Diff line number Diff line
@@ -3921,6 +3921,7 @@ fi 
d=libuser

mkdir -p $d

mkdir -p $d/trace

mkdir -p $d/qom

symlink $source_path/Makefile.user $d/Makefile



if test "$docs" = "yes" ; then

include/qemu/cpu.h

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/*

 * 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/gpl-2.0.html>

 */

#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

qom/Makefile

+1 −0
Original line number Diff line number Diff line 
qom-y = object.o container.o qom-qobject.o

qom-twice-y = cpu.o

qom/cpu.c

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * 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/gpl-2.0.html>

 */



#include "qemu/cpu.h"

#include "qemu-common.h"



void cpu_reset(CPUState *cpu)

{

    CPUClass *klass = CPU_GET_CLASS(cpu);



    if (klass->reset != NULL) {

        (*klass->reset)(cpu);

    }

}



static void cpu_common_reset(CPUState *cpu)

{

}



static void cpu_class_init(ObjectClass *klass, void *data)

{

    CPUClass *k = CPU_CLASS(klass);



    k->reset = cpu_common_reset;

}



static TypeInfo cpu_type_info = {

    .name = TYPE_CPU,

    .parent = TYPE_OBJECT,

    .instance_size = sizeof(CPUState),

    .abstract = true,

    .class_size = sizeof(CPUClass),

    .class_init = cpu_class_init,

};



static void cpu_register_types(void)

{

    type_register_static(&cpu_type_info);

}



type_init(cpu_register_types)