From nobody Mon Feb 9 21:19:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628853977; cv=none; d=zohomail.com; s=zohoarc; b=bzGe3id1YKUPsdpfx9HiMgEJak4hjzzBLzqeHMAO4hMTR6L466ESjgCsmfrNHFb0Latk4hqytfH6kE6D/HK3x5s9I64wb/YL9/O9ni8t2sVmCF/eFAwJjnbm+6UUmbNhOeMAhaFR0E4CNDK3E3ypPLyLGoDjBqwLI3IT2VF4SVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628853977; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=y9ZNqtKL1cC+fTmEJTF4kIlxQkEz59g4jviAlnj0Q4c=; b=U7HmE0QnBRKkkGap1yaXsaYJDUxuvMizMKVMmqsBaA2Y8BeC6SSUOgGfBr4mX6tq8R98cgSrFr+mrMsXu3qD1z+nLU4fO6lD7ZLjZVyecPNKhME1UW/rb/xJnBgrJ/7DQKQtedThxgWl10yuqkcIMewKcSaqtHin40KfPqxGOb0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1628853977813649.7678972487649; Fri, 13 Aug 2021 04:26:17 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-230-Oy0poua4NSmRChAV9QFssA-1; Fri, 13 Aug 2021 07:26:15 -0400 Received: by mail-wm1-f72.google.com with SMTP id b3-20020a1c80030000b02902e6a7296cb3so2596613wmd.5 for ; Fri, 13 Aug 2021 04:26:15 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id f2sm1286209wrq.69.2021.08.13.04.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Aug 2021 04:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628853976; 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=y9ZNqtKL1cC+fTmEJTF4kIlxQkEz59g4jviAlnj0Q4c=; b=cbHhPfoj/uA+7qZhfZ2fNQFYvOZMcpA6jCk/7n/EVRzNMNXOT8K8yxGllWfmXoZaWNhtwz +q1GLBmjwFlEj+ZttBBfzic3MTiT0PIGvYcIziLFaYFfuGeznI/Sue/zJgaiC7l/8bp8la LhKQWqdi0lYf2LCSn9cYUX3GbY3R4ac= X-MC-Unique: Oy0poua4NSmRChAV9QFssA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y9ZNqtKL1cC+fTmEJTF4kIlxQkEz59g4jviAlnj0Q4c=; b=q4v1saEnJGoHsEOWBcbGXWbfhLSKYtlyq71od20ITHq+8u09VY0RhF749CqABSbBtN EqgIwmwEzprQDsYDDG95/VqhbWtWDeV/xoeGg7f0gCvaQwm8WotfW2uZOxeCDYqLqAGa icnMcecyEc8ilb3Apu0o0P7Eg7u6TA87tR8y+/ScZA7c2YkHxMpyCnZpFyleuGfCPhEe JJP1wTQHpjm+fU69dgKbXPHCM5otWuYtOdkEXR5lNxeSxD8kFe+Fvn+m/NmRXh76vjfh PhVU28aUmlZuUS4mtJYose8rRxZBcqxP5nyaDe5/NcmqxC8IkSee2MHef9gD4wSg//Yp rXmg== X-Gm-Message-State: AOAM533I34FMbbwA8Vrku/9+w7j5ajnTM4l20d435OQcvAt1ROcVPudQ 5JDY3m6EDLJ5I6nQuJt76PFnUAQKSfVNDWdfbJzwDVoLYOz+4qqJ3jGs2HH+aZKzqgoZcwUtVE3 NnHkasXnFr15sXg== X-Received: by 2002:adf:f046:: with SMTP id t6mr2617399wro.266.1628853974458; Fri, 13 Aug 2021 04:26:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBJKBUqSZxapvwL8yYh83lXE3AhuZKZ0UcL3YCGZIfD/BcHVkoJqjsGtjhpcfLYd9T2qsZYw== X-Received: by 2002:adf:f046:: with SMTP id t6mr2617378wro.266.1628853974323; Fri, 13 Aug 2021 04:26:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.1? v2 1/3] hw/core: Add missing return on error Date: Fri, 13 Aug 2021 13:26:06 +0200 Message-Id: <20210813112608.1452541-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210813112608.1452541-1-philmd@redhat.com> References: <20210813112608.1452541-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628853978741100001 If dies is not supported by this machine's CPU topology, don't keep processing options and return directly. Fixes: 0aebebb561c ("machine: reject -smp dies!=3D1 for non-PC machines") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index 943974d411c..abaeda589b7 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -752,6 +752,7 @@ static void smp_parse(MachineState *ms, SMPConfiguratio= n *config, Error **errp) =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"); + return; } =20 /* compute missing values, prefer sockets over cores over threads */ --=20 2.31.1