From nobody Fri Mar 29 05:30:15 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623315207; cv=none; d=zohomail.com; s=zohoarc; b=gqrVDvCChM0jzXUncwAV693Frwqe6oYKPusz7FAJirW4otJLcPoRNpuurMi8vQq97jtpD617VcYbTlI1IklFcY0e21FHPQh/18B+MhIXz/CJo81/u9zrGzqFdKF5l3pLF1ievKRXhZRZNL4r/DX3Fhi613g10iLa6hMwCWwXvNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623315207; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Y2Pyiw0Wl9/DyEiUxHLtR1oMST+4NRtt5CMAcHgQLcE=; b=JA1RwVCe8tmVineP0C338GyCPyxQwOkaoLfEJZjsz0glrcA0q9NHHbtsD3tS5i04QZViYj7lofGWY1JdI3+Vzq+yqYfup67vI7fchwkvbHxVWXgflVX8FlWAQ/hobckJUGQE71lVBP/YFjRKuPVzFQtN+RWXnxxRl/vezWzZtbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass 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 162331520786448.95454077663055; Thu, 10 Jun 2021 01:53:27 -0700 (PDT) Received: from localhost ([::1]:48706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrGRK-0005GK-Is for importer2@patchew.org; Thu, 10 Jun 2021 04:53:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrGOV-0003mI-VG for qemu-devel@nongnu.org; Thu, 10 Jun 2021 04:50:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrGOU-00044s-F1 for qemu-devel@nongnu.org; Thu, 10 Jun 2021 04:50:31 -0400 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-360-Q6-sSxopOnqwZ-JYtZHczA-1; Thu, 10 Jun 2021 04:50:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E454F100C61C for ; Thu, 10 Jun 2021 08:50:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-222.ams2.redhat.com [10.36.112.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B7EC160C05; Thu, 10 Jun 2021 08:50:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 51A4D113865F; Thu, 10 Jun 2021 10:50:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623315029; 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; bh=Y2Pyiw0Wl9/DyEiUxHLtR1oMST+4NRtt5CMAcHgQLcE=; b=JluXB8SgpPpM+TIAuA6GGtf9JJJz4TSaBu+Zk1PAU5NK2Wr4nADLEUA4O9nuqTfN8V+j23 Ns5GtFiStE5cKgVNn/521gGc4TFKNaNJwsAni0g24ygG34OcMAS7wvnpOfSCY7R/iROXYp 3T5wqr+McE07albLhWan0aGJjGKwtnw= X-MC-Unique: Q6-sSxopOnqwZ-JYtZHczA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH] qemu-option: Drop dead assertion Date: Thu, 10 Jun 2021 10:50:26 +0200 Message-Id: <20210610085026.436081-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.199, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit c6ecec43b2 "qemu-option: Check return value instead of @err where convenient" simplified opts =3D qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, &local_err); if (local_err) { error_propagate(errp, local_err); return NULL; } to opts =3D qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, errp= ); if (!opts) { return NULL; } but neglected to delete assert(opts !=3D NULL); Do that now. Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth --- util/qemu-option.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index 4944015a25..3fa0b13378 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -1028,8 +1028,6 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, co= nst QDict *qdict, return NULL; } =20 - assert(opts !=3D NULL); - for (entry =3D qdict_first(qdict); entry; entry =3D qdict_next(qdict, entry)) { --=20 2.31.1