From nobody Sat Jan 31 20:31:12 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767877928; cv=none; d=zohomail.com; s=zohoarc; b=Ez29KsFMNDzplDDQ/3EJyQ2kZiuV0++InskolvD36loEbCKPEX5oJu7hDYWdwEa1L/6hrhv5lQFWVXMyfrGIbt1evibNwPa3LWDlBKD8peOjmZ9Wu0E3P3CXCERJEUyWYBRO4k0IB2fgN5BwfpZPe3qexntX1kkrqD4aleIFvrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767877928; h=Content-Type: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=nyF4XBGwym7P72pkoLWyXPv/dFuoXRVdsycFcj1MYQ4=; b=hQeI1Q0V+jYhyumr8jXB+dPaemL4xJYnDU5CM/0gLWrMhQdduh2qXpOdj5JRZSB2dyZ1u3ryodBSxCxkfLzF3nzDkoPKEzE125hGgeUlIOP8iF+AiYKscjpf3/0M3N9QxOy5jGNEDA8z/NI3LGjr3nXzUHIp+zVQX6cuD0pTecs= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767877928469983.0366881716574; Thu, 8 Jan 2026 05:12:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdpnc-00089N-Ok; Thu, 08 Jan 2026 08:11:36 -0500 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 1vdpna-00088S-K9 for qemu-devel@nongnu.org; Thu, 08 Jan 2026 08:11:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdpnY-00084k-Vi for qemu-devel@nongnu.org; Thu, 08 Jan 2026 08:11:34 -0500 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-388-IzAUtesNMW6i-gbouiPFXw-1; Thu, 08 Jan 2026 08:11:30 -0500 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-43009df5ab3so2062140f8f.1 for ; Thu, 08 Jan 2026 05:11:30 -0800 (PST) Received: from [192.168.10.48] ([151.61.26.160]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-432bd0e6784sm16315281f8f.19.2026.01.08.05.11.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jan 2026 05:11:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767877892; 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=nyF4XBGwym7P72pkoLWyXPv/dFuoXRVdsycFcj1MYQ4=; b=PL5XQht5AlriPF5rYJem/HENfBDy4xBMexJNj+KJT6XX1V2RTGt/eNTjTRdlZ7q3zu3PyI rRBnJePGpHXwTSXpzaqw9bWQP2pe9xUxg65cDITXMiFcIjgbthwFpKJ/KNN6cbyn/OUSh6 fghs3+0mr7QsojahScUse6Lg7jq8UkU= X-MC-Unique: IzAUtesNMW6i-gbouiPFXw-1 X-Mimecast-MFC-AGG-ID: IzAUtesNMW6i-gbouiPFXw_1767877890 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1767877889; x=1768482689; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nyF4XBGwym7P72pkoLWyXPv/dFuoXRVdsycFcj1MYQ4=; b=AVMXrEDupfTgJ6o6/Q3wrrhGVYKWaxruMIYlbh90kTb4UuIrRS8P6yDgXgZ4reD9dl EiXRCbkZtmzN+mBePeX3aoY9Qr8o3cyEaeMSqBSTDBr5oyDJyY0w8K/0LMg+BonXr9vg gCI3rpgowVw/X+9y1RA35/cAtlMBbWcGljEU5yQfhnly9TNo0F7q2sr7QZkfZKPIvOSV t0NiXjvU3dgtSbaFjuGEn3mEMDzn7HYdqJLOY/nXjI5YZdTV/MUMxW3nDapuHh+4Cs+l 4W44lYOiEAqCI1Ha9U30tGk4zBCUHYQH2UBnkz9nwVyixlc3MuC5dNFvXx8ifza27Xlk 562A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767877889; x=1768482689; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nyF4XBGwym7P72pkoLWyXPv/dFuoXRVdsycFcj1MYQ4=; b=OcAsUYjWDihcEULYKsxHF5TF+GW6fsH0Gns0DqormFX4fIxZ+ac33B0TgrHJEUi5nj PtzcpBcgMsl/LHaMftGb58dhCjJpxWyePazhcTLM/4NfwMmZBnRXXpG1JzOSYrCW1kpk DwHdcuDoy72S4Eciqt+xcV5angX3IPpFlgiApS9EXDrCe0Pgg8QlpDt3BgRVhu+kSqjQ kV57TmpEkJY5Hsz/1EKrXThoDZ0kMrsRr77ilfsRMSTfjjsJxIrxjiTEmPx3GUHGnDOu 2RGQL2ibSX9jHObCalhxcU6yhq8iAtYz1avvN/m7WFxrb83IDB/mh3ES+TVuygd1B8FH wq8g== X-Gm-Message-State: AOJu0Yyj0L8PeKH+655cVkg8vGrGi3sZMNG4dRATtfPGJRvSTLGJmC4A i+zJdWkb15MS7veFjx3M8996OrLPTl4URdzSkJEaKWxDXGvwMuRZNlLHZvGxwpO1zNw6oGiBTTs djMKHqOWOm/mujsy5WX0DzEpUlQmUUS/gJu8TVPz3WysoUEIx7C7Sh/2ToJJIp3HCuNlg3aDYb7 sFKpQ3RCsMs/N/D44sM4LyEqv7V93Lpn2KbK5w9Gwd X-Gm-Gg: AY/fxX4OFBW8mH17blUJgF/kb0bsguFacbuD0lzpg/E4mGYMtbLO047xIaAo9sFEGpR KkqxmobMSbbDHTUquqLJ3P9yEtRXGvrHnYhJ+zn51X0TkDYGNCaNdxsybH6S2BAZmyksW3UvN9g iJiH1BQtLjv5AIWi7fzzgk93BuGF42ANewfTEx2j1ZIqWs+nTmjuVn/CGW4i6enCF2QapYmY4zp g6XJfvBuTMasmOJ/39JbwQ1RPqPZAfx+chjJVKYRhZ7gDtYYY5XDpnhcGTHWHlJBtkOyh9GRc6W ecfxEyC3T7+NlyihQuttghetQcnFRMQfB69FS0gAb73oZmaGCtcl4xbd3fzg/cC6QnvSrGV+O8c Pg6sJtn2TKzMjt8QV/4myQnMNarNgjtHftMb/sXdqODE+xUbcTHAUuIWWHx02gDMmeIpWzoeRXv pixKWj6+5DwJ1R4A== X-Received: by 2002:a5d:5f51:0:b0:430:ff81:295d with SMTP id ffacd0b85a97d-432c374fc38mr8437619f8f.41.1767877888726; Thu, 08 Jan 2026 05:11:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IEeYdz1HHfLuHgabdLWpi2Jvct5rCgEFFttH08X/7L6jRyLNg+eS5CiRzT/qYKozVSkJ61Bxw== X-Received: by 2002:a5d:5f51:0:b0:430:ff81:295d with SMTP id ffacd0b85a97d-432c374fc38mr8437582f8f.41.1767877888225; Thu, 08 Jan 2026 05:11:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-rust@nongnu.org Subject: [PATCH v2 15/16] scripts/qapi: add serde attributes Date: Thu, 8 Jan 2026 14:10:42 +0100 Message-ID: <20260108131043.490084-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260108131043.490084-1-pbonzini@redhat.com> References: <20260108131043.490084-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=lists.gnu.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767877930073158500 From: Marc-Andr=C3=A9 Lureau Generate serde attributes to match the serialization format to QAPI's: - for enums, map Rust enum variants to original QAPI names - for structs, rejects JSON with extra fields and omit optional fields (as opposed to serializing them as null) - for union variants: - use tagged union format matching QAPI's discriminator, - map variant names to original QAPI names - flatten union data into parent struct - for alternates, use type-based discrimination Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- scripts/qapi/rs_types.py | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/scripts/qapi/rs_types.py b/scripts/qapi/rs_types.py index 64702eb54ae..fb3362ad601 100644 --- a/scripts/qapi/rs_types.py +++ b/scripts/qapi/rs_types.py @@ -33,6 +33,7 @@ =20 =20 objects_seen =3D set() +SERDE_SKIP_NONE =3D '#[serde(skip_serializing_if =3D "Option::is_none")]' =20 =20 def gen_rs_variants_to_tag(name: str, @@ -79,11 +80,13 @@ def gen_rs_variants(name: str, ret =3D mcgen(''' =20 %(cfg)s -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +#[serde(tag =3D "%(tag)s")] pub enum %(rs_name)sVariant { ''', cfg=3Difcond.rsgen(), - rs_name=3Drs_name(name)) + rs_name=3Drs_name(name), + tag=3Dvariants.tag_member.name) =20 for var in variants.variants: type_name =3D var.type.name @@ -91,18 +94,22 @@ def gen_rs_variants(name: str, if type_name =3D=3D 'q_empty': ret +=3D mcgen(''' %(cfg)s + #[serde(rename =3D "%(rename)s")] %(var_name)s, ''', cfg=3Dvar.ifcond.rsgen(), - var_name=3Dvar_name) + var_name=3Dvar_name, + rename=3Dvar.name) else: ret +=3D mcgen(''' %(cfg)s + #[serde(rename =3D "%(rename)s")] %(var_name)s(%(rs_type)s), ''', cfg=3Dvar.ifcond.rsgen(), var_name=3Dvar_name, - rs_type=3Dvar.type.rs_type()) + rs_type=3Dvar.type.rs_type(), + rename=3Dvar.name) =20 ret +=3D mcgen(''' } @@ -158,9 +165,11 @@ def gen_struct_members(members: List[QAPISchemaObjectT= ypeMember], typ =3D 'Option<%s>' % typ ret +=3D mcgen(''' %(cfg)s + %(serde_skip_if)s pub %(rs_name)s: %(rs_type)s, ''', cfg=3Dmemb.ifcond.rsgen(), + serde_skip_if=3DSERDE_SKIP_NONE if memb.optional else= '', rs_type=3Dtyp, rs_name=3Drs_name(camel_to_lower(memb.name))) return ret @@ -181,17 +190,23 @@ def gen_rs_object(name: str, ret =3D '' objects_seen.add(name) =20 + serde_deny_unknown_fields =3D "#[serde(deny_unknown_fields)]" if variants: ret +=3D gen_rs_variants(name, ifcond, variants) + # we can't use because of the flatten unions + # serde FlatMapAccess should consume the fields? + serde_deny_unknown_fields =3D "" =20 ret +=3D mcgen(''' =20 %(cfg)s -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +%(serde_deny_unknown_fields)s pub struct %(rs_name)s { ''', cfg=3Difcond.rsgen(), - rs_name=3Drs_name(name)) + rs_name=3Drs_name(name), + serde_deny_unknown_fields=3Dserde_deny_unknown_fields) =20 if base: if not base.is_implicit(): @@ -213,6 +228,7 @@ def gen_rs_object(name: str, =20 if variants: ret +=3D mcgen(''' + #[serde(flatten)] pub u: %(rs_type)sVariant, ''', rs_type=3Drs_name(name)) ret +=3D mcgen(''' @@ -227,7 +243,7 @@ def gen_rs_enum(name: str, ret =3D mcgen(''' =20 %(cfg)s -#[derive(Copy, Clone, Debug, PartialEq)] +#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] ''', cfg=3Difcond.rsgen()) =20 @@ -243,10 +259,12 @@ def gen_rs_enum(name: str, for member in members: ret +=3D mcgen(''' %(cfg)s + #[serde(rename =3D "%(member_name)s")] %(c_enum)s, ''', cfg=3Dmember.ifcond.rsgen(), - c_enum=3Drs_name(camel_to_upper(member.name))) + c_enum=3Drs_name(camel_to_upper(member.name)), + member_name=3Dmember.name) ret +=3D '''} =20 ''' @@ -280,7 +298,8 @@ def gen_rs_alternate(name: str, =20 ret +=3D mcgen(''' %(cfg)s -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +#[serde(untagged)] pub enum %(rs_name)s { ''', cfg=3Difcond.rsgen(), @@ -330,6 +349,8 @@ def visit_begin(self, schema: QAPISchema) -> None: // that *could* be Eq too. #![allow(clippy::derive_partial_eq_without_eq)] =20 +use serde_derive::{Serialize, Deserialize}; + use util::qobject::QObject; ''')) =20 --=20 2.52.0