Commit 4ab23a91 authored by qiaonuohan's avatar qiaonuohan Committed by Luiz Capitulino
Browse files

Define the architecture for compressed dump format 



Signed-off-by: default avatarEkaterina Tumanova <tumanova@linux.vnet.ibm.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarQiao Nuohan <qiaonuohan@cn.fujitsu.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent b53ccc30

dump.c

+5 −2
Original line number Diff line number Diff line
@@ -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;

target-i386/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -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

target-s390x/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define TARGET_LONG_BITS 64



#define ELF_MACHINE	EM_S390

#define ELF_MACHINE_UNAME "S390X"



#define CPUArchState struct CPUS390XState