summaryrefslogtreecommitdiffstats
path: root/hw/i386
diff options
context:
space:
mode:
authorBharata B Rao <bharata@linux.vnet.ibm.com>2015-01-27 09:35:02 +0530
committerMichael S. Tsirkin <mst@redhat.com>2015-01-27 14:46:18 +0200
commit37153450436f58449ce7e41d13a23821611e889e (patch)
tree8113dc857b997ee97320d5d0926cc3098f6dc819 /hw/i386
parent9967c94957f60c2d1cadbe0bfd4373a13fb1a226 (diff)
downloadhqemu-37153450436f58449ce7e41d13a23821611e889e.zip
hqemu-37153450436f58449ce7e41d13a23821611e889e.tar.gz
pc-dimm: Add Error argument to pc_existing_dimms_capacity
Now that pc_existing_dimms_capacity() is an API, include Error pointer as an argument and modify the caller appropriately. Suggested-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Diffstat (limited to 'hw/i386')
-rw-r--r--hw/i386/pc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 2ec45a4..c7af6aa 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1584,8 +1584,8 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev,
goto out;
}
- if (pc_existing_dimms_capacity(OBJECT(machine), &existing_dimms_capacity)) {
- error_setg(&local_err, "failed to get total size of existing DIMMs");
+ existing_dimms_capacity = pc_existing_dimms_capacity(&local_err);
+ if (local_err) {
goto out;
}
OpenPOWER on IntegriCloud