[RFC,v4,11/14] target/s390x: remove kvm-stub.c

Commit Message

Al Cho May 24, 2021, 2:52 a.m. UTC

all function calls are protected by kvm_enabled(),
so we should not need the stubs.

Signed-off-by: Claudio Fontana <[e-mail]>
Signed-off-by: Cho, Yu-Chen <[e-mail]>
---
 target/s390x/kvm-stub.c  | 126 ---------------------------------------
 target/s390x/meson.build |   2 +-
 2 files changed, 1 insertion(+), 127 deletions(-)
 delete mode 100644 target/s390x/kvm-stub.c

Comments

Cornelia Huck June 2, 2021, 10:44 a.m. UTC | #1

On Mon, May 24 2021, "Cho, Yu-Chen" <[e-mail]> wrote:

> all function calls are protected by kvm_enabled(),
> so we should not need the stubs.
>
> Signed-off-by: Claudio Fontana <[e-mail]>
> Signed-off-by: Cho, Yu-Chen <[e-mail]>
> ---
>  target/s390x/kvm-stub.c  | 126 ---------------------------------------
>  target/s390x/meson.build |   2 +-
>  2 files changed, 1 insertion(+), 127 deletions(-)
>  delete mode 100644 target/s390x/kvm-stub.c

(...)

> -int kvm_s390_get_gs(void)
> -{
> -    return 0;
> -}

Unrelated to this patch: Nobody seems to call kvm_s390_get_gs()
(anymore?); are we missing something, or can that function be removed?

Thomas Huth June 2, 2021, 11:23 a.m. UTC | #2

On 02/06/2021 12.44, Cornelia Huck wrote:
> On Mon, May 24 2021, "Cho, Yu-Chen" <[e-mail]> wrote:
> 
>> all function calls are protected by kvm_enabled(),
>> so we should not need the stubs.
>>
>> Signed-off-by: Claudio Fontana <[e-mail]>
>> Signed-off-by: Cho, Yu-Chen <[e-mail]>
>> ---
>>   target/s390x/kvm-stub.c  | 126 ---------------------------------------
>>   target/s390x/meson.build |   2 +-
>>   2 files changed, 1 insertion(+), 127 deletions(-)
>>   delete mode 100644 target/s390x/kvm-stub.c
> 
> (...)
> 
>> -int kvm_s390_get_gs(void)
>> -{
>> -    return 0;
>> -}
> 
> Unrelated to this patch: Nobody seems to call kvm_s390_get_gs()
> (anymore?); are we missing something, or can that function be removed?

The last user has likely been removed with 0280b3eb7c0519b43452 ("s390x/kvm: 
use cpu model for gscb on compat machines"). I think this could be removed now.

  Thomas

Patch

diff --git a/target/s390x/kvm-stub.c b/target/s390x/kvm-stub.c
deleted file mode 100644
index 9970b5a8c7..0000000000
--- a/target/s390x/kvm-stub.c
+++ /dev/null
@@ -1,126 +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_gs(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)