From patchwork Tue Oct 20 02:23:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhengui li X-Patchwork-Id: 11845597 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 244BA15E6 for ; Tue, 20 Oct 2020 02:26:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 77F9D222E9 for ; Tue, 20 Oct 2020 02:26:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77F9D222E9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:38154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUhM1-0001s5-DH for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Oct 2020 22:26:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUhKT-00004y-Um; Mon, 19 Oct 2020 22:24:50 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:57812 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUhKP-0007zi-1p; Mon, 19 Oct 2020 22:24:49 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id C1F96773BAFECB2C266F; Tue, 20 Oct 2020 10:24:35 +0800 (CST) Received: from DESKTOP-80C7KIU.china.huawei.com (10.174.187.210) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Tue, 20 Oct 2020 10:24:27 +0800 From: Zhengui li To: , , , Subject: [PATCH v2 1/6] vhost-user-gpu: fix incorrect print type Date: Tue, 20 Oct 2020 02:23:59 +0000 Message-ID: <1603160644-7308-1-git-send-email-lizhengui@huawei.com> X-Mailer: git-send-email 2.6.4.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.187.210] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.32; envelope-from=lizhengui@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/19 22:24:36 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xieyingtai@huawei.com, lizhengui@huawei.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The type of input variable is unsigned int while the printer type is int. So fix incorrect print type. Signed-off-by: Zhengui li --- contrib/vhost-user-gpu/vhost-user-gpu.c | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-gpu/vhost-user-gpu.c index a019d0a..ee2bf59 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -299,7 +299,7 @@ vg_resource_create_2d(VuGpu *g, res = virtio_gpu_find_resource(g, c2d.resource_id); if (res) { - g_critical("%s: resource already exists %d", __func__, c2d.resource_id); + g_critical("%s: resource already exists %u", __func__, c2d.resource_id); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; return; } @@ -312,7 +312,7 @@ vg_resource_create_2d(VuGpu *g, pformat = virtio_gpu_get_pixman_format(c2d.format); if (!pformat) { - g_critical("%s: host couldn't handle guest format %d", + g_critical("%s: host couldn't handle guest format %u", __func__, c2d.format); g_free(res); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; @@ -325,7 +325,7 @@ vg_resource_create_2d(VuGpu *g, (uint32_t *)res->buffer.mmap, res->buffer.stride); if (!res->image) { - g_critical("%s: resource creation failed %d %d %d", + g_critical("%s: resource creation failed %u %u %u", __func__, c2d.resource_id, c2d.width, c2d.height); g_free(res); cmd->error = VIRTIO_GPU_RESP_ERR_OUT_OF_MEMORY; @@ -395,7 +395,7 @@ vg_resource_unref(VuGpu *g, res = virtio_gpu_find_resource(g, unref.resource_id); if (!res) { - g_critical("%s: illegal resource specified %d", + g_critical("%s: illegal resource specified %u", __func__, unref.resource_id); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; return; @@ -414,7 +414,7 @@ vg_create_mapping_iov(VuGpu *g, int i; if (ab->nr_entries > 16384) { - g_critical("%s: nr_entries is too big (%d > 16384)", + g_critical("%s: nr_entries is too big (%u > 16384)", __func__, ab->nr_entries); return -1; } @@ -436,7 +436,7 @@ vg_create_mapping_iov(VuGpu *g, (*iov)[i].iov_len = ents[i].length; (*iov)[i].iov_base = vu_gpa_to_va(&g->dev.parent, &len, ents[i].addr); if (!(*iov)[i].iov_base || len != ents[i].length) { - g_critical("%s: resource %d element %d", + g_critical("%s: resource %u element %d", __func__, ab->resource_id, i); g_free(*iov); g_free(ents); @@ -461,7 +461,7 @@ vg_resource_attach_backing(VuGpu *g, res = virtio_gpu_find_resource(g, ab.resource_id); if (!res) { - g_critical("%s: illegal resource specified %d", + g_critical("%s: illegal resource specified %u", __func__, ab.resource_id); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; return; @@ -488,7 +488,7 @@ vg_resource_detach_backing(VuGpu *g, res = virtio_gpu_find_resource(g, detach.resource_id); if (!res || !res->iov) { - g_critical("%s: illegal resource specified %d", + g_critical("%s: illegal resource specified %u", __func__, detach.resource_id); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; return; @@ -515,7 +515,7 @@ vg_transfer_to_host_2d(VuGpu *g, res = virtio_gpu_find_resource(g, t2d.resource_id); if (!res || !res->iov) { - g_critical("%s: illegal resource specified %d", + g_critical("%s: illegal resource specified %u", __func__, t2d.resource_id); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; return; @@ -528,7 +528,7 @@ vg_transfer_to_host_2d(VuGpu *g, t2d.r.x + t2d.r.width > res->width || t2d.r.y + t2d.r.height > res->height) { g_critical("%s: transfer bounds outside resource" - " bounds for resource %d: %d %d %d %d vs %d %d", + " bounds for resource %u: %u %u %u %u vs %u %u", __func__, t2d.resource_id, t2d.r.x, t2d.r.y, t2d.r.width, t2d.r.height, res->width, res->height); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; @@ -571,7 +571,7 @@ vg_set_scanout(VuGpu *g, virtio_gpu_bswap_32(&ss, sizeof(ss)); if (ss.scanout_id >= VIRTIO_GPU_MAX_SCANOUTS) { - g_critical("%s: illegal scanout id specified %d", + g_critical("%s: illegal scanout id specified %u", __func__, ss.scanout_id); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID; return; @@ -585,7 +585,7 @@ vg_set_scanout(VuGpu *g, /* create a surface for this scanout */ res = virtio_gpu_find_resource(g, ss.resource_id); if (!res) { - g_critical("%s: illegal resource specified %d", + g_critical("%s: illegal resource specified %u", __func__, ss.resource_id); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; return; @@ -597,8 +597,8 @@ vg_set_scanout(VuGpu *g, ss.r.height > res->height || ss.r.x + ss.r.width > res->width || ss.r.y + ss.r.height > res->height) { - g_critical("%s: illegal scanout %d bounds for" - " resource %d, (%d,%d)+%d,%d vs %d %d", + g_critical("%s: illegal scanout %u bounds for" + " resource %u, (%u,%u)+%u,%u vs %u %u", __func__, ss.scanout_id, ss.resource_id, ss.r.x, ss.r.y, ss.r.width, ss.r.height, res->width, res->height); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; @@ -670,7 +670,7 @@ vg_resource_flush(VuGpu *g, res = virtio_gpu_find_resource(g, rf.resource_id); if (!res) { - g_critical("%s: illegal resource specified %d\n", + g_critical("%s: illegal resource specified %u\n", __func__, rf.resource_id); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; return; @@ -683,7 +683,7 @@ vg_resource_flush(VuGpu *g, rf.r.x + rf.r.width > res->width || rf.r.y + rf.r.height > res->height) { g_critical("%s: flush bounds outside resource" - " bounds for resource %d: %d %d %d %d vs %d %d\n", + " bounds for resource %u: %u %u %u %u vs %u %u\n", __func__, rf.resource_id, rf.r.x, rf.r.y, rf.r.width, rf.r.height, res->width, res->height); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; @@ -835,7 +835,7 @@ vg_handle_ctrl(VuDev *dev, int qidx) } virtio_gpu_ctrl_hdr_bswap(&cmd->cmd_hdr); - g_debug("%d %s\n", cmd->cmd_hdr.type, + g_debug("%u %s\n", cmd->cmd_hdr.type, vg_cmd_to_string(cmd->cmd_hdr.type)); if (vg->virgl) {