From nobody Sun May 5 06:35:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642637320; cv=none; d=zohomail.com; s=zohoarc; b=aGLUy2owiDxSJObQ66U0ALm/Q1kSIagATOSPS1yjT7dG1o2B15OWF1mocxA2S7MJPWqHh+mPTs772Pm4my9gfZPnCvWIp3Vy7AGwWNxowVxGlaJ04QroghBS82rcU/p11PnRYqvBvdCxN4imj2RUgdBEd0cyBDm6ghjWb+mHubs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642637320; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=Snm1ZC0YW/LY/7ZY4f+6rYRnrHRxPqgC98JxX5MbhrQ=; b=mL0Re0mjb8z5mNacTNqaJRKlRfH3AIvpL9lVDY0XClv74cEc3J0jC6zDiK3PuxrslTg+GGKo/3qkBdcKJaVtMGfFxs6wzLdSBAKnotTAy7G28t4Z1fvUKHxNQqakc68BDNp2BIi5HdGklY6xLhErBLsK3Z3CwC7qFBDBpvaghr4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1642637320585556.4648347189956; Wed, 19 Jan 2022 16:08:40 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so9574890wme.0 for ; Wed, 19 Jan 2022 16:08:40 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id b15sm1201294wrs.93.2022.01.19.16.08.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 16:08:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Snm1ZC0YW/LY/7ZY4f+6rYRnrHRxPqgC98JxX5MbhrQ=; b=RZwani3fOJot9p0aMRE1MPB5f46sa03PiWaDMC57IC4/l8fl1nMz380CtyEGlsYv/L n2EAAqLP/eR7kJ0z6mRf5cOEdM+hM2fqZ4cs036025ZnUW1vnYE8GI6YPk6kzUPBFNvS jLK7czsjtPC4fep40RERUkOnkCn0N+xDDN9PekGPboEMvtblYH8+QBiWvY1eA/WrtTjw cwQ5YeSgxCZT2R3ohlESZ0m0ZWU1z5nF9dWWNtaL6bOg6hmtnhjAvAuTNnYfRnri30+X VBYKodhlv6u+DghmRAVMkPGTw9OVdzptgLaHRMY+95SPPCzoMeBVfjyMYa+ZxkwBB/Ix XQXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Snm1ZC0YW/LY/7ZY4f+6rYRnrHRxPqgC98JxX5MbhrQ=; b=kCVpkqtH1ehCU62TD9IMeKJC3JEe/zaaBoekOG4PPAgDgDT2SwumFsk8r7ZtpvhP7x UUtfKO+wpXflKH61c+kcWq8qeSmOtwQ6Kt2/2ZtMHAKzB/CiKmhDIN5W3l+dhbsNdiJR QTXPQCdHMxi8U9bYIa7DQvFs+/d/EXKL/u2qqLTA9KINwLvz8o4KqIE9kSJGVsRwGQug Al0q0ve8niR2tEmrAeRpnJyCurBM7t+L2T64k9ddGaci4v7JheWWtw0uikz8HpG59q/T 4pqbnZGZOc/C1nGGW4pWfVTbAdSSFhZquJA7pICuYWFDPXF1ryK1k9mtgmGA+YysbGFN C4mw== X-Gm-Message-State: AOAM532h//lJYtduBumCvN4ZPzwCLCXeUkNSbdVOHMW7y6U5FvIakfFG He5W0EAshk/u4KDx3Rqg80o= X-Google-Smtp-Source: ABdhPJwZwMvxBjYaqyShVoFL9xXI2FOl4lIuWxmTg/wt5ZOhPnh2qZ/8AwcE/2cH3m+OHm6jhI2g8Q== X-Received: by 2002:a5d:6c64:: with SMTP id r4mr25153952wrz.251.1642637318754; Wed, 19 Jan 2022 16:08:38 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Peter Xu , Richard Henderson , Thomas Huth , Paolo Bonzini , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] exec/cpu: Make host pages variables / macros 'target agnostic' Date: Thu, 20 Jan 2022 01:08:36 +0100 Message-Id: <20220120000836.229419-1-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642637322082100001 "host" pages are related to the *host* not the *target*, thus the qemu_host_page_size / qemu_host_page_mask variables and the HOST_PAGE_ALIGN() / REAL_HOST_PAGE_ALIGN() macros can be moved to "exec/cpu-common.h" which is target agnostic. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand --- include/exec/cpu-all.h | 9 --------- include/exec/cpu-common.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index bb37239efa3..84caf5c3d9f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -234,15 +234,6 @@ extern const TargetPageBits target_page; =20 #define TARGET_PAGE_ALIGN(addr) ROUND_UP((addr), TARGET_PAGE_SIZE) =20 -/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even - * when intptr_t is 32-bit and we are aligning a long long. - */ -extern uintptr_t qemu_host_page_size; -extern intptr_t qemu_host_page_mask; - -#define HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_host_page_size) -#define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_si= ze) - /* same as PROT_xxx */ #define PAGE_READ 0x0001 #define PAGE_WRITE 0x0002 diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 039d422bf4c..de5f444b193 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -7,6 +7,15 @@ #include "exec/hwaddr.h" #endif =20 +/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even + * when intptr_t is 32-bit and we are aligning a long long. + */ +extern uintptr_t qemu_host_page_size; +extern intptr_t qemu_host_page_mask; + +#define HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_host_page_size) +#define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_si= ze) + /* The CPU list lock nests outside page_(un)lock or mmap_(un)lock */ void qemu_init_cpu_list(void); void cpu_list_lock(void); --=20 2.34.1