diff options
| author |   Avi Kivity <avi@redhat.com> | 2010-05-16 15:13:06 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-16 15:13:06 +0300 |
| commit | d196172097cc563c5fd4febe09708318ed86a454 (patch) | |
| tree | d437f80f9d56b2bf132066f329e93f43ef73d110 /monitor.c | |
| parent | test: Add test for xor acc, imm (diff) | |
| parent | port qemu-kvm's on_vcpu code (diff) | |
| download | qemu-kvm-d196172097cc563c5fd4febe09708318ed86a454.tar.gz qemu-kvm-d196172097cc563c5fd4febe09708318ed86a454.tar.bz2 qemu-kvm-d196172097cc563c5fd4febe09708318ed86a454.zip | |
Merge commit 'e82bcec25f19846bfb899d55c9fb5915516b378a' into upstream-merge
* commit 'e82bcec25f19846bfb899d55c9fb5915516b378a':
port qemu-kvm's on_vcpu code
standardize on qemu_cpu_kick for signalling cpu thread(s)
make SIG_IPI to tcg vcpu thread reliable
kvm: set cpu_single_env around KVM_RUN ioctl
Fix -mem-path with hugetlbfs
doc: Clean up monitor command function index
doc: Heading for monitor command cpu got lost, restore it
doc: Fix acl monitor command documentation
doc: Fix host forwarding monitor command documentation
lsi: Handle removal of selected devices
lsi: Adjust some register reset values
lsi: Purge message queue on reset
scsi-disk: Clear aiocb on read completion
SCSI: Add disk reset handler
iov: Move from hw/ to topdir
vnc: set the right prefered encoding
sparc: Fix lazy flag calculation on interrupts, refactor
sparc: lazy C flag calculation
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2887,7 +2887,8 @@ static target_long monitor_get_tbl (const struct MonitorDef *md, int val) static target_long monitor_get_psr (const struct MonitorDef *md, int val) { CPUState *env = mon_get_cpu(); - return GET_PSR(env); + + return cpu_get_psr(env); } #endif |