[PATCH v2 7/8] kvm tools: Use dynamic IO port allocation in virtio-console

[Sasha Levin]

Signed-off-by: Sasha Levin <levinsasha...@gmail.com>
---
 tools/kvm/include/kvm/ioport.h |    2 --
 tools/kvm/virtio/console.c     |   11 +++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/kvm/include/kvm/ioport.h b/tools/kvm/include/kvm/ioport.h
index a6bcc6a..0c68e8c 100644
--- a/tools/kvm/include/kvm/ioport.h
+++ b/tools/kvm/include/kvm/ioport.h
@@ -10,8 +10,6 @@
 #define IOPORT_START                   0x6200
 #define IOPORT_SIZE                    0x400
 
-#define IOPORT_VIRTIO_CONSOLE          0xd200  /* Virtio console device */
-#define IOPORT_VIRTIO_CONSOLE_SIZE     256
 #define IOPORT_VIRTIO_NET              0xe200  /* Virtio network device */
 #define IOPORT_VIRTIO_NET_SIZE         256
 
diff --git a/tools/kvm/virtio/console.c b/tools/kvm/virtio/console.c
index affff0b..a954f22 100644
--- a/tools/kvm/virtio/console.c
+++ b/tools/kvm/virtio/console.c
@@ -36,7 +36,6 @@ static struct pci_device_header virtio_console_pci_device = {
        .class                  = 0x078000,
        .subsys_vendor_id       = PCI_SUBSYSTEM_VENDOR_ID_REDHAT_QUMRANET,
        .subsys_id              = VIRTIO_ID_CONSOLE,
-       .bar[0]                 = IOPORT_VIRTIO_CONSOLE | 
PCI_BASE_ADDRESS_SPACE_IO,
 };
 
 struct con_dev {
@@ -50,6 +49,7 @@ struct con_dev {
        u8                              status;
        u8                              isr;
        u16                             queue_selector;
+       u16                             base_addr;
 
        void                            *jobs[VIRTIO_CONSOLE_NUM_QUEUES];
 };
@@ -113,7 +113,7 @@ static bool virtio_console_pci_io_device_specific_in(void 
*data, unsigned long o
 
 static bool virtio_console_pci_io_in(struct kvm *kvm, u16 port, void *data, 
int size, u32 count)
 {
-       unsigned long offset = port - IOPORT_VIRTIO_CONSOLE;
+       unsigned long offset = port - cdev.base_addr;
        bool ret = true;
 
        mutex_lock(&cdev.mutex);
@@ -181,7 +181,7 @@ static void virtio_console_handle_callback(struct kvm *kvm, 
void *param)
 
 static bool virtio_console_pci_io_out(struct kvm *kvm, u16 port, void *data, 
int size, u32 count)
 {
-       unsigned long offset = port - IOPORT_VIRTIO_CONSOLE;
+       unsigned long offset = port - cdev.base_addr;
        bool ret = true;
 
        mutex_lock(&cdev.mutex);
@@ -243,12 +243,15 @@ static struct ioport_operations virtio_console_io_ops = {
 void virtio_console__init(struct kvm *kvm)
 {
        u8 dev, line, pin;
+       u16 console_base_addr;
 
        if (irq__register_device(VIRTIO_ID_CONSOLE, &dev, &pin, &line) < 0)
                return;
 
        virtio_console_pci_device.irq_pin       = pin;
        virtio_console_pci_device.irq_line      = line;
+       console_base_addr                       = 
ioport__register(IOPORT_EMPTY, &virtio_console_io_ops, IOPORT_SIZE);
+       virtio_console_pci_device.bar[0]        = console_base_addr | 
PCI_BASE_ADDRESS_SPACE_IO;
+       cdev.base_addr                          = console_base_addr;
        pci__register(&virtio_console_pci_device, dev);
-       ioport__register(IOPORT_VIRTIO_CONSOLE, &virtio_console_io_ops, 
IOPORT_VIRTIO_CONSOLE_SIZE);
 }
-- 
1.7.5.rc3

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html