diff options
| author | Peter Maydell | 2017-09-01 18:28:54 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-09-01 18:28:54 +0200 |
| commit | 32f0f68bb77289b75a82925f712bb52e16eac3ba (patch) | |
| tree | 5b1ef822b632fbf483ea3c7c8a1c2cc391230e65 /target/lm32/cpu.h | |
| parent | Merge remote-tracking branch 'remotes/elmarco/tags/tidy-pull-request' into st... (diff) | |
| parent | ppc: replace cpu_ppc_init() with cpu_generic_init() (diff) | |
| download | qemu-32f0f68bb77289b75a82925f712bb52e16eac3ba.tar.gz qemu-32f0f68bb77289b75a82925f712bb52e16eac3ba.tar.xz qemu-32f0f68bb77289b75a82925f712bb52e16eac3ba.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging
x86, cpu queue, 2017-09-01
CPU creation refactor plus x86 patches.
# gpg: Signature made Fri 01 Sep 2017 15:59:02 BST
# gpg: using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-and-machine-pull-request: (29 commits)
ppc: replace cpu_ppc_init() with cpu_generic_init()
unicore32: replace uc32_cpu_init() with cpu_generic_init()
openrisc: replace cpu_openrisc_init() with cpu_generic_init()
moxie: replace cpu_moxie_init() with cpu_generic_init()
lm32: replace cpu_lm32_init() with cpu_generic_init()
x86: replace cpu_x86_init() with cpu_generic_init()
cris: replace cpu_cris_init() with cpu_generic_init()
arm: replace cpu_arm_init() with cpu_generic_init()
sh4: replace cpu_sh4_init() with cpu_generic_init()
tricore: replace cpu_tricore_init() with cpu_generic_init()
xtensa: replace cpu_xtensa_init() with cpu_generic_init()
tilegx: replace cpu_tilegx_init() with cpu_generic_init()
nios2: replace cpu_nios2_init() with cpu_generic_init()
microblaze: replace cpu_mb_init() with cpu_generic_init()
m68k: replace cpu_m68k_init() with cpu_generic_init()
hppa: replace cpu_hppa_init() with cpu_generic_init()
alpha: replace cpu_alpha_init() with cpu_generic_init()
s390x: replace cpu_s390x_init() with cpu_generic_init()
sparc: replace cpu_sparc_init() with cpu_generic_init()
sparc: make cpu feature parsing property based
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/lm32/cpu.h')
| -rw-r--r-- | target/lm32/cpu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/lm32/cpu.h b/target/lm32/cpu.h index 1d972cb26b..de265b50d1 100644 --- a/target/lm32/cpu.h +++ b/target/lm32/cpu.h @@ -238,7 +238,6 @@ static inline lm32_wp_t lm32_wp_type(uint32_t dc, int idx) return (dc >> (idx+1)*2) & 0x3; } -LM32CPU *cpu_lm32_init(const char *cpu_model); /* you can call this signal handler from your SIGBUS and SIGSEGV signal handlers to inform the virtual CPU of exceptions. non zero is returned if the signal was handled by the virtual CPU. */ @@ -256,7 +255,7 @@ void lm32_watchpoint_insert(CPULM32State *env, int index, target_ulong address, void lm32_watchpoint_remove(CPULM32State *env, int index); bool lm32_cpu_do_semihosting(CPUState *cs); -#define cpu_init(cpu_model) CPU(cpu_lm32_init(cpu_model)) +#define cpu_init(cpu_model) cpu_generic_init(TYPE_LM32_CPU, cpu_model) #define cpu_list lm32_cpu_list #define cpu_signal_handler cpu_lm32_signal_handler |