diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-05-06 11:24:39 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-05-06 11:26:17 +0300 |
| commit | 8f1c89f7f016e3d4d6a694978a047a06069230bb (patch) | |
| tree | e7066eb1a2a40dfc1aaa9dd1ce0b6bf8893e1314 /cpu-defs.h | |
| parent | virtio-net: Make save/load format independent of build options (diff) | |
| parent | ETRAX: Simplify serport control logic. (diff) | |
| download | qemu-kvm-8f1c89f7f016e3d4d6a694978a047a06069230bb.tar.gz qemu-kvm-8f1c89f7f016e3d4d6a694978a047a06069230bb.tar.bz2 qemu-kvm-8f1c89f7f016e3d4d6a694978a047a06069230bb.zip | |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (84 commits)
ETRAX: Simplify serport control logic.
ETRAX: Drop _t for the serial type.
ETRAX: Use NULL for subwidth serport reg accesses.
ETRAX: Drop the _t for the internal PIC type.
ETRAX: Simplify the interrupt controller model.
ETRAX: Simplify interrupt signaling.
Fix compiler warnings in nwfpe code.
target-mips: proper sign extension for 'SUBU rd, zero, rt'
target-mips: fix comments about SUB/DSUB
qemu-options.hx: fix description of cache=none suboption
Suppress type mismatch warnings in VDE code.
minor fix of pci_register_bus()
use PCI_HEADER_TYPE.
Fix typos in comments in exec.c
Optimize cmp x, 0 case
Reindent
Handle NULL bdrv.
Improve instruction name comments for easier searching
Clarify: dmmuregs[1] is not a typo
Optimize operations with immediate parameters
...
Conflicts:
Makefile.target
hw/vga.c
qemu-common.h
vl.c
(iothread merge by Marcelo)
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-defs.h')
| -rw-r--r-- | cpu-defs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpu-defs.h b/cpu-defs.h index 8b9c26239..376861633 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -185,6 +185,8 @@ struct KVMCPUState { target_ulong mem_io_vaddr; /* target virtual addr at which the \ memory was accessed */ \ uint32_t halted; /* Nonzero if the CPU is in suspend state */ \ + uint32_t stop; /* Stop request */ \ + uint32_t stopped; /* Artificially stopped */ \ uint32_t interrupt_request; \ volatile sig_atomic_t exit_request; \ /* The meaning of the MMU modes is defined in the target code. */ \ @@ -226,6 +228,9 @@ struct KVMCPUState { /* user data */ \ void *opaque; \ \ + uint32_t created; \ + struct QemuThread *thread; \ + struct QemuCond *halt_cond; \ const char *cpu_model_str; \ struct KVMState *kvm_state; \ struct kvm_run *kvm_run; \ |