From patchwork Tue Aug 5 10:32:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 4677021 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5FD9D9F37E for ; Tue, 5 Aug 2014 10:32:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91CE420166 for ; Tue, 5 Aug 2014 10:32:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B037A2015A for ; Tue, 5 Aug 2014 10:32:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752363AbaHEKcR (ORCPT ); Tue, 5 Aug 2014 06:32:17 -0400 Received: from mail-we0-f172.google.com ([74.125.82.172]:54830 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752064AbaHEKcQ (ORCPT ); Tue, 5 Aug 2014 06:32:16 -0400 Received: by mail-we0-f172.google.com with SMTP id x48so767823wes.17 for ; Tue, 05 Aug 2014 03:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=m9tAne/lPd/qogXhGlNxmGOlHeZRQ6wfsmMlVGXaVeQ=; b=MlrmI3J4Izf+u50wvp1vuAte9i/eJnFgRtbROCCZnT48MZ5hgJ9eTKPe1PX/EVLQ/s J0EFAWUOZiqt3YxuZhE6z7Z1bmA3WB5ALGYh7UJyLzPKO0kqjnZ6uuGeWjauSSjJR2h1 tT0ZhX85jlTaFo3P0CJpRMQXCfiDpqobTLQQmBcMFWCjEYhZXlaG/q84WntWSnLVJWCU mCopivGdn028IU3r13W4lNTn0XLTDllRi7/7NGm8oqGhTabFgH/DDbj3QJ7RTSFP3Chd WQSgV1BW1tiiUQyPy//YNWYpyk7SxCcYJPdkLgK+lBzAp4s+CINWy9DyUYpFh6unwfKe PkBg== X-Received: by 10.180.75.49 with SMTP id z17mr5197148wiv.80.1407234734304; Tue, 05 Aug 2014 03:32:14 -0700 (PDT) Received: from playground.station (net-37-116-196-153.cust.vodafonedsl.it. [37.116.196.153]) by mx.google.com with ESMTPSA id ex2sm6357300wic.24.2014.08.05.03.32.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Aug 2014 03:32:13 -0700 (PDT) From: Paolo Bonzini To: kvm@vger.kernel.org Cc: chris.j.arges@canonical.com Subject: [PATCH kvm-unit-tests] x86: pcid: fix clearing of CR0.PG Date: Tue, 5 Aug 2014 12:32:07 +0200 Message-Id: <1407234727-529-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The test was trying to set CR0.PG, not clear it (and it was already set, even). Reported-by: Chris J Arges Signed-off-by: Paolo Bonzini --- x86/pcid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x86/pcid.c b/x86/pcid.c index 164e9a1..e3ccfdb 100644 --- a/x86/pcid.c +++ b/x86/pcid.c @@ -53,7 +53,7 @@ void test_pcid_enabled(void) goto report; /* try clearing CR0.PG when CR4.PCIDE=1, #GP expected */ - if (write_cr0_checking(cr0 | X86_CR0_PG) != GP_VECTOR) + if (write_cr0_checking(cr0 & ~X86_CR0_PG) != GP_VECTOR) goto report; write_cr4(cr4);