From patchwork Fri Jan 25 18:07:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 10781807 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F8C41515 for ; Fri, 25 Jan 2019 18:08:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9015B302F7 for ; Fri, 25 Jan 2019 18:08:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8415E30359; Fri, 25 Jan 2019 18:08:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DCE8302F7 for ; Fri, 25 Jan 2019 18:08:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729504AbfAYSIK (ORCPT ); Fri, 25 Jan 2019 13:08:10 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:51952 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729322AbfAYSII (ORCPT ); Fri, 25 Jan 2019 13:08:08 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 80F621596; Fri, 25 Jan 2019 10:08:08 -0800 (PST) Received: from donnerap.arm.com (donnerap.cambridge.arm.com [10.1.197.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 95D053F5AF; Fri, 25 Jan 2019 10:08:07 -0800 (PST) From: Andre Przywara To: Will Deacon Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [PATCH kvmtool 1/6] arm: turn pr_info() into pr_debug() messages Date: Fri, 25 Jan 2019 18:07:56 +0000 Message-Id: <20190125180801.209910-2-andre.przywara@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190125180801.209910-1-andre.przywara@arm.com> References: <20190125180801.209910-1-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- arm/fdt.c | 2 +- arm/kvm.c | 16 ++++++++-------- virtio/mmio.c | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arm/fdt.c b/arm/fdt.c index 980015b4..28ba1c2c 100644 --- a/arm/fdt.c +++ b/arm/fdt.c @@ -36,7 +36,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); } diff --git a/arm/kvm.c b/arm/kvm.c index b824f637..8dc6989c 100644 --- a/arm/kvm.c +++ b/arm/kvm.c @@ -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 8c0f1cc1..9e0cd05d 100644 --- a/virtio/mmio.c +++ b/virtio/mmio.c @@ -307,7 +307,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; }