diff options
| author | Peter Maydell | 2015-03-11 13:50:51 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-11 13:50:51 +0100 |
| commit | 8d86e34e65d6d4c8201de6356635f34d38391a93 (patch) | |
| tree | 5bada7ce625145210334aa3e17b6c185a84d38b9 /target-unicore32/helper.c | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into st... (diff) | |
| parent | cpu: Make cpu_init() return QOM CPUState object (diff) | |
| download | qemu-8d86e34e65d6d4c8201de6356635f34d38391a93.tar.gz qemu-8d86e34e65d6d4c8201de6356635f34d38391a93.tar.xz 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-unicore32/helper.c')
| -rw-r--r-- | target-unicore32/helper.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c index b4654fa98a..ae63277c84 100644 --- a/target-unicore32/helper.c +++ b/target-unicore32/helper.c @@ -25,15 +25,9 @@ #define DPRINTF(fmt, ...) do {} while (0) #endif -CPUUniCore32State *uc32_cpu_init(const char *cpu_model) +UniCore32CPU *uc32_cpu_init(const char *cpu_model) { - UniCore32CPU *cpu; - - cpu = UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model)); - if (cpu == NULL) { - return NULL; - } - return &cpu->env; + return UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model)); } uint32_t HELPER(clo)(uint32_t x) |