mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
dump: Add command interface for kdump-raw formats
The QMP dump API represents the dump format as an enumeration. Add three new enumerators, one for each supported kdump compression, each named "kdump-raw-*". For the HMP command line, rather than adding a new flag corresponding to each format, it seems more human-friendly to add a single flag "-R" to switch the kdump formats to "raw" mode. The choice of "-R" also correlates nicely to the "makedumpfile -R" option, which would serve to reassemble a flattened vmcore. Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> [ Marc-André: replace loff_t with off_t, indent fixes ] Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20230918233233.1431858-4-stephen.s.brennan@oracle.com>
This commit is contained in:
parent
d43a01db28
commit
e6549197f7
4 changed files with 76 additions and 11 deletions
33
dump/dump.c
33
dump/dump.c
|
@ -2090,6 +2090,7 @@ void qmp_dump_guest_memory(bool paging, const char *file,
|
|||
int fd = -1;
|
||||
DumpState *s;
|
||||
bool detach_p = false;
|
||||
bool kdump_raw = false;
|
||||
|
||||
if (runstate_check(RUN_STATE_INMIGRATE)) {
|
||||
error_setg(errp, "Dump not allowed during incoming migration.");
|
||||
|
@ -2103,6 +2104,29 @@ void qmp_dump_guest_memory(bool paging, const char *file,
|
|||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* externally, we represent kdump-raw-* as separate formats, but internally
|
||||
* they are handled the same, except for the "raw" flag
|
||||
*/
|
||||
if (has_format) {
|
||||
switch (format) {
|
||||
case DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_ZLIB:
|
||||
format = DUMP_GUEST_MEMORY_FORMAT_KDUMP_ZLIB;
|
||||
kdump_raw = true;
|
||||
break;
|
||||
case DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_LZO:
|
||||
format = DUMP_GUEST_MEMORY_FORMAT_KDUMP_LZO;
|
||||
kdump_raw = true;
|
||||
break;
|
||||
case DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_SNAPPY:
|
||||
format = DUMP_GUEST_MEMORY_FORMAT_KDUMP_SNAPPY;
|
||||
kdump_raw = true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* kdump-compressed format need the whole memory dumped, so paging or
|
||||
* filter is not supported here.
|
||||
|
@ -2166,6 +2190,10 @@ void qmp_dump_guest_memory(bool paging, const char *file,
|
|||
error_setg(errp, QERR_INVALID_PARAMETER, "protocol");
|
||||
return;
|
||||
}
|
||||
if (kdump_raw && lseek(fd, 0, SEEK_CUR) == (off_t) -1) {
|
||||
error_setg(errp, "kdump-raw formats require a seekable file");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!dump_migration_blocker) {
|
||||
error_setg(&dump_migration_blocker,
|
||||
|
@ -2186,7 +2214,7 @@ void qmp_dump_guest_memory(bool paging, const char *file,
|
|||
dump_state_prepare(s);
|
||||
|
||||
dump_init(s, fd, has_format, format, paging, has_begin,
|
||||
begin, length, false, errp);
|
||||
begin, length, kdump_raw, errp);
|
||||
if (*errp) {
|
||||
qatomic_set(&s->status, DUMP_STATUS_FAILED);
|
||||
return;
|
||||
|
@ -2214,15 +2242,18 @@ DumpGuestMemoryCapability *qmp_query_dump_guest_memory_capability(Error **errp)
|
|||
|
||||
/* kdump-zlib is always available */
|
||||
QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_KDUMP_ZLIB);
|
||||
QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_ZLIB);
|
||||
|
||||
/* add new item if kdump-lzo is available */
|
||||
#ifdef CONFIG_LZO
|
||||
QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_KDUMP_LZO);
|
||||
QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_LZO);
|
||||
#endif
|
||||
|
||||
/* add new item if kdump-snappy is available */
|
||||
#ifdef CONFIG_SNAPPY
|
||||
QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_KDUMP_SNAPPY);
|
||||
QAPI_LIST_APPEND(tail, DUMP_GUEST_MEMORY_FORMAT_KDUMP_RAW_SNAPPY);
|
||||
#endif
|
||||
|
||||
if (win_dump_available(NULL)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue