| [Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
 [PATCH v4 37/47] hw/net/lasi_i82596: Re-enable build
 
To: qemu-devel@xxxxxxxxxxFrom: David Woodhouse <dwmw2@xxxxxxxxxxxxx>Date: Fri, 26 Jan 2024 17:25:14 +0000Cc: Richard Henderson <richard.henderson@xxxxxxxxxx>,	Beniamino Galvani <b.galvani@xxxxxxxxx>,	Peter Maydell <peter.maydell@xxxxxxxxxx>,	Strahinja Jankovic <strahinja.p.jankovic@xxxxxxxxx>,	Niek Linnenbank <nieklinnenbank@xxxxxxxxx>,	Cédric Le Goater <clg@xxxxxxxx>,	Andrew Jeffery <andrew@xxxxxxxxxxxxxxxxxxxx>,	Joel Stanley <joel@xxxxxxxxx>,	Igor Mitsyanko <i.mitsyanko@xxxxxxxxx>,	Jean-Christophe Dubois <jcd@xxxxxxxxxxxxxxx>,	Andrey Smirnov <andrew.smirnov@xxxxxxxxx>,	Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>,	Rob Herring <robh@xxxxxxxxxx>,	Subbaraya Sundeep <sundeep.lkml@xxxxxxxxx>,	Jan Kiszka <jan.kiszka@xxxxxx>,	Tyrone Ting <kfting@xxxxxxxxxxx>,	Hao Wu <wuhaotsh@xxxxxxxxxx>,	Radoslaw Biernacki <rad@xxxxxxxxxxxx>,	Leif Lindholm <quic_llindhol@xxxxxxxxxxx>,	Marcin Juszkiewicz <marcin.juszkiewicz@xxxxxxxxxx>,	"Edgar E. Iglesias" <edgar.iglesias@xxxxxxxxx>,	Alistair Francis <alistair@xxxxxxxxxxxxx>,	Helge Deller <deller@xxxxxx>,	Paolo Bonzini <pbonzini@xxxxxxxxxx>,	Eduardo Habkost <eduardo@xxxxxxxxxxx>,	"Michael S. Tsirkin" <mst@xxxxxxxxxx>,	Marcel Apfelbaum <marcel.apfelbaum@xxxxxxxxx>,	Song Gao <gaosong@xxxxxxxxxxx>,	Thomas Huth <huth@xxxxxxxxxxxxx>,	Laurent Vivier <laurent@xxxxxxxxx>,	Huacai Chen <chenhuacai@xxxxxxxxxx>,	Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx>,	Hervé Poussineau <hpoussin@xxxxxxxxxxx>,	Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx>,	Aurelien Jarno <aurelien@xxxxxxxxxxx>,	Jason Wang <jasowang@xxxxxxxxxx>,	Jia Liu <proljc@xxxxxxxxx>,	Stafford Horne <shorne@xxxxxxxxx>,	Mark Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>,	Nicholas Piggin <npiggin@xxxxxxxxx>,	Daniel Henrique Barboza <danielhb413@xxxxxxxxx>,	David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>,	Harsh Prateek Bora <harshpb@xxxxxxxxxxxxx>,	Bin Meng <bin.meng@xxxxxxxxxxxxx>,	Palmer Dabbelt <palmer@xxxxxxxxxxx>,	Weiwei Li <liwei1518@xxxxxxxxx>,	Liu Zhiwei <zhiwei_liu@xxxxxxxxxxxxxxxxx>,	Halil Pasic <pasic@xxxxxxxxxxxxx>,	Christian Borntraeger <borntraeger@xxxxxxxxxxxxx>,	Eric Farman <farman@xxxxxxxxxxxxx>,	David Hildenbrand <david@xxxxxxxxxx>,	Ilya Leoshkevich <iii@xxxxxxxxxxxxx>,	Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>,	Magnus Damm <magnus.damm@xxxxxxxxx>,	Artyom Tarasenko <atar4qemu@xxxxxxxxx>,	Stefano Stabellini <sstabellini@xxxxxxxxxx>,	Anthony Perard <anthony.perard@xxxxxxxxxx>,	Paul Durrant <paul@xxxxxxx>,	Max Filippov <jcmvbkbc@xxxxxxxxx>,	qemu-arm@xxxxxxxxxx,	qemu-ppc@xxxxxxxxxx,	qemu-riscv@xxxxxxxxxx,	qemu-s390x@xxxxxxxxxx,	xen-devel@xxxxxxxxxxxxxxxxxxxx,	David Woodhouse <dwmw@xxxxxxxxxxxx>Delivery-date: Fri, 26 Jan 2024 17:41:45 +0000List-id: Xen developer discussion <xen-devel.lists.xenproject.org> 
 From: David Woodhouse <dwmw@xxxxxxxxxxxx>
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")
Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx>
---
 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
 |