From nobody Sun Mar 22 14:09:26 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=1773929250; cv=none; d=zohomail.com; s=zohoarc; b=kvBwLneBlA+dPQ6RFn+FKvX1pBiOblp8b4y+CY49HVEW8oD/dX5N7joYYlvTDY5oVWEE04ZWg9QZKWJOV9Wit2FzhifvOnw+n7/c4K1YKHYM69MqoOueypuwu8WGrDAY7nx/WySfUGcem2swMq+bnV5TO4BDlT605wZ6v+pZUA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773929250; h=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=L8zuos4bK0fGs5bKQ5veSNqyz1ldnM7+UP90yWuOXfA=; b=fIFwU4e6cfme/iUAf/N2mj5HnYLMzKoEruhNNY2xDkSV2lx6Fe+Vqmvop9RYHT1jxg4VWTZDkEUqHtm48FcBk67f0yFVsUE72M4f6gfuB5qYjM7pRZx+HgZhTROpzuq8iuOCtdJQ0Oyg5D+mz55eg6Xf7PP2kyluPNCicsrPzBI= 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 17739292505081004.123368390655; Thu, 19 Mar 2026 07:07:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3E1W-0003Zm-6O; Thu, 19 Mar 2026 10:06:54 -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 1w3E1O-0003ZA-C7 for qemu-devel@nongnu.org; Thu, 19 Mar 2026 10:06:48 -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 1w3E1L-0003fw-N9 for qemu-devel@nongnu.org; Thu, 19 Mar 2026 10:06:46 -0400 Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-450-xlQAlMGwPLaNSq6RlLirJQ-1; Thu, 19 Mar 2026 10:06:41 -0400 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-899edf0171bso90856926d6.0 for ; Thu, 19 Mar 2026 07:06:41 -0700 (PDT) Received: from x1.com ([142.189.10.167]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-89c6b9ce294sm44932506d6.30.2026.03.19.07.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 07:06:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773929202; h=from:from:reply-to:subject:subject: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=L8zuos4bK0fGs5bKQ5veSNqyz1ldnM7+UP90yWuOXfA=; b=Hm4KJCY2GzPgFAjxWoZDztMaS+v/un0WwDZCogWfjCC9zbbojzSXDy/rYQALjsomJia1+x bqDZKvKseRz3DOXCOfNaAkj4fDH33xi55+V63O9d/hW9oXUw5y+W59RmEiWEimY6DZbdwX ODnHTM9aKzdxXjdrPNV6i/06IDw1L9A= X-MC-Unique: xlQAlMGwPLaNSq6RlLirJQ-1 X-Mimecast-MFC-AGG-ID: xlQAlMGwPLaNSq6RlLirJQ_1773929201 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773929200; x=1774534000; 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=L8zuos4bK0fGs5bKQ5veSNqyz1ldnM7+UP90yWuOXfA=; b=X9BCDDEmEkZDDIdVgDGeJBkY2RirEOjFNiL4KPOy1zI/vCFiFrXAdrMCDamlqpZZ7g g+mZjqD5t+MBir21j6oVnnBIR4m2f/st6dDlapmvLeuLo8MXG6ek1GU36VHQSYOMt0dv Rk8Yf5A7a0HlHAdNenxkc9dTqWdpkNhjet6KIJI20mWK5f2RkEQbMqc/gF/wo4yp0ryU AkwMD3C1mQyUSbT2CzBpoZu1fYR/rqqMKKVnmvnbay6jPAgEzzcqq6uER9aJm7mflfwL vLJsguiDa47zWPkTOhmJp/TjV9wpFMvOvLNawjoFbQDBWyxmevmRuuEf2k/+c9wPSXhq tW8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773929200; x=1774534000; 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=L8zuos4bK0fGs5bKQ5veSNqyz1ldnM7+UP90yWuOXfA=; b=TloyeFPlrfDAs0QB2quKs3CLaxA+UgbFGAqZYzFyJ5XRQKXJ/IAV4Z0CjE8OOme2kR zsSCv55lsJQryrZN9r8g6pxft5rtHClPKcP0oMRy8Gixcz4Gb/GgOUS948xn/PpUgg3V 4VC1sp4kbKyQdjhfRMDzPulmIY6q/9ai1AkRRn6vAJKT8M+wMPX7Ymu2pW25rdgGkl/g 5tBEBA81tJLUbDb8v3E/qat/RGbEPLulpQH0/pcjJylB3zMVEhGCFZjM9b7DE1h5dbj2 GVbBRhgiu3WSQroNhCAfEcejBcg9Ku5deDKM/hoty/sVDM1k9ls6c0jconESxmo5/xIM DHzg== X-Gm-Message-State: AOJu0Yxdw4atXQq50ssYcXUd+HUTpMA3LXi+CoGkG4bpu5GpUfII7qfo +QdiMejNeGpU7CDWxo0X0Xge3wa8NfqXg6cVMPnORzRtrsEwbx12gFhr6vk1bJeQl9tnBT++FV9 ztw6dPy4ZG++04SPPYee10sVcrn+HYN8nEeL9g6SviboikYeTkx2F0TyfwXA+sahkb2+JMPuqDx vynsa82JpQcccSOcj5wqALb4nADPauu3OpQC6EAA== X-Gm-Gg: ATEYQzxbTG42Sy1UDwnyIdSL+u8wurRnK2PU7OzOwWM3tGWUOroUIX2gLFrxU4zdxar l4tcG+7jztuovVqEzK3FdwyR0Ar7AljerlotVA3M3SVk8y2NJCScu/U6sjxaI0wRCfRZarfefve bHV8NWg2Y2Kuj+hKJ6nVEbnsYkE/PvaxUFgj/6SgUV+ORITFYHBIV7jNjtwErkc9DQmJnmAgtV6 lnJPetu607OtEf18/mC3K1JBmL1Kdix+EQ19ufOEKRPEkSdW+EUExkXYYjNRmepyD86OnvEQTIq CuucUxPY05Jbc8PMNCvoQz2LbnzQP27i1Oi37xq85cUSfzqio3TxJiFvIMYFR29ZkOgTGfadWx/ Z9SeWACGqxnw= X-Received: by 2002:a05:6214:3204:b0:89c:6451:67ac with SMTP id 6a1803df08f44-89c6b4b79c2mr116232966d6.12.1773929200467; Thu, 19 Mar 2026 07:06:40 -0700 (PDT) X-Received: by 2002:a05:6214:3204:b0:89c:6451:67ac with SMTP id 6a1803df08f44-89c6b4b79c2mr116232126d6.12.1773929199854; Thu, 19 Mar 2026 07:06:39 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Peter Xu , Mark Cave-Ayland , Xiaoyao Li , Farrah Chen , Kim Phillips Subject: [PULL 1/2] memory: Set mr->ram before RAM Block allocation Date: Thu, 19 Mar 2026 10:06:35 -0400 Message-ID: <20260319140636.74007-2-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260319140636.74007-1-peterx@redhat.com> References: <20260319140636.74007-1-peterx@redhat.com> MIME-Version: 1.0 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 client-ip=170.10.133.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1773929252970154100 Content-Type: text/plain; charset="utf-8" From: Xiaoyao Li Commit 2fb627ef2f48 ("memory: Factor out common ram region initialization") introduced a helper function memory_region_set_ram_block(), which causes mr->ram to be set to true after the RAM Block allocation by qemu_ram_alloc_*(). It leads to the assertion g_assert(memory_region_is_ram(mr)); in memory_region_set_ram_discard_manager() being triggered when creating RAM Block with the RAM_GUEST_MEMFD flag. Fix this by restoring the original behavior of setting mr->ram before RAM Block allocation. Closes: https://gitlab.com/qemu-project/qemu/-/work_items/3330 Reported-by: Farrah Chen Link: https://lore.kernel.org/r/df63fdf0-05ea-4de0-8009-c52703e4b052@amd.com Reported-by: Kim Phillips Fixes: 2fb627ef2f48 ("memory: Factor out common ram region initialization") Signed-off-by: Xiaoyao Li Tested-by: Kim Phillips Link: https://lore.kernel.org/r/20260312063420.973637-1-xiaoyao.li@intel.com Signed-off-by: Peter Xu --- system/memory.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/system/memory.c b/system/memory.c index 17a7bcd9af..56f3225b21 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1578,7 +1578,6 @@ void memory_region_init_io(MemoryRegion *mr, Object *= owner, =20 static bool memory_region_set_ram_block(MemoryRegion *mr, RAMBlock *rb) { - mr->ram =3D true; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; mr->ram_block =3D rb; @@ -1597,6 +1596,7 @@ bool memory_region_init_ram_flags_nomigrate(MemoryReg= ion *mr, Object *owner, RAMBlock *rb; =20 memory_region_init(mr, owner, name, size); + mr->ram =3D true; rb =3D qemu_ram_alloc(size, ram_flags, mr, errp); return memory_region_set_ram_block(mr, rb); } @@ -1614,6 +1614,7 @@ bool memory_region_init_resizeable_ram(MemoryRegion *= mr, RAMBlock *rb; =20 memory_region_init(mr, owner, name, size); + mr->ram =3D true; rb =3D qemu_ram_alloc_resizeable(size, max_size, resized, mr, errp); return memory_region_set_ram_block(mr, rb); } @@ -1628,6 +1629,7 @@ bool memory_region_init_ram_from_file(MemoryRegion *m= r, Object *owner, RAMBlock *rb; =20 memory_region_init(mr, owner, name, size); + mr->ram =3D true; mr->readonly =3D !!(ram_flags & RAM_READONLY); mr->align =3D align; rb =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, offset, err= p); @@ -1642,6 +1644,7 @@ bool memory_region_init_ram_from_fd(MemoryRegion *mr,= Object *owner, RAMBlock *rb; =20 memory_region_init(mr, owner, name, size); + mr->ram =3D true; mr->readonly =3D !!(ram_flags & RAM_READONLY); rb =3D qemu_ram_alloc_from_fd(size, size, NULL, mr, ram_flags, fd, off= set, false, errp); @@ -1663,6 +1666,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, Obj= ect *owner, void *ptr) { memory_region_init(mr, owner, name, size); + mr->ram =3D true; memory_region_set_ram_ptr(mr, size, ptr); } =20 @@ -1671,6 +1675,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *= mr, Object *owner, void *ptr) { memory_region_init_io(mr, owner, &ram_device_mem_ops, mr, name, size); + mr->ram =3D true; mr->ram_device =3D true; memory_region_set_ram_ptr(mr, size, ptr); } @@ -3699,7 +3704,6 @@ bool memory_region_init_rom_device(MemoryRegion *mr, = Object *owner, memory_region_init_io(mr, owner, ops, opaque, name, size); rb =3D qemu_ram_alloc(size, 0, mr, errp); if (memory_region_set_ram_block(mr, rb)) { - mr->ram =3D false; mr->rom_device =3D true; memory_region_register_ram(mr, owner); return true; --=20 2.50.1 From nobody Sun Mar 22 14:09:26 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=1773929264; cv=none; d=zohomail.com; s=zohoarc; b=FQeKs8ulODWO1Nv4u0+DGfxPgHPxFIKcc9lbZJ6M+6TLBTD/aREKM7psRsEKZ6nhxtqiKFsr6mhUezYIqPFtJDz/MpQVVftLtC8SVS+eBZRIozIYConxTDNhOuE02HsQiWMmW3x8aG4m2Xng14UdjoakYanqCizpsKCNnT1G7v8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773929264; h=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=5zYx6xX+RJ4Vkxi2DBkoR2SC15BdSwrIjqXs4fdFlqw=; b=e0MaHdXhEVQL8babtph0K7pBvsRt+1szMC6K1DqvgOEi/O5L/qx42sjCUD2FEGRvQNoawTKgh6Zt0v619L3hbLxx44fCaCdNL9oPfKQWlcUWrMX+S+uzQ+nLzyr/jvV5Ed9e79TxSv3VtjmrGoSuBO8AdujaykA1GJvslESwuH0= 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 1773929264889407.95827919507406; Thu, 19 Mar 2026 07:07:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3E1e-0003af-Be; Thu, 19 Mar 2026 10:07:02 -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 1w3E1R-0003ZQ-EM for qemu-devel@nongnu.org; Thu, 19 Mar 2026 10:06:50 -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 1w3E1O-0003gH-Qv for qemu-devel@nongnu.org; Thu, 19 Mar 2026 10:06:49 -0400 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-477-AvvLZTfXNES9h6WQv92KlQ-1; Thu, 19 Mar 2026 10:06:44 -0400 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-89c5976a8eeso101668456d6.2 for ; Thu, 19 Mar 2026 07:06:44 -0700 (PDT) Received: from x1.com ([142.189.10.167]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-89c6b9ce294sm44932506d6.30.2026.03.19.07.06.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 07:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773929205; h=from:from:reply-to:subject:subject: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=5zYx6xX+RJ4Vkxi2DBkoR2SC15BdSwrIjqXs4fdFlqw=; b=fnL3pqIfkuZF7NjAQFTbnLAnBQUPGNSyN2vM1wauv3o0QtHNiRLnfWml0ZjC57qkAw3wS3 UR+wC3hRqcGmfrHwm49B9yADNzXHNeHz8sfx4a/OMIlRIm2eitoqHrqC5ShcEj9AoUQ7QY JsQ6SAw4yw6Dc3wLbrUYjIUT9ybqKzQ= X-MC-Unique: AvvLZTfXNES9h6WQv92KlQ-1 X-Mimecast-MFC-AGG-ID: AvvLZTfXNES9h6WQv92KlQ_1773929203 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773929203; x=1774534003; 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=5zYx6xX+RJ4Vkxi2DBkoR2SC15BdSwrIjqXs4fdFlqw=; b=B/TXAhMmNorxvn1+T1v6Yolfc23umotC8Mefky21Tf4DuYSijxBS1GxE6hklp10jRq jBue42qj3ZLuuYIGU6HQilzqq/WEgibjUUW5RxNDauRmc3ROdpp4x85tyND1kyELfz6g 1uut8NZYkTF2/JMgS0mFYf40lb5psdeU4s3muyWvDxHeMUdlpaxg3f0c2JJqpqWV4SnH ahNNP6QsvMPSBMyE3k95gqDfE+G2OEemnfmBqZzwVeHb2zYCHd6YaEOn3k5MfPL/+TEh gyjSlwZLJw0lJ7jRFjTnV5///LCY5lN2ezwkW3hPK8OyLS6EZH0rtzRR5k02YrktGt5Y U/bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773929203; x=1774534003; 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=5zYx6xX+RJ4Vkxi2DBkoR2SC15BdSwrIjqXs4fdFlqw=; b=VCH01It86SIBtoPju8R6A0tp0yZx7bY3LfZ0kz099/5ga5k5mgfveqIFQi6q2N4i90 iFs32ILfVFTgcy99Z6sFj+BQNRVgxgWeviWAS3U0ZnTewCxWOBkMXwDyX4uk9lnPoOGG orRJdIOqMGO1RhdEd2bfjbos1/MvTmcPTs4Deq3owvE0NAGPS+6FzMdKdA8nd19okXme 0xkU/nnY4dwTvsRM/0uiP0zibDgHCbAED18Y9b74RSdT4MYRutS9UN0+7r/Oyowc3nEc ClA5lPDT1cWXKU37Vk9zAj3LgJvy/kaYNaw+6/NYZsUHtSskLfIk9/IZ+sf4Pl2X3wf0 tJtw== X-Gm-Message-State: AOJu0Yzbjux7uxYKOicmPDasD6gC6b+6POWak1/jAxMpwY9Z0xd2xgdU 6SoeiTfBYY1BXPBUxCUb1NIeRud8YboO93GG6mfum9iB4SPfGQufPCAPf4KWJ8OrnPqp/V4AmON y+5bbWXf9HevdkzQRUclRUO+1+fzo19b8agHRtkeOqben3iN9i/aQ7cMf/NFApUHsRBv/cPvyBS ADpRKVMf3ZuOqfG8DCbQR6Qg+tazs+fMYbF67+Sg== X-Gm-Gg: ATEYQzwaePTStS/722xE8csHtR+EUM8XIuwr3I7/aeLqQet1QnR4NTGQ+3nz57Lp7cG gURKpyW3yfqb9hcFFEUdVTKFRWz6pFg3j05opXv19cuseZsy/qm7L5sW8pxeswYeNVNWOmKcZC8 HlmME96Sg0CvCtRfRoipmmWPuTjApbvNsc8iEJbpI6RrnG6utTtEV399weaFzvA31ctb/7A2X49 mC8cCfeeS4U/K1nvuSMwxYkn/TfYmgTN8tE7h6j7JcQmisrYViI3qsWlJHC31hwR69gfJjvnHNF C4r0QeK3utd9++wuXPj5Y18vQOypzSlPttH4pIIpQOxojyhocs/34loCEac0G3DjMbpTmm67xoY CyaoHKwwPC0E= X-Received: by 2002:a05:6214:5b88:b0:89c:56bf:9638 with SMTP id 6a1803df08f44-89c6b47f130mr118979956d6.7.1773929202782; Thu, 19 Mar 2026 07:06:42 -0700 (PDT) X-Received: by 2002:a05:6214:5b88:b0:89c:56bf:9638 with SMTP id 6a1803df08f44-89c6b47f130mr118979186d6.7.1773929202274; Thu, 19 Mar 2026 07:06:42 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Peter Xu , Mark Cave-Ayland , BALATON Zoltan , Thomas Huth Subject: [PULL 2/2] hw/display/tcx: Init memory regions in realize Date: Thu, 19 Mar 2026 10:06:36 -0400 Message-ID: <20260319140636.74007-3-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260319140636.74007-1-peterx@redhat.com> References: <20260319140636.74007-1-peterx@redhat.com> MIME-Version: 1.0 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 client-ip=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1773929266921154100 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan Thomas reported test failure: $ export QTEST_QEMU_BINARY=3D./qemu-system-sparc $ tests/qtest/device-introspect-test -m thorough ... # Testing device 'sun-tcx' RAMBlock "tcx.prom" already registered, abort! Broken pipe ../../devel/qemu/tests/qtest/libqtest.c:210: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped) Aborted (core dumped) Issue is the qom introspect test will create yet another sun-tcx device causing double register of the memory region. Fix it by removing the init method and move memory region creation in realize. Reported-by: Thomas Huth Link: https://lore.kernel.org/r/3b87e6d9-a027-4dcd-a995-857e16c8b2e6@redhat= .com Fixes: 653c4fa5b0 hw/display/{cg3.tcx}: Do not use memory_region_init_rom_n= omigrate Signed-off-by: BALATON Zoltan Link: https://lore.kernel.org/r/20260316130651.5C8735968DE@zero.eik.bme.hu [peterx: amend commit message, fix tag, add link] Signed-off-by: Peter Xu --- hw/display/tcx.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/hw/display/tcx.c b/hw/display/tcx.c index c8a4ac21ca..ea92a48400 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -751,10 +751,15 @@ static const GraphicHwOps tcx24_ops =3D { .gfx_update =3D tcx24_update_display, }; =20 -static void tcx_initfn(Object *obj) +static void tcx_realize(DeviceState *dev, Error **errp) { - SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); - TCXState *s =3D TCX(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + TCXState *s =3D TCX(dev); + Object *obj =3D OBJECT(dev); + ram_addr_t vram_offset =3D 0; + int size, ret; + uint8_t *vram_base; + char *fcode_filename; =20 memory_region_init_rom(&s->rom, obj, "tcx.prom", FCODE_MAX_ROM_SIZE, &error_fatal); @@ -804,16 +809,6 @@ static void tcx_initfn(Object *obj) memory_region_init_io(&s->alt, obj, &tcx_dummy_ops, s, "tcx.alt", TCX_ALT_NREGS); sysbus_init_mmio(sbd, &s->alt); -} - -static void tcx_realizefn(DeviceState *dev, Error **errp) -{ - SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); - TCXState *s =3D TCX(dev); - ram_addr_t vram_offset =3D 0; - int size, ret; - uint8_t *vram_base; - char *fcode_filename; =20 memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram", s->vram_size * (1 + 4 + 4), &error_fatal); @@ -887,7 +882,7 @@ static void tcx_class_init(ObjectClass *klass, const vo= id *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - dc->realize =3D tcx_realizefn; + dc->realize =3D tcx_realize; device_class_set_legacy_reset(dc, tcx_reset); dc->vmsd =3D &vmstate_tcx; device_class_set_props(dc, tcx_properties); @@ -897,7 +892,6 @@ static const TypeInfo tcx_info =3D { .name =3D TYPE_TCX, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(TCXState), - .instance_init =3D tcx_initfn, .class_init =3D tcx_class_init, }; =20 --=20 2.50.1