From patchwork Fri Dec 16 22:04:07 2022 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: 13075572 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C81ADC46467 for ; Fri, 16 Dec 2022 22:31:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ion-0007ew-Kr; Fri, 16 Dec 2022 17:04:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6Ioa-0007dX-38 for qemu-devel@nongnu.org; Fri, 16 Dec 2022 17:04:24 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6IoY-0005Ad-4o for qemu-devel@nongnu.org; Fri, 16 Dec 2022 17:04:23 -0500 Received: by mail-ej1-x62b.google.com with SMTP id n20so9390938ejh.0 for ; Fri, 16 Dec 2022 14:04:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i2cVk58Dcn2Rj8aTFRvN2/fiers8pgqo5iyjoGh8F+w=; b=iMZl//DVGdc74hAZUvDezhtC31xHMwxivZAdDW64VkSgvRaFbqLPhKq86YbHoNRpqi hr7uyey5mdaWWFvWg7m9mDe4kgdhohY4FbF86rxfyoUxc/UZOfC4wwmc00JNxNCw8ylY 4x9UGGgIkC6Pt84dAGYmChZj7Rg8Xptc5j+Uk0pHfOEKufrhtil5oOg/X1gKXWX/E99N mVIo9TU1WoGVZZZR4D76ljjNCtonuYUoqyFwuQVC1gsrUqJ6ssHQCU+wbQOBrn2lUmAY BcwuH80ut6fLMS46RejvarNfpphy9dZES63gFcgiHeDUQoMKKj8Uqr+IKmtLtV/q3BUO K5TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i2cVk58Dcn2Rj8aTFRvN2/fiers8pgqo5iyjoGh8F+w=; b=xR99KzStWzWUbvG7Z7gOBWdVBRPSNzGUlLlR32JAG86NG5NW74+VIODJCoKhYPVOVg HIxmvMfet/cnEXM26U5gng1v4vEsDZm32+RWW2uBKN+crFc3JkKJ4z766kZS1AVp5aMx cNpIzr63RZCXSOSrcgwL9b7ioMan5wlN4EsUXXDXoF8GTtY/HEMXRY9/XISxAqLNOoRs P7YTHoTGS+GMYh6R79WeIZ98LL5OlHszecePeHl0a429FMUfEyZA9ABP7aEUuhsYeJHr Gca/72jQLGQrqaXvTaN0/cDVn91iQzPwThupq1n3Ulu0XRmMEh19sYbuAANqkwN2a7As xXaw== X-Gm-Message-State: AFqh2kpuIzt3Hl+oX5NE8AWqDGjXiDIbbdCUUeJvKmf6zo8umqyK4D3Q 82Pq95l07pC18LaXKLcGeo4BvwaUCFbGVer5Lq0= X-Google-Smtp-Source: AMrXdXu5txSuLe9aj+LmfoL66P4AtYBDM5fa1jCZpD5s5MJFqLRkZYWPuzz7B7I9xd45doewPc6NEQ== X-Received: by 2002:a17:906:a20d:b0:7fc:4242:f9e9 with SMTP id r13-20020a170906a20d00b007fc4242f9e9mr142598ejy.70.1671228260600; Fri, 16 Dec 2022 14:04:20 -0800 (PST) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id u11-20020a170906b10b00b00781dbdb292asm1275400ejy.155.2022.12.16.14.04.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 16 Dec 2022 14:04:20 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Thomas Huth , Halil Pasic , Paolo Bonzini , Christian Borntraeger , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Eric Farman , Ilya Leoshkevich , qemu-s390x@nongnu.org, Richard Henderson , Peter Xu , Matthew Rosato Subject: [PATCH 1/5] exec/memory: Expose memory_region_access_valid() Date: Fri, 16 Dec 2022 23:04:07 +0100 Message-Id: <20221216220411.6779-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221216220411.6779-1-philmd@linaro.org> References: <20221216220411.6779-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Instead of having hardware device poking into memory internal API, expose memory_region_access_valid(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/s390x/s390-pci-inst.c | 2 +- include/exec/memory-internal.h | 4 ---- include/exec/memory.h | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 66e764f901..35db7777e4 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "exec/memop.h" -#include "exec/memory-internal.h" +#include "exec/memory.h" #include "qemu/error-report.h" #include "sysemu/hw_accel.h" #include "hw/s390x/s390-pci-inst.h" diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 9fcc2af25c..100c1237ac 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -38,10 +38,6 @@ void flatview_unref(FlatView *view); extern const MemoryRegionOps unassigned_mem_ops; -bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr, - unsigned size, bool is_write, - MemTxAttrs attrs); - void flatview_add_to_dispatch(FlatView *fv, MemoryRegionSection *section); AddressSpaceDispatch *address_space_dispatch_new(FlatView *fv); void address_space_dispatch_compact(AddressSpaceDispatch *d); diff --git a/include/exec/memory.h b/include/exec/memory.h index 91f8a2395a..c37ffdbcd1 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2442,6 +2442,10 @@ void memory_global_dirty_log_stop(unsigned int flags); void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool disabled); +bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr, + unsigned size, bool is_write, + MemTxAttrs attrs); + /** * memory_region_dispatch_read: perform a read directly to the specified * MemoryRegion. From patchwork Fri Dec 16 22:04:08 2022 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: 13075588 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EC547C4332F for ; Fri, 16 Dec 2022 22:35:23 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6IpA-0007p2-Je; Fri, 16 Dec 2022 17:05:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6Iog-0007ex-Jh for qemu-devel@nongnu.org; Fri, 16 Dec 2022 17:04:33 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ioe-0005BE-Eb for qemu-devel@nongnu.org; Fri, 16 Dec 2022 17:04:29 -0500 Received: by mail-ej1-x629.google.com with SMTP id x22so9205920ejs.11 for ; Fri, 16 Dec 2022 14:04:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZdbZRXHfDz9my/2NqwlMSDYtYDjTBgfAErVO9Fq757o=; b=sQpGTdNl81oqAdJPrntXviKZtH+/I5g09Vbx5/fJNm3mpQABV8GIZ+q5uC4yNWNZ79 k32y0x+CFSx4tlaIgICAUaddRmXNDXmlpBuLi/mtCjI4R38DkaFDj273tUvRS1TTMlBu vlfW712xWGiRe4StWUayYbm1JULsAfr79B84zkqWVW2XGt9gpynGo22+gHEzaQhAGFZh 8kH1TY4GCtRE3mlyazY0ChJsY0mksUkxkXjMBY78zEnHI+Aj85nGwmXJXF+TqAKB+6PJ nL/OjEAG9dCbSpSq4Htn5ZOE1FhoajPJgkWf9CMfQADessYMKAYSOEBKTD4UKCFpU/6w qtpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZdbZRXHfDz9my/2NqwlMSDYtYDjTBgfAErVO9Fq757o=; b=YGXQAiLz9guJ8AbxKsHt/+ALnPweToAJD97OABEwYl+xup2ARYg0o2HY2wgZKmcZQ2 HBaNOH7ajKpa/vKfIiSjtQrm3LqYt7KaK01E/3ZunyZpWXgUFnZ2ScLhCtH54QpcJBQx xdiwXJtI1L4k6ubPlmvLi+pUlc3dbuV0HVptGbKPOASNwo2O6Mf8KsgnnfNJoZlhZDSO 1dY1Ojaf3qXhJRQ/Td6fdIOrMNQtyHrLZzetfajQ/y9WKDVNoH/cs81dQ7cnplbX4wHU Gcsdg1JZaXAq1SyD2CaVj4uVHHqWBlB2pk8ZhbTcoGlwjBzfFP+Q/pjLnELlfMhn+Iss Wbfw== X-Gm-Message-State: ANoB5pm0DXIkx/+48j3hE2SXgOD2DpST7dm0RIBbJae63AqDGC3n4odp MrSmdYjgjzjaDJXHSSU8ejk3dnmI7THcH9I0S2E= X-Google-Smtp-Source: AA0mqf7w4Th41q3sZYqLrKys94QA51EDfCwrD1/tvUOylL9ESlfNmo/WlKIZD2r4JsiWQ+ztXfhBMw== X-Received: by 2002:a17:906:2a8c:b0:78d:f454:3771 with SMTP id l12-20020a1709062a8c00b0078df4543771mr26890169eje.20.1671228266228; Fri, 16 Dec 2022 14:04:26 -0800 (PST) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id q1-20020a17090676c100b007c6be268252sm1283252ejn.77.2022.12.16.14.04.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 16 Dec 2022 14:04:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Thomas Huth , Halil Pasic , Paolo Bonzini , Christian Borntraeger , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Eric Farman , Ilya Leoshkevich , qemu-s390x@nongnu.org, Richard Henderson , Peter Xu , Matthew Rosato Subject: [PATCH 2/5] hw/s390x/pv: Un-inline s390_pv_init() Date: Fri, 16 Dec 2022 23:04:08 +0100 Message-Id: <20221216220411.6779-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221216220411.6779-1-philmd@linaro.org> References: <20221216220411.6779-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=philmd@linaro.org; helo=mail-ej1-x629.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org There is no point in having s390_pv_init() inlined. Signed-off-by: Philippe Mathieu-Daudé --- hw/s390x/pv.c | 13 +++++++++++++ include/hw/s390x/pv.h | 14 +------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c index 8dfe92d8df..9c511369b2 100644 --- a/hw/s390x/pv.c +++ b/hw/s390x/pv.c @@ -26,6 +26,19 @@ static bool info_valid; static struct kvm_s390_pv_info_vm info_vm; static struct kvm_s390_pv_info_dump info_dump; +int s390_pv_init(ConfidentialGuestSupport *cgs, Error **errp) +{ + if (!cgs) { + return 0; + } + if (kvm_enabled()) { + return s390_pv_kvm_init(cgs, errp); + } + + error_setg(errp, "Protected Virtualization requires KVM"); + return -1; +} + static int __s390_pv_cmd(uint32_t cmd, const char *cmdname, void *data) { struct kvm_pv_cmd pv_cmd = { diff --git a/include/hw/s390x/pv.h b/include/hw/s390x/pv.h index 9360aa1091..5bca5bcaf1 100644 --- a/include/hw/s390x/pv.h +++ b/include/hw/s390x/pv.h @@ -12,7 +12,6 @@ #ifndef HW_S390_PV_H #define HW_S390_PV_H -#include "qapi/error.h" #include "sysemu/kvm.h" #ifdef CONFIG_KVM @@ -78,17 +77,6 @@ static inline int kvm_s390_dump_completion_data(void *buff) { return 0; } #endif /* CONFIG_KVM */ int s390_pv_kvm_init(ConfidentialGuestSupport *cgs, Error **errp); -static inline int s390_pv_init(ConfidentialGuestSupport *cgs, Error **errp) -{ - if (!cgs) { - return 0; - } - if (kvm_enabled()) { - return s390_pv_kvm_init(cgs, errp); - } - - error_setg(errp, "Protected Virtualization requires KVM"); - return -1; -} +int s390_pv_init(ConfidentialGuestSupport *cgs, Error **errp); #endif /* HW_S390_PV_H */ From patchwork Fri Dec 16 22:04:09 2022 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: 13075558 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D5C61C4332F for ; Fri, 16 Dec 2022 22:24:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ip8-0007hr-8a; Fri, 16 Dec 2022 17:04:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6Iom-0007fg-2M for qemu-devel@nongnu.org; Fri, 16 Dec 2022 17:04:37 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Iok-0005Bt-0G for qemu-devel@nongnu.org; Fri, 16 Dec 2022 17:04:35 -0500 Received: by mail-ed1-x532.google.com with SMTP id i9so5511578edj.4 for ; Fri, 16 Dec 2022 14:04:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eLBFoNDM1Z35hmIAgQprz2tI86WbCCpPFsa3peLy1EM=; b=XGo4b7JBCogNCEAhigxMHOfTKfQN2L+sg+8R9B+w86byt19bl/87m9C0Jbv67cYesl jz8JlkzkKLvK8KtEaky89sYrkmzSiekvvfnJL9WuI1lEMJactDo+wmoN0D8MT6zWEQAO o1rf+sca3RD8LmGpgrrSNnqRrOkM/NuoBzLW7yx9GKYT/5HZupc9L8prpoakrWwMprHc L/lNX0hM6iEOi8f7n1XznOAy9SL+Ghst5W9TBa9eN7JygLpeX7rMNF2K3dUoWZtUJZpz Dp3pr3issqRsrcjsLJ5M9ZHnNEW2ombpJIo0eJ4BodHaA5GxT7ShkWPr4GkVdCc3T/7N cZ/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eLBFoNDM1Z35hmIAgQprz2tI86WbCCpPFsa3peLy1EM=; b=CSk5ILYsqtWFARtMo2eETohcTdi62Q5vLkEpbvHdBqQAFOXOhCoOuufF2pTLt5fAwN uNI+4wOyrFquwTKXw/evPtXWytxqGfqFDS/Ex1/dUibdtZqe19hd78AzTojGAOs8BHOQ ovc/JIaLDOQlrHrCHIdkyq4Fsp3SQXRtzx8MJUJ3kNoQ1vNw9I1LIVq5bxXBs/N940+P gfkZ23M8DTyJmppBttPezam/4a5TKINdWGeTSsjPhHNCq4M2MtqhU1aY7wRBmEZFJv7y bmImhQ7lAK+vBFjgjfFnCCwBIDOxjTqNQeG6/os7aFKwQEfIath70BFyY7ZNN4qFBgti 2aCw== X-Gm-Message-State: ANoB5pnVXNtr1ywkkyfUuWfRwx466eOsEqvkq4jwXITR0vJVnrT/Ur1u iCFFxFnX6Z6KVewWmzil6H+zh80/oFO3s+BRegY= X-Google-Smtp-Source: AA0mqf4eDU2tx+oMsbw8kSiXf58LNIY3HkLotQiP4btYdYjoFIu1/+iua36H0EUalFQfQZdZcfWoJQ== X-Received: by 2002:a05:6402:f24:b0:46d:ca42:2e59 with SMTP id i36-20020a0564020f2400b0046dca422e59mr33897754eda.11.1671228272238; Fri, 16 Dec 2022 14:04:32 -0800 (PST) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id b4-20020aa7d484000000b0046267f8150csm1312805edr.19.2022.12.16.14.04.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 16 Dec 2022 14:04:31 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Thomas Huth , Halil Pasic , Paolo Bonzini , Christian Borntraeger , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Eric Farman , Ilya Leoshkevich , qemu-s390x@nongnu.org, Richard Henderson , Peter Xu , Matthew Rosato Subject: [PATCH 3/5] hw/s390x/pv: Simplify s390_is_pv() for user emulation Date: Fri, 16 Dec 2022 23:04:09 +0100 Message-Id: <20221216220411.6779-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221216220411.6779-1-philmd@linaro.org> References: <20221216220411.6779-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=philmd@linaro.org; helo=mail-ed1-x532.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Protected Virtualization is irrelevant in user emulation. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/s390x/pv.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/hw/s390x/pv.h b/include/hw/s390x/pv.h index 5bca5bcaf1..a4814ce303 100644 --- a/include/hw/s390x/pv.h +++ b/include/hw/s390x/pv.h @@ -12,6 +12,12 @@ #ifndef HW_S390_PV_H #define HW_S390_PV_H +#ifdef CONFIG_USER_ONLY + +static inline bool s390_is_pv(void) { return false; } + +#else /* !CONFIG_USER_ONLY */ + #include "sysemu/kvm.h" #ifdef CONFIG_KVM @@ -79,4 +85,6 @@ static inline int kvm_s390_dump_completion_data(void *buff) { return 0; } int s390_pv_kvm_init(ConfidentialGuestSupport *cgs, Error **errp); int s390_pv_init(ConfidentialGuestSupport *cgs, Error **errp); +#endif /* CONFIG_USER_ONLY */ + #endif /* HW_S390_PV_H */ From patchwork Fri Dec 16 22:04:10 2022 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: 13075565 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 787D1C4332F for ; Fri, 16 Dec 2022 22:27:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6IpE-0007s1-B8; Fri, 16 Dec 2022 17:05:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6Iot-0007hM-Au for qemu-devel@nongnu.org; Fri, 16 Dec 2022 17:04:45 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ioq-0005EX-B5 for qemu-devel@nongnu.org; Fri, 16 Dec 2022 17:04:42 -0500 Received: by mail-ej1-x62c.google.com with SMTP id kw15so9210375ejc.10 for ; Fri, 16 Dec 2022 14:04:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=b6XVltRxKK+Iiw2FnUeIqN6W0oZMrnhMzv1AL8xsjzw=; b=DBQHO3QBD1AUyKyJqnkqsOhQUI51KHZWId4ict2/0IPbti2e/RDlHt4RQGHQkBI9Xz mwYkWLBLQ+uSsWnNd5fu8eP92oYB9Hu4KjPOamoCe0bnSQhxbQgA1NlKleQfAraLvThp JwTREePzdFAzLRWy5MoHsZu215rufbTRPPF63E27z2fbPcsG3jnf//8V+dIGK9a4LRgz q3BJyNyddWym5MVux/ctAqpM47y50uPL+nkpsRvUUfJrNJG6P6TRowBq4BLAPz7gv0xD kFjXmgXX59KyEXx/ZdYBtoBIuOarPGZsUjgbctrWPaGKS7deOg7iXjIv4nhn5k9AnYAT vnTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b6XVltRxKK+Iiw2FnUeIqN6W0oZMrnhMzv1AL8xsjzw=; b=2fjehCix7VGDUfI8L/SEYENPxQAWyXMpz2Fya0oNimnlgqy2x0J2QSZVlvRQPidnyk T4Acy7noUMUbvNQP8m83fyeWCAafBXMpDbI29PqJ2/1FwweliAv+baY5LgLSmencg46u 3IqJCnaRGkD/n+7ZIfSPNTn+KBjD2qpLJ+SLme9MuSJ4wvOvhRdFYPqv9UqDD+yE14h9 rxUnTzDdO73o0+iAa3Sm13lrr1mmhYKctfU4Po8yv0ak6DK40rSDcnZX34Yrqufh3nqW m9Deti8jYElNg6L+it4/8hn/Mv4b4/R1WH+BdKMz34A8Bhahsl2iC35oYWCDbnvmEnj2 AFIw== X-Gm-Message-State: ANoB5pm8hLYJeOV1lW1MXQjcManob9CDhsowlrELpg5dPXGQJg5l6A+P UtWd85uegaGCU9IS8IL42vrfYCHISemli+3XhFI= X-Google-Smtp-Source: AA0mqf7+/pw2dylZ3yAILSCzSMIl6KzqEMW08UDBdA4Klh/CeZmTDZ5O5omSshyuov2dn32/R5xfuA== X-Received: by 2002:a17:907:f8d:b0:7c0:f684:9091 with SMTP id kb13-20020a1709070f8d00b007c0f6849091mr14812869ejc.11.1671228278463; Fri, 16 Dec 2022 14:04:38 -0800 (PST) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id q23-20020a17090676d700b007c1175334basm1288832ejn.78.2022.12.16.14.04.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 16 Dec 2022 14:04:38 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Thomas Huth , Halil Pasic , Paolo Bonzini , Christian Borntraeger , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Eric Farman , Ilya Leoshkevich , qemu-s390x@nongnu.org, Richard Henderson , Peter Xu , Matthew Rosato Subject: [PATCH 4/5] target/s390x/tcg/misc_helper: Remove unused "memory.h" include Date: Fri, 16 Dec 2022 23:04:10 +0100 Message-Id: <20221216220411.6779-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221216220411.6779-1-philmd@linaro.org> References: <20221216220411.6779-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=philmd@linaro.org; helo=mail-ej1-x62c.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/s390x/tcg/misc_helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 71388a7119..576157b1f3 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -23,7 +23,6 @@ #include "qemu/main-loop.h" #include "cpu.h" #include "s390x-internal.h" -#include "exec/memory.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "qemu/timer.h"