[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 07/14] qga: guest-get-memory-blocks shouldn't fail
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PULL v4 07/14] qga: guest-get-memory-blocks shouldn't fail for unexposed memory blocks |
Date: |
Mon, 19 Oct 2015 18:38:12 -0500 |
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 <address@hidden>
---
qga/commands-posix.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
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;
}
--
1.9.1
- [Qemu-devel] [PULL v4 00/14] qemu-ga patch queue, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 09/14] qga: drop guest_file_init helper and replace it with static initializers, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 10/14] qga: guest exec functionality, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 03/14] qga: add QGA_CONF environment variable, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 12/14] qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all(), Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 13/14] qga: guest-exec simple stdin/stdout/stderr redirection, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 07/14] qga: guest-get-memory-blocks shouldn't fail for unexposed memory blocks,
Michael Roth <=
- [Qemu-devel] [PULL v4 11/14] qga: handle possible SIGPIPE in guest-file-write, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 14/14] qga: fix uninitialized value warning for win32, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 05/14] qtest: add a few fd-level qmp helpers, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 04/14] qga: do not override configuration verbosity, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 01/14] build: qemu-ga: add 'qemu-ga' build target for w32, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 02/14] qga: Use g_new() & friends where that makes obvious sense, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 06/14] glib-compat: add 2.38/2.40/2.46 asserts, Michael Roth, 2015/10/19
- [Qemu-devel] [PULL v4 08/14] tests: add a local test for guest agent, Michael Roth, 2015/10/19
- Re: [Qemu-devel] [PULL v4 00/14] qemu-ga patch queue, Peter Maydell, 2015/10/20