From: Aneesh Kumar K.V Date: Sun, 19 Jun 2011 09:13:16 +0000 (+0530) Subject: tools/kvm/9p: Use the same #define as the kernel X-Git-Tag: next-20110824~3^2~195 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c77da81612c711fe17f3aa799f83bd16178ce6db;p=karo-tx-linux.git tools/kvm/9p: Use the same #define as the kernel Cc: Sasha Levin Signed-off-by: Aneesh Kumar K.V Signed-off-by: Pekka Enberg --- diff --git a/tools/kvm/virtio/9p.c b/tools/kvm/virtio/9p.c index add63fe11aed..0fbf59138175 100644 --- a/tools/kvm/virtio/9p.c +++ b/tools/kvm/virtio/9p.c @@ -21,7 +21,7 @@ #include #define NUM_VIRT_QUEUES 1 -#define VIRTIO_P9_QUEUE_SIZE 128 +#define VIRTQUEUE_NUM 128 #define VIRTIO_P9_DEFAULT_TAG "kvm_9p" #define VIRTIO_P9_HDR_LEN (sizeof(u32)+sizeof(u8)+sizeof(u16)) #define VIRTIO_P9_MAX_FID 128 @@ -115,7 +115,7 @@ static bool virtio_p9_pci_io_in(struct ioport *ioport, struct kvm *kvm, ioport__write32(data, p9dev->vqs[p9dev->queue_selector].pfn); break; case VIRTIO_PCI_QUEUE_NUM: - ioport__write16(data, VIRTIO_P9_QUEUE_SIZE); + ioport__write16(data, VIRTQUEUE_NUM); break; case VIRTIO_PCI_STATUS: ioport__write8(data, p9dev->status); @@ -574,7 +574,7 @@ static bool virtio_p9_do_io_request(struct kvm *kvm, struct p9_dev_job *job) p9_handler *handler; struct virt_queue *vq; struct p9_dev *p9dev; - struct iovec iov[VIRTIO_P9_QUEUE_SIZE]; + struct iovec iov[VIRTQUEUE_NUM]; vq = job->vq; p9dev = job->p9dev; @@ -638,7 +638,7 @@ static bool virtio_p9_pci_io_out(struct ioport *ioport, struct kvm *kvm, queue->pfn = ioport__read32(data); p = guest_pfn_to_host(kvm, queue->pfn); - vring_init(&queue->vring, VIRTIO_P9_QUEUE_SIZE, p, + vring_init(&queue->vring, VIRTQUEUE_NUM, p, VIRTIO_PCI_VRING_ALIGN); *job = (struct p9_dev_job) {