From: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com
Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com
Subject: [Qemu-devel] [PATCH 2/3] vhost-user: Fix VHOST_SET_MEM_TABLE processing
Date: Tue, 08 Jul 2014 17:06:08 +0300 [thread overview]
Message-ID: <20140708140601.7314.97988.stgit@3820> (raw)
In-Reply-To: <20140708140447.7314.87628.stgit@3820>
For each memory region we use qemu_get_ram_fd to get the RAMBlock
associated file descriptor. It uses qemu_get_ram_block to find the proper structure.
The latter aborts with "Bad ram offset" when the address is not found.
We'll use the new qemu_is_ram_block to indentify non-RAM regions and avoid qemu_get_ram_fd
call on them.
Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
---
hw/virtio/vhost-user.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 38e5806..876b080 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -216,6 +216,10 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request,
case VHOST_SET_MEM_TABLE:
for (i = 0; i < dev->mem->nregions; ++i) {
struct vhost_memory_region *reg = dev->mem->regions + i;
+ if (!qemu_is_ram_block(reg->guest_phys_addr)) {
+ /* this is non-RAM region - skip it */
+ continue;
+ }
fd = qemu_get_ram_fd(reg->guest_phys_addr);
if (fd > 0) {
msg.memory.regions[fd_num].userspace_addr = reg->userspace_addr;
next prev parent reply other threads:[~2014-07-08 14:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-08 14:05 [Qemu-devel] [PATCH 0/3] vhost-user fixes Nikolay Nikolaev
2014-07-08 14:05 ` [Qemu-devel] [PATCH 1/3] Add qemu_is_ram_block Nikolay Nikolaev
2014-07-08 14:06 ` Nikolay Nikolaev [this message]
2014-07-11 20:56 ` [Qemu-devel] [PATCH 2/3] vhost-user: Fix VHOST_SET_MEM_TABLE processing Paolo Bonzini
2014-07-08 14:06 ` [Qemu-devel] [PATCH 3/3] qtest: Adapt vhost-user-test to latehs vhost-user changes Nikolay Nikolaev
2014-07-11 18:42 ` [Qemu-devel] [PATCH 0/3] vhost-user fixes Michael S. Tsirkin
2014-07-11 20:57 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140708140601.7314.97988.stgit@3820 \
--to=n.nikolaev@virtualopensystems.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=snabb-devel@googlegroups.com \
--cc=tech@virtualopensystems.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.