diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-01-28 16:39:52 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-03-14 22:20:27 +0100 |
| commit | dd83b06ae61cfa2dc4381ab49f365bd0995fc930 (patch) | |
| tree | dd8e6fc7732ca3f34e71e2fc35789a3c09b6bf53 /Makefile.objs | |
| parent | 9349b4f9fda360f3d9adc4cf4443a1a9b429c17e (diff) | |
| download | qemu-dd83b06ae61cfa2dc4381ab49f365bd0995fc930.tar.gz | |
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: Andreas Färber <afaerber@suse.de>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index f71ea17d07..226b01df96 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -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 |