aboutsummaryrefslogtreecommitdiff
path: root/qga/main.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-08-07 14:54:47 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-08-07 14:54:47 +0100
commit2ee55b8351910e5dd898f52415064a4c5479baba (patch)
tree7d29652c004379d94056ed5caa046c768af8f2ab /qga/main.c
parent9d8bb3557408adc3e5e26b7915cbf6c198dfd4ff (diff)
parenteddedd546a68f6ac864b71d50dd8d39b939b724b (diff)
downloadqemu-2ee55b8351910e5dd898f52415064a4c5479baba.zip
qemu-2ee55b8351910e5dd898f52415064a4c5479baba.tar.gz
qemu-2ee55b8351910e5dd898f52415064a4c5479baba.tar.bz2
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
KVM changes include a MIPS patch and the testdev backend used by the ARM kvm-unit-tests. icount include the first part of reverse execution and Sebastian Tanase's patches to slow down -icount execution to the desired speed of the target. v1->v2: fix dump_drift_info to print nothing outside icount mode, and to compile on 32-bit architectures # gpg: Signature made Thu 07 Aug 2014 14:09:58 BST using RSA key ID 9B4D86F2 # gpg: Good signature from "Paolo Bonzini <pbonzini@redhat.com>" # gpg: aka "Paolo Bonzini <bonzini@gnu.org>" * remotes/bonzini/tags/for-upstream: target-mips: Ignore unassigned accesses with KVM monitor: Add drift info to 'info jit' cpu-exec: Print to console if the guest is late cpu-exec: Add sleeping algorithm icount: Add align option to icount icount: Add QemuOpts for icount icount: Fix virtual clock start value on ARM timer: add cpu_icount_to_ns function. migration: migrate icount fields. icount: put icount variables into TimerState. backends: Introduce chr-testdev Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qga/main.c')
0 files changed, 0 insertions, 0 deletions