On 3/8/21 10:54 AM, Kevin Wolf wrote: > This adds a QAPI schema for the properties of the memory-backend-* > objects. > > HostMemPolicy has to be moved to an include file that can be used by the > storage daemon, too, because ObjectOptions must be the same in all > binaries if we don't want to compile the whole code multiple times. > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > Acked-by: Peter Krempa <pkre...@redhat.com> > --- > qapi/common.json | 20 ++++++++ > qapi/machine.json | 22 +-------- > qapi/qom.json | 121 +++++++++++++++++++++++++++++++++++++++++++++- > 3 files changed, 141 insertions(+), 22 deletions(-) >
> @@ -287,7 +397,10 @@ > 'cryptodev-backend-builtin', > 'cryptodev-vhost-user', > 'dbus-vmstate', > - 'iothread' > + 'iothread', > + 'memory-backend-file', > + 'memory-backend-memfd', > + 'memory-backend-ram' Another leaked enum value... > ] } > > ## > @@ -315,7 +428,11 @@ > 'cryptodev-vhost-user': { 'type': 'CryptodevVhostUserProperties', > 'if': 'defined(CONFIG_VIRTIO_CRYPTO) > && defined(CONFIG_VHOST_CRYPTO)' }, > 'dbus-vmstate': 'DBusVMStateProperties', > - 'iothread': 'IothreadProperties' > + 'iothread': 'IothreadProperties', > + 'memory-backend-file': 'MemoryBackendFileProperties', > + 'memory-backend-memfd': { 'type': 'MemoryBackendMemfdProperties', > + 'if': 'defined(CONFIG_LINUX)' }, > + 'memory-backend-ram': 'MemoryBackendProperties' > } } ...when compared to the union branches. Once fixed, Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org