From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B2BB6CCD185 for ; Fri, 10 Oct 2025 15:13:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7Els-0000EK-H4; Fri, 10 Oct 2025 11:11:04 -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 1v7Elr-0000CH-G0 for qemu-rust@nongnu.org; Fri, 10 Oct 2025 11:11:03 -0400 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 1v7ElU-00048v-Ba for qemu-rust@nongnu.org; Fri, 10 Oct 2025 11:11:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760109038; 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=WosTp1yK3Q8xfkSSHqzAC8nqLnmsf887SgMNENXzcxk=; b=YYZlNyRJCwqovNqrai+bYl8ghiY5h+N/Ydbn49Cd2mwYtcLsIpzo22iGD7T1CKDIitSXoF PBW9kwh3YY7JXfPN1zgPA77cGOb/ImGqft/FIFiZvik2D6pAIWLwhFEJDkwrOw1AxX+uyU JXpO1nQOskJKBxMz7jZZJuSrRdP7Y4Y= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-166-YclZSy6cPO29SXPTobBVOQ-1; Fri, 10 Oct 2025 11:10:37 -0400 X-MC-Unique: YclZSy6cPO29SXPTobBVOQ-1 X-Mimecast-MFC-AGG-ID: YclZSy6cPO29SXPTobBVOQ_1760109036 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-b3d21b18e8fso198597466b.2 for ; Fri, 10 Oct 2025 08:10:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760109035; x=1760713835; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WosTp1yK3Q8xfkSSHqzAC8nqLnmsf887SgMNENXzcxk=; b=nA0bHUbndCZ66BwTRDftzxdd1EIUPNKxED69Fc7AgWIA7TvG5RL94ijrA4Sndrn/NT KQeqfBkcw/QAkM+EdBa+6vkz8nTiqbPO+lsVa1SOekAkMAVMPzi92H3gjVqHPqIg29jC VN2BQuYDBIX0Owe8Lv4xFieXgkXJrR82DVC7gISEzYgz6naI12KqB9LiKoDBdVyqWhK2 DSPW3V9w386MrQIXR8HcRrMXcKDjxz8tKmGCfsZ9W2VEz62PcCFC3Yu5c+uUjHOv/94S VLfbbvRYsHCb4ag+ye6Xcd1BUkOg78geHHIUGazMlNn9yQeuXFC5VWzDIGT7fDiPYwHB h1Zg== X-Forwarded-Encrypted: i=1; AJvYcCVEf7Lz76EEcI40Djj9pBIR9tJylwgvta0SPYEM4SLz4xbhXXH3kUjGxCYKIoVSFgGj+8gxcD2XjaE=@nongnu.org X-Gm-Message-State: AOJu0Yz3SZfrzf7BLDwyZb+EaIuNJTTPv4yeXkyw97mkHy7hXCo3Mexj PkTSnznq+mKd4ZCFvNnIV2H0ddOxvy6HgIfLomg+bRwFYbyabZ22pxhi5/nVsZOlcjLsA4AkV2e HLb0JJQ2VVMz4qyl9mckVBuLV7C16UA+n+EOEpqt242Em2KQz7q2o9Aajz2ByijY= X-Gm-Gg: ASbGnctdN5Qmpw3mMtKVlXujsXjX/+yRS6zl9kE6nvaTLe0O1f2s8J5a/jWflfsvbM+ UNIV4drq0nzR3NwBH5U9yuvJvE5RhF5jK0DtXcSqHBY5tCEaykDV32R4sSRB0HDtEDtri02tjU+ nqDDTIYKnL0EBEqbBBMr/1HOJ7JwefcrO4EhZK9zpebAz0qPUdi9nAweEOVCXZ7PgXmU0g0vgK4 qRfusgq1SHsoHKCpb0T3o2l1gIk+F61B2GQ1STSkw/FIFctmSfuYo2D+80C2zRMHdIuLN9wtu1a nO8CxYIc1kdsWIP+UJ9I8do7KEUYUn39oY3UQNToG6rRkPhTgMlYsvWMwFEqg/V7MOV4Hyyzv2Q shLoGnBBPp95g8194h330jYgUN+I1q2IWmfcJiEjuM0BR X-Received: by 2002:a17:907:9448:b0:b40:a71b:151f with SMTP id a640c23a62f3a-b50ac1c4e7cmr1338883766b.30.1760109035198; Fri, 10 Oct 2025 08:10:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEc8ddHlRxqc2C3ZyaFil4eELHDUpY9sAIKvOHlmzwkIB8TO55EXcYfAaz0BzMmRZARW7u7ww== X-Received: by 2002:a17:907:9448:b0:b40:a71b:151f with SMTP id a640c23a62f3a-b50ac1c4e7cmr1338880766b.30.1760109034733; Fri, 10 Oct 2025 08:10:34 -0700 (PDT) Received: from [192.168.10.48] ([151.49.231.162]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b55d951d210sm254257866b.74.2025.10.10.08.10.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 08:10:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, marcandre.lureau@redhat.com, qemu-rust@nongnu.org Subject: [PATCH 11/19] rust/qobject: add from/to JSON bindings for QObject Date: Fri, 10 Oct 2025 17:09:56 +0200 Message-ID: <20251010151006.791038-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251010151006.791038-1-pbonzini@redhat.com> References: <20251010151006.791038-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 0H0rFQsqegr6JmHShgfgoqX-0sei_NLVbr_1gtdo4gA_1760109036 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.441, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-rust@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: QEMU Rust-related patches and discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-rust-bounces+qemu-rust=archiver.kernel.org@nongnu.org Sender: qemu-rust-bounces+qemu-rust=archiver.kernel.org@nongnu.org These are used by tests. However it could even be an idea to use serde_json + transcoding and get rid of the C version... Co-authored-by: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- rust/util/wrapper.h | 1 + rust/util/src/qobject/mod.rs | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/rust/util/wrapper.h b/rust/util/wrapper.h index 0907dd59142..c88820a5e5b 100644 --- a/rust/util/wrapper.h +++ b/rust/util/wrapper.h @@ -37,3 +37,4 @@ typedef enum memory_order { #include "qobject/qobject.h" #include "qobject/qlist.h" #include "qobject/qdict.h" +#include "qobject/qjson.h" diff --git a/rust/util/src/qobject/mod.rs b/rust/util/src/qobject/mod.rs index e896aba5f3a..292a3c9c238 100644 --- a/rust/util/src/qobject/mod.rs +++ b/rust/util/src/qobject/mod.rs @@ -23,6 +23,7 @@ use common::assert_field_type; pub use deserializer::from_qobject; pub use error::{Error, Result}; +use foreign::prelude::*; pub use serializer::to_qobject; use crate::bindings; @@ -111,6 +112,22 @@ fn refcnt(&self) -> &AtomicUsize { let qobj = self.0.get(); unsafe { AtomicUsize::from_ptr(addr_of_mut!((*qobj).base.refcnt)) } } + + pub fn to_json(&self) -> String { + let qobj = self.0.get(); + unsafe { + let json = bindings::qobject_to_json(qobj); + glib_sys::g_string_free(json, glib_sys::GFALSE).into_native() + } + } + + pub fn from_json(json: &str) -> std::result::Result { + let c_json = std::ffi::CString::new(json)?; + unsafe { + crate::Error::with_errp(|errp| bindings::qobject_from_json(c_json.as_ptr(), errp)) + .map(|qobj| QObject::from_raw(qobj)) + } + } } impl From<()> for QObject { -- 2.51.0