target/riscv: Remove unuseful KVM stubs
Subsystems (3)
PATCH 1/1 target/riscv: Remove unuseful KVM stubs
Since we always check whether KVM is enabled before calling kvm_riscv_reset_vcpu() and kvm_riscv_set_irq(), their call is elided by the compiler when KVM is not available. Therefore the stubs are not even linked. Remove them.
--- target/riscv/kvm-stub.c | 30 ------------------------------ target/riscv/kvm.c | 4 +--- target/riscv/meson.build | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 target/riscv/kvm-stub.c
target/riscv/kvm-stub.c deleted +0 -30
@@ -1,30 +0,0 @@ -/* -* QEMU KVM RISC-V specific function stubs -* -* Copyright (c) 2020 Huawei Technologies Co., Ltd -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2 or later, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "qemu/osdep.h" -#include "cpu.h" -#include "kvm_riscv.h" - -void kvm_riscv_reset_vcpu (RISCVCPU *cpu) -{ -abort (); -} - -void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level) -{ -abort (); -}
target/riscv/kvm.c +1 -3
@@ -503,9 +503,7 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) {CPURISCVState *env = &cpu->env; -if (!kvm_enabled ()) { -return ; - } +assert (kvm_enabled ()); env->pc = cpu->env.kernel_addr; env->gpr[10 ] =kvm_arch_vcpu_id (CPU (cpu));/* a0 */ env->gpr[11 ] = cpu->env.fdt_addr;/* a1 */
target/riscv/meson.build +1 -1
@@ -22,7 +22,7 @@ riscv_ss.add(files( 'crypto_helper.c', 'zce_helper.c' )) -riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c')) +riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) riscv_softmmu_ss = ss.source_set() riscv_softmmu_ss.add(files(
Signature · 1 line
2.38.1
ping?
Quoted 77 lines · Philippe Mathieu-Daudé
Since we always check whether KVM is enabled before calling
kvm_riscv_reset_vcpu()andkvm_riscv_set_irq(), their call is elided by the compiler when KVM is not available. Therefore the stubs are not even linked. Remove them.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/riscv/kvm-stub.c | 30 ------------------------------ target/riscv/kvm.c | 4 +--- target/riscv/meson.build | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-)delete mode 100644
target/riscv/kvm-stub.ctarget/riscv/kvm-stub.c deleted +0
-30@@ -1,30 +0,0 @@ -/* -* QEMU KVM RISC-V specific function stubs -* -* Copyright (c) 2020 Huawei Technologies Co., Ltd -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2 or later, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "qemu/osdep.h" -#include "cpu.h" -#include "kvm_riscv.h" - -void kvm_riscv_reset_vcpu (RISCVCPU *cpu) -{ -abort (); -} - -void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level) -{ -abort (); -}target/riscv/kvm.c +1
-3@@ -503,9 +503,7 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) {CPURISCVState *env = &cpu->env; -if (!kvm_enabled ()) { -return ; - } +assert (kvm_enabled ()); env->pc = cpu->env.kernel_addr; env->gpr[10 ] =kvm_arch_vcpu_id (CPU (cpu));/* a0 */ env->gpr[11 ] = cpu->env.fdt_addr;/* a1 */ target/riscv/meson.build +1
-1@@ -22,7 +22,7 @@ riscv_ss.add(files( 'crypto_helper.c', 'zce_helper.c' )) -riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c')) +riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) riscv_softmmu_ss = ss.source_set() riscv_softmmu_ss.add(files(
Quoted 3 lines · Philippe Mathieu-Daudé
Since we always check whether KVM is enabled before calling
kvm_riscv_reset_vcpu()andkvm_riscv_set_irq(), their call is elided by the compiler when KVM is not available.
Had to google 'elided'. Nice touch.
Quoted 4 lines
Therefore the stubs are not even linked. Remove them.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Tested with a simple KVM guest. Nothing bad happened.
Quoted 70 lines
target/riscv/kvm-stub.c | 30 ------------------------------ target/riscv/kvm.c | 4 +--- target/riscv/meson.build | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-)delete mode 100644
target/riscv/kvm-stub.ctarget/riscv/kvm-stub.c deleted +0
-30@@ -1,30 +0,0 @@ -/* -* QEMU KVM RISC-V specific function stubs -* -* Copyright (c) 2020 Huawei Technologies Co., Ltd -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2 or later, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "qemu/osdep.h" -#include "cpu.h" -#include "kvm_riscv.h" - -void kvm_riscv_reset_vcpu (RISCVCPU *cpu) -{ -abort (); -} - -void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level) -{ -abort (); -}target/riscv/kvm.c +1
-3@@ -503,9 +503,7 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) {CPURISCVState *env = &cpu->env; -if (!kvm_enabled ()) { -return ; - } +assert (kvm_enabled ()); env->pc = cpu->env.kernel_addr; env->gpr[10 ] =kvm_arch_vcpu_id (CPU (cpu));/* a0 */ env->gpr[11 ] = cpu->env.fdt_addr;/* a1 */ target/riscv/meson.build +1
-1@@ -22,7 +22,7 @@ riscv_ss.add(files( 'crypto_helper.c', 'zce_helper.c' )) -riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c')) +riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) riscv_softmmu_ss = ss.source_set() riscv_softmmu_ss.add(files(
Quoted 7 lines · Philippe Mathieu-Daudé
Since we always check whether KVM is enabled before calling
kvm_riscv_reset_vcpu()andkvm_riscv_set_irq(), their call is elided by the compiler when KVM is not available. Therefore the stubs are not even linked. Remove them.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Alistair
Quoted 75 lines
--- target/riscv/kvm-stub.c | 30 ------------------------------ target/riscv/kvm.c | 4 +--- target/riscv/meson.build | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 target/riscv/kvm-stub.ctarget/riscv/kvm-stub.c deleted +0
-30@@ -1,30 +0,0 @@ -/* -* QEMU KVM RISC-V specific function stubs -* -* Copyright (c) 2020 Huawei Technologies Co., Ltd -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2 or later, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "qemu/osdep.h" -#include "cpu.h" -#include "kvm_riscv.h" - -void kvm_riscv_reset_vcpu (RISCVCPU *cpu) -{ -abort (); -} - -void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level) -{ -abort (); -}target/riscv/kvm.c +1
-3@@ -503,9 +503,7 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) {CPURISCVState *env = &cpu->env; -if (!kvm_enabled ()) { -return ; - } +assert (kvm_enabled ()); env->pc = cpu->env.kernel_addr; env->gpr[10 ] =kvm_arch_vcpu_id (CPU (cpu));/* a0 */ env->gpr[11 ] = cpu->env.fdt_addr;/* a1 */ target/riscv/meson.build +1
-2@@ -22,7 +22,7 @@ riscv_ss.add(files( 'crypto_helper.c', 'zce_helper.c' )) -riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c')) +riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) riscv_softmmu_ss = ss.source_set() riscv_softmmu_ss.add(files( --2.38.1
Quoted 7 lines · Philippe Mathieu-Daudé
Since we always check whether KVM is enabled before calling
kvm_riscv_reset_vcpu()andkvm_riscv_set_irq(), their call is elided by the compiler when KVM is not available. Therefore the stubs are not even linked. Remove them.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Do you mind rebasing this on
https://github.com/alistair23/qemu/tree/riscv-to-apply.next?
Alistair
Quoted 75 lines
--- target/riscv/kvm-stub.c | 30 ------------------------------ target/riscv/kvm.c | 4 +--- target/riscv/meson.build | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 target/riscv/kvm-stub.ctarget/riscv/kvm-stub.c deleted +0
-30@@ -1,30 +0,0 @@ -/* -* QEMU KVM RISC-V specific function stubs -* -* Copyright (c) 2020 Huawei Technologies Co., Ltd -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2 or later, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "qemu/osdep.h" -#include "cpu.h" -#include "kvm_riscv.h" - -void kvm_riscv_reset_vcpu (RISCVCPU *cpu) -{ -abort (); -} - -void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level) -{ -abort (); -}target/riscv/kvm.c +1
-3@@ -503,9 +503,7 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) {CPURISCVState *env = &cpu->env; -if (!kvm_enabled ()) { -return ; - } +assert (kvm_enabled ()); env->pc = cpu->env.kernel_addr; env->gpr[10 ] =kvm_arch_vcpu_id (CPU (cpu));/* a0 */ env->gpr[11 ] = cpu->env.fdt_addr;/* a1 */ target/riscv/meson.build +1
-2@@ -22,7 +22,7 @@ riscv_ss.add(files( 'crypto_helper.c', 'zce_helper.c' )) -riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: files('kvm-stub.c')) +riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) riscv_softmmu_ss = ss.source_set() riscv_softmmu_ss.add(files( --2.38.1