]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
tools/kvm/9p: Use the same #define as the kernel
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Sun, 19 Jun 2011 09:13:16 +0000 (14:43 +0530)
committerPekka Enberg <penberg@kernel.org>
Sun, 19 Jun 2011 10:16:18 +0000 (13:16 +0300)
Cc: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
tools/kvm/virtio/9p.c

index add63fe11aed2f6b69349720eb64b5dc46b17f7e..0fbf59138175add1b33974ec164ff94ff275093c 100644 (file)
@@ -21,7 +21,7 @@
 #include <net/9p/9p.h>
 
 #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) {