From 402585aedb9b38721e0687da2e34ee9f8b7ef2ee Mon Sep 17 00:00:00 2001
From: Zhi Yong Wu <zwu.kernel@gmail.com>
Date: Wed, 12 Feb 2014 20:50:55 +0800
Subject: [PATCH] virtio: make set_features() void
Signed-off-by: Zhi Yong Wu <zwu.kernel@gmail.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
drivers/virtio.cc | 5 +----
drivers/virtio.hh | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/virtio.cc b/drivers/virtio.cc
index 2ddd0d4f5..80e15e2d8 100644
--- a/drivers/virtio.cc
+++ b/drivers/virtio.cc
@@ -53,7 +53,7 @@ virtio_driver::~virtio_driver()
free_queues();
}
-bool virtio_driver::setup_features()
+void virtio_driver::setup_features()
{
u32 dev_features = get_device_features();
u32 drv_features = this->get_driver_features();
@@ -73,9 +73,6 @@ bool virtio_driver::setup_features()
set_event_idx_cap(true);
set_guest_features(subset);
-
- return subset != 0;
-
}
void virtio_driver::dump_config()
diff --git a/drivers/virtio.hh b/drivers/virtio.hh
index 4b40a3860..3f383792a 100644
--- a/drivers/virtio.hh
+++ b/drivers/virtio.hh
@@ -165,7 +165,7 @@ public:
protected:
// Actual drivers should implement this on top of the basic ring features
virtual u32 get_driver_features() { return 1 << VIRTIO_RING_F_INDIRECT_DESC | 1 << VIRTIO_RING_F_EVENT_IDX; }
- bool setup_features();
+ void setup_features();
protected:
pci::device& _dev;
interrupt_manager _msi;
--
GitLab