Commit 33ac7f1630d8655b92b6a53d59886fca2b64da10
1 parent
924b2c07
Don't kill the registered irqs on reset.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2903 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
4 additions
and
3 deletions
target-mips/cpu.h
| @@ -284,10 +284,8 @@ struct CPUMIPSState { | @@ -284,10 +284,8 @@ struct CPUMIPSState { | ||
| 284 | int CCRes; /* Cycle count resolution/divisor */ | 284 | int CCRes; /* Cycle count resolution/divisor */ |
| 285 | int Status_rw_bitmask; /* Read/write bits in CP0_Status */ | 285 | int Status_rw_bitmask; /* Read/write bits in CP0_Status */ |
| 286 | 286 | ||
| 287 | -#if defined(CONFIG_USER_ONLY) | 287 | +#ifdef CONFIG_USER_ONLY |
| 288 | target_ulong tls_value; | 288 | target_ulong tls_value; |
| 289 | -#else | ||
| 290 | - void *irq[8]; | ||
| 291 | #endif | 289 | #endif |
| 292 | 290 | ||
| 293 | CPU_COMMON | 291 | CPU_COMMON |
| @@ -298,6 +296,9 @@ struct CPUMIPSState { | @@ -298,6 +296,9 @@ struct CPUMIPSState { | ||
| 298 | const char *initrd_filename; | 296 | const char *initrd_filename; |
| 299 | 297 | ||
| 300 | mips_def_t *cpu_model; | 298 | mips_def_t *cpu_model; |
| 299 | +#ifndef CONFIG_USER_ONLY | ||
| 300 | + void *irq[8]; | ||
| 301 | +#endif | ||
| 301 | 302 | ||
| 302 | struct QEMUTimer *timer; /* Internal timer */ | 303 | struct QEMUTimer *timer; /* Internal timer */ |
| 303 | }; | 304 | }; |