[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/22] dump: Define the architecture for compressed d
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 17/22] dump: Define the architecture for compressed dump format. |
Date: |
Thu, 13 Feb 2014 10:30:35 -0500 |
From: Ekaterina Tumanova <address@hidden>
Signed-off-by: Ekaterina Tumanova <address@hidden>
Reviewed-by: Laszlo Ersek <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 2ebbb23..78d226f 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 12/22] dump: add API to write dump header, (continued)
- [Qemu-devel] [PULL 12/22] dump: add API to write dump header, Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 13/22] dump: add API to write dump_bitmap, Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 14/22] dump: add APIs to operate DataCache, Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 15/22] dump: add API to write dump pages, Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 18/22] dump: add 'query-dump-guest-memory-capability' command, Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 16/22] dump: make kdump-compressed format available for 'dump-guest-memory', Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 19/22] monitor: Add device_del id argument completion., Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 20/22] monitor: Add device_add device argument completion., Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 22/22] monitor: Add object_add class argument completion., Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 21/22] monitor: Add object_del id argument completion., Luiz Capitulino, 2014/02/13
- [Qemu-devel] [PULL 17/22] dump: Define the architecture for compressed dump format.,
Luiz Capitulino <=
- Re: [Qemu-devel] [PULL 00/22] QMP queue, Peter Maydell, 2014/02/15