From: Raphael Ning <raphning@gmail.com>
To: Simon Horman <horms@verge.net.au>
Cc: kexec@lists.infradead.org, Raphael Ning <raphning@gmail.com>,
Julien Grall <julien@xen.org>, Hongyan Xia <hx242@xen.org>,
xen-devel@lists.xenproject.org,
Raphael Ning <raphning@amazon.com>
Subject: [PATCH] kexec-xen: Use correct image type for Live Update
Date: Tue, 23 Mar 2021 17:59:23 +0000 [thread overview]
Message-ID: <20210323175923.7342-1-raphning@gmail.com> (raw)
From: Raphael Ning <raphning@amazon.com>
Unlike xen_kexec_load(), xen_kexec_unload() and xen_kexec_status()
fail to distinguish between normal kexec and Xen Live Update image
types.
Fix that by introducing a new helper function that maps internal
flags to KEXEC_TYPE_*, and using it throughout kexec-xen.c.
Signed-off-by: Raphael Ning <raphning@amazon.com>
---
kexec/kexec-xen.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/kexec/kexec-xen.c b/kexec/kexec-xen.c
index da514d052e3d..47da3da466f0 100644
--- a/kexec/kexec-xen.c
+++ b/kexec/kexec-xen.c
@@ -91,6 +91,17 @@ out:
return rc;
}
+static uint8_t xen_get_kexec_type(unsigned long kexec_flags)
+{
+ if (kexec_flags & KEXEC_ON_CRASH)
+ return KEXEC_TYPE_CRASH;
+
+ if (kexec_flags & KEXEC_LIVE_UPDATE)
+ return KEXEC_TYPE_LIVE_UPDATE;
+
+ return KEXEC_TYPE_DEFAULT;
+}
+
#define IDENTMAP_1MiB (1024 * 1024)
int xen_kexec_load(struct kexec_info *info)
@@ -177,12 +188,7 @@ int xen_kexec_load(struct kexec_info *info)
seg++;
}
- if (info->kexec_flags & KEXEC_ON_CRASH)
- type = KEXEC_TYPE_CRASH;
- else if (info->kexec_flags & KEXEC_LIVE_UPDATE )
- type = KEXEC_TYPE_LIVE_UPDATE;
- else
- type = KEXEC_TYPE_DEFAULT;
+ type = xen_get_kexec_type(info->kexec_flags);
arch = (info->kexec_flags & KEXEC_ARCH_MASK) >> 16;
#if defined(__i386__) || defined(__x86_64__)
@@ -211,8 +217,7 @@ int xen_kexec_unload(uint64_t kexec_flags)
if (!xch)
return -1;
- type = (kexec_flags & KEXEC_ON_CRASH) ? KEXEC_TYPE_CRASH
- : KEXEC_TYPE_DEFAULT;
+ type = xen_get_kexec_type(kexec_flags);
ret = xc_kexec_unload(xch, type);
@@ -232,7 +237,7 @@ int xen_kexec_status(uint64_t kexec_flags)
if (!xch)
return -1;
- type = (kexec_flags & KEXEC_ON_CRASH) ? KEXEC_TYPE_CRASH : KEXEC_TYPE_DEFAULT;
+ type = xen_get_kexec_type(kexec_flags);
ret = xc_kexec_status(xch, type);
--
2.23.3
next reply other threads:[~2021-03-24 5:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 17:59 Raphael Ning [this message]
2021-04-02 10:01 ` [PATCH] kexec-xen: Use correct image type for Live Update Simon Horman
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=20210323175923.7342-1-raphning@gmail.com \
--to=raphning@gmail.com \
--cc=horms@verge.net.au \
--cc=hx242@xen.org \
--cc=julien@xen.org \
--cc=kexec@lists.infradead.org \
--cc=raphning@amazon.com \
--cc=xen-devel@lists.xenproject.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).