aboutsummaryrefslogtreecommitdiff
path: root/accel.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2014-09-26 17:45:20 -0300
committerPaolo Bonzini <pbonzini@redhat.com>2014-10-04 08:59:15 +0200
commita22465520060951e70124729521318a559a3fe88 (patch)
treee74b8ce422c842e8bbf6f7318d64bac2b73f464f /accel.c
parente8b466ef95637e083b8c962476e38dd640f360f1 (diff)
downloadqemu-arm-a22465520060951e70124729521318a559a3fe88.tar.gz
accel: Move accel name lookup to separate function
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'accel.c')
-rw-r--r--accel.c57
1 files changed, 33 insertions, 24 deletions
diff --git a/accel.c b/accel.c
index fc8c5518df..c752fcc52d 100644
--- a/accel.c
+++ b/accel.c
@@ -55,11 +55,24 @@ static AccelType accel_list[] = {
{ "qtest", "QTest", qtest_available, qtest_init_accel, &qtest_allowed },
};
+/* Lookup AccelType from opt_name. Returns NULL if not found */
+static AccelType *accel_find(const char *opt_name)
+{
+ int i;
+ for (i = 0; i < ARRAY_SIZE(accel_list); i++) {
+ AccelType *acc = &accel_list[i];
+ if (acc->opt_name && strcmp(acc->opt_name, opt_name) == 0) {
+ return acc;
+ }
+ }
+ return NULL;
+}
+
int configure_accelerator(MachineClass *mc)
{
const char *p;
char buf[10];
- int i, ret;
+ int ret;
bool accel_initialised = false;
bool init_failed = false;
AccelType *acc = NULL;
@@ -75,30 +88,26 @@ int configure_accelerator(MachineClass *mc)
p++;
}
p = get_opt_name(buf, sizeof(buf), p, ':');
- for (i = 0; i < ARRAY_SIZE(accel_list); i++) {
- acc = &accel_list[i];
- if (strcmp(acc->opt_name, buf) == 0) {
- if (!acc->available()) {
- printf("%s not supported for this target\n",
- acc->name);
- break;
- }
- *(acc->allowed) = true;
- ret = acc->init(mc);
- if (ret < 0) {
- init_failed = true;
- fprintf(stderr, "failed to initialize %s: %s\n",
- acc->name,
- strerror(-ret));
- *(acc->allowed) = false;
- } else {
- accel_initialised = true;
- }
- break;
- }
- }
- if (i == ARRAY_SIZE(accel_list)) {
+ acc = accel_find(buf);
+ if (!acc) {
fprintf(stderr, "\"%s\" accelerator does not exist.\n", buf);
+ continue;
+ }
+ if (!acc->available()) {
+ printf("%s not supported for this target\n",
+ acc->name);
+ continue;
+ }
+ *(acc->allowed) = true;
+ ret = acc->init(mc);
+ if (ret < 0) {
+ init_failed = true;
+ fprintf(stderr, "failed to initialize %s: %s\n",
+ acc->name,
+ strerror(-ret));
+ *(acc->allowed) = false;
+ } else {
+ accel_initialised = true;
}
}