All of lore.kernel.org
 help / color / mirror / Atom feed
From: Aaron Lewis <aaronlewis@google.com>
To: kvm@vger.kernel.org
Cc: pbonzini@redhat.com, jmattson@google.com, seanjc@google.com,
	Aaron Lewis <aaronlewis@google.com>
Subject: [PATCH] KVM: x86: Remove the second definition of pr_fmt in hyperv.c
Date: Tue, 27 Dec 2022 20:26:37 +0000	[thread overview]
Message-ID: <20221227202636.680628-1-aaronlewis@google.com> (raw)

Both commit e21d10ee00c5 ("KVM: x86: Unify pr_fmt to use module name
for all KVM modules") and commit 1567037614af ("KVM: VMX: Resurrect
vmcs_conf sanitization for KVM-on-Hyper-V") define pr_fmt.

Remove the pr_fmt that was defined in commit 1567037614af ("KVM: VMX:
Resurrect vmcs_conf sanitization for KVM-on-Hyper-V").

With both defined I get this:

arch/x86/kvm/vmx/hyperv.c:4:9: error: 'pr_fmt' macro redefined [-Werror,-Wmacro-redefined]
        ^
arch/x86/kvm/vmx/hyperv.c:2:9: note: previous definition is here
        ^
  UPD     arch/x86/kvm/kvm-asm-offsets.h
  AS      arch/x86/kvm/vmx/vmenter.o
  AS      arch/x86/kvm/svm/vmenter.o
1 error generated.

Signed-off-by: Aaron Lewis <aaronlewis@google.com>
---
 arch/x86/kvm/vmx/hyperv.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/x86/kvm/vmx/hyperv.c b/arch/x86/kvm/vmx/hyperv.c
index 398240a4327b5..2a26a0f27d489 100644
--- a/arch/x86/kvm/vmx/hyperv.c
+++ b/arch/x86/kvm/vmx/hyperv.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#define pr_fmt(fmt) "kvm/hyper-v: " fmt
-
 #include <linux/errno.h>
 #include <linux/smp.h>
 
-- 
2.39.0.314.g84b9a713c41-goog


             reply	other threads:[~2022-12-27 20:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-27 20:26 Aaron Lewis [this message]
2022-12-28 11:05 ` [PATCH] KVM: x86: Remove the second definition of pr_fmt in hyperv.c Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221227202636.680628-1-aaronlewis@google.com \
    --to=aaronlewis@google.com \
    --cc=jmattson@google.com \
    --cc=kvm@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=seanjc@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.