From: Denis Mukhin <dmuk...@ford.com>
Use %pd in all logs issued from arch_domain_create() and reword some of the
messages.
Also, expand error message in arch_domain_create() under !emulation_flags_ok()
case to help debugging.
Signed-off-by: Denis Mukhin <dmuk...@ford.com>
---
Changes since v3:
- re-formatted log messages
- shortened message text where possible
---
xen/arch/x86/domain.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 4989600627..0db0567877 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -791,13 +791,14 @@ int arch_domain_create(struct domain *d,
{
if ( !opt_allow_unsafe )
{
- printk(XENLOG_G_ERR "Xen does not allow DomU creation on this CPU"
- " for security reasons.\n");
+ printk(XENLOG_G_ERR
+ "%pd: cannot create domain on this CPU due to security
reasons\n",
+ d);
return -EPERM;
}
printk(XENLOG_G_WARNING
- "Dom%d may compromise security on this CPU.\n",
- d->domain_id);
+ "%pd: may compromise security on this CPU\n",
+ d);
}
emflags = config->arch.emulation_flags;
@@ -807,16 +808,20 @@ int arch_domain_create(struct domain *d,
if ( emflags & ~XEN_X86_EMU_ALL )
{
- printk(XENLOG_G_ERR "d%d: Invalid emulation bitmap: %#x\n",
- d->domain_id, emflags);
+ printk(XENLOG_G_ERR
+ "%pd: invalid emulation bitmap: %#x\n",
+ d, emflags);
return -EINVAL;
}
if ( !emulation_flags_ok(d, emflags) )
{
- printk(XENLOG_G_ERR "d%d: Xen does not allow %s domain creation "
- "with the current selection of emulators: %#x\n",
- d->domain_id, is_hvm_domain(d) ? "HVM" : "PV", emflags);
+ printk(XENLOG_G_ERR
+ "%pd: cannot create %s %sdomain with emulators: %#x\n",
+ d,
+ is_hvm_domain(d) ? "HVM" : "PV",
+ is_hardware_domain(d) ? "hardware " : "",
+ emflags);
return -EOPNOTSUPP;
}
d->arch.emulation_flags = emflags;
--
2.34.1
