From patchwork Tue Apr 2 13:26:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 10881703 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FB47922 for ; Tue, 2 Apr 2019 13:27:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17E0427031 for ; Tue, 2 Apr 2019 13:27:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08EE4274D0; Tue, 2 Apr 2019 13:27:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A1CAC27031 for ; Tue, 2 Apr 2019 13:27:50 +0000 (UTC) Received: from localhost ([127.0.0.1]:58042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBJS9-0004Cv-V6 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Apr 2019 09:27:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBJRH-0002yz-Jz for qemu-devel@nongnu.org; Tue, 02 Apr 2019 09:26:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBJRG-0003Yq-F9 for qemu-devel@nongnu.org; Tue, 02 Apr 2019 09:26:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10123) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hBJRG-0003YA-6L for qemu-devel@nongnu.org; Tue, 02 Apr 2019 09:26:54 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4B36088AA2; Tue, 2 Apr 2019 13:26:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-116.ams2.redhat.com [10.36.116.116]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1740A1001DDB; Tue, 2 Apr 2019 13:26:52 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 928271138648; Tue, 2 Apr 2019 15:26:50 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2019 15:26:49 +0200 Message-Id: <20190402132650.23095-1-armbru@redhat.com> In-Reply-To: <20190311060823.18360-1-richardw.yang@linux.intel.com> References: <20190311060823.18360-1-richardw.yang@linux.intel.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 02 Apr 2019 13:26:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] vl: Clean up after previous commit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, richardw.yang@linux.intel.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since the previous commit, find_machine() and find_default_machine() don't have to deallocate on return. This permits further simplifications. Signed-off-by: Markus Armbruster --- vl.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/vl.c b/vl.c index 126081f595..6a31e5bfac 100644 --- a/vl.c +++ b/vl.c @@ -1467,40 +1467,29 @@ MachineState *current_machine; static MachineClass *find_machine(const char *name, GSList *machines) { GSList *el; - MachineClass *mc = NULL; for (el = machines; el; el = el->next) { - MachineClass *temp = el->data; + MachineClass *mc = el->data; - if (!strcmp(temp->name, name)) { - mc = temp; - break; - } - if (temp->alias && - !strcmp(temp->alias, name)) { - mc = temp; - break; + if (!strcmp(mc->name, name) || !g_strcmp0(mc->alias, name)) { + return mc; } } - return mc; + return NULL; } static MachineClass *find_default_machine(GSList *machines) { GSList *el; - MachineClass *mc = NULL; for (el = machines; el; el = el->next) { - MachineClass *temp = el->data; - - if (temp->is_default) { - mc = temp; - break; + if (((MachineClass *)el->data)->is_default) { + return el->data; } } - return mc; + return NULL; } MachineInfoList *qmp_query_machines(Error **errp)