yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
b38b0f
From ff372341353d79db7e5a963d013bc6341d033337 Mon Sep 17 00:00:00 2001
b38b0f
From: Danilo de Paula <ddepaula@redhat.com>
b38b0f
Date: Wed, 22 May 2019 20:24:34 +0100
b38b0f
Subject: [PATCH 12/12] hw/pci: Add missing include
b38b0f
MIME-Version: 1.0
b38b0f
Content-Type: text/plain; charset=UTF-8
b38b0f
Content-Transfer-Encoding: 8bit
b38b0f
b38b0f
RH-Author: Danilo de Paula <ddepaula@redhat.com>
b38b0f
Message-id: <20190522202434.2529-3-ddepaula@redhat.com>
b38b0f
Patchwork-id: 88165
b38b0f
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 2/2] hw/pci: Add missing include
b38b0f
Bugzilla: 1712946
b38b0f
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
b38b0f
RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
b38b0f
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
b38b0f
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
b38b0f
b38b0f
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
b38b0f
b38b0f
Noted while refactoring:
b38b0f
b38b0f
      CC      mips-softmmu/hw/mips/gt64xxx_pci.o
b38b0f
    In file included from include/hw/pci-host/gt64xxx.h:2,
b38b0f
                     from hw/mips/gt64xxx_pci.c:30:
b38b0f
    include/hw/pci/pci_bus.h:23:5: error: unknown type name ‘PCIIOMMUFunc’
b38b0f
         PCIIOMMUFunc iommu_fn;
b38b0f
         ^~~~~~~~~~~~
b38b0f
    include/hw/pci/pci_bus.h:27:5: error: unknown type name ‘pci_set_irq_fn’
b38b0f
         pci_set_irq_fn set_irq;
b38b0f
         ^~~~~~~~~~~~~~
b38b0f
    include/hw/pci/pci_bus.h:28:5: error: unknown type name ‘pci_map_irq_fn’
b38b0f
         pci_map_irq_fn map_irq;
b38b0f
         ^~~~~~~~~~~~~~
b38b0f
    include/hw/pci/pci_bus.h:29:5: error: unknown type name ‘pci_route_irq_fn’
b38b0f
         pci_route_irq_fn route_intx_to_irq;
b38b0f
         ^~~~~~~~~~~~~~~~
b38b0f
    include/hw/pci/pci_bus.h:31:24: error: ‘PCI_SLOT_MAX’ undeclared here (not in a function)
b38b0f
         PCIDevice *devices[PCI_SLOT_MAX * PCI_FUNC_MAX];
b38b0f
                            ^~~~~~~~~~~~
b38b0f
    include/hw/pci/pci_bus.h:31:39: error: ‘PCI_FUNC_MAX’ undeclared here (not in a function)
b38b0f
         PCIDevice *devices[PCI_SLOT_MAX * PCI_FUNC_MAX];
b38b0f
                                           ^~~~~~~~~~~~
b38b0f
    make[1]: *** [rules.mak:69: hw/mips/gt64xxx_pci.o] Error 1
b38b0f
    make: *** [Makefile:482: subdir-mips-softmmu] Error 2
b38b0f
b38b0f
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
b38b0f
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
b38b0f
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
b38b0f
(cherry picked from commit 2728a57a061af92b476f926b7fb66cb3ac60ab50)
b38b0f
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
b38b0f
---
b38b0f
 include/hw/pci/pci_bus.h | 2 ++
b38b0f
 1 file changed, 2 insertions(+)
b38b0f
b38b0f
diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h
b38b0f
index b7da8f5..dfb7575 100644
b38b0f
--- a/include/hw/pci/pci_bus.h
b38b0f
+++ b/include/hw/pci/pci_bus.h
b38b0f
@@ -1,6 +1,8 @@
b38b0f
 #ifndef QEMU_PCI_BUS_H
b38b0f
 #define QEMU_PCI_BUS_H
b38b0f
 
b38b0f
+#include "hw/pci/pci.h"
b38b0f
+
b38b0f
 /*
b38b0f
  * PCI Bus datastructures.
b38b0f
  *
b38b0f
-- 
b38b0f
1.8.3.1
b38b0f