On 03/09/2018 10:07 AM, Andrea Bolognani wrote:
> In QOM, all devices are objects, which makes the existing names
> technically correct; however, not all objects are devices, and
> soon we're going to start looking for object properties in
> addition to device properties: the former need to go through a
> different code path, so we need to be able to tell them apart.
> Using more precise names is a good way to achieve that.
>
> While renaming, hunks are also being moved around a bit: the
> new grouping, too, will make things nicer once we start adding
> support for object properties.
>
> Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
> ---
> src/qemu/qemu_capabilities.c | 239 ++++++++++++++++++++++---------------------
> src/qemu/qemu_monitor.c | 4 +-
> src/qemu/qemu_monitor.h | 2 +-
> src/qemu/qemu_monitor_json.c | 2 +-
> src/qemu/qemu_monitor_json.h | 2 +-
> 5 files changed, 128 insertions(+), 121 deletions(-)
>
This is unrelated to the v2.12/capabilities... although I imagine
someone will be cursing at you for the merge conflicts they'll have.
Reviewed-by: John Ferlan <jferlan@xxxxxxxxxx>
John
note the minor nit ...
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index c70bd27f18..83ec8a67d5 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -1559,6 +1559,13 @@ struct virQEMUCapsStringFlags {
> int flag;
> };
>
> +struct virQEMUCapsObjectTypeProps {
> + const char *type;
> + struct virQEMUCapsStringFlags *props;
> + size_t nprops;
> + int capsCondition;
> +};
> +
>
> struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
> { "system_wakeup", QEMU_CAPS_WAKEUP },
> @@ -1698,14 +1705,21 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
> { "pl011", QEMU_CAPS_DEVICE_PL011 },
> };
>
> -static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
> +/* Device properties.
> + *
> + * The following can be probed either using the device-list-properties
> + * QMP command or, for older QEMU versions, from the help text obtained
s/or,/or/
s/, from/
IOW: QMP command or for older QEMU versions the help text obtained
> + * through the '-device xxx,?' command line option
> + */
> +
> +static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
> { "deflate-on-oom", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE },
> { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY },
> { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM },
> { "ats", QEMU_CAPS_VIRTIO_PCI_ATS },
> };
>
[...]
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
