From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2405DC3A589 for ; Thu, 15 Aug 2019 18:43:46 +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 E9A512083B for ; Thu, 15 Aug 2019 18:43:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E9A512083B 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyKiu-0006vh-TJ for qemu-devel@archiver.kernel.org; Thu, 15 Aug 2019 14:43:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38442) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyKdj-0000yr-CF for qemu-devel@nongnu.org; Thu, 15 Aug 2019 14:38:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyKdg-0000kW-Dy for qemu-devel@nongnu.org; Thu, 15 Aug 2019 14:38:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyKdg-0000jN-6a for qemu-devel@nongnu.org; Thu, 15 Aug 2019 14:38:20 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 8089E307D90D; Thu, 15 Aug 2019 18:38:19 +0000 (UTC) Received: from localhost (ovpn-116-32.gru2.redhat.com [10.97.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AE8A6266B; Thu, 15 Aug 2019 18:38:16 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 15 Aug 2019 15:38:03 -0300 Message-Id: <20190815183803.13346-4-ehabkost@redhat.com> In-Reply-To: <20190815183803.13346-1-ehabkost@redhat.com> References: <20190815183803.13346-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 15 Aug 2019 18:38:19 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 3/3] pc: Don't make CPU properties mandatory unless necessary 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: Peter Krempa , Eduardo Habkost , Like Xu , "Michael S. Tsirkin" , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We have this issue reported when using libvirt to hotplug CPUs: https://bugzilla.redhat.com/show_bug.cgi?id=3D1741451 Basically, libvirt is not copying die-id from query-hotpluggable-cpus, but die-id is now mandatory. We could blame libvirt and say it is not following the documented interface, because we have this buried in the QAPI schema documentation: > Note: currently there are 5 properties that could be present > but management should be prepared to pass through other > properties with device_add command to allow for future > interface extension. This also requires the filed names to be kept in > sync with the properties passed to -device/device_add. But I don't think this would be reasonable from us. We can just make QEMU more flexible and let CPU properties to be omitted when there's no ambiguity. This will allow us to keep compatibility with existing libvirt versions. Test case included to ensure we don't break this again. Cc: Peter Krempa Signed-off-by: Eduardo Habkost --- hw/i386/pc.c | 17 +++++++ tests/acceptance/pc_cpu_hotplug_props.py | 59 ++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 tests/acceptance/pc_cpu_hotplug_props.py diff --git a/hw/i386/pc.c b/hw/i386/pc.c index fb4ac5ca90..4d773c862d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2403,6 +2403,23 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplu= g_dev, int max_socket =3D (ms->smp.max_cpus - 1) / smp_threads / smp_cores / pcms->smp_dies= ; =20 + /* + * If there's only one possible value for a topology property, + * allow it to be omitted. + */ + if (cpu->socket_id < 0 && max_socket =3D=3D 0) { + cpu->socket_id =3D 0; + } + if (cpu->die_id < 0 && pcms->smp_dies =3D=3D 1) { + cpu->die_id =3D 0; + } + if (cpu->core_id < 0 && smp_cores =3D=3D 1) { + cpu->core_id =3D 0; + } + if (cpu->thread_id < 0 && smp_threads =3D=3D 1) { + cpu->thread_id =3D 0; + } + if (cpu->socket_id < 0) { error_setg(errp, "CPU socket-id is not set"); return; diff --git a/tests/acceptance/pc_cpu_hotplug_props.py b/tests/acceptance/= pc_cpu_hotplug_props.py new file mode 100644 index 0000000000..2c36926214 --- /dev/null +++ b/tests/acceptance/pc_cpu_hotplug_props.py @@ -0,0 +1,59 @@ +# +# Ensure CPU topology parameters may be omitted on -device +# +# Copyright (c) 2019 Red Hat Inc +# +# Author: +# Eduardo Habkost +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, see . +# + +from avocado_qemu import Test + +class OmittedCPUProps(Test): + """ + :avocado: tags=3Darch:x86_64 + """ + def test_only_socket(self): + self.vm.add_args('-nodefaults', '-S') + self.vm.add_args('-smp', '1,sockets=3D2,maxcpus=3D2') + self.vm.add_args('-cpu', 'qemu64') + self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=3D1') + self.vm.launch() + self.assertEquals(len(self.vm.command('query-cpus')), 2) + + def test_only_die(self): + self.vm.add_args('-nodefaults', '-S') + self.vm.add_args('-smp', '1,dies=3D2,maxcpus=3D2') + self.vm.add_args('-cpu', 'qemu64') + self.vm.add_args('-device', 'qemu64-x86_64-cpu,die-id=3D1') + self.vm.launch() + self.assertEquals(len(self.vm.command('query-cpus')), 2) + + def test_only_core(self): + self.vm.add_args('-nodefaults', '-S') + self.vm.add_args('-smp', '1,cores=3D2,maxcpus=3D2') + self.vm.add_args('-cpu', 'qemu64') + self.vm.add_args('-device', 'qemu64-x86_64-cpu,core-id=3D1') + self.vm.launch() + self.assertEquals(len(self.vm.command('query-cpus')), 2) + + def test_only_thread(self): + self.vm.add_args('-nodefaults', '-S') + self.vm.add_args('-smp', '1,threads=3D2,maxcpus=3D2') + self.vm.add_args('-cpu', 'qemu64') + self.vm.add_args('-device', 'qemu64-x86_64-cpu,thread-id=3D1') + self.vm.launch() + self.assertEquals(len(self.vm.command('query-cpus')), 2) --=20 2.21.0