Pull virtio fixes and cleanups from Michael Tsirkin: - Some bug fixes - Cleanup a couple of issues that surfaced meanwhile - Disable vhost on ARM with OABI for now - to be fixed fully later in the cycle or in the next release. * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (24 commits) vhost: disable for OABI virtio: drop vringh.h dependency virtio_blk: add a missing include virtio-balloon: Avoid using the word 'report' when referring to free page hinting virtio-balloon: make virtballoon_free_page_report() static vdpa: fix comment of vdpa_register_device() vdpa: make vhost, virtio depend on menu vdpa: allow a 32 bit vq alignment drm/virtio: fix up for include file changes remoteproc: pull in slab.h rpmsg: pull in slab.h virtio_input: pull in slab.h remoteproc: pull in slab.h virtio-rng: pull in slab.h virtgpu: pull in uaccess.h tools/virtio: make asm/barrier.h self contained tools/virtio: define aligned attribute virtio/test: fix up after IOTLB changes vhost: Create accessors for virtqueues private_data vdpasim: Return status in vdpasim_get_status ...
Showing the changes to include/uapi/linux (1 of 33 files). Show all
Unified · Split
| @@ -48,8 +48,15 @@ struct virtio_balloon_config { · 47 unmodified lines | ||
| 48 | 48 | __u32 num_pages; |
| 49 | 49 | /* Number of pages we've actually got in balloon. */ |
| 50 | 50 | __u32 actual; |
| 51 | − /* Free page report command id, readonly by guest */ | |
| 52 | − __u32 free_page_report_cmd_id; | |
| 51 | + /* | |
| 52 | + * Free page hint command id, readonly by guest. | |
| 53 | + * Was previously named free_page_report_cmd_id so we | |
| 54 | + * need to carry that name for legacy support. | |
| 55 | + */ | |
| 56 | + union { | |
| 57 | + __u32 free_page_hint_cmd_id; | |
| 58 | + __u32 free_page_report_cmd_id; /* deprecated */ | |
| 59 | + }; | |
| 53 | 60 | /* Stores PAGE_POISON if page poisoning is in use */ |
| 54 | 61 | __u32 poison_val; |
| 55 | 62 | }; |