From: "Cho, Yu-Chen" <acho@suse.com>
To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org
Cc: cfontana@suse.com, acho@suse.com, jose.ziviani@suse.com,
Claudio Fontana <cfontana@suse.de>,
Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.com>
Subject: [PATCH v7 12/14] target/s390x: remove kvm-stub.c
Date: Wed, 7 Jul 2021 18:53:22 +0800 [thread overview]
Message-ID: <20210707105324.23400-13-acho@suse.com> (raw)
In-Reply-To: <20210707105324.23400-1-acho@suse.com>
all function calls are protected by kvm_enabled(),
so we do not need the stubs.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Cho, Yu-Chen <acho@suse.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
MAINTAINERS | 1 -
target/s390x/kvm-stub.c | 121 ---------------------------------------
target/s390x/meson.build | 2 +-
3 files changed, 1 insertion(+), 123 deletions(-)
delete mode 100644 target/s390x/kvm-stub.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 8ec845f4e0..4e04800576 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -396,7 +396,6 @@ M: Christian Borntraeger <borntraeger@de.ibm.com>
S: Supported
F: target/s390x/kvm.c
F: target/s390x/kvm_s390x.h
-F: target/s390x/kvm-stub.c
F: target/s390x/ioinst.[ch]
F: target/s390x/machine.c
F: target/s390x/sigp.c
diff --git a/target/s390x/kvm-stub.c b/target/s390x/kvm-stub.c
deleted file mode 100644
index 8a308cfebb..0000000000
--- a/target/s390x/kvm-stub.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * QEMU KVM support -- s390x specific function stubs.
- *
- * Copyright (c) 2009 Ulrich Hecht
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#include "qemu/osdep.h"
-#include "cpu.h"
-#include "kvm_s390x.h"
-
-void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t te_code)
-{
-}
-
-int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, void *hostbuf,
- int len, bool is_write)
-{
- return -ENOSYS;
-}
-
-void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code)
-{
-}
-
-int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state)
-{
- return -ENOSYS;
-}
-
-void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu)
-{
-}
-
-int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu)
-{
- return 0;
-}
-
-int kvm_s390_get_hpage_1m(void)
-{
- return 0;
-}
-
-int kvm_s390_get_ri(void)
-{
- return 0;
-}
-
-int kvm_s390_get_clock(uint8_t *tod_high, uint64_t *tod_low)
-{
- return -ENOSYS;
-}
-
-int kvm_s390_get_clock_ext(uint8_t *tod_high, uint64_t *tod_low)
-{
- return -ENOSYS;
-}
-
-int kvm_s390_set_clock(uint8_t tod_high, uint64_t tod_low)
-{
- return -ENOSYS;
-}
-
-int kvm_s390_set_clock_ext(uint8_t tod_high, uint64_t tod_low)
-{
- return -ENOSYS;
-}
-
-void kvm_s390_enable_css_support(S390CPU *cpu)
-{
-}
-
-int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,
- int vq, bool assign)
-{
- return -ENOSYS;
-}
-
-void kvm_s390_cmma_reset(void)
-{
-}
-
-void kvm_s390_reset_vcpu_initial(S390CPU *cpu)
-{
-}
-
-void kvm_s390_reset_vcpu_clear(S390CPU *cpu)
-{
-}
-
-void kvm_s390_reset_vcpu_normal(S390CPU *cpu)
-{
-}
-
-int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit)
-{
- return 0;
-}
-
-void kvm_s390_set_max_pagesize(uint64_t pagesize, Error **errp)
-{
-}
-
-void kvm_s390_crypto_reset(void)
-{
-}
-
-void kvm_s390_stop_interrupt(S390CPU *cpu)
-{
-}
-
-void kvm_s390_restart_interrupt(S390CPU *cpu)
-{
-}
-
-void kvm_s390_set_diag318(CPUState *cs, uint64_t diag318_info)
-{
-}
diff --git a/target/s390x/meson.build b/target/s390x/meson.build
index bbcaede384..6c8e03b8fb 100644
--- a/target/s390x/meson.build
+++ b/target/s390x/meson.build
@@ -8,7 +8,7 @@ s390x_ss.add(files(
'cpu-dump.c',
))
-s390x_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c'))
+s390x_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
gen_features = executable('gen-features', 'gen-features.c', native: true,
build_by_default: false)
--
2.32.0
next prev parent reply other threads:[~2021-07-07 10:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-07 10:53 [PATCH v7 00/14] s390x cleanup Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 01/14] target/s390x: meson: add target_user_arch Cho, Yu-Chen
2021-07-07 11:29 ` Thomas Huth
2021-07-08 17:20 ` Cornelia Huck
2021-07-09 7:24 ` Al Cho
2021-07-09 7:43 ` Cornelia Huck
2021-07-07 10:53 ` [PATCH v7 02/14] hw/s390x: rename tod-qemu.c to tod-tcg.c Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 03/14] hw/s390x: tod: make explicit checks for accelerators when initializing Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 04/14] hw/s390x: only build tod-tcg from the CONFIG_TCG build Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 05/14] target/s390x: remove tcg-stub.c Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 06/14] target/s390x: rename internal.h to s390x-internal.h Cho, Yu-Chen
2021-07-07 11:31 ` Thomas Huth
2021-07-07 10:53 ` [PATCH v7 07/14] target/s390x: start moving TCG-only code to tcg/ Cho, Yu-Chen
2021-07-07 11:39 ` Thomas Huth
2021-07-07 10:53 ` [PATCH v7 08/14] target/s390x: move sysemu-only code out to cpu-sysemu.c Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 09/14] target/s390x: split cpu-dump from helper.c Cho, Yu-Chen
2021-07-07 11:42 ` Thomas Huth
2021-07-07 10:53 ` [PATCH v7 10/14] target/s390x: make helper.c sysemu-only Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 11/14] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m Cho, Yu-Chen
2021-07-07 10:53 ` Cho, Yu-Chen [this message]
2021-07-07 10:53 ` [PATCH v7 13/14] target/s390x: move kvm files into kvm/ Cho, Yu-Chen
2021-07-07 11:47 ` Thomas Huth
2021-07-07 10:53 ` [PATCH v7 14/14] target/s390x: split sysemu part of cpu models Cho, Yu-Chen
2021-07-07 11:56 ` [PATCH v7 00/14] s390x cleanup Cornelia Huck
2021-07-07 16:39 ` Cornelia Huck
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=20210707105324.23400-13-acho@suse.com \
--to=acho@suse.com \
--cc=cfontana@suse.com \
--cc=cfontana@suse.de \
--cc=cohuck@redhat.com \
--cc=jose.ziviani@suse.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.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 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).