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 <andrew.cooper3@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
index 7d177a1d7d67166f2f77657918e552881eae44a8..672dcc00bcaa625680049271d6e11276dcaf2b01 100644 (file)
--- 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 e7065bfde391ae492a83671f6f2206425086296b..0bd2f1bf90e34c5e6b5f35befc054f47ee642295 100644 (file)
--- 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;