From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>,
kvm@vger.kernel.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH 3/3] accel/stubs: Simplify kvm-stub.c
Date: Mon, 9 Nov 2020 10:45:47 +0100 [thread overview]
Message-ID: <20201109094547.2456385-4-f4bug@amsat.org> (raw)
In-Reply-To: <20201109094547.2456385-1-f4bug@amsat.org>
Now than kvm-stub.c is only built on system-mode emulation,
we can simplify its #ifdef'ry.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
accel/stubs/kvm-stub.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c
index 680e0994637..68fdfce50ed 100644
--- a/accel/stubs/kvm-stub.c
+++ b/accel/stubs/kvm-stub.c
@@ -13,10 +13,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "sysemu/kvm.h"
-
-#ifndef CONFIG_USER_ONLY
#include "hw/pci/msi.h"
-#endif
KVMState *kvm_state;
bool kvm_kernel_irqchip;
@@ -91,7 +88,6 @@ int kvm_memcrypt_encrypt_data(uint8_t *ptr, uint64_t len)
return 1;
}
-#ifndef CONFIG_USER_ONLY
int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev)
{
return -ENOSYS;
@@ -158,4 +154,3 @@ bool kvm_arm_supports_user_irq(void)
{
return false;
}
-#endif
--
2.26.2
next prev parent reply other threads:[~2020-11-09 9:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 9:45 [PATCH 0/3] accel: Remove system-mode stubs from user-mode builds Philippe Mathieu-Daudé
2020-11-09 9:45 ` [PATCH 1/3] accel: Only include TCG stubs in user-mode only builds Philippe Mathieu-Daudé
2020-11-09 9:55 ` Claudio Fontana
2020-11-09 10:48 ` Paolo Bonzini
2020-11-09 9:45 ` [PATCH 2/3] accel/stubs: Restrict system-mode emulation stubs Philippe Mathieu-Daudé
2020-11-09 9:56 ` Claudio Fontana
2020-11-09 9:45 ` Philippe Mathieu-Daudé [this message]
2020-11-09 10:50 ` [PATCH 0/3] accel: Remove system-mode stubs from user-mode builds 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=20201109094547.2456385-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=kvm@vger.kernel.org \
--cc=laurent@vivier.eu \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).