diff options
| author | Xudong Hao <xudong.hao@intel.com> | 2012-12-20 11:07:23 +0800 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2012-12-25 14:37:52 +0200 |
| commit | 0a2a59d35cbabf63c91340a1c62038e3e60538c1 (patch) | |
| tree | 08db34f1d6c98965dcd0a99a6ae41535a2de7650 | |
| parent | f28558d3d37ad3bc4e35e8ac93f7bf81a0d5622c (diff) | |
| download | qemu-0a2a59d35cbabf63c91340a1c62038e3e60538c1.zip | |
qemu-kvm/pci-assign: 64 bits bar emulation
Enable 64 bits bar emulation.
Test pass with the current seabios which already support 64bit pci bars.
Signed-off-by: Xudong Hao <xudong.hao@intel.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
| -rw-r--r-- | hw/kvm/pci-assign.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c index e80dad009c..addc205596 100644 --- a/hw/kvm/pci-assign.c +++ b/hw/kvm/pci-assign.c @@ -46,6 +46,7 @@ #define IORESOURCE_IRQ 0x00000400 #define IORESOURCE_DMA 0x00000800 #define IORESOURCE_PREFETCH 0x00002000 /* No side effects */ +#define IORESOURCE_MEM_64 0x00100000 //#define DEVICE_ASSIGNMENT_DEBUG @@ -442,9 +443,13 @@ static int assigned_dev_register_regions(PCIRegion *io_regions, /* handle memory io regions */ if (cur_region->type & IORESOURCE_MEM) { - int t = cur_region->type & IORESOURCE_PREFETCH - ? PCI_BASE_ADDRESS_MEM_PREFETCH - : PCI_BASE_ADDRESS_SPACE_MEMORY; + int t = PCI_BASE_ADDRESS_SPACE_MEMORY; + if (cur_region->type & IORESOURCE_PREFETCH) { + t |= PCI_BASE_ADDRESS_MEM_PREFETCH; + } + if (cur_region->type & IORESOURCE_MEM_64) { + t |= PCI_BASE_ADDRESS_MEM_TYPE_64; + } /* map physical memory */ pci_dev->v_addrs[i].u.r_virtbase = mmap(NULL, cur_region->size, @@ -632,7 +637,8 @@ again: rp->valid = 0; rp->resource_fd = -1; size = end - start + 1; - flags &= IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH; + flags &= IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH + | IORESOURCE_MEM_64; if (size == 0 || (flags & ~IORESOURCE_PREFETCH) == 0) { continue; } |