diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 08d886de7b429e5f701a143179884ee9dc2ed0de..1b56261964c0f2b62bbccfb74e7c59cb079a0a13 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -266,7 +266,6 @@ static void aarch64_kunpeng_920_initfn(Object *obj) cpu->isar.id_aa64dfr0 = 0x110305408; cpu->isar.id_aa64isar0 = 0x10211120; cpu->isar.id_aa64mmfr0 = 0x101125; - cpu->kvm_target = KVM_ARM_TARGET_GENERIC_V8; } void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) @@ -983,47 +982,10 @@ static gchar *aarch64_gdb_arch_name(CPUState *cs) return g_strdup("aarch64"); } -/* Parse "+feature,-feature,feature=foo" CPU feature string - */ -static void arm_cpu_parse_featurestr(const char *typename, char *features, - Error **errp ) -{ - char *featurestr; - char *val; - static bool cpu_globals_initialized; - - if (cpu_globals_initialized) { - return; - } - cpu_globals_initialized = true; - - featurestr = features ? strtok(features, ",") : NULL; - while (featurestr) { - val = strchr(featurestr, '='); - if (val) { - GlobalProperty *prop = g_new0(typeof(*prop), 1); - *val = 0; - val++; - prop->driver = typename; - prop->property = g_strdup(featurestr); - prop->value = g_strdup(val); - qdev_prop_register_global(prop); - } else if (featurestr[0] == '+' || featurestr[0] == '-') { - warn_report("Ignore %s feature\n", featurestr); - } else { - error_setg(errp, "Expected key=value format, found %s.", - featurestr); - return; - } - featurestr = strtok(NULL, ","); - } -} - static void aarch64_cpu_class_init(ObjectClass *oc, void *data) { CPUClass *cc = CPU_CLASS(oc); - cc->parse_features = arm_cpu_parse_featurestr; cc->gdb_read_register = aarch64_cpu_gdb_read_register; cc->gdb_write_register = aarch64_cpu_gdb_write_register; cc->gdb_num_core_regs = 34;