Commit-ID: c1a2b22899b375649836a5e80c890ad20392e1e2
Gitweb: http://git.kernel.org/tip/c1a2b22899b375649836a5e80c890ad20392e1e2
Author: Sasha Levin <levinsasha928@xxxxxxxxx>
AuthorDate: Thu, 26 May 2011 13:30:08 +0300
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Thu, 26 May 2011 18:55:56 +0300
kvm tools: Use dynamic IO port allocation in vesa driver
Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/hw/vesa.c | 7 +++----
tools/kvm/include/kvm/ioport.h | 2 --
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/tools/kvm/hw/vesa.c b/tools/kvm/hw/vesa.c
index ec4788c..85fe1a9 100644
--- a/tools/kvm/hw/vesa.c
+++ b/tools/kvm/hw/vesa.c
@@ -49,7 +49,6 @@ static struct pci_device_header vesa_pci_device = {
.class = 0x030000,
.subsys_vendor_id = PCI_SUBSYSTEM_VENDOR_ID_REDHAT_QUMRANET,
.subsys_id = PCI_SUBSYSTEM_ID_VESA,
- .bar[0] = IOPORT_VESA | PCI_BASE_ADDRESS_SPACE_IO,
.bar[1] = VESA_MEM_ADDR | PCI_BASE_ADDRESS_SPACE_MEMORY,
};
@@ -66,17 +65,17 @@ void vesa__init(struct kvm *kvm)
{
u8 dev, line, pin;
pthread_t thread;
+ u16 vesa_base_addr;
if (irq__register_device(PCI_DEVICE_ID_VESA, &dev, &pin, &line) < 0)
return;
vesa_pci_device.irq_pin = pin;
vesa_pci_device.irq_line = line;
-
+ vesa_base_addr = ioport__register(IOPORT_EMPTY, &vesa_io_ops, IOPORT_SIZE, NULL);
+ vesa_pci_device.bar[0] = vesa_base_addr | PCI_BASE_ADDRESS_SPACE_IO;
pci__register(&vesa_pci_device, dev);
- ioport__register(IOPORT_VESA, &vesa_io_ops, IOPORT_VESA_SIZE, NULL);
-
kvm__register_mmio(VESA_MEM_ADDR, VESA_MEM_SIZE, &vesa_mmio_callback);
pthread_create(&thread, NULL, vesa__dovnc, kvm);
diff --git a/tools/kvm/include/kvm/ioport.h b/tools/kvm/include/kvm/ioport.h
index 55d53e0..84eb65a 100644
--- a/tools/kvm/include/kvm/ioport.h
+++ b/tools/kvm/include/kvm/ioport.h
@@ -12,8 +12,6 @@
#define IOPORT_START 0x6200
#define IOPORT_SIZE 0x400
-#define IOPORT_VESA 0xa200
-#define IOPORT_VESA_SIZE 256
#define IOPORT_VIRTIO_P9 0xb200 /* Virtio 9P device */
#define IOPORT_VIRTIO_P9_SIZE 256
#define IOPORT_VIRTIO_CONSOLE 0xd200 /* Virtio console device */
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|