From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNSql-0007Bn-6v for qemu-devel@nongnu.org; Fri, 29 Aug 2014 16:32:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNSqf-0002au-1P for qemu-devel@nongnu.org; Fri, 29 Aug 2014 16:32:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15074) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNSqe-0002ZY-RG for qemu-devel@nongnu.org; Fri, 29 Aug 2014 16:32:40 -0400 From: Eduardo Habkost Date: Fri, 29 Aug 2014 17:31:45 -0300 Message-Id: <1409344310-5441-13-git-send-email-ehabkost@redhat.com> In-Reply-To: <1409344310-5441-1-git-send-email-ehabkost@redhat.com> References: <1409344310-5441-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 12/17] accel: Move accel init/allowed code to separate function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Mueller , Marcel Apfelbaum , "Michael S. Tsirkin" , Alexander Graf , Christian Borntraeger , "Jason J. Herne" , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Eduardo Habkost --- hw/core/accel.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/core/accel.c b/hw/core/accel.c index aeb779a..5817c3c 100644 --- a/hw/core/accel.c +++ b/hw/core/accel.c @@ -57,6 +57,17 @@ static AccelClass *accel_find(const char *opt_name) return ac; } +static int accel_init(AccelClass *acc, MachineClass *mc) +{ + int ret; + *(acc->allowed) = true; + ret = acc->init(mc); + if (ret < 0) { + *(acc->allowed) = false; + } + return ret; +} + int configure_accelerator(MachineClass *mc) { const char *p; @@ -87,14 +98,12 @@ int configure_accelerator(MachineClass *mc) acc->name); continue; } - *(acc->allowed) = true; - ret = acc->init(mc); + ret = accel_init(acc, 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.9.3