| Message ID | 20240126173228.394202-38-dwmw2@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Rework matching of network devices to -nic options | expand |
On 26/01/2024 18.25, David Woodhouse wrote: > 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") > Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> > --- > 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')) Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2144
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'))