From nobody Mon Feb 9 17:05:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1555654574; cv=none; d=zoho.com; s=zohoarc; b=AfpVxUq2KXDnwfOCBFmlJLFgkyAbc/7tsAyNigXlSoNeKs/JSCKWXsmT6BbwbJH2rO9lnbkUClRx7b2Drb4FHY9hjDQQpQcST3tYHtt8KhcEq9joWuhOF1HRtmreT0OMMzkRrRJgfaJ9ZYG8of7UfLCZi1cF6iNjlPoO8HDqTVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555654574; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=dOzSXF6yg6/jh+5xzg9sJ6xP0pZkmVdAnO/HRFFJSc4=; b=B//prk5DMLCIkQECZqCU8LA5K1v8S7CTIm3wzGYWPrTfmBQnA4LFltGxDn6k/8UgA2uYUP9SLSWOqdz5M8lRCY3/Cc2EkfDY5lmFh0YKCyGjH5OIn1CUtFmSSwimeJFjI/Dv4ihr3NSo+mgenVR4DlW3exxujpaRZC1ZB+PeXLs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555654574741945.6338683777602; Thu, 18 Apr 2019 23:16:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:51865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHMoe-0006Sk-Kv for importer@patchew.org; Fri, 19 Apr 2019 02:16:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHMmf-00059a-VO for qemu-devel@nongnu.org; Fri, 19 Apr 2019 02:14:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHMmf-0004n1-2T for qemu-devel@nongnu.org; Fri, 19 Apr 2019 02:14:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32886) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHMme-0004me-TA for qemu-devel@nongnu.org; Fri, 19 Apr 2019 02:14:01 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 21CBF3004149; Fri, 19 Apr 2019 06:14:00 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6F83600C1; Fri, 19 Apr 2019 06:13:59 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 19 Apr 2019 03:13:36 -0300 Message-Id: <20190419061349.17094-5-ehabkost@redhat.com> In-Reply-To: <20190419061349.17094-1-ehabkost@redhat.com> References: <20190419061349.17094-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 19 Apr 2019 06:14:00 +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 04/17] 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: Peter Maydell , Igor Mammedov , Markus Armbruster , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 Message-Id: <20190405064121.23662-4-richardw.yang@linux.intel.com> Signed-off-by: Eduardo Habkost --- vl.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/vl.c b/vl.c index 62f2656ccf..cb0f3f5856 100644 --- a/vl.c +++ b/vl.c @@ -1468,40 +1468,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.18.0.rc1.1.g3f1ff2140