diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-11 12:50:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-11 12:50:51 +0000 |
| commit | 8d86e34e65d6d4c8201de6356635f34d38391a93 (patch) | |
| tree | 5bada7ce625145210334aa3e17b6c185a84d38b9 /target-i386 | |
| parent | 48412371415a260d00fc7fdcdb400da55f268828 (diff) | |
| parent | 2994fd96d986578a342f2342501b4ad30f6d0a85 (diff) | |
| download | qemu-8d86e34e65d6d4c8201de6356635f34d38391a93.tar.gz qemu-8d86e34e65d6d4c8201de6356635f34d38391a93.tar.bz2 qemu-8d86e34e65d6d4c8201de6356635f34d38391a93.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging
QOM CPUState and X86CPU
* Add CPUClass documentation
* Clean up X86CPU APIC realization
* Cleanups around cpu_init()
# gpg: Signature made Tue Mar 10 17:27:28 2015 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-cpu-for-peter:
cpu: Make cpu_init() return QOM CPUState object
unicore32: Use uc32_cpu_init()
m68k: Use cpu_m68k_init()
target-unicore32: Make uc32_cpu_init() return UniCore32CPU
target-i386: Clean up misuse of qdev_init() in realize method
cpu: Add missing documentation for some CPUClass methods
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 8 | ||||
| -rw-r--r-- | target-i386/cpu.h | 9 |
2 files changed, 3 insertions, 14 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 50907d0bf1..ed7e5d5de3 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2728,12 +2728,8 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) if (cpu->apic_state == NULL) { return; } - - if (qdev_init(cpu->apic_state)) { - error_setg(errp, "APIC device '%s' could not be initialized", - object_get_typename(OBJECT(cpu->apic_state))); - return; - } + object_property_set_bool(OBJECT(cpu->apic_state), true, "realized", + errp); } #else static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 0638d24a88..e4c27b1fa8 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1170,14 +1170,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); # define PHYS_ADDR_MASK 0xfffffffffLL # endif -static inline CPUX86State *cpu_init(const char *cpu_model) -{ - X86CPU *cpu = cpu_x86_init(cpu_model); - if (cpu == NULL) { - return NULL; - } - return &cpu->env; -} +#define cpu_init(cpu_model) CPU(cpu_x86_init(cpu_model)) #define cpu_exec cpu_x86_exec #define cpu_gen_code cpu_x86_gen_code |