All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Vrabel <david.vrabel@citrix.com>
To: xen-devel@lists.xen.org
Cc: Daniel Kiper <daniel.kiper@oracle.com>,
	Simon Horman <horms@verge.net.au>,
	kexec@lists.infradead.org, David Vrabel <david.vrabel@citrix.com>,
	Don Slutz <Don@CloudSwitch.com>
Subject: [PATCH 4/5] kexec/xen: switch to use xc_kexec_get_range for get_xen_vmcoreinfo.
Date: Mon, 8 Apr 2013 20:06:53 +0100	[thread overview]
Message-ID: <1365448014-12119-5-git-send-email-david.vrabel@citrix.com> (raw)
In-Reply-To: <1365448014-12119-1-git-send-email-david.vrabel@citrix.com>

From: Don Slutz <Don@CloudSwitch.com>

Signed-off-by: Don Slutz <Don@CloudSwitch.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
---
 kexec/crashdump-xen.c |   20 ++++++++++++++++++++
 kexec/crashdump.c     |    2 ++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/kexec/crashdump-xen.c b/kexec/crashdump-xen.c
index 13335a5..dfb86c8 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;
diff --git a/kexec/crashdump.c b/kexec/crashdump.c
index cdd3ef6..b8441b7 100644
--- a/kexec/crashdump.c
+++ b/kexec/crashdump.c
@@ -141,7 +141,9 @@ int get_kernel_vmcoreinfo(uint64_t *addr, uint64_t *len)
 	return get_vmcoreinfo("/sys/kernel/vmcoreinfo", addr, len);
 }
 
+#ifndef HAVE_LIBXENCTRL
 int get_xen_vmcoreinfo(uint64_t *addr, uint64_t *len)
 {
 	return get_vmcoreinfo("/sys/hypervisor/vmcoreinfo", addr, len);
 }
+#endif
-- 
1.7.2.5


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

WARNING: multiple messages have this Message-ID (diff)
From: David Vrabel <david.vrabel@citrix.com>
To: xen-devel@lists.xen.org
Cc: Daniel Kiper <daniel.kiper@oracle.com>,
	Simon Horman <horms@verge.net.au>,
	kexec@lists.infradead.org, David Vrabel <david.vrabel@citrix.com>,
	Don Slutz <Don@CloudSwitch.com>
Subject: [PATCH 4/5] kexec/xen: switch to use xc_kexec_get_range for get_xen_vmcoreinfo.
Date: Mon, 8 Apr 2013 20:06:53 +0100	[thread overview]
Message-ID: <1365448014-12119-5-git-send-email-david.vrabel@citrix.com> (raw)
In-Reply-To: <1365448014-12119-1-git-send-email-david.vrabel@citrix.com>

From: Don Slutz <Don@CloudSwitch.com>

Signed-off-by: Don Slutz <Don@CloudSwitch.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
---
 kexec/crashdump-xen.c |   20 ++++++++++++++++++++
 kexec/crashdump.c     |    2 ++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/kexec/crashdump-xen.c b/kexec/crashdump-xen.c
index 13335a5..dfb86c8 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;
diff --git a/kexec/crashdump.c b/kexec/crashdump.c
index cdd3ef6..b8441b7 100644
--- a/kexec/crashdump.c
+++ b/kexec/crashdump.c
@@ -141,7 +141,9 @@ int get_kernel_vmcoreinfo(uint64_t *addr, uint64_t *len)
 	return get_vmcoreinfo("/sys/kernel/vmcoreinfo", addr, len);
 }
 
+#ifndef HAVE_LIBXENCTRL
 int get_xen_vmcoreinfo(uint64_t *addr, uint64_t *len)
 {
 	return get_vmcoreinfo("/sys/hypervisor/vmcoreinfo", addr, len);
 }
+#endif
-- 
1.7.2.5

  parent reply	other threads:[~2013-04-08 19:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-08 19:06 [PATCHv2 0/4] kexec-tools: add support for Xen 4.3 David Vrabel
2013-04-08 19:06 ` [PATCH 1/5] purgatory: put variables altered by kexec in .data not .bss David Vrabel
2013-04-08 19:06 ` David Vrabel
2013-04-08 19:06 ` [PATCH 2/5] kexec/xen: require libxc from Xen 4.3 David Vrabel
2013-04-08 19:06 ` David Vrabel
2013-04-08 19:06 ` [PATCH 3/5] kexec/xen: use libxc to get location of crash notes David Vrabel
2013-04-08 19:06 ` David Vrabel
2013-04-08 19:06 ` David Vrabel [this message]
2013-04-08 19:06   ` [PATCH 4/5] kexec/xen: switch to use xc_kexec_get_range for get_xen_vmcoreinfo David Vrabel
2013-04-08 19:06 ` [PATCH 5/5] kexec/xen: directly load images images into Xen David Vrabel
2013-04-08 19:06 ` David Vrabel
2013-04-09 21:20   ` Daniel Kiper
2013-04-09 21:20   ` Daniel Kiper
2013-04-17 12:56     ` Daniel Kiper
2013-04-17 12:56     ` Daniel Kiper
2013-04-17 13:53       ` David Vrabel
2013-04-17 14:12         ` Daniel Kiper
2013-04-17 14:12         ` Daniel Kiper
2013-04-17 13:53       ` David Vrabel
2013-04-09  2:49 ` [PATCHv2 0/4] kexec-tools: add support for Xen 4.3 Simon Horman
2013-04-09  2:49 ` Simon Horman
2013-04-09 21:16 ` Daniel Kiper
2013-04-09 21:16 ` Daniel Kiper
  -- strict thread matches above, loose matches on Subject: below --
2013-09-12 20:00 [PATCHv4 0/5] " David Vrabel
2013-09-12 20:00 ` [PATCH 4/5] kexec/xen: switch to use xc_kexec_get_range for get_xen_vmcoreinfo David Vrabel
2013-09-12 20:00   ` David Vrabel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365448014-12119-5-git-send-email-david.vrabel@citrix.com \
    --to=david.vrabel@citrix.com \
    --cc=Don@CloudSwitch.com \
    --cc=daniel.kiper@oracle.com \
    --cc=horms@verge.net.au \
    --cc=kexec@lists.infradead.org \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.