From nobody Mon Feb 9 10:48:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1562076974; cv=none; d=zoho.com; s=zohoarc; b=cH7Foyc+HCXLjShd/tWZ0aZXrjB8eQ81TgAaGZFIiotH7gTYA0b/si5Xy1KEhq9lBuoEeXYZwx9YpTTJ9hyGIkK+ffRjyR1MSqCXBmzIF1LUsM9/eHUMvyMzACJabW7Xwy3o5POAarTRe06FDjYGCZBj/HEUHI9o+RcUI3dmcQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562076974; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3qPbgry7qmt3jeYtwTAt6IZSl+weRfN9ta5QiLZi2uA=; b=WMLxAoJ5L1wvU+X5UJM7/Dhawp16cIxlY4npOjaLfU63Jd1ZuBBZ8fZORm54Bnx2CJpDKNq96PLmyv2J0RsYpIQZktWpeyxRmNF7nzolqC/GpH9o9aQdmETf2UlBhnLM7QhCGkuSWrDJ3+QCF4//5cbGktuI94x7B6+2nFuWokA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1562076974180409.9343889342457; Tue, 2 Jul 2019 07:16:14 -0700 (PDT) Received: from localhost ([::1]:53792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiJZp-0003K6-VB for importer@patchew.org; Tue, 02 Jul 2019 10:16:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44331) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiJRp-0004vI-IB for qemu-devel@nongnu.org; Tue, 02 Jul 2019 10:07:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiJRo-0002yP-Ik for qemu-devel@nongnu.org; Tue, 02 Jul 2019 10:07:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51786) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiJRo-0002xr-CZ for qemu-devel@nongnu.org; Tue, 02 Jul 2019 10:07:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFD273082E3F for ; Tue, 2 Jul 2019 14:07:51 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 928B17D5CF; Tue, 2 Jul 2019 14:07:50 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 2 Jul 2019 10:07:44 -0400 Message-Id: <20190702140745.27767-2-imammedo@redhat.com> In-Reply-To: <20190702140745.27767-1-imammedo@redhat.com> References: <20190702140745.27767-1-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 02 Jul 2019 14:07:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] numa: allow memory-less nodes when using memdev as backend 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: Laurent Vivier , Paolo Bonzini , Thomas Huth , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" QEMU fails to start if memory-less node is present when memdev is used qemu-system-x86_64 -object memory-backend-ram,id=3Dram0,size=3D128M \ -numa node -numa node,memdev=3Dram0 with error: "memdev option must be specified for either all or no nodes" which works as expected if legacy 'mem' is used. Fix check to make memory-less nodes valid when memdev option is used but still disallow mix of mem and memdev options. Signed-off-by: Igor Mammedov --- numa.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/numa.c b/numa.c index 91a29138a2..cdef332773 100644 --- a/numa.c +++ b/numa.c @@ -48,7 +48,8 @@ QemuOptsList qemu_numa_opts =3D { .desc =3D { { 0 } } /* validated with OptsVisitor */ }; =20 -static int have_memdevs =3D -1; +static int have_memdevs; +static int have_mem; static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one. * For all nodes, nodeid < max_numa_nodeid */ @@ -105,17 +106,11 @@ static void parse_numa_node(MachineState *ms, NumaNod= eOptions *node, } } =20 - if (node->has_mem && node->has_memdev) { - error_setg(errp, "cannot specify both mem=3D and memdev=3D"); - return; - } - - if (have_memdevs =3D=3D -1) { - have_memdevs =3D node->has_memdev; - } - if (node->has_memdev !=3D have_memdevs) { - error_setg(errp, "memdev option must be specified for either " - "all or no nodes"); + have_memdevs =3D have_memdevs ? : node->has_memdev; + have_mem =3D have_mem ? : node->has_mem; + if ((node->has_mem && have_memdevs) || (node->has_memdev && have_mem))= { + error_setg(errp, "numa configuration should use either mem=3D or m= emdev=3D," + "mixing both is not allowed"); return; } =20 --=20 2.18.1