From patchwork Fri Jun 19 12:00:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 11614013 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 2FE4314DD for ; Fri, 19 Jun 2020 12:02:22 +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 BAC672083B for ; Fri, 19 Jun 2020 12:02:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CStXFMTM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BAC672083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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]:44340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmFiu-00068s-Nf for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Jun 2020 08:02:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmFhs-0004gJ-2E for qemu-devel@nongnu.org; Fri, 19 Jun 2020 08:01:17 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:30009 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jmFhp-0006bO-9L for qemu-devel@nongnu.org; Fri, 19 Jun 2020 08:01:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592568071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vu/e2YN0cWmt3Ppx+qvnIOK08pnjIL49S8tGrixieWk=; b=CStXFMTMvmjU2jdRVNm8WlGPQwYmayXwEp5m+BwS8cXYBtLO9qfN6CiBozlSQh5b/HDnX8 8SS4AANgzKHbDFdITs9lZaJ35hicrpnegM89h2n4GzvUQPiBy8DRDpO4JMqet61z7GryOS xoV4mPSjWGi7cd560IbeivinnuqxLes= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-265-5L9uBSPcP-ukJUL_16CGig-1; Fri, 19 Jun 2020 08:01:08 -0400 X-MC-Unique: 5L9uBSPcP-ukJUL_16CGig-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E30A38035D2; Fri, 19 Jun 2020 12:01:07 +0000 (UTC) Received: from localhost (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BDCA7C1EE; Fri, 19 Jun 2020 12:01:04 +0000 (UTC) From: Stefan Hajnoczi To: Coiby Xu Subject: [PATCH 1/6] vhost-user-server: fix VHOST_MEMORY_MAX_REGIONS compiler error Date: Fri, 19 Jun 2020 13:00:41 +0100 Message-Id: <20200619120046.2422205-1-stefanha@redhat.com> In-Reply-To: <20200614183907.514282-3-coiby.xu@gmail.com> References: <20200614183907.514282-3-coiby.xu@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/19 01:50:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, bharatlkmlkvm@gmail.com, qemu-devel@nongnu.org, Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Commit b650d5f4b1cd3f9f8c4fdb319838c5c1e0695e41 ("Lift max ram slots limit in libvhost-user") renamed this constant. Use the array size instead of hard-coding a particular constant in the error message. Signed-off-by: Stefan Hajnoczi --- util/vhost-user-server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c index 393beeb6b9..e94a8d8a83 100644 --- a/util/vhost-user-server.c +++ b/util/vhost-user-server.c @@ -137,9 +137,9 @@ vu_message_read(VuDev *vu_dev, int conn_fd, VhostUserMsg *vmsg) read_bytes += rc; if (nfds_t > 0) { if (nfds + nfds_t > G_N_ELEMENTS(vmsg->fds)) { - error_report("A maximum of %d fds are allowed, " + error_report("A maximum of %zu fds are allowed, " "however got %lu fds now", - VHOST_MEMORY_MAX_NREGIONS, nfds + nfds_t); + G_N_ELEMENTS(vmsg->fds), nfds + nfds_t); goto fail; } memcpy(vmsg->fds + nfds, fds_t,