| Message ID | 20240529051539.71210-10-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines | expand |
On Wed, 29 May 2024 07:15:25 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > x86_cpu_change_kvm_default() was only used out of kvm-cpu.c by > the pc-i440fx-2.1 machine, which got removed. Make it static, > and remove its declaration. "kvm-cpu.h" is now empty, remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > target/i386/kvm/kvm-cpu.h | 41 --------------------------------------- > target/i386/kvm/kvm-cpu.c | 3 +-- > 2 files changed, 1 insertion(+), 43 deletions(-) > delete mode 100644 target/i386/kvm/kvm-cpu.h > > diff --git a/target/i386/kvm/kvm-cpu.h b/target/i386/kvm/kvm-cpu.h > deleted file mode 100644 > index e858ca21e5..0000000000 > --- a/target/i386/kvm/kvm-cpu.h > +++ /dev/null > @@ -1,41 +0,0 @@ > -/* > - * i386 KVM CPU type and functions > - * > - * Copyright (c) 2003 Fabrice Bellard > - * > - * This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2 of the License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this library; if not, see <http://www.gnu.org/licenses/>. > - */ > - > -#ifndef KVM_CPU_H > -#define KVM_CPU_H > - > -#ifdef CONFIG_KVM > -/* > - * Change the value of a KVM-specific default > - * > - * If value is NULL, no default will be set and the original > - * value from the CPU model table will be kept. > - * > - * It is valid to call this function only for properties that > - * are already present in the kvm_default_props table. > - */ > -void x86_cpu_change_kvm_default(const char *prop, const char *value); > - > -#else /* !CONFIG_KVM */ > - > -#define x86_cpu_change_kvm_default(a, b) > - > -#endif /* CONFIG_KVM */ > - > -#endif /* KVM_CPU_H */ > diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c > index f76972e47e..f9b99b5f50 100644 > --- a/target/i386/kvm/kvm-cpu.c > +++ b/target/i386/kvm/kvm-cpu.c > @@ -10,7 +10,6 @@ > #include "qemu/osdep.h" > #include "cpu.h" > #include "host-cpu.h" > -#include "kvm-cpu.h" > #include "qapi/error.h" > #include "sysemu/sysemu.h" > #include "hw/boards.h" > @@ -178,7 +177,7 @@ static PropValue kvm_default_props[] = { > /* > * Only for builtin_x86_defs models initialized with x86_register_cpudef_types. > */ > -void x86_cpu_change_kvm_default(const char *prop, const char *value) > +static void x86_cpu_change_kvm_default(const char *prop, const char *value) > { > PropValue *pv; > for (pv = kvm_default_props; pv->prop; pv++) {
On Wed, 29 May 2024 07:15:25 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > x86_cpu_change_kvm_default() was only used out of kvm-cpu.c by > the pc-i440fx-2.1 machine, which got removed. Make it static, > and remove its declaration. "kvm-cpu.h" is now empty, remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > target/i386/kvm/kvm-cpu.h | 41 --------------------------------------- > target/i386/kvm/kvm-cpu.c | 3 +-- > 2 files changed, 1 insertion(+), 43 deletions(-) > delete mode 100644 target/i386/kvm/kvm-cpu.h > > diff --git a/target/i386/kvm/kvm-cpu.h b/target/i386/kvm/kvm-cpu.h > deleted file mode 100644 > index e858ca21e5..0000000000 > --- a/target/i386/kvm/kvm-cpu.h > +++ /dev/null > @@ -1,41 +0,0 @@ > -/* > - * i386 KVM CPU type and functions > - * > - * Copyright (c) 2003 Fabrice Bellard > - * > - * This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2 of the License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this library; if not, see <http://www.gnu.org/licenses/>. > - */ > - > -#ifndef KVM_CPU_H > -#define KVM_CPU_H > - > -#ifdef CONFIG_KVM > -/* > - * Change the value of a KVM-specific default > - * > - * If value is NULL, no default will be set and the original > - * value from the CPU model table will be kept. > - * > - * It is valid to call this function only for properties that > - * are already present in the kvm_default_props table. > - */ > -void x86_cpu_change_kvm_default(const char *prop, const char *value); > - > -#else /* !CONFIG_KVM */ > - > -#define x86_cpu_change_kvm_default(a, b) > - > -#endif /* CONFIG_KVM */ > - > -#endif /* KVM_CPU_H */ > diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c > index f76972e47e..f9b99b5f50 100644 > --- a/target/i386/kvm/kvm-cpu.c > +++ b/target/i386/kvm/kvm-cpu.c > @@ -10,7 +10,6 @@ > #include "qemu/osdep.h" > #include "cpu.h" > #include "host-cpu.h" > -#include "kvm-cpu.h" > #include "qapi/error.h" > #include "sysemu/sysemu.h" > #include "hw/boards.h" > @@ -178,7 +177,7 @@ static PropValue kvm_default_props[] = { > /* > * Only for builtin_x86_defs models initialized with x86_register_cpudef_types. > */ > -void x86_cpu_change_kvm_default(const char *prop, const char *value) > +static void x86_cpu_change_kvm_default(const char *prop, const char *value) > { > PropValue *pv; > for (pv = kvm_default_props; pv->prop; pv++) {
diff --git a/target/i386/kvm/kvm-cpu.h b/target/i386/kvm/kvm-cpu.h deleted file mode 100644 index e858ca21e5..0000000000 --- a/target/i386/kvm/kvm-cpu.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * i386 KVM CPU type and functions - * - * Copyright (c) 2003 Fabrice Bellard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef KVM_CPU_H -#define KVM_CPU_H - -#ifdef CONFIG_KVM -/* - * Change the value of a KVM-specific default - * - * If value is NULL, no default will be set and the original - * value from the CPU model table will be kept. - * - * It is valid to call this function only for properties that - * are already present in the kvm_default_props table. - */ -void x86_cpu_change_kvm_default(const char *prop, const char *value); - -#else /* !CONFIG_KVM */ - -#define x86_cpu_change_kvm_default(a, b) - -#endif /* CONFIG_KVM */ - -#endif /* KVM_CPU_H */ diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index f76972e47e..f9b99b5f50 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "host-cpu.h" -#include "kvm-cpu.h" #include "qapi/error.h" #include "sysemu/sysemu.h" #include "hw/boards.h" @@ -178,7 +177,7 @@ static PropValue kvm_default_props[] = { /* * Only for builtin_x86_defs models initialized with x86_register_cpudef_types. */ -void x86_cpu_change_kvm_default(const char *prop, const char *value) +static void x86_cpu_change_kvm_default(const char *prop, const char *value) { PropValue *pv; for (pv = kvm_default_props; pv->prop; pv++) {