qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Richard Henderson <richard.henderson@linaro.org>,
	Fabiano Rosas <farosas@suse.de>
Subject: [PULL 16/23] softmmu: Move dirtylimit.c into the target independent source set
Date: Thu, 20 Apr 2023 12:12:09 +0200	[thread overview]
Message-ID: <20230420101216.786304-17-thuth@redhat.com> (raw)
In-Reply-To: <20230420101216.786304-1-thuth@redhat.com>

dirtylimit.c just uses one TARGET_PAGE_SIZE macro - change it to
qemu_target_page_size() so we can move thefile into the target
independent source set. Then we only have to compile this file
once during the build instead of multiple times (one time for
each target).

Message-Id: <20230413054509.54421-1-thuth@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 softmmu/dirtylimit.c | 3 ++-
 softmmu/meson.build  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/softmmu/dirtylimit.c b/softmmu/dirtylimit.c
index c56f0f58c8..82986c1499 100644
--- a/softmmu/dirtylimit.c
+++ b/softmmu/dirtylimit.c
@@ -20,6 +20,7 @@
 #include "monitor/hmp.h"
 #include "monitor/monitor.h"
 #include "exec/memory.h"
+#include "exec/target_page.h"
 #include "hw/boards.h"
 #include "sysemu/kvm.h"
 #include "trace.h"
@@ -236,7 +237,7 @@ static inline int64_t dirtylimit_dirty_ring_full_time(uint64_t dirtyrate)
     static uint64_t max_dirtyrate;
     uint32_t dirty_ring_size = kvm_dirty_ring_size();
     uint64_t dirty_ring_size_meory_MB =
-        dirty_ring_size * TARGET_PAGE_SIZE >> 20;
+        dirty_ring_size * qemu_target_page_size() >> 20;
 
     if (max_dirtyrate < dirtyrate) {
         max_dirtyrate = dirtyrate;
diff --git a/softmmu/meson.build b/softmmu/meson.build
index b392f0bd35..974732b0f3 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -3,7 +3,6 @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
   'ioport.c',
   'memory.c',
   'physmem.c',
-  'dirtylimit.c',
   'watchpoint.c',
 )])
 
@@ -18,6 +17,7 @@ softmmu_ss.add(files(
   'cpu-throttle.c',
   'cpu-timers.c',
   'datadir.c',
+  'dirtylimit.c',
   'dma-helpers.c',
   'globals.c',
   'memory_mapping.c',
-- 
2.31.1



  parent reply	other threads:[~2023-04-20 10:14 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-20 10:11 [PULL 00/23] First batch of testing and misc patches for 8.1 Thomas Huth
2023-04-20 10:11 ` [PULL 01/23] hw: Add compat machines " Thomas Huth
2023-04-20 10:11 ` [PULL 02/23] docs: Fix typo (wphx => whpx) Thomas Huth
2023-04-20 10:11 ` [PULL 03/23] docs/cxl: Fix sentence Thomas Huth
2023-04-20 10:11 ` [PULL 04/23] test: Fix test-crypto-secret when compiling without keyring support Thomas Huth
2023-04-20 10:11 ` [PULL 05/23] qtest: Don't assert on "-qtest chardev:myid" Thomas Huth
2023-04-20 10:11 ` [PULL 06/23] chardev: Allow setting file chardev input file on the command line Thomas Huth
2023-04-20 10:12 ` [PULL 07/23] travis.yml: Add missing clang-10 package to the 'Clang (disable-tcg)' job Thomas Huth
2023-04-20 10:12 ` [PULL 08/23] travis.yml: Add missing 'flex', 'bison' packages to 'GCC (user)' job Thomas Huth
2023-04-20 10:12 ` [PULL 09/23] tests/migration: Only run auto_converge in slow mode Thomas Huth
2023-04-20 10:12 ` [PULL 10/23] target/i386: Set family/model/stepping of the "max" CPU according to LM bit Thomas Huth
2023-04-20 10:12 ` [PULL 11/23] hw/char: Move two more files from specific_ss to softmmu_ss Thomas Huth
2023-04-20 10:12 ` [PULL 12/23] softmmu/qtest: Move the target-specific pseries RTAS code out of qtest.c Thomas Huth
2023-04-20 10:12 ` [PULL 13/23] include/exec: Provide the tswap() functions for target independent code, too Thomas Huth
2023-04-20 10:12 ` [PULL 14/23] softmmu: Make qtest.c target independent Thomas Huth
2023-04-20 10:12 ` [PULL 15/23] hw/display: Compile vga.c as target-independent code Thomas Huth
2023-04-20 10:12 ` Thomas Huth [this message]
2023-04-20 10:12 ` [PULL 17/23] hw/core: Move numa.c into the target independent source set Thomas Huth
2023-04-20 10:12 ` [PULL 18/23] cpu: Remove parameter of list_cpus() Thomas Huth
2023-04-20 10:12 ` [PULL 19/23] MAINTAINERS: Add Juan Quintela to developer guides review Thomas Huth
2023-04-20 10:12 ` [PULL 20/23] qtest: Add functions for accessing devices on Aspeed I2C controller Thomas Huth
2023-04-20 10:12 ` [PULL 21/23] qtest: Move tpm_util_tis_transmit() into tpm-tis-utils.c and rename it Thomas Huth
2023-04-20 10:12 ` [PULL 22/23] qtest: Add a test case for TPM TIS I2C connected to Aspeed I2C controller Thomas Huth
2023-04-20 10:12 ` [PULL 23/23] tests/vm/freebsd: Update to FreeBSD 13.2 Thomas Huth
2023-04-21 17:28 ` [PULL 00/23] First batch of testing and misc patches for 8.1 Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230420101216.786304-17-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=farosas@suse.de \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).