diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-08-17 18:24:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-08-17 18:24:38 +0100 |
| commit | a544c9110d3971cc764c2dcd86a55b28534e4a63 (patch) | |
| tree | ab1e426f7787fc7ea16e1556c737d27a01afac6f /accel/kvm/kvm-all.c | |
| parent | 0abaa41d936becd914a16ee1fe2a981d96d19428 (diff) | |
| parent | 238e91728503d400e1c4e644e3a9b80f9e621682 (diff) | |
| download | focaccia-qemu-a544c9110d3971cc764c2dcd86a55b28534e4a63.tar.gz focaccia-qemu-a544c9110d3971cc764c2dcd86a55b28534e4a63.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20180817.0' into staging
VFIO update 2018-08-17 - Enhance balloon inhibitor for multiple users and use around vfio device assignment (Alex Williamson) # gpg: Signature made Fri 17 Aug 2018 17:43:37 BST # gpg: using RSA key 239B9B6E3BB08B22 # gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>" # gpg: aka "Alex Williamson <alex@shazbot.org>" # gpg: aka "Alex Williamson <alwillia@redhat.com>" # gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>" # Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B 8A90 239B 9B6E 3BB0 8B22 * remotes/awilliam/tags/vfio-update-20180817.0: vfio/ccw/pci: Allow devices to opt-in for ballooning vfio: Inhibit ballooning based on group attachment to a container kvm: Use inhibit to prevent ballooning without synchronous mmu balloon: Allow multiple inhibit users 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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index eb7db92a5e..38f468d8e2 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -39,6 +39,7 @@ #include "trace.h" #include "hw/irq.h" #include "sysemu/sev.h" +#include "sysemu/balloon.h" #include "hw/boards.h" @@ -1698,6 +1699,9 @@ static int kvm_init(MachineState *ms) s->many_ioeventfds = kvm_check_many_ioeventfds(); s->sync_mmu = !!kvm_vm_check_extension(kvm_state, KVM_CAP_SYNC_MMU); + if (!s->sync_mmu) { + qemu_balloon_inhibit(true); + } return 0; |