Commit acd0c941 authored by Anthony PERARD's avatar Anthony PERARD Committed by Paolo Bonzini
Browse files

xen: fix build without pci passthrough 



Xen PCI passthrough support may not be available and thus the global
variable "has_igd_gfx_passthru" might be compiled out. Common code
should not access it in that case.

Unfortunately, we can't use CONFIG_XEN_PCI_PASSTHROUGH directly in
xen-common.c so this patch instead move access to the
has_igd_gfx_passthru variable via function and those functions are
also implemented as stubs. The stubs will be used when QEMU is built
without passthrough support.

Now, when one will want to enable igd-passthru via the -machine
property, they will get an error message if QEMU is built without
passthrough support.

Fixes: 46472d82 ('xen: convert "-machine igd-passthru" to an accelerator property')
Reported-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Signed-off-by: default avatarAnthony PERARD <anthony.perard@citrix.com>
Message-Id: <20200603160442.3151170-1-anthony.perard@citrix.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e77cb0bb

accel/xen/xen-all.c

+2 −2
Original line number Diff line number Diff line
@@ -137,12 +137,12 @@ static void xen_change_state_handler(void *opaque, int running, 


static bool xen_get_igd_gfx_passthru(Object *obj, Error **errp)

{

    return has_igd_gfx_passthru;

    return xen_igd_gfx_pt_enabled();

}



static void xen_set_igd_gfx_passthru(Object *obj, bool value, Error **errp)

{

    has_igd_gfx_passthru = value;

    xen_igd_gfx_pt_set(value, errp);

}



static void xen_setup_post(MachineState *ms, AccelState *accel)

hw/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ devices-dirs-y += usb/ 
devices-dirs-$(CONFIG_VFIO) += vfio/

devices-dirs-y += virtio/

devices-dirs-y += watchdog/

devices-dirs-y += xen/

devices-dirs-$(CONFIG_XEN) += xen/

devices-dirs-$(CONFIG_MEM_DEVICE) += mem/

devices-dirs-$(CONFIG_NUBUS) += nubus/

devices-dirs-y += semihosting/

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static void pc_init_isa(MachineState *machine) 
#ifdef CONFIG_XEN

static void pc_xen_hvm_init_pci(MachineState *machine)

{

    const char *pci_type = has_igd_gfx_passthru ?

    const char *pci_type = xen_igd_gfx_pt_enabled() ?

                TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE : TYPE_I440FX_PCI_DEVICE;



    pc_init1(machine,

hw/xen/Makefile.objs

+2 −1
Original line number Diff line number Diff line 
# xen backend driver support

common-obj-$(CONFIG_XEN) += xen-legacy-backend.o xen_devconfig.o xen_pvdev.o xen-bus.o xen-bus-helper.o xen-backend.o

common-obj-y += xen-legacy-backend.o xen_devconfig.o xen_pvdev.o xen-bus.o xen-bus-helper.o xen-backend.o



obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o

obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_graphics.o xen_pt_msi.o

obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt_load_rom.o

obj-$(call $(lnot, $(CONFIG_XEN_PCI_PASSTHROUGH))) += xen_pt_stub.o

hw/xen/xen_pt.c

+11 −1
Original line number Diff line number Diff line
@@ -65,7 +65,17 @@ 
#include "qemu/range.h"

#include "exec/address-spaces.h"



bool has_igd_gfx_passthru;

static bool has_igd_gfx_passthru;



bool xen_igd_gfx_pt_enabled(void)

{

    return has_igd_gfx_passthru;

}



void xen_igd_gfx_pt_set(bool value, Error **errp)

{

    has_igd_gfx_passthru = value;

}



#define XEN_PT_NR_IRQS (256)

static uint8_t xen_pt_mapped_machine_irq[XEN_PT_NR_IRQS] = {0};