diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-28 16:07:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-28 16:07:23 +0100 |
| commit | 38a01e55d268aeba68c84eea425252e7f810feaf (patch) | |
| tree | 6a19c9a35558f6e9d64e2c1a5fc21432f683c830 /qemu-img.c | |
| parent | 795c050e379ab21b75fc2bbb30699fe8752be157 (diff) | |
| parent | 172dbc52b39c86d7569af5251cca78cb2c74c912 (diff) | |
| download | hqemu-38a01e55d268aeba68c84eea425252e7f810feaf.zip hqemu-38a01e55d268aeba68c84eea425252e7f810feaf.tar.gz | |
Merge remote-tracking branch 'remotes/kvm/tags/for-upstream' into staging
Mostly bugfixes + Alexey's interface-based implementation
of the NMI monitor command.
# gpg: Signature made Thu 28 Aug 2014 15:07:22 BST using RSA key ID 9B4D86F2
# gpg: Good signature from "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: aka "Paolo Bonzini <bonzini@gnu.org>"
* remotes/kvm/tags/for-upstream:
mc146818rtc: reinitialize irq_reinject_on_ack_count on reset
target-i386: Add "tsc_adjust" CPU feature name
target-i386: Add "mpx" CPU feature name
vl: process -object after other backend options
checkpatch.pl: adjust typedef definition to QEMU coding style
x86: Clear MTRRs on vCPU reset
x86: kvm: Add MTRR support for kvm_get|put_msrs()
x86: Use common variable range MTRR counts
target-i386: Don't forbid NX bit on PAE PDEs and PTEs
spapr: Add support for new NMI interface
s390x: Migrate to new NMI interface
s390x: Convert QEMUMachine to MachineClass
cpus: Define callback for QEMU "nmi" command
kvm: run cpu state synchronization on target vcpu thread
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-img.c')
0 files changed, 0 insertions, 0 deletions
