From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOgQt-0007eH-Iw for qemu-devel@nongnu.org; Thu, 28 Jan 2016 01:51:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOgQp-0003uD-6v for qemu-devel@nongnu.org; Thu, 28 Jan 2016 01:51:55 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:23566 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOgQo-0003sc-Rj for qemu-devel@nongnu.org; Thu, 28 Jan 2016 01:51:51 -0500 From: Vladimir Sementsov-Ogievskiy Date: Thu, 28 Jan 2016 09:51:11 +0300 Message-Id: <1453963872-13549-3-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1453963872-13549-1-git-send-email-vsementsov@virtuozzo.com> References: <1453963872-13549-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 2/3] pcdimm: add 'type' field to PCDIMMDeviceInfo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Vladimir Sementsov-Ogievskiy , Xiao Guangrong , "Michael S. Tsirkin" , Markus Armbruster , Stefan Hajnoczi , Igor Mammedov , "Denis V. Lunev" The field is needed to distinguish pc-dimm and nvdimm. Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Denis V. Lunev CC: Stefan Hajnoczi CC: Xiao Guangrong CC: "Michael S. Tsirkin" CC: Igor Mammedov CC: Eric Blake CC: Markus Armbruster --- hw/mem/pc-dimm.c | 1 + qapi-schema.json | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 4f30950..7469bd4 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -178,6 +178,7 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque) di->size = object_property_get_int(OBJECT(dimm), PC_DIMM_SIZE_PROP, NULL); di->memdev = object_get_canonical_path(OBJECT(dimm->hostmem)); + di->type = g_strdup(object_get_typename(obj)); info->u.dimm = di; elem->value = info; diff --git a/qapi-schema.json b/qapi-schema.json index 8d04897..3bcc957 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3924,6 +3924,8 @@ # # @hotpluggable: true if device if could be added/removed while machine is running # +# @type: device type: 'pc-dimm' or 'nvdimm' (since 2.6) +# # Since: 2.1 ## { 'struct': 'PCDIMMDeviceInfo', @@ -3934,7 +3936,8 @@ 'node': 'int', 'memdev': 'str', 'hotplugged': 'bool', - 'hotpluggable': 'bool' + 'hotpluggable': 'bool', + 'type': 'str' } } -- 1.8.3.1