From nobody Sat May 30 19:21:08 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1777443708; cv=none; d=zohomail.com; s=zohoarc; b=EvZxVImkIr6CLVFyV8gK0KfXGBBAPcsoiz7jyOW5Me98JiRT1FDGVtuzN1FXPH3jg4AQ8UN7VK+iHvDAohY9O6mELvhBGFkp/qPritSb5UWPj9oIlm8LXAcks/7gsU2SzzU61knVDmwqlUWP6eCtzQm3F/acG2yIX/WTzLGZ5tw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777443708; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wpsQePTv0btTrCLyqE5kqL0DTPlWHThu8xlylHlpxhs=; b=iJulfeKZ5rXthQrfnj8QAjBaR6Fm3p+gH7iUcQHO+jqTC83g1q91/bROmb0vzGZdgTrUOWNkhYLOWLg91H6hfxhNJlICyu+LWYwy+n0X8Ae8yYHMw5ChZe4gTBPI04SI0GmG+HKAjoyaVE5Cj1ykVFT68FW7kkswjasu61cEyzw= 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+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777443708060700.1628684546779; Tue, 28 Apr 2026 23:21:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wHyIO-0004an-5O; Wed, 29 Apr 2026 02:21:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wHyHv-0004Vk-34; Wed, 29 Apr 2026 02:20:51 -0400 Received: from out30-101.freemail.mail.aliyun.com ([115.124.30.101]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wHyHl-00077C-EA; Wed, 29 Apr 2026 02:20:46 -0400 Received: from localhost(mailfrom:guobin@linux.alibaba.com fp:SMTPD_---0X1wRJXH_1777443612 cluster:ay36) by smtp.aliyun-inc.com; Wed, 29 Apr 2026 14:20:22 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1777443622; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=wpsQePTv0btTrCLyqE5kqL0DTPlWHThu8xlylHlpxhs=; b=qaPq+dntt/OqqMDlomsSmPYNpKpsz92jXSMAVhfgA9RkUdTD1Qlkr3uY9LHJeBrAwsTx3Iv8pJ7rRatNz1hg/h/g6pn1VDjvPCLKYaPQBBCqQ+adT74wh1NpPeb3ce3VMohbWSN07MfQy1plImPz2qzHWkn4/2ADqWcujlUI4ro= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R111e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam033037026112; MF=guobin@linux.alibaba.com; NM=1; PH=DS; RN=6; SR=0; TI=SMTPD_---0X1wRJXH_1777443612; From: Bin Guo To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, kwolf@redhat.com, hreitz@redhat.com, qemu-block@nongnu.org Subject: [PATCH 1/3] qom/object: merge double hash table traversal in object_property_del_child Date: Wed, 29 Apr 2026 14:20:02 +0800 Message-ID: <20260429062004.36582-2-guobin@linux.alibaba.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260429062004.36582-1-guobin@linux.alibaba.com> References: <20260429062004.36582-1-guobin@linux.alibaba.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=115.124.30.101; envelope-from=guobin@linux.alibaba.com; helo=out30-101.freemail.mail.aliyun.com X-Spam_score_int: -174 X-Spam_score: -17.5 X-Spam_bar: ----------------- X-Spam_report: (-17.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1777443709584158500 Content-Type: text/plain; charset="utf-8" object_property_del_child() previously performed two full iterations over obj->properties: the first to find the matching child property and call its release callback, the second to find the same property again and remove it from the hash table. Merge the two loops into one: when the matching property is found, call the release callback and immediately remove the entry via g_hash_table_iter_remove(), then break. This halves the number of hash table operations in the common case and avoids the redundant second scan. Signed-off-by: Bin Guo Reviewed-by: Richard Henderson --- qom/object.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/qom/object.c b/qom/object.c index f981e27044..9c0e8dfd02 100644 --- a/qom/object.c +++ b/qom/object.c @@ -629,13 +629,6 @@ static void object_property_del_child(Object *obj, Obj= ect *child) prop->release(obj, prop->name, prop->opaque); prop->release =3D NULL; } - break; - } - } - g_hash_table_iter_init(&iter, obj->properties); - while (g_hash_table_iter_next(&iter, &key, &value)) { - prop =3D value; - if (object_property_is_child(prop) && prop->opaque =3D=3D child) { g_hash_table_iter_remove(&iter); break; } --=20 2.50.1 (Apple Git-155) From nobody Sat May 30 19:21:08 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1777443767; cv=none; d=zohomail.com; s=zohoarc; b=nQ2WnxHLUF8hozPB/DS6ka3MekzZoHA+2boZ644gOasROoId0/DSMaeUTnlVJ5O3IjVyvK0A/0IbMClOeBoyF/TlB5pCkliKcGhPwkDq+ARvdkO4t0Ncn+bYSBRaxD4vQ//ijcmzcNg+HDVpae3ugSefjHn9k0NKSYu5a48qUYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777443767; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MARf+gfsHcq6jSDjRoPtErFT1ue1g868Ee90sY5sqak=; b=iFIedDztoccSUdUSWi8PQwt8gxo7YrZMlo8NpZM7NsaXy//lKKzBev3K1/dwMBybjAaiNp9A8fRnbblkovCbete6pBKxsWtqFfuW4C+SofXNG//walIjLxhh9aGcL5Oapqb4o/+6onERBELmEri4XajORhgUZxEUVzmHO8BVX2o= 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+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777443767005634.1101934138412; Tue, 28 Apr 2026 23:22:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wHyJ6-0004r5-I5; Wed, 29 Apr 2026 02:22:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wHyHx-0004Vr-Gw; Wed, 29 Apr 2026 02:20:51 -0400 Received: from out30-118.freemail.mail.aliyun.com ([115.124.30.118]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wHyHr-00078I-Uj; Wed, 29 Apr 2026 02:20:47 -0400 Received: from localhost(mailfrom:guobin@linux.alibaba.com fp:SMTPD_---0X1wgCg6_1777443622 cluster:ay36) by smtp.aliyun-inc.com; Wed, 29 Apr 2026 14:20:28 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1777443629; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=MARf+gfsHcq6jSDjRoPtErFT1ue1g868Ee90sY5sqak=; b=wr0U93eZxno4saD9w/3jnAR7Nb08wjxxWZjLsGQCsdzxv+9Z8XQi5VJE/OcpCHHfLvOWeHAdbHP1a1lQsV+nTYD5lk1FbSGyBLkWmaI7bOJhuXE03XZVdcEKvvqviB+B2og92h/g4FOIwKkBYHA7jlxKvDSpvqqGwI2prqtwCCo= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R201e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam011083073210; MF=guobin@linux.alibaba.com; NM=1; PH=DS; RN=6; SR=0; TI=SMTPD_---0X1wgCg6_1777443622; From: Bin Guo To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, kwolf@redhat.com, hreitz@redhat.com, qemu-block@nongnu.org Subject: [PATCH 2/3] block/block-backend: delegate blk_co_preadv to blk_co_preadv_part Date: Wed, 29 Apr 2026 14:20:03 +0800 Message-ID: <20260429062004.36582-3-guobin@linux.alibaba.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260429062004.36582-1-guobin@linux.alibaba.com> References: <20260429062004.36582-1-guobin@linux.alibaba.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=115.124.30.118; envelope-from=guobin@linux.alibaba.com; helo=out30-118.freemail.mail.aliyun.com X-Spam_score_int: -174 X-Spam_score: -17.5 X-Spam_bar: ----------------- X-Spam_report: (-17.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1777443769535158500 Content-Type: text/plain; charset="utf-8" blk_co_preadv() and blk_co_preadv_part() share identical bodies except that blk_co_preadv() always passes qiov_offset=3D0. blk_co_pwritev() already uses this pattern and simply calls blk_co_pwritev_part() with qiov_offset=3D0. Apply the same simplification to the read side so that both pairs are consistent and the shared logic lives in a single place. Before this change blk_co_preadv() duplicated the blk_inc_in_flight / blk_co_do_preadv_part / blk_dec_in_flight sequence. After this change it is a one-liner wrapper, matching the write side. Signed-off-by: Bin Guo Reviewed-by: Kevin Wolf Reviewed-by: Richard Henderson --- block/block-backend.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 9944657120..490b149bf8 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1376,14 +1376,8 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, in= t64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags) { - int ret; IO_OR_GS_CODE(); - - blk_inc_in_flight(blk); - ret =3D blk_co_do_preadv_part(blk, offset, bytes, qiov, 0, flags); - blk_dec_in_flight(blk); - - return ret; + return blk_co_preadv_part(blk, offset, bytes, qiov, 0, flags); } =20 int coroutine_fn blk_co_preadv_part(BlockBackend *blk, int64_t offset, --=20 2.50.1 (Apple Git-155) From nobody Sat May 30 19:21:08 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1777443728; cv=none; d=zohomail.com; s=zohoarc; b=LJiWKJaHAr1o8FX3h3HIgrjB3Or4CD53LOVOv6rIp3rBcshLX4UFkTBUZEJDjXzN434/9iZko21oDU4UTfcy4hJjeM9ixZWMbIxBgwWdHIr2ASsTUxokOdYg4Zc5mhqQNgUw0QSQLwx6SMZOiu5yL2xNkQwSv2SQBmBMl/Tfvqg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777443728; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7BNMZsf0OZfChDgYsNAXBHtNNdE/HIiReKu3r1PFxt0=; b=lkfiLCBr6/uixpsDod2wWLUdwtASb/8p8wUTulfgmnWLCe9tNtd4lOBAkTmifY+exMufSqm3HMy+thIDdmiBhHYX8kAxBl0hidVLUHIWaQraPKbaA2hP/Qw5lw3RSvqys1SUDjAl5iv85A9ii0d+2e9QyVCuwiGcniPDib3EAII= 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+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777443728243929.7981760613754; Tue, 28 Apr 2026 23:22:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wHyJ4-0004pj-5T; Wed, 29 Apr 2026 02:21:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wHyHz-0004Xq-Li; Wed, 29 Apr 2026 02:20:51 -0400 Received: from out30-118.freemail.mail.aliyun.com ([115.124.30.118]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wHyHv-00078Y-EO; Wed, 29 Apr 2026 02:20:51 -0400 Received: from localhost(mailfrom:guobin@linux.alibaba.com fp:SMTPD_---0X1wgCi6_1777443629 cluster:ay36) by smtp.aliyun-inc.com; Wed, 29 Apr 2026 14:20:36 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1777443637; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=7BNMZsf0OZfChDgYsNAXBHtNNdE/HIiReKu3r1PFxt0=; b=OVbluQTkoFojZVXSiYms0TDXuBcuZCZIMO04xuYsF+uB+Pnp2nPxivUPpRicP/vP6eyhBXcfoHwV5q+mosPSjBoTuLk85TvPqyRL37mNlp/WkHYOpCfzdVT3yTnJuWTF3tBAjEx5FUNUhLnD+OCoSWdqpCFGo+RlmRygmolA4kE= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R171e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam033037033178; MF=guobin@linux.alibaba.com; NM=1; PH=DS; RN=6; SR=0; TI=SMTPD_---0X1wgCi6_1777443629; From: Bin Guo To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, kwolf@redhat.com, hreitz@redhat.com, qemu-block@nongnu.org Subject: [PATCH 3/3] system/vl.c: inline qemu_opts_parse_noisily() result checks Date: Wed, 29 Apr 2026 14:20:04 +0800 Message-ID: <20260429062004.36582-4-guobin@linux.alibaba.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260429062004.36582-1-guobin@linux.alibaba.com> References: <20260429062004.36582-1-guobin@linux.alibaba.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=115.124.30.118; envelope-from=guobin@linux.alibaba.com; helo=out30-118.freemail.mail.aliyun.com X-Spam_score_int: -174 X-Spam_score: -17.5 X-Spam_bar: ----------------- X-Spam_report: (-17.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1777443730547154100 Content-Type: text/plain; charset="utf-8" In qemu_init()'s option parsing switch, several cases assigned the return value of qemu_opts_parse_noisily() to the shared 'opts' variable solely to check for NULL, without using the pointer afterwards. Inline the call directly into the if-condition, matching the style already used by QEMU_OPTION_action. This affects the following options: -drive, -numa, -iscsi, -m, -mon, -chardev, -fsdev, -fwcfg Cases where the returned QemuOpts* is subsequently used (e.g. -acpitable, -smbios, -virtfs) are left unchanged. Signed-off-by: Bin Guo Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- system/vl.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/system/vl.c b/system/vl.c index 0e1fc217b4..0e0d3cb761 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2961,9 +2961,8 @@ void qemu_init(int argc, char **argv) break; } case QEMU_OPTION_drive: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("drive"), - optarg, false); - if (opts =3D=3D NULL) { + if (!qemu_opts_parse_noisily(qemu_find_opts("drive"), + optarg, false)) { exit(1); } break; @@ -2988,9 +2987,8 @@ void qemu_init(int argc, char **argv) replay_add_blocker("-snapshot"); break; case QEMU_OPTION_numa: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("numa"), - optarg, true); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("numa"), + optarg, true)) { exit(1); } break; @@ -3049,9 +3047,8 @@ void qemu_init(int argc, char **argv) break; #ifdef CONFIG_LIBISCSI case QEMU_OPTION_iscsi: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("iscsi"), - optarg, false); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("iscsi"), + optarg, false)) { exit(1); } break; @@ -3104,8 +3101,8 @@ void qemu_init(int argc, char **argv) exit(0); break; case QEMU_OPTION_m: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("memory"),= optarg, true); - if (opts =3D=3D NULL) { + if (!qemu_opts_parse_noisily(qemu_find_opts("memory"), + optarg, true)) { exit(1); } break; @@ -3226,17 +3223,15 @@ void qemu_init(int argc, char **argv) default_monitor =3D 0; break; case QEMU_OPTION_mon: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("mon"), op= targ, - true); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("mon"), optarg, + true)) { exit(1); } default_monitor =3D 0; break; case QEMU_OPTION_chardev: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("chardev"), - optarg, true); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("chardev"), + optarg, true)) { exit(1); } break; @@ -3246,8 +3241,7 @@ void qemu_init(int argc, char **argv) error_report("fsdev support is disabled"); exit(1); } - opts =3D qemu_opts_parse_noisily(olist, optarg, true); - if (!opts) { + if (!qemu_opts_parse_noisily(olist, optarg, true)) { exit(1); } break; @@ -3386,9 +3380,8 @@ void qemu_init(int argc, char **argv) smbios_entry_add(opts, &error_fatal); break; case QEMU_OPTION_fwcfg: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("fw_cfg"), - optarg, true); - if (opts =3D=3D NULL) { + if (!qemu_opts_parse_noisily(qemu_find_opts("fw_cfg"), + optarg, true)) { exit(1); } break; --=20 2.50.1 (Apple Git-155)