From nobody Sun Feb 8 14:35:10 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554446655012147.53583635921166; Thu, 4 Apr 2019 23:44:15 -0700 (PDT) Received: from localhost ([127.0.0.1]:36977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIZx-0004Zv-IX for importer@patchew.org; Fri, 05 Apr 2019 02:43:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCIY7-0003dr-84 for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCIY6-0004VL-DW for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:03 -0400 Received: from mga07.intel.com ([134.134.136.100]:40758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hCIY6-0004O6-2b for qemu-devel@nongnu.org; Fri, 05 Apr 2019 02:42:02 -0400 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Apr 2019 23:42:01 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga007.jf.intel.com with ESMTP; 04 Apr 2019 23:42:00 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,310,1549958400"; d="scan'208";a="128814028" From: Wei Yang To: qemu-devel@nongnu.org Date: Fri, 5 Apr 2019 14:41:20 +0800 Message-Id: <20190405064121.23662-4-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190405064121.23662-1-richardw.yang@linux.intel.com> References: <20190405064121.23662-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 Subject: [Qemu-devel] [PATCH v2 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, ehabkost@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Markus Armbruster 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 Reviewed-by: Wei Yang --- vl.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/vl.c b/vl.c index cf08d96ce4..99f9cb2533 100644 --- a/vl.c +++ b/vl.c @@ -1421,40 +1421,31 @@ MachineState *current_machine; static MachineClass *find_machine(const char *name, GSList *machines) { GSList *el; - MachineClass *mc =3D NULL; =20 for (el =3D machines; el; el =3D el->next) { - MachineClass *temp =3D el->data; + MachineClass *mc =3D el->data; =20 - if (!strcmp(temp->name, name)) { - mc =3D temp; - break; - } - if (temp->alias && - !strcmp(temp->alias, name)) { - mc =3D temp; - break; + if (!strcmp(mc->name, name) || !g_strcmp0(mc->alias, name)) { + return mc; } } =20 - return mc; + return NULL; } =20 static MachineClass *find_default_machine(GSList *machines) { GSList *el; - MachineClass *mc =3D NULL; =20 for (el =3D machines; el; el =3D el->next) { - MachineClass *temp =3D el->data; + MachineClass *mc =3D el->data; =20 - if (temp->is_default) { - mc =3D temp; - break; + if (mc->is_default) { + return mc; } } =20 - return mc; + return NULL; } =20 MachineInfoList *qmp_query_machines(Error **errp) --=20 2.19.1