This patch allows to display feature and status bits in virtio-status. Applications could find it helpful to compare status and features that are numeric encoded. For example, an upper application could use the features (encoded as a number) in the output of "ovs-vsctl list interface" and the feature bits fields in the output of QMP command "x-query-virtio-status" to compare directly when attempting to ensure the correctness of the virtio negotiation between guest, QEMU, and OVS-DPDK. Not applying any more encoding.
This patch also serves as a preparation for the next one, which implements a vhost-user test case about acked features of vhost-user protocol. Note that since the matching HMP command is typically used for human, leave it unchanged. Signed-off-by: Hyman Huang <yong.hu...@smartx.com> --- hw/virtio/virtio-qmp.c | 8 ++++++++ qapi/virtio.json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c index 1dd96ed20f..13ba1e926e 100644 --- a/hw/virtio/virtio-qmp.c +++ b/hw/virtio/virtio-qmp.c @@ -733,6 +733,9 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp) status->name = g_strdup(vdev->name); status->device_id = vdev->device_id; status->vhost_started = vdev->vhost_started; + status->guest_features_bits = vdev->guest_features; + status->host_features_bits = vdev->host_features; + status->backend_features_bits = vdev->backend_features; status->guest_features = qmp_decode_features(vdev->device_id, vdev->guest_features); status->host_features = qmp_decode_features(vdev->device_id, @@ -753,6 +756,7 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp) } status->num_vqs = virtio_get_num_queues(vdev); + status->status_bits = vdev->status; status->status = qmp_decode_status(vdev->status); status->isr = vdev->isr; status->queue_sel = vdev->queue_sel; @@ -775,6 +779,10 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp) status->vhost_dev->n_tmp_sections = hdev->n_tmp_sections; status->vhost_dev->nvqs = hdev->nvqs; status->vhost_dev->vq_index = hdev->vq_index; + status->vhost_dev->features_bits = hdev->features; + status->vhost_dev->acked_features_bits = hdev->acked_features; + status->vhost_dev->backend_features_bits = hdev->backend_features; + status->vhost_dev->protocol_features_bits = hdev->protocol_features; status->vhost_dev->features = qmp_decode_features(vdev->device_id, hdev->features); status->vhost_dev->acked_features = diff --git a/qapi/virtio.json b/qapi/virtio.json index e6dcee7b83..6f1b5e3710 100644 --- a/qapi/virtio.json +++ b/qapi/virtio.json @@ -79,12 +79,20 @@ # # @vq-index: vhost_dev vq_index # +# @features-bits: vhost_dev features encoded as a number +# # @features: vhost_dev features # +# @acked-features-bits: vhost_dev acked_features encoded as a number +# # @acked-features: vhost_dev acked_features # +# @backend-features-bits: vhost_dev backend_features encoded as a number +# # @backend-features: vhost_dev backend_features # +# @protocol-features-bits: vhost_dev protocol_features encoded as a number +# # @protocol-features: vhost_dev protocol_features # # @max-queues: vhost_dev max_queues @@ -102,9 +110,13 @@ 'n-tmp-sections': 'int', 'nvqs': 'uint32', 'vq-index': 'int', + 'features-bits': 'uint64', 'features': 'VirtioDeviceFeatures', + 'acked-features-bits': 'uint64', 'acked-features': 'VirtioDeviceFeatures', + 'backend-features-bits': 'uint64', 'backend-features': 'VirtioDeviceFeatures', + 'protocol-features-bits': 'uint64', 'protocol-features': 'VhostDeviceProtocols', 'max-queues': 'uint64', 'backend-cap': 'uint64', @@ -124,10 +136,16 @@ # # @vhost-started: VirtIODevice vhost_started flag # +# @guest-features-bits: VirtIODevice guest_features encoded as a number +# # @guest-features: VirtIODevice guest_features # +# @host-features-bits: VirtIODevice host_features encoded as a number +# # @host-features: VirtIODevice host_features # +# @backend-features-bits: VirtIODevice backend_features encoded as a number +# # @backend-features: VirtIODevice backend_features # # @device-endian: VirtIODevice device_endian @@ -135,6 +153,9 @@ # @num-vqs: VirtIODevice virtqueue count. This is the number of # active virtqueues being used by the VirtIODevice. # +# @status-bits: VirtIODevice configuration status encoded as a number +# (VirtioDeviceStatus) +# # @status: VirtIODevice configuration status (VirtioDeviceStatus) # # @isr: VirtIODevice ISR @@ -170,10 +191,14 @@ 'device-id': 'uint16', 'vhost-started': 'bool', 'device-endian': 'str', + 'guest-features-bits': 'uint64', 'guest-features': 'VirtioDeviceFeatures', + 'host-features-bits': 'uint64', 'host-features': 'VirtioDeviceFeatures', + 'backend-features-bits': 'uint64', 'backend-features': 'VirtioDeviceFeatures', 'num-vqs': 'int', + 'status-bits': 'uint8', 'status': 'VirtioDeviceStatus', 'isr': 'uint8', 'queue-sel': 'uint16', @@ -216,6 +241,7 @@ # "disable-legacy-check": false, # "name": "virtio-crypto", # "started": true, +# "guest-features-bits": 5100273664, # "device-id": 20, # "backend-features": { # "transports": [], @@ -241,6 +267,7 @@ # "VIRTIO_F_VERSION_1: Device compliant for v1 spec (legacy)" # ] # }, +# "host-features-bits": 6325010432, # "host-features": { # "unknown-dev-features": 1073741824, # "dev-features": [], @@ -252,9 +279,11 @@ # "VIRTIO_F_NOTIFY_ON_EMPTY: Notify when device runs out of avail. descs. on VQ" # ] # }, +# "backend-features-bits": 0, # "use-guest-notifier-mask": true, # "vm-running": true, # "queue-sel": 1, +# "status-bits": 15, # "disabled": false, # "vhost-started": false, # "use-started": true @@ -272,11 +301,13 @@ # "disabled-legacy-check": false, # "name": "virtio-net", # "started": true, +# "guest-features-bits": 5111807911, # "device-id": 1, # "vhost-dev": { # "n-tmp-sections": 4, # "n-mem-sections": 4, # "max-queues": 1, +# "features-bits": 13908344832 # "backend-cap": 2, # "log-size": 0, # "backend-features": { @@ -284,6 +315,8 @@ # "transports": [] # }, # "nvqs": 2, +# "acked-features-bits": 5100306432, +# "backend-features-bits": 0, # "protocol-features": { # "protocols": [] # }, @@ -299,6 +332,7 @@ # "VIRTIO_F_VERSION_1: Device compliant for v1 spec (legacy)" # ] # }, +# "protocol-features-bits": 0, # "features": { # "dev-features": [ # "VHOST_F_LOG_ALL: Logging write descriptors supported", @@ -387,6 +421,7 @@ # "VIRTIO_F_VERSION_1: Device compliant for v1 spec (legacy)" # ] # }, +# "host-features-bits": 6337593319, # "host-features": { # "dev-features": [ # "VHOST_USER_F_PROTOCOL_FEATURES: Vhost-user protocol features negotiation supported", @@ -420,9 +455,11 @@ # "VIRTIO_F_NOTIFY_ON_EMPTY: Notify when device runs out of avail. descs. on VQ" # ] # }, +# "backend-features-bits": 6337593319, # "use-guest-notifier-mask": true, # "vm-running": true, # "queue-sel": 2, +# "status-bits": 15, # "disabled": false, # "vhost-started": true, # "use-started": true -- 2.39.1