mirror of https://github.com/proxmox/mirror_qemu
migration: Pass incoming state into qemu_ufd_copy_ioctl()
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>master
parent
fe80c0241d
commit
eef621c4e6
|
@ -1128,10 +1128,12 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *mis)
|
||||||
return 0;
|
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)
|
void *from_addr, uint64_t pagesize, RAMBlock *rb)
|
||||||
{
|
{
|
||||||
|
int userfault_fd = mis->userfault_fd;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (from_addr) {
|
if (from_addr) {
|
||||||
struct uffdio_copy copy_struct;
|
struct uffdio_copy copy_struct;
|
||||||
copy_struct.dst = (uint64_t)(uintptr_t)host_addr;
|
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
|
* which would be slightly cheaper, but we'd have to be careful
|
||||||
* of the order of updating our page state.
|
* 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;
|
int e = errno;
|
||||||
error_report("%s: %s copy host: %p from: %p (size: %zd)",
|
error_report("%s: %s copy host: %p from: %p (size: %zd)",
|
||||||
__func__, strerror(e), host, from, pagesize);
|
__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)
|
* but it's not available for everything (e.g. hugetlbpages)
|
||||||
*/
|
*/
|
||||||
if (qemu_ram_is_uf_zeroable(rb)) {
|
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;
|
int e = errno;
|
||||||
error_report("%s: %s zero host: %p",
|
error_report("%s: %s zero host: %p",
|
||||||
__func__, strerror(e), host);
|
__func__, strerror(e), host);
|
||||||
|
|
Loading…
Reference in New Issue