diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-19 12:51:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-19 12:51:11 +0000 |
| commit | 299a2e6fac397be9b82c66583d53d1daaa3ffe6c (patch) | |
| tree | 7d92c923bcc7134d7469d2856a602302d5ec8224 /backends/hostmem-ram.c | |
| parent | 72f1094b6cd8191a5ed842bc57cffeefae95ac1e (diff) | |
| parent | a3defabbb58b7c1c060e7698def237a31a4cc161 (diff) | |
| download | focaccia-qemu-299a2e6fac397be9b82c66583d53d1daaa3ffe6c.tar.gz focaccia-qemu-299a2e6fac397be9b82c66583d53d1daaa3ffe6c.zip | |
Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into staging
PVRDMA implementation # gpg: Signature made Mon 19 Feb 2018 11:08:49 GMT # gpg: using RSA key 36D4C0F0CF2FE46D # gpg: Good signature from "Marcel Apfelbaum <marcel@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: B1C6 3A57 F92E 08F2 640F 31F5 36D4 C0F0 CF2F E46D * remotes/marcel/tags/rdma-pull-request: MAINTAINERS: add entry for hw/rdma hw/rdma: Implementation of PVRDMA device hw/rdma: PVRDMA commands and data-path ops hw/rdma: Implementation of generic rdma device layers hw/rdma: Definitions for rdma device and rdma resource manager hw/rdma: Add wrappers and macros include/standard-headers: add pvrdma related headers scripts/update-linux-headers: import pvrdma headers docs: add pvrdma device documentation. mem: add share parameter to memory-backend-ram Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'backends/hostmem-ram.c')
| -rw-r--r-- | backends/hostmem-ram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c index 38977be73e..7ddd08d370 100644 --- a/backends/hostmem-ram.c +++ b/backends/hostmem-ram.c @@ -28,8 +28,8 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) } path = object_get_canonical_path_component(OBJECT(backend)); - memory_region_init_ram_nomigrate(&backend->mr, OBJECT(backend), path, - backend->size, errp); + memory_region_init_ram_shared_nomigrate(&backend->mr, OBJECT(backend), path, + backend->size, backend->share, errp); g_free(path); } |