From patchwork Fri Apr 8 14:12:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asias He X-Patchwork-Id: 692531 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 p37EE9j0001560 for ; Thu, 7 Apr 2011 14:14:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751915Ab1DGOOE (ORCPT ); Thu, 7 Apr 2011 10:14:04 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:53954 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751562Ab1DGOOD (ORCPT ); Thu, 7 Apr 2011 10:14:03 -0400 Received: by yxs7 with SMTP id 7so1024931yxs.19 for ; Thu, 07 Apr 2011 07:14:02 -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; bh=jdYwJqdrShIe9WQBknXXMZGDK77zmsvil38SyttR8B8=; b=Y6nETNriYQF6c3tYFmuN25EwcdeZDhMb8hUHefA1lOgwcGIEm6/+1fXqiHtMSn157D mPuTmuvmYqzpfayMI7cVBN5iybbrPYVfvczbenCQemnu6w3wlSEIL9RHOlxBMZ9rZx4Z qY2S9aDMGEERq6RFMVrMxWyYjZByc3VU3a2po= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=eb/D+K5ZNa9MDTcB7M144e9ZC6ELgjHcPE5lUNQKIHjNDSTbaVVgCAcUy/WMB+kSEe PCAW14UPE17Q0aXKlqyIl2sbPJQSdBMH6I73JyYOxzXlefKDmfcBYvci34F4bb8GqxX0 shXu1XR1eoXMwr7L1pN15e5dB2h1qTz3UhAHs= Received: by 10.43.45.134 with SMTP id uk6mr1459780icb.168.1302185641781; Thu, 07 Apr 2011 07:14:01 -0700 (PDT) Received: from localhost.localdomain ([219.224.169.130]) by mx.google.com with ESMTPS id m10sm2277615wfl.11.2011.04.07.07.13.56 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 07 Apr 2011 07:14:00 -0700 (PDT) From: Asias He To: Pekka Enberg , Cyrill Gorcunov Cc: kvm@vger.kernel.org, Ingo Molnar , Asias He Subject: [PATCH 1/6] kvm tools: define marcros for virtio device io space size and pci device number Date: Fri, 8 Apr 2011 22:12:48 +0800 Message-Id: <1302271973-7604-1-git-send-email-asias.hejun@gmail.com> X-Mailer: git-send-email 1.7.4.1 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, 07 Apr 2011 14:14:10 +0000 (UTC) Signed-off-by: Asias He --- tools/kvm/blk-virtio.c | 6 ++++-- tools/kvm/include/kvm/ioport.h | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/kvm/blk-virtio.c b/tools/kvm/blk-virtio.c index 48211b5..9a723cc 100644 --- a/tools/kvm/blk-virtio.c +++ b/tools/kvm/blk-virtio.c @@ -278,6 +278,8 @@ static struct pci_device_header blk_virtio_pci_device = { .irq_line = VIRTIO_BLK_IRQ, }; +#define PCI_VIRTIO_BLK_DEVNUM 1 + void blk_virtio__init(struct kvm *self) { if (!self->disk_image) @@ -285,7 +287,7 @@ void blk_virtio__init(struct kvm *self) device.blk_config.capacity = self->disk_image->size / SECTOR_SIZE; - pci__register(&blk_virtio_pci_device, 1); + pci__register(&blk_virtio_pci_device, PCI_VIRTIO_BLK_DEVNUM); - ioport__register(IOPORT_VIRTIO_BLK, &blk_virtio_io_ops, 256); + ioport__register(IOPORT_VIRTIO_BLK, &blk_virtio_io_ops, IOPORT_VIRTIO_BLK_SIZE); } diff --git a/tools/kvm/include/kvm/ioport.h b/tools/kvm/include/kvm/ioport.h index 7b6af53..b77f565 100644 --- a/tools/kvm/include/kvm/ioport.h +++ b/tools/kvm/include/kvm/ioport.h @@ -5,8 +5,11 @@ #include /* some ports we reserve for own use */ -#define IOPORT_DBG 0xe0 -#define IOPORT_VIRTIO_BLK 0xc200 /* Virtio block device */ +#define IOPORT_DBG 0xe0 +#define IOPORT_VIRTIO_BLK 0xc200 /* Virtio block device */ +#define IOPORT_VIRTIO_BLK_SIZE 256 +#define IOPORT_VIRTIO_CONSOLE 0xd200 /* Virtio console device */ +#define IOPORT_VIRTIO_CONSOLE_SIZE 256 struct kvm;