On 21.01.19 13:02, Dr. David Alan Gilbert wrote:
> * David Hildenbrand (da...@redhat.com) wrote:
>> On 16.01.19 15:46, Eric Blake wrote:
>>> On 1/16/19 5:35 AM, David Hildenbrand wrote:
>>>> From: Pankaj Gupta <pagu...@redhat.com>
>>>>
>>>> This is the current protoype of virtio-pmem. Support will require
>>>> machine changes for the architectures that will support it, so it will
>>>> not yet be compiled.
>>>>
>>>> TODO:
>>>> - Use separate struct for tracking requests internally
>>>> - Move request/response structs to linux headers
>>>> - Factor out linux header sync
>>>> - Drop debug printfs
>>>>
>>>> Signed-off-by: Pankaj Gupta <pagu...@redhat.com>
>>>> [ MemoryDevice/MemoryRegion changes, cleanups, addr property "memaddr",
>>>> split up patches, unplug handler ]
>>>> Signed-off-by: David Hildenbrand <da...@redhat.com>
>>>> ---
>>>
>>>> +++ b/qapi/misc.json
>>>> @@ -2949,6 +2949,29 @@
>>>> }
>>>> }
>>>>
>>>> +##
>>>> +# @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: 3.1
>>>
>>> Now 4.0
>>>
>>>> +##
>>>> +{ 'struct': 'VirtioPMEMDeviceInfo',
>>>> + 'data': { '*id': 'str',
>>>> + 'memaddr': 'size',
>>>> + 'size': 'size',
>>>> + 'memdev': 'str'
>>>> + }
>>>> +}
>>>> +
>>>> ##
>>>> # @MemoryDeviceInfo:
>>>> #
>>>> @@ -2958,7 +2981,8 @@
>>>> ##
>>>> { 'union': 'MemoryDeviceInfo',
>>>
>>> Does this union need a documentation update that virtio-pmem was added
>>> in 4.0?
>>
>> Seems like:
>>
>> ##
>> # @MemoryDeviceInfo:
>> #
>> # Union containing information about a memory device
>> #
>> # @dimm: Information about a pc-dimm device.
>> #
>> # @nvdimm: Information about a nvdimm device. (since 2.12)
>> #
>> # @virtio-pmem: Information about a virtio-pmem device. (since 4.0)
>> #
>> # Since: 2.1
>> ##
>>
>> Does not work.
>>
>> In file included from /home/dhildenb/git/qemu/qapi/qapi-schema.json:97:
>> /home/dhildenb/git/qemu/qapi/misc.json:2975: The following documented
>> members are not in the declaration: dimm, nvdimm, virtio-pmem
>>
>> Any idea how to document this correctly?
>
> No I don't, but looking at other Union's they only ever seem to document
> the base members, not the data members, for example see CpuInfo.
>
Yes, that's also what I noticed. Guess I'll simply change that to
"nvdimm is included since 2.12. virtio-pmem is included since 4.0."
Unless Eric has another idea.
Thanks!
> Dave
>
>> --
>>
>> Thanks,
>>
>> David / dhildenb
> --
> Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
>
--
Thanks,
David / dhildenb
