On Fri, 7 Jul 2017 15:11:15 +0200 Thomas Huth <th...@redhat.com> wrote:
> On 07.07.2017 14:21, 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 <coh...@redhat.com> > > --- > > 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 36d2c430c5..ec12962d73 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" > > > > PciInfoList *qmp_query_pci(Error **errp) > > @@ -35,3 +36,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); > > +} > > Do you need a dummy return statement in here in case somebody ever tries > to compile the code with NDEBUG ? Or maybe rather use abort() instead? Right, I did not consider that. Probably assert() + return. Should Never Happen(tm), but I don't really want qemu to abort() on an unsuspecting user.