diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-16 22:29:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-16 22:29:51 +0000 |
| commit | bce36c6c5436c0c2679b42c6de54de5393dfcf59 (patch) | |
| tree | d42fbebb76a47201f85b1e95fa85ac01cee03c2a /util/vfio-helpers.c | |
| parent | b17d3b7b77f043f0e76f0e6ce6def3c1b1d5ee8b (diff) | |
| parent | 1370d61ae3c9934861d2349349447605202f04e9 (diff) | |
| download | focaccia-qemu-bce36c6c5436c0c2679b42c6de54de5393dfcf59.tar.gz focaccia-qemu-bce36c6c5436c0c2679b42c6de54de5393dfcf59.zip | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
Bug fixes # gpg: Signature made Mon 16 Nov 2020 18:22:51 GMT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: memory: Skip dirty tracking for un-migratable memory regions target/i386: avoid theoretical leak on MCE injection scsi-disk: convert more errno values back to SCSI statuses util/vfio-helpers.c: Use ram_block_discard_disable() in qemu_vfio_open_pci() kvm/i386: Set proper nested state format for SVM Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/vfio-helpers.c')
| -rw-r--r-- | util/vfio-helpers.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index c469beb061..2bec48e163 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "exec/ramlist.h" #include "exec/cpu-common.h" +#include "exec/memory.h" #include "trace.h" #include "qemu/error-report.h" #include "standard-headers/linux/pci_regs.h" @@ -494,8 +495,20 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device, Error **errp) int r; QEMUVFIOState *s = g_new0(QEMUVFIOState, 1); + /* + * VFIO may pin all memory inside mappings, resulting it in pinning + * all memory inside RAM blocks unconditionally. + */ + r = ram_block_discard_disable(true); + if (r) { + error_setg_errno(errp, -r, "Cannot set discarding of RAM broken"); + g_free(s); + return NULL; + } + r = qemu_vfio_init_pci(s, device, errp); if (r) { + ram_block_discard_disable(false); g_free(s); return NULL; } @@ -837,4 +850,5 @@ void qemu_vfio_close(QEMUVFIOState *s) close(s->device); close(s->group); close(s->container); + ram_block_discard_disable(false); } |