| Message ID | 20181105014047.26447-10-sameo@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | ACPI reorganization for hardware-reduced API addition | expand |
On Mon, 5 Nov 2018 02:40:32 +0100 Samuel Ortiz <sameo@linux.intel.com> wrote: > The PCI hole properties are not pc or i386 specific. They belong to the > PCI host header instead. > > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> > --- > include/hw/i386/pc.h | 5 ----- > include/hw/pci/pci_host.h | 6 ++++++ > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index fed136fcdd..bbbdb33ea3 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -182,11 +182,6 @@ void pc_acpi_init(const char *default_dsdt); > > void pc_guest_info_init(PCMachineState *pcms); > > -#define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start" > -#define PCI_HOST_PROP_PCI_HOLE_END "pci-hole-end" > -#define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start" > -#define PCI_HOST_PROP_PCI_HOLE64_END "pci-hole64-end" > -#define PCI_HOST_PROP_PCI_HOLE64_SIZE "pci-hole64-size" > #define PCI_HOST_BELOW_4G_MEM_SIZE "below-4g-mem-size" > #define PCI_HOST_ABOVE_4G_MEM_SIZE "above-4g-mem-size" > > diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h > index ba31595fc7..e343f4d9ca 100644 > --- a/include/hw/pci/pci_host.h > +++ b/include/hw/pci/pci_host.h > @@ -38,6 +38,12 @@ > #define PCI_HOST_BRIDGE_GET_CLASS(obj) \ > OBJECT_GET_CLASS(PCIHostBridgeClass, (obj), TYPE_PCI_HOST_BRIDGE) > > +#define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start" > +#define PCI_HOST_PROP_PCI_HOLE_END "pci-hole-end" > +#define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start" > +#define PCI_HOST_PROP_PCI_HOLE64_END "pci-hole64-end" > +#define PCI_HOST_PROP_PCI_HOLE64_SIZE "pci-hole64-size" these are pc/q53 machine specific properties and do not belong here > + > struct PCIHostState { > SysBusDevice busdev; >
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index fed136fcdd..bbbdb33ea3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -182,11 +182,6 @@ void pc_acpi_init(const char *default_dsdt); void pc_guest_info_init(PCMachineState *pcms); -#define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start" -#define PCI_HOST_PROP_PCI_HOLE_END "pci-hole-end" -#define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start" -#define PCI_HOST_PROP_PCI_HOLE64_END "pci-hole64-end" -#define PCI_HOST_PROP_PCI_HOLE64_SIZE "pci-hole64-size" #define PCI_HOST_BELOW_4G_MEM_SIZE "below-4g-mem-size" #define PCI_HOST_ABOVE_4G_MEM_SIZE "above-4g-mem-size" diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h index ba31595fc7..e343f4d9ca 100644 --- a/include/hw/pci/pci_host.h +++ b/include/hw/pci/pci_host.h @@ -38,6 +38,12 @@ #define PCI_HOST_BRIDGE_GET_CLASS(obj) \ OBJECT_GET_CLASS(PCIHostBridgeClass, (obj), TYPE_PCI_HOST_BRIDGE) +#define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start" +#define PCI_HOST_PROP_PCI_HOLE_END "pci-hole-end" +#define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start" +#define PCI_HOST_PROP_PCI_HOLE64_END "pci-hole64-end" +#define PCI_HOST_PROP_PCI_HOLE64_SIZE "pci-hole64-size" + struct PCIHostState { SysBusDevice busdev;
The PCI hole properties are not pc or i386 specific. They belong to the PCI host header instead. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> --- include/hw/i386/pc.h | 5 ----- include/hw/pci/pci_host.h | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-)