From nobody Mon Feb 9 22:20:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623145906; cv=none; d=zohomail.com; s=zohoarc; b=dk4zRcQz2QkuD4GngvCqwz+V2YO0cdvROhtBJnDazq5zLL7LHnqvmwybJuLRKuTx/kbCFIRB5one/2Z3yJt6qpT57uGxumLVrk/6OJ7vUN3Z2lPsD7iKw3PT4nxX1GsYuIj6lDHPL018xlJJ+k5MVYgrPa9iFVPA9o09KaTtW2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623145906; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qzpXFnyjgRnwQsHIuTfmXtl8Hzry0AV1o6f9R8rYdXg=; b=MsSPY7X23KgfH5lbK8dGSHdrHAfDIgISBmLL00IPVvNlF8/gweL1OB4ZHZsFk5xiyYPoDcY5v8sY3ynbcGhqvELKCoyz62tE+QsRcH+6+5uO2Gv94H4dgxQp9yUP6jvyQ4eoBgAIJaZmR+94RDQr1n6XQnbXiFK/C3QwAO0+vg4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623145906010934.8880141319336; Tue, 8 Jun 2021 02:51:46 -0700 (PDT) Received: from localhost ([::1]:37794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqYOe-0001EC-At for importer@patchew.org; Tue, 08 Jun 2021 05:51:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqYDo-0004e4-DN for qemu-devel@nongnu.org; Tue, 08 Jun 2021 05:40:32 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:43940) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqYDm-0001uM-Av for qemu-devel@nongnu.org; Tue, 08 Jun 2021 05:40:32 -0400 Received: by mail-wr1-x432.google.com with SMTP id r9so4118318wrz.10 for ; Tue, 08 Jun 2021 02:40:29 -0700 (PDT) Received: from avogadro.lan ([93.56.169.140]) by smtp.gmail.com with ESMTPSA id d15sm8608764wri.58.2021.06.08.02.40.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 02:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qzpXFnyjgRnwQsHIuTfmXtl8Hzry0AV1o6f9R8rYdXg=; b=Ez1zo9Ww/47Muge28SLE1xIluNeq5CprwHSYB8B3ev07THNS7H1qSnhCO4KnYobzri /BzzN7gYgl1avvORo6v9jxhuYvwy4wMIxPOzWVdHU6jJoKNWD9YftG5E3HidzyusTgbu R3GjUyo7gNB0zNaxWyqgXA7ga9JjxPuUTff/Eu1Yv8vB64OljXGmVDYXUDi95shrpnKT z2AJ7/8Gb68hoBmWYoZ51lYupEfEJfJJ55mZC0CzuIARRuGc/TzCnxAvcHHeZ/sAB68e I4Dj12Unxm/P2SR8lSGGUPMM/jbqj2mHV9tG4TG7GikyypSVypCbxgeY3NYdDe9LOLYJ RBmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qzpXFnyjgRnwQsHIuTfmXtl8Hzry0AV1o6f9R8rYdXg=; b=dxJ+kjZ7VQbWX0nQYrS4t4lG5ZKMthwoypOQvgvNmMBY2LE0bLm4P92vOlKjZBPutz At19ZTFdg58QQDyCvmnttyRyRmXMjS3+Tx87AeOzmlvDh15YqNQUPd7n1S4MOzLU2rSs pEKcChDlwRltrRjltOHS8YMAL5qCJcoearrF258z977MaDo1R2ik5iz2PIV95LfmV96A mVljbAXY4GImF6ce6kT1CfI0p/v2OWBFM6wQwsieLsZ+h92DjYSabFRZIqAha1I/mF1b h8lDrk6+NTfBLLepFYPi4L1QeXIvrWM6EHJf7kLTZYMKgYmE0DuRTlfjrL0Lqvx7KnP0 hhWw== X-Gm-Message-State: AOAM533yrGbyiiK0dmYx7yFYwniD4AUYzB48EiuaIMMgNZroiDXGigTr LOH4rugWlBUhEDalYE9b7pNvJmWPXtU= X-Google-Smtp-Source: ABdhPJwSQEvOUA0zQH25P1DzxHkt7OPNUevyv6q1MytJ9RaCX8px3WZ/nS3j0rLU3Kj1JsqQdV9RRQ== X-Received: by 2002:a05:6000:2cc:: with SMTP id o12mr4847886wry.279.1623145229026; Tue, 08 Jun 2021 02:40:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/12] machine: reject -smp dies!=1 for non-PC machines Date: Tue, 8 Jun 2021 11:40:15 +0200 Message-Id: <20210608094017.392673-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210608094017.392673-1-pbonzini@redhat.com> References: <20210608094017.392673-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- hw/core/machine.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index 9ad8341a31..ffc076ae84 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -746,6 +746,10 @@ static void smp_parse(MachineState *ms, SMPConfigurati= on *config, Error **errp) unsigned cores =3D config->has_cores ? config->cores : 0; unsigned threads =3D config->has_threads ? config->threads : 0; =20 + if (config->has_dies && config->dies !=3D 0 && config->dies !=3D 1) { + error_setg(errp, "dies not supported by this machine's CPU topolog= y"); + } + /* compute missing values, prefer sockets over cores over threads */ if (cpus =3D=3D 0 || sockets =3D=3D 0) { cores =3D cores > 0 ? cores : 1; --=20 2.31.1