diff options
| author | Paolo Bonzini | 2013-06-25 12:33:01 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2013-07-04 17:42:47 +0200 |
| commit | 3cd2cf4375993494bcf6195c1637a3d009aa6fae (patch) | |
| tree | af90f3229403ee60b3e67a1e311a811a6fb7f5ca /hw/pci-host/pam.c | |
| parent | spapr_iommu: pass device to spapr_tce_new_table and use it to set owner (diff) | |
| download | qemu-3cd2cf4375993494bcf6195c1637a3d009aa6fae.tar.gz qemu-3cd2cf4375993494bcf6195c1637a3d009aa6fae.tar.xz qemu-3cd2cf4375993494bcf6195c1637a3d009aa6fae.zip | |
pam: pass device to init_pam and use it to set owner
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/pci-host/pam.c')
| -rw-r--r-- | hw/pci-host/pam.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/hw/pci-host/pam.c b/hw/pci-host/pam.c index ec935f440a..ec6be4676c 100644 --- a/hw/pci-host/pam.c +++ b/hw/pci-host/pam.c @@ -26,6 +26,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +#include "qom/object.h" #include "sysemu/sysemu.h" #include "hw/pci-host/pam.h" @@ -49,24 +51,24 @@ void smram_set_smm(uint8_t *host_smm_enabled, int smm, uint8_t smram, } } -void init_pam(MemoryRegion *ram_memory, MemoryRegion *system_memory, - MemoryRegion *pci_address_space, PAMMemoryRegion *mem, - uint32_t start, uint32_t size) +void init_pam(DeviceState *dev, MemoryRegion *ram_memory, + MemoryRegion *system_memory, MemoryRegion *pci_address_space, + PAMMemoryRegion *mem, uint32_t start, uint32_t size) { int i; /* RAM */ - memory_region_init_alias(&mem->alias[3], NULL, "pam-ram", ram_memory, + memory_region_init_alias(&mem->alias[3], OBJECT(dev), "pam-ram", ram_memory, start, size); /* ROM (XXX: not quite correct) */ - memory_region_init_alias(&mem->alias[1], NULL, "pam-rom", ram_memory, + memory_region_init_alias(&mem->alias[1], OBJECT(dev), "pam-rom", ram_memory, start, size); memory_region_set_readonly(&mem->alias[1], true); /* XXX: should distinguish read/write cases */ - memory_region_init_alias(&mem->alias[0], NULL, "pam-pci", pci_address_space, + memory_region_init_alias(&mem->alias[0], OBJECT(dev), "pam-pci", pci_address_space, start, size); - memory_region_init_alias(&mem->alias[2], NULL, "pam-pci", pci_address_space, + memory_region_init_alias(&mem->alias[2], OBJECT(dev), "pam-pci", pci_address_space, start, size); for (i = 0; i < 4; ++i) { |