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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 150E6C433F5 for ; Sat, 5 Mar 2022 21:53:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232686AbiCEVyX (ORCPT ); Sat, 5 Mar 2022 16:54:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229716AbiCEVyU (ORCPT ); Sat, 5 Mar 2022 16:54:20 -0500 Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 599C0631E; Sat, 5 Mar 2022 13:53:29 -0800 (PST) Received: by mail-qt1-x829.google.com with SMTP id b23so10332348qtt.6; Sat, 05 Mar 2022 13:53:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bXmranGPLHTOH6hVyVVXhTm11KHwG3igIGZ59Jq8giI=; b=KDgg2khBFoblDxRAue2Jh7xJNDD9Xf5wJinQQpN73KEX1QCSCiHPOv82NmBIPFCqeL LaVvRC8kQG3I2Qmh0bHLL/XW90JnLGxao131ypOTUHttLiPyQjNJmnljyrcSCxT/KYHs x1wLfn6DD80OAwCOVg4al92mEpLr3BtOs7VNOa8tTr57AsruiO8QyGr2yxQOO3xY4lB4 6ZfA4nihzx/u8LQWpXQJ1fjJh91IoYimiY0FwzY7SlT7Ca//CHbDiYUmzhbYtIX9tSIj xBSATt7cfvRQ1SRp3v37vKIgWDtffj6hhzoP9QgWU1P2TsJCbj5EEs3ibZOjcFZnE6rq RkOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bXmranGPLHTOH6hVyVVXhTm11KHwG3igIGZ59Jq8giI=; b=ipMCoSpo392Z6AEslLYNq9R3XCooca5TWSAV19e1VqQRr/F5nYpBn+fbOVOjyGU7HE nOuV1FnBvTuB/GUYdonHpGsN6Bf/nOajt//3RZj95vJJ8BGQnst/Gpu8cBanmQohV50U snRGKT0StUeqOb1MFfSBQ9RPI0FLdAckoNuArQXRKTErLSjm571S9iXSsI7+ROQcPM9y 1sun1EV6ENMmNgDxeq0cvi8K0M8YuEoFBqSayVzzr5YUM+miCaW4VYJVSf++Hpg+15Xb Dvl74ms2iFaBaCjHCSwYS0Va9JLWFfkm5NAXyEarvAHS5VKxADDI3WRD2P2ZkXz05ADh csrQ== X-Gm-Message-State: AOAM533mIkLip3N5NmMnGPwMqWeuHKAx336OMu0D/fHLto+JlMgNphGy O1C+f7sNlVALWI8t70hW02C2BOGJPv00n83n X-Google-Smtp-Source: ABdhPJxWTRNB+OxJUkwD13+7DDQa7+sCZYOAutEQALJmLAdKeq+iPhA5mPslsJ3iy5QjtyN93FU9+w== X-Received: by 2002:ac8:7f0e:0:b0:2de:4e16:5ae2 with SMTP id f14-20020ac87f0e000000b002de4e165ae2mr4176963qtk.313.1646517208495; Sat, 05 Mar 2022 13:53:28 -0800 (PST) Received: from henry-arch.studentwireless.binghamton.edu ([149.125.84.173]) by smtp.googlemail.com with ESMTPSA id t9-20020a05622a148900b002de2dfd0ee2sm5692836qtx.70.2022.03.05.13.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 13:53:28 -0800 (PST) From: Henry Sloan Cc: pbonzini@redhat.com, Henry Sloan , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/6] KVM: Fix minor indentation and brace style issues Date: Sat, 5 Mar 2022 16:53:12 -0500 Message-Id: <20220305215313.19094-1-henryksloan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220305205528.463894-7-henryksloan@gmail.com> References: <20220305205528.463894-7-henryksloan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Henry Sloan --- virt/kvm/kvm_main.c | 25 ++++++++++++++----------- virt/kvm/pfncache.c | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1a9f20e3fa2d..eea5b18b8efe 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -132,7 +132,10 @@ static long kvm_vcpu_compat_ioctl(struct file *file, unsigned int ioctl, * passed to a compat task, let the ioctls fail. */ static long kvm_no_compat_ioctl(struct file *file, unsigned int ioctl, - unsigned long arg) { return -EINVAL; } + unsigned long arg) +{ + return -EINVAL; +} static int kvm_no_compat_open(struct inode *inode, struct file *file) { @@ -2155,8 +2158,9 @@ static int kvm_clear_dirty_log_protect(struct kvm *kvm, if (log->first_page > memslot->npages || log->num_pages > memslot->npages - log->first_page || - (log->num_pages < memslot->npages - log->first_page && (log->num_pages & 63))) - return -EINVAL; + (log->num_pages < memslot->npages - log->first_page && + (log->num_pages & 63))) + return -EINVAL; kvm_arch_sync_dirty_log(kvm, memslot); @@ -2517,7 +2521,7 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma, * tail pages of non-compound higher order allocations, which * would then underflow the refcount when the caller does the * required put_page. Don't allow those pages here. - */ + */ if (!kvm_try_get_pfn(pfn)) r = -EFAULT; @@ -2906,7 +2910,7 @@ int kvm_vcpu_read_guest(struct kvm_vcpu *vcpu, gpa_t gpa, void *data, unsigned l EXPORT_SYMBOL_GPL(kvm_vcpu_read_guest); static int __kvm_read_guest_atomic(struct kvm_memory_slot *slot, gfn_t gfn, - void *data, int offset, unsigned long len) + void *data, int offset, unsigned long len) { int r; unsigned long addr; @@ -2935,7 +2939,7 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_read_guest_atomic); static int __kvm_write_guest_page(struct kvm *kvm, struct kvm_memory_slot *memslot, gfn_t gfn, - const void *data, int offset, int len) + const void *data, int offset, int len) { int r; unsigned long addr; @@ -2990,7 +2994,7 @@ int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data, EXPORT_SYMBOL_GPL(kvm_write_guest); int kvm_vcpu_write_guest(struct kvm_vcpu *vcpu, gpa_t gpa, const void *data, - unsigned long len) + unsigned long len) { gfn_t gfn = gpa >> PAGE_SHIFT; int seg; @@ -3157,7 +3161,7 @@ EXPORT_SYMBOL_GPL(kvm_clear_guest); void mark_page_dirty_in_slot(struct kvm *kvm, const struct kvm_memory_slot *memslot, - gfn_t gfn) + gfn_t gfn) { struct kvm_vcpu *vcpu = kvm_get_running_vcpu(); @@ -5176,9 +5180,8 @@ int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, return 0; for (i = 0; i < bus->dev_count; i++) { - if (bus->range[i].dev == dev) { + if (bus->range[i].dev == dev) break; - } } if (i == bus->dev_count) @@ -5599,7 +5602,7 @@ EXPORT_SYMBOL_GPL(kvm_get_running_vcpu); */ struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void) { - return &kvm_running_vcpu; + return &kvm_running_vcpu; } #ifdef CONFIG_GUEST_PERF_EVENTS diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c index ce878f4be4da..072c9a9e44b1 100644 --- a/virt/kvm/pfncache.c +++ b/virt/kvm/pfncache.c @@ -237,7 +237,7 @@ int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, ret = -EFAULT; } - map_done: + map_done: write_lock_irq(&gpc->lock); if (ret) { gpc->valid = false; -- 2.35.1