Re: [Qemu-devel] [PATCH RFC v2 1/9] kvm: remove hard dependency on pci

[Cornelia Huck]

On Tue, 18 Jul 2017 17:00:22 +0200
Thomas Huth <address@hidden> wrote:

> On 18.07.2017 16:24, Cornelia Huck wrote:
> > The msi routing code in kvm calls some pci functions: provide
> > some stubs to enable builds without pci.
> > 
> > Fixes: e1d4fb2de ("kvm-irqchip: x86: add msi route notify fn")
> > Fixes: 767a554a0 ("kvm-all: Pass requester ID to MSI routing functions")
> > Signed-off-by: Cornelia Huck <address@hidden>
> > ---
> >  hw/pci/pci-stub.c | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> > 
> > diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
> > index ecad664946..bc228ce91e 100644
> > --- a/hw/pci/pci-stub.c
> > +++ b/hw/pci/pci-stub.c
> > @@ -23,6 +23,7 @@
> >  #include "monitor/monitor.h"
> >  #include "qapi/qmp/qerror.h"
> >  #include "hw/pci/pci.h"
> > +#include "hw/pci/msi.h"
> >  #include "qmp-commands.h"
> >  #include "hw/pci/msi.h"
> >  
> > @@ -38,3 +39,14 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict 
> > *qdict)
> >  {
> >      monitor_printf(mon, "PCI devices not supported\n");
> >  }
> > +
> > +/* kvm-all wants this */
> > +MSIMessage pci_get_msi_message(PCIDevice *dev, int vector)
> > +{
> > +    assert(false);
> > +}
> > +
> > +uint16_t pci_requester_id(PCIDevice *dev)
> > +{
> > +    assert(false);
> > +}
> >   
> 
> Would it be feasible to move the offending code from kvm-all.c into a
> new file called kvm-pci.c instead which then only gets compiled for
> CONFIG_PCI=y ? I think that would be a cleaner solution ...

msi(x) seems to have gotten a bit entangled with the kvm code (maybe
even before the two commits I mentioned above - but it must have worked
fine before we added zpci...) I'd rather just use this quick fix for
now and do a proper separation on top.