From nobody Sat Apr 11 21:30:22 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=1773088945; cv=none; d=zohomail.com; s=zohoarc; b=AjzMWvATZ7jZ3h2sglh6DHBlxtYuAqwcSeA+Ec8YvJyOlRxbdyi04GoNPH7eZ0kbs/WJ20wjLwydX6ozmq+yqXjBNWi2w8nalYRPEwlOY0xYESp09vPX0tb3E56r2ihncV5Xwpx9s40o3Y4TEKvkfS8n6GBi8xmiMAt8/OD8/Ls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088945; 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=pYJpSgxPPO+v1EgJ+isO2WJIuGRkEiiV4/Qldt+i+AE=; b=gZxDkdVEqq8vYxpFKPML8RasVXTevO/pggrvYEStQAHIstJTpio4gsXFMOWSeDAAT8BznoG0h4BurnfoApPmaHSYreKK58KQPbPiUAirE4UgkQngDXPGxaans2Egin0KbfMzLg6sntCzpqQx7Yzu2PQB27+bk6Bh5BjRwxSI7Ms= 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 1773088945635413.51123581006584; Mon, 9 Mar 2026 13:42:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPD-0004fp-Jz; Mon, 09 Mar 2026 16:40:47 -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 1vzhP2-0004eP-2K for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:36 -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 1vzhOm-0007gV-0O for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:24 -0400 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-AWeMLBmKOR6gYCz4sRIcYA-1; Mon, 09 Mar 2026 16:40:18 -0400 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cd76ff19d5so1339196185a.0 for ; Mon, 09 Mar 2026 13:40:18 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088819; 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=pYJpSgxPPO+v1EgJ+isO2WJIuGRkEiiV4/Qldt+i+AE=; b=M2rcAGF81ecpXw2RON/UPdTKXGPYNQccaMGwDKbnSBuXNCJvXsqz5TRRjXihTgFi4zQqVZ 1p2185EQvlpdAjmgbnGp6e770fDdCcihjhTaMbPZe/+yG4anRCQQ8/wx+n2eeCZtmxt88E OFBliDkwWSen9Xm9HE+M/zecj/nuyYY= X-MC-Unique: AWeMLBmKOR6gYCz4sRIcYA-1 X-Mimecast-MFC-AGG-ID: AWeMLBmKOR6gYCz4sRIcYA_1773088817 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088817; x=1773693617; 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=pYJpSgxPPO+v1EgJ+isO2WJIuGRkEiiV4/Qldt+i+AE=; b=DJaDPLwH23wtIMQU5FKjNbxA8EnlpEiPeZoggP/Elqt0Bf0AavmhajodbLR+bEEg5F FEQNACRxm7sntI9LJRdXQM1MEU+hVT681nBcdBNXvgy+ahy+46pQX9We9qrru8yE1pyy jlKFbVKD2kmBhXygs3hm3Iao5R+QSlUd4iojJVyAIvgmeHs49UpIMT/m6HHGyDnoWeOI NAmVgPFCB9No1J+ssxcWbtGIjZfm3J9SOUX7vhNhEv63lznAOPB5ilM2jThOAxD10snR jb3jWNQBiC3IMV06uj/NfJJHCuDs4RQtbI8K5Gnp1DTC0RdClg6m9Z+zHBjbewCu8goe Q+lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088817; x=1773693617; 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=pYJpSgxPPO+v1EgJ+isO2WJIuGRkEiiV4/Qldt+i+AE=; b=lfpPIA/nVhI3T7waRkLxbI8bn1xe8R3QxQwg+FtFWKc4JDFMDgr2981KpeGVDp+vgI z/0933ckxsLLoK0Js0nV6DAlC7Rd2ZAOwTEKnxvHvGx5RaqstFjfqm4sZYYIRx96QATz eiyazFelEYhMFLiwwqcrEk4csQg1AFogD3Ef78DhLa+PDrZEXbx0ICblYuuuQguwByUC XhnzPDTIMMytzRf5hXyBOceU14Ogdfh89IiH4rWC5pY+dAXNMSB+a9ewQIZVmQrZDjl8 UEGwmWCoCOTglePx2SrDZPmq9iWTI0y8FeXz2cEZ+Y8Kus9JNCSQhYTR6jrNhU3ootxE iiFA== X-Gm-Message-State: AOJu0YwXrq5NM7Qjfp/tZHhMEWUoeAlsZzFvOFifl/hP1mE+yriiWImI 6zOVKVC9JuhpdlMUb0bk3UGksStAz7f8+8AAx/BKdjk0vO9aY7AuUHeNyFcpHTpcAwzr6Dg+1lc vR9GS/gC/DSt0inma9iX1IhYmAj3d83NciyOB68VFTwQh8J+2WjSKbNlFanjmeNorU3ix96s5++ a2CM5uBdaDMA/DU7RI9cD8Glrg6JPlvF7semrdNg== X-Gm-Gg: ATEYQzxcBUP4Lr7US1Sbn0l4TkOAE6qdkAKe+IKqSjW6QwsPDErXq7EQwlyJYK+VNfc 5mHjbwPRI8Sh3+LDQDtZCEpVyll6wQ6Be0OaWxOqggZs3B3jW/EA7zbkPS4ni6ASSiM3R2M1ILF IOTy2p0yZpO22JBCZ4rmpsDLDkAw+SIrxUGDYJ69d/NOgZaxykfdA3tM6cdsO4DRaqVXNN/WpZv x1nAN9YeThQa6mYcgh3WS9sXpEmVWUX6uiGHIricToBvqKwRDY8yNtlNyz9Kck+1m20LSn/DWr+ i47rXw6B8KkgqLO+FnyDUQjyoAYNHct2M8lLoiVMXxbGwMx2YfF5/4PtPqUgT0dIkWc1jEyTwgX 61kmYr2+KNriLl/hrX1jSWO6LtpKPQxLInffCot5sz8p9VDjx3v6QgtgvlkjoyJcNmfvFfnT+vS dkjy3Ihw== X-Received: by 2002:a05:620a:29c2:b0:8cd:80e1:5a0e with SMTP id af79cd13be357-8cd80e15eb1mr891701085a.63.1773088817097; Mon, 09 Mar 2026 13:40:17 -0700 (PDT) X-Received: by 2002:a05:620a:29c2:b0:8cd:80e1:5a0e with SMTP id af79cd13be357-8cd80e15eb1mr891696785a.63.1773088816500; Mon, 09 Mar 2026 13:40:16 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , BALATON Zoltan , Peter Maydell , Akihiko Odaki Subject: [PULL 01/18] hw/display/{cg3.tcx}: Do not use memory_region_init_rom_nomigrate() Date: Mon, 9 Mar 2026 16:39:50 -0400 Message-ID: <20260309204007.1709441-2-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-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_H4=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: 1773088946734158500 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan Use memory_region_init_rom() instead which is what other devices do. This breaks migration but these devices are only used by sparc Sun machines which have no migration compatibility guarantee. Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell Reviewed-by: Akihiko Odaki Link: https://lore.kernel.org/r/819df754e359b024bc9bf8f971ecd26816552559.17= 72924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- hw/display/cg3.c | 5 ++--- hw/display/tcx.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/display/cg3.c b/hw/display/cg3.c index 568d6048a6..61bdb0552e 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -282,8 +282,8 @@ static void cg3_initfn(Object *obj) SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); CG3State *s =3D CG3(obj); =20 - memory_region_init_rom_nomigrate(&s->rom, obj, "cg3.prom", - FCODE_MAX_ROM_SIZE, &error_fatal); + memory_region_init_rom(&s->rom, obj, "cg3.prom", FCODE_MAX_ROM_SIZE, + &error_fatal); sysbus_init_mmio(sbd, &s->rom); =20 memory_region_init_io(&s->reg, obj, &cg3_reg_ops, s, "cg3.reg", @@ -299,7 +299,6 @@ static void cg3_realizefn(DeviceState *dev, Error **err= p) char *fcode_filename; =20 /* FCode ROM */ - vmstate_register_ram_global(&s->rom); fcode_filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, CG3_ROM_FILE); if (fcode_filename) { ret =3D load_image_mr(fcode_filename, &s->rom); diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 36cad82abd..16114b9bb8 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -756,8 +756,8 @@ static void tcx_initfn(Object *obj) SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); TCXState *s =3D TCX(obj); =20 - memory_region_init_rom_nomigrate(&s->rom, obj, "tcx.prom", - FCODE_MAX_ROM_SIZE, &error_fatal); + memory_region_init_rom(&s->rom, obj, "tcx.prom", FCODE_MAX_ROM_SIZE, + &error_fatal); sysbus_init_mmio(sbd, &s->rom); =20 /* 2/STIP : Stippler */ @@ -822,7 +822,6 @@ static void tcx_realizefn(DeviceState *dev, Error **err= p) vram_base =3D memory_region_get_ram_ptr(&s->vram_mem); =20 /* 10/ROM : FCode ROM */ - vmstate_register_ram_global(&s->rom); fcode_filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE); if (fcode_filename) { ret =3D load_image_mr(fcode_filename, &s->rom); --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088863; cv=none; d=zohomail.com; s=zohoarc; b=ESVBN/X9GqCEHJO62vUGjflthr0Wa7MisDoIaxXnUaEqNTbEUSw258HI2P+4vGrWdMoZXhBuUykb+pKA/WloVhr2YGReUmaZeiwkjMbqFp22LZo3sf/0QG3CSXguU7p+6dSuFrbtfxgDRJ+gQNHDpQUEGnhlfo3rsV7bXIyygt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088863; 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=2vehCZK5/R8j3vUwTjtp8zDbHvkpCYWmHpHas3VXqzU=; b=YPOoPJZP9OnSCNg98LHCYNtix0OzSnD37xY7Z/bzPul7YnqzDdR0pCLvTstO/m46uyzmLDKgckShgYMNUG2RHpTgwwgLlBpo6dhr91wOL4C/EZ9KjLxrSQ87+qPYDm0geGw4BpwkMuVJJ3dW/9h23jYvU8AuMnoVK5ocZFsWfrE= 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 1773088863157721.0927810264315; Mon, 9 Mar 2026 13:41:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPA-0004fZ-IK; Mon, 09 Mar 2026 16:40:46 -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 1vzhP2-0004eO-0F for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:36 -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 1vzhOn-0007gx-4g for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:24 -0400 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-460-k4bYsTy9NTauN8cGL0eFcQ-1; Mon, 09 Mar 2026 16:40:19 -0400 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cd77502295so1349969585a.1 for ; Mon, 09 Mar 2026 13:40:19 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088820; 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=2vehCZK5/R8j3vUwTjtp8zDbHvkpCYWmHpHas3VXqzU=; b=Eg862//JHCI8ij4qm7aoyGx6SFJxPpNlxJb4uHtv69nkfVllGxoP6awWLYP/6LrUbgJh0Q 4qnoRYU8pOsN56KJcFmLHOBRyxr5yMeSLpd/o65cEXO705mZJ7CyfPCeJwVT9cvf3hRXMb L757mJW7/43r7H4E0J2HlX0GoQDaGhU= X-MC-Unique: k4bYsTy9NTauN8cGL0eFcQ-1 X-Mimecast-MFC-AGG-ID: k4bYsTy9NTauN8cGL0eFcQ_1773088819 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088818; x=1773693618; 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=2vehCZK5/R8j3vUwTjtp8zDbHvkpCYWmHpHas3VXqzU=; b=RtpZs8PwByC6R11h9AeFN7mPOO0Sz/KDpvu24mH3A9PuqBvn+68P7xrfJsOAHAAD05 tfgLk0s5lDuN7tKvNN/GS8/BchWDPYrHJK5cYGIgfU4cbEtJvnBaQIBDXBAwhv+rJHtZ mrb2MNwEzKWDMXO5Ggxj/xRYRdJI1nI5BFwxceeRP/TlI/MIXrrsB2O7R/6DCNNS7T4w mmnpdcqEaH8pdpjl3ZgCfRAYLc492Qrm17gtM5cuIxXcf+ocWLGIa+WUpPReG1TAB5yw F4ZfxXVQms2F2GLWxRCBVKcz7zq7Qk3QQRXHa5QkLdJzgOU4StMu1vK1JK7iJVYmA+MO zz2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088818; x=1773693618; 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=2vehCZK5/R8j3vUwTjtp8zDbHvkpCYWmHpHas3VXqzU=; b=tNzTwiMMnWnhEohe13n6bV3kmOJ4tPD12anNvaqrF55o846TZ/wHC93cN4r4k0uT9f fPaNyvMtfHKgH26K78wuV7r+hCho1rA5nrtDhbxt/rSFWGwyC7hlrQR3DDo/3OM2JIlo 4l3jFBgDJg3AyDkIn/ZQHYlQz8H3pRqJSwwHa91ZDjskiK7KuoPZ5fMLAVEwCTF3foyp r7yladpIwgqvNxLNCPGhqgX6klOgNNxHe+XmCkYDiZ3UUsS4KElyU8Zd4GXGqwCL0mpb Q+JVkIfvvSF3tLOzFntfYM+y40YFgy+qLnb6TrH0T9sDstDEw07fS+xDSfRKMAEC4DT+ OZCA== X-Gm-Message-State: AOJu0Yyhyt7CPvsk0ZNepZjNqTkGb4pfxIGIu2hbbpPGDY02bLEUoauU fEYFkItW2BTucA3y6TUND/elvtLXDSKmanRpA72WQduD6d0BQX0XYq2ZAfuCGfHzOhSYFjHBfcZ yZvQa2ZYOvBosQI6oWYsLXOwXRXzIA/ST/W8RqzkpV0u8RJyrj/dkgJhD+aiQix7AtiH9KwsZhf 87/iJj34J5zbi5M3Cy5tGsdFL8rSM8mszMOlVnKw== X-Gm-Gg: ATEYQzw+n5QvhOa8FcxLAnEObHoofItc3o82qcZ+R0JiAZSERfKx6nvwKbx6a8hG2j7 P6wBLiKkus7Luf7xMdwsuCwGJgook43rVpWmTg1zsnTA1y54/yGWKg7pRr1yvo9rXVuS2xh/7JO 7ARFeINOPYDWl3tWRwTEoiQ/KOMd0Gr3tIRC56PeA6UMRLTeh8LxxFK9zCE0P21+7kViCNBx9uk 5bZwad0HCenZRvmR2OYglBVd6bPglUPTNpZoQbr4pN80w4ealdQh2s/P+CpHVVgz4KUC1tRe/qr MScnDapBeGVulCz9sk0xx9IGlcK8l5z8+u0VqBJYLDZ1CuKZ8U8QMmid69wxBcnPND8nwVj9JRZ vKae2v4Ucn2jP6yYYzqd/0PXUuTbIgnzlnuRXJmVyqzlhO/bDdMepsG+4Wgwl+vwSTAQqlafU5h KfR64i6w== X-Received: by 2002:a05:620a:480c:b0:8ca:2baa:6658 with SMTP id af79cd13be357-8cd6d4f7dd7mr1570852285a.70.1773088818314; Mon, 09 Mar 2026 13:40:18 -0700 (PDT) X-Received: by 2002:a05:620a:480c:b0:8ca:2baa:6658 with SMTP id af79cd13be357-8cd6d4f7dd7mr1570847785a.70.1773088817649; Mon, 09 Mar 2026 13:40:17 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , BALATON Zoltan , Peter Maydell Subject: [PULL 02/18] memory: Remove memory_region_init_rom_nomigrate() Date: Mon, 9 Mar 2026 16:39:51 -0400 Message-ID: <20260309204007.1709441-3-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-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: 1773088864521158500 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan All users were converted so no longer needed. Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell Link: https://lore.kernel.org/r/2665c92b578f5f6a602b34c7dde73451773e6148.17= 72924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- docs/devel/memory.rst | 1 - .../memory-region-housekeeping.cocci | 28 ------------------- include/system/memory.h | 26 ----------------- system/memory.c | 19 ++----------- 4 files changed, 3 insertions(+), 71 deletions(-) diff --git a/docs/devel/memory.rst b/docs/devel/memory.rst index 8558f70a42..0bb5acab21 100644 --- a/docs/devel/memory.rst +++ b/docs/devel/memory.rst @@ -113,7 +113,6 @@ have a special case where you need to manage the migrat= ion of the backing memory yourself, you can call the functions: =20 - memory_region_init_ram_nomigrate() -- memory_region_init_rom_nomigrate() =20 which only initialize the MemoryRegion and leave handling migration to the caller. diff --git a/scripts/coccinelle/memory-region-housekeeping.cocci b/scripts/= coccinelle/memory-region-housekeeping.cocci index 7f89e9712e..e45703141a 100644 --- a/scripts/coccinelle/memory-region-housekeeping.cocci +++ b/scripts/coccinelle/memory-region-housekeeping.cocci @@ -16,17 +16,10 @@ expression E1, E2, E3, E4, E5; symbol true; @@ -( - memory_region_init_ram(E1, E2, E3, E4, E5); + memory_region_init_rom(E1, E2, E3, E4, E5); ... WHEN !=3D E1 - memory_region_set_readonly(E1, true); -| -- memory_region_init_ram_nomigrate(E1, E2, E3, E4, E5); -+ memory_region_init_rom_nomigrate(E1, E2, E3, E4, E5); - ... WHEN !=3D E1 -- memory_region_set_readonly(E1, true); -) =20 =20 @possible_memory_region_init_rom@ @@ -53,11 +46,7 @@ cocci.print_main("potential use of memory_region_init_ro= m*() in ", p) expression ROM, E1, E2, E3, E4; expression ALIAS, E5, E6, E7, E8; @@ -( memory_region_init_rom(ROM, E1, E2, E3, E4); -| - memory_region_init_rom_nomigrate(ROM, E1, E2, E3, E4); -) ... memory_region_init_alias(ALIAS, E5, E6, ROM, E7, E8); - memory_region_set_readonly(ALIAS, true); @@ -80,23 +69,6 @@ expression ERRP; ... -vmstate_register_ram_global(MR); @@ -expression MR; -expression NAME; -expression SIZE; -expression ERRP; -@@ --memory_region_init_rom_nomigrate(MR, NULL, NAME, SIZE, ERRP); -+memory_region_init_rom(MR, NULL, NAME, SIZE, ERRP); - ... --vmstate_register_ram_global(MR); -@@ -expression MR; -expression OPS; -expression OPAQUE; -expression NAME; -expression SIZE; -expression ERRP; -@@ typedef DeviceState; identifier device_fn, dev, obj; expression E1, E2, E3, E4, E5; diff --git a/include/system/memory.h b/include/system/memory.h index 0562af3136..7117699b10 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -1588,32 +1588,6 @@ void memory_region_init_alias(MemoryRegion *mr, hwaddr offset, uint64_t size); =20 -/** - * memory_region_init_rom_nomigrate: Initialize a ROM memory region. - * - * This has the same effect as calling memory_region_init_ram_nomigrate() - * and then marking the resulting region read-only with - * memory_region_set_readonly(). - * - * Note that this function does not do anything to cause the data in the - * RAM side of the memory region to be migrated; that is the responsibility - * of the caller. - * - * @mr: the #MemoryRegion to be initialized. - * @owner: the object that tracks the region's reference count - * @name: Region name, becomes part of RAMBlock name used in migration str= eam - * must be unique within any device - * @size: size of the region. - * @errp: pointer to Error*, to store an error if it happens. - * - * Return: true on success, else false setting @errp with error. - */ -bool memory_region_init_rom_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp); - /** * memory_region_init_iommu: Initialize a memory region of a custom type * that translates addresses diff --git a/system/memory.c b/system/memory.c index c51d0798a8..65042bd9fa 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1738,21 +1738,6 @@ void memory_region_init_alias(MemoryRegion *mr, mr->alias_offset =3D offset; } =20 -bool memory_region_init_rom_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp) -{ - if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, - size, 0, errp)) { - return false; - } - mr->readonly =3D true; - - return true; -} - void memory_region_init_iommu(void *_iommu_mr, size_t instance_size, const char *mrtypename, @@ -3757,9 +3742,11 @@ bool memory_region_init_rom(MemoryRegion *mr, { DeviceState *owner_dev; =20 - if (!memory_region_init_rom_nomigrate(mr, owner, name, size, errp)) { + if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, + size, 0, errp)) { return false; } + mr->readonly =3D true; /* This will assert if owner is neither NULL nor a DeviceState. * We only want the owner here for the purposes of defining a * unique name for migration. TODO: Ideally we should implement --=20 2.50.1 From nobody Sat Apr 11 21:30:22 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1773088929; cv=none; d=zohomail.com; s=zohoarc; b=WssTUXOOE6yEMoHGCz8Rrhg6Inj3WsX8YriapUttdRi+nvTgd8+BPwmIVB8hX7RxkmfZFm+jqGXw+JN2FYBDDO6JJ54964eWgzrtFLdyO814Cu4Vat/AgqG4bgsex4rzEISWW3ZRmEUXy9EPKWT1o26TtwpltTrWKlj+p2XOqrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088929; 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:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=judGREE7htOIbKSf0eAF2a0JvA1FKRJEdWDv/QQf948=; b=mzTiVHBuOR/6Nmgy3RNdAjiv7IN6O1zzDEFUxurYQ5vqBMqWLvJxusqe6aI0P3eq0Qrl8MMTktSKlQjCIVvy1YTBWRZWnZ79ji4yN/iJYQ0Q8ELnAnshgarmYvJlJ8JZyIXMHohslZrotq1xbreC6AsASheGWsvbFo3ETkzCfRc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773088929321758.6608918156834; Mon, 9 Mar 2026 13:42:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPD-0004hS-V4; Mon, 09 Mar 2026 16:40:47 -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 1vzhP2-0004eQ-3d for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:36 -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 1vzhOy-0007hE-Cw for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:35 -0400 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-623-ANAZO8sENiySqMKll8kp0A-1; Mon, 09 Mar 2026 16:40:21 -0400 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cd81be6f05so1021151885a.2 for ; Mon, 09 Mar 2026 13:40:21 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088822; 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=judGREE7htOIbKSf0eAF2a0JvA1FKRJEdWDv/QQf948=; b=L7DCnXD2SFrzwBeiXdT6aXX01JkTpMQgO9ffzm2ncuUcbeTovhSUEMjeuNZEPeKveChXFe ioAjeD/hhFMUsO6vI2ews0lM7XXFubtLJEJazQsXDKR0Il5uzD5nLQTo+ifDSmD7JO1CMF HzXlO1IbSuRcs+RRlReb/+we2gZDgu4= X-MC-Unique: ANAZO8sENiySqMKll8kp0A-1 X-Mimecast-MFC-AGG-ID: ANAZO8sENiySqMKll8kp0A_1773088820 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088820; x=1773693620; 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=judGREE7htOIbKSf0eAF2a0JvA1FKRJEdWDv/QQf948=; b=eBq0ntl2phPpX0w47kfcJHarKQT8+H3IBEMMI87OcI6GTlMnhOtE+BT9zwCXT8Ez9M J1+mDoZyUSTRvUGhGFv3zvs1fEmSEg/9O6ZQOlsp/FM2EtYdD3YJAxGS6iCXZk71MgZT X5/nMeCGEM5yzI1Z7xeRyk0j9WT72TktA4ML8gkY2J0JkDVUz7z+F1ABV9OwKKkd4otG guYVYjdpvP09I08RE5y+q3KdGTI/KzznvLvyelVf7e4tMeraeDHoYLFvJYZGCnHZ2EiL uDqOSjPXVfgIylbZh/CVkmZ79MroMdEP85cuS0s4qCOqftCNUQbFHFIShEoL1nlt8qyT TqqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088820; x=1773693620; 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=judGREE7htOIbKSf0eAF2a0JvA1FKRJEdWDv/QQf948=; b=S7HuN5dOkeGDGaweThC7JDcDgbz9WwHbpU/5CdDyGC/gXj4Vl/6LeKn4HZp9NzQzk7 6oywqKfXp0aTc2t9OObxTAi079L050CClUhL5tK0GW5X+6Kmcrnrs4gmD0Qpf3UVyHh5 lTcA5wEtIp47r9LBxkV/4ZXP+3kbugC2jZAQchL2hXE/xHPb08L7DCuzpqYF+S56xcsn 0mOZzA8iJgkiI0I/1FUtQAhawFNnQ9Yj8lqb8Dgw6fwBoYIpEf6XCfO9MZMKJC+qjX5q Risp+MEyltGIvZjOKcOkK25Bsr0xHBHMNQv2y+kKMSMfcFSi36PMRigb39mOtn2DaCuC eH+Q== X-Gm-Message-State: AOJu0Yx3/oVQH3NUOTjMOxTIIfgORG65RkjQ/o8q3ky0WSWO2Mk/4D9q wsfwEft/kwPm+ROcXptOR5UYTvORD5+F45rSdsYSZUTPTUcNwEn16/6ACWWZ03+VILSX4Xxc6mX mb9rzL1wCwzInPM2Hm2tMEK6CSfjWZQNBl4Nd8RVyLpHsf1GszFY+APaDCAMDUZLrFkNaznkEac YOcJ6GnVJCF/uELsVIpmfx59CTEjy52BndasZRCA== X-Gm-Gg: ATEYQzzhUr98gCxenLd0qG9BrMC9iQQEjC3VXuCk4Y4pVGtUBFz5Nu7l3Tp5jht5gOq +nsOSzLW2V4UGpJdFukmXKeHcqh1hOrC3Vdl5YBQKRR57N7HwLHXJsrW34MPcwtFkYkkpMcugrl 7Fu78OJ2r3qOZnwiujgQYJPSsXQf/CruBHhHi+ojJ01Oi+eBIYJwClJSJ/nKvLI33/NpiB3Zgx/ 2DUd2k6jHAEcjE0poUj/mdeIzjUeaki1lyr3cQ37qeW1eL3/LJqEzMrfOQrsqNM0nHzUrbmiHS2 kDaQhFdjPnLqSxmChRq0nLzXwNCcK9Tx0cMuyqXxQYfbbNcuUQqhyZGt0wAXWmEf+8vCXWRpcpP RRjF/rljm1AJvgqWYJI8pdA1A3uohVqy3SwIVN4ZjsdVSFW1XdOYx6exRorBBP6+6b+O1zAeskR /TUnT5nA== X-Received: by 2002:a05:620a:bc1:b0:8c7:1119:2994 with SMTP id af79cd13be357-8cd6d4d51f6mr1573346085a.64.1773088819914; Mon, 09 Mar 2026 13:40:19 -0700 (PDT) X-Received: by 2002:a05:620a:bc1:b0:8c7:1119:2994 with SMTP id af79cd13be357-8cd6d4d51f6mr1573342085a.64.1773088819361; Mon, 09 Mar 2026 13:40:19 -0700 (PDT) To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , BALATON Zoltan , Peter Maydell , Akihiko Odaki Subject: [PULL 03/18] sun4m, sun4u, tcx: Do not use memory_region_init_ram_nomigrate() Date: Mon, 9 Mar 2026 16:39:52 -0400 Message-ID: <20260309204007.1709441-4-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-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_H4=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: , Reply-to: Peter Xu From: Peter Xu via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZM-MESSAGEID: 1773088931298158500 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan Convert to use memory_region_init_{ram,rom} instead. This breaks migration but these machines have no migration compatibility guarantee and this removes most remaining usages of this nomigrate variant. Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell Reviewed-by: Akihiko Odaki Link: https://lore.kernel.org/r/1d0f04534af14598f5c6b8c6922e3f10d8bb18cf.17= 72924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- hw/display/tcx.c | 3 +-- hw/sparc/sun4m.c | 19 +++++-------------- hw/sparc64/sun4u.c | 10 +++------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 16114b9bb8..c8a4ac21ca 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -815,9 +815,8 @@ static void tcx_realizefn(DeviceState *dev, Error **err= p) uint8_t *vram_base; char *fcode_filename; =20 - memory_region_init_ram_nomigrate(&s->vram_mem, OBJECT(s), "tcx.vram", + memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram", s->vram_size * (1 + 4 + 4), &error_fatal); - vmstate_register_ram_global(&s->vram_mem); memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA); vram_base =3D memory_region_get_ram_ptr(&s->vram_mem); =20 diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index a17bdb3692..47853e3f76 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -587,13 +587,10 @@ static void idreg_realize(DeviceState *ds, Error **er= rp) IDRegState *s =3D MACIO_ID_REGISTER(ds); SysBusDevice *dev =3D SYS_BUS_DEVICE(ds); =20 - if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.idre= g", - sizeof(idreg_data), errp)) { + if (!memory_region_init_rom(&s->mem, OBJECT(ds), "sun4m.idreg", + sizeof(idreg_data), errp)) { return; } - - vmstate_register_ram_global(&s->mem); - memory_region_set_readonly(&s->mem, true); sysbus_init_mmio(dev, &s->mem); } =20 @@ -638,12 +635,9 @@ static void afx_realize(DeviceState *ds, Error **errp) AFXState *s =3D TCX_AFX(ds); SysBusDevice *dev =3D SYS_BUS_DEVICE(ds); =20 - if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.afx", - 4, errp)) { + if (!memory_region_init_ram(&s->mem, OBJECT(ds), "sun4m.afx", 4, errp)= ) { return; } - - vmstate_register_ram_global(&s->mem); sysbus_init_mmio(dev, &s->mem); } =20 @@ -719,13 +713,10 @@ static void prom_realize(DeviceState *ds, Error **err= p) PROMState *s =3D OPENPROM(ds); SysBusDevice *dev =3D SYS_BUS_DEVICE(ds); =20 - if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4m.pro= m", - PROM_SIZE_MAX, errp)) { + if (!memory_region_init_rom(&s->prom, OBJECT(ds), "sun4m.prom", + PROM_SIZE_MAX, errp)) { return; } - - vmstate_register_ram_global(&s->prom); - memory_region_set_readonly(&s->prom, true); sysbus_init_mmio(dev, &s->prom); } =20 diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index b8bda1eb81..2e41785b78 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -455,13 +455,10 @@ static void prom_realize(DeviceState *ds, Error **err= p) PROMState *s =3D OPENPROM(ds); SysBusDevice *dev =3D SYS_BUS_DEVICE(ds); =20 - if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4u.pro= m", - PROM_SIZE_MAX, errp)) { + if (!memory_region_init_rom(&s->prom, OBJECT(ds), "sun4u.prom", + PROM_SIZE_MAX, errp)) { return; } - - vmstate_register_ram_global(&s->prom); - memory_region_set_readonly(&s->prom, true); sysbus_init_mmio(dev, &s->prom); } =20 @@ -498,9 +495,8 @@ static void ram_realize(DeviceState *dev, Error **errp) RamDevice *d =3D SUN4U_RAM(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 - memory_region_init_ram_nomigrate(&d->ram, OBJECT(d), "sun4u.ram", d->s= ize, + memory_region_init_ram(&d->ram, OBJECT(d), "sun4u.ram", d->size, &error_fatal); - vmstate_register_ram_global(&d->ram); sysbus_init_mmio(sbd, &d->ram); } =20 --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088904; cv=none; d=zohomail.com; s=zohoarc; b=ag/PrLWihbF1KZka7WjZpzoFbL2zjchhdnVe1t+GJG6Pu2YFs/PDZy9A/AfK1RBe4K6MVx9W+Jf+6a0Se2V1fAsYcWc3kHBIUcVZzTvgA/qVjqQglXe7LGIEoNHfPsb/dSsFezxbPSWYvX71OJfDPMaVQF8kHXzSKOxgzjqszag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088904; 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=xVcTYkmlJ7eP8vLspcRNlyG6cYCjZqhjMZSUsJqQKq0=; b=QvVU1Ty/Y6xEqUJcBMZLmW6mE4qqWY4vSAKByjsGNdgbXVjG/wRCgsuiuwn8PeJAiy533nlBkm8T/kk8f8A+G7nAU3Off+F40F3QFOTlDXB6Jw+Oa2RB7PykoCG5hnVFZGmeYsMVtiXhmYWpiQzKN0RhIPSrukALyBDIv5sFn/w= 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 1773088904190208.6451992963489; Mon, 9 Mar 2026 13:41:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPH-0004kk-Sg; Mon, 09 Mar 2026 16:40:51 -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 1vzhP7-0004fe-MX for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:42 -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 1vzhP1-0007hY-Pq for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:38 -0400 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-169-K361aXYdOLuLkwNUqnRomA-1; Mon, 09 Mar 2026 16:40:22 -0400 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cd85e08fddso1373514185a.1 for ; Mon, 09 Mar 2026 13:40:22 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088824; 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=xVcTYkmlJ7eP8vLspcRNlyG6cYCjZqhjMZSUsJqQKq0=; b=F/wDUFCAuvpxEcvc6ZWxhWVb43cMUIjqErja4vdGCmuSbA8uhAwQFVRgZHR2S6tMNb7Qwz iZG+D0m0HgjtIbSkSM7d+BBKtSmuowXY82Hq8+IsBQcVwmgiDuBozaLaM6BiOK19hRzr7y hROwFMyTBNtHUf4Yn6TgaQYmI7ECiiU= X-MC-Unique: K361aXYdOLuLkwNUqnRomA-1 X-Mimecast-MFC-AGG-ID: K361aXYdOLuLkwNUqnRomA_1773088822 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088822; x=1773693622; 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=xVcTYkmlJ7eP8vLspcRNlyG6cYCjZqhjMZSUsJqQKq0=; b=hSHX0PQBL57fQpRN3l4+8G+U9psnsw1tcV55jh2iHSco5MGOem1yFs/E/HM09iXEfs l4lYKfxuqfOIZI+jUYVmde1N00h0/EKkgzXdlusijDqcqKpux87PcGCaEXHoUe6AMdb6 stPr5suhql4uek/jxAPLK3/pWKoD6BJYlgdV+CDEFkdGnBy3AHC4mxVn5WGuoag23KAG HKlAe/QXPWEB772XC1TMBvpGRKCN2kfR0ALqy8anxK8P/UPYE/FyDhXd+iLuv4KOpTRW lGjf7iTPH4bpNI3sQ+5edZiFbEH7/o9IcF5kfIDqc5eslBI/hTisbdtCCkrFIihxNMdu lYVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088822; x=1773693622; 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=xVcTYkmlJ7eP8vLspcRNlyG6cYCjZqhjMZSUsJqQKq0=; b=RkXwLeQzyp0DEZKnELQtpxu+44RmyBuggajK8huAFhWJFXfeQLCApOlqgZEV9sPc7p 2aRACdrb3hqZmjK8Nki/V6MV9FIkcUGFKBtWd+ZWP9V2le0fq+K4kMzOVyR1LRFIW+U+ 0RozihvXWra2jE6PxO8mORFc3F/x0SLFL1/0RZxL+PaZWPjroVGEWbyD9l/7oDi+H0F9 D70I+Vdw60YmJxgnNP+um0HMv+FwQkuAlz4MFoXl5Qe4WmdCJWi6lEa21WvWpilpXvD7 zDBYemzm6UmBbYNrBKFhjwLoeaL3kOgE3v0u94R2TzxU7fCdrLtEUWs+/Ft+dOvItcz5 GGmA== X-Gm-Message-State: AOJu0YwphJmHe4K4sSd5UYR9VAiJTgsdt0AOmlzzuViBI1TGn2HCW7lV RTWxUwHiCxOK3W0D9sUngJdA5wKKDPlqZI5lrOOgbYF7hOylH/UJb4OSz6w8+9ezB3lF5jLUHXK RMQsIQLATxb+8S1tJUsPrAP2fPO/pW5CcBok/9qQnid5ZDnb+R0Lh4EIo/KxNj8GIZ/1rD4okux fnjYIGqrlgshmoS3to2XkmbWhXfews6Ks/tYO49Q== X-Gm-Gg: ATEYQzywUBM8UlxPjh6EUNZl2NjYCTrMOrMQu0CfzCNzcxyezJTDqjHxYJpxuXZ9Gom ij5m9dkO9Hfh+zJH4uyglgHJtpdXsvKXkzY0wGvYWYx6oTGrBhevMY8tZoW8Cdm4+2WoG32g4z+ O4TV7+4XIry07hb6xuNjBZF4YtpI0n4cnmo8+ojeMGHhGHjtqjOE9MMKptM01dTjnEM/2h4tzXJ 8298+TegawX7YbwQatxghh/r3eqYnihFg5mrAu2/msV3rdctyRKSRgQ5tK9obQU3v5ZKFJvIiUx K6e355htGUAspgByvhMA0147oNImUXHzzGYCjAYhPnHBm0V5Shc95hLkI83xAI08WDT8Ikszgm6 bIFRVrSxD/mFw5VUrvrmRczBRRO6wewNI4RTVL5o0jKQX0Lt7nGql4BB7BHBHLlhQNOGLuZXOtr RZNlZsHw== X-Received: by 2002:a05:620a:3943:b0:8c9:f996:81f5 with SMTP id af79cd13be357-8cd6d3ecd1cmr1672440585a.3.1773088821861; Mon, 09 Mar 2026 13:40:21 -0700 (PDT) X-Received: by 2002:a05:620a:3943:b0:8c9:f996:81f5 with SMTP id af79cd13be357-8cd6d3ecd1cmr1672436085a.3.1773088821345; Mon, 09 Mar 2026 13:40:21 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , BALATON Zoltan , Peter Maydell , Akihiko Odaki Subject: [PULL 04/18] hw/xtensa/xtfpga: Do not use memory_region_init_ram_nomigrate() Date: Mon, 9 Mar 2026 16:39:53 -0400 Message-ID: <20260309204007.1709441-5-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-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_H4=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: 1773088907391158500 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan Convert to use memory_region_init_ram() instead. This breaks migration but the machines using this device have no migration compatibility guarantee. Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell Reviewed-by: Akihiko Odaki Link: https://lore.kernel.org/r/0a57625ac909c2b005302b9136920cb917427a8b.17= 72924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- hw/xtensa/xtfpga.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index d427d68e50..ed24720f94 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -50,7 +50,6 @@ #include "xtensa_memory.h" #include "hw/xtensa/mx_pic.h" #include "exec/cpu-common.h" -#include "migration/vmstate.h" =20 typedef struct XtfpgaFlashDesc { hwaddr base; @@ -163,9 +162,8 @@ static void xtfpga_net_init(MemoryRegion *address_space, sysbus_mmio_get_region(s, 1)); =20 ram =3D g_malloc(sizeof(*ram)); - memory_region_init_ram_nomigrate(ram, OBJECT(s), "open_eth.ram", 16 * = KiB, + memory_region_init_ram(ram, OBJECT(s), "open_eth.ram", 16 * KiB, &error_fatal); - vmstate_register_ram_global(ram); memory_region_add_subregion(address_space, buffers, ram); } =20 --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088924; cv=none; d=zohomail.com; s=zohoarc; b=Kmky/6OAIudP7MLxwOLAi+LZpaO8WkoNrc0AQE6fu5RE1MpF1DcJJmL/3loK4xhr1Gp0GmRMvlFOvykIKmWefXno6ZTWr3mDFKNgPxj/VJZkbAGX69RZTM2GiESUQhA5zvitTw+mdEW2R1g+HnM6MNixsQb3cOw+5nQ6q06uPJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088924; 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=I/ptOc9JgQFyYATJ+GXdVFz1EZ/RN/UI8fL0fT+Qc04=; b=dvBSAjGU21jyrkCoIa9TtdP8wv6XPMC/1CKVFA2mDnYsz+H90oWhttib4fnpeZrJKYHnqLe3SDPCh0jzw10KAy1DZveshP8jCLyQ1UxVc7+r3yIz84vnqEVzIbhhaZkTZ9REBmhnKP9wVzHStQjcSQA3Y/SxxCTpeQVS2Rvq+gg= 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 1773088924239398.2678671438953; Mon, 9 Mar 2026 13:42:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPE-0004hs-IK; Mon, 09 Mar 2026 16:40:48 -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 1vzhP3-0004f7-Tl for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:38 -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 1vzhP0-0007hc-66 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:37 -0400 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-349-wQrir5jTNP-2CPuJ5AJbcw-1; Mon, 09 Mar 2026 16:40:24 -0400 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cd767c51efso305166885a.2 for ; Mon, 09 Mar 2026 13:40:24 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088825; 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=I/ptOc9JgQFyYATJ+GXdVFz1EZ/RN/UI8fL0fT+Qc04=; b=NyKc/QoUunBFdgFjRI2TKys5u65ezkkS44SjcqxGbAKFuTuJgbU3P0VZQemKhVDjQALuMy x4Er78IDldB5hDmm3a/G/OwPXki5ANV1RHb9uFJyn4LezzAXrVbv/L3L7zW6xJ3ao6IEQn E2K8OBYnvtg0u58X9Y0c14MGtDeF4rM= X-MC-Unique: wQrir5jTNP-2CPuJ5AJbcw-1 X-Mimecast-MFC-AGG-ID: wQrir5jTNP-2CPuJ5AJbcw_1773088824 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088823; x=1773693623; 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=I/ptOc9JgQFyYATJ+GXdVFz1EZ/RN/UI8fL0fT+Qc04=; b=oTbX8t4P1kX3gcNz6zC9RchNZ6T7ruhn+RZxoMtUvvxAzcUp3pcmCJdqGHs6L5ocD7 rFiyCmVtE3LWExWQbFCsYbo5q+8a0QKPfUER9g4n6recRupj0q0oNIvk5Sf5kvP9OrkT CZhz65lN4d50DDODt+1biFTeZRTOdFqxuFYP6zNIXlDObOULcqyfSz2g8emhW1EI6lEd wnsugYx1FQncUPqYOPnMbNwII0/UQh+lqTrU/+wJP0ayCPygX+2Fu2AOX2HihrEdUvCB UXJa+q0Q+GzOi1tD0/7hU/hbVyKEYsh83XEinNIXS6db/9LZKQGAN4dUtRWzyJ+iRyp5 pBaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088823; x=1773693623; 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=I/ptOc9JgQFyYATJ+GXdVFz1EZ/RN/UI8fL0fT+Qc04=; b=JjmXg0fvAeDeAdwvPzEwySP7+g5tk3EtklZbkQsjyxni9uQYRrpGy2MuW6JTOaR8sO KaDUSzjvyKuVU1nj938nKTkItQfgiE6uIK2nkLh8JIJ0A2BdQeIG03u7z2r11q9KgawC UXkV/1gKXqLs+XSaPeLw6ysiddPBPiNL2if4fDUX3am2QwMfgdCYHgN+y7UNaUtRVwJG kd1pk5B+22LIZfZkh7mFrj7vYQ+/S19qIHvlwWZtOJj9WFJ8C4JAbTFSv9fk8ubiQnfP /Jmg5XEjJZCn0Bet+ldoCspGNAa0bLDzrn/lgD+FiqSJwh7VL3TNgOt8iETQLHrR2Q8x sqdQ== X-Gm-Message-State: AOJu0YxhRgq+4XmzpNNUif1rJFBpi/XtDsyldI8Cq8t5OyeVaNYpEDNg KM3GKBDS4+rMU2WirPzbtA8lYqM4A8gWxruMiyUAcz+bMT497ODyEm2qPh2UMSjWcQHKElYhED/ HVvf/VQ+D8xouOg9wCEbZx9pLIfrGB49xRM9S7OA8Q1Tvwuj9x/KWT9tjf2RgdgCTJdqDUXsHpv YANBhyGshURgE20caHulbPQU+bysQbwkycKi8BoQ== X-Gm-Gg: ATEYQzzQFKsoZ1DGz5rrwA5JKgRSOXyMgJXZGuMTXKLlJUAza/sKmwdaTheBTV0W1Uu 7CkAN5Nd+ApUkcj1nHMgthWkR0BjOmhxAKF86nlZamCMFe3LnzOfgc7mozGueilIkUgcRzbNnut zF4kIHNVvPDfIOOf0WbDQnGnCGfpfcj2K/gCSSJHRd4Mz/VkAkoIX3KArQzAQ6xTmhsqm4nG5MK 4LTOIEMKIUpxSahsKLQAul0XS1xcftw0VSMHya5SmeXX6mkOAKqjH6QRdoBB21bi/6qXnyVI1+2 sEp0bxls9J1zYfHqLIsyIZI4s/CTHX/JPtYXIlPiL6bRyxzwc3MAH2EaO22M0tluzxDXcGwILa9 cMbBe73VB+qxsAGnTb9p6/hZ5NbTMzJl6kwIlK2+e1qkUd1YrfJsJjHqp8uUTQ69EbUstj9vsoO vQ7NJO2Q== X-Received: by 2002:a05:620a:8782:b0:8cd:7c98:87c2 with SMTP id af79cd13be357-8cd7c988bc0mr649007485a.60.1773088822896; Mon, 09 Mar 2026 13:40:22 -0700 (PDT) X-Received: by 2002:a05:620a:8782:b0:8cd:7c98:87c2 with SMTP id af79cd13be357-8cd7c988bc0mr649004585a.60.1773088822264; Mon, 09 Mar 2026 13:40:22 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , BALATON Zoltan , Akihiko Odaki Subject: [PULL 05/18] memory: Remove memory_region_init_ram_nomigrate() Date: Mon, 9 Mar 2026 16:39:54 -0400 Message-ID: <20260309204007.1709441-6-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-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_H4=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: 1773088926482154100 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan Convert the last remaining use outside of memory.c in vga to use memory_region_init_ram_flags_nomigrate() instead and inline and remove the memory_region_init_ram_nomigrate() variant. This leaves memory_region_init_ram_flags_nomigrate() as the only nomigrate variant that is still needed at a few places. Signed-off-by: BALATON Zoltan Reviewed-by: Akihiko Odaki Link: https://lore.kernel.org/r/d913d0694b792bc3aed3fbb432e63d00c556de39.17= 72924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- docs/devel/memory.rst | 8 +++---- .../memory-region-housekeeping.cocci | 19 --------------- include/system/memory.h | 23 ------------------- hw/display/vga.c | 4 ++-- system/memory.c | 13 ++--------- 5 files changed, 7 insertions(+), 60 deletions(-) diff --git a/docs/devel/memory.rst b/docs/devel/memory.rst index 0bb5acab21..9083b18f08 100644 --- a/docs/devel/memory.rst +++ b/docs/devel/memory.rst @@ -110,11 +110,9 @@ migrated: =20 For most devices and boards this is the correct thing. If you have a special case where you need to manage the migration of -the backing memory yourself, you can call the functions: - -- memory_region_init_ram_nomigrate() - -which only initialize the MemoryRegion and leave handling +the backing memory yourself, you can call the function +memory_region_init_ram_flags_nomigrate() +which only initializes the MemoryRegion and leaves handling migration to the caller. =20 The functions: diff --git a/scripts/coccinelle/memory-region-housekeeping.cocci b/scripts/= coccinelle/memory-region-housekeeping.cocci index e45703141a..b23647a3d8 100644 --- a/scripts/coccinelle/memory-region-housekeeping.cocci +++ b/scripts/coccinelle/memory-region-housekeeping.cocci @@ -26,15 +26,9 @@ symbol true; expression E1, E2, E3, E4, E5; position p; @@ -( memory_region_init_ram@p(E1, E2, E3, E4, E5); ... memory_region_set_readonly(E1, true); -| - memory_region_init_ram_nomigrate@p(E1, E2, E3, E4, E5); - ... - memory_region_set_readonly(E1, true); -) @script:python@ p << possible_memory_region_init_rom.p; @@ @@ -52,23 +46,10 @@ expression ALIAS, E5, E6, E7, E8; - memory_region_set_readonly(ALIAS, true); =20 =20 -// Replace by-hand memory_region_init_ram_nomigrate/vmstate_register_ram -// code sequences with use of the new memory_region_init_ram function. -// Similarly for the _rom and _rom_device functions. // We don't try to replace sequences with a non-NULL owner, because // there are none in the tree that can be automatically converted // (and only a handful that can be manually converted). @@ -expression MR; -expression NAME; -expression SIZE; -expression ERRP; -@@ --memory_region_init_ram_nomigrate(MR, NULL, NAME, SIZE, ERRP); -+memory_region_init_ram(MR, NULL, NAME, SIZE, ERRP); - ... --vmstate_register_ram_global(MR); -@@ typedef DeviceState; identifier device_fn, dev, obj; expression E1, E2, E3, E4, E5; diff --git a/include/system/memory.h b/include/system/memory.h index 7117699b10..d4793a08a7 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -1374,29 +1374,6 @@ void memory_region_init_io(MemoryRegion *mr, const char *name, uint64_t size); =20 -/** - * memory_region_init_ram_nomigrate: Initialize RAM memory region. Acces= ses - * into the region will modify memory - * directly. - * - * @mr: the #MemoryRegion to be initialized. - * @owner: the object that tracks the region's reference count - * @name: Region name, becomes part of RAMBlock name used in migration str= eam - * must be unique within any device - * @size: size of the region. - * @errp: pointer to Error*, to store an error if it happens. - * - * Note that this function does not do anything to cause the data in the - * RAM memory region to be migrated; that is the responsibility of the cal= ler. - * - * Return: true on success, else false setting @errp with error. - */ -bool memory_region_init_ram_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp); - /** * memory_region_init_ram_flags_nomigrate: Initialize RAM memory region. * Accesses into the region will diff --git a/hw/display/vga.c b/hw/display/vga.c index 59a65cbbff..ee7d97b5c2 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2235,8 +2235,8 @@ bool vga_common_init(VGACommonState *s, Object *obj, = Error **errp) return false; } =20 - memory_region_init_ram_nomigrate(&s->vram, obj, "vga.vram", s->vram_si= ze, - &local_err); + memory_region_init_ram_flags_nomigrate(&s->vram, obj, "vga.vram", + s->vram_size, 0, &local_err); if (local_err) { error_propagate(errp, local_err); return false; diff --git a/system/memory.c b/system/memory.c index 65042bd9fa..e15f931a8a 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1579,16 +1579,6 @@ void memory_region_init_io(MemoryRegion *mr, memory_region_set_ops(mr, ops, opaque); } =20 -bool memory_region_init_ram_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp) -{ - return memory_region_init_ram_flags_nomigrate(mr, owner, name, - size, 0, errp); -} - bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, Object *owner, const char *name, @@ -3695,7 +3685,8 @@ bool memory_region_init_ram(MemoryRegion *mr, { DeviceState *owner_dev; =20 - if (!memory_region_init_ram_nomigrate(mr, owner, name, size, errp)) { + if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, + size, 0, errp)) { return false; } /* This will assert if owner is neither NULL nor a DeviceState. --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088923; cv=none; d=zohomail.com; s=zohoarc; b=bornqMlWLH6vvPZANGjEkS1/UnE/6iB6KfJZ5iFeLSxnkc95BKDLo4qBefC3dA33MyYJxJLh0dA79E+3HgkSNwsvywi8x3PjlVTxbAbSKrfyqjjeD7KuI2gc8Z1iqqKO7//81L+7MNh2pzJ4RVaLiJsJA5BC9PW5ZqsswxuSs/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088923; 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=PCSsJ5q4fk9kF9TJZO2z5mERilkapSPpUsI49F3EOfg=; b=oD15LRaocXsrMvf/QCvnfywK2CdzCtaOCmkcn6p2NN/kBPZ3kfRop1laiQZXMXR1027RZ0etuYM3zrQ4qmw3ftJfWh1KAkXiVcRLWxvfbvJmvh+vJ0+HcDr56jNrak4TY8FY8FDDW/uu7xtmD/TrwkVn3jeks06QxMkJU5Uc+yE= 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 177308892381197.06465446517689; Mon, 9 Mar 2026 13:42:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPF-0004iJ-1p; Mon, 09 Mar 2026 16:40:49 -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 1vzhP7-0004fb-Hy for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:42 -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 1vzhP1-0007hg-Na for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:38 -0400 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-3J5_IFIMO5mCn4qwGqO9QQ-1; Mon, 09 Mar 2026 16:40:25 -0400 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cd81506677so979574285a.1 for ; Mon, 09 Mar 2026 13:40:25 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088826; 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=PCSsJ5q4fk9kF9TJZO2z5mERilkapSPpUsI49F3EOfg=; b=h3p7fjnt3zDRmNWXpJeGNVmK1+m3dXlVhJtQU8jkd3HZglK3aJVqxILh2at808hwqqW8mW VNVqbKM90a27ZESdwp6vUdRQG6GYZxB3OAHvDZl4k5o/ajJ75/jjmWDCWVc3dhsock3ErJ 7EBf39loxHoV+Jih5p1OhT+bA7+lRts= X-MC-Unique: 3J5_IFIMO5mCn4qwGqO9QQ-1 X-Mimecast-MFC-AGG-ID: 3J5_IFIMO5mCn4qwGqO9QQ_1773088825 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088824; x=1773693624; 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=PCSsJ5q4fk9kF9TJZO2z5mERilkapSPpUsI49F3EOfg=; b=pTKg5P8fhgAqB991pq2EmWx2w5yrTFcEdWssSJmwGoGUrGSlLW1GO4P7OK9dp2GzZ/ bAUOq6bTeT/0W9tRVUet/4clHAHEmMFCLmEr5YGZi6Ii4keNvpjGP+3/fQqCzHBowxAG k3bNRSs9mSDWF4jQGp302/G1BHTiZ5zGO9QamclYAqROAtob+zjHyD38FGfblW4uY0Wm nCfL9+1EJ2+GNC6gLwYFqwxIPI7xSdkQyKcIUE32yHWB9uHLerkG2X8FvWZdeI9UjuLw QECIln73KBDMkdjj+Dk1KPWZEE6YdEg7JO1h0bApSbNUZRH6tMGmNN3vZwtnnCoz+X0h sg5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088824; x=1773693624; 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=PCSsJ5q4fk9kF9TJZO2z5mERilkapSPpUsI49F3EOfg=; b=eucaJXPaiQVmvCGh8xPoZ8ArYbydrUj4FbV2J03FI39FgJdxr15OeaKhC/Q7xDGmpK WpVyp+Qevb3U4KplGrgNu0B6EI1lFyBWhbcD/8mSVCTCyo+df+k2pPJ24gsrZ80OvT+i RKEI62L+oR+LE3ILQ3czpIODERRCTBLZDlZOU0Z2Lp3h1Fr6iSeTFMgHmbczquMGrk0N rb6yGKbsnGkNuwu3nZ6CIRvmVR0V4IzYJEXSDflyJUoga+jv5NEX/4u0hKMBFFetITDY uQ2qOlG6tnHgWgEd9jt9mNROGYlv/VunomZJhV0RS8W33uQoVotvlNB9Kdt+sHNgvH/E qFZQ== X-Gm-Message-State: AOJu0Yx1EhV8xyA0VNYSDbLpOd7DFC6sRqQtl3ZTCM2HY0obZEkUR4ZI 3Zonr6dgof4VWdj6seSr0Pur/FR49OAiRhWT4G3Paza0+Gj1KulZeG5bXopdKCwQR9VHS4UjPZe IqsWpnb8TyAymTgYxxj/CncU4jLkfucc12Imk93WPiv1HxoUMapxF7ek1RGC4IOIJ/wbZKRH1eo uMov/5BmBHP/e3EaAhKVI3Fhf2HazoiSb03vgE1g== X-Gm-Gg: ATEYQzz4TjR28XvaBDl1ucAaTCzotkfqUvA0a1KQy5OBw8dE9FckeV13AwMeGuPR4b7 hjJAvbuVVtx8Y7nK209LLu1Al9U2aM0LjZV0uDN9ZlFeZ4NXPaNULe1O3dwRLrAOrluDkeb2qVF eVm9hBc9JVfsSuvc8DdKrY/c3dSEPPpEoOt7uJFpQw7lDOxax7BuoqqGB4Df5fBH/6I9NzUy4n/ 4aMBgEl9OA5h1YQd+DTyn/vzDZYG2M+MGwgQtqTLWXU2GKn+ttdcAaWqQEwyBtdp+t6XaMVkiOh T4h5fUxLLnDnhbo5OlJDBeglHxJcXqZy2lUMyuC7/Bxvbqf5Fx/9Nz7jhEEA+8+UMEZ28O9zwMm n4wmKDYeKsxUgC/YXr8kBbe3NTcqFUNfXE8c1ucwVpLimd51/2dKoznWa9rgOlg+8bXIQ/ps41l dxsRAfUw== X-Received: by 2002:a05:620a:4008:b0:8cd:8142:b7d3 with SMTP id af79cd13be357-8cd8142c613mr814604785a.72.1773088824032; Mon, 09 Mar 2026 13:40:24 -0700 (PDT) X-Received: by 2002:a05:620a:4008:b0:8cd:8142:b7d3 with SMTP id af79cd13be357-8cd8142c613mr814599585a.72.1773088823432; Mon, 09 Mar 2026 13:40:23 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , BALATON Zoltan , Akihiko Odaki Subject: [PULL 06/18] memory: Shorten memory_region_init_ram_device_ptr and memory_region_init_rom_device Date: Mon, 9 Mar 2026 16:39:55 -0400 Message-ID: <20260309204007.1709441-7-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-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_H4=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: 1773088924428158501 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan We can reuse memory_region_init_io in these functions. Signed-off-by: BALATON Zoltan Reviewed-by: Akihiko Odaki Link: https://lore.kernel.org/r/79ff00abd2eb5c304f1f00664c94784e1269d984.17= 72924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- system/memory.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/system/memory.c b/system/memory.c index e15f931a8a..13d4e3314b 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1705,10 +1705,9 @@ void memory_region_init_ram_device_ptr(MemoryRegion = *mr, uint64_t size, void *ptr) { - memory_region_init(mr, owner, name, size); + 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_ops(mr, &ram_device_mem_ops, mr); mr->destructor =3D memory_region_destructor_ram; =20 /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ @@ -3762,8 +3761,7 @@ bool memory_region_init_rom_device(MemoryRegion *mr, Error *err =3D NULL; =20 assert(ops); - memory_region_init(mr, owner, name, size); - memory_region_set_ops(mr, ops, opaque); + memory_region_init_io(mr, owner, ops, opaque, name, size); mr->rom_device =3D true; mr->destructor =3D memory_region_destructor_ram; mr->ram_block =3D qemu_ram_alloc(size, 0, mr, &err); --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088946; cv=none; d=zohomail.com; s=zohoarc; b=VdSbBY4DMMzHLBf+MO/YetxqW7nYTKDn9nCCxDt6hgxva1QWlQ8ei14TgP5EL9B9fsnlD5t/MA+gdyPbYkuTXdm0FQtMlu4anSY1CxXqR780N8JLL9yI+/0SyMalKFcWjO41UM63BChNvou0eG3eAvxB3cg1Shl/eYPAl1LPhtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088946; 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=g4Vs0ZPen7aMfB8K8UbHiZRosOKI+EWKjN8E+7wSbK8=; b=HV8JB/Su3TVR0VyVtGPkP5QfxgvziEUEG3dzG8Dj1JZxLh22G9zoMPXfWlejp47M4eBTYOQTHHbKZ/r5EAWzv+joipyH8FOTDp9QKVy10EwKBzhhEYC5PVT04qEwLF1UyIPkQDcnjXGMDaL0FXc5miowz6tL3gL/mnZA4e9k4m4= 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 1773088946157889.571014658004; Mon, 9 Mar 2026 13:42:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPI-0004l3-U3; Mon, 09 Mar 2026 16:40:52 -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 1vzhP7-0004fg-N6 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:42 -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 1vzhP1-0007hp-Mc for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:39 -0400 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-lxvhADGkOzW9SUCAeXYDtg-1; Mon, 09 Mar 2026 16:40:26 -0400 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cd7fec8d44so931585985a.2 for ; Mon, 09 Mar 2026 13:40:26 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088827; 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=g4Vs0ZPen7aMfB8K8UbHiZRosOKI+EWKjN8E+7wSbK8=; b=Mp0GaK0tGLOcOrer8NZRj4Y/Fv19FaqGB16XUtrtWQqPk9CmtckFPCAhkPUkVFArWDaS/i LWsxNYZ2yEHWSRJg7ap3J7p3mWPS+5Gt9Hmb+cLZ8OxaVgRkxkvVIeWYPYymCoSyD4NYtA f+KC4L9SZQVN4aJmdrVguLZsAxvdjdY= X-MC-Unique: lxvhADGkOzW9SUCAeXYDtg-1 X-Mimecast-MFC-AGG-ID: lxvhADGkOzW9SUCAeXYDtg_1773088826 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088825; x=1773693625; 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=g4Vs0ZPen7aMfB8K8UbHiZRosOKI+EWKjN8E+7wSbK8=; b=F0xY3kzALrh2cyrHTxcRF0yggbvBdJY87hIDDjuABClNQca0o0YU8VtccrNfNfM/np im7KkB429AO+/E+BXpNCJgOx1ibYJUEGctax0myNojX01Nt4PlO8Br0s3Ai2JYjG+0AD x+W9gZy0F9Y452y4yJFsIlvycY2NuVMS3vB8Zp6fv9xnyEM5uNr3tAYSUW9GonhiSjHS ZnS06Z816ayCpH7haVTsJmHvk8bZADHCiMZfBfXIOTRctpH2GWso43WVZ5ZcFD3XVmR5 GlB4Zwu/vsrrkGccClozTKU70UWScz37LHjIsBoWE3+aXw59L+pikwDtB4GuWMSf7Lij 8wbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088825; x=1773693625; 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=g4Vs0ZPen7aMfB8K8UbHiZRosOKI+EWKjN8E+7wSbK8=; b=goWqJa/soJbcp8dLpjLORf6MRWrSlzCyQf6qzxXvlfpC+KKHNgnmHjcqHwtfk914wy /6k+WylwGI1JFkCAzs0GOWxaMlDJRuGlH2xain+qCY0HqSTRstnD3cdyp3wvlBctvey+ GFT/zP1yJCyLto37smHB2SMbbuVm2k4abm9izCucuReQrzhz09AjEBXkahxiycMEwrIO BhiE8b+8zecLIORdDHq7lDZxDJd8oA82D3w48sOxYnOuLHUYSB+fZpM4B45f7encPMAX 4mZQA5phEWCRV//MhnuCViXIwIkWrLwECCW/P4WBdx96UBGqOL7wiE/W5sdGt6EV0ZhK pjEQ== X-Gm-Message-State: AOJu0Yz31XY/ANKj6fTfhse3zN67hSGOz7ZL05LZ0SdvjC9VaN62eR6V WQ1lVU7TIJWBHFN8l2J3VX4tj5wRPSg9dc+cFEiRVVv9htL+Erz/hhgipmbbghSEPcfUr2mRML0 nbXzmp73+i3NQHtLFPmqqnpkkW+ooEQB++F4nh4f+amNcgyHCsfwHDdhwXoHCJpgaT4CPan64Wx PzEeVsQbFm7JrBATLSZ7XhON0n5oD+uc1VgfZ5dQ== X-Gm-Gg: ATEYQzyY6c0Qk8YLbebO8SsE0ixC3os/3HmntI6uwMID2R/xFFqn3zWusnS27rCCDCI 4AKsbQOgRzhPaCGgUOtavPqAdQwNevVEXoEABNgsuMat5XlhF9CitCPGgFBHCg1y92TDPwoIgxU mWhiaPlib9kAY3tJQ9cEfXkCzgb5k8QV5aZ5XlfHuZMsLV8AuIImTp9louA7VNvOVr222ENtdaT PhNL1jsL/EBM4j/kp4ehP9XBNbe6LiBUcXU4PYdEC+MEU+r91N/4nczrQMM+4z2QeRu0SfAxyMR w6fGbS6XYbz2q/0yAreAubY514JxmKs4hw0VTzlNk+bwaCoflGMMiMCu6WE/NDg9N+H01luwmyI KPd3kqBt2FKJWPBzcrXRWjoXk4/PK0qgAaoIH8tDrKLvXtMKFEHI0OcxLWQ02VfV5zkxyNEWZ09 UEnDS+VQ== X-Received: by 2002:a05:620a:4001:b0:8cd:933f:d909 with SMTP id af79cd13be357-8cd933fdca5mr180896685a.64.1773088825163; Mon, 09 Mar 2026 13:40:25 -0700 (PDT) X-Received: by 2002:a05:620a:4001:b0:8cd:933f:d909 with SMTP id af79cd13be357-8cd933fdca5mr180892285a.64.1773088824613; Mon, 09 Mar 2026 13:40:24 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PULL 07/18] memory: Add internal memory_region_register_ram function Date: Mon, 9 Mar 2026 16:39:56 -0400 Message-ID: <20260309204007.1709441-8-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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_H4=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: 1773088948584158500 From: BALATON Zoltan Factor out common operation from memory_region_init_{ram,rom} functions to register the region for migration. This avoids duplicating the long comment in several functions. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Akihiko Odaki Link: https://lore.kernel.org/r/1f0bcb38e59456aa910376df6a375d63c2f3f442.17= 72924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- system/memory.c | 80 ++++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 57 deletions(-) diff --git a/system/memory.c b/system/memory.c index 13d4e3314b..9a12224555 100644 --- a/system/memory.c +++ b/system/memory.c @@ -3676,18 +3676,10 @@ void mtree_info(bool flatview, bool dispatch_tree, = bool owner, bool disabled) } } =20 -bool memory_region_init_ram(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp) +static void memory_region_register_ram(MemoryRegion *mr, Object *owner) { DeviceState *owner_dev; =20 - if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, - size, 0, errp)) { - return false; - } /* This will assert if owner is neither NULL nor a DeviceState. * We only want the owner here for the purposes of defining a * unique name for migration. TODO: Ideally we should implement @@ -3696,68 +3688,50 @@ bool memory_region_init_ram(MemoryRegion *mr, */ owner_dev =3D DEVICE(owner); vmstate_register_ram(mr, owner_dev); +} =20 +bool memory_region_init_ram(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, + Error **errp) +{ + if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, size, 0, + errp)) { + return false; + } + memory_region_register_ram(mr, owner); return true; } =20 -bool memory_region_init_ram_guest_memfd(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, +bool memory_region_init_ram_guest_memfd(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, Error **errp) { - DeviceState *owner_dev; - if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, size, RAM_GUEST_MEMFD, errp)) { return false; } - /* This will assert if owner is neither NULL nor a DeviceState. - * We only want the owner here for the purposes of defining a - * unique name for migration. TODO: Ideally we should implement - * a naming scheme for Objects which are not DeviceStates, in - * which case we can relax this restriction. - */ - owner_dev =3D DEVICE(owner); - vmstate_register_ram(mr, owner_dev); - + memory_region_register_ram(mr, owner); return true; } =20 -bool memory_region_init_rom(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, +bool memory_region_init_rom(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, Error **errp) { - DeviceState *owner_dev; - - if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, - size, 0, errp)) { + if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, size, 0, + errp)) { return false; } mr->readonly =3D true; - /* This will assert if owner is neither NULL nor a DeviceState. - * We only want the owner here for the purposes of defining a - * unique name for migration. TODO: Ideally we should implement - * a naming scheme for Objects which are not DeviceStates, in - * which case we can relax this restriction. - */ - owner_dev =3D DEVICE(owner); - vmstate_register_ram(mr, owner_dev); - + memory_region_register_ram(mr, owner); return true; } =20 -bool memory_region_init_rom_device(MemoryRegion *mr, - Object *owner, - const MemoryRegionOps *ops, - void *opaque, - const char *name, - uint64_t size, +bool memory_region_init_rom_device(MemoryRegion *mr, Object *owner, + const MemoryRegionOps *ops, void *opaqu= e, + const char *name, uint64_t size, Error **errp) { - DeviceState *owner_dev; Error *err =3D NULL; =20 assert(ops); @@ -3771,15 +3745,7 @@ bool memory_region_init_rom_device(MemoryRegion *mr, error_propagate(errp, err); return false; } - /* This will assert if owner is neither NULL nor a DeviceState. - * We only want the owner here for the purposes of defining a - * unique name for migration. TODO: Ideally we should implement - * a naming scheme for Objects which are not DeviceStates, in - * which case we can relax this restriction. - */ - owner_dev =3D DEVICE(owner); - vmstate_register_ram(mr, owner_dev); - + memory_region_register_ram(mr, owner); return true; } =20 --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088915; cv=none; d=zohomail.com; s=zohoarc; b=DEvR+AC06wVt3Tx8NqxM1RVWCoNx8HPmKhp3YNMG5/8dWpx5px8m28wQX6neKHFvMxb6orJUY0lrKyvgZRTTe1/wouvDOApGi4iOrl677vmmO9SlwIdnEEZLffK6gXlDNWkkh+p5PtAVA0GoH4FSDl4OTHHhykMjQ28oCjsNgt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088915; 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=n6yzzY9kJRmx2RhAp5ydNbm/6HISn+r/lJ0rKal3hJQ=; b=JEz26MGbXuWPCMILhtEaQu91mxoBjxCvUErqvz73m5AtYIzSns7mT/oIb9SSHsRb3SBy+iknCw33eZxN6B2t/27OK8rIpxlXyjlc5EMT1RZz2Z8K8JkMVFLzpdBUJULf5PgoFFd1nNCkZS5EVvDVQNXgDkbGfOdqe1nzM0xGEQY= 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 1773088915608843.9904813841067; Mon, 9 Mar 2026 13:41:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPM-0004nF-Vu; Mon, 09 Mar 2026 16:40:57 -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 1vzhP7-0004fc-IY for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:42 -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 1vzhP1-0007hz-MF for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:39 -0400 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-135-fkRR8UCBPK-iCodWbliuGg-1; Mon, 09 Mar 2026 16:40:28 -0400 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cd900cd3a7so387300785a.0 for ; Mon, 09 Mar 2026 13:40:28 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088829; 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=n6yzzY9kJRmx2RhAp5ydNbm/6HISn+r/lJ0rKal3hJQ=; b=G11z/amccIm/xWuU5N+iiBZawwdhZe040DBI+78M0MVpaF6wU2muCQ5hnjVpy9cGIB9gcu DFNR8yM2knm1lRrVlgrAbxO8sMxG5uMxj6+u2FiWRP6tOS36xydPWBbPpVJ11I7AoEFtLY 6UJrb8fM42cPodB+IBgliva044vfvVo= X-MC-Unique: fkRR8UCBPK-iCodWbliuGg-1 X-Mimecast-MFC-AGG-ID: fkRR8UCBPK-iCodWbliuGg_1773088827 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088827; x=1773693627; 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=n6yzzY9kJRmx2RhAp5ydNbm/6HISn+r/lJ0rKal3hJQ=; b=HOkV3J55z6jopYjuByqqIh6XEiR0tByFqqWAmgr9yfhqyyYtSv5xUpPkgPjsG/ppW1 Tyd0gaqDZgXFd25a745I+cdOl72ZBWLbw+hz53LpiyOzTAL4VGEv3YtYkyc+59WE/FQz 6e4GPS0hAB+AXzSHaBJehBcq0DjNHQIgDmn7VQzFSxKtqMRJC3RY2dT71ZyMS77rifV5 JBhbcgUr6syOeh1/1kZ4J7E3+uOLMQWYktZjn34yCsufA++KXFjjHfdKdhhkXcr9bl+l l89ijRBEVG/yM+dNpm3D9jFKxY2yyUQXa8m8LMFcKzmRsDufMJ4rqks7+O3l4KEl6PdA gKcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088827; x=1773693627; 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=n6yzzY9kJRmx2RhAp5ydNbm/6HISn+r/lJ0rKal3hJQ=; b=kn78D6p8mLAiuMrP7LJB4VEVRupgMk6m3Zhg4Ri7ROuXhoB+lUp2KSQuM4bWEqKtuS a+5FEiWOk26YjuT3Fqstv3YnTgWeZL3zUeu4n0AsXnIpNLJkDCyv0SQ7/Qax/2S/wKCx k9JXuUAfA83FzIQ+SD3tq3KfGFO3EOG0BBrl4c7Z2gPHob2v8yJgpafb7Hrtu6+1YLsi KECEqylqNkPnxrvGBovo9L535QHavTlngzdDkJf+Z761WQnrjqoEaYzCvcInRRYXXJSl fHxCxJB/FPTRhZGv02znEUnr/OUcHvz6C5Y9jNrsE1mUIl6rz3+usp1gCy2VpXMxvDbP LMwg== X-Gm-Message-State: AOJu0YzKXBM20KNMYhZR0gT7YCBX1YKrP8ztdVkQwO7Qh30Sxp3bt2e/ RGHqr9NfcMTwQX/zSgGxKuajrCORdN4+0vgpxgeMylU9twtSvyB2tv7S4NPbL0U3tmjW5+CQ1kE p1mTd/bCYhMUYVQk8HTIHFtdEkHNsrm1znpsVWRRVkV+oEO77Q+qIIbLkQoMZbiFd1s8Vfy7U61 GvAZO7uWXamEodvxDZzHiInz9BlEE8d6OwavLvBw== X-Gm-Gg: ATEYQzyntWHitZOUvFuPvJJ6jSFH4ADQ0SW9zRoBcf1ePLEaPvgt2u8Vy6VPCM7CLcw bZ+TbB1RHXeyG6yTlBNl+SWZesK9M6b5Z4XpN9Kzti4mZranXeFb0COEYWwLKvmvCEqJ6TbjKEa gjTau/kYG6jTJGOZoCN7cTqpCU6108cOAHm1w/5TldlTTx3ITDVsva0teJqy6dUElnDLTf24UAa 3UrvNBw6yhJvf4Q70INBc7Z1kR0zK0bxsyzkRftvanuxhlvvDU++13CB38mmcsLDyeYPfyN82Jj CAY+BZKWTlO2mS/k8ez9DB5hFEZzkgcZZfvoqwkdYnAxteW0Mtsxt1cj+kU7pw5s5WAyt9Gx9Hz gbw4SL9JPU2zZc3eSCmOi/LL/dEQ/DRQ2/iW8MZo0qoFebDOl07m6n0gD/2e2TGvqxd0x5QFbw0 gpFCHfMA== X-Received: by 2002:a05:620a:25c7:b0:8b2:e986:2707 with SMTP id af79cd13be357-8cd6d44161amr1628776385a.45.1773088827094; Mon, 09 Mar 2026 13:40:27 -0700 (PDT) X-Received: by 2002:a05:620a:25c7:b0:8b2:e986:2707 with SMTP id af79cd13be357-8cd6d44161amr1628771385a.45.1773088826352; Mon, 09 Mar 2026 13:40:26 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , BALATON Zoltan , Akihiko Odaki Subject: [PULL 08/18] memory: Factor out common ram region initialization Date: Mon, 9 Mar 2026 16:39:57 -0400 Message-ID: <20260309204007.1709441-9-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-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_H4=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: 1773088919059154100 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan Introduce internal helper function to remove duplicated code from different memory_region_init_*ram functions. Remove local err and error_propagate and pass errp and check return value instead. Also shorten some function prototypes while at it. Signed-off-by: BALATON Zoltan Reviewed-by: Akihiko Odaki Link: https://lore.kernel.org/r/d6db01c283149b46023ffeb9c5b368c67f6acc8d.17= 72924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- system/memory.c | 167 ++++++++++++++++++------------------------------ 1 file changed, 61 insertions(+), 106 deletions(-) diff --git a/system/memory.c b/system/memory.c index 9a12224555..2cda814bd6 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1568,39 +1568,39 @@ static void memory_region_set_ops(MemoryRegion *mr, mr->terminates =3D true; } =20 -void memory_region_init_io(MemoryRegion *mr, - Object *owner, - const MemoryRegionOps *ops, - void *opaque, - const char *name, - uint64_t size) +void memory_region_init_io(MemoryRegion *mr, Object *owner, + const MemoryRegionOps *ops, void *opaque, + const char *name, uint64_t size) { memory_region_init(mr, owner, name, size); memory_region_set_ops(mr, ops, opaque); } =20 -bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - uint32_t ram_flags, - Error **errp) +static bool memory_region_set_ram_block(MemoryRegion *mr, RAMBlock *rb) { - Error *err =3D NULL; - memory_region_init(mr, owner, name, size); mr->ram =3D true; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc(size, ram_flags, mr, &err); - if (err) { + mr->ram_block =3D rb; + if (!rb) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); - error_propagate(errp, err); return false; } return true; } =20 +bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, Object *owne= r, + const char *name, uint64_t siz= e, + uint32_t ram_flags, Error **er= rp) +{ + RAMBlock *rb; + + memory_region_init(mr, owner, name, size); + rb =3D qemu_ram_alloc(size, ram_flags, mr, errp); + return memory_region_set_ram_block(mr, rb); +} + bool memory_region_init_resizeable_ram(MemoryRegion *mr, Object *owner, const char *name, @@ -1611,116 +1611,74 @@ bool memory_region_init_resizeable_ram(MemoryRegio= n *mr, void *host), Error **errp) { - Error *err =3D NULL; + RAMBlock *rb; + memory_region_init(mr, owner, name, size); - mr->ram =3D true; - mr->terminates =3D true; - mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc_resizeable(size, max_size, resized, - mr, &err); - if (err) { - mr->size =3D int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - return false; - } - return true; + rb =3D qemu_ram_alloc_resizeable(size, max_size, resized, mr, errp); + return memory_region_set_ram_block(mr, rb); } =20 #if defined(CONFIG_POSIX) && !defined(EMSCRIPTEN) -bool memory_region_init_ram_from_file(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - uint64_t align, - uint32_t ram_flags, - const char *path, - ram_addr_t offset, +bool memory_region_init_ram_from_file(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, + uint64_t align, uint32_t ram_flags, + const char *path, ram_addr_t offset, Error **errp) { - Error *err =3D NULL; + RAMBlock *rb; + memory_region_init(mr, owner, name, size); - mr->ram =3D true; mr->readonly =3D !!(ram_flags & RAM_READONLY); - mr->terminates =3D true; - mr->destructor =3D memory_region_destructor_ram; mr->align =3D align; - mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, - offset, &err); - if (err) { - mr->size =3D int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - return false; - } - return true; + rb =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, offset, err= p); + return memory_region_set_ram_block(mr, rb); } =20 -bool memory_region_init_ram_from_fd(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - uint32_t ram_flags, - int fd, - ram_addr_t offset, - Error **errp) +bool memory_region_init_ram_from_fd(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, + uint32_t ram_flags, int fd, + ram_addr_t offset, Error **errp) { - Error *err =3D NULL; + RAMBlock *rb; + memory_region_init(mr, owner, name, size); - mr->ram =3D true; mr->readonly =3D !!(ram_flags & RAM_READONLY); - mr->terminates =3D true; - mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc_from_fd(size, size, NULL, mr, ram_fla= gs, fd, - offset, false, &err); - if (err) { - mr->size =3D int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - return false; - } - return true; + rb =3D qemu_ram_alloc_from_fd(size, size, NULL, mr, ram_flags, fd, off= set, + false, errp); + return memory_region_set_ram_block(mr, rb); } #endif =20 -void memory_region_init_ram_ptr(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, +void memory_region_init_ram_ptr(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, void *ptr) { - memory_region_init(mr, owner, name, size); - mr->ram =3D true; - mr->terminates =3D true; - mr->destructor =3D memory_region_destructor_ram; + RAMBlock *rb; =20 + memory_region_init(mr, owner, name, size); /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ assert(ptr !=3D NULL); - mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); + rb =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); + memory_region_set_ram_block(mr, rb); } =20 -void memory_region_init_ram_device_ptr(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, +void memory_region_init_ram_device_ptr(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, void *ptr) { + RAMBlock *rb; + memory_region_init_io(mr, owner, &ram_device_mem_ops, mr, name, size); - mr->ram =3D true; mr->ram_device =3D true; - mr->destructor =3D memory_region_destructor_ram; - /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ assert(ptr !=3D NULL); - mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); + rb =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); + memory_region_set_ram_block(mr, rb); } =20 -void memory_region_init_alias(MemoryRegion *mr, - Object *owner, - const char *name, - MemoryRegion *orig, - hwaddr offset, - uint64_t size) +void memory_region_init_alias(MemoryRegion *mr, Object *owner, + const char *name, MemoryRegion *orig, + hwaddr offset, uint64_t size) { memory_region_init(mr, owner, name, size); mr->alias =3D orig; @@ -3732,21 +3690,18 @@ bool memory_region_init_rom_device(MemoryRegion *mr= , Object *owner, const char *name, uint64_t size, Error **errp) { - Error *err =3D NULL; + RAMBlock *rb; =20 assert(ops); memory_region_init_io(mr, owner, ops, opaque, name, size); - mr->rom_device =3D true; - mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc(size, 0, mr, &err); - if (err) { - mr->size =3D int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - return false; + 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; } - memory_region_register_ram(mr, owner); - return true; + return false; } =20 /* --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088896; cv=none; d=zohomail.com; s=zohoarc; b=dZ8Nghb//TwRXSBM6aQ9HBLnCpJZ7+Zu7Ew6cALvwl7Ogc6YNXhmxeL1GG7agYHLm8BNSFJatjuvoIKxOApAKthEGccX2i86azmJXcqwJbW3e9EbhtTHvbJzdHwVVXjTqWY34Y9feEmUIVhnC28+TWBuvWLh9ubCgjizPJ3cT+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088896; 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=8Ln9f0V7PnAMgCBfotMt4QR41AJsGNe4HewJnIjGquU=; b=im4L/TKAQClSZHkoEFV4AMKXEDUvBeFO0GJO8WID6ScO48oVF87SMcCOZEKO76XaoTKqLoZjGI/7drGbe+wsIH7SiYsUjpJoI6qgHTxfKfSzZNKDGjCKvkr3smm/yZ3XXy1B8lF3a+o2RbJNmglCR+5IOzGLuav/QiJpa2RVJfg= 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 1773088896854646.5271440227204; Mon, 9 Mar 2026 13:41:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPJ-0004lG-3U; Mon, 09 Mar 2026 16:40:53 -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 1vzhP3-0004f6-NX for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:38 -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 1vzhP1-0007iA-NG for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:37 -0400 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-534-8OXwUvfDMhe3ml7v5tVXNg-1; Mon, 09 Mar 2026 16:40:29 -0400 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-506a07740bdso27727631cf.2 for ; Mon, 09 Mar 2026 13:40:29 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088831; 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=8Ln9f0V7PnAMgCBfotMt4QR41AJsGNe4HewJnIjGquU=; b=DBLL66lkETp/K5hXyxXmRx5E86Ptllgoa/Uv7NDt36sKLQ7AawSr8a6bCgdT1NZazOu8cz cND13h5AiaFS53alfaB52PQFGi4ssuNpjloFcxtYZBaITTzTl7RuIJoSJ14403iC4WeKF/ bClwsFF4hNcQY8qpuQzbWGaYcmzJXKw= X-MC-Unique: 8OXwUvfDMhe3ml7v5tVXNg-1 X-Mimecast-MFC-AGG-ID: 8OXwUvfDMhe3ml7v5tVXNg_1773088829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088829; x=1773693629; 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=8Ln9f0V7PnAMgCBfotMt4QR41AJsGNe4HewJnIjGquU=; b=GLaNfjHe7pJjxX8Ri7c4DtbaBdIK3oRiKe1L7oXSj7gom1pT4HYMMJyU+AnZSi3LnQ PQIYV3JEZP2EJZenjmPisezwqbSne/rWoXMnuCW8chF287YIVn74XzFHMZymQN8/T/K/ /V9mdgUw+Gs5uUzEgQqLlELcsdbGmFB7dshUtO2SwjVIXlZn5GeV4YiZCwQ+yhCPP5Ol kjdKePbDKGdn6Nh59vVNFtmFnlX6MDUi6eP62ot2RDgDMM4Lrfs7uSZ9fwjsXhvFsue+ 5v+K5os+HZMHgeJ43FW8wradBWreq0k+L737s/dLT5jUmltdpdpPn3Cps3H7g0Oc4rdq 0yRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088829; x=1773693629; 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=8Ln9f0V7PnAMgCBfotMt4QR41AJsGNe4HewJnIjGquU=; b=GNkL2eJe3FrjHRg+asQoNTo/HnHXjM/L2Zh60T11hXoe9NIQlEb7zI5WyyIaJSG4eC e2Dzfaqf9MD3eu3spxKyzhHuQOFRR9GgoxkCycllDvKJlntHPqN/l4NxBFUQFA9jLHeo vjDNObk6JCrmxoI2AkEuNWrhnqyaaf2Jn00exV0FQsy4xkHRntXu2/2c2Rnt+Sy6FiXk lKEsLUJjMnrgJmF/TeUqYbudWT5DILhUAi+qDtvwnFJkiEqti000NlCO5G2CWUdtalkk qiDD8LpvvmaoWZ0gqq1NDC6CYmpScnQFrQ5h8W0dpxa6+cDayM5ev/inLAwHcQFMjtT6 IFrw== X-Gm-Message-State: AOJu0Yynz/+5Z4FWgsJqk0A6Lx46uxtmQ0IDZh61ybosLd2xq91ZIUxT 6oWWJ07WR+H3yhROi1v6VI3d2rs3vCBfWg+KM0YkvHDfQZkUbb1QzH5SdcALnB4Uqc8eNGwIKZX /k6YO+01Cxh+HhB+ooVEK0XHw7ji8vJdK2Bc24dvVsgDtkRXYb3VsSL54GEkt8FB9wdi3gHqBTo Vlm8RmKa/Kj8Hn+U1tsCact2rFF5jnyoQkW1rgkw== X-Gm-Gg: ATEYQzwLT2AcYzdT+btYmDg5qUd1YCXj+jBuZqVanIqhAOZPmX1TuF8qcCkXPjd7hVP 1Vgsaj/C+yws/vqKvfUyOMPSoOc0quxFUgqvQV9kw95WNKIeRGKJykR8gEWfpjg3sbsT80LnimH opqDLg465AESjn48LhVEtpiHyVnE8/+VharG8ImD5UBcdXGtn72QgoJYROf/9Ufx7kWZZ0XJXVU 0y81rq+hf+WYkRF2p4F7EkdktzpJuaIzAG8nklRKc6ggp0UF571oaEMx1d1Ds28oS/jJyZQ9QxU I8uehhEap2gtw/PiL7vvSo2AN70H7qedleOcqxh4x/d+xOc3L9JuJzbv/xAC02ByaQrFJajleGn qZnrZD6wHE3UTERmvNIk9gSusC+M+XuE6NrZjN5ecfhuEYxmgOvNtbEvaNwTLn6D4ikiG9Y9wMa dItaP0Rg== X-Received: by 2002:a05:620a:904b:b0:8cd:7ba1:ad with SMTP id af79cd13be357-8cd7ba10695mr715239485a.63.1773088828870; Mon, 09 Mar 2026 13:40:28 -0700 (PDT) X-Received: by 2002:a05:620a:904b:b0:8cd:7ba1:ad with SMTP id af79cd13be357-8cd7ba10695mr715235785a.63.1773088828164; Mon, 09 Mar 2026 13:40:28 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , BALATON Zoltan Subject: [PULL 09/18] memory: Factor out common ram ptr initialization Date: Mon, 9 Mar 2026 16:39:58 -0400 Message-ID: <20260309204007.1709441-10-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-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: 1773088898483158500 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan Introduce internal helper function to remove duplicated code from different memory_region_init_ram_*ptr functions. Signed-off-by: BALATON Zoltan Link: https://lore.kernel.org/r/7c5a31fc2202e6927437ed57cb9ce08a224f2a50.17= 72924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- system/memory.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/system/memory.c b/system/memory.c index 2cda814bd6..f1db72eb42 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1649,31 +1649,30 @@ bool memory_region_init_ram_from_fd(MemoryRegion *m= r, Object *owner, } #endif =20 +static void memory_region_set_ram_ptr(MemoryRegion *mr, uint64_t size, + void *ptr) +{ + /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ + assert(ptr !=3D NULL); + RAMBlock *rb =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); + memory_region_set_ram_block(mr, rb); +} + void memory_region_init_ram_ptr(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, void *ptr) { - RAMBlock *rb; - memory_region_init(mr, owner, name, size); - /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ - assert(ptr !=3D NULL); - rb =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); - memory_region_set_ram_block(mr, rb); + memory_region_set_ram_ptr(mr, size, ptr); } =20 void memory_region_init_ram_device_ptr(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, void *ptr) { - RAMBlock *rb; - memory_region_init_io(mr, owner, &ram_device_mem_ops, mr, name, size); mr->ram_device =3D true; - /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ - assert(ptr !=3D NULL); - rb =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); - memory_region_set_ram_block(mr, rb); + memory_region_set_ram_ptr(mr, size, ptr); } =20 void memory_region_init_alias(MemoryRegion *mr, Object *owner, --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088945; cv=none; d=zohomail.com; s=zohoarc; b=FvITrNvTR99RaYNoEp9dZdXum4Nt8KsWkz1GkPxf3IuYe6J0HndvW+BF5RHuU5xhMs0phJUsUQCrEsYVrj5c6RNWO5bwL3zyVaFL/dESp5tw5GUKvlwjOn1u0kUZS8wNj6mvJaLmEEUtHTI6GUke+z3OZES5MynvsIyslBuU9BI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088945; 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=lc9q3aVwHdDuElq9fQQTf1eGS3mbbryM4KP1sxagD+M=; b=PnnLBn3mLQd97J0OSOcWg4UpHBv0pqlIv2uI0PS30Yn/WmDGEDcDNy5WLAOh2Ihn4X09oOCL9EZcvbHbFSYFIawCzJS6nqwsEdz2z1n3BYSmMBHAaeRLyWZTeNshBMXV6+axXrPR+AvTx+yQoD06z/cyNnfGqHiJu/ZZCChS5SA= 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 1773088945721538.4862419936089; Mon, 9 Mar 2026 13:42:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPH-0004jx-8k; Mon, 09 Mar 2026 16:40:51 -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 1vzhP7-0004fa-Il for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:42 -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 1vzhP1-0007it-Pq for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:38 -0400 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-340-Ye0saBMCMOqgczQqodNR0g-1; Mon, 09 Mar 2026 16:40:31 -0400 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cd7fc27cf7so1033395885a.1 for ; Mon, 09 Mar 2026 13:40:31 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088832; 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=lc9q3aVwHdDuElq9fQQTf1eGS3mbbryM4KP1sxagD+M=; b=OR1Eup6IbplgqKNmi9akUTq7x9aZpEvvS0/bDzkbkeFsQEFiRoCShjqBqrMzGj1G6Y39aG 5VmdYelA8pDAftcBHOyYmO9oagxcbvNTQ8jr/DUu/8oibo/zRi0Kg6hc705Yi9Z5b0XXvl AnZJyqFOv17PFQXelYa2wPQ9W0idyLw= X-MC-Unique: Ye0saBMCMOqgczQqodNR0g-1 X-Mimecast-MFC-AGG-ID: Ye0saBMCMOqgczQqodNR0g_1773088831 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088831; x=1773693631; 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=lc9q3aVwHdDuElq9fQQTf1eGS3mbbryM4KP1sxagD+M=; b=g/fe4wlMGxpVH1oQLlZnJtWrdAOGOVyhyTFsLqJskjZX91n/P9MrPKWVUSxBH+zOiJ Y+pSC/E8jRcNO5gv/LzISGK+AiUSkD9415TlZ4iYaGtl1WMJgssyz2sUTpUrDT4djug2 GDRTA5Ekld3KuWpzjv92/MiDEvqDIDQL8yJAZ87zBRsCP8xRAu+myYuoVfeEWzt7479m xPM4v0Tc9envDag4G9qxpjDTX98Z4rKdaE3focs+xlOUyNh8cXZU+qfTCMHr0ZIpr+0u VI1sjFMl99ipFFz8xclHmr9P4phlaFVqb1Ajhebg0QmwkujmCwFLMUqlWInKQ1y65l8U oOvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088831; x=1773693631; 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=lc9q3aVwHdDuElq9fQQTf1eGS3mbbryM4KP1sxagD+M=; b=YwbvWU2ioNlrPL5ZOH8G5H7gZL2A2Cnx91CsQO9O0IotGBQ3SOTlHY9B/22U9uBNwY elWKSOAs9vmPgtxItUui8GLcrpgOhxrkdOPo5NNLXsEMnjLv1X2MKEcdcS7Y8U/RDLnL wXbhbPxQCa86ngyR0FRTRkUIW0ooANuiL4+PRy4byv8PuYeLiwGs1E0xH8LwmuJ/TWWP v6xBIef136Jr9Yp/cTykCrNm5T2jXiy4IcwmB8b2rU0AD7I9PsuaD4kFHw74fEy3OR/9 SFEjxlUtqSqCdojVDcvRQl0B3gtttdu1n8NIv5bYZg4aLFqzarL9ZrQ+OC27VL/tzKLU 8UhQ== X-Gm-Message-State: AOJu0YzEv99oE47scpiq1UiEf0zH9bMjO+5o86R60xWaSPofPQIXWiY/ 8QPAxQ0zJpavFZu2QLSd+F/FQbuYcAhHWudiVX+aknoF8bDym5POIz5XNy4f94tPP2onnQJ2w4G fhjyvIgUxF+nfxiT8oV8seCU/LbeePgzTzD6WVKLI2HUs0LsU80KCqAhJqtQbc0gpMYK+sg2fHg Ki5vL0+wqnKhMBaAH0PTuiP3g0E4VQBHmaAXJ7AQ== X-Gm-Gg: ATEYQzzdHjwfR8IZTs0z5e02b4Yh6V4AY2tAy69Rg1cM0kJwNxhSt7M5yQz/LhmVojr B+GvjVxFLITXhXr6BM4gRZS3ZlY4/1tk1MuKK8gqaGkDAMVxP9o9TsG3FkxKQgpYLqO8bwB4bK1 xuNgn3SLtahG5hxgIT/Y84Dk27yNDhSVKJKcpTQ2EZBgbT4pe304zFr6ye+F/qXB747yu3AMvTl ehjZUqUyD242GWaxqEoJgh6O5cLnQiP1oA7meKjPodcxcI/XwwrYkZAZ5LN8LMprCzLmddSTKsD XpWVbu1BgIgibkMC/f806hq8eJTLxLOQgJA0ATsgQyKfE7djJDCMQchE6NsvVqFSWWbgoigmJN2 1MmibFcGoLayeN7YUmZ1WqF5TMVkb3HtBeE9DIKlN8+6YdmQviYOqGmHZS5pFGZZqwoYs9KN3jX vgazPEtQ== X-Received: by 2002:a05:620a:319f:b0:8ca:4444:26e8 with SMTP id af79cd13be357-8cd6d47bf86mr1425229885a.63.1773088830775; Mon, 09 Mar 2026 13:40:30 -0700 (PDT) X-Received: by 2002:a05:620a:319f:b0:8ca:4444:26e8 with SMTP id af79cd13be357-8cd6d47bf86mr1425226385a.63.1773088830234; Mon, 09 Mar 2026 13:40:30 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 10/18] system/rba: use DIV_ROUND_UP Date: Mon, 9 Mar 2026 16:39:59 -0400 Message-ID: <20260309204007.1709441-11-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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: 1773088946546158500 From: Marc-Andr=C3=A9 Lureau Mostly for readability. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Peter Xu Link: https://lore.kernel.org/r/20260226140001.3622334-2-marcandre.lureau@r= edhat.com Signed-off-by: Peter Xu --- system/ram-block-attributes.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/ram-block-attributes.c b/system/ram-block-attributes.c index fb7c5c2746..9f72a6b354 100644 --- a/system/ram-block-attributes.c +++ b/system/ram-block-attributes.c @@ -401,8 +401,7 @@ RamBlockAttributes *ram_block_attributes_create(RAMBloc= k *ram_block) object_unref(OBJECT(attr)); return NULL; } - attr->bitmap_size =3D - ROUND_UP(int128_get64(mr->size), block_size) / block_size; + attr->bitmap_size =3D DIV_ROUND_UP(int128_get64(mr->size), block_size); attr->bitmap =3D bitmap_new(attr->bitmap_size); =20 return attr; --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088951; cv=none; d=zohomail.com; s=zohoarc; b=FurHa2qs8YXHtunymf5kcrT/e3RVYQJZmwauT278xk9KULDLR2stvG43Kx0gRilOAnuE4ecjtS3h0CNRlVl1TF31MtxtlPIitTIjAcvtzy0+uoirJa8ajP2XSCm+4VeKPXvF7KBtcUu2xe1wZHFwmm/QOg5wnQqpTs4p3LV+Uok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088951; 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=IKLe9iiWMkSZNOnyjvHZMWwPo4cDtCVEG53p9Vctsgk=; b=loAGaFjpI6QGvA+s83VL0gfc0UD0I1BTSR185ikPrMy8keAXvjqEDhKj4aLg0mdm3YY6PCctfR6dCiFuyXYOhNTRZjZoYMCOYm6Nc/6lm+Hn9S4Kzi3J+px4ZOn6httgXgEChTemQ7MaHlJU56CyFr3aiwuhzSuglrOcUFAdeEY= 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 1773088951120998.7527758300339; Mon, 9 Mar 2026 13:42:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPH-0004ju-6j; Mon, 09 Mar 2026 16:40:51 -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 1vzhP7-0004fd-Mh for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:42 -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 1vzhP1-0007jw-Mv for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:39 -0400 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-542-L4sUBdSNMbut5Jt5xDe59g-1; Mon, 09 Mar 2026 16:40:33 -0400 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cb6291d95aso4096430285a.1 for ; Mon, 09 Mar 2026 13:40:33 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088835; 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=IKLe9iiWMkSZNOnyjvHZMWwPo4cDtCVEG53p9Vctsgk=; b=DnWcqIZ42PnUpCO1G1klbJ85eaq0JBVx1TtMIF+/nP2jBP+TwOhsPWPtYkMczzSV5jVCyQ XMJb/ydIOLoOhEjCdhlXADSISRnGj1laDYmPhyJegoCv25E36eLTt7JQiy8clVvC5Dg+Oq 1qzshxpfRMzlkihaDbq0MzU11Re57I8= X-MC-Unique: L4sUBdSNMbut5Jt5xDe59g-1 X-Mimecast-MFC-AGG-ID: L4sUBdSNMbut5Jt5xDe59g_1773088833 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088833; x=1773693633; 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=IKLe9iiWMkSZNOnyjvHZMWwPo4cDtCVEG53p9Vctsgk=; b=Yfnoz97BVFxtLAHciHRMi3oc8JW3tjs/EYZI9FwoYl5cnTCZydPDo1+ODMwNH3p/L0 ryfWpHSO5sPAu4IB6EyDrKn16kmyaEEr64yFp/GRKKYBqCYPzo3WsRbviBw2Dy+cuANO PhfmoFDBc0WyqfUS/UI5IxyPaCz6lhJyZiK7q1I1Yr6HVzpGQRLp+wbAkTl1Ibt+M8sm RQD6KHp2PS6BR+9RZepZs4C+1RRJJfdPi7OCe082T+eLK5/DYG/0f7WglK5ZAYu57zng p4q2MW1qke/0nqk3pjmvHOLxNdJEtbLkzp1fhpww99m4TL8Dhf4mwQpIGNQkYSdiDh9v JIow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088833; x=1773693633; 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=IKLe9iiWMkSZNOnyjvHZMWwPo4cDtCVEG53p9Vctsgk=; b=s3CboqOEfOvTJJsspsWxyScG+E0/ygDhzUardJ9wgBfNpK8T5RmjfljpSAvLqf5DoH 8gL5QpMHALUBA7q6wN96wGxnh8PBolS1IhTBHjRkoIwNsARHFxbVdgbBStyBRheEqD3T 1rngfYcqI33JOEWqsPyCV0YH35CPnYcEWMdpNZloJeUgghv1KaLchYmYfrB45g/0BVs4 7pIlFlt3eKzd1Gg4UPYhX4gUKhSjYnuXCW+AHNOoKjcvQMgQ63tfd9VsqAo6WuiSUqml 6aFSc4Ja+9sDTTHtucpT67EngjQqL7RUU+uMKALrnHUk3O4gqQWaYAZQV015N3KMzv1F Ldkg== X-Gm-Message-State: AOJu0Yyz3azRNIIL6FMWNb8OnN9vJM5ce/7z3jSglwfm33HVxXVe7pbH ajXuuTKOkWkZQZgASB2zmYEJkVKYk0ZCWg5xsjr/o66Lps5sICMaMa4V9RBjWUet+0pOvTmTEbn nyzsRzFaqMHRKVi6IGsghi1xntExkorXQ+sVG0yfJJfF73UeHtdPKnpQD+PrwLAOQugIOwIdYn1 p5n06dhqb3WCIXpZ2YY7ay3O89KP8UkmEYRy0IMg== X-Gm-Gg: ATEYQzyzOXfuI83z1ZK+TrTUE9FM7HraefMPXKuiDPa6tHh1rnpEiMUSV8L9QaoGRWw C1B3vvhEOlB4PADQSLzlBWRzjZbD+MOGUU59wdi9OEpU2h3C9qqAPnwhVEcrEZMwWFK7KZ2IUKJ KkuEPyDitIsvyi3QMoLaEuWDY7Kl179hLG65Mmi/EXUHg6eFpzY99ZTZB3Vtl3sxxlmagL2ncKt iuI0j1qnKZqPuzQqEZLKwnonjVfdP+maoiE6yPkX1yWQQDLmxSQimKffbnb+2SW0alLRf8oikem cv97j08TqCMWPsi+2rCX/lZ1YCApXEe/izKVB7tlfujjlhN/EKjncLf9I1pIkb2VV5QWHnqzxVr i9t5Az9LmVNteuaLs//r+TrG8eGSqunumpnKSAOZLXDuomJe2wKQc/QjHDPQYtKObKyZ9hR8KJD 6WrukaTA== X-Received: by 2002:a05:620a:444d:b0:8cd:8a8b:8cf6 with SMTP id af79cd13be357-8cd8a8b9552mr537873285a.10.1773088832660; Mon, 09 Mar 2026 13:40:32 -0700 (PDT) X-Received: by 2002:a05:620a:444d:b0:8cd:8a8b:8cf6 with SMTP id af79cd13be357-8cd8a8b9552mr537868585a.10.1773088832024; Mon, 09 Mar 2026 13:40:32 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , "David Hildenbrand (Arm)" Subject: [PULL 11/18] memory: drop RamDiscardListener::double_discard_supported Date: Mon, 9 Mar 2026 16:40:00 -0400 Message-ID: <20260309204007.1709441-12-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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: 1773088952854154100 From: Marc-Andr=C3=A9 Lureau This was never turned off, effectively some dead code. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Peter Xu Acked-by: David Hildenbrand (Arm) Link: https://lore.kernel.org/r/20260226140001.3622334-3-marcandre.lureau@r= edhat.com Signed-off-by: Peter Xu --- include/system/memory.h | 12 +----------- hw/vfio/listener.c | 2 +- hw/virtio/virtio-mem.c | 22 ++-------------------- system/ram-block-attributes.c | 23 +---------------------- 4 files changed, 5 insertions(+), 54 deletions(-) diff --git a/include/system/memory.h b/include/system/memory.h index d4793a08a7..d6b5ca13c2 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -580,26 +580,16 @@ struct RamDiscardListener { */ NotifyRamDiscard notify_discard; =20 - /* - * @double_discard_supported: - * - * The listener suppors getting @notify_discard notifications that span - * already discarded parts. - */ - bool double_discard_supported; - MemoryRegionSection *section; QLIST_ENTRY(RamDiscardListener) next; }; =20 static inline void ram_discard_listener_init(RamDiscardListener *rdl, NotifyRamPopulate populate_fn, - NotifyRamDiscard discard_fn, - bool double_discard_supported) + NotifyRamDiscard discard_fn) { rdl->notify_populate =3D populate_fn; rdl->notify_discard =3D discard_fn; - rdl->double_discard_supported =3D double_discard_supported; } =20 /** diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c index 1087fdc142..960da9e0a9 100644 --- a/hw/vfio/listener.c +++ b/hw/vfio/listener.c @@ -283,7 +283,7 @@ static bool vfio_ram_discard_register_listener(VFIOCont= ainer *bcontainer, =20 ram_discard_listener_init(&vrdl->listener, vfio_ram_discard_notify_populate, - vfio_ram_discard_notify_discard, true); + vfio_ram_discard_notify_discard); ram_discard_manager_register_listener(rdm, &vrdl->listener, section); QLIST_INSERT_HEAD(&bcontainer->vrdl_list, vrdl, next); =20 diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index c1e2defb68..251d1d50aa 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -331,14 +331,6 @@ static int virtio_mem_notify_populate_cb(MemoryRegionS= ection *s, void *arg) return rdl->notify_populate(rdl, s); } =20 -static int virtio_mem_notify_discard_cb(MemoryRegionSection *s, void *arg) -{ - RamDiscardListener *rdl =3D arg; - - rdl->notify_discard(rdl, s); - return 0; -} - static void virtio_mem_notify_unplug(VirtIOMEM *vmem, uint64_t offset, uint64_t size) { @@ -398,12 +390,7 @@ static void virtio_mem_notify_unplug_all(VirtIOMEM *vm= em) } =20 QLIST_FOREACH(rdl, &vmem->rdl_list, next) { - if (rdl->double_discard_supported) { - rdl->notify_discard(rdl, rdl->section); - } else { - virtio_mem_for_each_plugged_section(vmem, rdl->section, rdl, - virtio_mem_notify_discard_= cb); - } + rdl->notify_discard(rdl, rdl->section); } } =20 @@ -1824,12 +1811,7 @@ static void virtio_mem_rdm_unregister_listener(RamDi= scardManager *rdm, =20 g_assert(rdl->section->mr =3D=3D &vmem->memdev->mr); if (vmem->size) { - if (rdl->double_discard_supported) { - rdl->notify_discard(rdl, rdl->section); - } else { - virtio_mem_for_each_plugged_section(vmem, rdl->section, rdl, - virtio_mem_notify_discard_= cb); - } + rdl->notify_discard(rdl, rdl->section); } =20 memory_region_section_free_copy(rdl->section); diff --git a/system/ram-block-attributes.c b/system/ram-block-attributes.c index 9f72a6b354..630b0fda12 100644 --- a/system/ram-block-attributes.c +++ b/system/ram-block-attributes.c @@ -61,16 +61,6 @@ ram_block_attributes_notify_populate_cb(MemoryRegionSect= ion *section, return rdl->notify_populate(rdl, section); } =20 -static int -ram_block_attributes_notify_discard_cb(MemoryRegionSection *section, - void *arg) -{ - RamDiscardListener *rdl =3D arg; - - rdl->notify_discard(rdl, section); - return 0; -} - static int ram_block_attributes_for_each_populated_section(const RamBlockAttributes *= attr, MemoryRegionSection *secti= on, @@ -191,22 +181,11 @@ ram_block_attributes_rdm_unregister_listener(RamDisca= rdManager *rdm, RamDiscardListener *rdl) { RamBlockAttributes *attr =3D RAM_BLOCK_ATTRIBUTES(rdm); - int ret; =20 g_assert(rdl->section); g_assert(rdl->section->mr =3D=3D attr->ram_block->mr); =20 - if (rdl->double_discard_supported) { - rdl->notify_discard(rdl, rdl->section); - } else { - ret =3D ram_block_attributes_for_each_populated_section(attr, - rdl->section, rdl, ram_block_attributes_notify_discard_cb); - if (ret) { - error_report("%s: Failed to unregister RAM discard listener: %= s", - __func__, strerror(-ret)); - exit(1); - } - } + rdl->notify_discard(rdl, rdl->section); =20 memory_region_section_free_copy(rdl->section); rdl->section =3D NULL; --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088941; cv=none; d=zohomail.com; s=zohoarc; b=adYGO1tc9IWLyiC26G2MkHkApkUxtAicYMKmowZXtDcya4Pl0jP/IiFgSZGSgUgsMRpnLG8GwNBbOhng0PRExgYSYSV71YvJxdov9Af4IFBBy1iDe80JlJD3jVososMPH7PPTgBWhL9atHRZxWy4CmC8EJpx90DuCn66UDqAmu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088941; 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=lsMTrpzimSV7ykM9K2H9v+kajidUb0NZsCJPw9IEnVQ=; b=PwLL3Qbs3SUu2XHIiPVnA/94Jhqr36g33u4poGNvLiF/1J2SSL195BhECqeTTI/9SG30DUjcrYK+EtYg045ApyHQ5Sm7JjCz99QHoiJ4nx+K/jkpcG/acUdYIm/ZT1wJl5o0jSLoFV1lpy80l72vTfLGDk2xRvFmx/JFrMw/l7I= 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 177308894141694.92127883324883; Mon, 9 Mar 2026 13:42:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPI-0004kz-SB; Mon, 09 Mar 2026 16:40:52 -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 1vzhP7-0004ff-Mk for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:42 -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 1vzhP2-0007kf-VA for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:39 -0400 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-1guHJnQVPvWeAgKP_911Zw-1; Mon, 09 Mar 2026 16:40:34 -0400 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-50917996cfaso115180721cf.0 for ; Mon, 09 Mar 2026 13:40:34 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088835; 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=lsMTrpzimSV7ykM9K2H9v+kajidUb0NZsCJPw9IEnVQ=; b=EIzoWBpg9YLnnQzgrEy2+2h7I7KZGVYhdheI/OA/+P1S3Flr3fV6Ir34OBbzLr2luBYfgG SPr9qzIsneVVP3sYcVTCztqrYA9tNrusugvVq8OwI4PgalwaPnkpyUJxChg5QhSLK+epuS 4OKffxLFAmEMA+T1joN7Z+Sxx9jJYdg= X-MC-Unique: 1guHJnQVPvWeAgKP_911Zw-1 X-Mimecast-MFC-AGG-ID: 1guHJnQVPvWeAgKP_911Zw_1773088834 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088834; x=1773693634; 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=lsMTrpzimSV7ykM9K2H9v+kajidUb0NZsCJPw9IEnVQ=; b=bBxb+cPm4iD2u8Zfxh/fTYOGCm8dnADXLBSqVvjnoVoUbRqFl86uK3fhpxodEnanqU D1/hbm2NwjCozTcci8vIIt4eUe3abjnGUQ5OvfhUlswCywERDs4VVWw0yznJQTeqBHTV GtnKqxpxVasO7VChoL0JzfhxUB4wfzItTdauCn4YseM3jCSs4IEULgQO5+D8/Lw+WSRP zy6Uca7IsYBJpo/WSBcD/bEayhApAZpSix5vcAiVfDD7Wfh/4TtkVyG4LRZXZcicmHtO 5R10JfAb3yMwOsLCWdf14xPhg2d1eSOkEGCCQ6COc362L+khapTLNS7mVxlG8MzG6UWD IHGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088834; x=1773693634; 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=lsMTrpzimSV7ykM9K2H9v+kajidUb0NZsCJPw9IEnVQ=; b=RpkSLbWwNss0GVMe/b6Onk3XfvRuxcmmPjI6pD4OU1+AuQjG8hqWgTFm95i+ThdARd JxkcxvBgjgrrJZg0BoNmpenrrawUjKsTOX+d2Zs7tQ3+o4Oy7+7kqJR/9DYOA5CKOoPt tQczazHS5A6pkUDD9TC88OvLC2bhkjZbYAcEPHtysaeqBzbkxeuA3vV2tpJyNVbhZ3zv BNwGcliHyjxPtzbvfLEqyL6sGCSwtGiFeR/ZkjxIHYAKg3thbzIlH0hRJejfmlfveHG9 bh2xTnZHxobCeWmp/gi5A4fCmptAmWImSNT5Lx6Pfjt555eUlSeyoQuzH8PVuCWNwoUC /13g== X-Gm-Message-State: AOJu0YwnoEQSaYql18ru0yFpr+R4qxXufgXyyyx+Is1zoyO1qMVcAIuV HNkrlJ6W28aFSw1ElPVG3c4Gm9dzNyf0Nx3TNdJ8KN6klXsSN4zOO2U0sWPdRhYYXKrLXeuvYUY DP0nFHW/qY0THd4UTCLnLf2YAg5p8AkKc8p7oUKhY6XFMPXf1Mv/HCinsdgnXCcEeRqSenzpbQw ou1uV3gOUw8/e9lpOQ5BW11Aqes4xP1GTagFFkTw== X-Gm-Gg: ATEYQzySNkd0Ad1yxQ6L8VdTuOze6to+x80hgDbU8UDc5sfE94COQgl7ZMpc3uuEgIe 8m0kIAbCKlYxDYZJisKikSxCQQByLzD0QqUnlYVGNvBNjVnbxN2rYtARDW11G1ynNSERQOq7gRi D1Ac/Tl1PX3H/OpZRaKmLYtst7EkBYG7g7VRxLNiSdvXd4uj7tONNxRCiogVkWIT9aMyQwI/E0y e6jJ/ZkfPX6PsBK0379X1PoCL42xIu8QSDPllXFOdYXlIbI9NDToLHswEXZWJN29VUwFJhKM//V 3CzLh4UeFnHXJ4zkexL65BB8q/3GCqV72PQkjQs/2ssSRiA3GLQPBD6ZkbbzG5dC9Lr5AeJ1ti+ aIQtmkL8RdIEFFPp4KNpb7vSMHzUvDDCVY2fr5HgqxWklTSxpZVIqhZGKZa3fEX9tMQGAhgANzZ dx+uasNg== X-Received: by 2002:a05:620a:31a8:b0:8cd:93b7:ec10 with SMTP id af79cd13be357-8cd93b81d00mr135511585a.64.1773088833753; Mon, 09 Mar 2026 13:40:33 -0700 (PDT) X-Received: by 2002:a05:620a:31a8:b0:8cd:93b7:ec10 with SMTP id af79cd13be357-8cd93b81d00mr135508585a.64.1773088833164; Mon, 09 Mar 2026 13:40:33 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , "David Hildenbrand (Arm)" Subject: [PULL 12/18] virtio-mem: use warn_report_err_once() Date: Mon, 9 Mar 2026 16:40:01 -0400 Message-ID: <20260309204007.1709441-13-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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_H4=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: 1773088942801154100 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Peter Xu Acked-by: David Hildenbrand (Arm) Link: https://lore.kernel.org/r/20260226140001.3622334-4-marcandre.lureau@r= edhat.com Signed-off-by: Peter Xu --- hw/virtio/virtio-mem.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 251d1d50aa..a4b71974a1 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -594,18 +594,7 @@ static int virtio_mem_set_block_state(VirtIOMEM *vmem,= uint64_t start_gpa, Error *local_err =3D NULL; =20 if (!qemu_prealloc_mem(fd, area, size, 1, NULL, false, &local_err)= ) { - static bool warned; - - /* - * Warn only once, we don't want to fill the log with these - * warnings. - */ - if (!warned) { - warn_report_err(local_err); - warned =3D true; - } else { - error_free(local_err); - } + warn_report_err_once(local_err); ret =3D -EBUSY; } } --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088917; cv=none; d=zohomail.com; s=zohoarc; b=fzJtUnd5mq62hXex2hFQG3+IRgdCW9NKnAh5APdVo9/1q9qktuPqpnnvMH+jynWWiP87dhrKm7ZLhFjVGpfLPWdPMJCaLOHkWGqimmr+0nmjw3HRxImn8YbbDX2SGJ37OaIvsZuA92f5gEfAw0vlH+LTjLeUn0GgcRJ6t+iNSgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088917; 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=T3uE0Cza8Sev8WzpzBMRzQgJnwUI7D6cI8Y40IS2isk=; b=n7AR0I2+Sav9YkaktqNee+bADi2NlIj4djsXA6aVm7Hw/FyX8EPSk3niyRt+jLXJR8v1Ks42TFTqOgkZ3ivgJ1ieL5WZfJzIAYz7dcE+/KlFr8Pvdjs4AoTgw8rjmbvsgknlwisUv4TagQUNnadZV45fM5j2nRnWHX2Fk5hULcY= 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 1773088917259391.469441120052; Mon, 9 Mar 2026 13:41:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPH-0004kY-MW; Mon, 09 Mar 2026 16:40:51 -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 1vzhP9-0004gS-Kr for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:46 -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 1vzhP7-0007mY-9p for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:42 -0400 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-590-4SCYGUxWOWuEbSyo_juqhw-1; Mon, 09 Mar 2026 16:40:37 -0400 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cd7c4ab845so906668885a.1 for ; Mon, 09 Mar 2026 13:40:37 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088838; 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=T3uE0Cza8Sev8WzpzBMRzQgJnwUI7D6cI8Y40IS2isk=; b=S1TL6/vS1mUJp+FUAeewrPu7K9eeiqguZvYDbLk64Z+96LiNNSCadd/sJJpwm3pMlKwo/V l3oKxp74iewiLED7RE9l5HrEmVM0fI4juxDnUxLtHaPdREGhwTSnu+raz/yFZda9ASibhu a2/QyT1GIKbJCkQCc2T0A3gyU+d4J50= X-MC-Unique: 4SCYGUxWOWuEbSyo_juqhw-1 X-Mimecast-MFC-AGG-ID: 4SCYGUxWOWuEbSyo_juqhw_1773088837 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088837; x=1773693637; 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=T3uE0Cza8Sev8WzpzBMRzQgJnwUI7D6cI8Y40IS2isk=; b=dy9gZUifij5p2criAoJXQ4A1JXvrepXTYgirlHak8eDmfuvAqFVbd2b+NMhhLrDYhZ sRp7/nJVWgZYExfwstO+zKjmdpfBpjjjC9z1QIiQZ8M1KHFbtHp9jWQhATovxcCjOmed bNCF6cFuMKuqzjc08xmieHujnoGNyztHMNrQpJ1dqCIEm5uzwZqVAeb8JsvF79ceBP3B XO6Ko5YnwaKaJZi/RkPPLeis0xMRTjE+/DIYr5RZfHONU5lX7KgEKPMG67pK9NHJo2O6 kVbhcUlKSgZYNHzavS0p3tZTZsxJJdfN4O/9xYD4WgXOYi3kRDOLh5HooxX/E8lrq0R3 UBRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088837; x=1773693637; 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=T3uE0Cza8Sev8WzpzBMRzQgJnwUI7D6cI8Y40IS2isk=; b=lcwam0kzN1J9aiHTSSpAxb0Wqv1J+x9J4Gk1qHrR4vCHf3SRI6ZnDo2STbV6c8sEb4 kkG7s0c1A95ciQivXhAFt7iqbevqi6aDkUiwx7o6gnizs68E9RmKJcZRqfijhZX52RG1 oVXxrMfLXqMESFct8liKKCsW8FFDNjQtcWKuB+etI1FFQwZuuvF++eOJ+vYtGl1EkXip e8cXuXTZXOTyTmK8i6w+x3u8K3S6Ef1O6TrOw4veLGuIJNnqb2stFiWy9sKb5qUqgp41 l9Qy1iJxcUyzC7wRvxKAOInFXVdG1Ykpzji81SINfVWjiTQSxsnojmGCSAjmdd5oiJ/T aPLw== X-Gm-Message-State: AOJu0YySgXS8olH6+kBiAwJOIq7pYxqB/e5+z3esGmRFXReH4O1cFa4B LRhxRbeUXIN3jFewFFYh5Fb8gjIMTHvMHNed2WaincqV+yOmsmI87AUdq2Ctzry/40OLcVRHU1K iJ6QQPaIEPTFDD5GdtGgw9WNpddtrrLviyz3NyCb/ieuNT3Pabj9LdovRruhkz5gl/N21/gs10s hTx9VIh5LpS28XHBZqqzIn8h0gtrarLD9vuPs+9w== X-Gm-Gg: ATEYQzxCazBSfqczrOdlmvkn2a5fKJIsQxuMKtucsXLcIq8uQUOFm258PY0pidsod4T 1QTzCMOx2IX7FuM0NW/4SLQiPih3sxgUy5dDykMx3GSs4ZRSI0YocQ2qaQdZ5Lu9aen8K2ELXQ+ rCz3Kkm/wrdcdfsX5oUZg01zb19g/S/QVfRMQxgzvDrfe6+OctuLQFz3Lbpi8j7GnoF42PnJHwX 90O4gg/RVhgjQ2nqfz1Jqze2Fkro/r6HB3+1rDQzm2y+GsAFP3BHsaC2LTo88IBDc2YTvIYV7W8 NyeZoO3Rxl2csdSy8GSMaOJvFOGMBv4UTiYlEbFMmNlVq4+PWcDJ9i9J/81bNs3v8aQlT+jb8+T QLoIvX9Uim9PVGdV7PUCfHtrrgwaB/LxlBlkNNJLhfr9/j2spxPQYoqkc/vU5dmJYg1uwqglQ+V HA/JK00w== X-Received: by 2002:a05:620a:290e:b0:8cb:d9a2:1347 with SMTP id af79cd13be357-8cd6d464c4amr1512522685a.57.1773088836671; Mon, 09 Mar 2026 13:40:36 -0700 (PDT) X-Received: by 2002:a05:620a:290e:b0:8cb:d9a2:1347 with SMTP id af79cd13be357-8cd6d464c4amr1512518485a.57.1773088836009; Mon, 09 Mar 2026 13:40:36 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , "David Hildenbrand (Arm)" Subject: [PULL 13/18] system/memory: minor doc fix Date: Mon, 9 Mar 2026 16:40:02 -0400 Message-ID: <20260309204007.1709441-14-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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: 1773088918399158500 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Peter Xu Reviewed-by: David Hildenbrand (Arm) Link: https://lore.kernel.org/r/20260226140001.3622334-5-marcandre.lureau@r= edhat.com Signed-off-by: Peter Xu --- include/system/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/system/memory.h b/include/system/memory.h index d6b5ca13c2..a9b0e19be8 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -574,7 +574,7 @@ struct RamDiscardListener { * new population (e.g., unmap). * * @rdl: the #RamDiscardListener getting notified - * @section: the #MemoryRegionSection to get populated. The section + * @section: the #MemoryRegionSection to get discarded. The section * is aligned within the memory region to the minimum granul= arity * unless it would exceed the registered section. */ --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088907; cv=none; d=zohomail.com; s=zohoarc; b=ErW3g/FOoXSQr2hZpBSBMxOp3EHMBDa4v0EoUl3FEQPlrlMv1Ax9Li28c30bsys5FCjRmTvuyIvqIPUI1Oq/RwwUz3BO+a1Ps4bhT0VeZXJHeFTjCptTDYOaNiSdcPwvIFo6rLo0yjCHLkT4MLiiQ2rS8jj4HtFxdUjF4XesONw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088907; 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=KURqW3GBA7wyjpfqN4oG+8IbN7+6HherEsvu+QG0MLg=; b=Df9zDJ2S2QrmS7zYH1VbOIU/LdbDPOdyKyIRAhr3y+ySqffC/5Nu8SpQxRGwPQNvUA3CPTKncWfjO32/B9B9PZcucdBnBl4yDiGkaPNCOOduSHQoj//aYhQ6v1+URbxGafOG6cHbC0vZe4ow9jl8CDp//1Qz8PZUa6TN2Lsrpjs= 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 1773088907017579.3819129479499; Mon, 9 Mar 2026 13:41:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPF-0004ik-J4; Mon, 09 Mar 2026 16:40:49 -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 1vzhP9-0004gR-Kv for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:46 -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 1vzhP7-0007me-9I for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:42 -0400 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-fdu1QbKtOku44SoFeaduTQ-1; Mon, 09 Mar 2026 16:40:38 -0400 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cd7fc27cf7so1033447085a.1 for ; Mon, 09 Mar 2026 13:40:38 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088839; 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=KURqW3GBA7wyjpfqN4oG+8IbN7+6HherEsvu+QG0MLg=; b=cC9Wyf0wL+OXq+1aQASV9osXpYipj9uIvY7spZDPhO9A53Ma8zMGONHJT6FCcJ6W3XwFpZ hGrWhkrLmdC7REEvmDtMj07ousg9U64VVDgNj2hZQUetMT+N4qkvX+GPqCQK9mjxhdm7RM 9hqJZdojp8SzBe1Uw+cN9uVu6VxHQ8c= X-MC-Unique: fdu1QbKtOku44SoFeaduTQ-1 X-Mimecast-MFC-AGG-ID: fdu1QbKtOku44SoFeaduTQ_1773088838 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088837; x=1773693637; 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=KURqW3GBA7wyjpfqN4oG+8IbN7+6HherEsvu+QG0MLg=; b=J39H9vBPVTVsvW1SG02pwn5ApIQlaKDUAm6901CwLToRsuNZD+7tk/eKfWMgsgLgqj VqXWBomaNJEZD8dKFmTYxVONqIKMxaOGrhwB33nIPpZnI8QaOzIX6pLioCfGyzSIPJOv 7gH8Pve3xItphVD14cHyK70ukZ2tpMac1PNfBGE9BfRcYm8rOSJYvEb/pkmAF8S2vH+S RqDQRvyXRQ7JkrD1OEuifYFeK1g4dwpN+4p2Do2fGkeEULYXd24HuPLQkpR0i0bzKrAc HMgO32lNW0RAdMHLdfCr2HCUFSaGFxu1+SS++vnZ51b3SEA6M+qYZuX5m+bgOIlFpd/f C03g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088837; x=1773693637; 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=KURqW3GBA7wyjpfqN4oG+8IbN7+6HherEsvu+QG0MLg=; b=S/ZlWd3gwUqYpAGD9Q+jIXuq0NUbBNUhvL9AGlzrYN8SmRKk8Z/he6VFdxM3AthiBC i6sdhl24zFBRxAkWKbM4zaMdxvx3k3j3aAIYZqNmETmECVQvSVa1SzuXQWi3senBKwMP r+1Oi6j5KUBCJt1HktGGcRrJ2IvF3e+fn6XWbs3dW/9RJWGc7rSfuhcuc0PEls4P9jSs Vfb7W4x4BF50bUdw45sGweOFqlMkDpoA7Czhcp12dnx/ba4s7yph2j4ue7FToScuhUMt ZEaeSbeuMNpPg/rkaNknFPFS9/1o2whPxXTz+mNvZdQup+c5R1Edvf/e/sllspxaNKHZ eOQA== X-Gm-Message-State: AOJu0YzXG0sRjtDG/HlwP1avwDujWBbFmn3lNrsjS+TNmOMZtpqZowBu R5VLAAl+EgcUBfdnyXjj4weuNpr+Lz1KdYWIlNGJEOnHK1zIUhlkY5/jXM51F/IwQ7O//fNCOsU scFwPrxiu1yBiU2FhmeppyaNfbrVe8UqcLqyWyUUTe+0tiqhyIhJ+RHzZw9Cvm7vJYqF13l+Mq+ kLc/DwJvVrGmhBMfixyO4xGL24TZLrEL8NyABJqw== X-Gm-Gg: ATEYQzwDc3HaLx/5cHju5hPrZZsPv9S5IpG3Bb+4jleNlOwFnAuVS7WZAow2RkHQNM3 SPnpSLW9DFs0nxb2yO1x2fGXbvb7RsdYlbXv0lozsE+mqOsHIUNaqxsYdWISjlUHFyUAJFcYy0n prrqPDFCxNXyzpWPr0I8/MIrwgO+C4RSMY9Oe11+d4Hgt02vpYSg1Wmz/N7LLRv/EgzfLw2Kvde xW2aKtvXyXTGkqAryaezZL50+/7Ux69vnHHgY+pQbnfYKVYAdzXokrtT6Y4hGrX90Dh9FKQz9zN Eebnw2Jwq6DiDKAf0mJc7hbukt0HA5s3D9VVfoRVIF6s3GXNV3reYpAybgO5cmmawKIn46KUXFr io0hz8OadEuDNnh9AU0xaOFLc++EGPAm4AEiQhpI79UQxG/ZS+L+ZO6A6ufJXEn9SvFiOrrkLMZ 0R0W18DQ== X-Received: by 2002:a05:620a:44d2:b0:8cd:80f1:f468 with SMTP id af79cd13be357-8cd80f1fa47mr953985885a.41.1773088837584; Mon, 09 Mar 2026 13:40:37 -0700 (PDT) X-Received: by 2002:a05:620a:44d2:b0:8cd:80f1:f468 with SMTP id af79cd13be357-8cd80f1fa47mr953980485a.41.1773088837029; Mon, 09 Mar 2026 13:40:37 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Chenyi Qiang Subject: [PULL 14/18] kvm: replace RamDicardManager by the RamBlockAttribute Date: Mon, 9 Mar 2026 16:40:03 -0400 Message-ID: <20260309204007.1709441-15-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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: 1773088908346158500 From: Marc-Andr=C3=A9 Lureau No need to cast through the RamDiscardManager interface, use the RamBlock already retrieved. Makes it more direct and readable, and allow further refactoring to make RamDiscardManager an aggregator object in the following patches. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Chenyi Qiang Reviewed-by: Peter Xu Link: https://lore.kernel.org/r/20260226140001.3622334-6-marcandre.lureau@r= edhat.com Signed-off-by: Peter Xu --- accel/kvm/kvm-all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index ebd721c3d6..984db97779 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3404,7 +3404,7 @@ int kvm_convert_memory(hwaddr start, hwaddr size, boo= l to_private) addr =3D memory_region_get_ram_ptr(mr) + section.offset_within_region; rb =3D qemu_ram_block_from_host(addr, false, &offset); =20 - ret =3D ram_block_attributes_state_change(RAM_BLOCK_ATTRIBUTES(mr->rdm= ), + ret =3D ram_block_attributes_state_change(rb->attributes, offset, size, to_private); if (ret) { error_report("Failed to notify the listener the state change of " --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088889; cv=none; d=zohomail.com; s=zohoarc; b=aCTVVLWZ+lTnxiwWJKSIGxbV92HhcIOEVrYdRIXqX0Y0i+WYGUMXEppBfhUydOPX+in61OqhjPaQOzM9QDIYjVyOzy7e0R3YDJOb8arkpmekCX23nKeWPCesbyuXpljyTYjQIMsP6WnqpKxhe4mISkAvv1rb/EKVm6FCk+y5byU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088889; 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=uf3HD61cPR9EZKQ9SCtWf0wlWyOgzRoud2zUcsD7Rg4=; b=Q/y7JOi3rVqaCmCfL62tOyQIMsraErUWxgqRxdNyOy9t8spaaznwa2tsPOmaZGkSs3icx1JbD+odQkvPDUmOLCZo/+cWs6gik87jZgpzyOTFEMy6JlzIhI14gEFhHvngM4wKIZUj5EdiM2Uo9QMyLZzx143VXxY87GMjARCBom8= 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 1773088889960564.1807752951593; Mon, 9 Mar 2026 13:41:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPI-0004kp-H8; Mon, 09 Mar 2026 16:40:52 -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 1vzhPB-0004go-Tc for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:47 -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 1vzhP9-0007nj-E0 for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:45 -0400 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-59-MnOoPJ9DMs-6iHB1nXkgcA-1; Mon, 09 Mar 2026 16:40:40 -0400 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cd7ea0bb20so1071408785a.3 for ; Mon, 09 Mar 2026 13:40:40 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088842; 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=uf3HD61cPR9EZKQ9SCtWf0wlWyOgzRoud2zUcsD7Rg4=; b=RHG0OThO6MoDDTGygkpRJU6f0TTYg0Cbo3b8SES9iyBAwQuu5G930PV4uUczHX+Vg1B7BW hyLfrWSF4QL5jksQMWcFQXJ8ukvxOW+VJmNvRoacNziG41pH0J4C5zsPfpB8JE758JjjA7 jiieC36UF0FZkkX4K6WDA3hYTZ7U0zU= X-MC-Unique: MnOoPJ9DMs-6iHB1nXkgcA-1 X-Mimecast-MFC-AGG-ID: MnOoPJ9DMs-6iHB1nXkgcA_1773088840 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088840; x=1773693640; 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=uf3HD61cPR9EZKQ9SCtWf0wlWyOgzRoud2zUcsD7Rg4=; b=fKJITlpsZsS9K2rfXO2tHoXzaxWNm4fqj5e4VrEe/FL/iKg3dQ/MMxCVTX5mTLVFZZ fBSOBJZDP9tso+mQYuZ2RYt0O4FV4PiGUWJt0Mz9XRl3aqF/EXT3mwz/idhgm8pT5A4F /Zks+nyu1dFkyVQCyEtSdJFY47Wu6/7wWIlgVSpLgCYdQSSq7vvQavzzf3L528rIOl9M G/3YPLf3r2JXrBCHlRn4WCqptQgkgc4YhRbkrRXN8whZ1cN/cScsGSnZ+YZgISAmp38A twA76y/r96rGZFM1vnrPM9c7sqZLk2PCmvVQqFf3HhIsBm5O/MfgqvD+P11/mV5FGS8q 0Liw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088840; x=1773693640; 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=uf3HD61cPR9EZKQ9SCtWf0wlWyOgzRoud2zUcsD7Rg4=; b=Mht1FJiFO4c8JG6aOFfVH1ynE699+jzSGwUI0QVucaBRqiBq1qSaBpcrhrID2vV3Yd DlN0aDfA3FlL0FrOSaPr9nGl/FjARaLdkImfU5JPetQCPJyFaGzdDZrqTEulVJ+fsfAa x8dqIJ6lVRf0qHu1fR7rVTUZW3LAHu+SrTpMm5WFdKVfcQ7HfL0ojbuxXz8ihkYRrMOH wvEkq/VJzz8GHZ4FDse1Zc8xRXmU5IoPPR2/iOiGIus8itniBA+wYGp2REu8jtX44051 dfwEPUgGDW3i29iKADIdQuuDXlCvF6jAzAMovemDNBczWS4y0tGa5FgjIrX+Sc74l/jB 497g== X-Gm-Message-State: AOJu0YzWm5qInn1uRnlPcrejYppWA2nlJA+ZR/TX3GjvRnAnE9awubbj 4qFPLRQGztVIgYll9SbiYUI48/c5dGWR6KtHOk/2mmy5bkNR9rKksrZHBd/y7obOReFVOO6pEL1 4aiP8mdlfbDmmvjp6JmlT1AOIqD9fJfj7yOvRSzqMkPy08CqHo0C2Jk2BeZKKxXhp408Q9+Lb7i hIVJwJBISti73U0JT/KPThM6Wsg+hCoSbfUq0/qg== X-Gm-Gg: ATEYQzzUufdNBXmOoNJy+yDS2hdylRLUYhk4ZYbt8NkoBWhLu7aP54NjKz3+wut+Z76 /YWTpleNBb7Y8eSueQ34EwHB1aSQtTfNdWotJ72HTda6RPXIBhuPR/Pd+de+qFUqqGjMo39Il+W Oqo/mM2towK/XNsKA6rcAWhWC2FI3QTHoASiqh+uVmHdbCGbcV8qdBl5SDhrFvv0OeoAWw0muh7 jbGcYVYpMbjJ+yTxsBQCf9rvd0A7X+ILjYJZpNjYGZ0DGsm8l4peB0nDoW1u3pA30N1YV1egzBu /JNpPBLEQBrJJJG4T6JLDVKidbBjvPBYq4z2nyX8BnbBAKOhWVlhLLU7FXlZVJdLzLALwwofQNT l0FFY4emlDPds4K63ITIx0Odm/bvy3PZglweHW8gyQuIq3AYsBT9TK4/qYbUAya0aAATQoWHHui 6ce01yKg== X-Received: by 2002:a05:620a:564:b0:8cd:7f7d:b089 with SMTP id af79cd13be357-8cd7f7db148mr689055085a.70.1773088839708; Mon, 09 Mar 2026 13:40:39 -0700 (PDT) X-Received: by 2002:a05:620a:564:b0:8cd:7f7d:b089 with SMTP id af79cd13be357-8cd7f7db148mr689051485a.70.1773088839159; Mon, 09 Mar 2026 13:40:39 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PULL 15/18] system/ramblock: Constify various RAMBlock arguments Date: Mon, 9 Mar 2026 16:40:04 -0400 Message-ID: <20260309204007.1709441-16-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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_H4=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: 1773088892215154100 From: Philippe Mathieu-Daud=C3=A9 Mark the RAMBlock structure const when is only accessed read-only. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Peter Xu Link: https://lore.kernel.org/r/20260309183536.88976-2-philmd@linaro.org Signed-off-by: Peter Xu --- include/system/ramblock.h | 28 ++++++++++++++-------------- stubs/physmem.c | 2 +- stubs/ram-block.c | 6 +++--- system/physmem.c | 28 ++++++++++++++-------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/system/ramblock.h b/include/system/ramblock.h index e9f58ac045..4435f8d55f 100644 --- a/include/system/ramblock.h +++ b/include/system/ramblock.h @@ -154,26 +154,26 @@ RAMBlock *qemu_ram_block_by_name(const char *name); */ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, ram_addr_t *offset); -ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host); +ram_addr_t qemu_ram_block_host_offset(const RAMBlock *rb, void *host); void qemu_ram_set_idstr(RAMBlock *block, const char *name, DeviceState *de= v); void qemu_ram_unset_idstr(RAMBlock *block); -const char *qemu_ram_get_idstr(RAMBlock *rb); -void *qemu_ram_get_host_addr(RAMBlock *rb); -ram_addr_t qemu_ram_get_offset(RAMBlock *rb); -ram_addr_t qemu_ram_get_fd_offset(RAMBlock *rb); -ram_addr_t qemu_ram_get_used_length(RAMBlock *rb); -ram_addr_t qemu_ram_get_max_length(RAMBlock *rb); -bool qemu_ram_is_shared(RAMBlock *rb); -bool qemu_ram_is_noreserve(RAMBlock *rb); -bool qemu_ram_is_uf_zeroable(RAMBlock *rb); +const char *qemu_ram_get_idstr(const RAMBlock *rb); +void *qemu_ram_get_host_addr(const RAMBlock *rb); +ram_addr_t qemu_ram_get_offset(const RAMBlock *rb); +ram_addr_t qemu_ram_get_fd_offset(const RAMBlock *rb); +ram_addr_t qemu_ram_get_used_length(const RAMBlock *rb); +ram_addr_t qemu_ram_get_max_length(const RAMBlock *rb); +bool qemu_ram_is_shared(const RAMBlock *rb); +bool qemu_ram_is_noreserve(const RAMBlock *rb); +bool qemu_ram_is_uf_zeroable(const RAMBlock *rb); void qemu_ram_set_uf_zeroable(RAMBlock *rb); -bool qemu_ram_is_migratable(RAMBlock *rb); +bool qemu_ram_is_migratable(const RAMBlock *rb); void qemu_ram_set_migratable(RAMBlock *rb); void qemu_ram_unset_migratable(RAMBlock *rb); -bool qemu_ram_is_named_file(RAMBlock *rb); -int qemu_ram_get_fd(RAMBlock *rb); +bool qemu_ram_is_named_file(const RAMBlock *rb); +int qemu_ram_get_fd(const RAMBlock *rb); =20 -size_t qemu_ram_pagesize(RAMBlock *block); +size_t qemu_ram_pagesize(const RAMBlock *block); size_t qemu_ram_pagesize_largest(void); #include "exec/target_page.h" #include "exec/hwaddr.h" diff --git a/stubs/physmem.c b/stubs/physmem.c index 14667f2bd8..2eca06ab6d 100644 --- a/stubs/physmem.c +++ b/stubs/physmem.c @@ -7,7 +7,7 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_of= fset, return NULL; } =20 -int qemu_ram_get_fd(RAMBlock *rb) +int qemu_ram_get_fd(const RAMBlock *rb) { return -1; } diff --git a/stubs/ram-block.c b/stubs/ram-block.c index 8790a59593..1c79e447ff 100644 --- a/stubs/ram-block.c +++ b/stubs/ram-block.c @@ -3,17 +3,17 @@ #include "system/ramblock.h" #include "system/memory.h" =20 -void *qemu_ram_get_host_addr(RAMBlock *rb) +void *qemu_ram_get_host_addr(const RAMBlock *rb) { return 0; } =20 -ram_addr_t qemu_ram_get_offset(RAMBlock *rb) +ram_addr_t qemu_ram_get_offset(const RAMBlock *rb) { return 0; } =20 -ram_addr_t qemu_ram_get_used_length(RAMBlock *rb) +ram_addr_t qemu_ram_get_used_length(const RAMBlock *rb) { return 0; } diff --git a/system/physmem.c b/system/physmem.c index 7eecd81877..e5390d09be 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -1859,48 +1859,48 @@ static void qemu_ram_setup_dump(void *addr, ram_add= r_t size) } } =20 -const char *qemu_ram_get_idstr(RAMBlock *rb) +const char *qemu_ram_get_idstr(const RAMBlock *rb) { return rb->idstr; } =20 -void *qemu_ram_get_host_addr(RAMBlock *rb) +void *qemu_ram_get_host_addr(const RAMBlock *rb) { return rb->host; } =20 -ram_addr_t qemu_ram_get_offset(RAMBlock *rb) +ram_addr_t qemu_ram_get_offset(const RAMBlock *rb) { return rb->offset; } =20 -ram_addr_t qemu_ram_get_fd_offset(RAMBlock *rb) +ram_addr_t qemu_ram_get_fd_offset(const RAMBlock *rb) { return rb->fd_offset; } =20 -ram_addr_t qemu_ram_get_used_length(RAMBlock *rb) +ram_addr_t qemu_ram_get_used_length(const RAMBlock *rb) { return rb->used_length; } =20 -ram_addr_t qemu_ram_get_max_length(RAMBlock *rb) +ram_addr_t qemu_ram_get_max_length(const RAMBlock *rb) { return rb->max_length; } =20 -bool qemu_ram_is_shared(RAMBlock *rb) +bool qemu_ram_is_shared(const RAMBlock *rb) { return rb->flags & RAM_SHARED; } =20 -bool qemu_ram_is_noreserve(RAMBlock *rb) +bool qemu_ram_is_noreserve(const RAMBlock *rb) { return rb->flags & RAM_NORESERVE; } =20 /* Note: Only set at the start of postcopy */ -bool qemu_ram_is_uf_zeroable(RAMBlock *rb) +bool qemu_ram_is_uf_zeroable(const RAMBlock *rb) { return rb->flags & RAM_UF_ZEROPAGE; } @@ -1910,7 +1910,7 @@ void qemu_ram_set_uf_zeroable(RAMBlock *rb) rb->flags |=3D RAM_UF_ZEROPAGE; } =20 -bool qemu_ram_is_migratable(RAMBlock *rb) +bool qemu_ram_is_migratable(const RAMBlock *rb) { return rb->flags & RAM_MIGRATABLE; } @@ -1925,12 +1925,12 @@ void qemu_ram_unset_migratable(RAMBlock *rb) rb->flags &=3D ~RAM_MIGRATABLE; } =20 -bool qemu_ram_is_named_file(RAMBlock *rb) +bool qemu_ram_is_named_file(const RAMBlock *rb) { return rb->flags & RAM_NAMED_FILE; } =20 -int qemu_ram_get_fd(RAMBlock *rb) +int qemu_ram_get_fd(const RAMBlock *rb) { return rb->fd; } @@ -1987,7 +1987,7 @@ static char *cpr_name(MemoryRegion *mr) } } =20 -size_t qemu_ram_pagesize(RAMBlock *rb) +size_t qemu_ram_pagesize(const RAMBlock *rb) { return rb->page_size; } @@ -2772,7 +2772,7 @@ void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_= t addr) } =20 /* Return the offset of a hostpointer within a ramblock */ -ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host) +ram_addr_t qemu_ram_block_host_offset(const RAMBlock *rb, void *host) { ram_addr_t res =3D (uint8_t *)host - (uint8_t *)rb->host; assert((uintptr_t)host >=3D (uintptr_t)rb->host); --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088932; cv=none; d=zohomail.com; s=zohoarc; b=P/tUW81k5e1hrLHS2g6u4Dc8CvfznOg4jtROVc62d0bTVUZcdCkBRXQdAH6rt0GM6aQx33ofYs+3VsXGQfv7AQkSmCCQDexIFZTfqeD5XpV5MKEzJaKyUfBdcOPowG7nREXhgqjUCiK74PUmwIe2fpH4fqzHt5RR4TwN27MwM0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088932; 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=wLFDlachEI4Q0czjIy+BCK+FfK4yknAlsXlj9QsvgqI=; b=PuOpmVXK5h/TyzVNEmbNtMsYTCfLpt1SRRern9o+rAwhE5114Wd2oqhc5pm9pDcyhTA+9U8DqXSJ+1y05OKdiLtFx5ahEbtCK0ydNh8phoEla2753ceSRnMqk1ihIi0hvBwTbc8gM02GlkTNYdIz9/g9q7XPe4rzGrYL7m4Hmt4= 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 1773088932951128.94890994324965; Mon, 9 Mar 2026 13:42:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPJ-0004lc-Ga; Mon, 09 Mar 2026 16:40:53 -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 1vzhPD-0004hQ-RT for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:47 -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 1vzhPA-0007or-OM for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:47 -0400 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-Qf8io0T3OoK9061sp40L0g-1; Mon, 09 Mar 2026 16:40:42 -0400 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cd84943c76so954916085a.0 for ; Mon, 09 Mar 2026 13:40:42 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088844; 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=wLFDlachEI4Q0czjIy+BCK+FfK4yknAlsXlj9QsvgqI=; b=AiX/1YjMKJPd52tLFbxQBjIMmLtMZZ6ZKwszPmZzgjU2VMXYmHi1X60zI+fRAshLP75Edz 8uwjiSOPpb1kDi0tTTAVfs8eSzWspBbZ+F9jUaxCTIldNAP2LP/ujl+EOLrhA/gKRTh5Uu yQ1wnv2mpdHN05Ejfl1MAEj4v+62rMw= X-MC-Unique: Qf8io0T3OoK9061sp40L0g-1 X-Mimecast-MFC-AGG-ID: Qf8io0T3OoK9061sp40L0g_1773088842 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088842; x=1773693642; 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=wLFDlachEI4Q0czjIy+BCK+FfK4yknAlsXlj9QsvgqI=; b=fyEfShR7j7ZjtH/mKs7wb5l9jQA5ACaopEsgQ4pYAOMXQPKG2AlPoj0MDsGs0CdFM/ fN8JkgdjOdsUVjNFJM5Hcg0v5/528sYawScT8jxan5QpMuVqCNCLNH2UAfytWa1+AhZh sxh0pedHbeG8N6Mh7wCDxme070Vbg0vXB0aljd0jlvNurmu/iMCgfWs+js9muLYDbBlR 3VX1A3QmdholFm35OWDEvE3tJLFFNYD6IsGKZgHQ/LcZ5VsNjq2XTcdykE2LWHIx2CF+ Kc/STs/Wr7QLIO+fb0IbjCh9gpzEQ7pk9tcV4AO2nH7/Mhx2e4jEwng3lkQNgWo14ebP Bbdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088842; x=1773693642; 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=wLFDlachEI4Q0czjIy+BCK+FfK4yknAlsXlj9QsvgqI=; b=w30iVuMABp9BTtIWkGUzWOlx+/RFpBDZVaEc02JkfhU7bCTIGjBsqPodhq7j0tjzxH 2DTU/VJUuVBZgPQZYytl7h2bYH5mNnYofmqgmiX9liGzgXTZUvT71YZJjmpP7LTGeygi L31nHyMxP0XGSF8jqgfF61GuqfU0/etz0bmTbgERnhE/30rRJq3Rd7yP6VW1xGT4Aw+m 9OGqXMIVxSzuNznGc9GnSsqcTkuKyRCCOTpT31KqUi6kvTGRVGn+tuk02bUR7XrWvNVQ pycLw2xLTNUl0xW1XCUT0wuTQjcRmOt5cNar3UuWgxmLSx5VwdSHw9nqwKxfAd+vzwFb QeNQ== X-Gm-Message-State: AOJu0YwEWNHV3hFpEmRygbBIgau78ZaulHthC0m8kJwHYbj6evGn8eOC k0CTUBwMONb/lgmxzh94MRQX+qdMi2c5pFzoOPjNaNIGMb++bywhopDaPkg2uJC5BehnMIiO/B7 cu5NEDvBbvofc/MPlfwpLO5MUg2iFSDbIWS/v9tIPFU3D68+FcTHE9ubElGeHOjOvFXzS8SxpJJ YZ9GEedKcV1kxlAwYQkoWaARHk1SnMcHIBFyo5iw== X-Gm-Gg: ATEYQzzfJlsCjDweI8KeJrlEw6Lo4ktqVjEvBk1sLle78saJRvDZ7kvnRPp4/vvJpjx RZrECVd1ZexSS+CN6S7KWFR4bO4EUa9+npRO4VKC6PFQiSwXHKvnwzszjML5LJHE9DI3D1Osed3 IykPJV5CpLACNtwj060+b7qZYPeoXAZNKYd3Jiai8M6KcIrFjBUeAyaeGpGOqUOMUlYyrpPecRU tW4174KXgmnYKvl3HRKabhlP+FW5zbuvLn17zURHplZsVQNrkpl5QSwSaxTL3ja8AdBBCvtPPhA YvEB5NHp0COsZyELAbpzejBXe0/fBb6qqEkjb+kNsrWW2COinLrN0qfwCUBLbzwSkP7Rb766SXY BCOyoQT5Kh3fAZXJa1ePS/GlZ/htDAGuLtiqywkEYXUhCZ3e6Pd+YGlJLn+yPkh7hYZ7c8GFy+d EARcxUXw== X-Received: by 2002:a05:620a:4083:b0:8cd:75a9:eab9 with SMTP id af79cd13be357-8cd93b7eb74mr108391685a.14.1773088841654; Mon, 09 Mar 2026 13:40:41 -0700 (PDT) X-Received: by 2002:a05:620a:4083:b0:8cd:75a9:eab9 with SMTP id af79cd13be357-8cd93b7eb74mr108387485a.14.1773088840971; Mon, 09 Mar 2026 13:40:40 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PULL 16/18] system/memory: Constify various MemoryRegion arguments Date: Mon, 9 Mar 2026 16:40:05 -0400 Message-ID: <20260309204007.1709441-17-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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_H4=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: 1773088934561154100 From: Philippe Mathieu-Daud=C3=A9 Mark the MemoryRegion structure const when is only accessed read-only. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Peter Xu Link: https://lore.kernel.org/r/20260309183536.88976-3-philmd@linaro.org Signed-off-by: Peter Xu --- include/system/memory.h | 38 +++++++++++++++++++------------------- system/memory.c | 38 ++++++++++++++++++++------------------ system/physmem.c | 2 +- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/include/system/memory.h b/include/system/memory.h index a9b0e19be8..d7b18b632d 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -1690,14 +1690,14 @@ bool memory_region_init_rom_device(MemoryRegion *mr, * * @mr: the memory region being queried. */ -Object *memory_region_owner(MemoryRegion *mr); +Object *memory_region_owner(const MemoryRegion *mr); =20 /** * memory_region_size: get a memory region's size. * * @mr: the memory region being queried. */ -uint64_t memory_region_size(MemoryRegion *mr); +uint64_t memory_region_size(const MemoryRegion *mr); =20 /** * memory_region_is_ram: check whether a memory region is random access @@ -1706,7 +1706,7 @@ uint64_t memory_region_size(MemoryRegion *mr); * * @mr: the memory region being queried */ -static inline bool memory_region_is_ram(MemoryRegion *mr) +static inline bool memory_region_is_ram(const MemoryRegion *mr) { return mr->ram; } @@ -1718,7 +1718,7 @@ static inline bool memory_region_is_ram(MemoryRegion = *mr) * * @mr: the memory region being queried */ -bool memory_region_is_ram_device(MemoryRegion *mr); +bool memory_region_is_ram_device(const MemoryRegion *mr); =20 /** * memory_region_is_romd: check whether a memory region is in ROMD mode @@ -1728,7 +1728,7 @@ bool memory_region_is_ram_device(MemoryRegion *mr); * * @mr: the memory region being queried */ -static inline bool memory_region_is_romd(MemoryRegion *mr) +static inline bool memory_region_is_romd(const MemoryRegion *mr) { return mr->rom_device && mr->romd_mode; } @@ -1741,7 +1741,7 @@ static inline bool memory_region_is_romd(MemoryRegion= *mr) * * @mr: the memory region being queried */ -bool memory_region_is_protected(MemoryRegion *mr); +bool memory_region_is_protected(const MemoryRegion *mr); =20 /** * memory_region_has_guest_memfd: check whether a memory region has guest_= memfd @@ -1751,7 +1751,7 @@ bool memory_region_is_protected(MemoryRegion *mr); * * @mr: the memory region being queried */ -bool memory_region_has_guest_memfd(MemoryRegion *mr); +bool memory_region_has_guest_memfd(const MemoryRegion *mr); =20 /** * memory_region_get_iommu: check whether a memory region is an iommu @@ -1761,7 +1761,7 @@ bool memory_region_has_guest_memfd(MemoryRegion *mr); * * @mr: the memory region being queried */ -static inline IOMMUMemoryRegion *memory_region_get_iommu(MemoryRegion *mr) +static inline IOMMUMemoryRegion *memory_region_get_iommu(const MemoryRegio= n *mr) { if (mr->alias) { return memory_region_get_iommu(mr->alias); @@ -1932,7 +1932,7 @@ const char *memory_region_name(const MemoryRegion *mr= ); * @mr: the memory region being queried * @client: the client being queried */ -bool memory_region_is_logging(MemoryRegion *mr, uint8_t client); +bool memory_region_is_logging(const MemoryRegion *mr, uint8_t client); =20 /** * memory_region_get_dirty_log_mask: return the clients for which a @@ -1943,7 +1943,7 @@ bool memory_region_is_logging(MemoryRegion *mr, uint8= _t client); * * @mr: the memory region being queried */ -uint8_t memory_region_get_dirty_log_mask(MemoryRegion *mr); +uint8_t memory_region_get_dirty_log_mask(const MemoryRegion *mr); =20 /** * memory_region_is_rom: check whether a memory region is ROM @@ -1952,7 +1952,7 @@ uint8_t memory_region_get_dirty_log_mask(MemoryRegion= *mr); * * @mr: the memory region being queried */ -static inline bool memory_region_is_rom(MemoryRegion *mr) +static inline bool memory_region_is_rom(const MemoryRegion *mr) { return mr->ram && mr->readonly; } @@ -1964,7 +1964,7 @@ static inline bool memory_region_is_rom(MemoryRegion = *mr) * * @mr: the memory region being queried */ -static inline bool memory_region_is_nonvolatile(MemoryRegion *mr) +static inline bool memory_region_is_nonvolatile(const MemoryRegion *mr) { return mr->nonvolatile; } @@ -1977,7 +1977,7 @@ static inline bool memory_region_is_nonvolatile(Memor= yRegion *mr) * * @mr: the RAM or alias memory region being queried. */ -int memory_region_get_fd(MemoryRegion *mr); +int memory_region_get_fd(const MemoryRegion *mr); =20 /** * memory_region_from_host: Convert a pointer into a RAM memory region @@ -2012,7 +2012,7 @@ MemoryRegion *memory_region_from_host(void *ptr, ram_= addr_t *offset); * * @mr: the memory region being queried. */ -void *memory_region_get_ram_ptr(MemoryRegion *mr); +void *memory_region_get_ram_ptr(const MemoryRegion *mr); =20 /* memory_region_ram_resize: Resize a RAM region. * @@ -2362,7 +2362,7 @@ void memory_region_add_subregion_overlap(MemoryRegion= *mr, * * @mr: the region to be queried */ -ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr); +ram_addr_t memory_region_get_ram_addr(const MemoryRegion *mr); =20 uint64_t memory_region_get_alignment(const MemoryRegion *mr); /** @@ -2462,7 +2462,7 @@ bool memory_region_present(MemoryRegion *container, h= waddr addr); * * @mr: a #MemoryRegion which should be checked if it's mapped */ -bool memory_region_is_mapped(MemoryRegion *mr); +bool memory_region_is_mapped(const MemoryRegion *mr); =20 /** * memory_region_get_ram_discard_manager: get the #RamDiscardManager for a @@ -2908,7 +2908,7 @@ void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_= t addr); int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr); bool prepare_mmio_access(MemoryRegion *mr); =20 -static inline bool memory_region_supports_direct_access(MemoryRegion *mr) +static inline bool memory_region_supports_direct_access(const MemoryRegion= *mr) { /* ROM DEVICE regions only allow direct access if in ROMD mode. */ if (memory_region_is_romd(mr)) { @@ -2925,8 +2925,8 @@ static inline bool memory_region_supports_direct_acce= ss(MemoryRegion *mr) return !memory_region_is_ram_device(mr); } =20 -static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write, - MemTxAttrs attrs) +static inline bool memory_access_is_direct(const MemoryRegion *mr, + bool is_write, MemTxAttrs attrs) { if (!memory_region_supports_direct_access(mr)) { return false; diff --git a/system/memory.c b/system/memory.c index f1db72eb42..fca74ee62b 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1750,9 +1750,9 @@ static void memory_region_finalize(Object *obj) g_free(mr->ioeventfds); } =20 -Object *memory_region_owner(MemoryRegion *mr) +Object *memory_region_owner(const MemoryRegion *mr) { - Object *obj =3D OBJECT(mr); + const Object *obj =3D OBJECT(mr); return obj->parent; } =20 @@ -1780,7 +1780,7 @@ void memory_region_unref(MemoryRegion *mr) } } =20 -uint64_t memory_region_size(MemoryRegion *mr) +uint64_t memory_region_size(const MemoryRegion *mr) { if (int128_eq(mr->size, int128_2_64())) { return UINT64_MAX; @@ -1797,25 +1797,25 @@ const char *memory_region_name(const MemoryRegion *= mr) return mr->name; } =20 -bool memory_region_is_ram_device(MemoryRegion *mr) +bool memory_region_is_ram_device(const MemoryRegion *mr) { return mr->ram_device; } =20 -bool memory_region_is_protected(MemoryRegion *mr) +bool memory_region_is_protected(const MemoryRegion *mr) { return mr->ram && (mr->ram_block->flags & RAM_PROTECTED); } =20 -bool memory_region_has_guest_memfd(MemoryRegion *mr) +bool memory_region_has_guest_memfd(const MemoryRegion *mr) { return mr->ram_block && mr->ram_block->guest_memfd >=3D 0; } =20 -uint8_t memory_region_get_dirty_log_mask(MemoryRegion *mr) +uint8_t memory_region_get_dirty_log_mask(const MemoryRegion *mr) { uint8_t mask =3D mr->dirty_log_mask; - RAMBlock *rb =3D mr->ram_block; + const RAMBlock *rb =3D mr->ram_block; =20 if (global_dirty_tracking && ((rb && qemu_ram_is_migratable(rb)) || memory_region_is_iommu(mr))) { @@ -1829,7 +1829,7 @@ uint8_t memory_region_get_dirty_log_mask(MemoryRegion= *mr) return mask; } =20 -bool memory_region_is_logging(MemoryRegion *mr, uint8_t client) +bool memory_region_is_logging(const MemoryRegion *mr, uint8_t client) { return memory_region_get_dirty_log_mask(mr) & (1 << client); } @@ -2337,7 +2337,7 @@ void memory_region_reset_dirty(MemoryRegion *mr, hwad= dr addr, memory_region_get_ram_addr(mr) + addr, size, client, NULL); } =20 -int memory_region_get_fd(MemoryRegion *mr) +int memory_region_get_fd(const MemoryRegion *mr) { RCU_READ_LOCK_GUARD(); while (mr->alias) { @@ -2346,7 +2346,7 @@ int memory_region_get_fd(MemoryRegion *mr) return mr->ram_block->fd; } =20 -void *memory_region_get_ram_ptr(MemoryRegion *mr) +void *memory_region_get_ram_ptr(const MemoryRegion *mr) { uint64_t offset =3D 0; =20 @@ -2371,7 +2371,7 @@ MemoryRegion *memory_region_from_host(void *ptr, ram_= addr_t *offset) return block->mr; } =20 -ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr) +ram_addr_t memory_region_get_ram_addr(const MemoryRegion *mr) { return mr->ram_block ? mr->ram_block->offset : RAM_ADDR_INVALID; } @@ -2737,7 +2737,7 @@ static FlatRange *flatview_lookup(FlatView *view, Add= rRange addr) sizeof(FlatRange), cmp_flatrange_addr); } =20 -bool memory_region_is_mapped(MemoryRegion *mr) +bool memory_region_is_mapped(const MemoryRegion *mr) { return !!mr->container || mr->mapped_via_alias; } @@ -3221,7 +3221,7 @@ void address_space_destroy_free(AddressSpace *as) call_rcu(as, do_address_space_destroy_free, rcu); } =20 -static const char *memory_region_type(MemoryRegion *mr) +static const char *memory_region_type(const MemoryRegion *mr) { if (mr->alias) { return memory_region_type(mr->alias); @@ -3414,7 +3414,6 @@ static void mtree_print_flatview(gpointer key, gpoint= er value, GArray *fv_address_spaces =3D value; struct FlatViewInfo *fvi =3D user_data; FlatRange *range =3D &view->ranges[0]; - MemoryRegion *mr; int n =3D view->nr; int i; AddressSpace *as; @@ -3441,7 +3440,8 @@ static void mtree_print_flatview(gpointer key, gpoint= er value, } =20 while (n--) { - mr =3D range->mr; + const MemoryRegion *mr =3D range->mr; + if (range->offset_in_region) { qemu_printf(MTREE_INDENT HWADDR_FMT_plx "-" HWADDR_FMT_plx " (prio %d, %s%s): %s @" HWADDR_FMT_plx, @@ -3614,8 +3614,10 @@ static void mtree_info_as(bool dispatch_tree, bool o= wner, bool disabled) =20 /* print aliased regions */ QTAILQ_FOREACH(ml, &ml_head, mrqueue) { - qemu_printf("memory-region: %s\n", memory_region_name(ml->mr)); - mtree_print_mr(ml->mr, 1, 0, &ml_head, owner, disabled); + const MemoryRegion *mr =3D ml->mr; + + qemu_printf("memory-region: %s\n", memory_region_name(mr)); + mtree_print_mr(mr, 1, 0, &ml_head, owner, disabled); qemu_printf("\n"); } =20 diff --git a/system/physmem.c b/system/physmem.c index e5390d09be..4a9e076004 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -1975,7 +1975,7 @@ void qemu_ram_unset_idstr(RAMBlock *block) } } =20 -static char *cpr_name(MemoryRegion *mr) +static char *cpr_name(const MemoryRegion *mr) { const char *mr_name =3D memory_region_name(mr); g_autofree char *id =3D mr->dev ? qdev_get_dev_path(mr->dev) : NULL; --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088965; cv=none; d=zohomail.com; s=zohoarc; b=SqCBJtT5Y+YfoeOrpBwssOGU8dEcE9F4af3VNsFKvlvUvOTCqtrNnL8NsfcIm+FTiUjai4caApqauidElrh0iitVGQMNjzerLPcZwQ/DTIxf70vfDeToq0IPvXB3VBp5tdRXCGKeC3pJp19///qTlnafPCecwr8JvoZ9v5oiKTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088965; 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=dulq0T1zzOTRkDz99a96A58d86es7ym6LZ7eZmdWwUw=; b=lL+fmNM8/TE9wlMPW6dDQd7WRpXk3XpCQL38RkGvKAwGtyPLG95LeOmeN/Epsuv8XTqeYVL5CXbmaNY3IjoR1p9V9EXlrUkG5n1pfzp8Xzyx/0HQqn8UgQr81+8But95Adu2X4DHAftQU7MAjQbxn4/L440xLeHMLJz0481jg+I= 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 1773088965863501.2261119777777; Mon, 9 Mar 2026 13:42:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPH-0004jt-8O; Mon, 09 Mar 2026 16:40:51 -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 1vzhPD-0004hR-SA for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:47 -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 1vzhPC-0007q2-5u for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:47 -0400 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-152-1WjBShxbP-W-syRQbhUFUQ-1; Mon, 09 Mar 2026 16:40:44 -0400 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cd7ea0bb20so1071438085a.3 for ; Mon, 09 Mar 2026 13:40:44 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088845; 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=dulq0T1zzOTRkDz99a96A58d86es7ym6LZ7eZmdWwUw=; b=WKQ7fRQSI6UDCc9Ml5zcmSq3MeTh2u06p/2F3IHzP+tcuotSvvuULBQRci5AxtcsfHDhSo UIUAKF76xnX5x8MAe/2AzN4xjsyiB1WVDNcavED3ulUhwAC1q0igrPGmM9Vqk/No+PcQsx covA0LY0/leVdiig6CJgJCFToAqgHro= X-MC-Unique: 1WjBShxbP-W-syRQbhUFUQ-1 X-Mimecast-MFC-AGG-ID: 1WjBShxbP-W-syRQbhUFUQ_1773088844 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088844; x=1773693644; 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=dulq0T1zzOTRkDz99a96A58d86es7ym6LZ7eZmdWwUw=; b=pZNIqXKbIe3sBEzaSB7YmHnLacpBFQVbTNedglYUZsEXZbZWq1XwB1CErO1yMadIqw pKBeG4guXyBrpBSdUshAoFMeLx3a5laK3cakFy2Jx5uxJSoZIGSPjJHZG3pwsCrDjvW/ BkzdIQrPN2gdYC0LT70AhqjVg5U4+kFFL5Gf5wF+ef3paBU6HDarjevF7I5PWLPvt82M W0pjLUT4J3bpBpe2k9fypiiSNp8gnTWSoYVZkId4zJBh1w3T4gs/ugflbdJcxdfVOozk fMc6wC+s2LhZ9E0/X+2PaA9mcEroNICwLpdp7mJzy4m7FrevUfNn20OafYgxin2Mx0IH b8Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088844; x=1773693644; 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=dulq0T1zzOTRkDz99a96A58d86es7ym6LZ7eZmdWwUw=; b=rKRhKTPyH7ERb48c7auaoBjcHvFiT5EQi+lYWM8vGDxPS2UyjX0EBN8/9Ft4J49RGG rcPEgvZTKZc1TXEsoushqR3ZQZZeZNPnHCgyyd1NwlzA69Eez6EVumFHJ7MzX5YBJRqR ZHERA+GGHVMY2cSQZQEuiyyWqUF8xS/1/MG5qX26PcgZJwBrTpTCIRgNGaSfEEXPdais q88/1Zz8DU7yTDVm5WLguZAwE0tPE1LGyOf189KmiM4RJTSjPlBNL8ucXxPWPTKjXcuX Lcd+BHJYkikFpWQ3vKDvt45y6LmogoXlsW14dI6yIDThVls3DXzuvd0R3lK1v1rTkLWa P22Q== X-Gm-Message-State: AOJu0YymRHQFPqLrJRJVZ96t7z7aYk9WhStd2DLq++EP/AyemczcjENP i421Fg+rZXXlzidnaOcsfNq6y2j4lS530mdgNFZJzoJoAj6qFDMvI8xvqxgPikVjJnGMPKCacV0 D0kMZTjhBBDxXMTj7X8cwo+CcvyUHkSzpQGWD4osVEagDS4fKVlAlGA0713JSBZvNU+BdvdsN2D SkyaPMu1SkM8RHoOoU/C7+uMex0vSw/K20VDtnKQ== X-Gm-Gg: ATEYQzzSNKuozqH1gABkAKrrADhszuKIyYSknr7RwHOUvbvDPDZ7a8aqcAVNOIlYS0S ztp9w0CZW3B7ElL7ABsnZULZmSg8mISuPr0ZLt2kfnH6wiU8fw2nXNyH0ec0xYplNORkhM8TWq/ NplKOO2CahH1+lKqtywV8xODTnPCb6HBLz6nPqFTDNuisuzip/wQdUb64rISxTR+yAw9cRIS4jJ Y5eZ/wwr+m9uy86udVvZhFg3qIlsozC1/IqZzjQtXnouhSorqicG/D4X3K6EI09sewckLCztsM9 LoOmZuwTIGmKKoaLDvjQdWjvLBoYSLk+eyw0EnNAhjKBGrWIkF4twGHcVY6yVmNyNf6IO8IvfvV a3a7yEzyAsRMC2v9YhI5nnfQx4l6WJR3LNJeNv2hbiMzF3L7z8uAzyFrsfdKQX5lmDa8TdZLYdr pNLxRmag== X-Received: by 2002:a05:620a:2847:b0:8ca:2086:a148 with SMTP id af79cd13be357-8cd6d453d81mr1669284685a.28.1773088843557; Mon, 09 Mar 2026 13:40:43 -0700 (PDT) X-Received: by 2002:a05:620a:2847:b0:8ca:2086:a148 with SMTP id af79cd13be357-8cd6d453d81mr1669279685a.28.1773088842894; Mon, 09 Mar 2026 13:40:42 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PULL 17/18] system/xen: Constify various MemoryRegion arguments Date: Mon, 9 Mar 2026 16:40:06 -0400 Message-ID: <20260309204007.1709441-18-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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: 1773088969016154100 From: Philippe Mathieu-Daud=C3=A9 Mark the MemoryRegion structure const when is only accessed read-only. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Link: https://lore.kernel.org/r/20260309183536.88976-4-philmd@linaro.org Signed-off-by: Peter Xu --- include/system/xen-mapcache.h | 2 +- include/system/xen.h | 6 +++--- hw/xen/xen-hvm-common.c | 8 ++++---- hw/xen/xen-mapcache.c | 2 +- hw/xen/xen_stubs.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/system/xen-mapcache.h b/include/system/xen-mapcache.h index c46190dd0c..114d1929c8 100644 --- a/include/system/xen-mapcache.h +++ b/include/system/xen-mapcache.h @@ -16,7 +16,7 @@ typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offs= et, bool xen_map_cache_enabled(void); void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque); -uint8_t *xen_map_cache(MemoryRegion *mr, hwaddr phys_addr, hwaddr size, +uint8_t *xen_map_cache(const MemoryRegion *mr, hwaddr phys_addr, hwaddr si= ze, ram_addr_t ram_addr_offset, uint8_t lock, bool dma, bool is_write); diff --git a/include/system/xen.h b/include/system/xen.h index 9a7c53f283..43b857e4d1 100644 --- a/include/system/xen.h +++ b/include/system/xen.h @@ -30,7 +30,7 @@ extern bool xen_allowed; =20 void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length); void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, - struct MemoryRegion *mr, Error **errp); -bool xen_mr_is_memory(MemoryRegion *mr); -bool xen_mr_is_grants(MemoryRegion *mr); + const MemoryRegion *mr, Error **errp); +bool xen_mr_is_memory(const MemoryRegion *mr); +bool xen_mr_is_grants(const MemoryRegion *mr); #endif diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index eb7f6270a0..62d88804c4 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -23,19 +23,19 @@ MemoryRegion xen_memory, xen_grants; =20 /* Check for any kind of xen memory, foreign mappings or grants. */ -bool xen_mr_is_memory(MemoryRegion *mr) +bool xen_mr_is_memory(const MemoryRegion *mr) { return mr =3D=3D &xen_memory || mr =3D=3D &xen_grants; } =20 /* Check specifically for grants. */ -bool xen_mr_is_grants(MemoryRegion *mr) +bool xen_mr_is_grants(const MemoryRegion *mr) { return mr =3D=3D &xen_grants; } =20 -void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr, - Error **errp) +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + const MemoryRegion *mr, Error **errp) { unsigned target_page_bits =3D qemu_target_page_bits(); unsigned long nr_pfn; diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c index a3c162cd4c..85cf0cf359 100644 --- a/hw/xen/xen-mapcache.c +++ b/hw/xen/xen-mapcache.c @@ -460,7 +460,7 @@ tryagain: return mc->last_entry->vaddr_base + address_offset; } =20 -uint8_t *xen_map_cache(MemoryRegion *mr, +uint8_t *xen_map_cache(const MemoryRegion *mr, hwaddr phys_addr, hwaddr size, ram_addr_t ram_addr_offset, uint8_t lock, bool dma, diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c index a39efb5062..f830768d99 100644 --- a/hw/xen/xen_stubs.c +++ b/hw/xen/xen_stubs.c @@ -19,12 +19,12 @@ void xen_hvm_modified_memory(ram_addr_t start, ram_addr= _t length) } =20 void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, - struct MemoryRegion *mr, Error **errp) + const MemoryRegion *mr, Error **errp) { g_assert_not_reached(); } =20 -bool xen_mr_is_memory(MemoryRegion *mr) +bool xen_mr_is_memory(const MemoryRegion *mr) { g_assert_not_reached(); } @@ -44,7 +44,7 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr) g_assert_not_reached(); } =20 -uint8_t *xen_map_cache(MemoryRegion *mr, +uint8_t *xen_map_cache(const MemoryRegion *mr, hwaddr phys_addr, hwaddr size, ram_addr_t ram_addr_offset, --=20 2.50.1 From nobody Sat Apr 11 21:30:22 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=1773088947; cv=none; d=zohomail.com; s=zohoarc; b=eriX5R9FuKR/CVdhsWLOlaEaHfn5PbReAnIPCabIRc8BRwOLkE2tbrYB3TaIn3/jO5Qz+gLkWG3ybcmk6E2sbAKjSeB8o/rbQVGGnH0/qR434B/jZjMtIS++JLuX/b1P6gA1eroS1zZ5+fBOUai4tww5ts+MEnSgKd/9XLwJ9MY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773088947; 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=0GuAyxRTooT6yfCAc2b/eQlsvt/y6s1ZY45EFsHiNVI=; b=GPceVbFqsZ11guxFBO4nzInwek2r76iUeI7keO/LMq6hC+jKrWZwTwmhwil2TcRkJmPIboPRkqkOxjkREdc0FOSC34FXTw6mA/oFek1uBrE45sruglTK7aFKzqjVYkzqJMgUtCZIomtesC9yeHUegPk7+aXsxTTQ/J5RrlIdnkM= 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 177308894740065.37659209642925; Mon, 9 Mar 2026 13:42:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzhPI-0004kn-8b; Mon, 09 Mar 2026 16:40:52 -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 1vzhPF-0004iW-6X for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:49 -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 1vzhPD-0007qB-HO for qemu-devel@nongnu.org; Mon, 09 Mar 2026 16:40:48 -0400 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-wWDkmC6qM5mZ3YPRhLYL-g-1; Mon, 09 Mar 2026 16:40:45 -0400 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cd7d4cc049so2034297485a.0 for ; Mon, 09 Mar 2026 13:40:45 -0700 (PDT) Received: from x1.local (bras-vprn-aurron9134w-lp130-03-174-91-117-149.dsl.bell.ca. [174.91.117.149]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cd8576db0esm332951885a.47.2026.03.09.13.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 13:40:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773088846; 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=0GuAyxRTooT6yfCAc2b/eQlsvt/y6s1ZY45EFsHiNVI=; b=Xd+xyRGetJFIKulk6WQq/mVTx1QIR8BJadiZFMvu+EvqY+uNoLVZuyy5uJheI7svljqXQc EHmnr2uTTq5NxWbImQCvZIVG2Tzq4bFczafJzWCFT0GloP778Av1ydCkVDo7UZq7/kbaIg UsN7wBdHmXUSG3f1WV5kIN+6K4L9UbQ= X-MC-Unique: wWDkmC6qM5mZ3YPRhLYL-g-1 X-Mimecast-MFC-AGG-ID: wWDkmC6qM5mZ3YPRhLYL-g_1773088845 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773088845; x=1773693645; 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=0GuAyxRTooT6yfCAc2b/eQlsvt/y6s1ZY45EFsHiNVI=; b=EC3cIso54N+wKiKY4Z0eQZMUKeV+JJqBSI0K0ApkpWLhwS9pGBE9ET/XFDKYEbB3FK Yqef6UhZ78d2MD9gfRqS18uBSPZl2RCidH2dnCvgWhirjd0sHRltgC8djmRBvNZgllKJ 4IxfYYf/6/jjqMx4aREyjCzHl/nxxf7y+GMEXm5d58p7k7fpGA5k0d2APD6dItuF0lAa yM0abuV3vJiCMeB5RKej21NEawg+cJ9jtfzPuQk1cB9R7mazCElT/aDMrSjS4Tt+Y+VT W4HwSz72AGgvPRTOD+WAsZ8pkvqA2ff1P+HCXCSyFZU3RTi/JVy7AuPf9t8Io4WVzzLs gBOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773088845; x=1773693645; 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=0GuAyxRTooT6yfCAc2b/eQlsvt/y6s1ZY45EFsHiNVI=; b=P8tueUOfnnGqhmsb7Pg3nljhdjHNa2dexUohLW1nuCo5eIr2n5vJjXpozb3NLxQuPW qNnClOwjlqnrvQmE1dD78/RKGcsw/NDB/yU4FEW/RK5Pcx3KNX8nPAlsqcSla/wYKY7s u3+ccKm9xXDFhqy+CPxZi6SiEhVFcF/LOq056SBP7mGMuHYTcr+K21s3LBH8ydanJ5JH O9wkfVTPZHRucx2aN3Pv3opVbTyoOWhgAvjef2AZ6drFfu1AJNsrXGpJL0q0VG7n2J0q knTe7iLLF0uK+beUT7vODb1GMJdmWx/XJRgmK/Wt/2DtaGsSWchQqlUAWXkF1A1ol68s LiGw== X-Gm-Message-State: AOJu0YyI40ljXV4WRATqKBl317u39rGN3GgNGWTfx2gNYNnTtduyfzsK mkABZNRPAWr/2/Ep0+6LzWxuFV4EG5bG4u5GaufaC6YJXVZl22Gi4yNPB9oQZvaKtLePTnGCPVi cG8MGgv6/PG2zeDtOoIGguiKq9/Gtb2sCeFo0ZAeI9HYkPcSGoV6ZKQZA5a5+7wkJs93aLSwEFp fUGkv6TBgiOAqkjh+ogB5s+h6VW6dmL3xc/cph7Q== X-Gm-Gg: ATEYQzx0IBjPFi18hi49YfrQwg9YuVvAkd8Z8dSzjSfYNknve1dkJts0ej1bWPAvf1a 4wUv4LO29PKR/pLZ2/tu92Ohb+snNUGiQn/0rCJ9WTwFZuGWmTRvq2RWRaV/V20tQ1J3KhW23SV W5dCpKp4ZMwhpTvVAN4JsKdikb/uoCiQoT3o9dKkDJUfGJBbWz1me6bsWftKscKic3Oq6GuQt09 wtIcNVHN00rxlplzA6oNqQ4XqsvYl4vrnx0u6gDvh4OUGXO8CsTloDJb5UGXVCEyCqlk3+CyNP5 gggOKCnJxnoPipQR/T2uEYw6jxoX8a5AdfL6Nr2HD2di+9ze54ktPbHC35AgJBp3zwL1QnUn1mm fQfaXGy/vZE7GlvvJoOs20unGaVAeGntf0kWlJOja6RPOpVY0oa2bixzArwMVutFDb/7Dp4qat7 3rQvtHrA== X-Received: by 2002:a05:620a:1a19:b0:8b2:767c:31ab with SMTP id af79cd13be357-8cd6d503f2cmr1466056185a.60.1773088844602; Mon, 09 Mar 2026 13:40:44 -0700 (PDT) X-Received: by 2002:a05:620a:1a19:b0:8b2:767c:31ab with SMTP id af79cd13be357-8cd6d503f2cmr1466052285a.60.1773088843947; Mon, 09 Mar 2026 13:40:43 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PULL 18/18] system/memory: Have memory_region_type() correctly describe containers Date: Mon, 9 Mar 2026 16:40:07 -0400 Message-ID: <20260309204007.1709441-19-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260309204007.1709441-1-peterx@redhat.com> References: <20260309204007.1709441-1-peterx@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 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_H4=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: 1773088948614154100 From: Philippe Mathieu-Daud=C3=A9 MemoryRegion containers are not I/O regions, describe them as 'container'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Peter Xu Link: https://lore.kernel.org/r/20260309183536.88976-5-philmd@linaro.org Signed-off-by: Peter Xu --- system/memory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/memory.c b/system/memory.c index fca74ee62b..17a7bcd9af 100644 --- a/system/memory.c +++ b/system/memory.c @@ -3234,6 +3234,8 @@ static const char *memory_region_type(const MemoryReg= ion *mr) return "rom"; } else if (memory_region_is_ram(mr)) { return "ram"; + } else if (!mr->container) { + return "container"; } else { return "i/o"; } --=20 2.50.1