From a63334ef13e4a43f1265c9117216cd5ae1bdc659 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Wed, 26 Jul 2017 08:44:56 +0100 Subject: [PATCH] libxc: bail immediately when PV superpage is discovered The original code was added with the hope that PV superpage migration might work. But it was never proven that the code actually worked. Now that PV superpage is gone, simplify the code by returning error immediately. Suggested-by: Andrew Cooper Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Konrad Rzeszutek Wilk --- tools/libxc/xc_sr_save_x86_pv.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_sr_save_x86_pv.c b/tools/libxc/xc_sr_save_x86_pv.c index 36b10583d6..ff5efe954b 100644 --- a/tools/libxc/xc_sr_save_x86_pv.c +++ b/tools/libxc/xc_sr_save_x86_pv.c @@ -975,14 +975,9 @@ static int normalise_pagetable(struct xc_sr_context *ctx, const uint64_t *src, if ( (type > XEN_DOMCTL_PFINFO_L1TAB) && (pte & _PAGE_PSE) ) { - if ( !ctx->dominfo.paused ) - errno = EAGAIN; - else - { - ERROR("Cannot migrate superpage (L%lu[%u]: 0x%016"PRIx64")", - type >> XEN_DOMCTL_PFINFO_LTAB_SHIFT, i, pte); - errno = E2BIG; - } + ERROR("Cannot migrate superpage (L%lu[%u]: 0x%016"PRIx64")", + type >> XEN_DOMCTL_PFINFO_LTAB_SHIFT, i, pte); + errno = E2BIG; return -1; } -- 2.30.2