diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-14 17:42:25 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-14 17:42:25 +0000 |
| commit | 0d3e41d5efd638a0c5682f6813b26448c3c51624 (patch) | |
| tree | b7deda2b3818eabf03827704f825ed7046fc07b2 /accel/kvm/kvm-all.c | |
| parent | 16abfb36c582aae4ac81e5aac1198ed3081deeba (diff) | |
| parent | 96566d09aa105ee04cbc1c9539cf8a9a40e8e422 (diff) | |
| download | qemu-0d3e41d5efd638a0c5682f6813b26448c3c51624.zip qemu-0d3e41d5efd638a0c5682f6813b26448c3c51624.tar.gz qemu-0d3e41d5efd638a0c5682f6813b26448c3c51624.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
- some configure updates (HAX/NetBSD, remove "wav", -Waddress-of-packed-member)
- remove deprecated options
- some trace and error cleanup
- typo fixes
# gpg: Signature made Thu 14 Feb 2019 10:46:50 GMT
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
configure: improve usbfs check
hw/sparc64: Explicitly set default_display = "std"
hw/dma/i8257: Use qemu_log_mask(UNIMP) instead of fprintf
wavcapture: Convert to error_report
kvm: Add kvm_set_ioeventfd* traces
HMP: Prepend errors with 'Error:'
pckbd: Convert DPRINTF->trace
configure: Make -Waddress-of-packed-member warnings be errors
configure: Add HAX support in NetBSD
configure: fix qemu-img name
configure: remove handling of "wav" audio driver
qemu-options: Remove deprecated option -clock
qemu-deprecated: Remove -virtioconsole and -no-frame for good
qapi: Fix qcow2 encryption doc typo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'accel/kvm/kvm-all.c')
| -rw-r--r-- | accel/kvm/kvm-all.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 4e1de94..fd92b6f 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -657,6 +657,8 @@ static int kvm_set_ioeventfd_mmio(int fd, hwaddr addr, uint32_t val, .fd = fd, }; + trace_kvm_set_ioeventfd_mmio(fd, (uint64_t)addr, val, assign, size, + datamatch); if (!kvm_enabled()) { return -ENOSYS; } @@ -688,6 +690,7 @@ static int kvm_set_ioeventfd_pio(int fd, uint16_t addr, uint16_t val, .fd = fd, }; int r; + trace_kvm_set_ioeventfd_pio(fd, addr, val, assign, size, datamatch); if (!kvm_enabled()) { return -ENOSYS; } |