From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH 7/9] kvm tools: Use dynamic IO port allocation in virtio-console driver Date: Wed, 25 May 2011 17:23:45 +0300 Message-ID: <1306333427-26186-7-git-send-email-levinsasha928@gmail.com> References: <1306333427-26186-1-git-send-email-levinsasha928@gmail.com> Cc: john@jfloren.net, kvm@vger.kernel.org, mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, prasadjoshi124@gmail.com, Sasha Levin To: penberg@kernel.org Return-path: Received: from mail-wy0-f174.google.com ([74.125.82.174]:45482 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932975Ab1EYOYd (ORCPT ); Wed, 25 May 2011 10:24:33 -0400 Received: by mail-wy0-f174.google.com with SMTP id 21so5812629wya.19 for ; Wed, 25 May 2011 07:24:33 -0700 (PDT) In-Reply-To: <1306333427-26186-1-git-send-email-levinsasha928@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Sasha Levin --- tools/kvm/virtio/console.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/kvm/virtio/console.c b/tools/kvm/virtio/console.c index affff0b..eeb5dc9 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,16 @@ 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__find_free_range(); + 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); + ioport__register(console_base_addr, &virtio_console_io_ops, IOPORT_SIZE); } -- 1.7.5.rc3