[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/28] accel: Move accel name lookup to separate func
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 11/28] accel: Move accel name lookup to separate function |
Date: |
Thu, 9 Oct 2014 12:17:18 +0200 |
From: Eduardo Habkost <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
accel.c | 57 +++++++++++++++++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 24 deletions(-)
diff --git a/accel.c b/accel.c
index fc8c551..c752fcc 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;
}
}
--
1.8.3.1
[Qemu-devel] [PULL 28/28] qemu-char: Fix reconnect socket error reporting, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 25/28] virtio-scsi: fix use-after-free of VirtIOSCSIReq, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 24/28] linuxboot: compute initrd loading address, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 07/28] vl.c: Small coding style fix, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 16/28] accel: Move Xen registration code to xen-common.c, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 15/28] accel: Move KVM accel registration to kvm-all.c, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 10/28] accel: Simplify configure_accelerator() using AccelType *acc variable, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 11/28] accel: Move accel name lookup to separate function,
Paolo Bonzini <=
[Qemu-devel] [PULL 14/28] accel: Report unknown accelerator as "not found" instead of "does not exist", Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 12/28] accel: Use QOM classes for accel types, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 09/28] accel: Create AccelType typedef, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 13/28] accel: Make AccelClass.available() optional, Paolo Bonzini, 2014/10/09
[Qemu-devel] [PULL 08/28] accel: Move accel code to accel.c, Paolo Bonzini, 2014/10/09
Re: [Qemu-devel] [PULL 00/28] Changes for 2014-10-09, Peter Maydell, 2014/10/09