From: Asias He <asias.hejun@gmail.com>
Date: Fri, 8 Apr 2011 14:12:48 +0000 (+0800)
Subject: kvm tools: Cleanup IO space and PCI magic numbers
X-Git-Tag: next-20110824~3^2~486
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8cd1c959e37d5e399c586bd02a89c0da4cbb2d41;p=karo-tx-linux.git

kvm tools: Cleanup IO space and PCI magic numbers

This patch define macros for virtio device IO space size and PCI device
numbering.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/tools/kvm/blk-virtio.c b/tools/kvm/blk-virtio.c
index 48211b5cbeff..9a723cc491fa 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 7b6af539c684..b77f565a98c1 100644
--- a/tools/kvm/include/kvm/ioport.h
+++ b/tools/kvm/include/kvm/ioport.h
@@ -5,8 +5,11 @@
 #include <stdint.h>
 
 /* 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;