[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/8] dump: Rename qmp_dump_guest_memory() parameter to match QAPI
|
From: |
marcandre . lureau |
|
Subject: |
[PULL 4/8] dump: Rename qmp_dump_guest_memory() parameter to match QAPI schema |
|
Date: |
Fri, 3 Nov 2023 11:01:32 +0400 |
From: Markus Armbruster <armbru@redhat.com>
The name of the second parameter differs between QAPI schema and C
implementation: it's @protocol in the former and @file in the latter.
Potentially confusing. Change the C implementation to match the QAPI
schema.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20231031104531.3169721-2-armbru@redhat.com>
---
dump/dump.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/dump/dump.c b/dump/dump.c
index 44b27fef45..9cdb4a2bf8 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -2079,11 +2079,12 @@ DumpQueryResult *qmp_query_dump(Error **errp)
return result;
}
-void qmp_dump_guest_memory(bool paging, const char *file,
+void qmp_dump_guest_memory(bool paging, const char *protocol,
bool has_detach, bool detach,
- bool has_begin, int64_t begin, bool has_length,
- int64_t length, bool has_format,
- DumpGuestMemoryFormat format, Error **errp)
+ bool has_begin, int64_t begin,
+ bool has_length, int64_t length,
+ bool has_format, DumpGuestMemoryFormat format,
+ Error **errp)
{
ERRP_GUARD();
const char *p;
@@ -2170,7 +2171,7 @@ void qmp_dump_guest_memory(bool paging, const char *file,
}
#if !defined(WIN32)
- if (strstart(file, "fd:", &p)) {
+ if (strstart(protocol, "fd:", &p)) {
fd = monitor_get_fd(monitor_cur(), p, errp);
if (fd == -1) {
return;
@@ -2178,7 +2179,7 @@ void qmp_dump_guest_memory(bool paging, const char *file,
}
#endif
- if (strstart(file, "file:", &p)) {
+ if (strstart(protocol, "file:", &p)) {
fd = qemu_open_old(p, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
S_IRUSR);
if (fd < 0) {
error_setg_file_open(errp, errno, p);
--
2.41.0
- [PULL 0/8] Dump patches, marcandre . lureau, 2023/11/03
- [PULL 4/8] dump: Rename qmp_dump_guest_memory() parameter to match QAPI schema,
marcandre . lureau <=
- [PULL 5/8] dump: Fix g_array_unref(NULL) in dump-guest-memory, marcandre . lureau, 2023/11/03
- [PULL 6/8] dump: Recognize "fd:" protocols on Windows hosts, marcandre . lureau, 2023/11/03
- [PULL 8/8] dump: Drop redundant check for empty dump, marcandre . lureau, 2023/11/03
- [PULL 7/8] dump: Improve some dump-guest-memory error messages, marcandre . lureau, 2023/11/03
- Re: [PULL 0/8] Dump patches, Stefan Hajnoczi, 2023/11/06