yeahuh / rpms / qemu-kvm

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