From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9Ead-00010v-9e for qemu-devel@nongnu.org; Fri, 31 Jan 2014 08:57:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W9EaU-0007nw-7F for qemu-devel@nongnu.org; Fri, 31 Jan 2014 08:57:03 -0500 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:47845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9EaT-0007na-UO for qemu-devel@nongnu.org; Fri, 31 Jan 2014 08:56:54 -0500 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 31 Jan 2014 13:56:51 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id C77162190056 for ; Fri, 31 Jan 2014 13:56:46 +0000 (GMT) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s0VDuah259637786 for ; Fri, 31 Jan 2014 13:56:36 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s0VEun4c017135 for ; Fri, 31 Jan 2014 07:56:49 -0700 Message-ID: <52EBAB9A.9080602@de.ibm.com> Date: Fri, 31 Jan 2014 14:56:42 +0100 From: Christian Borntraeger MIME-Version: 1.0 References: <52EA89D0.8030006@redhat.com> <1391175905-61306-1-git-send-email-tumanova@linux.vnet.ibm.com> <1391175905-61306-2-git-send-email-tumanova@linux.vnet.ibm.com> In-Reply-To: <1391175905-61306-2-git-send-email-tumanova@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2] Define the architecture for compressed dump format. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Ekaterina Tumanova , Public KVM Mailing List Cc: qiaonuohan@cn.fujitsu.com, lersek@redhat.com On 31/01/14 14:45, Ekaterina Tumanova wrote: > Signed-off-by: Ekaterina Tumanova Acked-by: Christian Borntraeger > --- > 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 8f64aab..25503bc 100644 > --- a/dump.c > +++ b/dump.c > @@ -32,6 +32,9 @@ > #ifdef CONFIG_SNAPPY > #include > #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((char *)&(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((char *)&(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 1fcbc82..198743c 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 68b5ab7..bf7ae4c 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 >