From nobody Mon Feb 9 11:32:53 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=1666810100; cv=none; d=zohomail.com; s=zohoarc; b=mkK1xdHg4zlUHWLt/1oykfEdIw95k/FU96m6oblnTAzoY+kHLUK0b8abQ0+EEAE/DzRjNDq849F4b4bRNCyc/MqjlV9tUH58ILDIPRTXnm2VWhdstJdOdBJ1jcDHKi1hqNeMicc0n+8P+bJD5xxw88bzmsAot5bE22XeqLbxDEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666810100; 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=54tPZKho5BvyVxvP3gzN0PCYLSwS8vWyxEiLl8ciOF4=; b=mIsoRpJAt0wOjaGNyU9q0C+kEf8//mRGCahAFVqGe9mwYVJvJyGo8om/CH5cexoWP67mkMZk6xx1pjEiJGC3xisk7UBB8XvhztcMvHClOoIm5eb2DxCFvG0yHCZli9dgyXgBrbucXkXW1xrL2L54pssnM3NxFj3a/JLdm9IsjmQ= 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 1666810100328360.8410829844339; Wed, 26 Oct 2022 11:48:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onlGL-0007hc-J9; Wed, 26 Oct 2022 14:36:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onlFr-0006zg-Ij for qemu-devel@nongnu.org; Wed, 26 Oct 2022 14:35:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onlFb-0003Bc-3L for qemu-devel@nongnu.org; Wed, 26 Oct 2022 14:35:55 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-49-rWVc4CNeOpe1ByVq0g_rwQ-1; Wed, 26 Oct 2022 14:35:37 -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 AA55429DD9B1; Wed, 26 Oct 2022 18:35:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.118]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C34A492B16; Wed, 26 Oct 2022 18:35:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 62AF721E6808; Wed, 26 Oct 2022 20:35:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666809338; 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=54tPZKho5BvyVxvP3gzN0PCYLSwS8vWyxEiLl8ciOF4=; b=FDjeisj4AEzPmgCgtZNirOPCv9JmN1STSLMuMo/LwRbUSMeIb1r/tRfcnbRQ5I3AYwXxZH tpeG5KIrCbjciA3FAdzAczbAlHu6TuQj/QMSYXIxTn1fgJSyqozWN7p4V/BBbodWRavCL7 9Es10mR9FDurrmi61zUFOTQE3IUiZL4= X-MC-Unique: rWVc4CNeOpe1ByVq0g_rwQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Laurent Vivier , "Michael S . Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 26/28] qapi virtio: Elide redundant has_FOO in generated C Date: Wed, 26 Oct 2022 20:35:30 +0200 Message-Id: <20221026183532.487708-27-armbru@redhat.com> In-Reply-To: <20221026183532.487708-1-armbru@redhat.com> References: <20221026183532.487708-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.515, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666810101727100003 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/virtio.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: Laurent Vivier Cc: Michael S. Tsirkin Signed-off-by: Markus Armbruster Message-Id: <20221018062849.3420573-27-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/virtio.c | 1 - monitor/hmp-cmds.c | 4 ++-- scripts/qapi/schema.py | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 808446b4c9..883bc7064d 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -4664,7 +4664,6 @@ VirtioStatus *qmp_x_query_virtio_status(const char *p= ath, Error **errp) status->disable_legacy_check =3D vdev->disable_legacy_check; status->bus_name =3D g_strdup(vdev->bus_name); status->use_guest_notifier_mask =3D vdev->use_guest_notifier_mask; - status->has_vhost_dev =3D vdev->vhost_started; =20 if (vdev->vhost_started) { VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_GET_CLASS(vdev); diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 5285d7f2fe..cbbd9bdc6d 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2570,7 +2570,7 @@ void hmp_virtio_status(Monitor *mon, const QDict *qdi= ct) =20 monitor_printf(mon, "%s:\n", path); monitor_printf(mon, " device_name: %s %s\n", - s->name, s->has_vhost_dev ? "(vhost)" : ""); + s->name, s->vhost_dev ? "(vhost)" : ""); monitor_printf(mon, " device_id: %d\n", s->device_id); monitor_printf(mon, " vhost_started: %s\n", s->vhost_started ? "true" : "false"); @@ -2606,7 +2606,7 @@ void hmp_virtio_status(Monitor *mon, const QDict *qdi= ct) monitor_printf(mon, " Backend features:\n"); hmp_virtio_dump_features(mon, s->backend_features); =20 - if (s->has_vhost_dev) { + if (s->vhost_dev) { monitor_printf(mon, " VHost:\n"); monitor_printf(mon, " nvqs: %d\n", s->vhost_dev->nvqs); diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index fd18f8249b..b2df148e01 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/virtio.json', 'qga/qapi-schema.json'] if self.info and any(self.info.fname.endswith(mod) for mod in opt_out): --=20 2.37.3