diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2009-10-30 21:21:10 +0900 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-11-09 08:43:08 -0600 |
| commit | 4f8589e11558f1151d95a4a3e9fce902f042df3d (patch) | |
| tree | b2564c76ca9635832de018f938cd617c9d7ce087 /hw/pci.c | |
| parent | 89e8b13c530a9375c43e617c09d07d78d7065926 (diff) | |
| download | focaccia-qemu-4f8589e11558f1151d95a4a3e9fce902f042df3d.tar.gz focaccia-qemu-4f8589e11558f1151d95a4a3e9fce902f042df3d.zip | |
pci: typedef pcibus_t as uint64_t instead of uint32_t.
This patch is preliminary for 64bit bar. For 64bit bar support, change pcibus_t which represents pci bus addr/size from uint32_t to uint64_t. And also change FMT_pcibus for printf. In pci_update_mapping() checks 32bit overflow. So the check must be updated too. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/pci.c b/hw/pci.c index 5cf50e0562..b462bd6246 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -524,7 +524,14 @@ static void pci_update_mappings(PCIDevice *d) mappings, we handle specific values as invalid mappings. */ if (last_addr <= new_addr || new_addr == 0 || - last_addr == PCI_BAR_UNMAPPED) { + last_addr == PCI_BAR_UNMAPPED || + + /* Now pcibus_t is 64bit. + * Check if 32 bit BAR wrap around explicitly. + * Without this, PC ide doesn't work well. + * TODO: remove this work around. + */ + last_addr >= UINT32_MAX) { new_addr = PCI_BAR_UNMAPPED; } } else { |