[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/16] migration: Pass incoming state into qemu_ufd_copy_ioctl()
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 11/16] migration: Pass incoming state into qemu_ufd_copy_ioctl() |
Date: |
Mon, 26 Oct 2020 16:19:47 +0000 |
From: Peter Xu <peterx@redhat.com>
It'll be used in follow up patches to access more fields out of it. Meanwhile
fetch the userfaultfd inside the function.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20201021212721.440373-2-peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/postcopy-ram.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index eea92bbd36..aed4cdaa38 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -1128,10 +1128,12 @@ int postcopy_ram_incoming_setup(MigrationIncomingState
*mis)
return 0;
}
-static int qemu_ufd_copy_ioctl(int userfault_fd, void *host_addr,
+static int qemu_ufd_copy_ioctl(MigrationIncomingState *mis, void *host_addr,
void *from_addr, uint64_t pagesize, RAMBlock
*rb)
{
+ int userfault_fd = mis->userfault_fd;
int ret;
+
if (from_addr) {
struct uffdio_copy copy_struct;
copy_struct.dst = (uint64_t)(uintptr_t)host_addr;
@@ -1185,7 +1187,7 @@ int postcopy_place_page(MigrationIncomingState *mis, void
*host, void *from,
* which would be slightly cheaper, but we'd have to be careful
* of the order of updating our page state.
*/
- if (qemu_ufd_copy_ioctl(mis->userfault_fd, host, from, pagesize, rb)) {
+ if (qemu_ufd_copy_ioctl(mis, host, from, pagesize, rb)) {
int e = errno;
error_report("%s: %s copy host: %p from: %p (size: %zd)",
__func__, strerror(e), host, from, pagesize);
@@ -1212,7 +1214,7 @@ int postcopy_place_page_zero(MigrationIncomingState *mis,
void *host,
* but it's not available for everything (e.g. hugetlbpages)
*/
if (qemu_ram_is_uf_zeroable(rb)) {
- if (qemu_ufd_copy_ioctl(mis->userfault_fd, host, NULL, pagesize, rb)) {
+ if (qemu_ufd_copy_ioctl(mis, host, NULL, pagesize, rb)) {
int e = errno;
error_report("%s: %s zero host: %p",
__func__, strerror(e), host);
--
2.28.0
- [PULL 00/16] migration queue, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 02/16] migration: Do not use C99 // comments, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 01/16] migration: Drop unused VMSTATE_FLOAT64 support, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 03/16] migration: Don't use '#' flag of printf format, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 04/16] migration: Add spaces around operator, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 05/16] migration: Open brace '{' following struct go on the same line, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 06/16] migration: Add braces {} for if statement, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 07/16] migration: Do not initialise statics and globals to 0 or NULL, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 08/16] migration: Open brace '{' following function declarations go on the next line, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 09/16] migration: Delete redundant spaces, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 11/16] migration: Pass incoming state into qemu_ufd_copy_ioctl(),
Dr. David Alan Gilbert (git) <=
- [PULL 10/16] migration: using trace_ to replace DPRINTF, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 12/16] migration: Introduce migrate_send_rp_message_req_pages(), Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 13/16] migration: Maintain postcopy faulted addresses, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 15/16] migration/postcopy: Release fd before going into 'postcopy-pause', Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 14/16] migration: Sync requested pages after postcopy recovery, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 16/16] migration-test: Only hide error if !QTEST_LOG, Dr. David Alan Gilbert (git), 2020/10/26
- Re: [PULL 00/16] migration queue, no-reply, 2020/10/26
- Re: [PULL 00/16] migration queue, Peter Maydell, 2020/10/27
- Re: [PULL 00/16] migration queue, Christian Schoenebeck, 2020/10/31