[Libvirt-cim] [PATCH 46/47] Add others handling in _get_mem_device()

Signed-off-by: Xu Wang <gesaint(a)linux.vnet.ibm.com&gt; --- libxkutil/device_parsing.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/libxkutil/device_parsing.c b/libxkutil/device_parsing.c index 9eabd48..1680b37 100644 --- a/libxkutil/device_parsing.c +++ b/libxkutil/device_parsing.c @@ -1686,6 +1686,7 @@ static int _get_mem_device(const char *xml, struct virt_device **list) struct virt_device *mdevs = NULL; struct virt_device *mdev = NULL; int ret; + struct others *tmp = NULL; ret = parse_devices(xml, &mdevs, CIM_RES_TYPE_MEM); if (ret <= 0) @@ -1705,10 +1706,16 @@ static int _get_mem_device(const char *xml, struct virt_device **list) mdevs[1].dev.mem.size); mdev->dev.mem.maxsize = MAX(mdevs[0].dev.mem.maxsize, mdevs[1].dev.mem.maxsize); + mdev->dev.mem.others = dup_others(mdevs[0].dev.mem.others); + tmp = dup_others(mdevs[1].dev.mem.others); + mdev->dev.mem.others = combine_others(mdev->dev.mem.others, + tmp); + } else { mdev->dev.mem.size = MAX(mdevs[0].dev.mem.size, mdevs[0].dev.mem.maxsize); mdev->dev.mem.maxsize = mdev->dev.mem.size; + mdev->dev.mem.others = dup_others(mdevs[0].dev.mem.others); } mdev->type = CIM_RES_TYPE_MEM; -- 1.7.1