[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/32] Define the architecture for compressed dump fo
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 15/32] Define the architecture for compressed dump format |
Date: |
Mon, 3 Mar 2014 12:12:06 -0500 |
From: qiaonuohan <address@hidden>
Signed-off-by: Ekaterina Tumanova <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Qiao Nuohan <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
dump.c | 7 +++++--
target-i386/cpu.h | 2 ++
target-s390x/cpu.h | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dump.c b/dump.c
index fb0c896..2c81318 100644
--- a/dump.c
+++ b/dump.c
@@ -32,6 +32,9 @@
#ifdef CONFIG_SNAPPY
#include <snappy-c.h>
#endif
+#ifndef ELF_MACHINE_UNAME
+#define ELF_MACHINE_UNAME "Unknown"
+#endif
static uint16_t cpu_convert_to_target16(uint16_t val, int endian)
{
@@ -817,7 +820,7 @@ static int create_header32(DumpState *s)
dh->nr_cpus = cpu_convert_to_target32(s->nr_cpus, endian);
bitmap_blocks = DIV_ROUND_UP(s->len_dump_bitmap, block_size) * 2;
dh->bitmap_blocks = cpu_convert_to_target32(bitmap_blocks, endian);
- memcpy(&(dh->utsname.machine), "i686", 4);
+ strncpy(dh->utsname.machine, ELF_MACHINE_UNAME,
sizeof(dh->utsname.machine));
if (s->flag_compress & DUMP_DH_COMPRESSED_ZLIB) {
status |= DUMP_DH_COMPRESSED_ZLIB;
@@ -924,7 +927,7 @@ static int create_header64(DumpState *s)
dh->nr_cpus = cpu_convert_to_target32(s->nr_cpus, endian);
bitmap_blocks = DIV_ROUND_UP(s->len_dump_bitmap, block_size) * 2;
dh->bitmap_blocks = cpu_convert_to_target32(bitmap_blocks, endian);
- memcpy(&(dh->utsname.machine), "x86_64", 6);
+ strncpy(dh->utsname.machine, ELF_MACHINE_UNAME,
sizeof(dh->utsname.machine));
if (s->flag_compress & DUMP_DH_COMPRESSED_ZLIB) {
status |= DUMP_DH_COMPRESSED_ZLIB;
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 1b94f0f..6abcd23 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -38,8 +38,10 @@
#ifdef TARGET_X86_64
#define ELF_MACHINE EM_X86_64
+#define ELF_MACHINE_UNAME "x86_64"
#else
#define ELF_MACHINE EM_386
+#define ELF_MACHINE_UNAME "i686"
#endif
#define CPUArchState struct CPUX86State
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 96c2b4a..6d46827 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -28,6 +28,7 @@
#define TARGET_LONG_BITS 64
#define ELF_MACHINE EM_S390
+#define ELF_MACHINE_UNAME "S390X"
#define CPUArchState struct CPUS390XState
--
1.8.1.4
- [Qemu-devel] [PULL 09/32] dump: add members to DumpState and init some of them, (continued)
- [Qemu-devel] [PULL 09/32] dump: add members to DumpState and init some of them, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 05/32] dump: add API to write header of flatten format, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 11/32] dump: add API to write dump_bitmap, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 06/32] dump: add API to write vmcore, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 12/32] dump: add APIs to operate DataCache, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 10/32] dump: add API to write dump header, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 03/32] dump: const-qualify the buf of WriteCoreDumpFunction, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 14/32] dump: make kdump-compressed format available for 'dump-guest-memory', Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 13/32] dump: add API to write dump pages, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 15/32] Define the architecture for compressed dump format,
Luiz Capitulino <=
- [Qemu-devel] [PULL 16/32] dump: add 'query-dump-guest-memory-capability' command, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 17/32] qmp: Check for returned data from __json_read in get_events, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 19/32] monitor: Remove left-over code in do_info_profile., Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 18/32] qerror: Improve QERR_DEVICE_NOT_ACTIVE message, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 22/32] tests/qapi-schema: Cover simple argument types, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 20/32] tests/qapi-schema: Actually check successful QMP command response, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 21/32] tests/qapi-schema: Cover optional command arguments, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 24/32] tests/qapi-schema: Cover complex types with base, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 23/32] tests/qapi-schema: Cover anonymous union types, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 26/32] tests/qapi-schema: Cover flat union types, Luiz Capitulino, 2014/03/03