diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-17 16:19:12 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-17 16:19:13 +0000 |
| commit | ac738eadc409813c5fbb37dae8d254cb5664733a (patch) | |
| tree | 6fe608edd1bfb22f1d9480449db54db579c0db40 /target-i386/cpu.h | |
| parent | 1a87e52770ca64f5a09e9c46d29ea3b5a5db5ffd (diff) | |
| parent | e1570d0005f29f97d4b1d603b4548591340c57e1 (diff) | |
| download | focaccia-qemu-ac738eadc409813c5fbb37dae8d254cb5664733a.tar.gz focaccia-qemu-ac738eadc409813c5fbb37dae8d254cb5664733a.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging
QOM CPUState and X86CPU * QTest for PC X86CPU * Confinement of ICC bridge X86CPU parenting to PC code # gpg: Signature made Tue Mar 17 15:23:31 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: target-i386: Remove icc_bridge parameter from cpu_x86_create() tests: Add PC CPU test pc: Suppress APIC ID compatibility warning for QTest Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index e4c27b1fa8..15db6d7aba 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -982,8 +982,7 @@ typedef struct CPUX86State { #include "cpu-qom.h" X86CPU *cpu_x86_init(const char *cpu_model); -X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, - Error **errp); +X86CPU *cpu_x86_create(const char *cpu_model, Error **errp); int cpu_x86_exec(CPUX86State *s); void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); void x86_cpudef_setup(void); |