From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Vrabel Subject: [PATCH 3/4] kexec/xen: switch to use xc_kexec_get_range for get_xen_vmcoreinfo. Date: Wed, 6 Nov 2013 14:55:21 +0000 Message-ID: <1383749722-12091-4-git-send-email-david.vrabel@citrix.com> References: <1383749722-12091-1-git-send-email-david.vrabel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1383749722-12091-1-git-send-email-david.vrabel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Daniel Kiper , Simon Horman , kexec@lists.infradead.org, David Vrabel , Don Slutz List-Id: xen-devel@lists.xenproject.org From: Don Slutz Signed-off-by: Don Slutz Signed-off-by: David Vrabel Reviewed-by: Daniel Kiper --- kexec/crashdump-xen.c | 25 +++++++++++++++++++++++++ kexec/crashdump.c | 5 ----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/kexec/crashdump-xen.c b/kexec/crashdump-xen.c index 8185423..79b68e0 100644 --- a/kexec/crashdump-xen.c +++ b/kexec/crashdump-xen.c @@ -164,6 +164,26 @@ unsigned long xen_architecture(struct crash_elf_info *elf_info) } #ifdef HAVE_LIBXENCTRL +int get_xen_vmcoreinfo(uint64_t *addr, uint64_t *len) +{ + xc_interface *xc; + int ret = 0; + + xc = xc_interface_open(NULL, NULL, 0); + if (!xc) { + fprintf(stderr, "failed to open xen control interface.\n"); + return -1; + } + + ret = xc_kexec_get_range(xc, KEXEC_RANGE_MA_VMCOREINFO, 0, len, addr); + + xc_interface_close(xc); + + if (ret < 0) + return -1; + return 0; +} + int xen_get_nr_phys_cpus(void) { xc_interface *xc; @@ -206,6 +226,11 @@ out: return cpu; } #else +int get_xen_vmcoreinfo(uint64_t *addr, uint64_t *len) +{ + return -1; +} + int xen_get_nr_phys_cpus(void) { return -1; diff --git a/kexec/crashdump.c b/kexec/crashdump.c index 8d88fdf..131e624 100644 --- a/kexec/crashdump.c +++ b/kexec/crashdump.c @@ -157,8 +157,3 @@ int get_kernel_vmcoreinfo(uint64_t *addr, uint64_t *len) { return get_vmcoreinfo("/sys/kernel/vmcoreinfo", addr, len); } - -int get_xen_vmcoreinfo(uint64_t *addr, uint64_t *len) -{ - return get_vmcoreinfo("/sys/hypervisor/vmcoreinfo", addr, len); -} -- 1.7.2.5