[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] vhost-user: Don't ask for reply on postcopy mem
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 5/7] vhost-user: Don't ask for reply on postcopy mem table set |
Date: |
Thu, 11 Oct 2018 20:25:11 +0100 |
From: Ilya Maximets <address@hidden>
According to documentation, NEED_REPLY_MASK should not be set
for VHOST_USER_SET_MEM_TABLE request in postcopy mode.
This restriction was mistakenly applied to 'reply_supported'
variable, which is local and used only for non-postcopy case.
CC: Dr. David Alan Gilbert <address@hidden>
Fixes: 9bb38019942c ("vhost+postcopy: Send address back to qemu")
Signed-off-by: Ilya Maximets <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Maxime Coquelin <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
hw/virtio/vhost-user.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index ed47d645d9..e09bed0e4a 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -374,8 +374,6 @@ static int vhost_user_set_mem_table_postcopy(struct
vhost_dev *dev,
int fds[VHOST_MEMORY_MAX_NREGIONS];
int i, fd;
size_t fd_num = 0;
- bool reply_supported = virtio_has_feature(dev->protocol_features,
- VHOST_USER_PROTOCOL_F_REPLY_ACK);
VhostUserMsg msg_reply;
int region_i, msg_i;
@@ -384,10 +382,6 @@ static int vhost_user_set_mem_table_postcopy(struct
vhost_dev *dev,
.hdr.flags = VHOST_USER_VERSION,
};
- if (reply_supported) {
- msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;
- }
-
if (u->region_rb_len < dev->mem->nregions) {
u->region_rb = g_renew(RAMBlock*, u->region_rb, dev->mem->nregions);
u->region_rb_offset = g_renew(ram_addr_t, u->region_rb_offset,
@@ -503,10 +497,6 @@ static int vhost_user_set_mem_table_postcopy(struct
vhost_dev *dev,
return -1;
}
- if (reply_supported) {
- return process_message_reply(dev, &msg);
- }
-
return 0;
}
@@ -519,8 +509,7 @@ static int vhost_user_set_mem_table(struct vhost_dev *dev,
size_t fd_num = 0;
bool do_postcopy = u->postcopy_listen && u->postcopy_fd.handler;
bool reply_supported = virtio_has_feature(dev->protocol_features,
- VHOST_USER_PROTOCOL_F_REPLY_ACK) &&
- !do_postcopy;
+ VHOST_USER_PROTOCOL_F_REPLY_ACK);
if (do_postcopy) {
/* Postcopy has enough differences that it's best done in it's own
--
2.19.0
- [Qemu-devel] [PULL 0/7] migration queue, Dr. David Alan Gilbert (git), 2018/10/11
- [Qemu-devel] [PULL 3/7] migration: Stop postcopy fault thread before notifying, Dr. David Alan Gilbert (git), 2018/10/11
- [Qemu-devel] [PULL 4/7] vhost-user: Fix userfaultfd leak, Dr. David Alan Gilbert (git), 2018/10/11
- [Qemu-devel] [PULL 5/7] vhost-user: Don't ask for reply on postcopy mem table set,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 6/7] qmp, hmp: make subsystem/system-vendor identities optional, Dr. David Alan Gilbert (git), 2018/10/11
- [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Dr. David Alan Gilbert (git), 2018/10/11
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Emilio G. Cota, 2018/10/17
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Thomas Huth, 2018/10/18
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Thomas Huth, 2018/10/18
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Emilio G. Cota, 2018/10/18
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Wei Huang, 2018/10/18
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Thomas Huth, 2018/10/19
[Qemu-devel] [PULL 1/7] tests: Add migration test for aarch64, Dr. David Alan Gilbert (git), 2018/10/11
[Qemu-devel] [PULL 7/7] migration-test: Only generate a single target architecture, Dr. David Alan Gilbert (git), 2018/10/11