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 2E978C433F5 for ; Sat, 5 Mar 2022 20:27:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232478AbiCEU2Y (ORCPT ); Sat, 5 Mar 2022 15:28:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231922AbiCEU2F (ORCPT ); Sat, 5 Mar 2022 15:28:05 -0500 Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2641E17E0B; Sat, 5 Mar 2022 12:27:14 -0800 (PST) Received: by mail-qk1-x733.google.com with SMTP id d84so9040058qke.8; Sat, 05 Mar 2022 12:27:14 -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=nMHQo9KaZLHpViqkt/5kWY28nI9765VdixDtNIl3AT0=; b=NOAqHLKka0LOjOZJ4nBGMmj0QmVY2qBlXVbKoiWvusApjQcOJTJIvMfZtF3ItE/44y vkx164JwUBmryfOLAgcS59zg5zD8LuzsvZy3SRaGwrEBCv2ClXVpQ0Od7v6GokUWkfwy wgBeP+BERvy79x1gO608620a8OlNECXbO0yF/TnW6LtXHlxW/DWEAO8MMgAWTU4jVFPM KhiSZaDICYJIdlV0q1tDt8v9IvxUz0kktdLAD8PWJw6RDKnALvxx+NNZXDS5pI8JcJRy immvscS06Pg3O4OfxI6BhHyIsGchOsdiQ8A6yPsIdWOIqyXjcsrQVPCuaxYjypuJTK6I YQiA== 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=nMHQo9KaZLHpViqkt/5kWY28nI9765VdixDtNIl3AT0=; b=iPb219w0WGsB87onO0dPftPFp+nG0ySXGfSyb1f1EuRpM7aqtvK6az1jeMv5DZ5KI+ YScSZmUmrk5PgmdjsINZLNzbhPSHlxfNr9Ep2qhZRqyICDPZq2/UiA2LqzKhqTU0TvW7 dlShjQcDxyJuxtIdQbv0CiI4x/ZSYYMAizwBC8qZlD8ChyC3H3idc5cZz/hm0n5HYrrd yKfPgFyzbw+YYHodWX66vMI4l0RtiawMYsN5NMNUFEXDRVX0OtPUDssfQvfW3HUeU9Zf bsT9bWDWXtVSGgwmr7q7OG5utBIAdZs2pQx21hBsPr2i3kCIKrZ661i57ERN+UE1dQt6 qt3A== X-Gm-Message-State: AOAM533V3KziUW5dUpsRE714qgWdMlm035Po2nHjeUalvfJvoyzZCHxW Z/7ewkaQugWUWKGggKp1K7o= X-Google-Smtp-Source: ABdhPJztyWU3vahJ23JhJn2se0BZFhxe9q6nKn2Gsc8q8R/iIV9GMfVohakgirTfM3WWDsOcy3fOaA== X-Received: by 2002:a37:747:0:b0:60d:d709:2e20 with SMTP id 68-20020a370747000000b0060dd7092e20mr2759874qkh.579.1646512034089; Sat, 05 Mar 2022 12:27:14 -0800 (PST) Received: from henry-arch.studentwireless.binghamton.edu ([149.125.84.173]) by smtp.googlemail.com with ESMTPSA id e9-20020ac85989000000b002de2bfc8f94sm5654208qte.88.2022.03.05.12.27.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 12:27:13 -0800 (PST) From: Henry Sloan Cc: pbonzini@redhat.com, Henry Sloan , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] KVM: fix checkpatch warnings Date: Sat, 5 Mar 2022 15:26:37 -0500 Message-Id: <20220305202637.457103-6-henryksloan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220305202637.457103-1-henryksloan@gmail.com> References: <20220305202637.457103-1-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 Fix warnings involving indentation and braces Signed-off-by: Henry Sloan --- virt/kvm/kvm_main.c | 36 +++++++++++++++++++----------------- virt/kvm/pfncache.c | 2 +- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1a9f20e3fa2d..c899da4515c0 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) { @@ -2154,9 +2157,9 @@ static int kvm_clear_dirty_log_protect(struct kvm *kvm, n = ALIGN(log->num_pages, BITS_PER_LONG) / 8; 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 < memslot->npages - log->first_page && (log->num_pages & 63))) + return -EINVAL; kvm_arch_sync_dirty_log(kvm, memslot); @@ -2517,7 +2520,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 +2909,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; @@ -2923,7 +2926,7 @@ static int __kvm_read_guest_atomic(struct kvm_memory_slot *slot, gfn_t gfn, } int kvm_vcpu_read_guest_atomic(struct kvm_vcpu *vcpu, gpa_t gpa, - void *data, unsigned long len) + void *data, unsigned long len) { gfn_t gfn = gpa >> PAGE_SHIFT; struct kvm_memory_slot *slot = kvm_vcpu_gfn_to_memslot(vcpu, gfn); @@ -2934,8 +2937,8 @@ int kvm_vcpu_read_guest_atomic(struct kvm_vcpu *vcpu, gpa_t gpa, 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) + struct kvm_memory_slot *memslot, gfn_t gfn, + const void *data, int offset, int len) { int r; unsigned long addr; @@ -2990,7 +2993,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; @@ -3011,8 +3014,8 @@ int kvm_vcpu_write_guest(struct kvm_vcpu *vcpu, gpa_t gpa, const void *data, EXPORT_SYMBOL_GPL(kvm_vcpu_write_guest); static int __kvm_gfn_to_hva_cache_init(struct kvm_memslots *slots, - struct gfn_to_hva_cache *ghc, - gpa_t gpa, unsigned long len) + struct gfn_to_hva_cache *ghc, + gpa_t gpa, unsigned long len) { int offset = offset_in_page(gpa); gfn_t start_gfn = gpa >> PAGE_SHIFT; @@ -3156,8 +3159,8 @@ int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len) EXPORT_SYMBOL_GPL(kvm_clear_guest); void mark_page_dirty_in_slot(struct kvm *kvm, - const struct kvm_memory_slot *memslot, - gfn_t gfn) + const struct kvm_memory_slot *memslot, + gfn_t gfn) { struct kvm_vcpu *vcpu = kvm_get_running_vcpu(); @@ -5176,9 +5179,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 +5601,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