From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDxK6-0001JI-36 for qemu-devel@nongnu.org; Thu, 13 Feb 2014 09:31:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDxJz-00065S-Cm for qemu-devel@nongnu.org; Thu, 13 Feb 2014 09:31:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDxJz-00065J-3T for qemu-devel@nongnu.org; Thu, 13 Feb 2014 09:31:23 -0500 Date: Thu, 13 Feb 2014 08:50:22 -0500 From: Luiz Capitulino Message-ID: <20140213085022.59335e1e@redhat.com> In-Reply-To: <1391180681-28296-2-git-send-email-tumanova@linux.vnet.ibm.com> References: <52EBAF1C.8050006@redhat.com> <1391180681-28296-1-git-send-email-tumanova@linux.vnet.ibm.com> <1391180681-28296-2-git-send-email-tumanova@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 1/1] Define the architecture for compressed dump format. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Ekaterina Tumanova Cc: borntraeger@de.ibm.com, qiaonuohan@cn.fujitsu.com, lersek@redhat.com, Public KVM Mailing List On Fri, 31 Jan 2014 16:04:41 +0100 Ekaterina Tumanova wrote: > Signed-off-by: Ekaterina Tumanova Applied to the qmp branch, thanks. > --- > 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..8d85255 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(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 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 >