diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2019-01-25 18:07:56 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-01-30 13:42:30 +0000 |
| commit | e1c7c62afc7b998a0965cd9c3617f0513e2c3c27 (patch) | |
| tree | e564f5ae089b25612309035eba8755084293550e | |
| parent | 66454cc2582a0bdb250e3a64c2f92bd16896caad (diff) | |
| download | kvmtool-e1c7c62afc7b998a0965cd9c3617f0513e2c3c27.tar.gz | |
arm: turn pr_info() into pr_debug() messages
For whatever reason on ARM/arm64 machines kvmtool greets us with quite
some elaborate messages:
Info: Loaded kernel to 0x80080000 (18704896 bytes)
Info: Placing fdt at 0x8fe00000 - 0x8fffffff
Info: virtio-mmio.devices=0x200@0x10000:36
Info: virtio-mmio.devices=0x200@0x10200:37
Info: virtio-mmio.devices=0x200@0x10400:38
This is not really useful information for the casual user, so change
those lines to use pr_debug().
This also fixes the long standing line ending issue for the mmio output.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arm/fdt.c | 2 | ||||
| -rw-r--r-- | arm/kvm.c | 16 | ||||
| -rw-r--r-- | virtio/mmio.c | 3 |
3 files changed, 11 insertions, 10 deletions
@@ -26,7 +26,7 @@ static void dump_fdt(const char *dtb_file, void *fdt) if (count < 0) die_perror("Failed to dump dtb"); - pr_info("Wrote %d bytes to dtb %s\n", count, dtb_file); + pr_debug("Wrote %d bytes to dtb %s", count, dtb_file); close(fd); } @@ -113,8 +113,8 @@ bool kvm__arch_load_kernel_image(struct kvm *kvm, int fd_kernel, int fd_initrd, die_perror("kernel read"); } kernel_end = pos + file_size; - pr_info("Loaded kernel to 0x%llx (%zd bytes)", - kvm->arch.kern_guest_start, file_size); + pr_debug("Loaded kernel to 0x%llx (%zd bytes)", + kvm->arch.kern_guest_start, file_size); /* * Now load backwards from the end of memory so the kernel @@ -129,9 +129,9 @@ bool kvm__arch_load_kernel_image(struct kvm *kvm, int fd_kernel, int fd_initrd, die("fdt overlaps with kernel image."); kvm->arch.dtb_guest_start = guest_addr; - pr_info("Placing fdt at 0x%llx - 0x%llx", - kvm->arch.dtb_guest_start, - host_to_guest_flat(kvm, limit)); + pr_debug("Placing fdt at 0x%llx - 0x%llx", + kvm->arch.dtb_guest_start, + host_to_guest_flat(kvm, limit)); limit = pos; /* ... and finally the initrd, if we have one. */ @@ -159,9 +159,9 @@ bool kvm__arch_load_kernel_image(struct kvm *kvm, int fd_kernel, int fd_initrd, kvm->arch.initrd_guest_start = initrd_start; kvm->arch.initrd_size = file_size; - pr_info("Loaded initrd to 0x%llx (%llu bytes)", - kvm->arch.initrd_guest_start, - kvm->arch.initrd_size); + pr_debug("Loaded initrd to 0x%llx (%llu bytes)", + kvm->arch.initrd_guest_start, + kvm->arch.initrd_size); } else { kvm->arch.initrd_size = 0; } diff --git a/virtio/mmio.c b/virtio/mmio.c index eff147aa..03cecc36 100644 --- a/virtio/mmio.c +++ b/virtio/mmio.c @@ -321,7 +321,8 @@ int virtio_mmio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev, * * virtio_mmio.devices=0x200@0xd2000000:5,0x200@0xd2000200:6 */ - pr_info("virtio-mmio.devices=0x%x@0x%x:%d\n", VIRTIO_MMIO_IO_SIZE, vmmio->addr, vmmio->irq); + pr_debug("virtio-mmio.devices=0x%x@0x%x:%d", VIRTIO_MMIO_IO_SIZE, + vmmio->addr, vmmio->irq); return 0; } |