From nobody Mon Feb 9 17:06:45 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1663275308; cv=none; d=zohomail.com; s=zohoarc; b=UjoICiwZJX8JR9v7lRnakhsH8lKWsGnB/Ktxz3aPz5X4lWAJxWmLfS+e8DpIwV7AxqGrxzFhYYDrdWPL2X1tA0puq131KqP2KH5jlAIPOLnRI858t2yL2M99eAQE/I3azg3gvcqIqBE/WyamzxBgMLbv4+fsL5tFbsuzAgGMbbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663275308; 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=PB4pPjn4AA2JdMqJEW5ks+wTSIKlM5zMI9x4E52iulY=; b=ZSU252DjFqZ1QJSyHkdVgd9QJ3EH5HMqZ4yCDl9MAB79w5zjSdlxXXLKyUpF6oWXjiuw4SEMHWvOD+6zIR8hEYZTt6WO1YbAsM3tz1x1gMIqzaFwhqVxGn21XgU6nrX/8J+SUn1/8nq7UuYs6/SYhI3zfXZUopq0X591N6v3v8M= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663275308574838.0551005663361; Thu, 15 Sep 2022 13:55:08 -0700 (PDT) Received: from localhost ([::1]:56326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYvt5-0001BU-Ec for importer@patchew.org; Thu, 15 Sep 2022 16:55:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYvhv-00020x-6A for qemu-devel@nongnu.org; Thu, 15 Sep 2022 16:43:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:27581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYvhm-0000J9-Ul for qemu-devel@nongnu.org; Thu, 15 Sep 2022 16:43:34 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-375-U969wNwNOdygmYWqGYbGfA-1; Thu, 15 Sep 2022 16:43:23 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9AD13185A794; Thu, 15 Sep 2022 20:43:22 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.163]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 75FBE492B05; Thu, 15 Sep 2022 20:43:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id F16F221E66CD; Thu, 15 Sep 2022 22:43:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663274606; 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=PB4pPjn4AA2JdMqJEW5ks+wTSIKlM5zMI9x4E52iulY=; b=Qqeu5tyfk97UfcKH0Uw2jf0nQ2PUWgX/Qt5yhW8JtMoU9MiScUvt8Q1sOYVR/OP0htrY0t QC8ASCU41Wn3qMEGvpvwd8y48/iCN7us992t985H3a/tJammPJ4Gyso/wsBhqAzMaWRXjV TaShR7h1gpl+hPcGZ5XOXPe2QlVAcsg= X-MC-Unique: U969wNwNOdygmYWqGYbGfA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, jsnow@redhat.com, eblake@redhat.com, Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org Subject: [PATCH 12/27] qapi job: Elide redundant has_FOO in generated C Date: Thu, 15 Sep 2022 22:43:02 +0200 Message-Id: <20220915204317.3766007-13-armbru@redhat.com> In-Reply-To: <20220915204317.3766007-1-armbru@redhat.com> References: <20220915204317.3766007-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1663275309626100001 Content-Type: text/plain; charset="utf-8" The has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/job.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: John Snow Cc: Vladimir Sementsov-Ogievskiy Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster --- job-qmp.c | 3 +-- scripts/qapi/schema.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/job-qmp.c b/job-qmp.c index 829a28aa70..f3c89c6db7 100644 --- a/job-qmp.c +++ b/job-qmp.c @@ -158,8 +158,7 @@ static JobInfo *job_query_single(Job *job, Error **errp) .status =3D job->status, .current_progress =3D progress_current, .total_progress =3D progress_total, - .has_error =3D !!job->err, - .error =3D job->err ? \ + .error =3D job->err ? g_strdup(error_get_pretty(job->err)) : NULL, }; =20 diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 2cdea9b3b6..765636a1a5 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chu= nks opt_out =3D [ - 'qapi/job.json', 'qapi/machine.json', 'qapi/machine-target.json', 'qapi/migration.json', --=20 2.37.2