On 10/10/2015 09:52 PM, Xiao Guangrong wrote:
This patch is generated by this script:
find ./ -name "*.[ch]" -o -name "*.json" -o -name "trace-events" -type f \
| xargs sed -i "s/PC_DIMM/DIMM/g"
find ./ -name "*.[ch]" -o -name "*.json" -o -name "trace-events" -type f \
| xargs sed -i "s/PCDIMM/DIMM/g"
find ./ -name "*.[ch]" -o -name "*.json" -o -name "trace-events" -type f \
| xargs sed -i "s/pc_dimm/dimm/g"
find ./ -name "trace-events" -type f | xargs sed -i "s/pc-dimm/dimm/g"
It prepares the work which abstracts dimm device type for both pc-dimm and
nvdimm
Signed-off-by: Xiao Guangrong <address@hidden>
---
hmp.c | 2 +-
+++ b/qapi-schema.json
@@ -3684,9 +3684,9 @@
{ 'command': 'query-memdev', 'returns': ['Memdev'] }
##
-# @PCDIMMDeviceInfo:
+# @DIMMDeviceInfo:
#
-# PCDIMMDevice state information
+# DIMMDevice state information
#
# @id: #optional device's ID
#
@@ -3706,7 +3706,7 @@
#
# Since: 2.1
##
-{ 'struct': 'PCDIMMDeviceInfo',
+{ 'struct': 'DIMMDeviceInfo',
'data': { '*id': 'str',
'addr': 'int',
'size': 'int',
@@ -3725,7 +3725,7 @@
#
# Since: 2.1
##
-{ 'union': 'MemoryDeviceInfo', 'data': {'dimm': 'PCDIMMDeviceInfo'} }
+{ 'union': 'MemoryDeviceInfo', 'data': {'dimm': 'DIMMDeviceInfo'} }
Struct names are not ABI, so this change is safe.
I have not reviewed the rest of the patch, but I don't see any problems
from the qapi perspective.