On Tue, Nov 3, 2020 at 9:41 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> On 8/21/20 12:21 PM, Paolo Bonzini wrote:
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> >  Makefile               |  74 ++----------------
> >  Makefile.target        |  19 +++--
> >  configure              |   6 --
> >  hw/i386/fw_cfg.c       |   2 +-
> >  hw/i386/pc.c           |   2 +-
> >  hw/i386/pc_piix.c      |   2 +-
> >  hw/i386/x86.c          |   2 +-
> >  hw/vfio/pci-quirks.c   |   2 +-
> >  hw/virtio/virtio-mem.c |   2 +-
> >  include/qemu/osdep.h   |   2 +-
> >  meson.build            | 166 ++++++++++++++++++++++++++++++++++++++++-
> >  rules.mak              |   8 --
> >  scripts/create_config  |   2 +
> >  scripts/grepy.sh       |   3 +
> >  scripts/minikconf.py   |   0
> >  softmmu/qtest.c        |   2 +-
> >  16 files changed, 192 insertions(+), 102 deletions(-)
> >  create mode 100755 scripts/grepy.sh
> >  mode change 100755 => 100644 scripts/minikconf.py
> ...
>
> > diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
> > index c55abfb01a..33441ad484 100644
> > --- a/hw/i386/fw_cfg.c
> > +++ b/hw/i386/fw_cfg.c
> > @@ -22,7 +22,7 @@
> >  #include "hw/nvram/fw_cfg.h"
> >  #include "e820_memory_layout.h"
> >  #include "kvm_i386.h"
> > -#include "config-devices.h"
> > +#include CONFIG_DEVICES