From nobody Thu May 2 13:58:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579266182; cv=none; d=zohomail.com; s=zohoarc; b=Wg1AlI1Qa/sy3CW+dU/zUkyAkhpufp3s/9kaIXe53WZz4tr460fLGn9RxGMnrUtB1fHWsrgc2j6fqHZZRBHJ6VKB/slMGpN3b1dMUYaKJqq0OIW0IUTnGN1g7KMYbIVF1bEXFmSM7focAslAZZJIQ2F/Z2fd2VQG0f0jpVQ11q0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579266182; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=tJV3ek5FylLA1DyjL4JZQD6GuFZM8VkJtyrLlRkjphE=; b=iM7wQs9KyoJgXD2bpADzMm8yDk+FiD/id9NlH9Zy03KgqFAMQYIb0os6EkpKl9NsvL4bNHprunmZWQTy8tSIv5CXtREmp7SfchFt7dAAH9wDxBn9MYOFnsWvgouxD5Bl7TjVaDT4ZawjNSohnw+HJKnoP9FFC5n5B4ymcR0L9Y8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 15792661821511003.8318621928801; Fri, 17 Jan 2020 05:03:02 -0800 (PST) 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-37-1wo-mMwSP42neHWwrPhU3w-1; Fri, 17 Jan 2020 08:02:58 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 718FF800D54; Fri, 17 Jan 2020 13:02:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3571F80894; Fri, 17 Jan 2020 13:02:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 506681802029; Fri, 17 Jan 2020 13:02:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00HD2leC007547 for ; Fri, 17 Jan 2020 08:02:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2DE185C57C; Fri, 17 Jan 2020 13:02:47 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-34.ams2.redhat.com [10.36.112.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id E30255C651; Fri, 17 Jan 2020 13:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579266181; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=tJV3ek5FylLA1DyjL4JZQD6GuFZM8VkJtyrLlRkjphE=; b=R3a3qtve3CPKjJoeIvTCl4mgNjuC3JMqVZ2PF7mfxe9U8BtDtN7dqJoXWi7ewUFILWs66N TKW8OorlFv84RdYRHzppx6b85O0QqLUGsTlc3XwzJk/D/ZAWn/xethMuOpXhwwB5JAevlY VMOzCfOt61Ei28G6G7Agkz9GK1Uyxfg= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] bhyve: fix typos checking CPU dies Date: Fri, 17 Jan 2020 13:02:30 +0000 Message-Id: <20200117130230.414539-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 1wo-mMwSP42neHWwrPhU3w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This fixes a build bug introduced by commit fbf27730a36da573b1065c179f4d96b9a751f22f Author: Daniel P. Berrang=C3=A9 Date: Mon Dec 16 11:16:51 2019 +0000 conf: add support for specifying CPU "dies" parameter Signed-off-by: Daniel P. Berrang=C3=A9 --- Pushed as a build fix for FreeBSD src/bhyve/bhyve_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index d78221aea8..a8bfc0aa72 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -453,10 +453,10 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, /* CPUs */ virCommandAddArg(cmd, "-c"); if (def->cpu && def->cpu->sockets) { - if (def->dies !=3D 1) { + if (def->cpu->dies !=3D 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only 1 die per socket is supported")); - goto cleanup; + goto error; } if (nvcpus !=3D def->cpu->sockets * def->cpu->cores * def->cpu->th= reads) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", --=20 2.23.0