[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V2 13/20] pci: move typedef, PCIHostState, PCIExpres
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH V2 13/20] pci: move typedef, PCIHostState, PCIExpressHost to qemu-common.h. |
Date: |
Fri, 13 Nov 2009 13:29:49 +0900 |
This patch moves two typedefs, PCIHostState and PCIExpressHost to
qemu-common.h for consistency as PCIBus and PCIDevice are typedefed
in qemu-common.h.
Signed-off-by: Isaku Yamahata <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
---
hw/pci_host.h | 4 ++--
hw/pcie_host.h | 4 ++--
qemu-common.h | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/pci_host.h b/hw/pci_host.h
index cf3a339..a006687 100644
--- a/hw/pci_host.h
+++ b/hw/pci_host.h
@@ -30,11 +30,11 @@
#include "sysbus.h"
-typedef struct {
+struct PCIHostState {
SysBusDevice busdev;
uint32_t config_reg;
PCIBus *bus;
-} PCIHostState;
+};
void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len);
uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len);
diff --git a/hw/pcie_host.h b/hw/pcie_host.h
index a7771c9..7754ac9 100644
--- a/hw/pcie_host.h
+++ b/hw/pcie_host.h
@@ -24,7 +24,7 @@
#include "pci_host.h"
-typedef struct {
+struct PCIExpressHost {
PCIHostState pci;
/* express part */
@@ -37,7 +37,7 @@ typedef struct {
/* result of cpu_register_io_memory() to map MMCONFIG area */
int mmio_index;
-} PCIExpressHost;
+};
int pcie_host_init(PCIExpressHost *e);
void pcie_host_mmcfg_unmap(PCIExpressHost *e);
diff --git a/qemu-common.h b/qemu-common.h
index b779cfe..8ecac61 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -198,6 +198,8 @@ typedef struct i2c_bus i2c_bus;
typedef struct i2c_slave i2c_slave;
typedef struct SMBusDevice SMBusDevice;
typedef struct QEMUTimer QEMUTimer;
+typedef struct PCIHostState PCIHostState;
+typedef struct PCIExpressHost PCIExpressHost;
typedef struct PCIBus PCIBus;
typedef struct PCIDevice PCIDevice;
typedef struct SerialState SerialState;
--
1.6.0.2
- [Qemu-devel] [PATCH V2 00/20] PCI express clean up patches., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 01/20] pci: fix pci_info_device()., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 02/20] pci: move pci_data_{read, write}() declaration from pci.h to pci_host.h, Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 11/20] pci: clean up of pci_init_wmask()., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 05/20] pci: rename pci_addr_to_dev(), pcie_mmcfg_addr_to_dev()., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 03/20] pci: simplify (pci_/pcie_mmcfg_)data_read(), Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 07/20] pci: remove pci_sub_bus() by open coding., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 09/20] pci_host: remove unnecessary & 0xff., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 13/20] pci: move typedef, PCIHostState, PCIExpressHost to qemu-common.h.,
Isaku Yamahata <=
- [Qemu-devel] [PATCH V2 17/20] pci: remove magic number, 256 in pci.c, Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 14/20] pci: remove unused constants., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 19/20] pci: pci bridge related clean up., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 06/20] pci: shorten pci_host_{conf, data}_register_xxx function a bit., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 12/20] pci: remove some unnecessary comment in pci.h, Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 15/20] pci: clean up of pci_update_mappings(), Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 08/20] pci: s/pci_find_host_bus/pci_find_root_bus/g, Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 16/20] pci: split up up pci_update mappings, Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 18/20] pci: fix pci_config_get_io_base()., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 10/20] pci: kill unnecessary included in pci.c, Isaku Yamahata, 2009/11/12