With virtio-1, we support more than 32 feature bits. Let's make
vdev-guest_features depend on the number of supported feature bits,
allowing us to grow the feature bits automatically.
We also need to enhance the internal functions dealing with getting
and setting features with an additional index field, so that all feature
bits may be accessed (in chunks of 32 bits).
vhost and migration have been ignored for now.
Reviewed-by: Thomas Huth th...@linux.vnet.ibm.com
Signed-off-by: Cornelia Huck cornelia.h...@de.ibm.com
---
hw/9pfs/virtio-9p-device.c |7 ++-
hw/block/virtio-blk.c |9 +++--
hw/char/virtio-serial-bus.c|9 +++--
hw/net/virtio-net.c| 38 ++
hw/s390x/s390-virtio-bus.c |9 +
hw/s390x/virtio-ccw.c | 17 ++---
hw/scsi/vhost-scsi.c |7 +--
hw/scsi/virtio-scsi.c |8
hw/virtio/dataplane/vring.c| 10 +-
hw/virtio/virtio-balloon.c |8 ++--
hw/virtio/virtio-bus.c |9 +
hw/virtio/virtio-mmio.c|9 +
hw/virtio/virtio-pci.c | 13 +++--
hw/virtio/virtio-rng.c |2 +-
hw/virtio/virtio.c | 29 +
include/hw/virtio/virtio-bus.h |7 ---
include/hw/virtio/virtio.h | 19 ++-
17 files changed, 134 insertions(+), 76 deletions(-)
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 2572747..c29c8c8 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -21,8 +21,13 @@
#include virtio-9p-coth.h
#include hw/virtio/virtio-access.h
-static uint32_t virtio_9p_get_features(VirtIODevice *vdev, uint32_t features)
+static uint32_t virtio_9p_get_features(VirtIODevice *vdev, unsigned int index,
+ uint32_t features)
{
+if (index 0) {
+return features;
+}
+
features |= 1 VIRTIO_9P_MOUNT_TAG;
return features;
}
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 45e0c8f..5abc327 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -561,10 +561,15 @@ static void virtio_blk_set_config(VirtIODevice *vdev,
const uint8_t *config)
aio_context_release(bdrv_get_aio_context(s-bs));
}
-static uint32_t virtio_blk_get_features(VirtIODevice *vdev, uint32_t features)
+static uint32_t virtio_blk_get_features(VirtIODevice *vdev, unsigned int index,
+uint32_t features)
{
VirtIOBlock *s = VIRTIO_BLK(vdev);
+if (index 0) {
+return features;
+}
+
features |= (1 VIRTIO_BLK_F_SEG_MAX);
features |= (1 VIRTIO_BLK_F_GEOMETRY);
features |= (1 VIRTIO_BLK_F_TOPOLOGY);
@@ -597,7 +602,7 @@ static void virtio_blk_set_status(VirtIODevice *vdev,
uint8_t status)
return;
}
-features = vdev-guest_features;
+features = vdev-guest_features[0];
/* A guest that supports VIRTIO_BLK_F_CONFIG_WCE must be able to send
* cache flushes. Thus, the auto writethrough behavior is never
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 3931085..0d843fe 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -75,7 +75,7 @@ static VirtIOSerialPort *find_port_by_name(char *name)
static bool use_multiport(VirtIOSerial *vser)
{
VirtIODevice *vdev = VIRTIO_DEVICE(vser);
-return vdev-guest_features (1 VIRTIO_CONSOLE_F_MULTIPORT);
+return vdev-guest_features[0] (1 VIRTIO_CONSOLE_F_MULTIPORT);
}
static size_t write_to_port(VirtIOSerialPort *port,
@@ -467,10 +467,15 @@ static void handle_input(VirtIODevice *vdev, VirtQueue
*vq)
{
}
-static uint32_t get_features(VirtIODevice *vdev, uint32_t features)
+static uint32_t get_features(VirtIODevice *vdev, unsigned int index,
+ uint32_t features)
{
VirtIOSerial *vser;
+if (index 0) {
+return features;
+}
+
vser = VIRTIO_SERIAL(vdev);
if (vser-bus.max_nr_ports 1) {
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 2040eac..67f91c0 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -86,7 +86,7 @@ static void virtio_net_set_config(VirtIODevice *vdev, const
uint8_t *config)
memcpy(netcfg, config, n-config_size);
-if (!(vdev-guest_features VIRTIO_NET_F_CTRL_MAC_ADDR 1)
+if (!(vdev-guest_features[0] VIRTIO_NET_F_CTRL_MAC_ADDR 1)
memcmp(netcfg.mac, n-mac, ETH_ALEN)) {
memcpy(n-mac, netcfg.mac, ETH_ALEN);
qemu_format_nic_info_str(qemu_get_queue(n-nic), n-mac);
@@ -305,7 +305,7 @@ static RxFilterInfo
*virtio_net_query_rxfilter(NetClientState *nc)
info-multicast_table = str_list;
info-vlan_table = get_vlan_table(n);
-if (!((1 VIRTIO_NET_F_CTRL_VLAN) vdev-guest_features)) {
+if (!((1 VIRTIO_NET_F_CTRL_VLAN)
