[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/21] hw/net: Move xilinx_ethlite.c to the target-independent sou
From: |
Thomas Huth |
Subject: |
[PULL 16/21] hw/net: Move xilinx_ethlite.c to the target-independent source set |
Date: |
Mon, 15 May 2023 15:02:28 +0200 |
Now that the tswap() functions are available for target-independent
code, too, we can move xilinx_ethlite.c from specific_ss to softmmu_ss
to avoid that we have to compile this file multiple times.
Message-Id: <20230508120314.59274-1-thuth@redhat.com>
Reviewed-by: Francisco Iglesias <frasse.iglesias@gmail.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/net/xilinx_ethlite.c | 2 +-
hw/net/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 99c22819ea..89f4f3b254 100644
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
#include "qom/object.h"
-#include "cpu.h" /* FIXME should not use tswap* */
+#include "exec/tswap.h"
#include "hw/sysbus.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
diff --git a/hw/net/meson.build b/hw/net/meson.build
index e2be0654a1..a7860c5efe 100644
--- a/hw/net/meson.build
+++ b/hw/net/meson.build
@@ -43,7 +43,7 @@ softmmu_ss.add(when: 'CONFIG_NPCM7XX', if_true:
files('npcm7xx_emc.c'))
softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c'))
softmmu_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c'))
specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_llan.c'))
-specific_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true:
files('xilinx_ethlite.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true:
files('xilinx_ethlite.c'))
softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c'))
specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c'))
--
2.31.1
- [PULL 00/21] Tests, docs, s390x and misc patches, Thomas Huth, 2023/05/15
- [PULL 02/21] sysemu/kvm: Remove unused headers, Thomas Huth, 2023/05/15
- [PULL 03/21] net: stream: test reconnect option with an unix socket, Thomas Huth, 2023/05/15
- [PULL 01/21] tests/avocado/virtio-gpu: Fix the URLs of the test_virtio_vga_virgl test, Thomas Huth, 2023/05/15
- [PULL 16/21] hw/net: Move xilinx_ethlite.c to the target-independent source set,
Thomas Huth <=
- [PULL 14/21] cpu: Introduce a wrapper for being able to use TARGET_NAME in common code, Thomas Huth, 2023/05/15
- [PULL 08/21] tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies, Thomas Huth, 2023/05/15
- [PULL 05/21] hw/pci-bridge: Fix release ordering by embedding PCIBridgeWindows within PCIBridge, Thomas Huth, 2023/05/15
- [PULL 21/21] tests/tcg/s390x: Test EXECUTE of relative branches, Thomas Huth, 2023/05/15
- [PULL 18/21] tests/tcg/multiarch: Make the system memory test work on big-endian, Thomas Huth, 2023/05/15
- [PULL 11/21] docs/devel: remind developers to run CI container pipeline when updating images, Thomas Huth, 2023/05/15
- [PULL 10/21] s390x/pv: Fix spurious warning with asynchronous teardown, Thomas Huth, 2023/05/15
- [PULL 06/21] Add information how to fix common build error on Windows in symlink-install-tree, Thomas Huth, 2023/05/15
- [PULL 19/21] tests/tcg/s390x: Enable the multiarch system tests, Thomas Huth, 2023/05/15
- [PULL 09/21] util/async-teardown: wire up query-command-line-options, Thomas Huth, 2023/05/15