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 lists1p.gnu.org (lists1p.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 D2625C5DF81 for ; Tue, 18 Aug 2026 18:26:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wwOUr-00085H-FY; Tue, 18 Aug 2026 14:25:13 -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 1wwOUq-00084F-5P for qemu-devel@nongnu.org; Tue, 18 Aug 2026 14:25:12 -0400 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wwOUo-0003CF-LI for qemu-devel@nongnu.org; Tue, 18 Aug 2026 14:25:11 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1F4C03E7D; Tue, 18 Aug 2026 18:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787077505; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G2peLC6JzEpMik1srp1Ibgub0BcuGgBGnMWyYc7s5n4=; b=xvaLYsxm/sJ7BaVqNgzZAV6qWBt+VT98HrxxRbLhDNX7Y1AllI8GJreNPIVZ1IK8czT2Yx 7GNQJx85TkghJitSfpNGKqPPQAcPJx27zbJb/6zxXYyFigQsgtkj+LX4txeQSJW2sFVq4K JpQj5NC4Cn54ofN8C+XkPTemFvM0duw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787077505; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G2peLC6JzEpMik1srp1Ibgub0BcuGgBGnMWyYc7s5n4=; b=Nlt/bEh7tUV/ha+u1LG3cxQT0wyW9PycSt0MtkMyGR8K1atafpkxOdog7yH2ZurjLhBmWg Qw8fQ8WdOMFKoBBQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=rqRCqEtk; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=zK1ulCrp DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787077501; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G2peLC6JzEpMik1srp1Ibgub0BcuGgBGnMWyYc7s5n4=; b=rqRCqEtkmg+f3boESKLQR/qLWRRKUF/HCZcj2js9O1AqZcevgfpGGboDX+ZamsHEbyq6L/ DWrg7oknSiQcsvLduLrSnxHCddIGmSH4EiwVcw7BajUDM1yHEckdI2HM3dDkW5qV8n+zzG ViYv3SapJKO5x8GKdOF0I5dowII9DDo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787077501; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G2peLC6JzEpMik1srp1Ibgub0BcuGgBGnMWyYc7s5n4=; b=zK1ulCrprHK9y7VQRbXIY9kFVDOb3TRQKbU/IydRxaXqQsV4HZAKSCqcq3NnDM7dIxPQqO B+4qFb0euL6O1ACw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C7E41339C; Tue, 18 Aug 2026 18:24:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id CHPSJXujhGpYYQAAD6G6ig (envelope-from ); Tue, 18 Aug 2026 18:24:59 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Vladimir Sementsov-Ogievskiy , Alexandr Moshkov , "Michael S . Tsirkin" Subject: [PATCH v2 6/8] migration: Check more vmstate flags Date: Tue, 18 Aug 2026 15:24:39 -0300 Message-ID: <20260818182441.404790-7-farosas@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260818182441.404790-1-farosas@suse.de> References: <20260818182441.404790-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Queue-Id: 1F4C03E7D X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,suse.de:dkim,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCVD_COUNT_TWO(0.00)[2]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; RCPT_COUNT_FIVE(0.00)[5]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org Received-SPF: pass client-ip=195.135.223.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add more checks for vmstate flags constraints. Signed-off-by: Fabiano Rosas --- migration/savevm.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/migration/savevm.c b/migration/savevm.c index 3e5cce6520d..c44df365cc8 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -893,6 +893,25 @@ static void vmstate_check(const VMStateDescription *vmsd) assert(field->flags & VMS_ARRAY_OF_POINTER); } + /* + * The VMS*ARRAY flags and VMS_VBUFFER affect allocation, + * they must have the proper fields set and no other + * vmstate types can set those fields, otherwise it won't + * be picked-up due to the missing flag. + */ + + if (field->flags & (VMS_ARRAY | VMS_VARRAY)) { + assert(field->num > 0 || field->num_indirect.size != 0); + } else { + assert(field->num == 0 && field->num_indirect.size == 0); + } + + if (field->flags & VMS_VBUFFER) { + assert(field->size_indirect.size != 0); + } else { + assert(field->size_indirect.size == 0); + } + if (field->flags & (VMS_STRUCT | VMS_VSTRUCT)) { /* Recurse to sub structures */ vmstate_check(field->vmsd); -- 2.53.0