[vfio-users] [Xen-devel] [PATCH v3 02/11] pc: remove has_igd_gfx_passthru global
Stefano Stabellini
stefano.stabellini at eu.citrix.com
Wed Jan 6 14:32:03 UTC 2016
On Tue, 5 Jan 2016, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
> hw/xen/xen_pt.h | 5 +++--
> vl.c | 10 ----------
> 2 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h
> index 3749711..cdd73ff 100644
> --- a/hw/xen/xen_pt.h
> +++ b/hw/xen/xen_pt.h
> @@ -4,6 +4,7 @@
> #include "qemu-common.h"
> #include "hw/xen/xen_common.h"
> #include "hw/pci/pci.h"
> +#include "hw/boards.h"
> #include "xen-host-pci-device.h"
>
> void xen_pt_log(const PCIDevice *d, const char *f, ...) GCC_FMT_ATTR(2, 3);
> @@ -322,10 +323,10 @@ extern void *pci_assign_dev_load_option_rom(PCIDevice *dev,
> unsigned int domain,
> unsigned int bus, unsigned int slot,
> unsigned int function);
> -extern bool has_igd_gfx_passthru;
> static inline bool is_igd_vga_passthrough(XenHostPCIDevice *dev)
> {
> - return (has_igd_gfx_passthru
> + MachineState *machine = MACHINE(qdev_get_machine());
> + return (machine->igd_gfx_passthru
> && ((dev->class_code >> 0x8) == PCI_CLASS_DISPLAY_VGA));
> }
> int xen_pt_register_vga_regions(XenHostPCIDevice *dev);
> diff --git a/vl.c b/vl.c
> index 5aaea77..d4e51ec 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -1365,13 +1365,6 @@ static inline void semihosting_arg_fallback(const char *file, const char *cmd)
> }
> }
>
> -/* Now we still need this for compatibility with XEN. */
> -bool has_igd_gfx_passthru;
> -static void igd_gfx_passthru(void)
> -{
> - has_igd_gfx_passthru = current_machine->igd_gfx_passthru;
> -}
> -
> /***********************************************************/
> /* USB devices */
>
> @@ -4550,9 +4543,6 @@ int main(int argc, char **argv, char **envp)
> exit(1);
> }
>
> - /* Check if IGD GFX passthrough. */
> - igd_gfx_passthru();
> -
> /* init generic devices */
> if (qemu_opts_foreach(qemu_find_opts("device"),
> device_init_func, NULL, NULL)) {
> --
> 1.8.3.1
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel at lists.xen.org
> http://lists.xen.org/xen-devel
>
More information about the vfio-users
mailing list