From patchwork Mon May 4 15:29:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 283467 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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 F186AC47257 for ; Mon, 4 May 2020 15:41:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 BFBC520721 for ; Mon, 4 May 2020 15:41:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Zmdz1dFC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BFBC520721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdE5-0008Da-S5 for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 11:41:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVd38-0005Af-TF for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:30 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46769 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jVd38-0004Jn-34 for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588606228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=roSqpWZiqVEnV8LkdMDYBqTbKDtiMZNpOAVtdss6dcA=; b=Zmdz1dFCgGMklmHrSRZryIPdZH9RaLAoTY+SulrVUjUmDjMyHaRPxNcYS1oyoxQIYNwbCE bpyJmII5B+prscKCfenDOZGYSdH44lZhl1m5BDHr/4AqA7Xlb5E2mE2QRXt5wa0S+DDWrZ bhv7b5E98SEPS+EuBsvS2+4jpjbfDik= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-177-Tc2P4NZPP6yMtFkuozAWVw-1; Mon, 04 May 2020 11:30:25 -0400 X-MC-Unique: Tc2P4NZPP6yMtFkuozAWVw-1 Received: by mail-wr1-f71.google.com with SMTP id p8so155370wrj.5 for ; Mon, 04 May 2020 08:30:25 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=Yw0XCRWQ5TOmgPjX3CHbIeQtGrafhhkkx8MZiR9pd/4=; b=XLgx6KioTTWb0q4sFCCZ9NkV+F4kDvvM/NcOZHOtBJ6voPS4gp6kN7t7Rspg4Us5cG EPahZNF6YwbR3etAq9CdUmygkqdbJUzfoqMAbvhGYDOERmcEkxmVnSECbDIJgMp8OWv7 Db2SipCXZvSwxjfGa4Qo2vTiZdSoMIK8lG2Ry57LDNaXQc7MQFMKgAM/ilvsGhmLd/gz TaB8aPHziiy12XvtmzbdhAP1+Ua9rDSQ+ge/JnTfKbr28WLmQAF5/2GFcKb9FviaUVvO g0l6bGxO5QQ/YNdvQLnAVHoPgadtxLJTsc+slYkL6ybGp/nbjX5AM5LMhaH8eGibnQFd sutw== X-Gm-Message-State: AGi0PuZ8XKpHbvsP9IyzEqMRuc9WgcRquz5w0lLGrz8JBTSOoGx/Ay82 TF+b6OeRyKYaiAjTWGddjZWaJ0dnHIsUrME9RXJB1Nkh/5Gezb7KpChAwZmvHvM58O3bDjRxTSJ ivQVXCvoa/m3Z4cY= X-Received: by 2002:a7b:c959:: with SMTP id i25mr15022186wml.20.1588606223849; Mon, 04 May 2020 08:30:23 -0700 (PDT) X-Google-Smtp-Source: APiQypKj4Ork54uQyKon7JuuI5hLn/qSvQkcntw69/VS1GCVsLTqkzf4xWLOeWqEwGpwl6KqwP2Uow== X-Received: by 2002:a7b:c959:: with SMTP id i25mr15022125wml.20.1588606223163; Mon, 04 May 2020 08:30:23 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id l19sm14665035wmj.14.2020.05.04.08.30.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 08:30:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 12/12] hw/core: Restrict CpuClass::get_crash_info() to system-mode Date: Mon, 4 May 2020 17:29:22 +0200 Message-Id: <20200504152922.21365-13-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504152922.21365-1-philmd@redhat.com> References: <20200504152922.21365-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 05:09:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Richard Henderson , qemu-s390x@nongnu.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/hw/core/cpu.h | 7 ++++++- hw/core/cpu.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 5bf94d28cf..0d1f9e084f 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -490,6 +490,8 @@ bool cpu_paging_enabled(const CPUState *cpu); void cpu_get_memory_mapping(CPUState *cpu, MemoryMappingList *list, Error **errp); +#if !defined(CONFIG_USER_ONLY) + /** * cpu_write_elf64_note: * @f: pointer to a function that writes memory to a file @@ -539,6 +541,8 @@ int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu, */ GuestPanicInformation *cpu_get_crash_info(CPUState *cpu); +#endif /* !CONFIG_USER_ONLY */ + /** * CPUDumpFlags: * @CPU_DUMP_CODE: @@ -632,7 +636,8 @@ static inline int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attrs) } return ret; } -#endif + +#endif /* CONFIG_USER_ONLY */ /** * cpu_list_add: diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 786a1bec8a..85b9723fee 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -209,6 +209,7 @@ static bool cpu_common_exec_interrupt(CPUState *cpu, int int_req) return false; } +#if !defined(CONFIG_USER_ONLY) GuestPanicInformation *cpu_get_crash_info(CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); @@ -219,6 +220,7 @@ GuestPanicInformation *cpu_get_crash_info(CPUState *cpu) } return res; } +#endif void cpu_dump_state(CPUState *cpu, FILE *f, int flags) {