| Message ID | 20200316000348.29692-9-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | user-mode: Prune build dependencies (part 2) | expand |
On Mon, 16 Mar 2020 01:03:48 +0100 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Igor Mammedov <imammedo@redhat.com> > --- > qapi/machine.json | 131 +++++++++++++++++++++++++++++++ > qapi/misc.json | 132 -------------------------------- > include/hw/mem/memory-device.h | 1 + > include/hw/virtio/virtio-pmem.h | 2 +- > 4 files changed, 133 insertions(+), 133 deletions(-) > > diff --git a/qapi/machine.json b/qapi/machine.json > index 33b259dbd0..17ccebda14 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -1476,3 +1476,134 @@ > # > ## > { 'command': 'query-pci', 'returns': ['PciInfo'] } > + > +## > +# @MemoryInfo: > +# > +# Actual memory information in bytes. > +# > +# @base-memory: size of "base" memory specified with command line > +# option -m. > +# > +# @plugged-memory: size of memory that can be hot-unplugged. This field > +# is omitted if target doesn't support memory hotplug > +# (i.e. CONFIG_MEM_DEVICE not defined at build time). > +# > +# Since: 2.11.0 > +## > +{ 'struct': 'MemoryInfo', > + 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } } > + > +## > +# @query-memory-size-summary: > +# > +# Return the amount of initially allocated and present hotpluggable (if > +# enabled) memory in bytes. > +# > +# Example: > +# > +# -> { "execute": "query-memory-size-summary" } > +# <- { "return": { "base-memory": 4294967296, "plugged-memory": 0 } } > +# > +# Since: 2.11.0 > +## > +{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' } > + > +## > +# @PCDIMMDeviceInfo: > +# > +# PCDIMMDevice state information > +# > +# @id: device's ID > +# > +# @addr: physical address, where device is mapped > +# > +# @size: size of memory that the device provides > +# > +# @slot: slot number at which device is plugged in > +# > +# @node: NUMA node number where device is plugged in > +# > +# @memdev: memory backend linked with device > +# > +# @hotplugged: true if device was hotplugged > +# > +# @hotpluggable: true if device if could be added/removed while machine is running > +# > +# Since: 2.1 > +## > +{ 'struct': 'PCDIMMDeviceInfo', > + 'data': { '*id': 'str', > + 'addr': 'int', > + 'size': 'int', > + 'slot': 'int', > + 'node': 'int', > + 'memdev': 'str', > + 'hotplugged': 'bool', > + 'hotpluggable': 'bool' > + } > +} > + > +## > +# @VirtioPMEMDeviceInfo: > +# > +# VirtioPMEM state information > +# > +# @id: device's ID > +# > +# @memaddr: physical address in memory, where device is mapped > +# > +# @size: size of memory that the device provides > +# > +# @memdev: memory backend linked with device > +# > +# Since: 4.1 > +## > +{ 'struct': 'VirtioPMEMDeviceInfo', > + 'data': { '*id': 'str', > + 'memaddr': 'size', > + 'size': 'size', > + 'memdev': 'str' > + } > +} > + > +## > +# @MemoryDeviceInfo: > +# > +# Union containing information about a memory device > +# > +# nvdimm is included since 2.12. virtio-pmem is included since 4.1. > +# > +# Since: 2.1 > +## > +{ 'union': 'MemoryDeviceInfo', > + 'data': { 'dimm': 'PCDIMMDeviceInfo', > + 'nvdimm': 'PCDIMMDeviceInfo', > + 'virtio-pmem': 'VirtioPMEMDeviceInfo' > + } > +} > + > +## > +# @query-memory-devices: > +# > +# Lists available memory devices and their state > +# > +# Since: 2.1 > +# > +# Example: > +# > +# -> { "execute": "query-memory-devices" } > +# <- { "return": [ { "data": > +# { "addr": 5368709120, > +# "hotpluggable": true, > +# "hotplugged": true, > +# "id": "d1", > +# "memdev": "/objects/memX", > +# "node": 0, > +# "size": 1073741824, > +# "slot": 0}, > +# "type": "dimm" > +# } ] } > +# > +## > +{ 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] } > diff --git a/qapi/misc.json b/qapi/misc.json > index 92b3926c6b..670b902999 100644 > --- a/qapi/misc.json > +++ b/qapi/misc.json > @@ -518,39 +518,6 @@ > ## > { 'command': 'closefd', 'data': {'fdname': 'str'} } > > -## > -# @MemoryInfo: > -# > -# Actual memory information in bytes. > -# > -# @base-memory: size of "base" memory specified with command line > -# option -m. > -# > -# @plugged-memory: size of memory that can be hot-unplugged. This field > -# is omitted if target doesn't support memory hotplug > -# (i.e. CONFIG_MEM_DEVICE not defined at build time). > -# > -# Since: 2.11.0 > -## > -{ 'struct': 'MemoryInfo', > - 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } } > - > -## > -# @query-memory-size-summary: > -# > -# Return the amount of initially allocated and present hotpluggable (if > -# enabled) memory in bytes. > -# > -# Example: > -# > -# -> { "execute": "query-memory-size-summary" } > -# <- { "return": { "base-memory": 4294967296, "plugged-memory": 0 } } > -# > -# Since: 2.11.0 > -## > -{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' } > - > - > ## > # @AddfdInfo: > # > @@ -788,105 +755,6 @@ > 'returns': ['CommandLineOptionInfo'], > 'allow-preconfig': true } > > -## > -# @PCDIMMDeviceInfo: > -# > -# PCDIMMDevice state information > -# > -# @id: device's ID > -# > -# @addr: physical address, where device is mapped > -# > -# @size: size of memory that the device provides > -# > -# @slot: slot number at which device is plugged in > -# > -# @node: NUMA node number where device is plugged in > -# > -# @memdev: memory backend linked with device > -# > -# @hotplugged: true if device was hotplugged > -# > -# @hotpluggable: true if device if could be added/removed while machine is running > -# > -# Since: 2.1 > -## > -{ 'struct': 'PCDIMMDeviceInfo', > - 'data': { '*id': 'str', > - 'addr': 'int', > - 'size': 'int', > - 'slot': 'int', > - 'node': 'int', > - 'memdev': 'str', > - 'hotplugged': 'bool', > - 'hotpluggable': 'bool' > - } > -} > - > -## > -# @VirtioPMEMDeviceInfo: > -# > -# VirtioPMEM state information > -# > -# @id: device's ID > -# > -# @memaddr: physical address in memory, where device is mapped > -# > -# @size: size of memory that the device provides > -# > -# @memdev: memory backend linked with device > -# > -# Since: 4.1 > -## > -{ 'struct': 'VirtioPMEMDeviceInfo', > - 'data': { '*id': 'str', > - 'memaddr': 'size', > - 'size': 'size', > - 'memdev': 'str' > - } > -} > - > -## > -# @MemoryDeviceInfo: > -# > -# Union containing information about a memory device > -# > -# nvdimm is included since 2.12. virtio-pmem is included since 4.1. > -# > -# Since: 2.1 > -## > -{ 'union': 'MemoryDeviceInfo', > - 'data': { 'dimm': 'PCDIMMDeviceInfo', > - 'nvdimm': 'PCDIMMDeviceInfo', > - 'virtio-pmem': 'VirtioPMEMDeviceInfo' > - } > -} > - > -## > -# @query-memory-devices: > -# > -# Lists available memory devices and their state > -# > -# Since: 2.1 > -# > -# Example: > -# > -# -> { "execute": "query-memory-devices" } > -# <- { "return": [ { "data": > -# { "addr": 5368709120, > -# "hotpluggable": true, > -# "hotplugged": true, > -# "id": "d1", > -# "memdev": "/objects/memX", > -# "node": 0, > -# "size": 1073741824, > -# "slot": 0}, > -# "type": "dimm" > -# } ] } > -# > -## > -{ 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] } > - > ## > # @ReplayMode: > # > diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h > index 04476acb8f..76f3de0f7e 100644 > --- a/include/hw/mem/memory-device.h > +++ b/include/hw/mem/memory-device.h > @@ -14,6 +14,7 @@ > #define MEMORY_DEVICE_H > > #include "hw/qdev-core.h" > +#include "qapi/qapi-types-machine.h" > #include "qapi/qapi-types-misc.h" > #include "qom/object.h" > > diff --git a/include/hw/virtio/virtio-pmem.h b/include/hw/virtio/virtio-pmem.h > index 33f1999320..72863412b2 100644 > --- a/include/hw/virtio/virtio-pmem.h > +++ b/include/hw/virtio/virtio-pmem.h > @@ -15,7 +15,7 @@ > #define HW_VIRTIO_PMEM_H > > #include "hw/virtio/virtio.h" > -#include "qapi/qapi-types-misc.h" > +#include "qapi/qapi-types-machine.h" > > #define TYPE_VIRTIO_PMEM "virtio-pmem" >
diff --git a/qapi/machine.json b/qapi/machine.json index 33b259dbd0..17ccebda14 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1476,3 +1476,134 @@ # ## { 'command': 'query-pci', 'returns': ['PciInfo'] } + +## +# @MemoryInfo: +# +# Actual memory information in bytes. +# +# @base-memory: size of "base" memory specified with command line +# option -m. +# +# @plugged-memory: size of memory that can be hot-unplugged. This field +# is omitted if target doesn't support memory hotplug +# (i.e. CONFIG_MEM_DEVICE not defined at build time). +# +# Since: 2.11.0 +## +{ 'struct': 'MemoryInfo', + 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } } + +## +# @query-memory-size-summary: +# +# Return the amount of initially allocated and present hotpluggable (if +# enabled) memory in bytes. +# +# Example: +# +# -> { "execute": "query-memory-size-summary" } +# <- { "return": { "base-memory": 4294967296, "plugged-memory": 0 } } +# +# Since: 2.11.0 +## +{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' } + +## +# @PCDIMMDeviceInfo: +# +# PCDIMMDevice state information +# +# @id: device's ID +# +# @addr: physical address, where device is mapped +# +# @size: size of memory that the device provides +# +# @slot: slot number at which device is plugged in +# +# @node: NUMA node number where device is plugged in +# +# @memdev: memory backend linked with device +# +# @hotplugged: true if device was hotplugged +# +# @hotpluggable: true if device if could be added/removed while machine is running +# +# Since: 2.1 +## +{ 'struct': 'PCDIMMDeviceInfo', + 'data': { '*id': 'str', + 'addr': 'int', + 'size': 'int', + 'slot': 'int', + 'node': 'int', + 'memdev': 'str', + 'hotplugged': 'bool', + 'hotpluggable': 'bool' + } +} + +## +# @VirtioPMEMDeviceInfo: +# +# VirtioPMEM state information +# +# @id: device's ID +# +# @memaddr: physical address in memory, where device is mapped +# +# @size: size of memory that the device provides +# +# @memdev: memory backend linked with device +# +# Since: 4.1 +## +{ 'struct': 'VirtioPMEMDeviceInfo', + 'data': { '*id': 'str', + 'memaddr': 'size', + 'size': 'size', + 'memdev': 'str' + } +} + +## +# @MemoryDeviceInfo: +# +# Union containing information about a memory device +# +# nvdimm is included since 2.12. virtio-pmem is included since 4.1. +# +# Since: 2.1 +## +{ 'union': 'MemoryDeviceInfo', + 'data': { 'dimm': 'PCDIMMDeviceInfo', + 'nvdimm': 'PCDIMMDeviceInfo', + 'virtio-pmem': 'VirtioPMEMDeviceInfo' + } +} + +## +# @query-memory-devices: +# +# Lists available memory devices and their state +# +# Since: 2.1 +# +# Example: +# +# -> { "execute": "query-memory-devices" } +# <- { "return": [ { "data": +# { "addr": 5368709120, +# "hotpluggable": true, +# "hotplugged": true, +# "id": "d1", +# "memdev": "/objects/memX", +# "node": 0, +# "size": 1073741824, +# "slot": 0}, +# "type": "dimm" +# } ] } +# +## +{ 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] } diff --git a/qapi/misc.json b/qapi/misc.json index 92b3926c6b..670b902999 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -518,39 +518,6 @@ ## { 'command': 'closefd', 'data': {'fdname': 'str'} } -## -# @MemoryInfo: -# -# Actual memory information in bytes. -# -# @base-memory: size of "base" memory specified with command line -# option -m. -# -# @plugged-memory: size of memory that can be hot-unplugged. This field -# is omitted if target doesn't support memory hotplug -# (i.e. CONFIG_MEM_DEVICE not defined at build time). -# -# Since: 2.11.0 -## -{ 'struct': 'MemoryInfo', - 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } } - -## -# @query-memory-size-summary: -# -# Return the amount of initially allocated and present hotpluggable (if -# enabled) memory in bytes. -# -# Example: -# -# -> { "execute": "query-memory-size-summary" } -# <- { "return": { "base-memory": 4294967296, "plugged-memory": 0 } } -# -# Since: 2.11.0 -## -{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' } - - ## # @AddfdInfo: # @@ -788,105 +755,6 @@ 'returns': ['CommandLineOptionInfo'], 'allow-preconfig': true } -## -# @PCDIMMDeviceInfo: -# -# PCDIMMDevice state information -# -# @id: device's ID -# -# @addr: physical address, where device is mapped -# -# @size: size of memory that the device provides -# -# @slot: slot number at which device is plugged in -# -# @node: NUMA node number where device is plugged in -# -# @memdev: memory backend linked with device -# -# @hotplugged: true if device was hotplugged -# -# @hotpluggable: true if device if could be added/removed while machine is running -# -# Since: 2.1 -## -{ 'struct': 'PCDIMMDeviceInfo', - 'data': { '*id': 'str', - 'addr': 'int', - 'size': 'int', - 'slot': 'int', - 'node': 'int', - 'memdev': 'str', - 'hotplugged': 'bool', - 'hotpluggable': 'bool' - } -} - -## -# @VirtioPMEMDeviceInfo: -# -# VirtioPMEM state information -# -# @id: device's ID -# -# @memaddr: physical address in memory, where device is mapped -# -# @size: size of memory that the device provides -# -# @memdev: memory backend linked with device -# -# Since: 4.1 -## -{ 'struct': 'VirtioPMEMDeviceInfo', - 'data': { '*id': 'str', - 'memaddr': 'size', - 'size': 'size', - 'memdev': 'str' - } -} - -## -# @MemoryDeviceInfo: -# -# Union containing information about a memory device -# -# nvdimm is included since 2.12. virtio-pmem is included since 4.1. -# -# Since: 2.1 -## -{ 'union': 'MemoryDeviceInfo', - 'data': { 'dimm': 'PCDIMMDeviceInfo', - 'nvdimm': 'PCDIMMDeviceInfo', - 'virtio-pmem': 'VirtioPMEMDeviceInfo' - } -} - -## -# @query-memory-devices: -# -# Lists available memory devices and their state -# -# Since: 2.1 -# -# Example: -# -# -> { "execute": "query-memory-devices" } -# <- { "return": [ { "data": -# { "addr": 5368709120, -# "hotpluggable": true, -# "hotplugged": true, -# "id": "d1", -# "memdev": "/objects/memX", -# "node": 0, -# "size": 1073741824, -# "slot": 0}, -# "type": "dimm" -# } ] } -# -## -{ 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] } - ## # @ReplayMode: # diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index 04476acb8f..76f3de0f7e 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -14,6 +14,7 @@ #define MEMORY_DEVICE_H #include "hw/qdev-core.h" +#include "qapi/qapi-types-machine.h" #include "qapi/qapi-types-misc.h" #include "qom/object.h" diff --git a/include/hw/virtio/virtio-pmem.h b/include/hw/virtio/virtio-pmem.h index 33f1999320..72863412b2 100644 --- a/include/hw/virtio/virtio-pmem.h +++ b/include/hw/virtio/virtio-pmem.h @@ -15,7 +15,7 @@ #define HW_VIRTIO_PMEM_H #include "hw/virtio/virtio.h" -#include "qapi/qapi-types-misc.h" +#include "qapi/qapi-types-machine.h" #define TYPE_VIRTIO_PMEM "virtio-pmem"
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- qapi/machine.json | 131 +++++++++++++++++++++++++++++++ qapi/misc.json | 132 -------------------------------- include/hw/mem/memory-device.h | 1 + include/hw/virtio/virtio-pmem.h | 2 +- 4 files changed, 133 insertions(+), 133 deletions(-)