OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi virtio: Elide redundant has_FOO in generated C 

The has_FOO for pointer-valued FOO are redundant, except for arrays.
They are also a nuisance to work with.  Recent commit "qapi: Start to
elide redundant has_FOO in generated C" provided the means to elide
them step by step.  This is the step for qapi/virtio.json.

Said commit explains the transformation in more detail.  The invariant
violations mentioned there do not occur here.

Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221104160712.3005652-29-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2022-11-04 17:07:10 +01:00
parent 3f41a3adb4
commit 41462e4106
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/virtio/virtio.c
View File

@ -4701,7 +4701,6 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp)
status->disable_legacy_check = vdev->disable_legacy_check; status->disable_legacy_check = vdev->disable_legacy_check;
status->bus_name = g_strdup(vdev->bus_name); status->bus_name = g_strdup(vdev->bus_name);
status->use_guest_notifier_mask = vdev->use_guest_notifier_mask; status->use_guest_notifier_mask = vdev->use_guest_notifier_mask;
status->has_vhost_dev = vdev->vhost_started;
if (vdev->vhost_started) { if (vdev->vhost_started) {
VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev); VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);

4
monitor/hmp-cmds.c
View File

@ -2549,7 +2549,7 @@ void hmp_virtio_status(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "%s:\n", path); monitor_printf(mon, "%s:\n", path);
monitor_printf(mon, " device_name: %s %s\n", monitor_printf(mon, " device_name: %s %s\n",
s->name, s->has_vhost_dev ? "(vhost)" : ""); s->name, s->vhost_dev ? "(vhost)" : "");
monitor_printf(mon, " device_id: %d\n", s->device_id); monitor_printf(mon, " device_id: %d\n", s->device_id);
monitor_printf(mon, " vhost_started: %s\n", monitor_printf(mon, " vhost_started: %s\n",
s->vhost_started ? "true" : "false"); s->vhost_started ? "true" : "false");
@ -2585,7 +2585,7 @@ void hmp_virtio_status(Monitor *mon, const QDict *qdict)
monitor_printf(mon, " Backend features:\n"); monitor_printf(mon, " Backend features:\n");
hmp_virtio_dump_features(mon, s->backend_features); hmp_virtio_dump_features(mon, s->backend_features);
if (s->has_vhost_dev) { if (s->vhost_dev) {
monitor_printf(mon, " VHost:\n"); monitor_printf(mon, " VHost:\n");
monitor_printf(mon, " nvqs: %d\n", monitor_printf(mon, " nvqs: %d\n",
s->vhost_dev->nvqs); s->vhost_dev->nvqs);

1
scripts/qapi/schema.py
View File

@ -759,7 +759,6 @@ class QAPISchemaObjectTypeMember(QAPISchemaMember):
assert self.type assert self.type
# Temporary hack to support dropping the has_FOO in reviewable chunks # Temporary hack to support dropping the has_FOO in reviewable chunks
opt_out = [ opt_out = [
'qapi/virtio.json',
'qga/qapi-schema.json'] 'qga/qapi-schema.json']
if self.info and any(self.info.fname.endswith(mod) if self.info and any(self.info.fname.endswith(mod)
for mod in opt_out): for mod in opt_out):