From nobody Sat Sep 26 22:15:44 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=1789731667; cv=none; d=zohomail.com; s=zohoarc; b=PCnePyamSiNKzcdXD8qaSkhyxSb1RmbJxe+OvuV64HLBLm81P/9MZRi/SBj+Hf73zbD95c6MrD+waa1rhRVvXx+G4byYQPAezHkHKZpME/TBjWx9BkYk91KpH9/S4tovVI9dUO1bZh2mcHjfHIGwxFHj9Ms1B6uj8doJnkAF3lM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731667; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NYiDFxM5DTkwPjVQc++Tthuv6NIMIlEmS75dFNyYj4E=; b=Ba/y/uJkygiKQQ8yRi/+wNVbAphGDNU3CscJZKW85pmIhiV3PC65OaYeHULFfmMqI/a58/iymjbyEeDsOA/D90lxW5GdQDhn5LNjpBwdkViEEJPTWKoBshHM5AB8seqvRh0YcLTvzUnWFe5J+KIjmpWRPRqOjEbEma3ttEbQ8bc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789731667665229.3967349787955; Fri, 18 Sep 2026 04:41:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7WwY-0000QQ-FC; Fri, 18 Sep 2026 07:39:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7WwW-0000QE-Lh for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:39:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7WwU-0001cg-WB for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:39:48 -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-444-a25Db9JFOuSMaY-f_MBNdw-1; Fri, 18 Sep 2026 07:39:43 -0400 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-52fb8f67601so6848921cf.3 for ; Fri, 18 Sep 2026 04:39:43 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-532aac41140sm1770451cf.5.2026.09.18.04.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731586; 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=NYiDFxM5DTkwPjVQc++Tthuv6NIMIlEmS75dFNyYj4E=; b=S0BbpeCtFfChgzhjxaQe79qMregGtf1EhagSrJwGH0EwFc+s44rHFHNSWS5PbjOg/XUTGp nIfBgZCmcRp1EiqGP+tJjJCob4fffQMzSkx0SorM0TfQKChw5aU0su4uUBdqP8RUn07KZI zV+J1d9JTom8ckT/K9Nigg8BBmNouDc= X-MC-Unique: a25Db9JFOuSMaY-f_MBNdw-1 X-Mimecast-MFC-AGG-ID: a25Db9JFOuSMaY-f_MBNdw_1789731583 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731583; x=1790336383; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=NYiDFxM5DTkwPjVQc++Tthuv6NIMIlEmS75dFNyYj4E=; b=ncJnPb6dHdK2BOmsq67+wF6usuG6FysXLqymo8RoXHI+jVc/kQe0OA9egzCdbSeS6B s9tP0khedsTW8zyFaQWDkCITxZoDG9SLUhHLMYPZXTSmq8SDC0ZprfYn0tjLOAs3f/SC IiVS29YGL1/09ZsY5ARVhLWy+7kriPAQGLSWeUexsLXKBG7qnRxVmXUHJ4npxLkl9/0z PED3qPrh5S/AueWAKKBLcw1Jy+VlLz67iM2eu8KDexGMRUWWDG2hLSJwQNEJn6t4tr50 CO2JD1SISB1CAwO1NpQ5typPqTpCqC0qR/lHk10wdbhCd/O6kKCK0TPkZUxfo/A3lI1d vidQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731583; x=1790336383; h=content-transfer-encoding:content-type: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 :content-type; bh=NYiDFxM5DTkwPjVQc++Tthuv6NIMIlEmS75dFNyYj4E=; b=c/f73lwuCBd0Vg47XT8IYpD2LvN7ClrLmNoY4yprhFyJrjKKTcmQrm2XRtJx5aYwAH GIG+8NWJCf161+SKv+wtQQvEk8ZvgyaG0yAQ+zBS2cqn+IcQZbbejwKnzQXvIrH3+NGR l0FrUMfsJHgaU1eVeM5GlevCRlZuITN5M/4LBobIDpCR9RsCk02BIUla47fzDz+MkW4r 1orUkShWBW4WiyQJEuwM/v6vv7poEhJBaJE6QuOL3wcNwzWkqGK9sMIVEiD9DXkJkeVD nTod6VMF4Ho0+mzsERR/YgBvTQmwhV5c2G5Ihx+aYRbcw9TqifwY33szRpWqd9NkyeuT 9ylA== X-Gm-Message-State: AFuF++ku+x4IlL+rXZfhbj/vOl6JSjJmZSoW+6J2XmigACbyU9kBr6FZ isdUwUHfpFocttxGEL3SQLeHAJQqX4OKTLP54Z0KBkhL4DsqbgWkj9W1icXg30MzGt2KEYKvGoH KGJgZPrgp7IY4vjqoxp6pPSukj3FAkdQPw5nEBXT7D2JQI9j9j/M1tQp6b4AOw5L/JiI+w1TNUH d+YW8woc6iDjdByyffLycXtcSeNnWegyb4LfWRDx9R X-Gm-Gg: AYBFou17p9A22R83/HLAravQGaH1cwd+FGjQwlrpFZph/F8kaEDqbseeuF3LVgq/yVd YxyyW3RZ75WHlKJShsNrNTzSpaxdjR6sNZT17pgGxaRxcqB5aAOZACmXLBGmK6Hy5Hus8JY/7kT dha4qf8WbQYSpeqxQaBxKnLgHIdwC9h+ZnXWaTBnwO5vR8OJOViO+aOfeEGEOVc6FOxDYUBpok+ r+OJZcJkNQqPMpdg6u8+YkvUrVS4NPRDlshfVsRlLgEeZMthporCYSm33pmznMMg6U6mMURRz0f GbhaPXkKY7mwAi2KQ76yUXx7uNvyLOJIKHdpD8zsyMml541uJ/ZfLSO4CKOYcFjUGMr7LAhy/RK lfgte/6cNrqqAtvkYzIdzJFkaBMZPwypLy2QlX7i5ESm01wohYbYg3HjVBWA= X-Received: by 2002:ac8:7d47:0:b0:532:9ade:b6d3 with SMTP id d75a77b69052e-5329e59c03emr30340761cf.79.1789731582975; Fri, 18 Sep 2026 04:39:42 -0700 (PDT) X-Received: by 2002:ac8:7d47:0:b0:532:9ade:b6d3 with SMTP id d75a77b69052e-5329e59c03emr30340301cf.79.1789731582325; Fri, 18 Sep 2026 04:39:42 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 01/11] system: Define ram_addr_t to be always uint64_t Date: Fri, 18 Sep 2026 07:39:16 -0400 Message-ID: <20260918113926.831204-2-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789731669777158500 QEMU's 32bit host support was deprecated since 10.0 and removed in 11.0 (commit 372ec46b9f), at least system emulation part (cf634dfcd8fc revived tools). Now it's safe to move ram_addr_t completely over to uint64_t. It should be almost the same as uintptr_t as before for !Xen, except that on some systems (like MacOS) uintptr_t and uint64_t can be typed slightly differently, causing unnecessary compiler warnings when use them in a mixture way. Hopefully, this change also makes it clear that ram_addr_t is never used as a host pointer in any form, but only an internal QEMU integer based address space for allocating ramblocks. [1] https://lore.kernel.org/r/d7b2fbf6-f9fa-4b39-8f40-95b7d5d0d8fb@oss.qual= comm.com Suggested-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson Link: https://lore.kernel.org/r/20260818172012.3052821-2-peterx@redhat.com Cc: Paolo Bonzini Cc: Peter Xu Cc: "Philippe Mathieu-Daud=C3=A9" Signed-off-by: Peter Xu --- include/system/ram_addr.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h index 129f6b8757..044c0b52cc 100644 --- a/include/system/ram_addr.h +++ b/include/system/ram_addr.h @@ -14,16 +14,14 @@ #ifndef RAM_ADDR_H #define RAM_ADDR_H =20 -/* address in the RAM (different from a physical address) */ -#if defined(CONFIG_XEN_BACKEND) +/* + * QEMU's internal RAM address space for ramblock allocations (different + * from guest physical address). + */ typedef uint64_t ram_addr_t; -# define RAM_ADDR_MAX UINT64_MAX -# define RAM_ADDR_FMT "%" PRIx64 -#else -typedef uintptr_t ram_addr_t; -# define RAM_ADDR_MAX UINTPTR_MAX -# define RAM_ADDR_FMT "%" PRIxPTR -#endif + +#define RAM_ADDR_MAX UINT64_MAX +#define RAM_ADDR_FMT "%" PRIx64 =20 #define DIRTY_MEMORY_VGA 0 #define DIRTY_MEMORY_CODE 1 --=20 2.55.0 From nobody Sat Sep 26 22:15:44 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=1789731648; cv=none; d=zohomail.com; s=zohoarc; b=XAIkeE2Pcd1B9Jb3rZjY21bgpIu2RyEwQjpcJUzRPt3qs0QE7qNjvgA7et03yTScmtQQEfn0A4zknCTlV2AwM/fMcl98saFWYi0T+6AX23K8R+nSW8pdhVmYwIyMgRZhGZ50oAai4s4JQfhZoKEM7DHwYIP/HXbCV02fql3inxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731648; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yfu1MBXsRmVP1HEFbBooqDFu2xyDHNFt7BQUuf2IFiw=; b=UuGGMdsI1DemLo0JyUs+mUTJqIvZO11mRxptC1MUKy6d1EAEIDS6bfaD6sVOR3qGaog1A3zGz+yBfpOLlWK9xTP7U8FhE5XevB6lrYZgFNuxExNfxq6N/AZLWylATVuJvhUFu60HxAuY/JTHcop0eThrW0q1rc1T02KZ1XqJvTY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789731648179318.88298688628277; Fri, 18 Sep 2026 04:40:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7Wwb-0000Rm-EX; Fri, 18 Sep 2026 07:39:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7WwZ-0000RO-Gy for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:39:51 -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 1x7WwX-0001d0-JP for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:39:51 -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-168-Gs9fzMA8M4iEiGaDW6bE2g-1; Fri, 18 Sep 2026 07:39:47 -0400 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-530f65ddee1so12388501cf.2 for ; Fri, 18 Sep 2026 04:39:47 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-532a19f19f1sm11263171cf.22.2026.09.18.04.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:39:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731589; 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=yfu1MBXsRmVP1HEFbBooqDFu2xyDHNFt7BQUuf2IFiw=; b=ZAGJhbRMOFF1NmfnQR2tEYChj+GLMfx/KgVl+vidi/Xpx5+lmJrTqgaIucK38oY1WygJkq Wz0hVZLibMWB8qYg43NM1jXUxbrMJrMeYgxF600HwlPao8ENhwiu/A6C75alun+GT2zAiA oHeKtgb9YsK3y8xOCVDLU3SDfQnOa6I= X-MC-Unique: Gs9fzMA8M4iEiGaDW6bE2g-1 X-Mimecast-MFC-AGG-ID: Gs9fzMA8M4iEiGaDW6bE2g_1789731587 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731586; x=1790336386; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=yfu1MBXsRmVP1HEFbBooqDFu2xyDHNFt7BQUuf2IFiw=; b=Ii5gfaJPplqCXWjzp+POKKOsMeCYtPDviYVCOr4oEVsqPt4QZWfxs35vvE0EryTkwl DAfgYFCGy1NazDgYLTDMNd24/rZmZou9e+vemBSd8g+o3NGFZUgd5UfTG9NhyeQGMUWb +u8vNKzqKLH56Hu45VqEZnwka93XQ/092wv7SydcQua25ZYhGNkB/moVkntaXRUJyV5F XgxajDWkma9mquHJyF698LXfVVZ5v4WRS4C8uPOPJn98NVrzfBx1qmrgoy7nPojt1wze 61z4wsAopRMGnn/mu6zynsE3nZJwvBHlfWRQkmVluwCgdNNXRQit9vLk5ysBUL5UDkAv 14ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731586; x=1790336386; h=content-transfer-encoding:content-type: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 :content-type; bh=yfu1MBXsRmVP1HEFbBooqDFu2xyDHNFt7BQUuf2IFiw=; b=decJt2HQzt5dj9Vi6IxZd8g7iEMOzmFDoQJfyGsdG4sG6o9zHEcrVdlzwXWRio5sNz 6zKHWG4CHah6fjy9eN3EKPSdoTdZjOeBoEzSMeGYoD31MtV5mX1IPZ7jAygzP4qp2yoN 1L2Y9dVifdPqHsiqTX/iIe56Y4jjYjP7ZxuClV67G7Qb/ijx24dd9LE4aCP2Ernlbd9X R40IRV3BvLjgNRaMMKU1tkL2LK4N82RYSG/Cf+cblU2UfT5TorBtFJZe6ZoKcThG04/X TuziiY0l5+WbTwwvIyGx1haCBQ8hYOxguQVZbmuAkbPL5B5P8KOpph+gsL95EJhXaFFi UKpg== X-Gm-Message-State: AFuF++kiXN1HzulH36IGK87f4g8HL9F4ha2rK8qtLvhdajXof/J4S80Y 5R1l22zH3UTwKC/Mzp9mKt5Omzjb6luRXXGcDo1hu28I20g0mtJQxEVbBgvRNCG3HTK5dUpMO9C yOiVSiqdmnc7dZIdALInhljr6XIR+PpmGgJKK4uahFKyMLe3V3n0J9Otn2pmn9RIEQgzGutEtH1 1irctWTuYjN+pO2ZrS11ZP50FqItdPK96LYEj9h1Xu X-Gm-Gg: AYBFou3VGHUMuWQu0jDkoWHI6VGQKUYi8H4tBPwJsVtfP0nDZhmUGsaSpNL6fnxUl+m 4Xt76HtDpoxU3kkvC6l5tWwK61X8UbCnR+AH3OkE+wDl8TATCIhh+Qi3rS+NUMc20ZxU89KX8Le 6M8Gg6Z26uj6lF9mnTfgg9Y63f0TA4Prb+MUISVO5VE2l6V/qbA4VxkwLiic+ex98C+TE2eLlKS Tnk7dM+iSMSaQqk2mHFDF/tcufA3jVB0i2vS+xC+L5iulPSr2f3z9rVCDeZ4cMSVJOWHFOfqP31 3QZDX/KPbyhkj611n5MW9KqdUJE1XxfVmhaKvcx+QkMbfs9Zc4mZ+O5BnuornC48QQzgW3/tc5/ YafccWHiw92Ott9jb7bw3XD6XMGvGz1x/IzccSPby+zr8yoBH61GD5jN9yC8= X-Received: by 2002:a05:622a:587:b0:530:ea70:39f8 with SMTP id d75a77b69052e-5329e47e893mr32013241cf.40.1789731586556; Fri, 18 Sep 2026 04:39:46 -0700 (PDT) X-Received: by 2002:a05:622a:587:b0:530:ea70:39f8 with SMTP id d75a77b69052e-5329e47e893mr32012811cf.40.1789731586002; Fri, 18 Sep 2026 04:39:46 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , Peter Maydell , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org Subject: [PULL 02/11] hw/vexpress.c: Remove forced cast to u64 Date: Fri, 18 Sep 2026 07:39:17 -0400 Message-ID: <20260918113926.831204-3-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1789731650077158500 Now since ram_addr_t has switched to u64, remove the forced cast as not needed. Suggested-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Link: https://lore.kernel.org/r/20260818172012.3052821-3-peterx@redhat.com Cc: Peter Maydell Cc: qemu-arm@nongnu.org Signed-off-by: Peter Xu --- hw/arm/vexpress.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 914cda66d2..a4328ec74b 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -362,16 +362,9 @@ static void a15_daughterboard_init(VexpressMachineStat= e *vms, MachineState *machine =3D MACHINE(vms); MemoryRegion *sysmem =3D get_system_memory(); =20 - { - /* We have to use a separate 64 bit variable here to avoid the gcc - * "comparison is always false due to limited range of data type" - * warning if we are on a host where ram_addr_t is 32 bits. - */ - uint64_t rsz =3D ram_size; - if (rsz > (30ULL * 1024 * 1024 * 1024)) { - error_report("vexpress-a15: cannot model more than 30GB RAM"); - exit(1); - } + if (ram_size > (30ULL * 1024 * 1024 * 1024)) { + error_report("vexpress-a15: cannot model more than 30GB RAM"); + exit(1); } =20 /* RAM is from 0x80000000 upwards; there is no low-memory alias for it= . */ --=20 2.55.0 From nobody Sat Sep 26 22:15:44 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=1789731685; cv=none; d=zohomail.com; s=zohoarc; b=ZsDEMZY2Ruj2kbABhHY6oYMe8tFaBBJgwqgG8quwSkn/QYL7ve5dUJ4cvzBGXvaT6KwDFOpVvuWTX/DiKUq7Zii8BihVdSrfwYog5K7Ix2LbZXBbNUPl1DgCPQUEQ6BrVDzvSZFMjvIWnjMqRe4fEhNubndLE0vqFh5vfDvHD5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731685; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PBaGuPoDATCVPFdrrPM5ytWeOyh4lWlPorysTKBYkuo=; b=NecktKGxANKFBWv2hWHemCOrQB6i1cV9uEkmOIchtPByzRXbnc7qBFtAusG2A6VywvCNpTkzBhu7JVBNOHWRS/JMBHKL12oY6osp1uxSErSKDJ6Mb4ALX8o7WvuzXSNFEM4T1ul5KuouJoq3p0OqN9ka1vHB3xUW63Vb3pMBBgw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789731685516837.1583669376901; Fri, 18 Sep 2026 04:41:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7Wwp-0000Tk-2S; Fri, 18 Sep 2026 07:40:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7Wwn-0000T9-7W for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:05 -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 1x7Wwl-0001fS-LO for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:04 -0400 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-456-ZEKKeXxONwWV7BBeMmp9Sw-1; Fri, 18 Sep 2026 07:40:01 -0400 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-91049eac948so10366536d6.1 for ; Fri, 18 Sep 2026 04:40:01 -0700 (PDT) Received: from localhost ([174.91.117.74]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-9125800d789sm10562956d6.17.2026.09.18.04.39.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731603; 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=PBaGuPoDATCVPFdrrPM5ytWeOyh4lWlPorysTKBYkuo=; b=cggX5IOYARo/Zg0pJR2udkyJ874QYauyxkFT6QU9WwUPyryCAn1ffvPI6A+V0Dj5y5s2Me 1NKyQOD6uJilHJ7wlaZN67fVZi6xjarnRJP34OY59qXUa3gllfYheGixlyzaQgNqmTYxCJ r6COKrFd2DC4nyZ7tQ6PvIofEiMNe3w= X-MC-Unique: ZEKKeXxONwWV7BBeMmp9Sw-1 X-Mimecast-MFC-AGG-ID: ZEKKeXxONwWV7BBeMmp9Sw_1789731601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731601; x=1790336401; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=PBaGuPoDATCVPFdrrPM5ytWeOyh4lWlPorysTKBYkuo=; b=ruoTRGkqzPqnYiVNjxbsMk6S4/qOgjahETkMvzi5XqUkEOaT8Ek+cpFAzqJzearC/U zgSu0vyMRJ9APgNhvHpRH5B/t+x5QVAjqzFMqze4KKmdGlzF4eT68MA/OaqdKdR4m8Ak nxujyZJ7/VOnUKzQpz8VuR1KKziEe6jaGnjECGMoMm9hslVVLYf/bQT3wnMe/p5pFahx 2xKp6esCSPKo5eY0roryimkGYcr+Vqsid4/2xa3E+P00Xj8+8P8GQj4bCKeZ9jzf3HhH YKDOZ6FAfgYWZQnfvEeYJ7egaWbZE5rdN1yCMV0ouIER1LZ/vHyy/8qmd+7oADHyS4MB aiNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731601; x=1790336401; h=content-transfer-encoding:content-type: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 :content-type; bh=PBaGuPoDATCVPFdrrPM5ytWeOyh4lWlPorysTKBYkuo=; b=0dwLs1dvDVGtrKAWo3J/C5HA6cvn1VhQG7kmYHZkD06xUZnbn+hxlCQusMOKD158Xx Arx02cE7AnLq7r0Okzk6DTRi+LX1C6grFzoChjLbHaO55lkdkJgblisv6GjWtK6QNSN7 domdJ9hQILLbVSGwVZQ0axNYpHTj396n69wn77bv1vziSOORMH95uQjdzzdxSMw/hFDc QlJrDA6yZB+nk2pWKrzK7WU2htOLUN++P2BjQDy+uZJdu7lLhMocclLsIPnQqlQ76bvQ gNmfFPuEyR/a1lzbxA4GYqSMyEqec1pMSnFdDBFYKiMaWDD7pezYR6c2111f/6JHVmHr b+tw== X-Gm-Message-State: AFuF++kCpFnuCgEUpvENEB1N0Us3wGhUrvNgAKhNIP0aaTOpzbSUNbt5 vB70zZ5x7jQVEeYKB+j7JICwxe1cS8x2Xf466vf+uJzpHNjvQ9TmogR7vnFxrpPH9nNk5GNDgBl kBxZNRappG5LgLrHsqKMQ8fSleC7CaMgGP8IrD5u461FZm58Ah+1zpPH36PkGLvbvJOIiT5pKyj 0Yk1vki/IZHFjupL4K7kvM366o+7VfjcK0CGq6PGEI X-Gm-Gg: AYBFou1xMnK6AEIJG7Ld4oQFsMTsXsB5QycfWzdP0jAJBEsVT4Z1Cke67O9PyR0s/Xe sYzE51szWsAmhSR0WibGeQqKUGGFTcZpvdxC7bDctRxQIp6uOMGgtCS2qhMXXGHBRF33jrgjG61 pWAZpbQhBAOIRvYtBFgcOejfp5PT9YyOL8Os/cQvToNlDFv78++yIafxbuHI+DMzokRV2imvKMM 28IbLcdn3/hIRK07vRAPbYxGi4jsp43alAzC9mPLu8W6y/GLf5bbZR4/q88qGjHbf0+U2UKwWxw R2xwyq2u+SC/dSTXIvz+a1ejU+Zbk2azg2K6RCouANQKzwzmc2TKahMjQjKJywGiXfvU X-Received: by 2002:a05:6214:3b81:b0:910:39f5:3747 with SMTP id 6a1803df08f44-91254b3a7e7mr32247876d6.2.1789731601221; Fri, 18 Sep 2026 04:40:01 -0700 (PDT) X-Received: by 2002:a05:6214:3b81:b0:910:39f5:3747 with SMTP id 6a1803df08f44-91254b3a7e7mr32247496d6.2.1789731600685; Fri, 18 Sep 2026 04:40:00 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-arm@nongnu.org Subject: [PULL 03/11] arm/mps: Remove 32bit define for MPS3_DDR_SIZE Date: Fri, 18 Sep 2026 07:39:18 -0400 Message-ID: <20260918113926.831204-4-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789731687623158500 QEMU has switched to 64bit-only hosts for all system emulations. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Link: https://lore.kernel.org/r/20260818172012.3052821-4-peterx@redhat.com Cc: Peter Maydell Cc: qemu-arm@nongnu.org Signed-off-by: Peter Xu --- hw/arm/mps2-tz.c | 9 --------- hw/arm/mps3r.c | 8 -------- 2 files changed, 17 deletions(-) diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 4e6744eddf..7f41a74df1 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -190,16 +190,7 @@ OBJECT_DECLARE_TYPE(MPS2TZMachineState, MPS2TZMachineC= lass, MPS2TZ_MACHINE) =20 /* Slow 32Khz S32KCLK frequency in Hz */ #define S32KCLK_FRQ (32 * 1000) - -/* - * The MPS3 DDR is 2GiB, but on a 32-bit host QEMU doesn't permit - * emulation of that much guest RAM, so artificially make it smaller. - */ -#if HOST_LONG_BITS =3D=3D 32 -#define MPS3_DDR_SIZE (1 * GiB) -#else #define MPS3_DDR_SIZE (2 * GiB) -#endif =20 /* For cpu{0,1}_mpu_{ns,s}, means "leave at SSE's default value" */ #define MPU_REGION_DEFAULT UINT32_MAX diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index eedb877e4b..4bd5d83d56 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -58,15 +58,7 @@ typedef struct RAMInfo { int flags; } RAMInfo; =20 -/* - * The MPS3 DDR is 3GiB, but on a 32-bit host QEMU doesn't permit - * emulation of that much guest RAM, so artificially make it smaller. - */ -#if HOST_LONG_BITS =3D=3D 32 -#define MPS3_DDR_SIZE (1 * GiB) -#else #define MPS3_DDR_SIZE (3 * GiB) -#endif =20 /* * Flag values: --=20 2.55.0 From nobody Sat Sep 26 22:15:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789731646; cv=none; d=zohomail.com; s=zohoarc; b=S9M2lBCOxwBNe25/8OKWSkGUdNBscfw5nrFTmrqBCmx8PBRjJcWRCym57fhSIsjd8hZ9B16Bo9bQA3GI3ocoREIzom1X6NEKys1kYnwYpURZs6VnQDWtz04cwW0tiWuDNdWpGsW2VsyHjTvI1wiHIcNRQZUcWwvCTkKZDD7DNn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731646; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NkBLN6iytHxigslhO22YLF7Mj8QQdsoSIRTOupiudCQ=; b=hw9iWcx/A6yZn1eUMT939syWHZdjJstIXseqqjfJI1zCW87lav4eeAXOezvk7sAdzvasjzNqJA2bhQxFdTug8Hc1A/Jg0gx4CbVEmmyWMuj6/Gsn/FKgThayZ7KVGb7AvCmDpDwibn630FESw9VoJ3tBqedsqwqEzrZgQTvlUpk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1789731646275740.1064648897491; Fri, 18 Sep 2026 04:40:46 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1425181.1649283 (Exim 4.92) (envelope-from ) id 1x7Wws-0000Eb-NU; Fri, 18 Sep 2026 11:40:10 +0000 Received: by outflank-mailman (output) from mailman id 1425181.1649283; Fri, 18 Sep 2026 11:40:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1x7Wws-0000EU-Kf; Fri, 18 Sep 2026 11:40:10 +0000 Received: by outflank-mailman (input) for mailman id 1425181; Fri, 18 Sep 2026 11:40:09 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1x7Wwr-0000EA-LI for xen-devel@lists.xenproject.org; Fri, 18 Sep 2026 11:40:09 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1x7Wwr-00CBMm-1x for xen-devel@lists.xenproject.org; Fri, 18 Sep 2026 13:40:09 +0200 Received: from [10.42.69.3] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aad2314-2eae-0a2a0a5409dd-0a2a4503d444-24 for ; Fri, 18 Sep 2026 13:40:08 +0200 Received: from [170.10.133.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-33051d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aad2317-fae8-0a2a45030019-aa0a857c7833-3 for ; Fri, 18 Sep 2026 13:40:08 +0200 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-664-RljFhzjcNa6PdeDGbFls5A-1; Fri, 18 Sep 2026 07:40:06 -0400 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-530d028f779so7419361cf.2 for ; Fri, 18 Sep 2026 04:40:05 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-532a19a4fa5sm11367371cf.13.2026.09.18.04.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:40:03 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:content-type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731607; 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=NkBLN6iytHxigslhO22YLF7Mj8QQdsoSIRTOupiudCQ=; b=BIGwUnQS4CreXwhsunC/+t8/4d28AItgbLMQ6KlnyYKtxgHr5METY5Pv7OX1cVshcan/3p lwMBOUweCSu+/jUcC1UhM3IRNbeIOsmPRlgHSIib45sp0EEHjp2dHVZXl8lxBBdiuI6+rA shP2o6IQWdamJhmgzD/Pv/K5xWhirfI= X-MC-Unique: RljFhzjcNa6PdeDGbFls5A-1 X-Mimecast-MFC-AGG-ID: RljFhzjcNa6PdeDGbFls5A_1789731605 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731605; x=1790336405; 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:content-type; bh=NkBLN6iytHxigslhO22YLF7Mj8QQdsoSIRTOupiudCQ=; b=UiTRPxJbgvORnmq8bZ+WJStkwKRsVe6/YaU/FdqaXrL8h8ERIZCRYjrDjspacT1Cs8 4bC9saVz3Y49eXHz4M6eZhRw8QiCzOQM3up2zBK/u4OGTC9DH7gZ3XlGO1++nuyfvcza I9bOs0c8WAYJOhLmBm8eUARlBozNWFAOTZb57I3bm0YYAANKQYDiDuPd/qniWukJA5DM iYuLNveu4bMyBIenoB7qa0PXSQ9R9cjzH070raeDMSrO1mz4iYQvXSi+HQsXZHJZNr8S zQrTLYhm4AZUKsnQUBtUVwqK+4pcTx+b/eQNlmK6az+K0Sffll830d5xODN3gyeV96+6 dP8A== X-Forwarded-Encrypted: i=1; AKwUvBx3Hnto0XTCZSb2SIPT3sQ4UwJreTCnZq1aFAMvTnCoxfqx8NbMcBIQzRYi5DU3/Sc5rW52Qq5cAgs=@lists.xenproject.org X-Gm-Message-State: AFuF++kg/JUwbzc0J8DX0/vT/ylz5JjjhWcEBvBrbGeppuBwHaLWKm7n 0szf/o/yyun0kbB2ocDAdA8SOM7yTY4tjKxwknEk33LVBLQ0duyOY/piJPHRH0PwDT5q3yxoqFF JjPdn8UAtmHYisqRcibOT5Z8Yh2OJGFwwsp+1BOG8eyxv8Y8KZsK9plAlMW1OBfMznSFs X-Gm-Gg: AYBFou3ufbauND5NNKOy+GuoZz64hDcxHRaId64MTyXOgbGcx19tx3B71j49lG2NWOq KL2Ccgh9vmh/tu1/GoOKHvPDp25eJln+SYpvV9qJMvMV4yLL80MhUcgUtF/njhSaeDxR52MeI5p bctkAzVb2RH0SZ/O957TQMGLWWenscdKdGG/fBsXTZAt7qHbPwgmNRt7DL3S62MyU9ANhNvYkdV prJp+WWVX+fofTTH16ch3PlDdm1+w58L+5A5aHJcn2Z8f1zT9nhg6TnY6O0eH4j7K4M/MerSEv4 pLis4HNHuzwTrhxH2P0fOEZJ237v20NpluaN3MLM3Aep0lAtElf8QhWoLRHKuSucHHo/RAAW+tN 86wJvvdbsDmuj900KJPijaxKpWci0QNTRs+kVX3UOr77h+GvySdJisylEuF8= X-Received: by 2002:ac8:5dd2:0:b0:531:214b:42b with SMTP id d75a77b69052e-5329e48fed1mr32543671cf.40.1789731605274; Fri, 18 Sep 2026 04:40:05 -0700 (PDT) X-Received: by 2002:ac8:5dd2:0:b0:531:214b:42b with SMTP id d75a77b69052e-5329e48fed1mr32543271cf.40.1789731604756; Fri, 18 Sep 2026 04:40:04 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , Richard Henderson , Stefano Stabellini , Anthony PERARD , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org Subject: [PULL 04/11] xen-mapcache: Remove 32bit support Date: Fri, 18 Sep 2026 07:39:19 -0400 Message-ID: <20260918113926.831204-5-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: rpY_kR2O1po8q49keBN0pdJ7V3BaLDxszMYA40eNPtY_1789731605 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-33051d/1789731608-6ECCB4E9-C9A000B8/0/0 X-purgate-type: clean X-purgate-size: 1444 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789731647451158500 Content-Type: text/plain; charset="utf-8"; x-default="true" QEMU has switched to 64bit-only hosts for all system emulations. Reviewed-by: Richard Henderson Link: https://lore.kernel.org/r/20260818172012.3052821-5-peterx@redhat.com Cc: Stefano Stabellini Cc: Anthony PERARD Cc: "Edgar E. Iglesias" Cc: xen-devel@lists.xenproject.org Signed-off-by: Peter Xu --- hw/xen/xen-mapcache.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c index 85cf0cf359..e30c07c2ee 100644 --- a/hw/xen/xen-mapcache.c +++ b/hw/xen/xen-mapcache.c @@ -26,11 +26,7 @@ #include #include =20 -#if HOST_LONG_BITS =3D=3D 32 -# define MCACHE_MAX_SIZE (1UL<<31) /* 2GB Cap */ -#else -# define MCACHE_MAX_SIZE (1UL<<35) /* 32GB Cap */ -#endif +#define MCACHE_MAX_SIZE (1UL << 35) /* 32GB Cap */ =20 /* This is the size of the virtual address space reserve to QEMU that will= not * be use by MapCache. @@ -151,11 +147,7 @@ void xen_map_cache_init(phys_offset_to_gaddr_t f, void= *opaque) exit(EXIT_FAILURE); } =20 - if (HOST_LONG_BITS =3D=3D 32) { - bucket_shift =3D 16; - } else { - bucket_shift =3D 20; - } + bucket_shift =3D 20; =20 if (geteuid() =3D=3D 0) { rlimit_as.rlim_cur =3D RLIM_INFINITY; --=20 2.55.0 From nobody Sat Sep 26 22:15:44 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=1789731708; cv=none; d=zohomail.com; s=zohoarc; b=LscwSk9A67FQVU+WU74GkvEg0v3/Vbuwa75fbfhHJ4STOlB4D10+xfMGhP8HFiu3rRQWNH7FC85U5Wy9KB9O1mXwPjs298hLZSUXdwnRQ0zhjB8IpI9krSoc8xjx2hAZTWHf09BHD39O/a8Abj7dpG3XZeFlEcFsgUzxiK5bG3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731708; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=f0YAk1LgwLEMJZh6lGah9roTe2m/EXT2KmvH9Za1r6I=; b=Rj+e4fK7NtZmCRG1i7a/CE0gVv1GiZTZcslVglyIKWIPsKqrFothGzcToDGeicDUrXmq8KONQZB9/2PhKlbTLxkDIQ27qxh4oZu8h3cNA11Ka1xndDIKNU/morI5oxxBt4ME6n+95OFXLcW9iiEL9LyyT87tYTS5PvBPqPLLX/M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789731708737527.1299989067143; Fri, 18 Sep 2026 04:41:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7Wx1-0000Vc-Jv; Fri, 18 Sep 2026 07:40:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7Wx0-0000VB-5n for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:18 -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 1x7Wwy-0001rz-Fa for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:17 -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-625-keWH_FP5Nh6Tji5FeLem4g-1; Fri, 18 Sep 2026 07:40:14 -0400 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-93a00c70d28so95435285a.0 for ; Fri, 18 Sep 2026 04:40:14 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id af79cd13be357-93be0a9eb64sm121185985a.0.2026.09.18.04.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:40:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731615; 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=f0YAk1LgwLEMJZh6lGah9roTe2m/EXT2KmvH9Za1r6I=; b=fQ7JxnDjwjnY0jz6ozEMt7OV4VCyQLkMD9h0k89PkA8sEXEJok+RD4l2R2QvhYT3b5+NSS ZG4tx8AeCYfnkUfTffEirLuY7ZPrHTikDuk2WSlPcC+wbd5qj8gafK+/n0nCHrmHmQ1eKR 1r9tt7dbOrXNj/Gl0aRTRFcF2eaXsl4= X-MC-Unique: keWH_FP5Nh6Tji5FeLem4g-1 X-Mimecast-MFC-AGG-ID: keWH_FP5Nh6Tji5FeLem4g_1789731613 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731613; x=1790336413; 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:content-type; bh=f0YAk1LgwLEMJZh6lGah9roTe2m/EXT2KmvH9Za1r6I=; b=nBECGrW4eO0+7RwgtFYz1VH9t1LbiWN0Im5atW2u5Ht8XIJwFbGgLkw4fBgA6Ze0LO 1GNXnChAOIQcMaN0u87HoWGYMlhDT4Z4B3UVWpB+GSS3SOMtqxVp7+cF483CZnkc/sjf bQVACn8cxn/4FtgfvKsjdoeF6EWBCFcjCU+k+RWdLvCxONC1DfAzUzzWWEVyZMHuiIvA hvBHuzm9DvCKrSapIeE4GsRyqlTrnAgUQneZdE65gIk6o+Td7hOZQL6Si9wYpPR3geyw aeu0ZcggqAb0PGIBfsg+FGpIsiEDBhTRnQSQ2xmQzU52XBTbDWboscNX69bH6jxQ+OJG sCOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731613; x=1790336413; 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:content-type; bh=f0YAk1LgwLEMJZh6lGah9roTe2m/EXT2KmvH9Za1r6I=; b=Z6l75YTq8luGvAN8tUJATmK4uxD/OlWG4ZiBS5Hxqm4v5FBd6qPrHBNPg50VVwQF9l sR8KOztAfYYDK8Zm8o+iwsGxoTbssoixOc9s9tEUVR6JKGQcIzSEEvChCZ1B5UEpnee5 t0wAnLvuFh+GwJINQpPo+99fNbemEJ+nJ+TsWxJGtpNz+kJrzSngb8yM+fShBC46OIho JHZ4Erzr7wKk3k8m9l9kAwA61OcYgLJNfoTj+JbnAGYwgQFi1ihGtmqkQi+mgZ7EPdmj dvXGMB2kPVOURk/FP8MeWAqrZIecWXLjNolz2dvUoR4WXg4JA7TQIyDU16miuXNhmfWU kNcw== X-Gm-Message-State: AFuF++nQgDJWV+4TIa72CO2LgIq4WfHZvxSIJJlVsMS3X4g69tybH2e6 XYRQ/S/QARKkJNIvrf2vzT/pJ/mtsTsiWMzdKLJx6rEhPYVTyeS1qnMDYIYiniRqyBeNwUFF4BX YEpLCll3bfG9aevKIEmZahp7WKP3sU/6m4foh7Wx5rEv9uJTnclkPF84gxj3Q2W2z6HlvorSag/ jKIeeYLVb6zjjhnxssSPoJpH/aM57Z3Rq56MsdC/MZ X-Gm-Gg: AYBFou0sICyexPfaaGj1IdV6m4rb0hh0scKcGUDRYrytrGReDc37ZIQr09VIO9x0gQw ZHilad3fxwhs3KrSvj5B80fj96bk3EbpZANVMKAxTk7Lf2msoN9lzSfH7XV11XEVlgoTQGXN8qP Ra/mYwV3QaSfUcQS1DYS02UktCCvoi7g0bVxqW9+WJtxb4vrso1TpPnxEUxzNI7pIVLcZdGu+wj n6YcasXcKDt9bHm5Il1KPgOAQsCyRCjtDkireS0sXm3Gjv+3HV2SRAC2mXRUcI8FR8bajyV0liU yYce2NIUL3hv97Ta4LhHitkuKOYV2Qj8hbKJ4t1LbdYK+HtOrJW5pCjTFh58MATF+nkTUbYSQ6Z 3QBgZFSQPxJxeEzRYfJrxdLCSf1Lmh2/Bc6f5kQUSIF7LCVIj9DUTWOI9KzU= X-Received: by 2002:a05:620a:6493:b0:93b:d7a2:83d5 with SMTP id af79cd13be357-93bdca24c27mr251790185a.68.1789731613479; Fri, 18 Sep 2026 04:40:13 -0700 (PDT) X-Received: by 2002:a05:620a:6493:b0:93b:d7a2:83d5 with SMTP id af79cd13be357-93bdca24c27mr251785285a.68.1789731612873; Fri, 18 Sep 2026 04:40:12 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , Warner Losh , Richard Henderson , Kyle Evans Subject: [PULL 05/11] bsd-user: Remove 32bit host support in thunk_convert|print() Date: Fri, 18 Sep 2026 07:39:20 -0400 Message-ID: <20260918113926.831204-6-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789731709882158500 Content-Type: text/plain; charset="utf-8" QEMU has switched to 64bit-only hosts for all system/user emulations. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Link: https://lore.kernel.org/r/20260818172012.3052821-6-peterx@redhat.com Cc: Warner Losh Cc: Kyle Evans Signed-off-by: Peter Xu --- bsd-user/thunk.c | 47 +++-------------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/bsd-user/thunk.c b/bsd-user/thunk.c index 3c89ae3ab8..6703286609 100644 --- a/bsd-user/thunk.c +++ b/bsd-user/thunk.c @@ -134,13 +134,7 @@ const argtype *thunk_convert(void *dst, const void *sr= c, case TYPE_ULONGLONG: *(uint64_t *)dst =3D tswap64(*(uint64_t *)src); break; -#if HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 32 - case TYPE_LONG: - case TYPE_ULONG: - case TYPE_PTRVOID: - *(uint32_t *)dst =3D tswap32(*(uint32_t *)src); - break; -#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 32 +#if TARGET_ABI_BITS =3D=3D 32 case TYPE_LONG: case TYPE_ULONG: case TYPE_PTRVOID: @@ -155,27 +149,12 @@ const argtype *thunk_convert(void *dst, const void *s= rc, *(uint32_t *)dst =3D tswap32(*(uint64_t *)src & 0xffffffff); } break; -#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 64 +#elif TARGET_ABI_BITS =3D=3D 64 case TYPE_LONG: case TYPE_ULONG: case TYPE_PTRVOID: *(uint64_t *)dst =3D tswap64(*(uint64_t *)src); break; -#elif HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 64 - case TYPE_LONG: - case TYPE_ULONG: - case TYPE_PTRVOID: - if (to_host) { - *(uint32_t *)dst =3D tswap64(*(uint64_t *)src); - } else { - if (type =3D=3D TYPE_LONG) { - /* sign extension */ - *(uint64_t *)dst =3D tswap64(*(int32_t *)src); - } else { - *(uint64_t *)dst =3D tswap64(*(uint32_t *)src); - } - } - break; #else #warning unsupported conversion #endif @@ -283,17 +262,7 @@ const argtype *thunk_print(void *arg, const argtype *t= ype_ptr) case TYPE_ULONGLONG: qemu_log("%" PRIu64, tswap64(*(uint64_t *)arg)); break; -#if HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 32 - case TYPE_PTRVOID: - qemu_log("0x%" PRIx32, tswap32(*(uint32_t *)arg)); - break; - case TYPE_LONG: - qemu_log("%" PRId32, tswap32(*(uint32_t *)arg)); - break; - case TYPE_ULONG: - qemu_log("%" PRIu32, tswap32(*(uint32_t *)arg)); - break; -#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 32 +#if TARGET_ABI_BITS =3D=3D 32 case TYPE_PTRVOID: qemu_log("0x%" PRIx32, tswap32(*(uint64_t *)arg & 0xffffffff)); break; @@ -303,16 +272,6 @@ const argtype *thunk_print(void *arg, const argtype *t= ype_ptr) case TYPE_ULONG: qemu_log("%" PRIu32, tswap32(*(uint64_t *)arg & 0xffffffff)); break; -#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 64 - case TYPE_PTRVOID: - qemu_log("0x%" PRIx64, tswap64(*(uint64_t *)arg)); - break; - case TYPE_LONG: - qemu_log("%" PRId64, tswap64(*(uint64_t *)arg)); - break; - case TYPE_ULONG: - qemu_log("%" PRIu64, tswap64(*(uint64_t *)arg)); - break; #else case TYPE_PTRVOID: qemu_log("0x%" PRIx64, tswap64(*(uint64_t *)arg)); --=20 2.55.0 From nobody Sat Sep 26 22:15:44 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=1789731697; cv=none; d=zohomail.com; s=zohoarc; b=l0VNQk/lfK/MCM1yQFi7SVfVTZvMuajJpeZorbhGOmiPW/hvlihMoOW0ijipwO5EHs2c9OAq6Anauw6jTtVmkIuPRF5BQSz6MokvMe2SNj2rOBPjpZDZrETFK49uWyfGJln0hHVJ7y//AaUAqNi3ppsUSvYgd3iDWjlK5t4VZQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731697; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kaFcT6CYHC1FcV/k1jfKLkRPjoNRmIXg++hBLZu8564=; b=QjH8CIvD2kCN8KdJ5gsIwWJfmqCNKbk4NNV0vA+rrBK6DuQaiOxoZWz8e+W687qK0tblbs0gOwXfZoDCALvNz+O4xTsJfj4gTJRlHWXtsUCiD3jtMBlZKUO8Qoj7gBwToHLXOi+q0BeBIfpg5c1DdWsv/dIdkBCER9M/owTdmPY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789731697935403.4155308819396; Fri, 18 Sep 2026 04:41:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7WxE-0000X5-LD; Fri, 18 Sep 2026 07:40:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7Wx7-0000W6-C7 for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:26 -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 1x7Wx5-0001sj-Gd for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:25 -0400 Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-ebLQijuNM9OKHryjtOeqMA-1; Fri, 18 Sep 2026 07:40:21 -0400 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-91064f6e75bso20156786d6.3 for ; Fri, 18 Sep 2026 04:40:21 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-9125802adb7sm10539456d6.18.2026.09.18.04.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731622; 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=kaFcT6CYHC1FcV/k1jfKLkRPjoNRmIXg++hBLZu8564=; b=PjF0001whuOJxiECgz90hqji0blFmpCBWZbmYZ1MwRVRhhrlCjDsHE5zA68sSCykHydYBM p/FVxIzMy3U9d799jOJTwfNlqv95/8u/kRHjFqXOjMGA1GU8E1KebbDfu4GMQZyYL+zmDj Bp7MDjoq4kXygFQZUXH9vtHisYcyvyk= X-MC-Unique: ebLQijuNM9OKHryjtOeqMA-1 X-Mimecast-MFC-AGG-ID: ebLQijuNM9OKHryjtOeqMA_1789731621 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731621; x=1790336421; 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:content-type; bh=kaFcT6CYHC1FcV/k1jfKLkRPjoNRmIXg++hBLZu8564=; b=jEd8mSrANRv6wG/SrxR1j7bDPy2/wqQkQptEZk+ruBPCA4+mQmSqB1E0Qr0v5XR0nC bqYagPTSdgp1IwD07MCF1T8xCYSCcllk9kUmjKqv7E5i4BeELIojYKW8KSY8sBleni6d HFXY5CUWsH70mSVrD/XEajgz1xsYc4qa0pEwtHJIDsPtmSli5mi3AdOy6MAIrqR4k658 +YqHu9kH26gG9RWHu0PEsktOPJLJJVjznQb4CNgkN7XsPgMRVtP25FKKEfYLjbq/4BJu 6quVS4HXE9bqnj6YaOL7RaKqd0qmdygvwB7D3NMjTO1Ha23pKY+Jqk7JnIq68JXskt3A EDmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731621; x=1790336421; 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:content-type; bh=kaFcT6CYHC1FcV/k1jfKLkRPjoNRmIXg++hBLZu8564=; b=HRXFmAbW9bd3tq3j4QiGMUT7ZpDalkkg5FJFkhHezbQJ/uPBIgwVDy+O8Cj4GgUDbe 60JImE/u5UMGNrVjEOfoj+tgOieb5HZ6LH+YTpih84xSgbvtZnBlW8AXIkrQm8PYQXiG eFevo0hc0Xx/Jlg1451xVQZGx8cu9rsiNBMPXUAudh3oKI5mPBTBrQOAoR5PvU5dTtUK ZfVhRjzpvnnbr2aifNYdg9RT9kSwBT9aFox57y1Fx0NtIxzjopYb6MFf69gAF79JBWPM a0giD3HoY8j6j4X6lL6DLuzGtVKxyH7if/OkU8DtGOJZ+oc3YOhrq6Hb/cPC7zKYZdfz FQ4A== X-Gm-Message-State: AFuF++kNqTvSoWQd3HsepvASbnIha7aNmaL88LeBHU5XnMrLM+x8ZoFR N7KgRB8VYdRtTw19WJ/v88ZXgfGV2388W7SRZpOvAp7foEbTdAkgF7OvwmiIDycDPH9wRaxOZjM RiiGL3dQWIPgMJT7lFLsgJPib9896JamoJciAyeQiTTxSwCarla2h2pm5T3RMIaweVMBr6ffdBO zFqR7QZ99iwqTsZa46WAN28PpJx9ptZLcIh6LkoZNy X-Gm-Gg: AYBFou0S4dkJGX0D3Aq8dG4ysn/Ur3to/bMiA9W/ZjZ/LPbc6oL8S5BkgrfrW/bJ1t7 7lKrsS7BK1nX4hnUBEYR5KbqsBe6svw5UiFFLnNppjk/jvGYygVi0CHWzkUeRO/8m3q7Sj/oUjM Fh8BeSf/yBvczKwnRE/QQeY4VyOgM3HU2QUt82Dk99RCWT0y2Py6og6rIvk4M/UyLfoq+BNBzfH /T+7mpuC1W2DveztxUrBE9cBypYBf6wI08wqiLTCyBihtKKTbLA5uQbt9UCumwKCn7SrlVBbobN xCfW88+FzDrWFH0uc6d/yCin9xo+IqUbNj1l4FsFTueOuDgaw9qg78Xcpm4XHZwpQT25oILJ/ZY qxZdXyGUonIUF/z77qDfIUHc3YBSy64LnWPpvD+La+od8+P3MbgRmjdIs2H4= X-Received: by 2002:a05:6214:334:b0:912:517b:40fb with SMTP id 6a1803df08f44-91254c26a2emr26036516d6.45.1789731620996; Fri, 18 Sep 2026 04:40:20 -0700 (PDT) X-Received: by 2002:a05:6214:334:b0:912:517b:40fb with SMTP id 6a1803df08f44-91254c26a2emr26036126d6.45.1789731620448; Fri, 18 Sep 2026 04:40:20 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , Richard Henderson , Laurent Vivier , Helge Deller , Pierrick Bouvier Subject: [PULL 06/11] linux-user: Remove 32bit host support in thunk_convert|print() Date: Fri, 18 Sep 2026 07:39:21 -0400 Message-ID: <20260918113926.831204-7-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789731703655158500 Content-Type: text/plain; charset="utf-8" QEMU has switched to 64bit-only hosts for all system/user emulations. Reviewed-by: Richard Henderson Link: https://lore.kernel.org/r/20260818172012.3052821-7-peterx@redhat.com Cc: Laurent Vivier Cc: Helge Deller Cc: Pierrick Bouvier Signed-off-by: Peter Xu --- linux-user/thunk.c | 47 +++------------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/linux-user/thunk.c b/linux-user/thunk.c index 3cd19e79c6..892ff3d154 100644 --- a/linux-user/thunk.c +++ b/linux-user/thunk.c @@ -145,13 +145,7 @@ const argtype *thunk_convert(void *dst, const void *sr= c, case TYPE_ULONGLONG: *(uint64_t *)dst =3D tswap64(*(uint64_t *)src); break; -#if HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 32 - case TYPE_LONG: - case TYPE_ULONG: - case TYPE_PTRVOID: - *(uint32_t *)dst =3D tswap32(*(uint32_t *)src); - break; -#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 32 +#if TARGET_ABI_BITS =3D=3D 32 case TYPE_LONG: case TYPE_ULONG: case TYPE_PTRVOID: @@ -166,27 +160,12 @@ const argtype *thunk_convert(void *dst, const void *s= rc, *(uint32_t *)dst =3D tswap32(*(uint64_t *)src & 0xffffffff); } break; -#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 64 +#elif TARGET_ABI_BITS =3D=3D 64 case TYPE_LONG: case TYPE_ULONG: case TYPE_PTRVOID: *(uint64_t *)dst =3D tswap64(*(uint64_t *)src); break; -#elif HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 64 - case TYPE_LONG: - case TYPE_ULONG: - case TYPE_PTRVOID: - if (to_host) { - *(uint32_t *)dst =3D tswap64(*(uint64_t *)src); - } else { - if (type =3D=3D TYPE_LONG) { - /* sign extension */ - *(uint64_t *)dst =3D tswap64(*(int32_t *)src); - } else { - *(uint64_t *)dst =3D tswap64(*(uint32_t *)src); - } - } - break; #else #warning unsupported conversion #endif @@ -294,17 +273,7 @@ const argtype *thunk_print(void *arg, const argtype *t= ype_ptr) case TYPE_ULONGLONG: qemu_log("%" PRIu64, tswap64(*(uint64_t *)arg)); break; -#if HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 32 - case TYPE_PTRVOID: - qemu_log("0x%" PRIx32, tswap32(*(uint32_t *)arg)); - break; - case TYPE_LONG: - qemu_log("%" PRId32, tswap32(*(uint32_t *)arg)); - break; - case TYPE_ULONG: - qemu_log("%" PRIu32, tswap32(*(uint32_t *)arg)); - break; -#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 32 +#if TARGET_ABI_BITS =3D=3D 32 case TYPE_PTRVOID: qemu_log("0x%" PRIx32, tswap32(*(uint64_t *)arg & 0xffffffff)); break; @@ -314,16 +283,6 @@ const argtype *thunk_print(void *arg, const argtype *t= ype_ptr) case TYPE_ULONG: qemu_log("%" PRIu32, tswap32(*(uint64_t *)arg & 0xffffffff)); break; -#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 64 - case TYPE_PTRVOID: - qemu_log("0x%" PRIx64, tswap64(*(uint64_t *)arg)); - break; - case TYPE_LONG: - qemu_log("%" PRId64, tswap64(*(uint64_t *)arg)); - break; - case TYPE_ULONG: - qemu_log("%" PRIu64, tswap64(*(uint64_t *)arg)); - break; #else case TYPE_PTRVOID: qemu_log("0x%" PRIx64, tswap64(*(uint64_t *)arg)); --=20 2.55.0 From nobody Sat Sep 26 22:15:44 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=1789731695; cv=none; d=zohomail.com; s=zohoarc; b=l/ekLlHnjXsWBORLGH85vDJDePNWPXyC80owlmFHL+XH/tUrSbfFEaJS+QYnuM7zI8cMGrRFgIF1MXgXv+2WCk0gqMyb4Zq71HsZyHmJVtTqfRWcbxAqzdWAnmgHDAE6HZZKakn7aqyHtpxPrDQM+s15f1FpCT/SQYylLTgHBu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731695; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=25/usmhwYv9RzdhvH+4Pmb2C2DxCeoy0YmGdWnXznT4=; b=lxhJNQYfBpUX8iB2Mrri9BiLz6t8AxhY1ZxB5IZ2nrLsxNMhKCj0iLteddQQ1EbtNS8e4jC6PS9E9iUAy8+BucY90PRE2LJb4wq/QupwkyQJK3X7Phv83CXeXGBjUjTk7IdyR4g22R/zdJxMagYCCLQM4szXZ1DsHjyJuvnMMI8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789731695606574.5659138425074; Fri, 18 Sep 2026 04:41:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7WxH-0000Y9-6n; Fri, 18 Sep 2026 07:40:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7WxA-0000Wj-Gx for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:28 -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 1x7Wx8-0001tB-Pi for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:28 -0400 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-dNvFC6MYOH6gtc7HQMkytA-1; Fri, 18 Sep 2026 07:40:24 -0400 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-91219341db7so13225466d6.1 for ; Fri, 18 Sep 2026 04:40:24 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id af79cd13be357-93be0ead31asm116851585a.25.2026.09.18.04.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:40:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731626; 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=25/usmhwYv9RzdhvH+4Pmb2C2DxCeoy0YmGdWnXznT4=; b=VJpITeSbRk4mDm9wrigvMT0KN4T290IEb9CudBPVv7z3wxo9J2StSmaRbkoUGXJtnxf55O U0+KNAkTqUnLg/uxM0BReeHIfeidIR3+fh1GnM4Z5cJF9BB2nWJOHG1oclbVk9WO9Sa+Bx BAqJ4dYZIux87cDF7hHxhB15GXj/FOg= X-MC-Unique: dNvFC6MYOH6gtc7HQMkytA-1 X-Mimecast-MFC-AGG-ID: dNvFC6MYOH6gtc7HQMkytA_1789731624 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731624; x=1790336424; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=25/usmhwYv9RzdhvH+4Pmb2C2DxCeoy0YmGdWnXznT4=; b=qUo2zymkjVVkniar+JoZea7meP6J9xiTI4Zkrr7UDcAVraKMmKYO1B6i1roXLsaUxl wJTsMlorjjRSac0AzAWSx59RctHOPjuaS/NCu6xLbWDGrO/jArZPftPYJlTc8d1hCSef A+EX7HoqIIsYOgTjBs/DjqLJ/u9YBgcRtPm32QzyQs3Yk6wCHjVuulo/y/VBggs9pp35 YBg1wHgSl/yKYwTL5lNaXE2pUxoGJM89o3UmGOidro2i7xE/jmb1jV4iMkYjCNGV4fyp TF8F6v5x/dUPrcAw0u1vpMhdSdZMDaZifi0jCSi2SzjEWCrgQYgJ+9hRKNc52UUf8fwu WCdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731624; x=1790336424; h=content-transfer-encoding:content-type: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 :content-type; bh=25/usmhwYv9RzdhvH+4Pmb2C2DxCeoy0YmGdWnXznT4=; b=FxtWFn4uD4CcO0JbZzt0AiqagbMQJuk2txBZq7GoB98jSLEwY8Ss7N6SQhz5vYsgZI 6/l1L2iervPfUvTLXZa6r9DcWOXKvn74rIq0kKgzBwMgPHtsgZRh0h2Zh6wJgJQhjSHQ E+Iqemq1uB1ANO9F7CkpCd+iBV2BWeD1TQJxjy8tuCYRxC8DEBaCNTa5ZA6WCNKU/Qvg LzkZ3RFflZQtf11SHVA/hOb74/Zl+is1450OnzjVjEgqj4op1eB5oNUkgugDFoehC6cu tJk0jDjQXipt/5lHONnUtsc1nnO1Nkf3+AD7MXU2NDVEBOb3tnYSN6J4myOC0JcidZT2 rGRQ== X-Gm-Message-State: AFuF++nwiEfnkY3XBVqr8mBsWSDCf1Y022WqT78LOxvFUNiugIEnTkM4 IQw/LFLhqMoboohxjbop1mSd+gE8ICv6WW1rHIG/Fj9lq3tw6BFl10u6UuWn2/T8TNFKkt2tMxh W8KtDPKoodaqtwlpmQGEhO+r0MXSX6GdxyScwToXEcjUtosNV6fn8DHgC0jrqyrHZ0EqKyRQLKW vG+XWPlD3XPDGq9QzkUVsvxaVdfG1c7pru8DwhB5zF X-Gm-Gg: AYBFou1MOxfA9bZ/rljgnRjRYM61DUmrTUu1ue38cI1XU6LuuF2q6yzzfFD0oD4wAc+ A6K4qWnxNZL6zYHE3VQnNkRzSpu9pH9aCi/XBYiWPr/AYHlBiT2v3GLsD7XTZWhxZ3Eb9/OOrTZ zO316ocyp+Ljv0wI9GrInkPIpjw/5IWFwQdAOUodluS+Ga4vFu/1zu6frphLiQ/Z26928VKhpkJ eZXLe+jCLWTlDc1wJ2YVr1uWQ7Eld328LDAWS7vafIjHdrtd6OLwwVOPNQo37yEqje6ZcoN10CJ oc1hNE+7jrLha9bJEj5WnwZcKPzQO4zd6Ps6G2hS0Ae7x3bPxZmu4ho3CEVqjJHseNqeOFPkW9a E1bm4uaYxSC//UU3SRXXClyv40qdrdtZQ+Ucfdn6K/lVhWiWfrV8I8rfus7E= X-Received: by 2002:a05:620a:268d:b0:934:ab73:ac53 with SMTP id af79cd13be357-93bdc475a1fmr265022785a.0.1789731624078; Fri, 18 Sep 2026 04:40:24 -0700 (PDT) X-Received: by 2002:a05:620a:268d:b0:934:ab73:ac53 with SMTP id af79cd13be357-93bdc475a1fmr265017885a.0.1789731623454; Fri, 18 Sep 2026 04:40:23 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Steven Lee , Troy Lee , Jamin Lin , Kane Chen , Andrew Jeffery , Joel Stanley , qemu-arm@nongnu.org Subject: [PULL 07/11] arm/aspeed: Drop ASPEED_RAM_SIZE Date: Fri, 18 Sep 2026 07:39:22 -0400 Message-ID: <20260918113926.831204-8-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1789731698068158500 QEMU has switched to 64bit-only hosts for all system/user emulations. It's not needed anymore. Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Link: https://lore.kernel.org/r/20260818172012.3052821-8-peterx@redhat.com Cc: "C=C3=A9dric Le Goater" Cc: Peter Maydell Cc: Steven Lee Cc: Troy Lee Cc: Jamin Lin Cc: Kane Chen Cc: Andrew Jeffery Cc: Joel Stanley Cc: qemu-arm@nongnu.org [peterx: fix aspeed_ast2600_sanmiguel.c, recently added in b6bcec6c2] Signed-off-by: Peter Xu --- include/hw/arm/aspeed.h | 7 ------- hw/arm/aspeed_ast2600_anacapa.c | 2 +- hw/arm/aspeed_ast2600_bletchley.c | 2 +- hw/arm/aspeed_ast2600_catalina.c | 2 +- hw/arm/aspeed_ast2600_fby35.c | 2 +- hw/arm/aspeed_ast2600_fuji.c | 2 +- hw/arm/aspeed_ast2600_gb200nvl.c | 2 +- hw/arm/aspeed_ast2600_sanmiguel.c | 2 +- 8 files changed, 7 insertions(+), 14 deletions(-) diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h index 54f0d7643d..989d39528e 100644 --- a/include/hw/arm/aspeed.h +++ b/include/hw/arm/aspeed.h @@ -26,13 +26,6 @@ DECLARE_OBJ_CHECKERS(AspeedMachineState, AspeedMachineCl= ass, #define ASPEED_MAC2_ON (1 << 2) #define ASPEED_MAC3_ON (1 << 3) =20 -/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ -#if HOST_LONG_BITS =3D=3D 32 -#define ASPEED_RAM_SIZE(sz) MIN((sz), 1 * GiB) -#else -#define ASPEED_RAM_SIZE(sz) (sz) -#endif - struct AspeedMachineState { MachineState parent_obj; =20 diff --git a/hw/arm/aspeed_ast2600_anacapa.c b/hw/arm/aspeed_ast2600_anacap= a.c index 697be58b0e..25578db589 100644 --- a/hw/arm/aspeed_ast2600_anacapa.c +++ b/hw/arm/aspeed_ast2600_anacapa.c @@ -17,7 +17,7 @@ =20 #define ANACAPA_BMC_HW_STRAP1 0x00002002 #define ANACAPA_BMC_HW_STRAP2 0x00000000 -#define ANACAPA_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) +#define ANACAPA_BMC_RAM_SIZE (2 * GiB) =20 /* * "Anacapa HPM (MB)" FRU data. Generated with frugen. diff --git a/hw/arm/aspeed_ast2600_bletchley.c b/hw/arm/aspeed_ast2600_blet= chley.c index 2822f6bdf5..6fa606c047 100644 --- a/hw/arm/aspeed_ast2600_bletchley.c +++ b/hw/arm/aspeed_ast2600_bletchley.c @@ -17,7 +17,7 @@ /* Bletchley hardware value */ #define BLETCHLEY_BMC_HW_STRAP1 0x00002000 #define BLETCHLEY_BMC_HW_STRAP2 0x00000801 -#define BLETCHLEY_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) +#define BLETCHLEY_BMC_RAM_SIZE (2 * GiB) =20 static void bletchley_bmc_i2c_init(AspeedMachineState *bmc) { diff --git a/hw/arm/aspeed_ast2600_catalina.c b/hw/arm/aspeed_ast2600_catal= ina.c index ad2953dfea..4f2b396f6f 100644 --- a/hw/arm/aspeed_ast2600_catalina.c +++ b/hw/arm/aspeed_ast2600_catalina.c @@ -19,7 +19,7 @@ /* Catalina hardware value */ #define CATALINA_BMC_HW_STRAP1 0x00002002 #define CATALINA_BMC_HW_STRAP2 0x00000800 -#define CATALINA_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) +#define CATALINA_BMC_RAM_SIZE (2 * GiB) =20 #define TYPE_TMP421 "tmp421" #define TYPE_DS1338 "ds1338" diff --git a/hw/arm/aspeed_ast2600_fby35.c b/hw/arm/aspeed_ast2600_fby35.c index 65d98fafec..28c9c143d8 100644 --- a/hw/arm/aspeed_ast2600_fby35.c +++ b/hw/arm/aspeed_ast2600_fby35.c @@ -16,7 +16,7 @@ =20 #define TYPE_LM75 TYPE_TMP105 #define TYPE_TMP421 "tmp421" -#define FBY35_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) +#define FBY35_BMC_RAM_SIZE (2 * GiB) =20 static const uint8_t fby35_nic_fruid[] =3D { 0x01, 0x00, 0x00, 0x01, 0x0f, 0x20, 0x00, 0xcf, 0x01, 0x0e, 0x19, 0xd7, diff --git a/hw/arm/aspeed_ast2600_fuji.c b/hw/arm/aspeed_ast2600_fuji.c index dae0239387..08d809b2fd 100644 --- a/hw/arm/aspeed_ast2600_fuji.c +++ b/hw/arm/aspeed_ast2600_fuji.c @@ -19,7 +19,7 @@ /* Fuji hardware value */ #define FUJI_BMC_HW_STRAP1 0x00000000 #define FUJI_BMC_HW_STRAP2 0x00000000 -#define FUJI_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) +#define FUJI_BMC_RAM_SIZE (2 * GiB) =20 static void get_pca9548_channels(I2CBus *bus, uint8_t mux_addr, I2CBus **channels) diff --git a/hw/arm/aspeed_ast2600_gb200nvl.c b/hw/arm/aspeed_ast2600_gb200= nvl.c index 311feb8202..c9c0b6cb6e 100644 --- a/hw/arm/aspeed_ast2600_gb200nvl.c +++ b/hw/arm/aspeed_ast2600_gb200nvl.c @@ -15,7 +15,7 @@ /* GB200NVL hardware value */ #define GB200NVL_BMC_HW_STRAP1 0x000000C0 #define GB200NVL_BMC_HW_STRAP2 0x00000003 -#define GB200NVL_BMC_RAM_SIZE ASPEED_RAM_SIZE(1 * GiB) +#define GB200NVL_BMC_RAM_SIZE (1 * GiB) =20 static const uint8_t gb200nvl_bmc_fruid[] =3D { 0x01, 0x00, 0x00, 0x01, 0x0b, 0x00, 0x00, 0xf3, 0x01, 0x0a, 0x19, 0x1f, diff --git a/hw/arm/aspeed_ast2600_sanmiguel.c b/hw/arm/aspeed_ast2600_sanm= iguel.c index 599ef1701f..345a9c9416 100644 --- a/hw/arm/aspeed_ast2600_sanmiguel.c +++ b/hw/arm/aspeed_ast2600_sanmiguel.c @@ -18,7 +18,7 @@ /* SanMiguel hardware values */ #define SANMIGUEL_BMC_HW_STRAP1 0x00002002 #define SANMIGUEL_BMC_HW_STRAP2 0x00000000 -#define SANMIGUEL_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) +#define SANMIGUEL_BMC_RAM_SIZE (2 * GiB) =20 #define TYPE_DS1338 "ds1338" =20 --=20 2.55.0 From nobody Sat Sep 26 22:15:44 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=1789731689; cv=none; d=zohomail.com; s=zohoarc; b=Mg32kEldNjmLF4Pjf7sHw7+AtqeHimSTLYiKMOmrKQr1CsWE1YP1qCZlVydtaGpwxdlqkojK5yNCUFLLCOmrpIcTjHnZjgbSkLrqQKiOxSWsYOPytEpjuZTE0jZuzpbvVYRVSeovNp67phB2Uzn/avyeJub+3pWgIz5yesgM8Fo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731689; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yJvHfKiX7PEwhtXR3zEFacUgadXzigtW25CODwRwitc=; b=IV4kVJNn9GRu2Drk3bkik20z7ahKTEMeygrvbpCn7SgYuh0se584n/MtQWebxCYtcGr2wtGric2ekBV+DaLcYMzgsWuj9Ukcoxw0xLGwnsArKYjIcUIXTxn6WFBbmWZGw8pL+splZG6eKSm4Rw9dr73gV3XzGDKfNoAKe2QPq28= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789731689037843.2509393002445; Fri, 18 Sep 2026 04:41:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7Wxr-0001IU-KY; Fri, 18 Sep 2026 07:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7WxK-0000el-MF for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:39 -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 1x7WxH-0001uE-Vt for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:37 -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-481-5ApGmaluNOmZBNBo-jOhMQ-1; Fri, 18 Sep 2026 07:40:28 -0400 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-939d6c515deso133827385a.3 for ; Fri, 18 Sep 2026 04:40:28 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91257f2d2fdsm10904636d6.5.2026.09.18.04.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:40:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731635; 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=yJvHfKiX7PEwhtXR3zEFacUgadXzigtW25CODwRwitc=; b=OpHFN0ItEIiFPYCjJKz8WUR+siSxwHzpzmaS+6RnecCbcVXR7h8ISEMl2VJ5Ofm+MsGMWE J8hKaLtfeHV1WDNdOfC7J/LZDj4dfY3kdFOO0GaNVxofAtmfqnJnTcsyB+AytKGWHmGGYL 6l9FbrdL5pD4DOFxW7Oos1bbN9zKceY= X-MC-Unique: 5ApGmaluNOmZBNBo-jOhMQ-1 X-Mimecast-MFC-AGG-ID: 5ApGmaluNOmZBNBo-jOhMQ_1789731628 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731628; x=1790336428; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=yJvHfKiX7PEwhtXR3zEFacUgadXzigtW25CODwRwitc=; b=Vc0KoHfsmD6bA/s1g3mFgb6FK9+zIPNaxXombhrAvfEYRFynII8k8N46XZEJSLESCs gSoyR9CuJYx2qEXM6tECEjMhj6M9J2qhsErpJeKTjsngtyFnxemjElptL1OtSZGrEzat wt6HqgWPqPHWNPbj075/WdruuIc+Ioak9Ya/Npm/M/EMadkRER1C/c6eits7YZ4ZbpAi dqxWd/sZSwT48EOQEys9f/N0kKpumiZXZGIKVBXTGvx3wE3GazsBgJrnorjVteLCuZVa oYFjSus0sn6fSNeUF3Vx3m1TK0oI0A6zl00s4+x/+ohCzn9j8Di64iGPAlz8iE+rl25P gBPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731628; x=1790336428; h=content-transfer-encoding:content-type: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 :content-type; bh=yJvHfKiX7PEwhtXR3zEFacUgadXzigtW25CODwRwitc=; b=07edrFNQrRuYUaPGMh5AkxY8Pt2fl+fs480V0zaLNdu7foyUUozmKg6qdX5jHJLIxE FmDWPwKKmNTNTocv1ELkKHbhVgYmWELBLtCZjTHuZtSqPSvmOXgOF2whCd7qMO2DZeMl F3QtT6+pVuO6n1uzidecNyWkTlwyGzx+/Cpquue+3yby0h+yc1e0oIIpWTw+gCRNYuXJ NTVhtGKV56PivOXjFvpqeVPzdRIp5B3nmd5DsIzUO89/QxQ1Yh5G/YF2IsorK/i6Fl5I oVP3S4cqDBE4wiPpKGylOhzfzhDDj0EpdO8YmlAHFAQ0n7wZu6HsAcpKDlEgoaE5+HT/ I9iw== X-Gm-Message-State: AFuF++nBBqvRH7ZQ8nQdy5R0nntPzRL7wmq2ieh8fl0MRsM3PkcSeBoB 8WpOBEff+5/X+YuJc5SdO8Ib2ZV1iqbDbau38hKLCyNHBOoU7VQ1pIfHShPe1L8KdnplsgHuvno TXZEugRA6sXkZKCkg4mzbatvSmCo/C7Vh+eAK06crcHUf4GZORxoScAN56nBx/xRhC8yYXTOvS5 GEpnZUTfwUVLBzJ2cys5EI89cZrgboyfEuhdGxPX+H X-Gm-Gg: AYBFou3aWh22RegZeixxP+JALiMkB7/s2hgfohskyvcq8EMRrLDNRS1p4+Log18b/lc pn+UOYzTaeZYPT4fGWlMEig7J+gahJ/jQcAulCTHU6vl32P2NMX2pCugmhCcUX/LP5CmdsSnlSH vcWkWtgyhEjyR08dY365SF9CFirSbmQIRjCuZ5ahr26AjqyAG/BUgfh7KvwfTtwnREaZ7dyh1L0 WqvxzJVxpjoppY00EoQNnGcVayumT5O3W0y/rpTxh4xEP9BLC2y4iGnMjba6cth/QJdW2Bn1fyf GUqUnyCU2ryWyTjSDRUknVX0QarzENHqrPlNLY7M+VrYW61pD4KRrfu9tQeiWwW1AuZwDa9m3xn Xc12zlVVMG4HYP52emiJoLZkaoK+j3b0/I3vK1EojYBH9a1to6TmHaveRYK4= X-Received: by 2002:a05:620a:4591:b0:93a:129b:5368 with SMTP id af79cd13be357-93bdc6d5ac4mr277008485a.36.1789731628120; Fri, 18 Sep 2026 04:40:28 -0700 (PDT) X-Received: by 2002:a05:620a:4591:b0:93a:129b:5368 with SMTP id af79cd13be357-93bdc6d5ac4mr277002585a.36.1789731627421; Fri, 18 Sep 2026 04:40:27 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org Subject: [PULL 08/11] hw/arm/raspi4b: Drop board_rev for 32bit hosts Date: Fri, 18 Sep 2026 07:39:23 -0400 Message-ID: <20260918113926.831204-9-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1789731689814158500 QEMU has switched to 64bit-only hosts for all system/user emulations. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Link: https://lore.kernel.org/r/20260818172012.3052821-9-peterx@redhat.com Cc: Peter Maydell Cc: "Philippe Mathieu-Daud=C3=A9" Cc: qemu-arm@nongnu.org Signed-off-by: Peter Xu --- hw/arm/raspi4b.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 7d3eed9630..566d64572d 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -110,11 +110,7 @@ static void raspi4b_machine_class_init(ObjectClass *oc= , const void *data) MachineClass *mc =3D MACHINE_CLASS(oc); RaspiBaseMachineClass *rmc =3D RASPI_BASE_MACHINE_CLASS(oc); =20 -#if HOST_LONG_BITS =3D=3D 32 - rmc->board_rev =3D 0xa03111; /* Revision 1.1, 1 Gb RAM */ -#else rmc->board_rev =3D 0xb03115; /* Revision 1.5, 2 Gb RAM */ -#endif raspi_machine_class_common_init(mc, rmc->board_rev); mc->auto_create_sdcard =3D true; mc->init =3D raspi4b_machine_init; --=20 2.55.0 From nobody Sat Sep 26 22:15:44 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=1789731710; cv=none; d=zohomail.com; s=zohoarc; b=X70veZR3hiV9wUN0gBd2od52oQ8BQBMXikl72KeiWkW3joYQm8MkaBuwutQ6REnI25FwdgJ6wCci/yIV5atf6uWsap9ZDXJPjtbCt2LBUhLf9rfQLE/iM0JdKBAtkDdYe8by40fommuK1g1ijv8tMeLajGXGGlMdyhRLm2k4imw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731710; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pSWQgz5THc8C9jmZ5BauNB19MPOXmarbNtQHtbkVRKY=; b=FMc7Erk5yGeUChXew+QZlcvXoGfgtv9U1Zu8zEO1DTqeOk47yJpftphgee0wNOSdW6o+qXmEr/jNgJvBYD10oCoWE0+mo2r2Ek2vv6d9Cz+3Fbma5FbSyFXkPRNYK4Ec+7+uAq+P3TZiDK9mRwg2M5v4Z/AUsmfT5BLLbhJxol0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178973171087161.28206803203045; Fri, 18 Sep 2026 04:41:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7WxL-0000hl-ST; Fri, 18 Sep 2026 07:40:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7WxH-0000YI-Ay for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:35 -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 1x7WxF-0001tv-QM for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:35 -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-195-Jl3Nw1CwNWyoYgKxU8SFEw-1; Fri, 18 Sep 2026 07:40:31 -0400 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-5328827bb8dso12667981cf.1 for ; Fri, 18 Sep 2026 04:40:31 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id af79cd13be357-93be0ccabecsm119006285a.6.2026.09.18.04.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731633; 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=pSWQgz5THc8C9jmZ5BauNB19MPOXmarbNtQHtbkVRKY=; b=N87cqvkwj7kZsVnHH8UjOfD0gz4HTFbuXqDZnXhEzZ6QCZwbuiaZhq/hWFW4cAeYakbOFf Sm0sBcvL7gPnBOvMvme5Wp7FDFfSuSacT9LQjYr4O6XRshNNEeFodbR5f40i0N74s/hHkd gBMTy1jlR5DXZsHy8ha9oD2yHmq8BNM= X-MC-Unique: Jl3Nw1CwNWyoYgKxU8SFEw-1 X-Mimecast-MFC-AGG-ID: Jl3Nw1CwNWyoYgKxU8SFEw_1789731631 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731631; x=1790336431; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=pSWQgz5THc8C9jmZ5BauNB19MPOXmarbNtQHtbkVRKY=; b=m72Y2ylyTdUFcrepuyhyqQPn2+4se0OCh4qLABKx+PCKZI4AOoF09dFbmHg1tdYYF+ 4Nu1k6F/dbWqkxwDi9B9rQTInPu/1DmqXq+6NZAopqXfD2BMmdyBKKRY0M65jsiEaeuW MPp+ZTu6wgoosqDxyIXHwqVOFY5J2lHMbJDq5mu2g8xgP/Mnx4VicDoMEKU4mLnDT/oX zaJ8wilOX21D1zBNuilGUK04HSpIJ/esokvm64TS36n12Yk7zxMg8FBu+wiv4Me4w0/Z Yx2NUnvZ7rcvmF740xF+Faxqt3FMA2ru7Sh9Mbdp7MZsOCXeDf/NtG+astmFpPEc6NHw T6Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731631; x=1790336431; h=content-transfer-encoding:content-type: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 :content-type; bh=pSWQgz5THc8C9jmZ5BauNB19MPOXmarbNtQHtbkVRKY=; b=Q7PaKNantbXm81TEoB9N2C6ua9aroqNM40Y+2ZPPGJw5hIsnmHmSyipbtt/ygK7Q4t XwjNMEglH5gfYawwwWiJLK6Eg+JcEOXduOFj85hDVYiv5LK4hu3F8G72OKrQH1AzRM+c XIAlxMA19Q35dcLwiGr9ktyrTncWje5Tdg09wOYSniHaqdtpXqSFTod5bNf/eTaFr5tv 3v7yN86p9OtC2YJna4o8qFmciIpI4cn9BnDXi4zAUr0ykkbq8Jx/7sQTP/PO6GzTGdbU XhMV+sw46s+13qFKDNxvUi//Lo8j/ykRSZNDoRQdJ/0uU6/ZE8xucyDP1f7i7mlR651j A2Hw== X-Gm-Message-State: AFuF++mDfzkx7s6rmyxPZnaCjStLaNa2I3FWzi7bhpJqwpDixkkNHev3 dtwuVID2jcrmUDG6a6mG7UdGRXiRfRFiOesI4JBGC/ugdPldulyhDT74/b8xqBwM3m93dJIftCf wvfpHqHX74ofvGHUDUeN8WFbQj/ncXXzbfT3n+jiMTebIkciyoAEHtcCHWxWEuWh3TNElyWPLR1 9xIzCNfrmeVyH51GLzIvY9+hkc0iqLuWGQSV4dFksu X-Gm-Gg: AYBFou3y+o4yeW3MVy8W5Fyw/uJvjS+bl4MAM//Rj5M6huErQjQ1ym4Ft8FQuPscxBG JfBFffZdAfo1gy8+MGiqKOVAQaurBGgvjFE7ldJxb78O6bnWeVl8dvDsIVjeT8nLmhrEFR4lsvn gkpPNF1L4AfvUOt/yILTmbJAXS2SUTpCE2EGXcRO/TeyDcVtU/zODB+ta62G/iwrJkzSQQiMlTD 3NfytmCugTosviGx9UNIHt524/tc9DZwt8qB1nXyhMI/TIMlEg9kPSskr9a6IwaTpEBquiT2TRk c0xO1MPjRV3h9+l56cmGa4czjD05BDaKRAbry8gm0adfaZhLefhowtZCkjP96TCT39AetW0NdYb VYlXJkIqwz0V5E4K/+xjq40bmT56siMgoqUePUMnZU2jewHV7ltdCbF1M5x4= X-Received: by 2002:a05:620a:3909:b0:939:ff85:8067 with SMTP id af79cd13be357-93bdc72b140mr291660485a.30.1789731631127; Fri, 18 Sep 2026 04:40:31 -0700 (PDT) X-Received: by 2002:a05:620a:3909:b0:939:ff85:8067 with SMTP id af79cd13be357-93bdc72b140mr291656085a.30.1789731630560; Fri, 18 Sep 2026 04:40:30 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PULL 09/11] machine: Remove 32bit limitation on ram size Date: Fri, 18 Sep 2026 07:39:24 -0400 Message-ID: <20260918113926.831204-10-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789731711711158500 QEMU has switched to 64bit-only hosts for all system/user emulations. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Link: https://lore.kernel.org/r/20260818172012.3052821-10-peterx@redhat.com Cc: "Philippe Mathieu-Daud=C3=A9" Cc: Zhao Liu Signed-off-by: Peter Xu --- hw/core/machine.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 8939ae1666..92f7be52a1 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1626,14 +1626,6 @@ void machine_run_board_init(MachineState *machine, c= onst char *mem_path, Error * clock values from the log. */ replay_checkpoint(CHECKPOINT_INIT); =20 - if (!xen_enabled()) { - /* On 32-bit hosts, QEMU is limited by virtual address space */ - if (machine->ram_size > (2047 << 20) && HOST_LONG_BITS =3D=3D 32) { - error_setg(errp, "at most 2047 MB RAM can be simulated"); - return; - } - } - if (machine->memdev) { ram_addr_t backend_size =3D object_property_get_uint(OBJECT(machin= e->memdev), "size", &error= _abort); --=20 2.55.0 From nobody Sat Sep 26 22:15:44 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=1789731711; cv=none; d=zohomail.com; s=zohoarc; b=I3+Hx1ds8pr92ru/0j3FLBhuWsP0YMUGmYaN2VLLOa8+4Fuf6PoqdD1Avjt9wO74ygB6Mn3tOEurl+X2Zd4MHJPFNDHnzY9YZ45gNvCvm6qxz6G9wy8IqpnZo1gg3D7uEfi4dXTwfYONCWCXPxKOuO334lqm584cV2yYix7Ga9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731711; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BuuoV/RtDVXCu0xt5LIWVsLTHx3UsyTgDjBv1wuZ3To=; b=jqV2JNvNViboTYP50bf7f9yyGv/iA7gIU+6YBlo2rG0VFkH9TlHu/wDWAjAY24BeaDmXZF8LDUYrPlc+EcL+0gO8Jprm9Yv3OC9sx/U929Znk3rPn3l9uUgcsy1FzjBfM6BlFkZAM/ki5o0plMjbC1K7WLQkHOi719CQgxNbpV8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789731711432143.18059073930795; Fri, 18 Sep 2026 04:41:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7WxO-0000pq-Us; Fri, 18 Sep 2026 07:40:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7WxK-0000em-Mu for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:39 -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 1x7WxI-0001uK-HP for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:37 -0400 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-435-Md_aPixpPJ2FeRPgsylj4Q-1; Fri, 18 Sep 2026 07:40:34 -0400 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-90c8da50f8dso17586696d6.2 for ; Fri, 18 Sep 2026 04:40:34 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91258057e41sm10416946d6.34.2026.09.18.04.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731635; 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=BuuoV/RtDVXCu0xt5LIWVsLTHx3UsyTgDjBv1wuZ3To=; b=Qu0nZiT4tGnLjs4rbdfflgOMIw0xlqRGCWdZ+IO1Spb4PeLt0/xGXPp62glLuRckUmoLEU EC0YEsPIskac51/xKKsVEslEQ3lbBMhUgIvmUvM7EmHV8Yl6eaLV9p8Qb+6T/P3maj238Q Wtn1vlq3+Rtf5ngNY+pR8+SV76bTacs= X-MC-Unique: Md_aPixpPJ2FeRPgsylj4Q-1 X-Mimecast-MFC-AGG-ID: Md_aPixpPJ2FeRPgsylj4Q_1789731634 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731634; x=1790336434; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=BuuoV/RtDVXCu0xt5LIWVsLTHx3UsyTgDjBv1wuZ3To=; b=sRD1VHuM9LK/F4FrXwPAcDuZk5shPZYYrSw1Aq/XdPdPCJgJGh0cluSYCLPxp3lAdU lUGLOZakQGuGeyuN121xM7hmA6PBdSX4SMdBzOxmX0D0lcZEMSTcaTQE07iNN0tKR/9k 6EvsmnCU8g49v+DBawVxoMrbPJOOqf1WeeKHEzI16Ss1RuJakSllDdDTUg0qKsnVWBZR eKVs7ck3udq+mr+SGUfw+Do4UIGlfe7F04SYzIJKK6L+dq9rRLWmDjAkGP4Fm4vEFG3u 8x/CL4BeqGnW0B5USa2FJAI94IYRNl5OGgH3KErxT7wIictLcz9bD3ov5o05HdFA1Hzp 8Q2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731634; x=1790336434; h=content-transfer-encoding:content-type: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 :content-type; bh=BuuoV/RtDVXCu0xt5LIWVsLTHx3UsyTgDjBv1wuZ3To=; b=wXNl2VFXw/GcELSzu6Ayd1UZLKDOQMkK91bhHT5CCqDf65y/TbaDC8Rn3COByAbScl btVzz0M4I2ldfE2tmEp6xIMk71ioKwI+nAHYXAyqcANGVnWQeUPStTvlKOhu7KOJQ2Ky rsG+x8kZ9KUYUv39S+WX2yX9r75oPrqwLVhfSavN5JYO8t9RpnaInysYStykKhhkFoY4 PkNnMtXU8gmwAn1nUWvTp5QobxmxzcrJIyuld1rtMEUHC65gxBbf6YzxsnmIRPx3xz8n 4YQXFIbeACCEOoUoLK84lsrdSkwOnooOHZwLzGrzus6LH9yRdr73pWlEwZd/6q3Sduvz qw/w== X-Gm-Message-State: AFuF++lGkIP2uhCDQhjlIQ5XVIsuZmgQjp9apYw9rEfH/szjz0eBzWHS Sp52EgpJyyoDwRXzRj64WYamnxLetOx7roCLA5B4sPYn34yck+HPrQ8J1oeiqHBLTRNKYuNZRb6 /9WkMhdV5alvq1eFmoJdqOM2YNqfeboeB4eDSo+vipCh5CWe9quP15Ef5wljXBRPeI+shDa88uL AuBXbjS2gLhktcefpoJxIi4hwh4Cs+DleMrdKmaB/M X-Gm-Gg: AYBFou24f5R0dprBBVDaVBbPDM+yLqIxipHfrhAIUaOYI+hrtN2dNWXaUWfjcF4Xn/m 0zb16gdBvzNJ7DtA0h2Ddfr+1sV2DNe+/vNimQPtHKfixaCA/CJTMsI/QMhEZn5leMfDZVZp/Tz POG7+iFZIUH1fFvsU3Lfutg9fRqW42zyaK6LF/+tyQPUr0V2hB6wK58b7uBP6JpiyDjmZmKeCSA ZTdgYAOehcVCRVcXDAgbYyT7RFBUDNBgg3fR3Me3A1rZvxqmcgiq5IErwcXbI3vA4aXDqh+DoL+ IU18cYB6nBXxLlRBL8Do9S33I3bKqGYVo6rVycUywqd1Ed1jWaUdxYtVl0tNRzdehKoezkUqlzQ Gfxu6Jph95GYvwO2Cze+T/Nl3Li7s83uTroGMhrtarql8LlN0TwTwP17LQ6w= X-Received: by 2002:a05:6214:2588:b0:912:518e:d0a4 with SMTP id 6a1803df08f44-91254ca41famr33606726d6.60.1789731634013; Fri, 18 Sep 2026 04:40:34 -0700 (PDT) X-Received: by 2002:a05:6214:2588:b0:912:518e:d0a4 with SMTP id 6a1803df08f44-91254ca41famr33606246d6.60.1789731633223; Fri, 18 Sep 2026 04:40:33 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/11] system/physmem: Improve guest memory allocation failure error message Date: Fri, 18 Sep 2026 07:39:25 -0400 Message-ID: <20260918113926.831204-11-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789731711789158500 From: Philippe Mathieu-Daud=C3=A9 When Linux refuses to overcommit a seriously wild allocation we get: $ qemu-system-i386 -m 40000000 qemu-system-i386: cannot set up guest memory 'pc.ram': Cannot allocate memory Slightly improve the error message, displaying the memory size requested (in case the user didn't expect unspecified memory size unit is in MiB): $ qemu-system-i386 -m 40000000 qemu-system-i386: Cannot set up 38.1 TiB of guest memory 'pc.ram': Cannot allocate memory Reported-by: Bin Meng Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu Tested-by: Bin Meng Signed-off-by: Bin Meng Link: https://lore.kernel.org/r/20260822122710.3731595-2-bin.meng@processmi= ssion.com Cc: Paolo Bonzini Cc: Peter Xu Cc: "Philippe Mathieu-Daud=C3=A9" Signed-off-by: Peter Xu --- system/physmem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/physmem.c b/system/physmem.c index a4a6a4710c..bd5f41cb02 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2171,8 +2171,10 @@ static void ram_block_add(RAMBlock *new_block, Error= **errp) &new_block->mr->align, shared, noreserve); if (!new_block->host) { + g_autofree char *size_s =3D size_to_str(new_block->max_len= gth); error_setg_errno(errp, errno, - "cannot set up guest memory '%s'", + "Cannot set up %s of guest memory '%s'", + size_s, memory_region_name(new_block->mr)); qemu_mutex_unlock_ramlist(); return; --=20 2.55.0 From nobody Sat Sep 26 22:15:44 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=1789731710; cv=none; d=zohomail.com; s=zohoarc; b=EJY9uDdrf0MGx/TojXtrbNlu9gPXx5T815qaZCFMoDHh6eSYuXDK1HDzrzCx1bZFVc3Pdk7PYD2pZ0zfU9S+IMa558kM4M3vgPePS2Pv3xTtXJOLXNsvv7kd+rsQqgMRxMPgq7mUz8SEi436HSowthArEDxhYcrYD6n0dkNmxYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789731710; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QRL71dB4DNT2ZGZseVXXIvVaWBoDYLTLHRGinZaqf6E=; b=I4CzLLBqIma7eQgiSqQDHQQ/RWydC4qPCvYcqyh2nlaAfj90vVOyGLXbGY/3cxDPRTLuHm9+Jq1k0vTEMtWXf2AgLPgrGnDrDgO1Jy1Qq/hcqCXcaSywNBdMntNyIVqVu4D/M4ES1Fszuw5Lk7PEfxZsUc7ew5SYXs9GYxtDUBI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789731710892131.4487979789393; Fri, 18 Sep 2026 04:41:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7Wy1-0001gn-O3; Fri, 18 Sep 2026 07:41:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7WxQ-0000uW-B4 for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:46 -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 1x7WxO-0001ue-3V for qemu-devel@nongnu.org; Fri, 18 Sep 2026 07:40:43 -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-223-xhdW5opJMsG1XeQqSe-J3A-1; Fri, 18 Sep 2026 07:40:40 -0400 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-530f49fc5ffso18706901cf.2 for ; Fri, 18 Sep 2026 04:40:40 -0700 (PDT) Received: from localhost (bras-vprn-aurron9134w-lp130-03-174-91-117-74.dsl.bell.ca. [174.91.117.74]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-532a19a4fa5sm11375511cf.13.2026.09.18.04.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 04:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789731641; 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=QRL71dB4DNT2ZGZseVXXIvVaWBoDYLTLHRGinZaqf6E=; b=BlDIxRHtypCpgJFnrlIrhf3+PKsGTiyXd/NuIeJZUZhUlO3z6RnDSieRr5KoBJpMjsEnvl HkBs1B6TTVhr0NzX6bUlpwW89Sm2A1sEUBQKH4hjX3/t345ifOud8jnu2y0Kc1FkWfuD0d kmIM8RoLuOBiYSumvCjYvLo8OWC23sI= X-MC-Unique: xhdW5opJMsG1XeQqSe-J3A-1 X-Mimecast-MFC-AGG-ID: xhdW5opJMsG1XeQqSe-J3A_1789731640 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789731640; x=1790336440; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=QRL71dB4DNT2ZGZseVXXIvVaWBoDYLTLHRGinZaqf6E=; b=S1sC0cpF4yD71xj4CGfxiligFVzz6ogHE/VaO1dO3dWMVjZk80ujOQRVaphkMwcW8S 91mbvAXpYOYajdq2f0LIbqSPTa6Cds/vXj2wxZut2Vr6MjJCWK9w1/Z82TQhHKsqIiFL rpY2IQsHguylIhjCBTfNsp2CMuyNtJmOj3eIDzjfw+SYmHhfTNDy0s13Bpao9qy52Gkf SnjnaMN35NuQaDHp2sVdVQ5VndmkZ0siuSfy1EG1cEb0H+/PWIuQuPw8dHnsdcRzG0Dy Vr5+aEOfKxHvgXEFRSzuunQvjUZI5zJ31I76asYQenrbQTgNMKlppg1DdCZ+3QB8hcgp j0JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789731640; x=1790336440; h=content-transfer-encoding:content-type: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 :content-type; bh=QRL71dB4DNT2ZGZseVXXIvVaWBoDYLTLHRGinZaqf6E=; b=j6sSTlji0wYRPjh31WX579sUAOmAO1Q5qjpCmzBqn+RG8pmR3nAjvWIF4Jh/7Sb3ln DLzhfXuBgu8hLUvXH4YODkAI6VlxZUR97fhb0Pb1VKc4QlyNAz2xJlFVVgRLWu74nRT5 53E+opfLmsUfwP9Eb/grTOdScYn9sU9NHhn/4lRkGuWninX0fPHDUoPvgKaK+MAwrMGU nuyd9Hf2Vf9wbcgZeo93w4hUipUhwFMOiGNi3f/b5q0e2SAAQ03WN6QHw1MfY/lLFEox KXFpTMizwBgkb8HAOPfVlhn4c84pOHBEhVv3atJxvPP/os1xpdJyaC2SQZ0k3MUAJJrk 06tg== X-Gm-Message-State: AFuF++kpY8yDAdMFpSb9Q+bAfBGqcNBoKkdLZbHix8O0fdGbUPdaGHeu 4HehOzM1iYOcFhcEj7mPPLR+412l7nihSiReB3Uot3G3zYT4n3PWCdAxcaWUeJnxtB7vSPLBGr2 gnYParRWSKstCdPKohWcmPT2Oh6bT3LYq9LUqGyO5D4WHZrchEMli+Z5ZmQuVOKPT5mrg9p8vY4 2Q2NdAhB8iMGgiV15FbHm8o+6QrQ2Pb7AFANOfXqnY X-Gm-Gg: AYBFou27jOpTqhAqFjNQwQYKX9V0baFmxYNISjNbKcoiRNxJ/P29gDCjIRslYWV+tr3 eqszxxqooEd8hqFzSoEwbuCdwadtEsNK2BBLstLxzdsD62aB9R0L66URUNFnzq7aMGsIg8LDNLj AOunTC0lJXLf3rJo8nfn1t7XH+lhgqD03qguwLRgFUEqP2xVb7AGqzHFFc5dExqUUBEdVwA7ISa qEb0hiTq0u9wodq/jgsqJLGfa32xZUJ+qa+n28s467ANqk2urdnFT7ZJSKJ2k0qxhAFnY1rjkvl bLzWnG+qlWeMut4D1sqrGX7uTPifjbOaznIC+bgl4xv97o8o6Cj+6R1R+rSrueHeXNlvYyTaqUD WH7cPVzlvP8Adzu7ZwRwMIIYfA2t1NOuwcR/blf9BI8VaTkJJx/PTUDfOPvQ= X-Received: by 2002:a05:622a:1b27:b0:530:f9b5:5837 with SMTP id d75a77b69052e-5329e3c0b74mr35365931cf.23.1789731639625; Fri, 18 Sep 2026 04:40:39 -0700 (PDT) X-Received: by 2002:a05:622a:1b27:b0:530:f9b5:5837 with SMTP id d75a77b69052e-5329e3c0b74mr35365101cf.23.1789731638759; Fri, 18 Sep 2026 04:40:38 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Peter Xu , Paolo Bonzini , Cam Miller , qemu-stable , Boris Fiuczynski , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 11/11] system/ram-discard-manager: fix offset_within_address_space in replay_by_populated_state() Date: Fri, 18 Sep 2026 07:39:26 -0400 Message-ID: <20260918113926.831204-12-peterx@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918113926.831204-1-peterx@redhat.com> References: <20260918113926.831204-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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1789731711766158500 From: Cam Miller Fix bug inside replay_by_populated_state() that forgets to initialize MemoryRegionSection field offset_within_address_space. Follow the established pattern of calling memory_region_section_intersect_range() to accomplish this task. Prior to commit cc9c77f4ddf0 ("system/memory: implement RamDiscardManager multi-source aggregation"), replay_by_populated_state() had called memory_region_section_intersect_range() in order to initialize interdependent fields offset_within_address_space, offset_within_region, and size together, as shown below. s->offset_within_address_space +=3D start - s->offset_within_region; s->offset_within_region =3D start; s->size =3D int128_sub(end, int128_make64(start)); cc9c77f4ddf0 reimplements replay_by_populated_state() initializing the fields of the given MemoryRegionSection instance by hand instead of via memory_region_section_intersect_range(). In doing so, it leaves offset_within_address_space uninitialized for some reason, as you can see below. MemoryRegionSection subsection =3D { .mr =3D section->mr, .offset_within_region =3D offset, .size =3D int128_make64(MIN(granularity, end_offset - offset)), }; Consequently offset_within_address_space defaults to GPA 0x0, which is incorrect. For example, on s390x, base RAM begins at GPA 0x0 and it is problematic to report that a virtio-iommu MR section lives there instead. cc9c77f4ddf0 deliberately calls memory_region_section_intersect_range() from other related code paths inside the same file, namely replay_source_by_state() and rdl_populate_cb()/rdl_discard_cb(). It is unclear why the new replay_by_populated_state() implementation does not conform to this same pattern. The effects of the bug include qemu crashes on multiple architectures. The following assertion failure occurs when driving the guest_phys_blocks_append() code path, for guests with virtio-mem device that has some memory plugged. DBG: guest_phys_block_add_section: predecessor->target_end=3D280000000 = target_start=3D0 ** ERROR:../system/memory_mapping.c:222:guest_phys_block_add_section: asse= rtion failed: (predecessor->target_end <=3D target_start) Bail out! ERROR:../system/memory_mapping.c:222:guest_phys_block_add_sec= tion: assertion failed: (predecessor->target_end <=3D target_start) 2026-09-11 16:03:57.405+0000: shutting down, reason=3Dcrashed This crash can be triggered on x86 via the dump-guest-memory QMP command. The same crash can be triggered on s390x by restoring VM State that has been migrated to a local file. (I used libvirt to manage this migration restore operation, namely command virsh managedsave then virsh start.) Applying the fix resolved the crash on both platforms. Cc: qemu-stable Fixes: cc9c77f4ddf0 ("system/memory: implement RamDiscardManager multi-sour= ce aggregation") Reported-by: Boris Fiuczynski Signed-off-by: Cam Miller Reviewed-by: Marc-Andr=C3=A9 Lureau Link: https://lore.kernel.org/r/20260914-vmem_fix-v1-1-f69ef04a07b0@linux.i= bm.com Signed-off-by: Peter Xu --- system/ram-discard-manager.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/system/ram-discard-manager.c b/system/ram-discard-manager.c index 4e8816e5a2..e9a609e5cd 100644 --- a/system/ram-discard-manager.c +++ b/system/ram-discard-manager.c @@ -238,14 +238,15 @@ static int replay_by_populated_state(const RamDiscard= Manager *rdm, } } else { if (in_run) { - MemoryRegionSection run_section =3D { - .mr =3D section->mr, - .offset_within_region =3D run_start, - .size =3D int128_make64(offset - run_start), - }; - ret =3D replay_fn(&run_section, user_opaque); - if (ret) { - return ret; + MemoryRegionSection run_section =3D *section; + + if (memory_region_section_intersect_range(&run_section, + run_start, + offset - run_sta= rt)) { + ret =3D replay_fn(&run_section, user_opaque); + if (ret) { + return ret; + } } in_run =3D false; } @@ -257,12 +258,12 @@ static int replay_by_populated_state(const RamDiscard= Manager *rdm, } =20 if (in_run) { - MemoryRegionSection run_section =3D { - .mr =3D section->mr, - .offset_within_region =3D run_start, - .size =3D int128_make64(end_offset - run_start), - }; - ret =3D replay_fn(&run_section, user_opaque); + MemoryRegionSection run_section =3D *section; + + if (memory_region_section_intersect_range(&run_section, run_start, + end_offset - run_start))= { + ret =3D replay_fn(&run_section, user_opaque); + } } =20 return ret; --=20 2.55.0