From nobody Tue Jun 23 12:18:35 2026 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 3C48EC433F5 for ; Sat, 5 Mar 2022 20:55:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232542AbiCEU4j (ORCPT ); Sat, 5 Mar 2022 15:56:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231150AbiCEU4e (ORCPT ); Sat, 5 Mar 2022 15:56:34 -0500 Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A07C060DB8; Sat, 5 Mar 2022 12:55:44 -0800 (PST) Received: by mail-qk1-x731.google.com with SMTP id c7so9053191qka.7; Sat, 05 Mar 2022 12:55:44 -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=dLjEiFN28e+Vj0lWlZ9hSloKdl9lKcIh6UsFQqrofGE=; b=bZe3hHOHz9cWr4ATGEtyfYBSGKayqrnCjCNKfskBrO0FttP4gS7tyYk+d7tfAKVCP3 ah7fbX6kaw8qyLhBSQXqpzKLp93tQQGSqYMY4o99YYiQT/otcmIyeE/Q27hfVE1V4V/S EU8LRtZNbkY5m7mYp/jWi174Sq2EWuNIREeJGWRqOBOnhj7IsRAjgoU5bz1sxCQfk37q de6AbFqGamfDeODiu1KE5hczkqGsWVsGxmqDf6unULEyd/ZNGGMuPvDyCzitYjvakCf3 S+Snhsogl4ABoWKAkOqwlVNmMkHFqLQvISQkyWL+K940vsO40pDv4ZSXB1qJSiNDTgbp FSXA== 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=dLjEiFN28e+Vj0lWlZ9hSloKdl9lKcIh6UsFQqrofGE=; b=P3YTiaCroRLm0WRuYmfCrdh7bt8R2Q0TogHUN3+97Bk9SmiFVjbKAi1Bu8zq0MC10e rkSu9PLdsJvejaayNhxVQxOf4RGSA5D6ARH2QI4jSQvpV0gAJHsDZe4Z3kwEGGxDXIIi I9cDM0fsC6NJvwymSR9inrlnCcXbOLZXSQvExCwP9CTShyNTtQvFuqke1SNdvguxUgGZ zaCZ2G3n5FFOVDaYjE/A6WN4ld1HZ1QIUzgRJ0qunZOjD7AqPMANmLFZ+s0UtTO1eoyv 2+sm3Bt2XUQvBk4Hi7SGmTTWJIUZnECNdCJ8naVNBSVRgKfPXXvX5wugBruoh3dxd6n5 gYpg== X-Gm-Message-State: AOAM530i5n1o2TFdwCPw6BFNqr/tOVob9XBC/5y8P1IPdRY1bgP3d1cD dtB+yiSayMX3xSpdmHOsv3E= X-Google-Smtp-Source: ABdhPJyEsGHwkZhS17UFs8fmzJKN6V1ociic6tjpUeU2Mq8rOGYWbgEbM6CBAPQAaYO7+olVyuoSLw== X-Received: by 2002:a05:620a:c52:b0:648:d550:5583 with SMTP id u18-20020a05620a0c5200b00648d5505583mr2932763qki.232.1646513743854; Sat, 05 Mar 2022 12:55:43 -0800 (PST) Received: from henry-arch.studentwireless.binghamton.edu ([149.125.84.173]) by smtp.googlemail.com with ESMTPSA id l19-20020a05622a175300b002de935a94c9sm5877525qtk.8.2022.03.05.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 12:55:43 -0800 (PST) From: Henry Sloan Cc: pbonzini@redhat.com, Henry Sloan , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] KVM: Use typical SPDX comment style Date: Sat, 5 Mar 2022 15:55:23 -0500 Message-Id: <20220305205528.463894-2-henryksloan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220305205528.463894-1-henryksloan@gmail.com> References: <20220305205528.463894-1-henryksloan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Signed-off-by: Henry Sloan --- virt/kvm/dirty_ring.c | 2 +- virt/kvm/kvm_mm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/virt/kvm/dirty_ring.c b/virt/kvm/dirty_ring.c index 222ecc81d7df..f4c2a6eb1666 100644 --- a/virt/kvm/dirty_ring.c +++ b/virt/kvm/dirty_ring.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +// SPDX-License-Identifier: GPL-2.0-only /* * KVM dirty ring implementation * diff --git a/virt/kvm/kvm_mm.h b/virt/kvm/kvm_mm.h index 34ca40823260..41da467d99c9 100644 --- a/virt/kvm/kvm_mm.h +++ b/virt/kvm/kvm_mm.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only +/* SPDX-License-Identifier: GPL-2.0-only */ =20 #ifndef __KVM_MM_H__ #define __KVM_MM_H__ 1 --=20 2.35.1 From nobody Tue Jun 23 12:18:35 2026 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 32E9EC433F5 for ; Sat, 5 Mar 2022 20:55:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232573AbiCEU4n (ORCPT ); Sat, 5 Mar 2022 15:56:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232517AbiCEU4g (ORCPT ); Sat, 5 Mar 2022 15:56:36 -0500 Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3DA260DAD; Sat, 5 Mar 2022 12:55:45 -0800 (PST) Received: by mail-qk1-x730.google.com with SMTP id z66so9058354qke.10; Sat, 05 Mar 2022 12:55:45 -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=jtIXuKCcBJI/lwMJfayWLSewoOe6VlcxvOBTKyy+vtU=; b=JNKyST3NjchNUczfg5MXqP7e7f8kswX9Lqp1eXSlsEEBMyaHrYp8OaUEbBovSvo3Qy crVd9LJ9FVvnXYJvxNQ9sFRZC0o5n8G9vWR/qkQnDKIhyfnxPqC2ugnakU/1TeJuFE7B dP3QoyMAtIbFtsJas1eWW3dVJqAYod2jhuYQhT4WQbTX+hhOliGbq/OfhYHsTZTOxVU8 EJXs3NHjoFH1DJ77FHfH23mxb9YcjepG03C6Ad1Lum53A/4gOdKbZY/2W0vObFVmH0c7 ppphm3YR2QSYAsCEbZMozboB5BonFR5whQDX4tdEHbwHzZSWphXJKCYyNW436RX16kWf jY9g== 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=jtIXuKCcBJI/lwMJfayWLSewoOe6VlcxvOBTKyy+vtU=; b=BppFjwVRFdWJAG5fgFfTWh3eqZIP9KV1OwApzY5ERMseGzDAdIS1wTzQzlNvcLuZA4 SSoKcWf6YWHXErhTzYp3o5JvlHWbUcjHnRMA0dcrThZug8PNXYz7BqDesLM9uSb0mThp DcIREQ71KLHPSfIaki3Ms3A504ck6w3T+6GmoswPmQXTBeOQUtVZA3Fp8zK5zwPzKDyK qUMIQJW5uyK6QI1eCNtZoq+Zu+WwlguMmuZcLZU0zeIT7EfBSACf+th1l8GXJNzwz9L6 tUy48IFwn4MPDDPwVBHWTKJBfq0YaZqVjOZMSwhLGciRgpzmX6t8CDBwLiZbGTDyYoh7 dm5A== X-Gm-Message-State: AOAM532u01aY7wCMa1nmCWz0D2s//ASEZhH5PViTjn7GvAAoSyNw5dBV 46bUuy0fnN0sRyEn0rupXyY= X-Google-Smtp-Source: ABdhPJyb6KR1hNEjwX2eRAV2NEOp7e/mgTxRVEUmNUfIwBDCNpluaCz5dZU9/Wdo2+lMxtz+GrbQTA== X-Received: by 2002:a05:620a:2855:b0:662:f88d:d77 with SMTP id h21-20020a05620a285500b00662f88d0d77mr2816484qkp.241.1646513744979; Sat, 05 Mar 2022 12:55:44 -0800 (PST) Received: from henry-arch.studentwireless.binghamton.edu ([149.125.84.173]) by smtp.googlemail.com with ESMTPSA id l19-20020a05622a175300b002de935a94c9sm5877525qtk.8.2022.03.05.12.55.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 12:55:44 -0800 (PST) From: Henry Sloan Cc: pbonzini@redhat.com, Henry Sloan , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] KVM: Replace bare 'unsigned' with 'unsigned int' Date: Sat, 5 Mar 2022 15:55:24 -0500 Message-Id: <20220305205528.463894-3-henryksloan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220305205528.463894-1-henryksloan@gmail.com> References: <20220305205528.463894-1-henryksloan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Signed-off-by: Henry Sloan --- virt/kvm/coalesced_mmio.c | 2 +- virt/kvm/eventfd.c | 8 ++++---- virt/kvm/irqchip.c | 6 +++--- virt/kvm/kvm_main.c | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c index 0be80c213f7f..1ff2bca6489c 100644 --- a/virt/kvm/coalesced_mmio.c +++ b/virt/kvm/coalesced_mmio.c @@ -43,7 +43,7 @@ static int coalesced_mmio_in_range(struct kvm_coalesced_m= mio_dev *dev, static int coalesced_mmio_has_room(struct kvm_coalesced_mmio_dev *dev, u32= last) { struct kvm_coalesced_mmio_ring *ring; - unsigned avail; + unsigned int avail; =20 /* Are we able to batch it ? */ =20 diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 59b1dd4a549e..1054ddb915b0 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -182,14 +182,14 @@ int __attribute__((weak)) kvm_arch_set_irq_inatomic( * Called with wqh->lock held and interrupts disabled */ static int -irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key) +irqfd_wakeup(wait_queue_entry_t *wait, unsigned int mode, int sync, void *= key) { struct kvm_kernel_irqfd *irqfd =3D container_of(wait, struct kvm_kernel_irqfd, wait); __poll_t flags =3D key_to_poll(key); struct kvm_kernel_irq_routing_entry irq; struct kvm *kvm =3D irqfd->kvm; - unsigned seq; + unsigned int seq; int idx; int ret =3D 0; =20 @@ -455,7 +455,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *arg= s) return ret; } =20 -bool kvm_irq_has_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin) +bool kvm_irq_has_notifier(struct kvm *kvm, unsigned int irqchip, unsigned = int pin) { struct kvm_irq_ack_notifier *kian; int gsi, idx; @@ -486,7 +486,7 @@ void kvm_notify_acked_gsi(struct kvm *kvm, int gsi) kian->irq_acked(kian); } =20 -void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin) +void kvm_notify_acked_irq(struct kvm *kvm, unsigned int irqchip, unsigned = int pin) { int gsi, idx; =20 diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index 58e4f88b2b9f..dcd51e6efb8a 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -38,7 +38,7 @@ int kvm_irq_map_gsi(struct kvm *kvm, return n; } =20 -int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin) +int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned int irqchip, unsigned i= nt pin) { struct kvm_irq_routing_table *irq_rt; =20 @@ -168,8 +168,8 @@ bool __weak kvm_arch_can_set_irq_routing(struct kvm *kv= m) =20 int kvm_set_irq_routing(struct kvm *kvm, const struct kvm_irq_routing_entry *ue, - unsigned nr, - unsigned flags) + unsigned int nr, + unsigned int flags) { struct kvm_irq_routing_table *new, *old; struct kvm_kernel_irq_routing_entry *e; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 0afc016cc54d..c5fb79e64e75 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -216,7 +216,7 @@ void vcpu_put(struct kvm_vcpu *vcpu) EXPORT_SYMBOL_GPL(vcpu_put); =20 /* TODO: merge with kvm_arch_vcpu_should_kick */ -static bool kvm_request_needs_ipi(struct kvm_vcpu *vcpu, unsigned req) +static bool kvm_request_needs_ipi(struct kvm_vcpu *vcpu, unsigned int req) { int mode =3D kvm_vcpu_exiting_guest_mode(vcpu); =20 @@ -415,7 +415,7 @@ void *kvm_mmu_memory_cache_alloc(struct kvm_mmu_memory_= cache *mc) } #endif =20 -static void kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned= id) +static void kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned= int id) { mutex_init(&vcpu->mutex); vcpu->cpu =3D -1; @@ -3454,7 +3454,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) */ if (kvm_arch_vcpu_should_kick(vcpu)) { cpu =3D READ_ONCE(vcpu->cpu); - if (cpu !=3D me && (unsigned)cpu < nr_cpu_ids && cpu_online(cpu)) + if (cpu !=3D me && (unsigned int)cpu < nr_cpu_ids && cpu_online(cpu)) smp_send_reschedule(cpu); } out: @@ -5366,7 +5366,7 @@ static const struct file_operations stat_fops_per_vm = =3D { =20 static int vm_stat_get(void *_offset, u64 *val) { - unsigned offset =3D (long)_offset; + unsigned int offset =3D (long)_offset; struct kvm *kvm; u64 tmp_val; =20 @@ -5382,7 +5382,7 @@ static int vm_stat_get(void *_offset, u64 *val) =20 static int vm_stat_clear(void *_offset, u64 val) { - unsigned offset =3D (long)_offset; + unsigned int offset =3D (long)_offset; struct kvm *kvm; =20 if (val) @@ -5402,7 +5402,7 @@ DEFINE_SIMPLE_ATTRIBUTE(vm_stat_readonly_fops, vm_sta= t_get, NULL, "%llu\n"); =20 static int vcpu_stat_get(void *_offset, u64 *val) { - unsigned offset =3D (long)_offset; + unsigned int offset =3D (long)_offset; struct kvm *kvm; u64 tmp_val; =20 @@ -5418,7 +5418,7 @@ static int vcpu_stat_get(void *_offset, u64 *val) =20 static int vcpu_stat_clear(void *_offset, u64 val) { - unsigned offset =3D (long)_offset; + unsigned int offset =3D (long)_offset; struct kvm *kvm; =20 if (val) @@ -5654,7 +5654,7 @@ static void check_processor_compat(void *data) *c->ret =3D kvm_arch_check_processor_compat(c->opaque); } =20 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, +int kvm_init(void *opaque, unsigned int vcpu_size, unsigned int vcpu_align, struct module *module) { struct kvm_cpu_compat_check c; --=20 2.35.1 From nobody Tue Jun 23 12:18:35 2026 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 0518CC4332F for ; Sat, 5 Mar 2022 20:55:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232568AbiCEU4o (ORCPT ); Sat, 5 Mar 2022 15:56:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232520AbiCEU4h (ORCPT ); Sat, 5 Mar 2022 15:56:37 -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 CDBB661A35; Sat, 5 Mar 2022 12:55:46 -0800 (PST) Received: by mail-qk1-x733.google.com with SMTP id s16so836000qks.4; Sat, 05 Mar 2022 12:55:46 -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=dgtynUkl2NInlVz9c5ix3B45LFvFB0LQ430PaZMW1II=; b=poVjJKTCR4/cA/XiB8QNfBT6ZtNw++5QZKbi/6qZPkxUfiFPp0vRMzzAb/5voTaGWN Q7OhoAn0v8nvdpxzxe+QTs35O/2C3wZ/Ssa5PpDWx83eRaNpPGdvfU+wElTtbwsjkc8p cvcRDlbuHYk7qy/kpLmw1sfYMwpHHJGjNEGCF7ibNfLL0eT/Fyves0agTkvlsD6vi0Ym +KSMVR9MO8tIv7YUrudxEN8sIC3qGWD49PR2u7nQ0tpw9T1C9c5yE1fxZfYORPBQVKGU /razbVr44Ryo0bOwR89x56bPDjdy2Xxo9lSv3Wea83Sp8DCk1QbsQUeEb6MiF7Q/nz5c bpZg== 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=dgtynUkl2NInlVz9c5ix3B45LFvFB0LQ430PaZMW1II=; b=DNYJlHWOMG+fAWl5lVGVwPrExfbMFzdwspIyYzYYY1sCMsYAE2KgF09Xc+3EZ8k9df M/fWEJKuUdzIGdxNqggSjWCwVaUmPptEQmk1De85SK2jA25ot3INLHVZwNjpydayYhHG 9Cs8+s1fEcFBVOK6rZKQvJ1nJ1ZKdybFUA8dvsDUCsP/WhGg5NopeY3iLGqSyJyBqW5H 125H3zz8il5gx0vvRgBrK7p5DBqknrtRAenW6nYVfAqlb0QywChgM7bpysV+9jOOtsR1 guG2DJTpQZUl2Y82qCNuRCw8DcIXuDlJWiAddMhUuNFSv4tlzQ8sJZ5w9ckMDrTL9f/M 9vng== X-Gm-Message-State: AOAM5308+k5nKB2vDr+bhso4JhS7HUzabF4V8KLUwi4oCT5EDffCT5aJ YmuTbHKzxEWmYZwYQR3QlhmKuCWfEqaF7lbh X-Google-Smtp-Source: ABdhPJwIH2hIp5+b55+kWph/10nEL3GMY1jKO4ZKGeXyBVFrGWgyMeNpnv46LvMgTdHyireTEPRWFg== X-Received: by 2002:a37:af81:0:b0:502:7ea:34e7 with SMTP id y123-20020a37af81000000b0050207ea34e7mr2895675qke.737.1646513745973; Sat, 05 Mar 2022 12:55:45 -0800 (PST) Received: from henry-arch.studentwireless.binghamton.edu ([149.125.84.173]) by smtp.googlemail.com with ESMTPSA id l19-20020a05622a175300b002de935a94c9sm5877525qtk.8.2022.03.05.12.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 12:55:45 -0800 (PST) From: Henry Sloan Cc: pbonzini@redhat.com, Henry Sloan , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] KVM: Replace '__attribute__((weak))' with '__weak' Date: Sat, 5 Mar 2022 15:55:25 -0500 Message-Id: <20220305205528.463894-4-henryksloan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220305205528.463894-1-henryksloan@gmail.com> References: <20220305205528.463894-1-henryksloan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Signed-off-by: Henry Sloan --- virt/kvm/eventfd.c | 12 ++++++------ virt/kvm/irqchip.c | 2 +- virt/kvm/kvm_main.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 1054ddb915b0..14aef85829ed 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -32,7 +32,7 @@ =20 static struct workqueue_struct *irqfd_cleanup_wq; =20 -bool __attribute__((weak)) +bool __weak kvm_arch_irqfd_allowed(struct kvm *kvm, struct kvm_irqfd *args) { return true; @@ -169,7 +169,7 @@ irqfd_deactivate(struct kvm_kernel_irqfd *irqfd) queue_work(irqfd_cleanup_wq, &irqfd->shutdown); } =20 -int __attribute__((weak)) kvm_arch_set_irq_inatomic( +int __weak kvm_arch_set_irq_inatomic( struct kvm_kernel_irq_routing_entry *irq, struct kvm *kvm, int irq_source_id, int level, @@ -265,24 +265,24 @@ static void irqfd_update(struct kvm *kvm, struct kvm_= kernel_irqfd *irqfd) } =20 #ifdef CONFIG_HAVE_KVM_IRQ_BYPASS -void __attribute__((weak)) kvm_arch_irq_bypass_stop( +void __weak kvm_arch_irq_bypass_stop( struct irq_bypass_consumer *cons) { } =20 -void __attribute__((weak)) kvm_arch_irq_bypass_start( +void __weak kvm_arch_irq_bypass_start( struct irq_bypass_consumer *cons) { } =20 -int __attribute__((weak)) kvm_arch_update_irqfd_routing( +int __weak kvm_arch_update_irqfd_routing( struct kvm *kvm, unsigned int host_irq, uint32_t guest_irq, bool set) { return 0; } =20 -bool __attribute__((weak)) kvm_arch_irqfd_route_changed( +bool __weak kvm_arch_irqfd_route_changed( struct kvm_kernel_irq_routing_entry *old, struct kvm_kernel_irq_routing_entry *new) { diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index dcd51e6efb8a..baa551aec010 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -157,7 +157,7 @@ static int setup_routing_entry(struct kvm *kvm, return 0; } =20 -void __attribute__((weak)) kvm_arch_irq_routing_update(struct kvm *kvm) +void __weak kvm_arch_irq_routing_update(struct kvm *kvm) { } =20 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index c5fb79e64e75..af74cf3b6446 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4386,7 +4386,7 @@ static int kvm_vm_ioctl_reset_dirty_pages(struct kvm = *kvm) return cleared; } =20 -int __attribute__((weak)) kvm_vm_ioctl_enable_cap(struct kvm *kvm, +int __weak kvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap) { return -EINVAL; --=20 2.35.1 From nobody Tue Jun 23 12:18:35 2026 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 D6A95C433EF for ; Sat, 5 Mar 2022 20:55:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232565AbiCEU4r (ORCPT ); Sat, 5 Mar 2022 15:56:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232536AbiCEU4i (ORCPT ); Sat, 5 Mar 2022 15:56:38 -0500 Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5D476210F; Sat, 5 Mar 2022 12:55:47 -0800 (PST) Received: by mail-qk1-x736.google.com with SMTP id f21so9057868qke.13; Sat, 05 Mar 2022 12:55:47 -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=R8MoG4V6/qvajTZezIe9y4jfAXlOuicKSXlBnDiaTLs=; b=ikeRqzIDcQ5A6KXHh00Hrqd9XQYEiZZTg+px37l4jUHXaZfQGVxdPw+neR8LpjR1hd A4t4C5iVorYzo90KgMEjSaZPpmFkCS8cQsojrGOw9k8F2vuEyXw1P9HbkONLEvj5GVk5 hoUeeh7PjwKU1Uh8YE3BHpJ9xJXqftnQ/P1UymWA9Ou6Og20IjJ0MlqMdKEBjuRsud8X sury6vZOX5zHMMAn3hGi0qwFlgVMrtAbql4Ms/PP7Z+6hTysnV3edj063nnRh6WkR1JK IAlHXw5W3XG0h9gxi0y1H098IVMIC1//7TsKA5UFYVB4E5+hEbu3D83vgMcBCVLWDlYO VUww== 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=R8MoG4V6/qvajTZezIe9y4jfAXlOuicKSXlBnDiaTLs=; b=EOWSUcalQQAcNtuRvS+xZWt5H0rstlPjLUW65OVa/xczwmauYloMTwQ/UXQcxm4LPw aXsI4DR1P8P9gAYjggOHjf1i//QxYw+ihXVKwSu6ws1XSI380pepqVqzEwMT0xqh4z3Q Z8xPa5xgV67zroFHsNcj8F2ofgKWpN0D+oBagMeLxlKaZvI32Nbr7jb4GZAHMC9R9fmY Dsc0SSDhFAU3uTpuXXWYHWGtrZH0lPysYKndnrrKGmwRkDNtlp68b9cWaKlEfSRTUjk2 X0pcyJKH4jlDNb/O38uERZwC9CjDdv4vVKDBNW+eFp5n5YgZm0+/Q+gKZnper4Ok5Tg3 n9qg== X-Gm-Message-State: AOAM533X8TS11ivICVUxtE7X8UQdrfedxqMYTCeScxyoyu3zjf3xDYaS XBoHjK6PfGg3Fl0xZl8tGgo= X-Google-Smtp-Source: ABdhPJxJFvKgeSdZT78GejgzfYS4YE3MXAzM16FaBJ2HYPUuiBzA09NdX8VtM0aWaxutZ145CA3P/Q== X-Received: by 2002:a37:414c:0:b0:662:cd75:5475 with SMTP id o73-20020a37414c000000b00662cd755475mr2781293qka.271.1646513747096; Sat, 05 Mar 2022 12:55:47 -0800 (PST) Received: from henry-arch.studentwireless.binghamton.edu ([149.125.84.173]) by smtp.googlemail.com with ESMTPSA id l19-20020a05622a175300b002de935a94c9sm5877525qtk.8.2022.03.05.12.55.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 12:55:46 -0800 (PST) From: Henry Sloan Cc: pbonzini@redhat.com, Henry Sloan , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] KVM: Add blank lines after some declarations Date: Sat, 5 Mar 2022 15:55:26 -0500 Message-Id: <20220305205528.463894-5-henryksloan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220305205528.463894-1-henryksloan@gmail.com> References: <20220305205528.463894-1-henryksloan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Signed-off-by: Henry Sloan --- virt/kvm/eventfd.c | 1 + virt/kvm/irqchip.c | 2 ++ virt/kvm/kvm_main.c | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 14aef85829ed..2e47bd13413e 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -195,6 +195,7 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned int mod= e, int sync, void *key) =20 if (flags & EPOLLIN) { u64 cnt; + eventfd_ctx_do_read(irqfd->eventfd, &cnt); =20 idx =3D srcu_read_lock(&kvm->irq_srcu); diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index baa551aec010..69a327c043d7 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -86,6 +86,7 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 i= rq, int level, =20 while (i--) { int r; + r =3D irq_set[i].set(&irq_set[i], kvm, irq_source_id, level, line_status); if (r < 0) @@ -122,6 +123,7 @@ void kvm_free_irq_routing(struct kvm *kvm) /* Called only during vm destruction. Nobody can use the pointer at this stage */ struct kvm_irq_routing_table *rt =3D rcu_access_pointer(kvm->irq_routing); + free_irq_routing_table(rt); } =20 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index af74cf3b6446..1988dd081606 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2171,6 +2171,7 @@ static int kvm_clear_dirty_log_protect(struct kvm *kv= m, i++, offset +=3D BITS_PER_LONG) { unsigned long mask =3D *dirty_bitmap_buffer++; atomic_long_t *p =3D (atomic_long_t *) &dirty_bitmap[i]; + if (!mask) continue; =20 @@ -2477,6 +2478,7 @@ static int hva_to_pfn_remapped(struct vm_area_struct = *vma, * not call the fault handler, so do it here. */ bool unlocked =3D false; + r =3D fixup_user_fault(current->mm, addr, (write_fault ? FAULT_FLAG_WRITE : 0), &unlocked); @@ -3053,6 +3055,7 @@ int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct= gfn_to_hva_cache *ghc, gpa_t gpa, unsigned long len) { struct kvm_memslots *slots =3D kvm_memslots(kvm); + return __kvm_gfn_to_hva_cache_init(slots, ghc, gpa, len); } EXPORT_SYMBOL_GPL(kvm_gfn_to_hva_cache_init); @@ -3887,6 +3890,7 @@ static long kvm_vcpu_ioctl(struct file *filp, switch (ioctl) { case KVM_RUN: { struct pid *oldpid; + r =3D -EINVAL; if (arg) goto out; --=20 2.35.1 From nobody Tue Jun 23 12:18:35 2026 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 807C4C433F5 for ; Sat, 5 Mar 2022 20:56:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232584AbiCEU4t (ORCPT ); Sat, 5 Mar 2022 15:56:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232540AbiCEU4j (ORCPT ); Sat, 5 Mar 2022 15:56:39 -0500 Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBBB260DB8; Sat, 5 Mar 2022 12:55:48 -0800 (PST) Received: by mail-qk1-x730.google.com with SMTP id g24so9097453qkl.3; Sat, 05 Mar 2022 12:55:48 -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=2OHv3SctzLs4vayu1DatcqlqlSwr80Sqxye5OO5KQt8=; b=CyRQiyIUN1u5RNeRbe/4s9VvLE68e4LWrZI1eCVkI0NM/gq1kzyIyx05Gtg2r02Ssi v6M7vX+kMNzDwDRnSXHPNZxGwlOsvpY+t3/S6eonRIwRHV47dbBKSsIEIxRScuzuPDQp Y45DMZTFg2K8vjkHO/Jl1qIPkQ468U3WX1NS6FXZCBhMcxT0HVP881Tccyk85UHGCU1v NeKlONIAoQEw9U8qtqhc+v0dVaBkayB3fK4DMCEAqFuCt8vq/q+4uqrnHk6qUTrrpVNI y2hJwROWjC8njIs9yN0aDULswUk5y7WIF4laE3DLBEZ3YK51B/eOfgkKtsQHLOEmZ/t0 xzSA== 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=2OHv3SctzLs4vayu1DatcqlqlSwr80Sqxye5OO5KQt8=; b=2VqNAnwa/5psAQOXuf9zudHUY+6BHKRiJ/DDBhLOkEt12LS43IjwzTW7QbGdId5Tz9 LjwqU51GTgFMnFF6grcOhCauPq4Nb4MzYB7FKn5J49PnZCvT8hifHAOF28HXjhGYF7Ff yyhOfEn7w0qHaJYlSW8HqQ/9bWsrgijV4eUOma1Rc1aubzmYjOvIl4bnl3mCKhplP0ew YpIUdzIQTKq/gmJIMsjmFLFdi7kplN05S+HaYp68+nrZJ2VbP0jZoQZlOwcKN1fnuAWZ x4GaQPssl/6IpaccLE9CKX3V80qFQBm8BfplzPQ+W5OUkCbUvDNHsM8I38Mi4Pwdaxm8 im3w== X-Gm-Message-State: AOAM530yiURELHyxqu2SRwDVGTeUaHg6sUV2Wm/eI9T4aau4vNLmRAFV YCkSOpejZDU4EiC/A7H2eVc= X-Google-Smtp-Source: ABdhPJxKOq6CooTF4kxHWFhS9aJ+8pxxr5qF18AG0ka/8SduH8q9Mx8Y1FLHAuyIUC9Tnrr2hQXcZQ== X-Received: by 2002:a37:e303:0:b0:47b:b0e1:fc3f with SMTP id y3-20020a37e303000000b0047bb0e1fc3fmr2867436qki.108.1646513748131; Sat, 05 Mar 2022 12:55:48 -0800 (PST) Received: from henry-arch.studentwireless.binghamton.edu ([149.125.84.173]) by smtp.googlemail.com with ESMTPSA id l19-20020a05622a175300b002de935a94c9sm5877525qtk.8.2022.03.05.12.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 12:55:47 -0800 (PST) From: Henry Sloan Cc: pbonzini@redhat.com, Henry Sloan , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] KVM: Use typical style for block comments Date: Sat, 5 Mar 2022 15:55:27 -0500 Message-Id: <20220305205528.463894-6-henryksloan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220305205528.463894-1-henryksloan@gmail.com> References: <20220305205528.463894-1-henryksloan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Signed-off-by: Henry Sloan --- virt/kvm/irqchip.c | 6 ++++-- virt/kvm/kvm_main.c | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index 69a327c043d7..80708f6ec9d9 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -120,8 +120,10 @@ static void free_irq_routing_table(struct kvm_irq_rout= ing_table *rt) =20 void kvm_free_irq_routing(struct kvm *kvm) { - /* Called only during vm destruction. Nobody can use the pointer - at this stage */ + /* + * Called only during vm destruction. Nobody can use the pointer + * at this stage + */ struct kvm_irq_routing_table *rt =3D rcu_access_pointer(kvm->irq_routing); =20 free_irq_routing_table(rt); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1988dd081606..1a9f20e3fa2d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2182,7 +2182,7 @@ static int kvm_clear_dirty_log_protect(struct kvm *kv= m, * never includes any bits beyond the length of the memslot (if * the length is not aligned to 64 pages), therefore it is not * a problem if userspace sets them in log->dirty_bitmap. - */ + */ if (mask) { flush =3D true; kvm_arch_mmu_enable_log_dirty_pt_masked(kvm, memslot, @@ -5245,8 +5245,8 @@ static int kvm_debugfs_open(struct inode *inode, stru= ct file *file, =20 /* * The debugfs files are a reference to the kvm struct which - * is still valid when kvm_destroy_vm is called. kvm_get_kvm_safe - * avoids the race between open and the removal of the debugfs dire= ctory. + * is still valid when kvm_destroy_vm is called. kvm_get_kvm_safe + * avoids the race between open and the removal of the debugfs directory. */ if (!kvm_get_kvm_safe(stat_data->kvm)) return -ENOENT; --=20 2.35.1 From nobody Tue Jun 23 12:18:35 2026 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 96055C433F5 for ; Sat, 5 Mar 2022 20:56:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229944AbiCEU4w (ORCPT ); Sat, 5 Mar 2022 15:56:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232549AbiCEU4l (ORCPT ); Sat, 5 Mar 2022 15:56:41 -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 0A60F60DB8; Sat, 5 Mar 2022 12:55:50 -0800 (PST) Received: by mail-qk1-x733.google.com with SMTP id n185so9081347qke.5; Sat, 05 Mar 2022 12:55:49 -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=caAOL4DhBXEAlI019vHXou2JkvhGYLGi1f2ZLFmi2YM=; b=o/ZtqAjW9TUN/J9zhoYrXEl3pd6wHzuXU5sIv7W0e9lZ+vKirdBLIbt5EXUIB3V94g DKCRw0pVYXAsWVJpYS2khd++s7q4he2K5cu0Qwg0tlCouP4LxRyA2nV6URJelPi1SiJN f0KaPj55Src/r8mJlcGMCQ32w8rqR1qwRQyZ41YD3prfUIf1i/qGmdQ+Wmas1m5+fxJm 1uZKv84aVz/q40+48PPs19E8tJHjB+4iqYY0ckHlGUDIDjgQeidK+QNh8Y3h5MxmOt7Y 9hqlR++0Cvm/aSzqxyfdnKQb7YrDiRIY338fiNAub0oewfcJe8uV5OSq1GvZtgiQpam+ zR0Q== 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=caAOL4DhBXEAlI019vHXou2JkvhGYLGi1f2ZLFmi2YM=; b=LS2gChAdacllD3eQXihoeL/kCdMXeG3c4GkmTtlyoWAx/P7lQyxMCQZBKoTwFeNiia 3qFSxjMhnlbpLnlRcRtFDwnvAzVxLRPkwaaVQQQvkn6Mtu6SR4UZ/qIdrloORdJalqjk TzaIS/f54a094UJ+dY8xqN2SMBpCAPiWZf2TBi1ne5KLaFStH/hMEbx91hl56fVQJKP1 lpcfpvuusukCG3EKZYi7tRgHj/HcyO6kkM6swrp0dpxAhF1bSdyN+DJTnMaRqbRnFQ+o bNrjd3gjH3IA6Ei/tSxzu3TSnlDi+ZKdTMpH9IOgJfTCc9sUZKtTWUHBclW9tx6s9QzA 8KiA== X-Gm-Message-State: AOAM532K8BJ5wu5OIGyhZYMXaiwpUI2JNFW5xgs5CtRDhpeUPsozdMW2 4kAas63efWs1IqLvFnYY+d0Y1MVMu8KOdvjM X-Google-Smtp-Source: ABdhPJxVh1Furf+8z0x/WG4SjmXx52XaQjErAse2ogrA433A1nBn3oCIinn2fIB79hSQK4YEZhQ8sw== X-Received: by 2002:a05:620a:22a3:b0:663:7c52:51c6 with SMTP id p3-20020a05620a22a300b006637c5251c6mr2728556qkh.295.1646513749159; Sat, 05 Mar 2022 12:55:49 -0800 (PST) Received: from henry-arch.studentwireless.binghamton.edu ([149.125.84.173]) by smtp.googlemail.com with ESMTPSA id l19-20020a05622a175300b002de935a94c9sm5877525qtk.8.2022.03.05.12.55.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 12:55:48 -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 minor indentation and brace style issues Date: Sat, 5 Mar 2022 15:55:28 -0500 Message-Id: <20220305205528.463894-7-henryksloan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220305205528.463894-1-henryksloan@gmail.com> References: <20220305205528.463894-1-henryksloan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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, u= nsigned 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; +} =20 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 *kv= m, n =3D ALIGN(log->num_pages, BITS_PER_LONG) / 8; =20 if (log->first_page > memslot->npages || - log->num_pages > memslot->npages - log->first_page || - (log->num_pages < memslot->npages - log->first_page && (log->num_page= s & 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; =20 kvm_arch_sync_dirty_log(kvm, memslot); =20 @@ -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. - */=20 + */ if (!kvm_try_get_pfn(pfn)) r =3D -EFAULT; =20 @@ -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); =20 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, } =20 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 =3D gpa >> PAGE_SHIFT; struct kvm_memory_slot *slot =3D 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); =20 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); =20 int kvm_vcpu_write_guest(struct kvm_vcpu *vcpu, gpa_t gpa, const void *dat= a, - unsigned long len) + unsigned long len) { gfn_t gfn =3D 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); =20 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 =3D offset_in_page(gpa); gfn_t start_gfn =3D gpa >> PAGE_SHIFT; @@ -3156,8 +3159,8 @@ int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsig= ned long len) EXPORT_SYMBOL_GPL(kvm_clear_guest); =20 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 =3D kvm_get_running_vcpu(); =20 @@ -5176,9 +5179,8 @@ int kvm_io_bus_unregister_dev(struct kvm *kvm, enum k= vm_bus bus_idx, return 0; =20 for (i =3D 0; i < bus->dev_count; i++) { - if (bus->range[i].dev =3D=3D dev) { + if (bus->range[i].dev =3D=3D dev) break; - } } =20 if (i =3D=3D 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; } =20 #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, struc= t gfn_to_pfn_cache *gpc, ret =3D -EFAULT; } =20 - map_done: + map_done: write_lock_irq(&gpc->lock); if (ret) { gpc->valid =3D false; --=20 2.35.1