From: Andrew Cooper Date: Fri, 26 Jan 2018 15:59:51 +0000 (+0000) Subject: x86/boot: Make the "Building Dom0" messages consistent X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~671 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=510414bd5a65a239912c12482102073ca8cf7424;p=xen.git x86/boot: Make the "Building Dom0" messages consistent Switch the PV message to match the wording of the PVH side, use the same number of ***'s, explicitly identify PV vs PVH, set the log level at INFO, and print the real domid (which won't be 0 in pv-shim mode). Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich --- diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index 7d177a1d7d..672dcc00bc 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -1064,7 +1064,7 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image, paddr_t entry, start_info; int rc; - printk("** Building a PVH Dom0 **\n"); + printk(XENLOG_INFO "*** Building a PVH Dom%d ***\n", d->domain_id); iommu_hwdom_init(d); diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index e7065bfde3..0bd2f1bf90 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -328,7 +328,7 @@ int __init dom0_construct_pv(struct domain *d, /* Machine address of next candidate page-table page. */ paddr_t mpt_alloc; - printk("*** LOADING DOMAIN 0 ***\n"); + printk(XENLOG_INFO "*** Building a PV Dom%d ***\n", d->domain_id); d->max_pages = ~0U;