From nobody Mon Feb 9 02:14:36 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=1666077829; cv=none; d=zohomail.com; s=zohoarc; b=B3w6ZKrjQZUXMYAYO949inydDJ5hXCE/xRKs8+8bnixNTUgV6hYVqyo3gjPm7vMCetGjKFHy07qfaIzIW77W1m+o8xANYfJzNbZb4o7rCvXWzE5geAD8Xr+jfaxmbUR7uMP9SH5gmKJI1CJ/fw2kkFC+UvAopDoBGXVHf6dT7pI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666077829; 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=SPYjfLa2tJN1fpoytQQbBGJRZJ444KI78FLAHW4M35Y=; b=Q+x9QGRFcMvYIhnyc8LxapBb0Fou2t3m57fYoZF4cLdaAa292LVnNpf2jTvMOhbRPTluWm+OU7QMO18W2rgX185NXaEZs31sRDDN75f5eWztxnG4Wko3/InhJC5MvDCiImZeedQsgNjHTdpS+dGIwMaWPNxDeQgQrb0TZi4yR8I= 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 1666077829209277.4669785861538; Tue, 18 Oct 2022 00:23:49 -0700 (PDT) Received: from localhost ([::1]:49064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okgx1-0001Gs-3w for importer@patchew.org; Tue, 18 Oct 2022 03:23:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okg6D-0005gd-7e for qemu-devel@nongnu.org; Tue, 18 Oct 2022 02:29:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okg65-0001Ep-HV for qemu-devel@nongnu.org; Tue, 18 Oct 2022 02:29:10 -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-620-ErwZM5uQMByHlOZZbWz1dQ-1; Tue, 18 Oct 2022 02:28:53 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 27F39185A79C; Tue, 18 Oct 2022 06:28:53 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D55A6409AE1; Tue, 18 Oct 2022 06:28:52 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 62E0121E662B; Tue, 18 Oct 2022 08:28:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666074534; 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=SPYjfLa2tJN1fpoytQQbBGJRZJ444KI78FLAHW4M35Y=; b=II+/cllJTa3OEunXhJS2L7KQt/82dmf8KSqzxKHGBDKmUIJq2vCDj47fWJVJ4khSHeVurs flwTy1lX3QrZykFG/MggeHemNmFEXTf4Duf6JmSqc56dsKXpoNhK3BHPo9oYGx6rKwfP0n jHPy6xOkMzFGovUOPJGIfcaq5fNb/SI= X-MC-Unique: ErwZM5uQMByHlOZZbWz1dQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, jsnow@redhat.com, eblake@redhat.com, Gerd Hoffmann , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 25/28] qapi ui: Elide redundant has_FOO in generated C Date: Tue, 18 Oct 2022 08:28:46 +0200 Message-Id: <20221018062849.3420573-26-armbru@redhat.com> In-Reply-To: <20221018062849.3420573-1-armbru@redhat.com> References: <20221018062849.3420573-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.9 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.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666077830375100001 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/ui.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 --- monitor/hmp-cmds.c | 12 ++++-------- ui/console.c | 4 ++-- ui/input.c | 4 ++-- ui/spice-core.c | 5 ----- ui/vnc.c | 10 ---------- scripts/qapi/schema.py | 1 - 6 files changed, 8 insertions(+), 28 deletions(-) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 378f5b083d..5285d7f2fe 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -569,11 +569,9 @@ static void hmp_info_vnc_clients(Monitor *mon, VncClie= ntInfoList *client) =20 hmp_info_VncBasicInfo(mon, qapi_VncClientInfo_base(cinfo), "Client= "); monitor_printf(mon, " x509_dname: %s\n", - cinfo->has_x509_dname ? - cinfo->x509_dname : "none"); + cinfo->x509_dname ?: "none"); monitor_printf(mon, " sasl_username: %s\n", - cinfo->has_sasl_username ? - cinfo->sasl_username : "none"); + cinfo->sasl_username ?: "none"); =20 client =3D client->next; } @@ -618,7 +616,7 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict) hmp_info_vnc_authcrypt(mon, " ", info->auth, info->has_vencrypt ? &info->vencrypt : NULL= ); } - if (info->has_display) { + if (info->display) { monitor_printf(mon, " Display: %s\n", info->display); } info2l =3D info2l->next; @@ -1422,7 +1420,6 @@ void hmp_set_password(Monitor *mon, const QDict *qdic= t) } =20 if (opts.protocol =3D=3D DISPLAY_PROTOCOL_VNC) { - opts.u.vnc.has_display =3D !!display; opts.u.vnc.display =3D (char *)display; } =20 @@ -1450,7 +1447,6 @@ void hmp_expire_password(Monitor *mon, const QDict *q= dict) } =20 if (opts.protocol =3D=3D DISPLAY_PROTOCOL_VNC) { - opts.u.vnc.has_display =3D !!display; opts.u.vnc.display =3D (char *)display; } =20 @@ -1735,7 +1731,7 @@ hmp_screendump(Monitor *mon, const QDict *qdict) goto end; } =20 - qmp_screendump(filename, id !=3D NULL, id, id !=3D NULL, head, + qmp_screendump(filename, id, id !=3D NULL, head, input_format !=3D NULL, format, &err); end: hmp_handle_error(mon, err); diff --git a/ui/console.c b/ui/console.c index 49da6a91df..35b5680812 100644 --- a/ui/console.c +++ b/ui/console.c @@ -407,7 +407,7 @@ static void graphic_hw_update_bh(void *con) =20 /* Safety: coroutine-only, concurrent-coroutine safe, main thread only */ void coroutine_fn -qmp_screendump(const char *filename, bool has_device, const char *device, +qmp_screendump(const char *filename, const char *device, bool has_head, int64_t head, bool has_format, ImageFormat format, Error **errp) { @@ -416,7 +416,7 @@ qmp_screendump(const char *filename, bool has_device, c= onst char *device, DisplaySurface *surface; int fd; =20 - if (has_device) { + if (device) { con =3D qemu_console_lookup_by_device_name(device, has_head ? head= : 0, errp); if (!con) { diff --git a/ui/input.c b/ui/input.c index e2a90af889..8f4a87d1d7 100644 --- a/ui/input.c +++ b/ui/input.c @@ -124,7 +124,7 @@ qemu_input_find_handler(uint32_t mask, QemuConsole *con) return NULL; } =20 -void qmp_input_send_event(bool has_device, const char *device, +void qmp_input_send_event(const char *device, bool has_head, int64_t head, InputEventList *events, Error **errp) { @@ -133,7 +133,7 @@ void qmp_input_send_event(bool has_device, const char *= device, Error *err =3D NULL; =20 con =3D NULL; - if (has_device) { + if (device) { if (!has_head) { head =3D 0; } diff --git a/ui/spice-core.c b/ui/spice-core.c index c3ac20ad43..72f8f1681c 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -222,7 +222,6 @@ static void channel_event(int event, SpiceChannelEventI= nfo *info) break; case SPICE_CHANNEL_EVENT_INITIALIZED: if (auth) { - server->has_auth =3D true; server->auth =3D g_strdup(auth); } add_channel_info(client, info); @@ -522,13 +521,9 @@ static SpiceInfo *qmp_query_spice_real(Error **errp) port =3D qemu_opt_get_number(opts, "port", 0); tls_port =3D qemu_opt_get_number(opts, "tls-port", 0); =20 - info->has_auth =3D true; info->auth =3D g_strdup(auth); - - info->has_host =3D true; info->host =3D g_strdup(addr ? addr : "*"); =20 - info->has_compiled_version =3D true; major =3D (SPICE_SERVER_VERSION & 0xff0000) >> 16; minor =3D (SPICE_SERVER_VERSION & 0xff00) >> 8; micro =3D SPICE_SERVER_VERSION & 0xff; diff --git a/ui/vnc.c b/ui/vnc.c index acb3629cd8..de0beb9c18 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -244,7 +244,6 @@ static VncServerInfo *vnc_server_info_get(VncDisplay *v= d) info =3D g_malloc0(sizeof(*info)); vnc_init_basic_info_from_server_addr(vd->listener->sioc[0], qapi_VncServerInfo_base(info), &e= rr); - info->has_auth =3D true; info->auth =3D g_strdup(vnc_auth_name(vd)); if (err) { qapi_free_VncServerInfo(info); @@ -263,13 +262,10 @@ static void vnc_client_cache_auth(VncState *client) if (client->tls) { client->info->x509_dname =3D qcrypto_tls_session_get_peer_name(client->tls); - client->info->has_x509_dname =3D - client->info->x509_dname !=3D NULL; } #ifdef CONFIG_VNC_SASL if (client->sasl.conn && client->sasl.username) { - client->info->has_sasl_username =3D true; client->info->sasl_username =3D g_strdup(client->sasl.username); } #endif @@ -341,11 +337,9 @@ static VncClientInfo *qmp_query_vnc_client(const VncSt= ate *client) =20 if (client->tls) { info->x509_dname =3D qcrypto_tls_session_get_peer_name(client->tls= ); - info->has_x509_dname =3D info->x509_dname !=3D NULL; } #ifdef CONFIG_VNC_SASL if (client->sasl.conn && client->sasl.username) { - info->has_sasl_username =3D true; info->sasl_username =3D g_strdup(client->sasl.username); } #endif @@ -426,11 +420,8 @@ VncInfo *qmp_query_vnc(Error **errp) abort(); } =20 - info->has_host =3D true; - info->has_service =3D true; info->has_family =3D true; =20 - info->has_auth =3D true; info->auth =3D g_strdup(vnc_auth_name(vd)); } =20 @@ -568,7 +559,6 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) if (vd->dcl.con) { dev =3D DEVICE(object_property_get_link(OBJECT(vd->dcl.con), "device", &error_abort)); - info->has_display =3D true; info->display =3D g_strdup(dev->id); } for (i =3D 0; vd->listener !=3D NULL && i < vd->listener->nsioc; i= ++) { diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 3673296ad8..fd18f8249b 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/ui.json', 'qapi/virtio.json', 'qga/qapi-schema.json'] if self.info and any(self.info.fname.endswith(mod) --=20 2.37.2