Now that the st*_p and ld*_p functions can be used from common code,
too, we can move ioport.c from specific_ss into softmmu_ss to avoid
that we have to compile it multiple times.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 softmmu/ioport.c    | 2 +-
 softmmu/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/softmmu/ioport.c b/softmmu/ioport.c
index cb8adb0b93..8d9d1e5b40 100644
--- a/softmmu/ioport.c
+++ b/softmmu/ioport.c
@@ -26,10 +26,10 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
 #include "exec/ioport.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
+#include "exec/tswap.h"
 #include "trace.h"
 
 typedef struct MemoryRegionPortioList {
diff --git a/softmmu/meson.build b/softmmu/meson.build
index 974732b0f3..e572af54ab 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -1,6 +1,5 @@
 specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
   'arch_init.c',
-  'ioport.c',
   'memory.c',
   'physmem.c',
   'watchpoint.c',
@@ -20,6 +19,7 @@ softmmu_ss.add(files(
   'dirtylimit.c',
   'dma-helpers.c',
   'globals.c',
+  'ioport.c',
   'memory_mapping.c',
   'qdev-monitor.c',
   'qtest.c',
-- 
2.31.1

On 5/17/23 00:42, Thomas Huth wrote:
> Now that the st*_p and ld*_p functions can be used from common code,
> too, we can move ioport.c from specific_ss into softmmu_ss to avoid
> that we have to compile it multiple times.
> 
> Signed-off-by: Thomas Huth<thuth@redhat.com>
> ---
>   softmmu/ioport.c    | 2 +-
>   softmmu/meson.build | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~