diff options
author | 2009-11-22 15:11:29 +0200 | |
---|---|---|
committer | 2009-11-22 15:11:29 +0200 | |
commit | 0b04e23bfe861522689765229143d9671e2308df (patch) | |
tree | 6c270982bd88387870e48e40879d7b0cb978ac32 /target-i386/cpu.h | |
parent | Merge commit '91011d4f3b7c311a42b842f6682ac64a2372d2b7' into upstream-merge (diff) | |
parent | kvm: x86: Refactor use of interrupt_bitmap (diff) | |
download | qemu-kvm-0b04e23bfe861522689765229143d9671e2308df.tar.gz qemu-kvm-0b04e23bfe861522689765229143d9671e2308df.tar.bz2 qemu-kvm-0b04e23bfe861522689765229143d9671e2308df.zip |
Merge commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a' into upstream-merge
* commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a': (22 commits)
kvm: x86: Refactor use of interrupt_bitmap
kvm: Add arch reset handler
Enable migration without shared storage from the monitor
Block live migration
Expose a mechanism to trace block writes
char: rename qemu_chr_reset to qemu_chr_generic_open
char: Remove special init_reset handling
char: don't limit data sent to backends to 1k per buffer
ARM PB-A8 support
LAN9118 emulation
mips_r4k: fix reset
PPC64: map Uni-North AGP bus aka fix Linux boot
PPC64: Partial fix to Linux crash: revert to old devfn
PCI: make duplicate devfn allocation fatal
Do not execute shell scripts directly
mips malta: fix indentation
target-mips: fix indentation
mips-malta: fix reset
mips: fix cpu_reset memory leak
fix make clean targets
...
Carry changes to qemu-kvm-x86.c.
Signed-off-by: Avi Kivity <avi@redhat.com>
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 4605fd280..a638e702b 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -709,8 +709,8 @@ typedef struct CPUX86State { MTRRVar mtrr_var[8]; /* For KVM */ - uint64_t interrupt_bitmap[256 / 64]; uint32_t mp_state; + int32_t interrupt_injected; /* in order to simplify APIC support, we leave this pointer to the user */ @@ -727,7 +727,6 @@ typedef struct CPUX86State { uint16_t fpus_vmstate; uint16_t fptag_vmstate; uint16_t fpregs_format_vmstate; - int32_t pending_irq_vmstate; } CPUX86State; CPUX86State *cpu_x86_init(const char *cpu_model); |