From patchwork Fri Feb 24 14:13:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 142847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 63FFEB6EEE for ; Sat, 25 Feb 2012 01:14:07 +1100 (EST) Received: from localhost ([::1]:43034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0vuG-0002yT-TV for incoming@patchwork.ozlabs.org; Fri, 24 Feb 2012 09:13:56 -0500 Received: from eggs.gnu.org ([140.186.70.92]:35164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0vtn-0002MX-GU for qemu-devel@nongnu.org; Fri, 24 Feb 2012 09:13:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0vtl-0001BT-Qm for qemu-devel@nongnu.org; Fri, 24 Feb 2012 09:13:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58959) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0vtl-0001BL-Im for qemu-devel@nongnu.org; Fri, 24 Feb 2012 09:13:25 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1OEDOJf031762 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 24 Feb 2012 09:13:25 -0500 Received: from localhost (ovpn-113-73.phx2.redhat.com [10.3.113.73]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q1OEDN8M028960; Fri, 24 Feb 2012 09:13:24 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 24 Feb 2012 12:13:11 -0200 Message-Id: <1330092792-22455-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1330092792-22455-1-git-send-email-lcapitulino@redhat.com> References: <1330092792-22455-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 4/5] boards: switch machine type list to QTAILQ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Luiz Capitulino --- hw/boards.h | 3 ++- vl.c | 16 ++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/boards.h b/hw/boards.h index 342a774..1eb8314 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -4,6 +4,7 @@ #define HW_BOARDS_H #include "qdev.h" +#include "qemu-queue.h" typedef void QEMUMachineInitFunc(ram_addr_t ram_size, const char *boot_device, @@ -28,7 +29,7 @@ typedef struct QEMUMachine { int is_default; const char *default_machine_opts; GlobalProperty *compat_props; - struct QEMUMachine *next; + QTAILQ_ENTRY(QEMUMachine) next; } QEMUMachine; void machine_register(QEMUMachine *m); diff --git a/vl.c b/vl.c index 9f9927c..4935106 100644 --- a/vl.c +++ b/vl.c @@ -1160,24 +1160,20 @@ void pcmcia_info(Monitor *mon) /***********************************************************/ /* machine registration */ -static QEMUMachine *first_machine = NULL; +static QTAILQ_HEAD(QEMUMachineHead, QEMUMachine) machine_types = + QTAILQ_HEAD_INITIALIZER(machine_types); QEMUMachine *current_machine = NULL; void machine_register(QEMUMachine *m) { - QEMUMachine **pm; - pm = &first_machine; - while (*pm != NULL) - pm = &(*pm)->next; - m->next = NULL; - *pm = m; + QTAILQ_INSERT_TAIL(&machine_types, m, next); } static QEMUMachine *machine_find(const char *name) { QEMUMachine *m; - for(m = first_machine; m != NULL; m = m->next) { + QTAILQ_FOREACH(m, &machine_types, next) { if (!strcmp(m->name, name)) return m; if (m->alias && !strcmp(m->alias, name)) @@ -1190,7 +1186,7 @@ QEMUMachine *machine_find_default(void) { QEMUMachine *m; - for(m = first_machine; m != NULL; m = m->next) { + QTAILQ_FOREACH(m, &machine_types, next) { if (m->is_default) { return m; } @@ -1203,7 +1199,7 @@ void machine_print_all(void) QEMUMachine *m; printf("Supported machines are:\n"); - for (m = first_machine; m != NULL; m = m->next) { + QTAILQ_FOREACH(m, &machine_types, next) { if (m->alias) { printf("%-10s %s (alias of %s)\n", m->alias, m->desc, m->name); }