AccelCPUClass is now an empty class. We removed all uses of the TYPE_ACCEL_CPU definition. Remove as dead code, along with register_accel_target_type().
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/accel/accel-cpu-target.h | 31 ------------------------------- include/accel/accel-cpu.h | 19 ------------------- accel/accel-common.c | 16 ---------------- 3 files changed, 66 deletions(-) delete mode 100644 include/accel/accel-cpu-target.h delete mode 100644 include/accel/accel-cpu.h diff --git a/include/accel/accel-cpu-target.h b/include/accel/accel-cpu-target.h deleted file mode 100644 index 6feb344e29b..00000000000 --- a/include/accel/accel-cpu-target.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Accelerator interface, specializes CPUClass - * This header is used only by target-specific code. - * - * Copyright 2021 SUSE LLC - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#ifndef ACCEL_CPU_TARGET_H -#define ACCEL_CPU_TARGET_H - -/* - * This header is used to define new accelerator-specific target-specific - * accelerator cpu subclasses. - * It uses CPU_RESOLVING_TYPE, so this is clearly target-specific. - * - * Do not try to use for any other purpose than the implementation of new - * subclasses in target/, or the accel implementation itself in accel/ - */ - -#include "qom/object.h" -#include "accel/accel-cpu.h" -#include "cpu.h" - -#define TYPE_ACCEL_CPU "accel-" CPU_RESOLVING_TYPE -#define ACCEL_CPU_NAME(name) (name "-" TYPE_ACCEL_CPU) -DECLARE_CLASS_CHECKERS(AccelCPUClass, ACCEL_CPU, TYPE_ACCEL_CPU) - -#endif /* ACCEL_CPU_H */ diff --git a/include/accel/accel-cpu.h b/include/accel/accel-cpu.h deleted file mode 100644 index d7ea45ada2e..00000000000 --- a/include/accel/accel-cpu.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Accelerator interface, specializes CPUClass - * - * Copyright 2021 SUSE LLC - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef ACCEL_CPU_H -#define ACCEL_CPU_H - -#include "qom/object.h" -#include "hw/core/cpu.h" - -typedef struct AccelCPUClass { - ObjectClass parent_class; -} AccelCPUClass; - -#endif /* ACCEL_CPU_H */ diff --git a/accel/accel-common.c b/accel/accel-common.c index d8ee6d62667..4fe15349012 100644 --- a/accel/accel-common.c +++ b/accel/accel-common.c @@ -11,7 +11,6 @@ #include "qemu/accel.h" #include "qemu/target-info.h" #include "accel/accel-ops.h" -#include "accel/accel-cpu.h" #include "accel/accel-cpu-ops.h" #include "accel-internal.h" @@ -98,18 +97,3 @@ static const TypeInfo accel_types[] = { }; DEFINE_TYPES(accel_types) - -static void register_accel_target_type(void) -{ - g_autofree char *name = g_strconcat("accel-", target_cpu_type(), NULL); - const TypeInfo accel_cpu_type = { - .name = name, - .parent = TYPE_OBJECT, - .abstract = true, - .class_size = sizeof(AccelCPUClass), - }; - - type_register_static(&accel_cpu_type); -} - -type_init(register_accel_target_type); -- 2.53.0
