Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6157AC10F13 for ; Thu, 11 Apr 2019 18:01:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 211C42173C for ; Thu, 11 Apr 2019 18:01:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ukuZ3PpN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726836AbfDKSB5 (ORCPT ); Thu, 11 Apr 2019 14:01:57 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42876 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726615AbfDKSB4 (ORCPT ); Thu, 11 Apr 2019 14:01:56 -0400 Received: by mail-wr1-f68.google.com with SMTP id g3so8515686wrx.9 for ; Thu, 11 Apr 2019 11:01:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9LI8Xe2X6jJ4shS0/q2sFCzTGRz3alxOPmz9fWaIJrE=; b=ukuZ3PpNVpN/Ps0V4gYaM/ov2Lp1S8eg6Oym3z4G+6R5+CBI7/eJ446gczwJOFBDjM Oi8yaO0QY/BvwwfsgiTPggazZmXYUMqxfrYllAPKWbiYaVSZgLJkeC9s7iaP25FxL6jg Vmoi7E3TigMLlpZIEe73RY8C6tdyf/FhSsy+bKSpKY7b53tb/vmYC3ypjD1Z4OwxvdTB hn4ajZax6G5uGjZwNH5iqUnq8yxPDED/sYoJiUIJdRE5tfzUIqhNWkDwmua8+a/FBEU7 2rt6fs069K3Rpcx4l/JA4sEpOl9vX5B8rY6S9CUX1IJ9vK/eml/ZMHwothfDNaW9kXB6 c+Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9LI8Xe2X6jJ4shS0/q2sFCzTGRz3alxOPmz9fWaIJrE=; b=aShKm2N5aGU7+hJLth5p27nIhxERZ81O6XzDBRH0P7OQ6zUDdPmaNLo/E/G5ucVxtf ExvqrCiwX+pxYl8272THEtTL+/xQVJqJ3F8Qq4L1OBqZuK1ufRFueWPN5cV9fOFGVylF q29/A1ZPGbfo5xM8TsUqfD/JsK+xN5AGkkU/+lcjLJBdaizSRnyqrTI1KRphINjQUnIk i1BYLp7UQsJjSHGe1duEkQQPuRFnvj45GcU/JlLUqomaa14gI6V8u0ZeX3KPfRMGIxgP o4hvGypBNclrCC4W+4zy6OMJ3ShiDrN+PiMn7cJNaXLRwM0oevtS5D3hFQZ/stNkaWaC fzew== X-Gm-Message-State: APjAAAXv1QnXcf5cDPn9KA0AiQRwpv4xhAZT+Ott9WH77AYudDvBPYbU EI38uHFYU0HaUeNxUPTso4uChvvQDDY= X-Google-Smtp-Source: APXvYqzHtle9oiEMUHk0ilZ1rQaJud6VH8vfsGFwFLugNJVM8L85KKiNOmAUh58u7tWlPcpd9NPrjA== X-Received: by 2002:adf:e84b:: with SMTP id d11mr30886818wrn.289.1555005714807; Thu, 11 Apr 2019 11:01:54 -0700 (PDT) Received: from htb-2n-eng-dhcp405.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id m6sm48501308wrr.53.2019.04.11.11.01.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 11:01:54 -0700 (PDT) From: Nadav Amit To: Paolo Bonzini Cc: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , kvm@vger.kernel.org, Nadav Amit , Sean Christopherson Subject: [kvm-unit-tests PATCH v2] x86: Fix wrong test for 5-level page-table Date: Thu, 11 Apr 2019 11:01:46 -0700 Message-Id: <20190411180146.24387-1-nadav.amit@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Untested, but clearly bit 12 is the one that needs to be tested. Cc: Sean Christopherson Signed-off-by: Nadav Amit --- x86/cstart64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x86/cstart64.S b/x86/cstart64.S index 21db10f..cccfcea 100644 --- a/x86/cstart64.S +++ b/x86/cstart64.S @@ -243,7 +243,7 @@ start64: setup_5level_page_table: /* Check if 5-level paging has already enabled */ mov %cr4, %rax - test $12, %eax + test $0x1000, %eax jnz lvl5 pushq $32 -- 2.17.1