Message ID | 20181019165735.22511-5-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 5256df880d1312a58472af3fb0a3c51e708f2161 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3549495lji; Fri, 19 Oct 2018 10:02:17 -0700 (PDT) X-Google-Smtp-Source: ACcGV61q0/aBm4rlQMbT6ewY/vYFoXfawqwbZqaLgJCb6mZbHDFVvCkw8X50XyXnKTo93YxmG9Kk X-Received: by 2002:a37:4dc5:: with SMTP id a188-v6mr33595372qkb.326.1539968537676; Fri, 19 Oct 2018 10:02:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539968537; cv=none; d=google.com; s=arc-20160816; b=bHkLKfv8K6rmz/osI+P8PD/wG/oQLPx2xPwtkrMItzq53s+Y1N4ZoQ+33ryjZd9YR3 nh6cFEfsZiqhMS96CRWwqc3NUbZZ1UHuwER0Kyvza2a+DZG3CpUeQtd3pJfx+pLbz8dY O49JbO1IXurOYU1xQLW+sQOZABvzqR1Mc0Dyl3TyZa+GZt8Ta/G3CKnnIx6tgw8DbrKD oGZ+f0auWA2B7ToVRHA44ZkQ16kk/jRpKCAvo3NJwKdw9+JCD0YT5/m0u4T8qI5iTkvg WIm6mcnc2nnVMyGtIL9+dKZEg2zRR10SNOn0FmabEckd5EX+zBfJZWnbIz1w7DTyuVEO cy5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=1h3td8UV/YYPSsGBmcvKsxDlnzLkFLp0CdCMfKJHy00=; b=Sz6XWqYjiVYEUvZOqMj8CwQxZsW04TahWaByvSJYguhF2w/4+8aANJcXG8WmqVY61a hGrIPLAvGmQF8GCI0DBqcBcpewnqMoDSfQj4vYDXzkt4kzMhnd0LyfoAALoyd/Z06IGm fR0I6EEuaOB7nlcH6YOs5DofOpvgAjdmhc25yi1gdLcq3sgjlQivpJ5k3tpjiY3vu+fh amXrUPw9PJ3PTpAwgxUlkKSfSEkRYnrQ6/KDinhPK7Pj2ZQnKDtlaILjmVwM+v56A0HD 7emvM1VvzCd/SodhP0g9se91mlUBZqMURTT8crqB8Nso6AeDyiOSkVBl0UiSLGnmMBcm OT0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l25-v6si988466qtn.308.2018.10.19.10.02.17 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 19 Oct 2018 10:02:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gDYAD-0004ud-5J for patch@linaro.org; Fri, 19 Oct 2018 13:02:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gDY5n-0001Lv-Rf for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:57:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gDY5m-0001qp-Sz for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:57:43 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:51972) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gDY5m-0001mu-LY for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:57:42 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1gDY5l-0006g3-D1 for qemu-devel@nongnu.org; Fri, 19 Oct 2018 17:57:41 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2018 17:56:54 +0100 Message-Id: <20181019165735.22511-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181019165735.22511-1-peter.maydell@linaro.org> References: <20181019165735.22511-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 04/45] target/arm: V8M should not imply V7VE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 4f6756a4e2e..12e6273d603 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -814,7 +814,11 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) /* Some features automatically imply others: */ if (arm_feature(env, ARM_FEATURE_V8)) { - set_feature(env, ARM_FEATURE_V7VE); + if (arm_feature(env, ARM_FEATURE_M)) { + set_feature(env, ARM_FEATURE_V7); + } else { + set_feature(env, ARM_FEATURE_V7VE); + } } if (arm_feature(env, ARM_FEATURE_V7VE)) { /* v7 Virtualization Extensions. In real hardware this implies