From: Michael Roth <mdroth@linux.vnet.ibm.com>
Date: Mon, 19 Oct 2015 21:38:25 +0000 (-0500)
Subject: qga: guest-get-memory-blocks shouldn't fail for unexposed memory blocks
X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~127^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f693fe6ef402bdcf89b3979bf004c4c5bf646724;p=sdk%2Femulator%2Fqemu.git

qga: guest-get-memory-blocks shouldn't fail for unexposed memory blocks

Some guests don't expose memory blocks via sysfs at all. This
shouldn't be a failure, instead just return an empty list. For
other access failures we still report an error.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index a932809..ff0ba62 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -2213,8 +2213,14 @@ GuestMemoryBlockList *qmp_guest_get_memory_blocks(Error **errp)
 
     dp = opendir("/sys/devices/system/memory/");
     if (!dp) {
-        error_setg_errno(errp, errno, "Can't open directory"
-                         "\"/sys/devices/system/memory/\"\n");
+        /* it's ok if this happens to be a system that doesn't expose
+         * memory blocks via sysfs, but otherwise we should report
+         * an error
+         */
+        if (errno != ENOENT) {
+            error_setg_errno(errp, errno, "Can't open directory"
+                             "\"/sys/devices/system/memory/\"\n");
+        }
         return NULL;
     }