[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 37/47] hw/net/lasi_i82596: Re-enable build
From: |
David Woodhouse |
Subject: |
[PULL 37/47] hw/net/lasi_i82596: Re-enable build |
Date: |
Thu, 1 Feb 2024 16:44:02 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
When converting to the shiny build-system-du-jour, a typo prevented the
last_i82596 driver from being built. Correct the config option name to
re-enable the build. And include "sysemu/sysemu.h" so it actually builds.
Fixes: b1419fa66558 ("meson: convert hw/net")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2144
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/net/lasi_i82596.c | 1 +
hw/net/meson.build | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c
index 6a3147fe2d..09e830ba5f 100644
--- a/hw/net/lasi_i82596.c
+++ b/hw/net/lasi_i82596.c
@@ -14,6 +14,7 @@
#include "qapi/error.h"
#include "qemu/timer.h"
#include "hw/sysbus.h"
+#include "sysemu/sysemu.h"
#include "net/eth.h"
#include "hw/net/lasi_82596.h"
#include "hw/net/i82596.h"
diff --git a/hw/net/meson.build b/hw/net/meson.build
index 9afceb0619..2b426d3d5a 100644
--- a/hw/net/meson.build
+++ b/hw/net/meson.build
@@ -33,7 +33,7 @@ system_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true:
files('mv88w8618_eth.c'))
system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c'))
system_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true:
files('stellaris_enet.c'))
system_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c'))
-system_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c'))
+system_ss.add(when: 'CONFIG_LASI_82596', if_true: files('lasi_i82596.c'))
system_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c'))
system_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c'))
system_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c'))
--
2.43.0
- [PULL 15/47] hw/ppc/prep: use pci_init_nic_devices(), (continued)
- [PULL 15/47] hw/ppc/prep: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 01/47] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info(), David Woodhouse, 2024/02/01
- [PULL 06/47] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs, David Woodhouse, 2024/02/01
- [PULL 18/47] hw/sh4/r2d: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 03/47] net: add qemu_create_nic_bus_devices(), David Woodhouse, 2024/02/01
- [PULL 13/47] hw/mips/malta: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 22/47] hw/arm/aspeed: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 28/47] hw/arm/npcm7xx: use qemu_configure_nic_device, allow emc0/emc1 as aliases, David Woodhouse, 2024/02/01
- [PULL 24/47] hw/arm/fsl: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 46/47] net: remove qemu_show_nic_models(), qemu_find_nic_model(), David Woodhouse, 2024/02/01
- [PULL 37/47] hw/net/lasi_i82596: Re-enable build,
David Woodhouse <=
- [PULL 38/47] hw/net/lasi_i82596: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 17/47] hw/ppc: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 36/47] hw/mips/jazz: use qemu_find_nic_info(), David Woodhouse, 2024/02/01
- [PULL 09/47] hw/arm/virt: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 14/47] hw/mips/loongson3_virt: use pci_init_nic_devices(), David Woodhouse, 2024/02/01
- [PULL 04/47] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot(), David Woodhouse, 2024/02/01
- [PULL 21/47] hw/arm/allwinner: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01
- [PULL 43/47] hw/xtensa/xtfpga: use qemu_create_nic_device(), David Woodhouse, 2024/02/01
- [PULL 29/47] hw/arm/stellaris: use qemu_find_nic_info(), David Woodhouse, 2024/02/01
- [PULL 34/47] hw/microblaze: use qemu_configure_nic_device(), David Woodhouse, 2024/02/01