This simplifies code compared to having virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) or !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1).
Signed-off-by: Pierrick Bouvier <[email protected]> --- include/hw/virtio/virtio-access.h | 3 +-- include/hw/virtio/virtio.h | 12 +++++++++++- hw/net/virtio-net.c | 2 +- hw/virtio/vhost.c | 2 +- hw/virtio/virtio-pci.c | 2 +- hw/virtio/virtio.c | 16 ++++++++-------- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h index cd17d0c87eb..324ba907e93 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -30,8 +30,7 @@ static inline bool virtio_access_is_big_endian(VirtIODevice *vdev) #if defined(LEGACY_VIRTIO_IS_BIENDIAN) return virtio_is_big_endian(vdev); #elif TARGET_BIG_ENDIAN - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { - /* Devices conforming to VIRTIO 1.0 or later are always LE. */ + if (virtio_vdev_is_modern(vdev)) { return false; } return true; diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 27cd98d2fe1..8f1e4323599 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -468,9 +468,19 @@ static inline bool virtio_host_has_feature(VirtIODevice *vdev, return virtio_has_feature(vdev->host_features, fbit); } +static inline bool virtio_vdev_is_modern(const VirtIODevice *vdev) +{ + return virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1); +} + +static inline bool virtio_vdev_is_legacy(const VirtIODevice *vdev) +{ + return !virtio_vdev_is_modern(vdev); +} + static inline bool virtio_is_big_endian(VirtIODevice *vdev) { - if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_legacy(vdev)) { assert(vdev->device_endian != VIRTIO_DEVICE_ENDIAN_UNKNOWN); return vdev->device_endian == VIRTIO_DEVICE_ENDIAN_BIG; } diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 512a7c02c93..313d3b88400 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -217,7 +217,7 @@ static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) memcpy(&netcfg, config, n->config_size); if (!virtio_vdev_has_feature(vdev, VIRTIO_NET_F_CTRL_MAC_ADDR) && - !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) && + virtio_vdev_is_legacy(vdev) && 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); diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 52801c1796b..70a112242b0 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1168,7 +1168,7 @@ static void vhost_log_stop(MemoryListener *listener, */ static inline bool vhost_needs_vring_endian(VirtIODevice *vdev) { - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { return false; } #if HOST_BIG_ENDIAN diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 1e8f90df34e..6126187a164 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1449,7 +1449,7 @@ static bool virtio_pci_queue_enabled(DeviceState *d, int n) VirtIOPCIProxy *proxy = VIRTIO_PCI(d); VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { return proxy->vqs[n].enabled; } diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 77ca54e5206..b0987e66d5b 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2279,7 +2279,7 @@ int virtio_set_status(VirtIODevice *vdev, uint8_t val) trace_virtio_set_status(vdev, val); int ret = 0; - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { if (!(vdev->status & VIRTIO_CONFIG_S_FEATURES_OK) && val & VIRTIO_CONFIG_S_FEATURES_OK) { ret = virtio_validate_features(vdev); @@ -2365,7 +2365,7 @@ void virtio_queue_enable(VirtIODevice *vdev, uint32_t queue_index) * be re-enabled for new machine types only, and also after * being converted to LOG_GUEST_ERROR. * - if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_legacy(vdev)) { error_report("queue_enable is only supported in devices of virtio " "1.0 or later."); } @@ -2454,7 +2454,7 @@ void virtio_queue_set_align(VirtIODevice *vdev, int n, int align) VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); /* virtio-1 compliant devices cannot change the alignment */ - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { error_report("tried to modify queue alignment for virtio-1 device"); return; } @@ -2753,7 +2753,7 @@ static bool virtio_device_endian_needed(void *opaque) VirtIODevice *vdev = opaque; assert(vdev->device_endian != VIRTIO_DEVICE_ENDIAN_UNKNOWN); - if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_legacy(vdev)) { return vdev->device_endian != virtio_default_endian(); } /* Devices conforming to VIRTIO 1.0 or later are always LE. */ @@ -3228,7 +3228,7 @@ int virtio_set_features_ex(VirtIODevice *vdev, const uint64_t *features) } if (!ret) { if (!virtio_device_started(vdev, vdev->status) && - !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + virtio_vdev_is_legacy(vdev)) { vdev->start_on_kick = true; } } @@ -3446,7 +3446,7 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id) } if (!virtio_device_started(vdev, vdev->status) && - !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + virtio_vdev_is_legacy(vdev)) { vdev->start_on_kick = true; } @@ -3461,7 +3461,7 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id) * to calculate used and avail ring addresses based on the desc * address. */ - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { virtio_init_region_cache(vdev, i); } else { virtio_queue_update_rings(vdev, i); @@ -4019,7 +4019,7 @@ void G_GNUC_PRINTF(2, 3) virtio_error(VirtIODevice *vdev, const char *fmt, ...) error_vreport(fmt, ap); va_end(ap); - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { vdev->status = vdev->status | VIRTIO_CONFIG_S_NEEDS_RESET; virtio_notify_config(vdev); } -- 2.47.3
