From patchwork Fri Mar 11 23:05:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 86465 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8D172B6FC2 for ; Sat, 12 Mar 2011 10:07:13 +1100 (EST) Received: from localhost ([127.0.0.1]:53999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PyBQM-00047O-Ih for incoming@patchwork.ozlabs.org; Fri, 11 Mar 2011 18:07:10 -0500 Received: from [140.186.70.92] (port=54552 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PyBPB-00046N-FV for qemu-devel@nongnu.org; Fri, 11 Mar 2011 18:05:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PyBPA-0006vJ-H1 for qemu-devel@nongnu.org; Fri, 11 Mar 2011 18:05:57 -0500 Received: from e3.ny.us.ibm.com ([32.97.182.143]:51520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PyBPA-0006vC-AC for qemu-devel@nongnu.org; Fri, 11 Mar 2011 18:05:56 -0500 Received: from d01dlp01.pok.ibm.com (d01dlp01.pok.ibm.com [9.56.224.56]) by e3.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p2BMje4J010318 for ; Fri, 11 Mar 2011 17:45:40 -0500 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 30CFB38C8039 for ; Fri, 11 Mar 2011 18:05:53 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2BN5tGw199396 for ; Fri, 11 Mar 2011 18:05:55 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2BN5tId027323 for ; Fri, 11 Mar 2011 18:05:55 -0500 Received: from localhost.localdomain (sig-9-65-217-31.mts.ibm.com [9.65.217.31]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p2BN5lGq026958; Fri, 11 Mar 2011 18:05:54 -0500 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Fri, 11 Mar 2011 17:05:35 -0600 Message-Id: <1299884745-521-6-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1299884745-521-1-git-send-email-aliguori@us.ibm.com> References: <1299884745-521-1-git-send-email-aliguori@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.143 Cc: Adam Litke , Anthony Liguori , Luiz Capitulino , Avi Kivity , Markus Armbruster Subject: [Qemu-devel] [PATCH 05/15] qapi: add QAPI module type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This lets us register marshaling handlers using a module init function. Signed-off-by: Anthony Liguori diff --git a/module.h b/module.h index 9263f1c..ef66730 100644 --- a/module.h +++ b/module.h @@ -24,12 +24,14 @@ typedef enum { MODULE_INIT_BLOCK, MODULE_INIT_DEVICE, MODULE_INIT_MACHINE, + MODULE_INIT_QAPI, MODULE_INIT_MAX } module_init_type; #define block_init(function) module_init(function, MODULE_INIT_BLOCK) #define device_init(function) module_init(function, MODULE_INIT_DEVICE) #define machine_init(function) module_init(function, MODULE_INIT_MACHINE) +#define qapi_init(function) module_init(function, MODULE_INIT_QAPI) void register_module_init(void (*fn)(void), module_init_type type); diff --git a/vl.c b/vl.c index 5e007a7..d27e750 100644 --- a/vl.c +++ b/vl.c @@ -1962,6 +1962,8 @@ int main(int argc, char **argv, char **envp) cyls = heads = secs = 0; translation = BIOS_ATA_TRANSLATION_AUTO; + module_call_init(MODULE_INIT_QAPI); + for (i = 0; i < MAX_NODES; i++) { node_mem[i] = 0; node_cpumask[i] = 0;