From patchwork Thu May 26 06:42:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 819742 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4Q6hBot032731 for ; Thu, 26 May 2011 06:43:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755508Ab1EZGnD (ORCPT ); Thu, 26 May 2011 02:43:03 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:35568 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755299Ab1EZGm5 (ORCPT ); Thu, 26 May 2011 02:42:57 -0400 Received: by mail-ww0-f44.google.com with SMTP id 36so405206wwa.1 for ; Wed, 25 May 2011 23:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=z0IMydxldjT3jJFeyC0Sys1+pkQUxPZkEsmfgeVuRn8=; b=fkOqtJ/WteGAxkrTXJZM6HtfN/pYCqZUCEbXruH8uMRuN2lZVcPwGUTnGnvsVsAgZr qWeOEXKXbjcLSSurh59GGObFOM46P62AW7O8RSLcW+a4yAdlaXOSuJBMt071cuU/ROLs hC/EtwmuKruAL3kfiiM9KnhDFzMCzUXd7pb4s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=o7C/e1wP/tjf62ZiQByCpNtJw9Faj+a5jGrFnljK+x211BO4wfLdoOMF1VdFbzidSU ZtXB5/Lfe2dpiKFOLZb7lQmU/yFzcC3uqySPROrgVBoqdScHqbJYoTQ9btLABBTQNvF+ oestJi16GTBBg03MKX6WSJ3CjL9btTBZq+IlI= Received: by 10.227.205.67 with SMTP id fp3mr437378wbb.53.1306392176962; Wed, 25 May 2011 23:42:56 -0700 (PDT) Received: from localhost.localdomain ([109.66.201.145]) by mx.google.com with ESMTPS id d19sm243507wbh.8.2011.05.25.23.42.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 May 2011 23:42:56 -0700 (PDT) From: Sasha Levin To: penberg@kernel.org Cc: john@jfloren.net, kvm@vger.kernel.org, mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, prasadjoshi124@gmail.com, Sasha Levin Subject: [PATCH v2 8/8] kvm tools: Use dynamic IO port allocation in virtio-net Date: Thu, 26 May 2011 09:42:15 +0300 Message-Id: <1306392135-16993-8-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.5.rc3 In-Reply-To: <1306392135-16993-1-git-send-email-levinsasha928@gmail.com> References: <1306392135-16993-1-git-send-email-levinsasha928@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 26 May 2011 06:43:15 +0000 (UTC) Signed-off-by: Sasha Levin --- tools/kvm/include/kvm/ioport.h | 3 --- tools/kvm/virtio/net.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/kvm/include/kvm/ioport.h b/tools/kvm/include/kvm/ioport.h index 0c68e8c..396928b 100644 --- a/tools/kvm/include/kvm/ioport.h +++ b/tools/kvm/include/kvm/ioport.h @@ -10,9 +10,6 @@ #define IOPORT_START 0x6200 #define IOPORT_SIZE 0x400 -#define IOPORT_VIRTIO_NET 0xe200 /* Virtio network device */ -#define IOPORT_VIRTIO_NET_SIZE 256 - #define IOPORT_EMPTY USHRT_MAX struct kvm; diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c index 649bc0f..7e4400a 100644 --- a/tools/kvm/virtio/net.c +++ b/tools/kvm/virtio/net.c @@ -37,7 +37,6 @@ static struct pci_device_header pci_header = { .class = 0x020000, .subsys_vendor_id = PCI_SUBSYSTEM_VENDOR_ID_REDHAT_QUMRANET, .subsys_id = VIRTIO_ID_NET, - .bar[0] = IOPORT_VIRTIO_NET | PCI_BASE_ADDRESS_SPACE_IO, }; struct net_device { @@ -51,6 +50,7 @@ struct net_device { u8 status; u8 isr; u16 queue_selector; + u16 base_addr; pthread_t io_rx_thread; pthread_mutex_t io_rx_lock; @@ -166,7 +166,7 @@ static bool virtio_net_pci_io_device_specific_in(void *data, unsigned long offse static bool virtio_net_pci_io_in(struct kvm *kvm, u16 port, void *data, int size, u32 count) { - unsigned long offset = port - IOPORT_VIRTIO_NET; + unsigned long offset = port - ndev.base_addr; bool ret = true; mutex_lock(&ndev.mutex); @@ -230,7 +230,7 @@ static void virtio_net_handle_callback(struct kvm *kvm, u16 queue_index) static bool virtio_net_pci_io_out(struct kvm *kvm, u16 port, void *data, int size, u32 count) { - unsigned long offset = port - IOPORT_VIRTIO_NET; + unsigned long offset = port - ndev.base_addr; bool ret = true; mutex_lock(&ndev.mutex); @@ -387,14 +387,18 @@ void virtio_net__init(const struct virtio_net_parameters *params) { if (virtio_net__tap_init(params)) { u8 dev, line, pin; + u16 net_base_addr; if (irq__register_device(VIRTIO_ID_NET, &dev, &pin, &line) < 0) return; pci_header.irq_pin = pin; pci_header.irq_line = line; + net_base_addr = ioport__register(IOPORT_EMPTY, &virtio_net_io_ops, IOPORT_SIZE); + pci_header.bar[0] = net_base_addr | PCI_BASE_ADDRESS_SPACE_IO; + ndev.base_addr = net_base_addr; + pci__register(&pci_header, dev); - ioport__register(IOPORT_VIRTIO_NET, &virtio_net_io_ops, IOPORT_VIRTIO_NET_SIZE); virtio_net__io_thread_init(params->kvm); }