diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-23 11:52:49 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-23 11:52:49 -0500 |
| commit | 3e4be9c29784df09c364b52a55e826a0b05b950e (patch) | |
| tree | 7e897ca9337076c2e32f8fdbb03a135b52129eb5 /trace-events | |
| parent | f3ca508f00fa1cc295334fe8f8010cd6ea45bacd (diff) | |
| parent | f010bc643a2759e87e989c3e4e85f15ec71ae98f (diff) | |
| download | qemu-3e4be9c29784df09c364b52a55e826a0b05b950e.tar.gz | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
# By Alexey Kardashevskiy (3) and others
# Via Paolo Bonzini
* qemu-kvm/uq/master:
target-i386: add feature kvm_pv_unhalt
linux-headers: update to 3.12-rc1
target-i386: forward CPUID cache leaves when -cpu host is used
linux-headers: update to 3.11
kvm: fix traces to use %x instead of %d
kvmvapic: Clear also physical ROM address when entering INACTIVE state
kvmvapic: Enter inactive state on hardware reset
kvmvapic: Catch invalid ROM size
kvm irqfd: support direct msimessage to irq translation
fix steal time MSR vmsd callback to proper opaque type
kvm: warn if num cpus is greater than num recommended
cpu: Move cpu state syncs up into cpu_dump_state()
exec: always use MADV_DONTFORK
Message-id: 1379694292-1601-1-git-send-email-pbonzini@redhat.com
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trace-events b/trace-events index d4dba24551..6bbceaf3f8 100644 --- a/trace-events +++ b/trace-events @@ -1167,9 +1167,9 @@ virtio_ccw_new_device(int cssid, int ssid, int schid, int devno, const char *dev migrate_set_state(int new_state) "new state %d" # kvm-all.c -kvm_ioctl(int type, void *arg) "type %d, arg %p" -kvm_vm_ioctl(int type, void *arg) "type %d, arg %p" -kvm_vcpu_ioctl(int cpu_index, int type, void *arg) "cpu_index %d, type %d, arg %p" +kvm_ioctl(int type, void *arg) "type 0x%x, arg %p" +kvm_vm_ioctl(int type, void *arg) "type 0x%x, arg %p" +kvm_vcpu_ioctl(int cpu_index, int type, void *arg) "cpu_index %d, type 0x%x, arg %p" kvm_run_exit(int cpu_index, uint32_t reason) "cpu_index %d, reason %d" # memory.c |