From nobody Mon Feb 9 21:37:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.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=1582923959; cv=none; d=zohomail.com; s=zohoarc; b=cfQqHkTtHh+toBC5pG+uo7md+jAjA14qa4WsKimmPpOkAHAaG5HzZrQGHFxTgOUuTLtlDSpG8hpTIR2foYAHmwpet+7bu7EWqETHF2+/6DUodlShEF4OV4VUXAAmv9rVxPRyVjM+fkIoz05OZqItV/sdfRPoSKhunnG2Iao+XZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582923959; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IoIxPFqCfBCDJiA8MKkIVdnI0zwyrcJ48E1TknAl5qg=; b=iqN3cM4Y9qy27uvf23WSxwxHKw+u4PbRbZ3WHiV9VQE32n2IddbUbUXnTv/F6Sl/nrK8fToAGNAkoqDYspk99uAnGw/oNqzbcVB+3Egq1ugcntUO7gjI+QwG4TX/K8NP7yc2CK8IH2IqCzdoAMoW4z5SmytJWg6Sd2zrn+s/GDk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1582923959560820.4135351737863; Fri, 28 Feb 2020 13:05:59 -0800 (PST) Received: from localhost ([::1]:53922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7mpa-0002m4-Bv for importer@patchew.org; Fri, 28 Feb 2020 16:05:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60168) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7moQ-0001Dv-7h for qemu-devel@nongnu.org; Fri, 28 Feb 2020 16:04:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7moP-0005M9-6i for qemu-devel@nongnu.org; Fri, 28 Feb 2020 16:04:46 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32719 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j7moP-0005Lx-3E for qemu-devel@nongnu.org; Fri, 28 Feb 2020 16:04:45 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-151-wZJJyrxoNhSk4PZkNvMQwA-1; Fri, 28 Feb 2020 16:04:41 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6E6C21005510; Fri, 28 Feb 2020 21:04:40 +0000 (UTC) Received: from localhost (unused-10-15-17-6.yyz.redhat.com [10.15.17.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id AED2C92D01; Fri, 28 Feb 2020 21:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582923884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IoIxPFqCfBCDJiA8MKkIVdnI0zwyrcJ48E1TknAl5qg=; b=gDlnRH3ZaBBq+vi3nNDSok281x9dT6yjzgouebhsJ2JJ15gU4/rxD6RgSP+IoIMkbnoqp6 Qb4PnfFrIaQLHzY8k+/CR1HKsQBE+zjJncZOMKyCtCwjIj8XkbxmNzIMg9q6ydwtpQ/y4s 3DqJ+AuwHhFNPdJnNDQxavuBR2DiOkk= X-MC-Unique: wZJJyrxoNhSk4PZkNvMQwA-1 From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 4/4] vl: Abort if multiple machines are registered as default Date: Fri, 28 Feb 2020 16:04:27 -0500 Message-Id: <20200228210427.474606-5-ehabkost@redhat.com> In-Reply-To: <20200228210427.474606-1-ehabkost@redhat.com> References: <20200228210427.474606-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 It would be confusing to have multiple default machines. Abort if this ever occurs. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200207161948.15972-4-philmd@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Eduardo Habkost Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier --- softmmu/vl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index 705ee6f841..5549f4b619 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1163,16 +1163,18 @@ static MachineClass *find_machine(const char *name,= GSList *machines) static MachineClass *find_default_machine(GSList *machines) { GSList *el; + MachineClass *default_machineclass =3D NULL; =20 for (el =3D machines; el; el =3D el->next) { MachineClass *mc =3D el->data; =20 if (mc->is_default) { - return mc; + assert(default_machineclass =3D=3D NULL && "Multiple default m= achines"); + default_machineclass =3D mc; } } =20 - return NULL; + return default_machineclass; } =20 static int machine_help_func(QemuOpts *opts, MachineState *machine) --=20 2.24.1