From: Peter Xu Date: Tue, 1 Mar 2022 08:39:05 +0000 (+0800) Subject: migration: Dump ramblock and offset too when non-same-page detected X-Git-Tag: qemu-xen-4.17.0-rc4~78^2~7 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cfc7dc8abfdb71e39e48bdb297b5e86fe2121d97;p=qemu-xen.git migration: Dump ramblock and offset too when non-same-page detected In ram_load_postcopy() we'll try to detect non-same-page case and dump error. This error is very helpful for debugging. Adding ramblock & offset into the error log too. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Peter Xu Message-Id: <20220301083925.33483-6-peterx@redhat.com> Signed-off-by: Dr. David Alan Gilbert dgilbert: Fix up long line --- diff --git a/migration/ram.c b/migration/ram.c index fe3de84856..a9d0d100bd 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3707,8 +3707,12 @@ static int ram_load_postcopy(QEMUFile *f) } else if (tmp_page->host_addr != host_page_from_ram_block_offset(block, addr)) { /* not the 1st TP within the HP */ - error_report("Non-same host page %p/%p", tmp_page->host_addr, - host_page_from_ram_block_offset(block, addr)); + error_report("Non-same host page detected. " + "Target host page %p, received host page %p " + "(rb %s offset 0x"RAM_ADDR_FMT" target_pages %d)", + tmp_page->host_addr, + host_page_from_ram_block_offset(block, addr), + block->idstr, addr, tmp_page->target_pages); ret = -EINVAL; break; }