[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu 5/6] cpu: Implement CPUClass::parse_features
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-cpu 5/6] cpu: Implement CPUClass::parse_features() for the rest of CPUs |
Date: |
Tue, 4 Mar 2014 03:55:48 +0100 |
CPUs who do not provide their own implementation of feature parsing
will treat each option as a QOM property and set it to the supplied
value.
Signed-off-by: Andreas Färber <address@hidden>
---
qom/cpu.c | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/qom/cpu.c b/qom/cpu.c
index 84c51e5..70fea7b 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -1,7 +1,7 @@
/*
* QEMU CPU model
*
- * Copyright (c) 2012 SUSE LINUX Products GmbH
+ * Copyright (c) 2012-2014 SUSE LINUX Products GmbH
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -218,6 +218,34 @@ static ObjectClass *cpu_common_class_by_name(const char
*cpu_model)
return NULL;
}
+static void cpu_common_parse_features(CPUState *cpu, char *features,
+ Error **errp)
+{
+ char *featurestr; /* Single "key=value" string being parsed */
+ char *val;
+ Error *err = NULL;
+
+ featurestr = features ? strtok(features, ",") : NULL;
+
+ while (featurestr) {
+ val = strchr(featurestr, '=');
+ if (val) {
+ *val = 0;
+ val++;
+ object_property_parse(OBJECT(cpu), val, featurestr, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ } else {
+ error_setg(errp, "Expected key=value format, found %s.",
+ featurestr);
+ return;
+ }
+ featurestr = strtok(NULL, ",");
+ }
+}
+
static void cpu_common_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cpu = CPU(dev);
@@ -248,6 +276,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)
CPUClass *k = CPU_CLASS(klass);
k->class_by_name = cpu_common_class_by_name;
+ k->parse_features = cpu_common_parse_features;
k->reset = cpu_common_reset;
k->get_arch_id = cpu_common_get_arch_id;
k->has_work = cpu_common_has_work;
--
1.8.4.5
Re: [Qemu-devel] [PATCH qom-cpu 1/6] cpu: Introduce CPUClass::parse_features() hook, Andreas Färber, 2014/03/09
[Qemu-devel] [PATCH qom-cpu 4/6] target-sparc: Defer SPARCCPU feature inference to QOM realize, Andreas Färber, 2014/03/03
[Qemu-devel] [PATCH qom-cpu 5/6] cpu: Implement CPUClass::parse_features() for the rest of CPUs,
Andreas Färber <=
[Qemu-devel] [PATCH qom-cpu 2/6] target-sparc: Use error_report() for CPU error reporting, Andreas Färber, 2014/03/03
[Qemu-devel] [PATCH qom-cpu 3/6] target-sparc: Implement CPUClass::parse_features() for SPARCCPU, Andreas Färber, 2014/03/03
[Qemu-devel] [PATCH qom-cpu 6/6] cpu: Factor out cpu_generic_init(), Andreas Färber, 2014/03/03
Re: [Qemu-devel] [PATCH qom-cpu 0/6] cpu: Unifying features parsing, Andreas Färber, 2014/03/04
Re: [Qemu-devel] [PATCH qom-cpu 0/6] cpu: Unifying features parsing, Alexey Kardashevskiy, 2014/03/04