From patchwork Tue May 26 17:24:21 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: 281875 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 E3B22C433E3 for ; Tue, 26 May 2020 17:25:52 +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 B35A4204EF for ; Tue, 26 May 2020 17:25:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EPaLxqVz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B35A4204EF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jddKp-00011r-Pl for qemu-devel@archiver.kernel.org; Tue, 26 May 2020 13:25:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jddJb-0006NI-P1; Tue, 26 May 2020 13:24:35 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:43162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jddJZ-0004M7-Qo; Tue, 26 May 2020 13:24:34 -0400 Received: by mail-ej1-x641.google.com with SMTP id a2so24647307ejb.10; Tue, 26 May 2020 10:24:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ySZN0x/gpW9u9k16b9nqnSd6Xdlq5rvuji37dlolnbk=; b=EPaLxqVztq6HHTgASgBqieyKIVpffbusau7Sb4xVVYBjsKVYH2ISfxZ9msqCjvf9Va gwi+eDTErWUymz4aH6ZjpT/h4segUpRBy/2cVdb1k6/edjAug9qgflPllShmDEL+0YAw +6DPSkzm4IVMNRepwyr99zReUvK6MMgpHWahjvaYo9xBsttDE/dWU7OEHRRZ41TuXXDH Hppx6M+QDRIqp7z5t6YdLyTECEhbywVAM4nyNwNzxuRUDCNoQj3z99qGpCkH7MgJX5gH r+6KgBG5ml22ttaaujMguaNNYAuL7CtnY/AroPSVojkFdBQx5lm0RlJV03CSAa56WfpS keTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ySZN0x/gpW9u9k16b9nqnSd6Xdlq5rvuji37dlolnbk=; b=uKqUDAf6C/ZdJy8o+l7o083DKM42IbjQKpBC7KEmDQzZXyWCmvqBGeCdkvp581jzbQ 4c4f7N8FKjaws3bg1C0yu05S0pNWYOe/nilJ2MG9D+q8gFpt9LNg/PLOCxIuKCbMnsfs DEilxuxWVB3EFZMlKV8ZkUfmkSpOLKLsiQ8vC80HqXzJaeZaAd2Jme+0OCEKzMBieA4F v8/ySqyLcCZ79wawWOYEuAWa2X1t7Pu6i1MEHpRWklcIZXrFN/fzdlOiITfze/EtNDja AUt6Wx2qDIOe0PmbdI9BXLF2dwlhAo1hmK9opCYZRCThBAw7iTjnKdN/bBYKsBQUrVqr HUuQ== X-Gm-Message-State: AOAM533eA4UaNU1RWYkNbA2a4/EH6ylcmy6IIMtiR5X9S9Rvnp/5qWB/ shoK5xNupdU9he39U5qXtxAxwQYiqE8= X-Google-Smtp-Source: ABdhPJwnH6TkfWy/1O3rgJT1eVUVOYC1sHpgM286TBTi8I1uW+9Z4O4az89O30KCWjhlPuoIaIivRA== X-Received: by 2002:a17:906:16d3:: with SMTP id t19mr2011617ejd.36.1590513871429; Tue, 26 May 2020 10:24:31 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id bf15sm421357edb.46.2020.05.26.10.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 10:24:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/7] sysemu/accel: Restrict machine methods to system-mode Date: Tue, 26 May 2020 19:24:21 +0200 Message-Id: <20200526172427.17460-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200526172427.17460-1-f4bug@amsat.org> References: <20200526172427.17460-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, 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: "Edgar E . Iglesias" , David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Roman Bolshakov , qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Restrict init_machine(), setup_post() and has_memory() to system-mode. Reviewed-by: Edgar E. Iglesias Reviewed-by: Cornelia Huck Signed-off-by: Philippe Mathieu-Daudé --- include/sysemu/accel.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index 47e5788530..e08b8ab8fa 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -37,10 +37,12 @@ typedef struct AccelClass { /*< public >*/ const char *name; +#ifndef CONFIG_USER_ONLY int (*init_machine)(MachineState *ms); void (*setup_post)(MachineState *ms, AccelState *accel); bool (*has_memory)(MachineState *ms, AddressSpace *as, hwaddr start_addr, hwaddr size); +#endif bool *allowed; /* * Array of global properties that would be applied when specific From patchwork Tue May 26 17:24:23 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: 281873 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 4259BC433E1 for ; Tue, 26 May 2020 17:27:49 +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 0E102204EF for ; Tue, 26 May 2020 17:27:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nnL9ngTs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E102204EF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jddMi-0004df-8r for qemu-devel@archiver.kernel.org; Tue, 26 May 2020 13:27:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jddJe-0006Zb-Sm; Tue, 26 May 2020 13:24:38 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:41912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jddJe-0004ND-4b; Tue, 26 May 2020 13:24:38 -0400 Received: by mail-ej1-x641.google.com with SMTP id x1so24673275ejd.8; Tue, 26 May 2020 10:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nzoy1AWlTOTo2Vla8z7lKUcDunyptX3S9k4CBZFpAHk=; b=nnL9ngTs6y+idNtc7cuTjI9ljzVR2ApgvxutfqI/6bBIhbOwxevqwNoN6EphiHe8pj bPJADMFZMlswDN/JDeoZTkYAlMwotxA04+SgM4C5axa69kI4w/D+5av0YfSUdgjQJFac dPpUTIpebKAxR8s1UsbgOEn997KcaDntXik3lNFQ7QCtTH9qIZfH3sBdQSRqjNgXr3yS 943vnvdrmlaaRvPu8IujyRN1jqbiPzDICrvwmbVDNbjQ5a9Z52woF4ZjZAGTr6l4Y7Ya FIKBX2pSHDFbkw1HPEb/Uaevr8trFo1WlLLkCxSckD7zslgbn6w5bnhxgv8VYDS1DZTh 5kpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nzoy1AWlTOTo2Vla8z7lKUcDunyptX3S9k4CBZFpAHk=; b=d03aiKDT+KRZulQKlboSN6vpyyusXdQWrdukSIJJW9dYwrPDX8cHc+OMqNpA61RmXE E5Ql/FaOdWVVt/UFaAaeUfhSrVs/92OXzwZ22P44ns4uN44ZNZ2Eu0F4rujvBpYk8Erq oCR19RsD8bCi3ZsLJmrbusdeVf/xGsTiEgLo/Y7SHEiQGUpJ7+CfLSrmVSd5o3Oxg+V6 LiclmmIsi8LZyPj8oU/I7k9m7eBvnNiXafijogso7pQwj1+nuz3YqOxJRN1dbmeCorO/ FATUtYsf4aJskAl2+Xd1h1m5ljkM3pNgU4RpZldr6GTXauLlN9NIOCtd9aWHXBQVC1y+ B6sA== X-Gm-Message-State: AOAM532p7opN3Bdm8AYag+aijtvYI6w4Yn/IQiUgNb7LYdLqD3Pg90us OHYCUKHTxCTvS2LZnnPhBiEzvgN4SJE= X-Google-Smtp-Source: ABdhPJycANe7Wy6qzm4YTlQoJ6T4Ej8ZDStbCnFv3eXvHVa/T3usj/YjXbveJ1ln7d282lq7FB6Nqg== X-Received: by 2002:a17:906:5e08:: with SMTP id n8mr2080984eju.132.1590513874770; Tue, 26 May 2020 10:24:34 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id bf15sm421357edb.46.2020.05.26.10.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 10:24:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/7] sysemu/hvf: Only declare hvf_allowed when HVF is available Date: Tue, 26 May 2020 19:24:23 +0200 Message-Id: <20200526172427.17460-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200526172427.17460-1-f4bug@amsat.org> References: <20200526172427.17460-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, 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: "Edgar E . Iglesias" , David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Roman Bolshakov , qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" When HVF is not available, the hvf_allowed variable does not exist. Reviewed-by: Edgar E. Iglesias Reviewed-by: Cornelia Huck Signed-off-by: Philippe Mathieu-Daudé --- v2: Fixed typo s/tcg_allowed/hvf_allowed/ (Edgar) --- include/sysemu/hvf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index d211e808e9..fe95743124 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -18,7 +18,6 @@ #include "exec/memory.h" #include "sysemu/accel.h" -extern bool hvf_allowed; #ifdef CONFIG_HVF #include #include @@ -26,11 +25,12 @@ extern bool hvf_allowed; #include "target/i386/cpu.h" uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, int reg); +extern bool hvf_allowed; #define hvf_enabled() (hvf_allowed) -#else +#else /* !CONFIG_HVF */ #define hvf_enabled() 0 #define hvf_get_supported_cpuid(func, idx, reg) 0 -#endif +#endif /* !CONFIG_HVF */ /* hvf_slot flags */ #define HVF_SLOT_LOG (1 << 0) From patchwork Tue May 26 17:24:26 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: 281872 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 6C61CC433DF for ; Tue, 26 May 2020 17:29:45 +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 36117204EF for ; Tue, 26 May 2020 17:29:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BQYkABkJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 36117204EF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jddOa-0007vC-Bn for qemu-devel@archiver.kernel.org; Tue, 26 May 2020 13:29:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jddJk-0006pY-9I; Tue, 26 May 2020 13:24:44 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:45450) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jddJj-0004Rw-Cw; Tue, 26 May 2020 13:24:43 -0400 Received: by mail-ed1-x544.google.com with SMTP id s19so18295103edt.12; Tue, 26 May 2020 10:24:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4W21aaZREdkuSM60kf8a80KRCL1+S7E7CeXJsG1JSx8=; b=BQYkABkJjEjV9C98u2Zf6f/JUND+40YzYHmJ4Z6TOW6foPmOSiYspzoaX9NkhlIhvR ljQhrfhe5myXFpJXo4YNmI4WQtjLZnjVbq3/xOini5RsaW+DF+vniktw7qZ5V9/d+oVK P+TgO9CxxNQILh20KerSfgGgpQc1+YQjgBSZzIbZTIDWYD9YW7gnUJ5f1LmJ9/YctfWm 0zka3w1FOy6uBlBp0WFAI0l2x67XLS9hxoh/IYkgQN6y1cRajf6HW5gPWngp+2vVeH5e S5hoIbGRTnMbg0g37fa+4EOMNwK72AYvLeIzkBv/yicQKfwEtnlwreupnae31yKm7m+H 87lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4W21aaZREdkuSM60kf8a80KRCL1+S7E7CeXJsG1JSx8=; b=rQ+YxxhkBjXEzTpIPJQui93nEwhEh1UKafCVOMP8PkYAyTkktAHpUS4faLruNYMGDB lIkBSdPE2xF31EY1j2ZGF8aTRKEn7z+zx65YCHcezeYO/+wwR3mLrL3S8RX0DnQVbjGU 5kxeiQOBiip9J7oAlKFG2IpfOxaTSjlouqTZmqdb0Ow/q/T5jnHFODflTQLllmriPBIn 4iUmPGzjBdIIdYdtAPWxnRLeCGylW9QznLxqCllR5Q/oFjwfDLBsaJyH+SwUGLwj5uVX m+diBEOoxJJnsqmI+nZidV2m3ERaycz/wG+yT5pIEmyp69ybuAbn3OTjrZN7pMedJ6B/ d+VA== X-Gm-Message-State: AOAM530d/H0qOzy37TGq8j0zQ+S9nqty0RGzvqhN3Z3BpdZgjpcN+LX9 qqwHeCpe5GyuSEY/ULIQKDp1JmEJ+go= X-Google-Smtp-Source: ABdhPJzvR5avvOpOZQYK/x/0WJuE4wXAy+JUPQr34XQMnXrAZtyvoLm89VkUPFxSol1G33VslGBLgw== X-Received: by 2002:a50:d1d3:: with SMTP id i19mr20425145edg.35.1590513881079; Tue, 26 May 2020 10:24:41 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id bf15sm421357edb.46.2020.05.26.10.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 10:24:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/7] target/s390x/helper: Clean ifdef'ry Date: Tue, 26 May 2020 19:24:26 +0200 Message-Id: <20200526172427.17460-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200526172427.17460-1-f4bug@amsat.org> References: <20200526172427.17460-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, 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: David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Roman Bolshakov , qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" All this code is guarded checking CONFIG_USER_ONLY definition. Drop the duplicated checks. Reviewed-by: David Hildenbrand Reviewed-by: Cornelia Huck Signed-off-by: Philippe Mathieu-Daudé --- target/s390x/helper.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 09f60406aa..9257d388ba 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -42,9 +42,6 @@ void s390x_cpu_timer(void *opaque) { cpu_inject_cpu_timer((S390CPU *) opaque); } -#endif - -#ifndef CONFIG_USER_ONLY hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr vaddr) { @@ -98,14 +95,12 @@ void s390_handle_wait(S390CPU *cpu) CPUState *cs = CPU(cpu); if (s390_cpu_halt(cpu) == 0) { -#ifndef CONFIG_USER_ONLY if (is_special_wait_psw(cpu->env.psw.addr)) { qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); } else { cpu->env.crash_reason = S390_CRASH_REASON_DISABLED_WAIT; qemu_system_guest_panicked(cpu_get_crash_info(cs)); } -#endif } } From patchwork Tue May 26 17:24:27 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: 281874 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 318FAC433E0 for ; Tue, 26 May 2020 17:26:28 +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 EC504204EF for ; Tue, 26 May 2020 17:26:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LREDIWJx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC504204EF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jddLP-0002ZU-0O for qemu-devel@archiver.kernel.org; Tue, 26 May 2020 13:26:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jddJl-0006u1-Rb; Tue, 26 May 2020 13:24:45 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:45448) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jddJl-0004TN-2C; Tue, 26 May 2020 13:24:45 -0400 Received: by mail-ed1-x541.google.com with SMTP id s19so18295187edt.12; Tue, 26 May 2020 10:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lXlYd5mDWippGeVthUR2pLi5N4ankzNYCPx8o3NujjY=; b=LREDIWJxx4B3Ha0/bpf0Hk8y68xksGN7GewX10ouk3K/VyGQ6SzDZ0TI0k4ZR9j5Eu WlSoWLAuCA0NX7VNXdta0cqgKlEWX63INWLmjzHiNwfG6KyGubPS+99979AQaLKsrBFq wbbRQEDT1pp19nvVXJQT0uCIcZXfnGbYHURQs+pfnkrLnrg7STKTKhvgfzfL6BC7X1sU 8sFsi4tw9PiWIwgAiESJBsZEqPZhQH5oUU2LzL1FOEJ80iQmX9/B4n7cCEAqrR+7RnoP crV5gHm41/knqqIYrQaoc2ha/xIYcDGFvulW0hBUHhpd7L90AbAz7dtb9TvAEp++/qk8 YH0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lXlYd5mDWippGeVthUR2pLi5N4ankzNYCPx8o3NujjY=; b=fqpg0dM4nNbJIPOFfYwkUIBIKB5TJNg0qWDfTE7Z7n5GjbwSurtXIVUfdApgBXsdR3 9M/gsRU8I73SoysFdUB/PadjaT/2x9lueL0HYnndNviunqBqQZeTOObyBKkubgqn3IVr 2/9PEcZD8Spaj27KL/7JBKv2wA6NXFk5HvJOOCUq7/UzEkkS5RBiX7QVgAtu2JFJ8X5D 1oFoRZXxI2Y14Da0KDQaOLnnJMx+byZuDmicR6P9CHn3kXhETMenMZrO6WCgv0SdpGt7 zf8kG/jCzXdrysWeDNFqrrNA9Ez7UZ7y+vhf/K9fjTapH/jVYJGL+13PKBhVOvFYkeB4 QjWA== X-Gm-Message-State: AOAM530ckK1GkX6AwspRgJ1v4T0rI/0yrecNwhzljhXE4r7q9wJQSfUo kaq0naNrWrbi1LdEAbMG6sGkIDvqHmM= X-Google-Smtp-Source: ABdhPJww+rvpUSymARdYrNqFwgPT5+khuR2IHpjHQddzMvQeMt90fV3tOlMSBBEAxGxtj8uC+vpu1g== X-Received: by 2002:a05:6402:31b1:: with SMTP id dj17mr20998881edb.142.1590513882606; Tue, 26 May 2020 10:24:42 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id bf15sm421357edb.46.2020.05.26.10.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 10:24:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 7/7] target/s390x: Restrict system-mode declarations Date: Tue, 26 May 2020 19:24:27 +0200 Message-Id: <20200526172427.17460-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200526172427.17460-1-f4bug@amsat.org> References: <20200526172427.17460-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x541.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, 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: David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Roman Bolshakov , qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As these declarations are restricted to !CONFIG_USER_ONLY in helper.c, only declare them when system-mode emulation is used. Signed-off-by: Philippe Mathieu-Daudé --- v2: Keep load_psw() is /* cc_helper.c */ section (cohuck) --- target/s390x/internal.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/target/s390x/internal.h b/target/s390x/internal.h index c1678dc6bc..b1e0ebf67f 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -236,9 +236,11 @@ int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, /* cc_helper.c */ const char *cc_name(enum cc_op cc_op); -void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr); uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst, uint64_t vr); +#ifndef CONFIG_USER_ONLY +void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr); +#endif /* CONFIG_USER_ONLY */ /* cpu.c */ @@ -303,18 +305,18 @@ void s390_cpu_gdb_init(CPUState *cs); /* helper.c */ void s390_cpu_dump_state(CPUState *cpu, FILE *f, int flags); -hwaddr s390_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); -hwaddr s390_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr); +void do_restart_interrupt(CPUS390XState *env); +#ifndef CONFIG_USER_ONLY uint64_t get_psw_mask(CPUS390XState *env); void s390_cpu_recompute_watchpoints(CPUState *cs); void s390x_tod_timer(void *opaque); void s390x_cpu_timer(void *opaque); -void do_restart_interrupt(CPUS390XState *env); void s390_handle_wait(S390CPU *cpu); +hwaddr s390_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); +hwaddr s390_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr); #define S390_STORE_STATUS_DEF_ADDR offsetof(LowCore, floating_pt_save_area) int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch); int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len); -#ifndef CONFIG_USER_ONLY LowCore *cpu_map_lowcore(CPUS390XState *env); void cpu_unmap_lowcore(LowCore *lowcore); #endif /* CONFIG_USER_ONLY */