[v2,02/10] pc: remove has_igd_gfx_passthru global

Commit Message

Gerd Hoffmann Dec. 18, 2015, 7:46 a.m. UTC

> > +    return (qdev_get_machine->igd_gfx_passthru
> >              && ((dev->class_code >> 0x8) == PCI_CLASS_DISPLAY_VGA));
> >  }
> 
> Doesn't compile:
> 
> qemu/hw/xen/xen_pt.h: In function ‘is_igd_vga_passthrough’:
> qemu/hw/xen/xen_pt.h:325:29: error: request for member ‘igd_gfx_passthru’ in something not a structure or union
>      return (qdev_get_machine->igd_gfx_passthru

Incremental fix attached (will squash into v2).

cheers,
  Gerd

Patch

From b30226140f80202c4d2dda23acae9533aba6136b Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <[e-mail]>
Date: Fri, 18 Dec 2015 08:44:48 +0100
Subject: [PATCH] [fixup] build on xen

---
 hw/xen/xen_pt.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h
index 6d8702b..680fe6e 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,7 +323,8 @@  extern void *pci_assign_dev_load_option_rom(PCIDevice *dev,
                                             unsigned int function);
 static inline bool is_igd_vga_passthrough(XenHostPCIDevice *dev)
 {
-    return (qdev_get_machine->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);
-- 
1.8.3.1