From patchwork Mon May 7 04:08:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 157218 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A1C19B6FBA for ; Mon, 7 May 2012 14:06:01 +1000 (EST) Received: from localhost ([::1]:53135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRFCx-0003bb-CT for incoming@patchwork.ozlabs.org; Mon, 07 May 2012 00:05:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRFCq-0003bL-3Q for qemu-devel@nongnu.org; Mon, 07 May 2012 00:05:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SRFCn-0000fn-Qr for qemu-devel@nongnu.org; Mon, 07 May 2012 00:05:51 -0400 Received: from [222.73.24.84] (port=41036 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRFCn-0000fa-81 for qemu-devel@nongnu.org; Mon, 07 May 2012 00:05:49 -0400 X-IronPort-AV: E=Sophos;i="4.75,540,1330876800"; d="scan'208";a="4897156" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 07 May 2012 12:05:19 +0800 Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q4745g6W015582; Mon, 7 May 2012 12:05:45 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012050712045597-298544 ; Mon, 7 May 2012 12:04:55 +0800 Message-ID: <4FA74AD8.6020906@cn.fujitsu.com> Date: Mon, 07 May 2012 12:08:56 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: qemu-devel , HATAYAMA Daisuke , Luiz Capitulino , "Daniel P. Berrange" , Anthony Liguori References: <4FA74927.5070905@cn.fujitsu.com> In-Reply-To: <4FA74927.5070905@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/05/07 12:04:55, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/05/07 12:05:01, Serialize complete at 2012/05/07 12:05:01 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [PATCH 09/12 v15] target-i386: add API to get dump info X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Dump info contains: endian, class and architecture. The next patch will use these information to create vmcore. Note: on x86 box, the class is ELFCLASS64 if the memory is larger than 4G. Signed-off-by: Wen Congyang --- cpu-all.h | 7 +++++++ dump.h | 23 +++++++++++++++++++++++ target-i386/arch_dump.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 0 deletions(-) create mode 100644 dump.h diff --git a/cpu-all.h b/cpu-all.h index a167bac..7e07c91 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -23,6 +23,7 @@ #include "qemu-tls.h" #include "cpu-common.h" #include "memory_mapping.h" +#include "dump.h" /* some important defines: * @@ -551,6 +552,7 @@ int cpu_write_elf64_qemunote(write_core_dump_function f, CPUArchState *env, void *opaque); int cpu_write_elf32_qemunote(write_core_dump_function f, CPUArchState *env, void *opaque); +int cpu_get_dump_info(ArchDumpInfo *info); #else static inline int cpu_write_elf64_note(write_core_dump_function f, CPUArchState *env, int cpuid, @@ -579,6 +581,11 @@ static inline int cpu_write_elf32_qemunote(write_core_dump_function f, { return -1; } + +static inline int cpu_get_dump_info(ArchDumpInfo *info) +{ + return -1; +} #endif #endif /* CPU_ALL_H */ diff --git a/dump.h b/dump.h new file mode 100644 index 0000000..28340cf --- /dev/null +++ b/dump.h @@ -0,0 +1,23 @@ +/* + * QEMU dump + * + * Copyright Fujitsu, Corp. 2011, 2012 + * + * Authors: + * Wen Congyang + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#ifndef DUMP_H +#define DUMP_H + +typedef struct ArchDumpInfo { + int d_machine; /* Architecture */ + int d_endian; /* ELFDATA2LSB or ELFDATA2MSB */ + int d_class; /* ELFCLASS32 or ELFCLASS64 */ +} ArchDumpInfo; + +#endif diff --git a/target-i386/arch_dump.c b/target-i386/arch_dump.c index ddbe20c..e378579 100644 --- a/target-i386/arch_dump.c +++ b/target-i386/arch_dump.c @@ -13,6 +13,7 @@ #include "cpu.h" #include "cpu-all.h" +#include "dump.h" #include "elf.h" #ifdef TARGET_X86_64 @@ -380,3 +381,36 @@ int cpu_write_elf32_qemunote(write_core_dump_function f, CPUArchState *env, { return cpu_write_qemu_note(f, env, opaque, 0); } + +int cpu_get_dump_info(ArchDumpInfo *info) +{ + bool lma = false; + RAMBlock *block; + +#ifdef TARGET_X86_64 + lma = !!(first_cpu->hflags & HF_LMA_MASK); +#endif + + if (lma) { + info->d_machine = EM_X86_64; + } else { + info->d_machine = EM_386; + } + info->d_endian = ELFDATA2LSB; + + if (lma) { + info->d_class = ELFCLASS64; + } else { + info->d_class = ELFCLASS32; + + QLIST_FOREACH(block, &ram_list.blocks, next) { + if (block->offset + block->length > UINT_MAX) { + /* The memory size is greater than 4G */ + info->d_class = ELFCLASS64; + break; + } + } + } + + return 0; +}