From c7da7a02a1eeb687b2557a25c7f6b32589e55d79 Mon Sep 17 00:00:00 2001
From: Zhi Yong Wu <zwu.kernel@gmail.com>
Date: Wed, 12 Feb 2014 20:50:56 +0800
Subject: [PATCH] virio: make probe_virt_queues() void
Signed-off-by: Zhi Yong Wu <zwu.kernel@gmail.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
drivers/virtio.cc | 8 +++-----
drivers/virtio.hh | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/virtio.cc b/drivers/virtio.cc
index 80e15e2d8..add46af77 100644
--- a/drivers/virtio.cc
+++ b/drivers/virtio.cc
@@ -141,14 +141,14 @@ bool virtio_driver::kick(int queue)
return true;
}
-bool virtio_driver::probe_virt_queues()
+void virtio_driver::probe_virt_queues()
{
u16 qsize = 0;
do {
if (_num_queues >= max_virtqueues_nr) {
- return false;
+ return;
}
// Read queue size
@@ -167,7 +167,7 @@ bool virtio_driver::probe_virt_queues()
virtio_conf_writew(VIRTIO_MSI_QUEUE_VECTOR, _num_queues);
if (virtio_conf_readw(VIRTIO_MSI_QUEUE_VECTOR) != _num_queues) {
virtio_e("Setting MSIx entry for queue %d failed.", _num_queues);
- return false;
+ return;
}
}
@@ -182,8 +182,6 @@ bool virtio_driver::probe_virt_queues()
virtio_d("Queue[%d] -> size %d, paddr %x", (_num_queues-1), qsize, queue->get_paddr());
} while (true);
-
- return true;
}
vring* virtio_driver::get_virt_queue(unsigned idx)
diff --git a/drivers/virtio.hh b/drivers/virtio.hh
index 3f383792a..3070ae140 100644
--- a/drivers/virtio.hh
+++ b/drivers/virtio.hh
@@ -118,7 +118,7 @@ public:
bool parse_pci_config();
- bool probe_virt_queues();
+ void probe_virt_queues();
vring* get_virt_queue(unsigned idx);
// block the calling thread until the queue has some used elements in it.
--
GitLab