From nobody Mon Feb 9 19:04:43 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=libvir-list-bounces@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=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659963995; cv=none; d=zohomail.com; s=zohoarc; b=T9nIWqSeKxqxHxaBU8Ovyo/hbEsWr7wBlhOIY2Kfq6TxR6Naa06CXBC3fIqYWY42BuyOu0hTIc8McJz8FiP3j28Pqb8hal21LrY50fVwMToCac9wzJ0cDhEo02p/YTXXow5uFFp8KjPJLhU/OhXt/9vPDLfxVZtdaHwJJEYdyN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659963995; h=Content-Type: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=9iZHCIAocWn3njw6QlmsFrAB0yC3FMQpSAXvXB4W048=; b=ivESbNRJILTZ1EfeNpADjwtu+sChL4/iXOyeOqSCe4s7ZNQp7t/0pf4xWCAvtZVnIzOPXKMfW7CH+p1dnTiF4vHZ7mUAjLKMn8z8E4oopy3V20J61aiVIiAFlo1GhDjVBWq0fLTdOPACKKqQqZWiByThAehOtvPa63+UbykCk4k= 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=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: 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 1659963995324670.7378733475741; Mon, 8 Aug 2022 06:06:35 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-50-PePu-8e9NJW38PXuAAcDhw-1; Mon, 08 Aug 2022 09:06:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F3E0985A58F; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDD234047D22; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AACC81946A4F; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 270531946A59 for ; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0BD4A4010D27; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 083BC4047D22 for ; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE0D51C1976D for ; Mon, 8 Aug 2022 13:06:24 +0000 (UTC) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-137-jXkVGxQaNv-EoR7FcEBvnA-1; Mon, 08 Aug 2022 09:06:23 -0400 Received: by mail-ed1-f71.google.com with SMTP id q18-20020a056402519200b0043dd2ff50feso5584191edd.9 for ; Mon, 08 Aug 2022 06:06:23 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id 11-20020a170906308b00b006fec4ee28d0sm4968761ejv.189.2022.08.08.06.06.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 06:06:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659963994; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9iZHCIAocWn3njw6QlmsFrAB0yC3FMQpSAXvXB4W048=; b=gjmxXO2dUT7PM+sTE+aVTEqNWZ8otMzU0tAZ6zjMUurNdinH+JiFAk97M+veTmXyAluVj3 qksYWFOjtb/d5F5v1aSMbcN+9tt/shLMouIMN6h1rYlkLqh6VDmksNQNBffdggN4N3YYdA IhQi+1RGwblH5v5XVP1Dbk1ngaQUxTA= X-MC-Unique: PePu-8e9NJW38PXuAAcDhw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: jXkVGxQaNv-EoR7FcEBvnA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=9iZHCIAocWn3njw6QlmsFrAB0yC3FMQpSAXvXB4W048=; b=KGoOBNXMdGHVygoTiEGLRG1oshgei8MFkgfq/HjEltE8DXPMZDm/ahIDD6cGSHGo38 piws3w9IuOM8hCV5DN6f6wYYzwyDEoibDpo1Wm0PTjCT9mUZWoNQixPWedLGxZwE3ldG gOt6m7DdFkn0AmgmOFx2rJL1FQImAvkUBHfqSNu1zblkC0cNuETO0Hn0MeC5Mdu/woov 0J4SF7sdjPi/WBBXya8fMRIFgYAR3cp1j1Q/tG5+VFPr96XX9TdbRNNsCGErR8KBNkoC knXm3plj0hi6B5G2yyPRT5Q5pvjmqoM22IO+SeFIPWZSeaAK/cF/3s4rCBdh7IJhDdRa d0VQ== X-Gm-Message-State: ACgBeo3n91q/4aK33rwcYJA7m9IaM1SrLDfa3SABC/uSEBkgRjJwmaHD FWzfDzKkOcV+V6vUsvq6dX+lFnI1tCwha1hgwsBeEIxEda3hvQ0jtCv6aICvvsfKEIhS2QF8rys r3r6p8kbhWm66UWidOT32A5kAJusChKyAST+AnLrFcXHar0UJcjlsi5kBZxDNwQBNtBoJgic= X-Received: by 2002:a05:6402:3552:b0:43d:a57d:22e9 with SMTP id f18-20020a056402355200b0043da57d22e9mr17676214edd.119.1659963981852; Mon, 08 Aug 2022 06:06:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR4rU1bbpKCqgE9qM4STUS4RJ3KCi5uqU7I849eJxkFrH+hV1CYx0MLK57hXt3urVyg5QWAXYA== X-Received: by 2002:a05:6402:3552:b0:43d:a57d:22e9 with SMTP id f18-20020a056402355200b0043da57d22e9mr17676181edd.119.1659963981368; Mon, 08 Aug 2022 06:06:21 -0700 (PDT) From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH 6/7] qemu: remove support for query-cpus Date: Mon, 8 Aug 2022 15:06:07 +0200 Message-Id: <20220808130608.61257-7-pbonzini@redhat.com> In-Reply-To: <20220808130608.61257-1-pbonzini@redhat.com> References: <20220808130608.61257-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659963997061100002 Content-Type: text/plain; charset="utf-8" The query-cpus-fast command was introduced in 2.12, therefore query-cpus is never used on supported versions of QEMU. Remove the logic to parse its output, as well as the parameters to choose between the two commands. Signed-off-by: Paolo Bonzini --- src/qemu/qemu_domain.c | 22 ++++-------------- src/qemu/qemu_monitor.c | 29 ++++++++++-------------- src/qemu/qemu_monitor.h | 6 ++--- src/qemu/qemu_monitor_json.c | 44 +++++++----------------------------- src/qemu/qemu_monitor_json.h | 3 +-- tests/qemumonitorjsontest.c | 4 ++-- 6 files changed, 30 insertions(+), 78 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 69e0c9e217..bb25266959 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9618,22 +9618,18 @@ qemuDomainRefreshVcpuInfo(virQEMUDriver *driver, size_t maxvcpus =3D virDomainDefGetVcpusMax(vm->def); size_t i, j; bool hotplug; - bool fast; bool validTIDs =3D true; int rc; int ret =3D -1; =20 hotplug =3D qemuDomainSupportsNewVcpuHotplug(vm); - fast =3D virQEMUCapsGet(QEMU_DOMAIN_PRIVATE(vm)->qemuCaps, - QEMU_CAPS_QUERY_CPUS_FAST); - - VIR_DEBUG("Maxvcpus %zu hotplug %d fast query %d", maxvcpus, hotplug, = fast); + VIR_DEBUG("Maxvcpus %zu hotplug %d", maxvcpus, hotplug); =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; =20 rc =3D qemuMonitorGetCPUInfo(qemuDomainGetMonitor(vm), &info, maxvcpus, - hotplug, fast); + hotplug); =20 qemuDomainObjExitMonitor(vm); =20 @@ -9641,7 +9637,7 @@ qemuDomainRefreshVcpuInfo(virQEMUDriver *driver, goto cleanup; =20 /* - * The query-cpus[-fast] commands return information + * The query-cpus-fast commands return information * about the vCPUs, including the OS level PID that * is executing the vCPU. * @@ -9766,7 +9762,6 @@ qemuDomainRefreshVcpuHalted(virQEMUDriver *driver, size_t maxvcpus =3D virDomainDefGetVcpusMax(vm->def); g_autoptr(virBitmap) haltedmap =3D NULL; size_t i; - bool fast; =20 /* Not supported currently for TCG, see qemuDomainRefreshVcpuInfo */ if (vm->def->virtType =3D=3D VIR_DOMAIN_VIRT_QEMU) @@ -9774,21 +9769,14 @@ qemuDomainRefreshVcpuHalted(virQEMUDriver *driver, =20 /* The halted state is interesting only on s390(x). On other platforms * the data would be stale at the time when it would be used. - * Calling qemuMonitorGetCpuHalted() can adversely affect the running - * VM's performance unless QEMU supports query-cpus-fast. */ - if (!ARCH_IS_S390(vm->def->os.arch) || - !virQEMUCapsGet(QEMU_DOMAIN_PRIVATE(vm)->qemuCaps, - QEMU_CAPS_QUERY_CPUS_FAST)) + if (!ARCH_IS_S390(vm->def->os.arch)) return 0; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; =20 - fast =3D virQEMUCapsGet(QEMU_DOMAIN_PRIVATE(vm)->qemuCaps, - QEMU_CAPS_QUERY_CPUS_FAST); - haltedmap =3D qemuMonitorGetCpuHalted(qemuDomainGetMonitor(vm), maxvcp= us, - fast); + haltedmap =3D qemuMonitorGetCpuHalted(qemuDomainGetMonitor(vm), maxvcp= us); qemuDomainObjExitMonitor(vm); =20 if (!haltedmap) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0c0b07d4a5..9d20acdc11 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1565,16 +1565,16 @@ qemuMonitorGetCPUInfoLegacy(struct qemuMonitorQuery= CpusEntry *cpuentries, * * This function stitches together data retrieved via query-hotpluggable-c= pus * which returns entities on the hotpluggable level (which may describe mo= re - * than one guest logical vcpu) with the output of query-cpus (or - * query-cpus-fast), having an entry per enabled guest logical vcpu. + * than one guest logical vcpu) with the output of query-cpus-fast, + * having an entry per enabled guest logical vcpu. * * query-hotpluggable-cpus conveys following information: * - topology information and number of logical vcpus this entry creates * - device type name of the entry that needs to be used when hotplugging * - qom path in qemu which can be used to map the entry against - * query-cpus[-fast] + * query-cpus-fast * - * query-cpus[-fast] conveys following information: + * query-cpus-fast conveys following information: * - thread id of a given guest logical vcpu * - order in which the vcpus were inserted * - qom path to allow mapping the two together @@ -1609,7 +1609,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryH= otpluggableCpusEntry *hotpl for (i =3D 0; i < nhotplugvcpus; i++) totalvcpus +=3D hotplugvcpus[i].vcpus; =20 - /* trim '/thread...' suffix from the data returned by query-cpus[-fast= ] */ + /* trim '/thread...' suffix from the data returned by query-cpus-fast = */ for (i =3D 0; i < ncpuentries; i++) { if (cpuentries[i].qom_path && (tmp =3D strstr(cpuentries[i].qom_path, "/thread"))) @@ -1622,7 +1622,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryH= otpluggableCpusEntry *hotpl } =20 /* Note the order in which the hotpluggable entities are inserted by - * matching them to the query-cpus[-fast] entries */ + * matching them to the query-cpus-fast entries */ for (i =3D 0; i < ncpuentries; i++) { for (j =3D 0; j < nhotplugvcpus; j++) { if (!cpuentries[i].qom_path || @@ -1679,7 +1679,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryH= otpluggableCpusEntry *hotpl } =20 if (anyvcpu =3D=3D maxvcpus) { - VIR_DEBUG("too many query-cpus[-fast] entries for a given " + VIR_DEBUG("too many query-cpus-fast entries for a given " "query-hotpluggable-cpus entry"); return -1; } @@ -1707,7 +1707,6 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryH= otpluggableCpusEntry *hotpl * @vcpus: pointer filled by array of qemuMonitorCPUInfo structures * @maxvcpus: total possible number of vcpus * @hotplug: query data relevant for hotplug support - * @fast: use QMP query-cpus-fast if supported * * Detects VCPU information. If qemu doesn't support or fails reporting * information this function will return success as other parts of libvirt @@ -1720,8 +1719,7 @@ int qemuMonitorGetCPUInfo(qemuMonitor *mon, qemuMonitorCPUInfo **vcpus, size_t maxvcpus, - bool hotplug, - bool fast) + bool hotplug) { struct qemuMonitorQueryHotpluggableCpusEntry *hotplugcpus =3D NULL; size_t nhotplugcpus =3D 0; @@ -1742,8 +1740,7 @@ qemuMonitorGetCPUInfo(qemuMonitor *mon, (qemuMonitorJSONGetHotpluggableCPUs(mon, &hotplugcpus, &nhotplugcp= us)) < 0) goto cleanup; =20 - rc =3D qemuMonitorJSONQueryCPUs(mon, &cpuentries, &ncpuentries, hotplu= g, - fast); + rc =3D qemuMonitorJSONQueryCPUs(mon, &cpuentries, &ncpuentries, hotplu= g); =20 if (rc < 0) { if (!hotplug && rc =3D=3D -2) { @@ -1779,12 +1776,11 @@ qemuMonitorGetCPUInfo(qemuMonitor *mon, * qemuMonitorGetCpuHalted: * * Returns a bitmap of vcpu id's that are halted. The id's correspond to t= he - * 'CPU' field as reported by query-cpus[-fast]'. + * 'CPU' field as reported by query-cpus-fast'. */ virBitmap * qemuMonitorGetCpuHalted(qemuMonitor *mon, - size_t maxvcpus, - bool fast) + size_t maxvcpus) { struct qemuMonitorQueryCpusEntry *cpuentries =3D NULL; size_t ncpuentries =3D 0; @@ -1794,8 +1790,7 @@ qemuMonitorGetCpuHalted(qemuMonitor *mon, =20 QEMU_CHECK_MONITOR_NULL(mon); =20 - rc =3D qemuMonitorJSONQueryCPUs(mon, &cpuentries, &ncpuentries, false, - fast); + rc =3D qemuMonitorJSONQueryCPUs(mon, &cpuentries, &ncpuentries, false); =20 if (rc < 0) goto cleanup; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 742bfd4cdc..49adad85dd 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -644,11 +644,9 @@ void qemuMonitorCPUInfoFree(qemuMonitorCPUInfo *list, int qemuMonitorGetCPUInfo(qemuMonitor *mon, qemuMonitorCPUInfo **vcpus, size_t maxvcpus, - bool hotplug, - bool fast); + bool hotplug); virBitmap *qemuMonitorGetCpuHalted(qemuMonitor *mon, - size_t maxvcpus, - bool fast); + size_t maxvcpus); =20 int qemuMonitorGetBalloonInfo(qemuMonitor *mon, unsigned long long *currmem); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 2469165728..dd352d6296 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1678,21 +1678,8 @@ qemuMonitorJSONExtractCPUS390Info(virJSONValue *json= cpu, * @data: JSON response data * @entries: filled with detected cpu entries on success * @nentries: number of entries returned - * @fast: true if this is a response from query-cpus-fast * * The JSON response @data will have the following format - * in case @fast =3D=3D false - * [{ "arch": "x86", - * "current": true, - * "CPU": 0, - * "qom_path": "/machine/unattached/device[0]", - * "pc": -2130415978, - * "halted": true, - * "thread_id": 2631237, - * ...}, - * {...} - * ] - * and for @fast =3D=3D true * [{ "arch": "x86", * "cpu-index": 0, * "props": { @@ -1724,8 +1711,7 @@ qemuMonitorJSONExtractCPUS390Info(virJSONValue *jsonc= pu, static int qemuMonitorJSONExtractCPUInfo(virJSONValue *data, struct qemuMonitorQueryCpusEntry **entries, - size_t *nentries, - bool fast) + size_t *nentries) { const char *arch =3D NULL; struct qemuMonitorQueryCpusEntry *cpus =3D NULL; @@ -1753,19 +1739,11 @@ qemuMonitorJSONExtractCPUInfo(virJSONValue *data, * non-fatal, simply returning no data. * The return data of query-cpus-fast has different field names */ - if (fast) { - if (!(arch =3D virJSONValueObjectGetString(entry, "target"))) - arch =3D virJSONValueObjectGetString(entry, "arch"); - ignore_value(virJSONValueObjectGetNumberInt(entry, "cpu-index"= , &cpuid)); - ignore_value(virJSONValueObjectGetNumberInt(entry, "thread-id"= , &thread)); - qom_path =3D virJSONValueObjectGetString(entry, "qom-path"); - } else { + if (!(arch =3D virJSONValueObjectGetString(entry, "target"))) arch =3D virJSONValueObjectGetString(entry, "arch"); - ignore_value(virJSONValueObjectGetNumberInt(entry, "CPU", &cpu= id)); - ignore_value(virJSONValueObjectGetNumberInt(entry, "thread_id"= , &thread)); - ignore_value(virJSONValueObjectGetBoolean(entry, "halted", &ha= lted)); - qom_path =3D virJSONValueObjectGetString(entry, "qom_path"); - } + ignore_value(virJSONValueObjectGetNumberInt(entry, "cpu-index", &c= puid)); + ignore_value(virJSONValueObjectGetNumberInt(entry, "thread-id", &t= hread)); + qom_path =3D virJSONValueObjectGetString(entry, "qom-path"); =20 cpus[i].qemu_id =3D cpuid; cpus[i].tid =3D thread; @@ -1794,7 +1772,6 @@ qemuMonitorJSONExtractCPUInfo(virJSONValue *data, * @entries: filled with detected entries on success * @nentries: number of entries returned * @force: force exit on error - * @fast: use query-cpus-fast * * Queries qemu for cpu-related information. Failure to execute the comman= d or * extract results does not produce an error as libvirt can continue witho= ut @@ -1807,18 +1784,13 @@ int qemuMonitorJSONQueryCPUs(qemuMonitor *mon, struct qemuMonitorQueryCpusEntry **entries, size_t *nentries, - bool force, - bool fast) + bool force) { g_autoptr(virJSONValue) cmd =3D NULL; g_autoptr(virJSONValue) reply =3D NULL; virJSONValue *data; =20 - if (fast) - cmd =3D qemuMonitorJSONMakeCommand("query-cpus-fast", NULL); - else - cmd =3D qemuMonitorJSONMakeCommand("query-cpus", NULL); - + cmd =3D qemuMonitorJSONMakeCommand("query-cpus-fast", NULL); if (!cmd) return -1; =20 @@ -1831,7 +1803,7 @@ qemuMonitorJSONQueryCPUs(qemuMonitor *mon, if (!(data =3D virJSONValueObjectGetArray(reply, "return"))) return -2; =20 - return qemuMonitorJSONExtractCPUInfo(data, entries, nentries, fast); + return qemuMonitorJSONExtractCPUInfo(data, entries, nentries); } =20 =20 diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index e4c65e250e..924238eeec 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -66,8 +66,7 @@ int qemuMonitorJSONQueryCPUs(qemuMonitor *mon, struct qemuMonitorQueryCpusEntry **entries, size_t *nentries, - bool force, - bool fast); + bool force); int qemuMonitorJSONUpdateVideoMemorySize(qemuMonitor *mon, virDomainVideoDef *video, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 9d8a315103..e0dd00dc7a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1299,7 +1299,7 @@ testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(qem= uMonitorTest *test, int ret =3D -1; =20 if (qemuMonitorJSONQueryCPUs(qemuMonitorTestGetMonitor(test), - &cpudata, &ncpudata, true, true) < 0) + &cpudata, &ncpudata, true) < 0) goto cleanup; =20 if (ncpudata !=3D num) { @@ -2380,7 +2380,7 @@ testQemuMonitorCPUInfo(const void *opaque) goto cleanup; =20 rc =3D qemuMonitorGetCPUInfo(qemuMonitorTestGetMonitor(test), - &vcpus, data->maxvcpus, true, true); + &vcpus, data->maxvcpus, true); =20 if (rc < 0) goto cleanup; --=20 2.37.1