From: Mukesh Rathor <mukesh.rathor@oracle.com>
To: Jan Beulich <JBeulich@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
xen-devel <xen-devel@lists.xen.org>
Subject: Re: [PATCH]: PVH: specify xen features strings cleany for PVH
Date: Wed, 23 Jan 2013 14:43:47 -0800 [thread overview]
Message-ID: <20130123144347.78ba0a3f@mantra.us.oracle.com> (raw)
In-Reply-To: <50FFABE702000078000B88E1@nat28.tlf.novell.com>
On Wed, 23 Jan 2013 08:22:47 +0000
"Jan Beulich" <JBeulich@suse.com> wrote:
> >>> On 23.01.13 at 00:12, Mukesh Rathor <mukesh.rathor@oracle.com>
> >>> wrote:
> > On Mon, 21 Jan 2013 12:06:42 +0000
> > "Jan Beulich" <JBeulich@suse.com> wrote:
> >
> > So, I think what I proposed earlier is the cleanest. Alternately:
> >
> > #ifdef CONFIG_XEN_X86_PVH
> >
> > #define PVH_FEATURES_STR
> > "|writable_descriptor_tables|auto_translated_physmap|supervisor_mode_kernel|h
> > vm_callback_vector\0"
> >
> > #else
> > #define PVH_FEATURES_STR "\0"
> > #endif
> >
> > Then:
> > ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .ascii
> > "!writable_page_tables|pae_pgdir_above_4gb"PVH_FEATURES_STR);
> >
>
> ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .ascii
> "!writable_page_tables|pae_pgdir_above_4gb"; .asciz PVH_FEATURES_STR);
Not that different from what I have above since PVH_FEATURES_STR still
has to be defined as null string for non PVH case. Anyways, below is
the latest patch. Konard, kindly apply if Jan is OK.
Thanks,
Mukesh
PVH: Use .ascii and .asciz to define xen feature string. Note, the PVH
string must be in a single line (not multiple lines with \) to keep the
assembler from putting null char after each string before \.
Signed-off-by: Mukesh Rathor <mukesh.rathor@oracle.com>
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index 1a6bca1..45226cb 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -14,12 +14,11 @@
#include <asm/xen/interface.h>
#ifdef CONFIG_XEN_X86_PVH
-#define FEATURES_PVH "|writable_descriptor_tables" \
- "|auto_translated_physmap" \
- "|supervisor_mode_kernel" \
- "|hvm_callback_vector"
+
+#define PVH_FEATURES_STR "|writable_descriptor_tables|auto_translated_physmap|supervisor_mode_kernel|hvm_callback_vector"
+
#else
-#define FEATURES_PVH /* Not supported */
+#define PVH_FEATURES_STR ""
#endif
__INIT
@@ -104,7 +103,7 @@ NEXT_HYPERCALL(arch_6)
#endif
ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, _ASM_PTR startup_xen)
ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page)
- ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb"FEATURES_PVH)
+ ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .ascii "!writable_page_tables|pae_pgdir_above_4gb"; .asciz PVH_FEATURES_STR);
ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes")
ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID,
next prev parent reply other threads:[~2013-01-23 22:43 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-19 1:35 [PATCH]: PVH: specify xen features strings cleany for PVH Mukesh Rathor
2013-01-21 12:06 ` Jan Beulich
2013-01-22 23:12 ` Mukesh Rathor
2013-01-23 8:22 ` Jan Beulich
2013-01-23 22:43 ` Mukesh Rathor [this message]
2013-01-24 9:16 ` Jan Beulich
2013-01-24 9:27 ` Ian Campbell
2013-01-24 15:10 ` Konrad Rzeszutek Wilk
2013-01-24 23:13 ` Mukesh Rathor
2013-01-25 8:02 ` Jan Beulich
2013-01-25 10:11 ` Ian Campbell
2013-01-25 10:27 ` Jan Beulich
2013-01-25 10:43 ` Ian Campbell
2013-01-28 16:26 ` Is: PVH + ARM new hypercalls. Was: " Konrad Rzeszutek Wilk
2013-01-29 2:57 ` Mukesh Rathor
2013-01-29 10:48 ` Jan Beulich
2013-02-01 2:23 ` Mukesh Rathor
2013-02-01 16:24 ` Jan Beulich
2013-02-01 19:27 ` Mukesh Rathor
2013-02-04 10:31 ` Ian Campbell
2013-02-05 1:04 ` Mukesh Rathor
2013-02-05 7:53 ` Jan Beulich
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=20130123144347.78ba0a3f@mantra.us.oracle.com \
--to=mukesh.rathor@oracle.com \
--cc=JBeulich@suse.com \
--cc=konrad.wilk@oracle.com \
--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 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).