From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 9CFCCC433E0 for ; Tue, 9 Mar 2021 16:41:09 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 38A9064FF3 for ; Tue, 9 Mar 2021 16:41:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38A9064FF3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BdIh92nyszmdxiTR9RE0k7QzkMm5fPG8Y+Ke4xMw5FY=; b=dLXks7J/1QqSPl8WCWITV1bnG xN6fqyvTy+TKUw7PwxU3Dt5Ly+wPHnyLJG8NzuZIjZC3qPy55QagctN6+TgSLLs86GgxpJ6zlCgSY qaqKXkshIcHWJF75pMRLmOuQdHJBS4aOK8iE5KUNB53WgKJ7q7DSLYa5+v00SSq8CQdJyTBJAqNJi ZK7EeBemWq6KdC2W7u9fijVeaFAbyWFXdis4EkiHweOpJlsWumjSCsrkDVijPvzDldfJ+7ObN4DKb PF0Zv3FrtIjYYNUHDbl6aegoKtOnzdSFZtr1FPipZykucsVvm8j+DE+b4XEph08oRcm2GwsRu6RJW 8DoniRRsw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJfOS-0056Ij-0R; Tue, 09 Mar 2021 16:39:36 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJfOO-0056HC-4a for linux-arm-kernel@lists.infradead.org; Tue, 09 Mar 2021 16:39:34 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E66F565237; Tue, 9 Mar 2021 16:39:29 +0000 (UTC) Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=hot-poop.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1lJfOK-000ayV-1k; Tue, 09 Mar 2021 16:39:28 +0000 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org Cc: Andre Przywara , Will Deacon , Alexandru Elisei Subject: [PATCH 1/3] kvmtool: Abstract KVM_VM_TYPE into a weak function Date: Tue, 9 Mar 2021 16:39:07 +0000 Message-Id: <20210309163909.822149-2-maz@kernel.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210309163909.822149-1-maz@kernel.org> References: <20210309163909.822149-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, Andre.Przywara@arm.com, will@kernel.org, alexandru.elisei@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210309_163932_452077_5A8C7905 X-CRM114-Status: GOOD ( 13.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Most architectures pass a fixed value for their VM type. However, arm64 uses it as a parameter describing the size of the guest's physical address space. In order to support this, introduce a kvm__get_vm_type() helper that only returns KVM_VM_TYPE for now. Signed-off-by: Marc Zyngier --- include/kvm/kvm.h | 1 + kvm.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/kvm/kvm.h b/include/kvm/kvm.h index 53373b0..72a42e8 100644 --- a/include/kvm/kvm.h +++ b/include/kvm/kvm.h @@ -100,6 +100,7 @@ int kvm__init(struct kvm *kvm); struct kvm *kvm__new(void); int kvm__recommended_cpus(struct kvm *kvm); int kvm__max_cpus(struct kvm *kvm); +int kvm__get_vm_type(struct kvm *kvm); void kvm__init_ram(struct kvm *kvm); int kvm__exit(struct kvm *kvm); bool kvm__load_firmware(struct kvm *kvm, const char *firmware_filename); diff --git a/kvm.c b/kvm.c index e327541..5bc66c8 100644 --- a/kvm.c +++ b/kvm.c @@ -428,6 +428,11 @@ int kvm__max_cpus(struct kvm *kvm) return ret; } +int __attribute__((weak)) kvm__get_vm_type(struct kvm *kvm) +{ + return KVM_VM_TYPE; +} + int kvm__init(struct kvm *kvm) { int ret; @@ -461,7 +466,7 @@ int kvm__init(struct kvm *kvm) goto err_sys_fd; } - kvm->vm_fd = ioctl(kvm->sys_fd, KVM_CREATE_VM, KVM_VM_TYPE); + kvm->vm_fd = ioctl(kvm->sys_fd, KVM_CREATE_VM, kvm__get_vm_type(kvm)); if (kvm->vm_fd < 0) { pr_err("KVM_CREATE_VM ioctl"); ret = kvm->vm_fd; -- 2.30.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel