restore: sign extend p2m when restoring on a host with pfn width < guest pfn width
PATCH 1/1 restore: sign extend p2m when restoring on a host with pfn width < guest pfn width
(i.e. 32on64 domain 0 and 64 bit guest domain).
Otherwise P2M entries which were INVALID_P2M_ENTRY (==0xffffffffffffffff) become 0xffffffff after a migrate.
Signed-off-by Ian Campbell <[email protected]>
tools/libxc/xc_domain_restore.c +1 -1
@@ -1197,7 +1197,7 @@* we need to adjust the live_p2m assignment appropriately */ if ( guest_width >sizeof (xen_pfn_t) )for ( i = p2m_size -1 ; i >=0 ; i-- ) - ((uint64_t *)live_p2m)[i] = p2m[i]; + ((int64_t *)live_p2m)[i] = (long )p2m[i];else if ( guest_width <sizeof (xen_pfn_t) )for ( i =0 ; i < p2m_size; i++ ) ((uint32_t *)live_p2m)[i] = p2m[i];