From patchwork Fri Dec 14 03:18:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153710 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1596510ljp; Thu, 13 Dec 2018 19:23:06 -0800 (PST) X-Google-Smtp-Source: AFSGD/VAJ5npuRUFAIdYl34yLPW7KdoQXB3Fz/odIBiZ3IcScnVGn6d7847eoj7CsgW4N7IRe1UN X-Received: by 2002:a37:3008:: with SMTP id w8mr1149253qkw.75.1544757786383; Thu, 13 Dec 2018 19:23:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544757786; cv=none; d=google.com; s=arc-20160816; b=nfe86wQ9wFntEOI24uJoSwdaPosQyxo7e049ohrd4zi+gSmN6WLRITrkhc8iuTAZ7R M8ik0m/2TWrHxo02h0pyv3d3YsmrVqHIP/2cUZYIKFQStrYKxQePc36w50+NWKhwAKty gww+qlzMA3YSTA8QM8mjFbdWSr2YPrvUQk1nNrNcFLOHYKJ5N99MRMML73Q8Uso5prNr RHxoHzCI4rYzwT+gec2VsOBdtp2c5+3ZdyK3yj+ZOUkDFzFhIBdpD0EpPRNwnmbZZXeI tEiuaMxng1/u/1LdxgIPg8GkNKeZjcKYe4FDniCfoQ4pSIBApYFp+kPX+Yb0OTH5lR8a +SVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=PSnqcBbqekkteIs5V8mVEZVTvEM3N4jqJPPZsnphQB4=; b=dYeikcaGRvF6wLwrp9guKASXAxlueXRHnLdVmHVXCwYAOWJCY5Gc/x++TPF0SZhXlt F5Gt8VbYXzJ5gZR+ENiKraxehQVjiPZwgNvKWo0BH9g3+D4VnPZOOrLfygtMxnPo/Fk3 IjZGi+yqZz/WrDg+Jq3bZmOf5fJvX1pYKHuI+rAHwJy3E+j6LdjILgF5ma5B5OPO56eE LNHjZxgJwkxBMY9Y2hvbTlLG6Xu6r/BqAwfMqChUqzqx0u1u1OuYV0muNS7HF0y1eaz2 KaxAxv8CPbQ0cESqdf1zwktZuz0cwKamNV1BrUO2H7ARTKoV60cDPOoamR4t87xR6dFF +S/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cot8RzYl; 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: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e52si131012qte.213.2018.12.13.19.23.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 19:23:06 -0800 (PST) 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; dkim=fail header.i=@linaro.org header.s=google header.b=cot8RzYl; 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]:59070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe49-0008Lo-H0 for patch@linaro.org; Thu, 13 Dec 2018 22:23:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe0i-0005pW-03 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXe0e-0006AB-Oe for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:31 -0500 Received: from mail-oi1-x242.google.com ([2607:f8b0:4864:20::242]:32808) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXe0e-00067L-6D for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:28 -0500 Received: by mail-oi1-x242.google.com with SMTP id c206so3494892oib.0 for ; Thu, 13 Dec 2018 19:19:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PSnqcBbqekkteIs5V8mVEZVTvEM3N4jqJPPZsnphQB4=; b=cot8RzYlkiypsTe21urgqwE4+jV5lL4f7uGDndn+BNSSIzck2J1ctnHbQ63X9875kW wfhzJmHAMU5kGLXcTp3T3nQGOm9eGp0A6gTQFYnyF+LqE9LBeVJXQZjYGpk0BznCKy7X NGiaTbyi6r/TfMQPwtjzLTCOLpUF3xq9WR+WE= 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:in-reply-to :references; bh=PSnqcBbqekkteIs5V8mVEZVTvEM3N4jqJPPZsnphQB4=; b=CMRYDowrW67w4qNu72OpPvWMXs2k9Fs+UROmtiRPvMzv2in9eDvtVkARDKApwyC9jB SYGqB3adr9LuxLfZqKODNdZAMGTgJL1bn9nwFHg0AA8hz3SsvzKCOabuRJ5FuGceN1mA A8aG7256WpUwQfC/TqWawaXWInS2OSIRbHoXaFLfpeSzq87Mw7W+QUxoHSJXUKLmlfgT OcgYhUeN8PgN3gjebimxPsWARhQP4UFWfHcKVoURQdyl2kOZUsSrqyGNQWXf+rF/Vo21 Xl/zsgRwDIgoBj1V4ZgmDEG9rj1eNpBqWcLo7MxxrX9EsZ/mJJZYxDEVrpoL2zHxXJaw YhPw== X-Gm-Message-State: AA+aEWY5j5/5KiMow3Gy7mTGua6KWWd/iVi2SH7QOdpsou174fKdL1fn qjahmFEIWAMoT6rp1uINmKrFHZOaiL4OUg== X-Received: by 2002:aca:f0f:: with SMTP id 15mr857437oip.47.1544757566917; Thu, 13 Dec 2018 19:19:26 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id g138sm2367537oib.26.2018.12.13.19.19.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 19:19:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 21:18:51 -0600 Message-Id: <20181214031923.29527-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214031923.29527-1-richard.henderson@linaro.org> References: <20181214031923.29527-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::242 Subject: [Qemu-devel] [PATCH] fixup! target/arm: Move id_aa64mmfr* to ARMISARegisters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I didn't get this fix pushed back into the patch set that I actually sent last week. The patch is in target-arm.next, and I'm sure you would have eventually seen the error in testing. r~ --- target/arm/kvm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.2 diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index ad83e1479c..089af9c5f0 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -538,9 +538,9 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) ARM64_SYS_REG(3, 0, 0, 6, 0)); err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64isar1, ARM64_SYS_REG(3, 0, 0, 6, 1)); - err |= read_sys_reg64(fdarray[2], &achf->isar.id_aa64mmfr0, + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64mmfr0, ARM64_SYS_REG(3, 0, 0, 7, 0)); - err |= read_sys_reg64(fdarray[2], &achf->isar.id_aa64mmfr1, + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64mmfr1, ARM64_SYS_REG(3, 0, 0, 7, 1)); /*