| Message ID | 20230508120314.59274-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/net: Move xilinx_ethlite.c to the target-independent source set | expand |
On [2023 May 08] Mon 14:03:14, Thomas Huth wrote: > 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. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Francisco Iglesias <frasse.iglesias@gmail.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 > >
On Mon, May 8, 2023 at 10:04 PM Thomas Huth <thuth@redhat.com> wrote: > > 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. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > 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 > >
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'))
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. 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(-)