From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXX1P-0006aq-KC for qemu-devel@nongnu.org; Fri, 26 Sep 2014 11:01:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXX1G-0000p2-Fx for qemu-devel@nongnu.org; Fri, 26 Sep 2014 11:01:23 -0400 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]:48997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXX1G-0000nN-A4 for qemu-devel@nongnu.org; Fri, 26 Sep 2014 11:01:14 -0400 Received: by mail-wi0-f179.google.com with SMTP id d1so11795683wiv.6 for ; Fri, 26 Sep 2014 08:01:08 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <54257FB1.10107@redhat.com> Date: Fri, 26 Sep 2014 17:01:05 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1409344310-5441-1-git-send-email-ehabkost@redhat.com> <1409344310-5441-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1409344310-5441-6-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 05/17] accel: Move accel name lookup to separate function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Michael Mueller , "Michael S. Tsirkin" , Marcel Apfelbaum , Alexander Graf , Christian Borntraeger , "Jason J. Herne" , =?windows-1252?Q?Andreas_?= =?windows-1252?Q?F=E4rber?= Il 29/08/2014 22:31, Eduardo Habkost ha scritto: > Signed-off-by: Eduardo Habkost > --- > hw/core/accel.c | 57 +++++++++++++++++++++++++++++++++------------------------ > 1 file changed, 33 insertions(+), 24 deletions(-) > > diff --git a/hw/core/accel.c b/hw/core/accel.c > index 00a71c0..7f9b715 100644 > --- a/hw/core/accel.c > +++ b/hw/core/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; > } > } > > Reviewed-by: Paolo Bonzini