From patchwork Tue Dec 17 13:49:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11297613 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5691E112B for ; Tue, 17 Dec 2019 13:51:33 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3142B20733 for ; Tue, 17 Dec 2019 13:51:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="Dz7jmTg1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3142B20733 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ihDEo-0007lv-H8; Tue, 17 Dec 2019 13:50:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ihDEn-0007lN-2D for xen-devel@lists.xenproject.org; Tue, 17 Dec 2019 13:50:09 +0000 X-Inumbo-ID: 1e19cd88-20d4-11ea-88e7-bc764e2007e4 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1e19cd88-20d4-11ea-88e7-bc764e2007e4; Tue, 17 Dec 2019 13:50:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1576590601; h=from:to:cc:subject:date:message-id:mime-version; bh=4p3kNmGaylaZ5Y0P9rAk8EWRyR7xVR/T8n6pJCGyySM=; b=Dz7jmTg1fesnJ8UZnvWstnhBD4ljvJFs12KXi4c86fYjaCZddtq/KuL8 kJQTIxgNHE9fzuV66IrdRReBZeIzWLIXJTS54ClQ68tqL5EqVtVVVNeVc 3euz4I/WSPd9JzXRmxQysUyqKqZlpdr7hk4hgYXIeK+VdR8J50wWOIcnN s=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: vP0fG9y8OEBKMuRvzBNS+FETm9La9TyZFhPaeqERxOQA+s3A6aWAv55EXOvLh313OuMTo+fun2 8d6KH6xv5HAN4Eigl+3UB5FRDaavLEmKWosGYKVHmfrm+LnGt4QYcfToTRrMDn4Vml5SYf3/F+ KK79jOxX4EREC9gJ4LbqOXQkU9hyICy0azcO0J9bVFfaY2qJEZZix7bkKvR/qgg8txD2kasDoW HbS9Cpi5OgjJAMd9y0APd9AyqN1tPhKnIniPWiuf9Wc/0y8sQMkczuqmM9nXCEqvyYQZYW5bVv 0PM= X-SBRS: 2.7 X-MesageID: 9815603 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,325,1571716800"; d="scan'208";a="9815603" From: Andrew Cooper To: Xen-devel Date: Tue, 17 Dec 2019 13:49:56 +0000 Message-ID: <20191217134956.15137-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] libxc/restore: Fix error message for unrecognised stream version X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The Expected and Got values are rendered in the wrong order. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- CC: Ian Jackson CC: Wei Liu This wants backporting to the stable trees --- tools/libxc/xc_sr_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index ea7b0339ef..1ac404b97b 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -36,7 +36,7 @@ static int read_headers(struct xc_sr_context *ctx) else if ( ihdr.version != IHDR_VERSION ) { ERROR("Invalid Version: Expected %d, Got %d", - ihdr.version, IHDR_VERSION); + IHDR_VERSION, ihdr.version); return -1; } else if ( ihdr.options & IHDR_OPT_BIG_ENDIAN )