[HVM] More printk cleanups.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 38aff434aea3a2b3f8d238e4a7b8cfe51b047f56..f423f41c6c4bf5a3d796c6fa448281b38243ae27 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -337,7 +337,7 @@ void hvm_print_line(struct vcpu *v, const char c)
         if ( c != '\n' )
             hd->pbuf[hd->pbuf_idx++] = '\n';
         hd->pbuf[hd->pbuf_idx] = '\0';
-        printk(XENLOG_G_DEBUG "HVM%u: %s\n", v->domain->domain_id, hd->pbuf);
+        printk(XENLOG_G_DEBUG "HVM%u: %s", v->domain->domain_id, hd->pbuf);
         hd->pbuf_idx = 0;
     }
     spin_unlock(&hd->pbuf_lock);

diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index bcfaa61376a9a1e72c6b410cdc859f0359b31a0b..24c3af8c0b1c5ba7d064a949d4dc6075665ffc72 100644 (file)
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -801,7 +801,8 @@ static void vlapic_write(struct vcpu *v, unsigned long address,
     break;
 
     default:
-        printk("Local APIC Write to read-only register\n");
+        gdprintk(XENLOG_WARNING, 
+                 "Local APIC Write to read-only register 0x%x\n", offset);
         break;
     }
 }

diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index a807c2c61efbf77e68009d4f62347767d2bd77ef..6a49cec3fc492980df50ef9ec69525a00ce6e760 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -360,8 +360,7 @@ static void vmx_do_launch(struct vcpu *v)
     error |= __vmwrite(GUEST_TR_LIMIT, 0xff);
 
     shadow_update_paging_modes(v);
-    printk("%s(): GUEST_CR3<=%08lx, HOST_CR3<=%08lx\n",
-           __func__, v->arch.hvm_vcpu.hw_cr3, v->arch.cr3);
+
     __vmwrite(GUEST_CR3, v->arch.hvm_vcpu.hw_cr3);
     __vmwrite(HOST_CR3, v->arch.cr3);