From nobody Sat May 30 20:11:55 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=1776846167; cv=none; d=zohomail.com; s=zohoarc; b=HFcvAD7V3cwAlGMqhUlx7CC7k02xudOvu4LKFaMto91pH/68hI2ap4f3CUZKW514TSgaKkKmToTanembVsjXo2Y0Myc/C2tOX8wv7B9HBGoJsdyv7Ecj3PCAwx1Vn2ABplHA4k9XB27oQAyU2NE1ElZ2rlwKs6eHPIdfjdgyz80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776846167; 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=Joilcik9KtEdJZjq4mdYWkp4FhfcJg7uC8Vb6+X8nd4=; b=Nr4D5BOEBWXdGBQ7Quq7YqTwHsSUdcyd4zdCRd/QBwSzVNcOkuEJFfcMepXZ+oalt6CCfVSJ6HKI36dpuxXzgmfpcUNK8eLV0vGwqPco5c9omjLkPeNAYnRQMPNE9M1S8+x5FUfitlDTgB2LSpVvvuIfDxjHKuip+5sNwA6imDg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776846167249918.049763061607; Wed, 22 Apr 2026 01:22:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFSr1-0006PG-BQ; Wed, 22 Apr 2026 04:22:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wFSqr-0006N9-UP for qemu-devel@nongnu.org; Wed, 22 Apr 2026 04:22:30 -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 1wFSqo-0006ar-T4 for qemu-devel@nongnu.org; Wed, 22 Apr 2026 04:22:29 -0400 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-307-FVPFynTXO0qGkrhOe1enhA-1; Wed, 22 Apr 2026 04:22:24 -0400 Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-358e95e81aeso3467905a91.0 for ; Wed, 22 Apr 2026 01:22:24 -0700 (PDT) Received: from fedora.armenon-thinkpadp16vgen1.bengluru.csb ([49.36.110.202]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3613fabeccesm5991459a91.6.2026.04.22.01.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2026 01:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776846146; 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=Joilcik9KtEdJZjq4mdYWkp4FhfcJg7uC8Vb6+X8nd4=; b=g1Tv3AiKU+/LpaTbO9o8Dy2rVshGLWiCnSV0aRU4G8uM1H3AM4FMzGIXekgH5p/H1rO1Dd leoAkkYwRpLMudjCdE0yrA7TJn/CnZReOu0eZzIKLIXPEvVbNc2OcDDmElVzbVYQlQcHBX 2nMK5UVg4MKqw9s85L/kvEmEcH6Mh20= X-MC-Unique: FVPFynTXO0qGkrhOe1enhA-1 X-Mimecast-MFC-AGG-ID: FVPFynTXO0qGkrhOe1enhA_1776846144 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1776846144; x=1777450944; 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=Joilcik9KtEdJZjq4mdYWkp4FhfcJg7uC8Vb6+X8nd4=; b=TkoankDlRhkHuvk3cAydhqza4XL19tcq+QB5dp8RUZ1FF/mZi6VjxL3PTt07s1haKk cXQ+meTPhSFvpKfMaV5YonfFRPjJYIqkobiP8eCezzbpH7U8T9SHOaxuxxEPzX4eHDuU VOQ8yS3yrdI98taCsdxSxCGAguWCBCwk+7R8gdiuNGaNSCULQO0YKjv7LkF8FIvzDNmk tbkB8xqRfPiNxJUeaW51Wj3LT9dGE/aXNYEbfr6jBrYyG4t6KHhrq7kADpI+dKKb9Vst oYPOZ3yYjeQJsolqWrd2dlQ6v97RuZWu+2IDhKR5NpzxFM+sG8iaAzUfiPGjN69cKUIT xigg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776846144; x=1777450944; 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=Joilcik9KtEdJZjq4mdYWkp4FhfcJg7uC8Vb6+X8nd4=; b=m25LCpLtiWRQTCDh5qO4gFqx88f/ophYnR4RYRZdW7TEvjSAyhvel5Hh+pn3y0dHRH KpAxG2ZcfEhkPYExrhuP2uKX3r/nt3Fiy9XHoOUzTg+9V9NDL+hiFT/oZ51TuLKUYgYx cdLDiRDqPbYqWcmx8WfAYDTfayEN8g7RU3XGuJ6kNz8vFFEtVHQi2V++F77giqSJQpiA xujFn1qWPWR8xTvR37jOuHil3MfUtqw6GDQ+kAwZ/DngjMch42DajDC3SFok5OJpC/nt J3pA3SL5idadaXINBtIhSbbRnkQim5aC7ljJAfJnh1GP3iHFWmV0GD30ClrIJ+0atjc5 3oKA== X-Gm-Message-State: AOJu0YwbVhxWC7534HL7qMZk7C3ZJUCQyKRWgPbpJ5xAsCSNJhmsew39 kNZswlzfidYBaClHTsEE8Yo6ezUH0Ia+X341ev/kE8CJ0TG6TwUy9LxwJoM6Ig+3kAHN7wie+AX 3EzuIT5rS/K7lFESt27dH6OleA71CXTzchP7YrlhpdnNIi0phS1OpwAyY/Rw0vxaQWhY/A6cONP 8SOdp4pCmuv1nwrAbh3q1mMX/JmrVf9VaGnHtYpeg= X-Gm-Gg: AeBDievx3kP5EX6iHKJNf/LdopPabUD1ghNqKq3VQuHFb0rrhxsjbmqWkj5HHbby78W ZRoX3rrLdavbOj/TQxRZeB8uJybiknT8n5ubskP2bCYPZQ0jjLpPutMMjGPExBeRZi5+zOawY3t juDBKciNKOV92lRVDraQsBggW2QwAqq4V3+j3+hhCllSO1MOBx61FW2aXG1MdNwuw0mpTPP2ENh CrFMHXsBbO2sfoCWVtb5gD9cRJqBCrQ1v4u5l+ro1HyxSsycpQQFCwTWT27ZOo8P9MW5cgQXmQW nxqai4dlKh87C95qmH/N6Ztb1Xkjao5eryZPsAlQA6rUitdM1psnSTbR+nfHL74/3ZdGqdNhpmf I8+/mycRq8lnRguYV7j4vVSqUk1Qwub7p5DbMSMl5fE/N6zpZ0kYAKHQV9NwPdCj2q6HLJTvayg == X-Received: by 2002:a17:90b:3d01:b0:35f:b75e:fff5 with SMTP id 98e67ed59e1d1-3614048b7admr24121777a91.22.1776846143685; Wed, 22 Apr 2026 01:22:23 -0700 (PDT) X-Received: by 2002:a17:90b:3d01:b0:35f:b75e:fff5 with SMTP id 98e67ed59e1d1-3614048b7admr24121739a91.22.1776846143066; Wed, 22 Apr 2026 01:22:23 -0700 (PDT) From: Arun Menon To: qemu-devel@nongnu.org Cc: Peter Xu , Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Arun Menon Subject: [PATCH v3 1/2] migration/vmstate: Add VMState support for GByteArray Date: Wed, 22 Apr 2026 13:52:13 +0530 Message-ID: <20260422082214.10390-2-armenon@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260422082214.10390-1-armenon@redhat.com> References: <20260422082214.10390-1-armenon@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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armenon@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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: qemu development 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: 1776846169796154100 From: Arun Menon In GLib, GByteArray is an object managed by the library. Currently, migrating a GByteArray requires treating it as a raw C struct and using VMSTATE_VBUFFER_ALLOC_UINT32. For example, see vmstate_vdba in ui/vdagent.c QEMU cannot pretend that GByteArray is a C struct and simply use VMS_ALLOC to g_malloc() the buffer. This is because, VMS_ALLOC blindly overwrites the data pointer with a newly allocated buffer, thereby leaking the previous memory. Besides, GLib tracks the array's capacity in a hidden alloc field. Bypassing GLib APIs leave this capacity out of sync with the newly allocated buffer, potentially leading to heap buffer overflows during subsequent g_byte_array_append() calls. This commit introduces VMSTATE_GBYTEARRAY which uses specific library API calls (g_byte_array_set_size()) to safely resize and populate the buffer. Signed-off-by: Arun Menon Fix-Suggested-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Peter Xu --- include/migration/vmstate.h | 10 ++++++++++ migration/vmstate-types.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 62c2abd0c4..f503a40ec0 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -265,6 +265,7 @@ extern const VMStateInfo vmstate_info_bitmap; extern const VMStateInfo vmstate_info_qtailq; extern const VMStateInfo vmstate_info_gtree; extern const VMStateInfo vmstate_info_qlist; +extern const VMStateInfo vmstate_info_g_byte_array; =20 #define type_check_2darray(t1,t2,n,m) ((t1(*)[n][m])0 - (t2*)0) /* @@ -892,6 +893,15 @@ extern const VMStateInfo vmstate_info_qlist; .start =3D offsetof(_type, _next), = \ } =20 +#define VMSTATE_GBYTEARRAY(_field, _state, _version) { \ + .name =3D (stringify(_field)), = \ + .version_id =3D (_version), = \ + .size =3D sizeof(GByteArray), = \ + .info =3D &vmstate_info_g_byte_array, = \ + .flags =3D VMS_SINGLE, = \ + .offset =3D vmstate_offset_pointer(_state, _field, GByteArray), = \ +} + /* _f : field name _f_n : num of elements field_name _n : num of elements diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c index 89cb211472..e3a47e60b1 100644 --- a/migration/vmstate-types.c +++ b/migration/vmstate-types.c @@ -942,3 +942,40 @@ const VMStateInfo vmstate_info_qlist =3D { .get =3D get_qlist, .put =3D put_qlist, }; + +static int get_g_byte_array(QEMUFile *f, void *pv, size_t size, + const VMStateField *field) +{ + GByteArray **byte_array =3D (GByteArray **)pv; + uint32_t len =3D qemu_get_be32(f); + + assert(*byte_array !=3D NULL); + + g_byte_array_set_size(*byte_array, len); + if (len > 0) { + qemu_get_buffer(f, (*byte_array)->data, len); + } + return 0; +} + +static int put_g_byte_array(QEMUFile *f, void *pv, size_t size, + const VMStateField *field, JSONWriter *vmdesc) +{ + GByteArray *byte_array =3D *(GByteArray **)pv; + uint32_t len; + assert(byte_array !=3D NULL); + + len =3D byte_array ? byte_array->len : 0; + qemu_put_be32(f, len); + if (len > 0) { + qemu_put_buffer(f, byte_array->data, len); + } + + return 0; +} + +const VMStateInfo vmstate_info_g_byte_array =3D { + .name =3D "GByteArray", + .get =3D get_g_byte_array, + .put =3D put_g_byte_array, +}; --=20 2.53.0 From nobody Sat May 30 20:11:55 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=1776846174; cv=none; d=zohomail.com; s=zohoarc; b=GsBdQ/cL+RuKqmoN9xjcYeEGWVCY0ViFx7OUOu6P4xgUEbpx6LviFwz5n4msJmf+aOVRt5ne0qFOEz9g9Ttuxux/HAuQmhKhVjbXWG/Xb35bpniFvf7jG1xutdA4nJF+aBv7MfkzMxMSDzEfaWqCx1f1v5s7dMCboiZl0fNfzig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776846174; 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=LGW6d9MttlD6p2S8pWbgXC+RAAlUoZve1q7FzTGw8jA=; b=JvAvYQt+U2VwGXp9fCohbT5Z7rKOp1nnUgzbvmNsH/jHt7TJZfNxYzVHs03LwGM8SyR3d90voyo5CQb2tRCrph+Lfsmzqhrx8Bs7GsBMEgiCE/aaEEmlNIauzFTgvqcQBJPxgAKr0GlijQirLMUVmg9gQFPtmFHD+rQx9A9svo0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776846174012818.6079705263943; Wed, 22 Apr 2026 01:22:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wFSr4-0006Qf-07; Wed, 22 Apr 2026 04:22:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wFSqu-0006NN-Hs for qemu-devel@nongnu.org; Wed, 22 Apr 2026 04:22:34 -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 1wFSqs-0006bK-5V for qemu-devel@nongnu.org; Wed, 22 Apr 2026 04:22:31 -0400 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-421-8mVpl7kRMCOAdd1UbmSdNw-1; Wed, 22 Apr 2026 04:22:27 -0400 Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-35da1c703d1so6380603a91.1 for ; Wed, 22 Apr 2026 01:22:27 -0700 (PDT) Received: from fedora.armenon-thinkpadp16vgen1.bengluru.csb ([49.36.110.202]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3613fabeccesm5991459a91.6.2026.04.22.01.22.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2026 01:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776846149; 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=LGW6d9MttlD6p2S8pWbgXC+RAAlUoZve1q7FzTGw8jA=; b=Met57qBAdzwS1SkoopqTLc+qruefMDP6rNJvgjed1uZmY5XIwJhGI/nYVvt1zjNGKOZPux A5EHTuI3jZxHKIvDs9P0bVTDfxHgZawdT0jTVDBd6aAHjbhfUGTYT0lfPGfGBZgQkt7zNq /v45XCLRqTXK+8pwwCi4t6udo8v8AnU= X-MC-Unique: 8mVpl7kRMCOAdd1UbmSdNw-1 X-Mimecast-MFC-AGG-ID: 8mVpl7kRMCOAdd1UbmSdNw_1776846147 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1776846146; x=1777450946; 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=LGW6d9MttlD6p2S8pWbgXC+RAAlUoZve1q7FzTGw8jA=; b=HonL48KzdTGZCHkQ5j5aXNfcpn4jGfipPi92OEmPZ4DWQo2tfbn8mXjK6a2yqgUwjM 3N6FnT/GwudpMuf410Asl4rjjXK0r9zPFGaj+7KYrKhb9FWlYIPfQP+4ywTNT7rIT3Ad YuDXhMmHxLVrHmp1GyebjLZk5LjLCkGcCvaduXrVyU5WHtzY4vFUUPvQ+t2Kr7vNx/DL 1hjIgqjh9HVYpzFeNs00gtbb6+JMPIZLQU/aXV2w48YjmakEiCUZ+LrKJoJber+ZMHCX P0cEPusKxzBLTlAPCGaSbkPISpXLXPTYnvAayQJUxUHNdIrkCsFyK/MqDnEjlyMxZYEL LRbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776846146; x=1777450946; 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=LGW6d9MttlD6p2S8pWbgXC+RAAlUoZve1q7FzTGw8jA=; b=XvxNOHN1tXIjfsE1r79z53DDb+68OY7Itgn1UyCsIAhQKNACy4re6ggxKQcr3XO2Ka +bKWJAxoVafuEftXfsEkQPqMJ2VD4++ZaCki1wz98cMoomJYZPOW9hgZkyaxGIIefEV7 cyUd3lrxPr4SfLLPoFYlYzvIdFILHaTAvfhWQcZoc4C5fidu5I9SD4yYQMovfnupI7LU u9m3RW8EQHtpOZtTDe2qBose++RxmS8Duk6FnaWhHYljkmezpvPe6evwfpGQXwMBskYX o2goPBzoDSGbd26FqdvTsMlC3CF7O5lODlhQ4hdXjmyVn1klAt+pm5Eey2qYmhSw98HZ 1guw== X-Gm-Message-State: AOJu0Yy3yGrI+HFDCO14LqSlwRn8rXbozYoocy7AYB/v3qE1Vb8CbiKr hk33SrzjN7dCu9v0muZTjCpzWOe/0bEXUFrCev39ab2p/5V9QKTuIdu9pmpvWt64iondQC7VytH zxm9UJAYncQ2gfd46UcnQ/LTm0KcV9XVhCn1IWYjnsjxxN0qfrdPWHhWSuK+j8wyHV126eE5skE 32ovtJgw+8OuvTq1hWMRzouKHEBcU+3bqV02O/sXM= X-Gm-Gg: AeBDies0YFXtoVmzwSRqWlMba2U8oGUbpUvk8Nl26mQ3yvaqKyLJ86YbY+5hqu7Sp4l a6XXHDFzJqO/LsRhQWPyGYZvrMGkFPwBldb+2lk2XWJfxFDTX5bnv8uK6ShesnqxaRgvVCvjKaC lVyfynjvdaOBuW4dxFh4PE22P2ZNHCfPvEH0aBXLd6qAwDT6M9MvkrfxsF8C9NLuK3h4eybKMG7 KUTv/qpTh7mNN7nhkAsWki+mteds3YEsnyu61sP4CMP+sb0kMzGgmYRL8eVXgcrLG3ejoyfETLv LuRMEvATzP48LVkgE47SA+F9W7e92pm9kiJuEXCtFCij9QnAMgpgcbStgUivGUbQVeZct8gUdAa 0Gh270JtWp6gNsuI21H00ubbt5vlZtBRM+kMUSuDk1f4LCMaYtilPn9f8ebDEndsyqgfoJe1pQQ == X-Received: by 2002:a17:90b:5865:b0:35b:929f:7e8d with SMTP id 98e67ed59e1d1-3614046cdb7mr22915034a91.14.1776846146519; Wed, 22 Apr 2026 01:22:26 -0700 (PDT) X-Received: by 2002:a17:90b:5865:b0:35b:929f:7e8d with SMTP id 98e67ed59e1d1-3614046cdb7mr22915002a91.14.1776846145877; Wed, 22 Apr 2026 01:22:25 -0700 (PDT) From: Arun Menon To: qemu-devel@nongnu.org Cc: Peter Xu , Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Arun Menon Subject: [PATCH v3 2/2] ui/vdagent: Use VMSTATE_GBYTEARRAY to safely migrate outbuf Date: Wed, 22 Apr 2026 13:52:14 +0530 Message-ID: <20260422082214.10390-3-armenon@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260422082214.10390-1-armenon@redhat.com> References: <20260422082214.10390-1-armenon@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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armenon@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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: qemu development 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: 1776846175696154100 From: Arun Menon Migrating a GLib GByteArray is now possible directly using the newly introduced VMSTATE_GBYTEARRAY. It uses the standard GLib API calls to create the array, or resize it. This is safer than implementing a C struct and manually updating the data and len fields. This commit uses the VMSTATE_GBYTEARRAY in vdagent to store the outbuf variable. Signed-off-by: Arun Menon Fix-Suggested-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Peter Xu --- ui/vdagent.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/ui/vdagent.c b/ui/vdagent.c index bb0c4aa14c..9206e47000 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -967,17 +967,6 @@ static const VMStateDescription vmstate_chunk =3D { } }; =20 -static const VMStateDescription vmstate_vdba =3D { - .name =3D "vdagent/bytearray", - .version_id =3D 0, - .minimum_version_id =3D 0, - .fields =3D (const VMStateField[]) { - VMSTATE_UINT32(len, GByteArray), - VMSTATE_VBUFFER_ALLOC_UINT32(data, GByteArray, 0, 0, len), - VMSTATE_END_OF_LIST() - } -}; - struct CBInfoArray { uint32_t n; QemuClipboardInfo cbinfo[QEMU_CLIPBOARD_SELECTION__COUNT]; @@ -1067,7 +1056,7 @@ static const VMStateDescription vmstate_vdagent =3D { VMSTATE_UINT32(xsize, VDAgentChardev), VMSTATE_UINT32(xoff, VDAgentChardev), VMSTATE_VBUFFER_ALLOC_UINT32(xbuf, VDAgentChardev, 0, 0, xsize), - VMSTATE_STRUCT_POINTER(outbuf, VDAgentChardev, vmstate_vdba, GByte= Array), + VMSTATE_GBYTEARRAY(outbuf, VDAgentChardev, 0), VMSTATE_UINT32(mouse_x, VDAgentChardev), VMSTATE_UINT32(mouse_y, VDAgentChardev), VMSTATE_UINT32(mouse_btn, VDAgentChardev), --=20 2.53.0