From nobody Thu May 16 12:10:55 2024 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=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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1586939608; cv=none; d=zohomail.com; s=zohoarc; b=BjowTWv62Tcn8u8nYrA68+3kRDwcz6NMyoXx/RUURLPzUF6ZJglrTjgbbAGY3TZNCULrfpYc41whNy/mmPKO77iRceNNKa6PmPCqdXdux26HQTOyed6Zo7fQmLJdgh3CePmXfk3k36FD0VcZ9HnFJLMBy79HH6qwBoVaEBqs97Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586939608; 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=hqvqhL54gOLcZoA08mHwefRccp/M1IutyokYX7aejLE=; b=KFJAJbnCn+bWiZ8BxmXw+1Kg7zc/0dsfI1+8WFsUDGaLM33SOv3yI+BQveVJNjND6+FqAmmONTnTezGlMBxtws5UXtXNVrg/IQ31kushaqsf7jlbX6+bJSlhL2vqEPmSj+4dAj9UAJ9t8am3XW5gVfi5S8bu4cgDKgN9kUPrGMk= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586939608468756.214336579242; Wed, 15 Apr 2020 01:33:28 -0700 (PDT) Received: from localhost ([::1]:46082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdU6-0006jm-9e for importer@patchew.org; Wed, 15 Apr 2020 04:33:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57273) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdRf-0002j4-9C for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOdRe-0004KL-4n for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:54 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:53821 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 1jOdRd-0004Ia-V7 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:54 -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-129-CY13wxkdNQyU1_SBvk0iHA-1; Wed, 15 Apr 2020 04:30:51 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2F0D58017F3; Wed, 15 Apr 2020 08:30:50 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2314D5D9E2; Wed, 15 Apr 2020 08:30:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9B57D11384A9; Wed, 15 Apr 2020 10:30:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586939453; 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=hqvqhL54gOLcZoA08mHwefRccp/M1IutyokYX7aejLE=; b=XG95yaGllczc6Z/l5OgSOsX+CbdInFnkTgp22j2AF7qurFJIf3fRWAfzv+DHCpH7B6vK5b Dp+oPqnWqGx1Yp7OaDEotJzePnuQqpGLUULQdkOWxrdud7iL3BmHD9H+z7SrsEQUt2L5HA 4UUpLkk5jxo49bLykwnjsXN6ur3/xRE= X-MC-Unique: CY13wxkdNQyU1_SBvk0iHA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH for-5.1 1/5] qobject: Clean up QLIST_FOREACH_ENTRY() Date: Wed, 15 Apr 2020 10:30:44 +0200 Message-Id: <20200415083048.14339-2-armbru@redhat.com> In-Reply-To: <20200415083048.14339-1-armbru@redhat.com> References: <20200415083048.14339-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" QLIST_FOREACH_ENTRY() traverses a tail queue manually. Use QTAILQ_FIRST() and QTAILQ_NEXT() instead. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qapi/qmp/qlist.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h index 8d2c32ca28..07ecae81e4 100644 --- a/include/qapi/qmp/qlist.h +++ b/include/qapi/qmp/qlist.h @@ -34,10 +34,10 @@ void qlist_append_int(QList *qlist, int64_t value); void qlist_append_null(QList *qlist); void qlist_append_str(QList *qlist, const char *value); =20 -#define QLIST_FOREACH_ENTRY(qlist, var) \ - for ((var) =3D ((qlist)->head.tqh_first); \ - (var); \ - (var) =3D ((var)->next.tqe_next)) +#define QLIST_FOREACH_ENTRY(qlist, var) \ + for ((var) =3D QTAILQ_FIRST(&(qlist)->head); \ + (var); \ + (var) =3D QTAILQ_NEXT((var), next)) =20 static inline QObject *qlist_entry_obj(const QListEntry *entry) { --=20 2.21.1 From nobody Thu May 16 12:10:55 2024 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=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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1586939531; cv=none; d=zohomail.com; s=zohoarc; b=cI6sPumfU5tlplqRj5i0iVSjMiy+X8EZheNZXM8l0dTVRDnBWkk7QIFQf9STqC787Np3Lu8RC5jr/xTf7yqlewguZAjxIdJCx7rc0RxtrCY2EDvLc7yz3PAz5ZsKNUtOa8KCrNXWr7xikqvPrb1Sw5CRYY7Eq5awr90dLA2KlTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586939531; 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=qvE+iD5Jt+PVv9yVEIP15pNGb4faDFqJ651/njshmzM=; b=bQD55QXX42GuhI21D43ZCPsvJhXWckfzE6P2psRxpt9XKAW0X266izyV51IS3Xa133wMGwWaZLGShjOB+fqNPDwTrj1rjF7Awh4u+wL7rVsPsEZb+6WdakKgbGEQ4Prdth9KsbmPbWFwLOqAMxWUU/rJHvHPQ3okRbaauzrL4lM= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586939531446116.92903083015312; Wed, 15 Apr 2020 01:32:11 -0700 (PDT) Received: from localhost ([::1]:46068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdSs-0004TA-4c for importer@patchew.org; Wed, 15 Apr 2020 04:32:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57276) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdRf-0002jJ-A5 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOdRe-0004KQ-5B for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:55 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:54305 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 1jOdRd-0004IZ-Vd for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:54 -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-83-wEVozBb1ObOPB2qFld9mCQ-1; Wed, 15 Apr 2020 04:30:51 -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 5CA2119067E4; Wed, 15 Apr 2020 08:30:50 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2566260BE0; Wed, 15 Apr 2020 08:30:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9EF3311358AF; Wed, 15 Apr 2020 10:30:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586939453; 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=qvE+iD5Jt+PVv9yVEIP15pNGb4faDFqJ651/njshmzM=; b=MCAFQnkZOH+MKdvZz+NbH9ByRVtUTbMCQoceplHBLlZp9v6/NQI+qNQgEBPQzL2/lgQK5M JlqtTlFz4QDfUKeQzwXBp2XKOYKYXYXzWQN9HSlzBNCwAsl1x8DoaBzdoCoH/0Qc3+z+eV BpIDAncEs5THUBwu9Ou32EROXuF0rEA= X-MC-Unique: wEVozBb1ObOPB2qFld9mCQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH for-5.1 2/5] qobject: Factor out helper json_pretty_newline() Date: Wed, 15 Apr 2020 10:30:45 +0200 Message-Id: <20200415083048.14339-3-armbru@redhat.com> In-Reply-To: <20200415083048.14339-1-armbru@redhat.com> References: <20200415083048.14339-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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: mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- qobject/qjson.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/qobject/qjson.c b/qobject/qjson.c index db36101f3b..f3c62711b9 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -159,21 +159,28 @@ typedef struct ToJsonIterState =20 static void to_json(const QObject *obj, QString *str, int pretty, int inde= nt); =20 +static void json_pretty_newline(QString *str, bool pretty, int indent) +{ + int i; + + if (pretty) { + qstring_append(str, "\n"); + for (i =3D 0 ; i < indent ; i++) { + qstring_append(str, " "); + } + } +} + static void to_json_dict_iter(const char *key, QObject *obj, void *opaque) { ToJsonIterState *s =3D opaque; QString *qkey; - int j; =20 if (s->count) { qstring_append(s->str, s->pretty ? "," : ", "); } =20 - if (s->pretty) { - qstring_append(s->str, "\n"); - for (j =3D 0 ; j < s->indent ; j++) - qstring_append(s->str, " "); - } + json_pretty_newline(s->str, s->pretty, s->indent); =20 qkey =3D qstring_from_str(key); to_json(QOBJECT(qkey), s->str, s->pretty, s->indent); @@ -187,17 +194,12 @@ static void to_json_dict_iter(const char *key, QObjec= t *obj, void *opaque) static void to_json_list_iter(QObject *obj, void *opaque) { ToJsonIterState *s =3D opaque; - int j; =20 if (s->count) { qstring_append(s->str, s->pretty ? "," : ", "); } =20 - if (s->pretty) { - qstring_append(s->str, "\n"); - for (j =3D 0 ; j < s->indent ; j++) - qstring_append(s->str, " "); - } + json_pretty_newline(s->str, s->pretty, s->indent); =20 to_json(obj, s->str, s->pretty, s->indent); s->count++; @@ -282,12 +284,7 @@ static void to_json(const QObject *obj, QString *str, = int pretty, int indent) s.pretty =3D pretty; qstring_append(str, "{"); qdict_iter(val, to_json_dict_iter, &s); - if (pretty) { - int j; - qstring_append(str, "\n"); - for (j =3D 0 ; j < indent ; j++) - qstring_append(str, " "); - } + json_pretty_newline(str, pretty, indent); qstring_append(str, "}"); break; } @@ -301,12 +298,7 @@ static void to_json(const QObject *obj, QString *str, = int pretty, int indent) s.pretty =3D pretty; qstring_append(str, "["); qlist_iter(val, (void *)to_json_list_iter, &s); - if (pretty) { - int j; - qstring_append(str, "\n"); - for (j =3D 0 ; j < indent ; j++) - qstring_append(str, " "); - } + json_pretty_newline(str, pretty, indent); qstring_append(str, "]"); break; } --=20 2.21.1 From nobody Thu May 16 12:10:55 2024 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=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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1586939654; cv=none; d=zohomail.com; s=zohoarc; b=Y+aa29pQwcLQBdW0KIrDAoUUF4gZbXPQpKYJqfPwHMxbyE2wjHonApMmkEjW1rqaCK3AA7dHg9BBMQXUexFauh2YSuuwl2WgdR32Wu/UGHBySsVSXjoIToysnvZqVB9zDSaTv3cHlfIQnFfI6UBua+uRiE9nUU4h6NvJzr8cf20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586939654; 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=ohbULlm42YU87XT+WjpnvqgnMQHkG5kcCg6Ur2P950Y=; b=WI+5Z0ugovMYZHrlijW9TMMEU85NI4OSNHC+Z62ffZUfKJU5sdoXW/MleGq2kAbmFQvo08HtSIqSuVR4ZKkRWwgNgRER5tVLscVA/YfXHGlclUF0RGNv4pKBMsOJf3gBF29rYs/O46hIBO4jVB4UvSYKnv0mzRFimO0PQFjYGDg= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586939654230715.9588317570832; Wed, 15 Apr 2020 01:34:14 -0700 (PDT) Received: from localhost ([::1]:46096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdUr-0007pC-23 for importer@patchew.org; Wed, 15 Apr 2020 04:34:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57279) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdRf-0002jQ-Bc for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOdRe-0004JR-06 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24597 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOdRd-0004Id-NY for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:53 -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-222-JdXPIc6bNDW6j_vSnuw60g-1; Wed, 15 Apr 2020 04:30:51 -0400 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 801C61005510; Wed, 15 Apr 2020 08:30:50 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A8835E037; Wed, 15 Apr 2020 08:30:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A24BA11358B0; Wed, 15 Apr 2020 10:30:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586939453; 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=ohbULlm42YU87XT+WjpnvqgnMQHkG5kcCg6Ur2P950Y=; b=atzNDVszz3WTIfnO9NpEfOKhtAdIwnmKVCZEraIkTE9ji/C4Nkqvqfz9MdDReTsjb5tqac DqpL1Z45JMRTXxZQEWaOsKEVNBjM0NhfGYbS+JP8GTPp+r0/fIyWxhJD4arofMMYOv5gnS BvrhQZOOJQ1suwIm62N0M6ozyIMnye0= X-MC-Unique: JdXPIc6bNDW6j_vSnuw60g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH for-5.1 3/5] qobject: Eliminate qlist_iter(), use QLIST_FOREACH_ENTRY() instead Date: Wed, 15 Apr 2020 10:30:46 +0200 Message-Id: <20200415083048.14339-4-armbru@redhat.com> In-Reply-To: <20200415083048.14339-1-armbru@redhat.com> References: <20200415083048.14339-1-armbru@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] X-Received-From: 205.139.110.120 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: mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qlist_iter() has just three uses outside tests/. Replace by QLIST_FOREACH_ENTRY() for more concise code and less type punning. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qapi/qmp/qlist.h | 2 -- qobject/qjson.c | 31 ++++++++++------------------ qobject/qlist.c | 44 +++++++++++----------------------------- tests/check-qlist.c | 37 +++++++++++++-------------------- 4 files changed, 37 insertions(+), 77 deletions(-) diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h index 07ecae81e4..595b7943e1 100644 --- a/include/qapi/qmp/qlist.h +++ b/include/qapi/qmp/qlist.h @@ -47,8 +47,6 @@ static inline QObject *qlist_entry_obj(const QListEntry *= entry) QList *qlist_new(void); QList *qlist_copy(QList *src); void qlist_append_obj(QList *qlist, QObject *obj); -void qlist_iter(const QList *qlist, - void (*iter)(QObject *obj, void *opaque), void *opaque); QObject *qlist_pop(QList *qlist); QObject *qlist_peek(QList *qlist); int qlist_empty(const QList *qlist); diff --git a/qobject/qjson.c b/qobject/qjson.c index f3c62711b9..10050354a0 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -191,20 +191,6 @@ static void to_json_dict_iter(const char *key, QObject= *obj, void *opaque) s->count++; } =20 -static void to_json_list_iter(QObject *obj, void *opaque) -{ - ToJsonIterState *s =3D opaque; - - if (s->count) { - qstring_append(s->str, s->pretty ? "," : ", "); - } - - json_pretty_newline(s->str, s->pretty, s->indent); - - to_json(obj, s->str, s->pretty, s->indent); - s->count++; -} - static void to_json(const QObject *obj, QString *str, int pretty, int inde= nt) { switch (qobject_type(obj)) { @@ -289,15 +275,20 @@ static void to_json(const QObject *obj, QString *str,= int pretty, int indent) break; } case QTYPE_QLIST: { - ToJsonIterState s; QList *val =3D qobject_to(QList, obj); + const char *comma =3D pretty ? "," : ", "; + const char *sep =3D ""; + QListEntry *entry; =20 - s.count =3D 0; - s.str =3D str; - s.indent =3D indent + 1; - s.pretty =3D pretty; qstring_append(str, "["); - qlist_iter(val, (void *)to_json_list_iter, &s); + + QLIST_FOREACH_ENTRY(val, entry) { + qstring_append(str, sep); + json_pretty_newline(str, pretty, indent + 1); + to_json(qlist_entry_obj(entry), str, pretty, indent + 1); + sep =3D comma; + } + json_pretty_newline(str, pretty, indent); qstring_append(str, "]"); break; diff --git a/qobject/qlist.c b/qobject/qlist.c index b3274af88b..1be95367d1 100644 --- a/qobject/qlist.c +++ b/qobject/qlist.c @@ -34,20 +34,17 @@ QList *qlist_new(void) return qlist; } =20 -static void qlist_copy_elem(QObject *obj, void *opaque) -{ - QList *dst =3D opaque; - - qobject_ref(obj); - qlist_append_obj(dst, obj); -} - QList *qlist_copy(QList *src) { QList *dst =3D qlist_new(); + QListEntry *entry; + QObject *elt; =20 - qlist_iter(src, qlist_copy_elem, dst); - + QLIST_FOREACH_ENTRY(src, entry) { + elt =3D qlist_entry_obj(entry); + qobject_ref(elt); + qlist_append_obj(dst, elt); + } return dst; } =20 @@ -86,21 +83,6 @@ void qlist_append_null(QList *qlist) qlist_append(qlist, qnull()); } =20 -/** - * qlist_iter(): Iterate over all the list's stored values. - * - * This function allows the user to provide an iterator, which will be - * called for each stored value in the list. - */ -void qlist_iter(const QList *qlist, - void (*iter)(QObject *obj, void *opaque), void *opaque) -{ - QListEntry *entry; - - QTAILQ_FOREACH(entry, &qlist->head, next) - iter(entry->value, opaque); -} - QObject *qlist_pop(QList *qlist) { QListEntry *entry; @@ -137,16 +119,14 @@ int qlist_empty(const QList *qlist) return QTAILQ_EMPTY(&qlist->head); } =20 -static void qlist_size_iter(QObject *obj, void *opaque) -{ - size_t *count =3D opaque; - (*count)++; -} - size_t qlist_size(const QList *qlist) { size_t count =3D 0; - qlist_iter(qlist, qlist_size_iter, &count); + QListEntry *entry; + + QLIST_FOREACH_ENTRY(qlist, entry) { + count++; + } return count; } =20 diff --git a/tests/check-qlist.c b/tests/check-qlist.c index ece83e293d..3cd0ccbf19 100644 --- a/tests/check-qlist.c +++ b/tests/check-qlist.c @@ -61,40 +61,31 @@ static void qobject_to_qlist_test(void) qobject_unref(qlist); } =20 -static int iter_called; -static const int iter_max =3D 42; - -static void iter_func(QObject *obj, void *opaque) -{ - QNum *qi; - int64_t val; - - g_assert(opaque =3D=3D NULL); - - qi =3D qobject_to(QNum, obj); - g_assert(qi !=3D NULL); - - g_assert(qnum_get_try_int(qi, &val)); - g_assert_cmpint(val, >=3D, 0); - g_assert_cmpint(val, <=3D, iter_max); - - iter_called++; -} - static void qlist_iter_test(void) { + const int iter_max =3D 42; int i; QList *qlist; + QListEntry *entry; + QNum *qi; + int64_t val; =20 qlist =3D qlist_new(); =20 for (i =3D 0; i < iter_max; i++) qlist_append_int(qlist, i); =20 - iter_called =3D 0; - qlist_iter(qlist, iter_func, NULL); + i =3D 0; + QLIST_FOREACH_ENTRY(qlist, entry) { + qi =3D qobject_to(QNum, qlist_entry_obj(entry)); + g_assert(qi !=3D NULL); =20 - g_assert(iter_called =3D=3D iter_max); + g_assert(qnum_get_try_int(qi, &val)); + g_assert_cmpint(val, =3D=3D, i); + i++; + } + + g_assert(i =3D=3D iter_max); =20 qobject_unref(qlist); } --=20 2.21.1 From nobody Thu May 16 12:10:55 2024 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=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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1586939536; cv=none; d=zohomail.com; s=zohoarc; b=noqFGAdOTduh2EcsCsGLkrGarzAeE8TQ0R0ZRQikUIDxDkStwN62o5BIGXndgb3l86XgeIMYG4ljchEN+KetboAwsN30zrMFrnNE0tsNHrcRoER0aYgyeBsJu983SDXBhfTZbZCke4x0mX7Sejqp6Ulm9J1CJbuwtgIzY9MlvqQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586939536; 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=6DMj6mUgVt3lh8Q84Xn5/zF+wOO0RHaX6INNcoeNAV0=; b=N7CFviyaL0txdcHZCM6VQTooNlmC+u8sFoVDomX+r3C5cyCmnLhtlq3L0LyWVcYdjOUsb/V34ZF/7IDEalAUiJSZcp2mZb8SeDFgILDD33m9d30cdM80z57L/22wamWONQjWgm7TAj+ufLZaswj9z7uVmGqRuQUzGsGxwCe5nqM= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586939536577849.5883300712381; Wed, 15 Apr 2020 01:32:16 -0700 (PDT) Received: from localhost ([::1]:46072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdSx-0004jD-9g for importer@patchew.org; Wed, 15 Apr 2020 04:32:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57306) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdRg-0002lS-Uf for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOdRf-0004MJ-Gv for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:56457 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOdRf-0004Lk-D3 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:55 -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-222-Pi_7GKJGNFu4t0WzwTKFUw-1; Wed, 15 Apr 2020 04:30:51 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 86D0819067E5; Wed, 15 Apr 2020 08:30:50 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E57119C69; Wed, 15 Apr 2020 08:30:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A596411358B1; Wed, 15 Apr 2020 10:30:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586939455; 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=6DMj6mUgVt3lh8Q84Xn5/zF+wOO0RHaX6INNcoeNAV0=; b=Ivt0UPcHou5iw1vOhUgITrdFwkSI8pJi7DbaXALG1d38scjCY51mUtl4zUEqKaEUBIkR7c VAcN4/p9+ipgA5AOBGGrADvYGndehuURg+8s+WQBHICbj33svsngguHGY16TopqFAftY1q JfuM6sZ1OvKy5EAQVnIdVVfUU4H3raA= X-MC-Unique: Pi_7GKJGNFu4t0WzwTKFUw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH for-5.1 4/5] qobject: Eliminate qdict_iter(), use qdict_first(), qdict_next() Date: Wed, 15 Apr 2020 10:30:47 +0200 Message-Id: <20200415083048.14339-5-armbru@redhat.com> In-Reply-To: <20200415083048.14339-1-armbru@redhat.com> References: <20200415083048.14339-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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] X-Received-From: 205.139.110.120 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: mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qdict_iter() has just three uses and no test coverage. Replace by qdict_first(), qdict_next() for more concise code and less type punning. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qapi/qmp/qdict.h | 3 -- qapi/qobject-input-visitor.c | 21 +++++++------- qobject/qdict.c | 19 ------------- qobject/qjson.c | 54 +++++++++++++----------------------- util/qemu-option.c | 10 ++++++- 5 files changed, 40 insertions(+), 67 deletions(-) diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index 7f3ec10a10..da942347a7 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -40,9 +40,6 @@ void qdict_del(QDict *qdict, const char *key); int qdict_haskey(const QDict *qdict, const char *key); QObject *qdict_get(const QDict *qdict, const char *key); bool qdict_is_equal(const QObject *x, const QObject *y); -void qdict_iter(const QDict *qdict, - void (*iter)(const char *key, QObject *obj, void *opaque), - void *opaque); const QDictEntry *qdict_first(const QDict *qdict); const QDictEntry *qdict_next(const QDict *qdict, const QDictEntry *entry); void qdict_destroy_obj(QObject *obj); diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 32236cbcb1..5ce3ec2e5f 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -203,31 +203,32 @@ static const char *qobject_input_get_keyval(QObjectIn= putVisitor *qiv, return qstring_get_str(qstr); } =20 -static void qdict_add_key(const char *key, QObject *obj, void *opaque) -{ - GHashTable *h =3D opaque; - g_hash_table_insert(h, (gpointer) key, NULL); -} - static const QListEntry *qobject_input_push(QObjectInputVisitor *qiv, const char *name, QObject *obj, void *qapi) { GHashTable *h; StackObject *tos =3D g_new0(StackObject, 1); + QDict *qdict =3D qobject_to(QDict, obj); + QList *qlist =3D qobject_to(QList, obj); + const QDictEntry *entry; =20 assert(obj); tos->name =3D name; tos->obj =3D obj; tos->qapi =3D qapi; =20 - if (qobject_type(obj) =3D=3D QTYPE_QDICT) { + if (qdict) { h =3D g_hash_table_new(g_str_hash, g_str_equal); - qdict_iter(qobject_to(QDict, obj), qdict_add_key, h); + for (entry =3D qdict_first(qdict); + entry; + entry =3D qdict_next(qdict, entry)) { + g_hash_table_insert(h, (void *)qdict_entry_key(entry), NULL); + } tos->h =3D h; } else { - assert(qobject_type(obj) =3D=3D QTYPE_QLIST); - tos->entry =3D qlist_first(qobject_to(QList, obj)); + assert(qlist); + tos->entry =3D qlist_first(qlist); tos->index =3D -1; } =20 diff --git a/qobject/qdict.c b/qobject/qdict.c index 3d8c2f7bbc..526de54ceb 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -298,25 +298,6 @@ const char *qdict_get_try_str(const QDict *qdict, cons= t char *key) return qstr ? qstring_get_str(qstr) : NULL; } =20 -/** - * qdict_iter(): Iterate over all the dictionary's stored values. - * - * This function allows the user to provide an iterator, which will be - * called for each stored value in the dictionary. - */ -void qdict_iter(const QDict *qdict, - void (*iter)(const char *key, QObject *obj, void *opaque), - void *opaque) -{ - int i; - QDictEntry *entry; - - for (i =3D 0; i < QDICT_BUCKET_MAX; i++) { - QLIST_FOREACH(entry, &qdict->table[i], next) - iter(entry->key, entry->value, opaque); - } -} - static QDictEntry *qdict_next_entry(const QDict *qdict, int first_bucket) { int i; diff --git a/qobject/qjson.c b/qobject/qjson.c index 10050354a0..2a3336e459 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -149,14 +149,6 @@ QDict *qdict_from_jsonf_nofail(const char *string, ...) return qdict; } =20 -typedef struct ToJsonIterState -{ - int indent; - int pretty; - int count; - QString *str; -} ToJsonIterState; - static void to_json(const QObject *obj, QString *str, int pretty, int inde= nt); =20 static void json_pretty_newline(QString *str, bool pretty, int indent) @@ -171,26 +163,6 @@ static void json_pretty_newline(QString *str, bool pre= tty, int indent) } } =20 -static void to_json_dict_iter(const char *key, QObject *obj, void *opaque) -{ - ToJsonIterState *s =3D opaque; - QString *qkey; - - if (s->count) { - qstring_append(s->str, s->pretty ? "," : ", "); - } - - json_pretty_newline(s->str, s->pretty, s->indent); - - qkey =3D qstring_from_str(key); - to_json(QOBJECT(qkey), s->str, s->pretty, s->indent); - qobject_unref(qkey); - - qstring_append(s->str, ": "); - to_json(obj, s->str, s->pretty, s->indent); - s->count++; -} - static void to_json(const QObject *obj, QString *str, int pretty, int inde= nt) { switch (qobject_type(obj)) { @@ -261,15 +233,29 @@ static void to_json(const QObject *obj, QString *str,= int pretty, int indent) break; } case QTYPE_QDICT: { - ToJsonIterState s; QDict *val =3D qobject_to(QDict, obj); + const char *comma =3D pretty ? "," : ", "; + const char *sep =3D ""; + const QDictEntry *entry; + QString *qkey; =20 - s.count =3D 0; - s.str =3D str; - s.indent =3D indent + 1; - s.pretty =3D pretty; qstring_append(str, "{"); - qdict_iter(val, to_json_dict_iter, &s); + + for (entry =3D qdict_first(val); + entry; + entry =3D qdict_next(val, entry)) { + qstring_append(str, sep); + json_pretty_newline(str, pretty, indent + 1); + + qkey =3D qstring_from_str(qdict_entry_key(entry)); + to_json(QOBJECT(qkey), str, pretty, indent + 1); + qobject_unref(qkey); + + qstring_append(str, ": "); + to_json(qdict_entry_value(entry), str, pretty, indent + 1); + sep =3D comma; + } + json_pretty_newline(str, pretty, indent); qstring_append(str, "}"); break; diff --git a/util/qemu-option.c b/util/qemu-option.c index 97172b5eaa..3fabfd157d 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -1015,6 +1015,7 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, co= nst QDict *qdict, OptsFromQDictState state; Error *local_err =3D NULL; QemuOpts *opts; + const QDictEntry *entry; =20 opts =3D qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, &local_err); @@ -1027,7 +1028,14 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, c= onst QDict *qdict, =20 state.errp =3D &local_err; state.opts =3D opts; - qdict_iter(qdict, qemu_opts_from_qdict_1, &state); + + for (entry =3D qdict_first(qdict); + entry; + entry =3D qdict_next(qdict, entry)) { + qemu_opts_from_qdict_1(qdict_entry_key(entry), + qdict_entry_value(entry), + &state); + } if (local_err) { error_propagate(errp, local_err); qemu_opts_del(opts); --=20 2.21.1 From nobody Thu May 16 12:10:55 2024 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=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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1586939535; cv=none; d=zohomail.com; s=zohoarc; b=mRXyYYon1tgqhVLQTuQ03mZgPv++bVz/I0+C6Szq9eyzxRbCqTqw8UH7Gny6R27I0vNOYSrFqd/ehcJEqfWw3OHCbKQQtf9s3bdpdMVSTPmgpHkUYJbg9I5PHRR4qTZ54x8GNithlE9T4zDiUs7MnQh6jln90clfqDe7TUiPBxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586939535; 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=+RhYhE4o65MxagfGEHae2s2haeSOzIgE6d1jL7M1ikM=; b=BiWMlZ2OJLmcpo21kme5lotO1CRYjVeRJcFULyaUd6CQ+rKmSJkxaVzQcCY931tEertSGzptICK6KdAnDPUb13l+6Uh/ZXgwl/rhrOFUpKcyPVT/xFXpODPeDEilWHzHUBMYmlf0qUGfU8n2IBuPp+vdsVct6ULTNTAXKCXFn1o= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586939535061318.3759844391327; Wed, 15 Apr 2020 01:32:15 -0700 (PDT) Received: from localhost ([::1]:46070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdSv-0004fD-LX for importer@patchew.org; Wed, 15 Apr 2020 04:32:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57316) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOdRh-0002mw-Vu for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOdRg-0004NP-SW for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:57 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:55819 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOdRg-0004N1-Ov for qemu-devel@nongnu.org; Wed, 15 Apr 2020 04:30:56 -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-74-q4b62mXwMlOhbGPD5n51Qg-1; Wed, 15 Apr 2020 04:30:52 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA6A5107ACC7; Wed, 15 Apr 2020 08:30:51 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 98CDC10372C2; Wed, 15 Apr 2020 08:30:51 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A8CD911358B2; Wed, 15 Apr 2020 10:30:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586939456; 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=+RhYhE4o65MxagfGEHae2s2haeSOzIgE6d1jL7M1ikM=; b=gV3BpKP4bu1lj9N9EVTkqo1i12PudAJyK2fl03bBZ46giz5qeL6l7y7gpXrwTI2/y6J6lI jV4pND6ndhLOOeRc2xSQlHsB4nLBt4TSODtNyu1LP+gT5zZKF7uWQ9MqRWvgQtSfYpSxbH Tgj7KbgLHDbww05O/Tvcg8hiWIMQV1w= X-MC-Unique: q4b62mXwMlOhbGPD5n51Qg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH for-5.1 5/5] qemu-option: Clean up after the previous commit Date: Wed, 15 Apr 2020 10:30:48 +0200 Message-Id: <20200415083048.14339-6-armbru@redhat.com> In-Reply-To: <20200415083048.14339-1-armbru@redhat.com> References: <20200415083048.14339-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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] X-Received-From: 205.139.110.120 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: mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- util/qemu-option.c | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index 3fabfd157d..123c52bf07 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -967,18 +967,16 @@ void qemu_opts_set_defaults(QemuOptsList *list, const= char *params, assert(opts); } =20 -typedef struct OptsFromQDictState { - QemuOpts *opts; - Error **errp; -} OptsFromQDictState; - -static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *op= aque) +static void qemu_opts_from_qdict_entry(QemuOpts *opts, + const QDictEntry *entry, + Error **errp) { - OptsFromQDictState *state =3D opaque; + const char *key =3D qdict_entry_key(entry); + QObject *obj =3D qdict_entry_value(entry); char buf[32], *tmp =3D NULL; const char *value; =20 - if (!strcmp(key, "id") || *state->errp) { + if (!strcmp(key, "id")) { return; } =20 @@ -999,7 +997,7 @@ static void qemu_opts_from_qdict_1(const char *key, QOb= ject *obj, void *opaque) return; } =20 - qemu_opt_set(state->opts, key, value, state->errp); + qemu_opt_set(opts, key, value, errp); g_free(tmp); } =20 @@ -1012,7 +1010,6 @@ static void qemu_opts_from_qdict_1(const char *key, Q= Object *obj, void *opaque) QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict, Error **errp) { - OptsFromQDictState state; Error *local_err =3D NULL; QemuOpts *opts; const QDictEntry *entry; @@ -1026,20 +1023,15 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, = const QDict *qdict, =20 assert(opts !=3D NULL); =20 - state.errp =3D &local_err; - state.opts =3D opts; - for (entry =3D qdict_first(qdict); entry; entry =3D qdict_next(qdict, entry)) { - qemu_opts_from_qdict_1(qdict_entry_key(entry), - qdict_entry_value(entry), - &state); - } - if (local_err) { - error_propagate(errp, local_err); - qemu_opts_del(opts); - return NULL; + qemu_opts_from_qdict_entry(opts, entry, &local_err); + if (local_err) { + error_propagate(errp, local_err); + qemu_opts_del(opts); + return NULL; + } } =20 return opts; @@ -1058,21 +1050,16 @@ void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *= qdict, Error **errp) =20 while (entry !=3D NULL) { Error *local_err =3D NULL; - OptsFromQDictState state =3D { - .errp =3D &local_err, - .opts =3D opts, - }; =20 next =3D qdict_next(qdict, entry); =20 if (find_desc_by_name(opts->list->desc, entry->key)) { - qemu_opts_from_qdict_1(entry->key, entry->value, &state); + qemu_opts_from_qdict_entry(opts, entry, &local_err); if (local_err) { error_propagate(errp, local_err); return; - } else { - qdict_del(qdict, entry->key); } + qdict_del(qdict, entry->key); } =20 entry =3D next; --=20 2.21.1