[Qemu-devel] [RFC 19/25] accel: Use target-specific accel class if available

[Eduardo Habkost]

Target-specific accelerator subclasses are optional. If a given
accelerator type needs to make it mandatory, the base class can be made
abstract.

Signed-off-by: Eduardo Habkost <address@hidden>
---
 hw/core/accel.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/hw/core/accel.c b/hw/core/accel.c
index 78e7dfc..6efe36c 100644
--- a/hw/core/accel.c
+++ b/hw/core/accel.c
@@ -51,11 +51,25 @@ static const TypeInfo accel_type = {
 };
 
 /* Lookup AccelClass from opt_name. Returns NULL if not found */
-static AccelClass *accel_find(const char *opt_name)
+static AccelClass *accel_find(const char *opt_name, const char *target_name)
 {
     char *class_name = g_strdup_printf("%s-accel", opt_name);
-    AccelClass *ac = ACCEL_CLASS(object_class_by_name(class_name));
+    char *target_class_name = g_strdup_printf("%s-%s-accel",
+                                              target_name, opt_name);
+    ObjectClass *oc;
+    AccelClass *ac;
+    oc = object_class_by_name(target_class_name);
+    if (!oc) {
+        oc = object_class_by_name(class_name);
+    }
+    /* Must be a TYPE_ACCEL subclass, and not abstract */
+    oc = object_class_dynamic_cast(oc, TYPE_ACCEL);
+    if (oc && object_class_is_abstract(oc)) {
+        oc = NULL;
+    }
+    ac = ACCEL_CLASS(oc);
     g_free(class_name);
+    g_free(target_class_name);
     return ac;
 }
 
@@ -96,7 +110,7 @@ int init_accelerator(MachineState *ms, const char 
*target_name)
             p++;
         }
         p = get_opt_name(buf, sizeof(buf), p, ':');
-        acc = accel_find(buf);
+        acc = accel_find(buf, target_name);
         if (!acc) {
             fprintf(stderr, "\"%s\" accelerator does not exist.\n", buf);
             continue;
-- 
1.9.3