From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XcAng-0006Hc-1K for qemu-devel@nongnu.org; Thu, 09 Oct 2014 06:18:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XcAnS-0000X6-Qy for qemu-devel@nongnu.org; Thu, 09 Oct 2014 06:18:23 -0400 Received: from mail-wg0-x234.google.com ([2a00:1450:400c:c00::234]:54370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XcAnS-0000Wx-Gv for qemu-devel@nongnu.org; Thu, 09 Oct 2014 06:18:10 -0400 Received: by mail-wg0-f52.google.com with SMTP id a1so873872wgh.35 for ; Thu, 09 Oct 2014 03:18:09 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 9 Oct 2014 12:17:26 +0200 Message-Id: <1412849855-12661-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1412849438-12274-1-git-send-email-pbonzini@redhat.com> References: <1412849438-12274-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 19/28] 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: Eduardo Habkost From: Eduardo Habkost Reviewed-by: Paolo Bonzini Signed-off-by: Eduardo Habkost Signed-off-by: Paolo Bonzini --- accel.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/accel.c b/accel.c index 0f3fcee..9241967 100644 --- a/accel.c +++ b/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.8.3.1