From nobody Sun Feb 8 22:07:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1572960662; cv=none; d=zoho.com; s=zohoarc; b=U6JsErYrsI2ZUY3CbesZWuHKbtiZO8CFBfXlA2hMdMsYQsPL8QNN0H7zI/nS9CIPji8m5VUbQ/5tY5iPXwH1ovOEs8F4TkHVx4yP0vNrdkg29Y+fONufOpB5lzpsRP6HJyEjB/ksQQW5fuExvefjFk/1MP1Nde4diLWxVheAd80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572960662; 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=uhbJaGc/RQxYmbE91zOUAGZRpGMaaS4lRbagjVsnIpI=; b=hCxvFUo3QXQOkoFcmSfJyN6FQoiac3K2Z8sFfQBvctSmdA9b68AqW5+mbTiKzXrIck2Nqb5w8ec3kUbATgjc0cXH7/b51Iec+C99EL15eINCS7Xltb0zgHbxNvGwk9myRZnhnzHPT6BcoJO8MI4tfApycXwumFt+QRyQc1y2+50= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1572960662825868.2571294526382; Tue, 5 Nov 2019 05:31:02 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-344-fRyrFZoLPVO5457Dm1R5uw-1; Tue, 05 Nov 2019 08:29:34 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 545C88017DD; Tue, 5 Nov 2019 13:29:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E69C5C883; Tue, 5 Nov 2019 13:29:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BAED346FBF; Tue, 5 Nov 2019 13:29:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xA5DS3TF004132 for ; Tue, 5 Nov 2019 08:28:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 893B5600C6; Tue, 5 Nov 2019 13:28:03 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DE19600CC for ; Tue, 5 Nov 2019 13:28:01 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 0C507105D7E; Tue, 5 Nov 2019 14:27:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572960661; 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=uhbJaGc/RQxYmbE91zOUAGZRpGMaaS4lRbagjVsnIpI=; b=FGYA67mrVtH7hRmskxz+WlZO5NjCxVQ+0jQChuAqwfp5sWNj4sI+6CVS/bCfpgnrvA/4vw dK4aoPYBZDeldAdX8Bg8W+5tR78hXgOsJaNef2/sw69eI1bPMopWdIf+xAuIKEAvk7djYR hUQTpUPbrpJmiRk58a6/StuAiSoe1XQ= From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 5 Nov 2019 14:27:34 +0100 Message-Id: <6f1b0feb78266cbdce03165a3023069b4f352c49.1572958254.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 36/52] qemu: Refactor virQEMUCapsFormatCache a bit X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: fRyrFZoLPVO5457Dm1R5uw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All the code for formatting machine type data was moved to a standalone virQEMUCapsFormatMachines function. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 3: - new patch src/qemu/qemu_capabilities.c | 37 ++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4c0cba6a62..52a7248574 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4023,6 +4023,28 @@ virQEMUCapsFormatCPUModels(virQEMUCapsAccelPtr caps, } =20 =20 +static void +virQEMUCapsFormatMachines(virQEMUCapsPtr qemuCaps, + virBufferPtr buf) +{ + size_t i; + + for (i =3D 0; i < qemuCaps->nmachineTypes; i++) { + virBufferEscapeString(buf, "machineTypes[i].name); + virBufferEscapeString(buf, " alias=3D'%s'", + qemuCaps->machineTypes[i].alias); + if (qemuCaps->machineTypes[i].hotplugCpus) + virBufferAddLit(buf, " hotplugCpus=3D'yes'"); + virBufferAsprintf(buf, " maxCpus=3D'%u'", + qemuCaps->machineTypes[i].maxCpus); + if (qemuCaps->machineTypes[i].qemuDefault) + virBufferAddLit(buf, " default=3D'yes'"); + virBufferAddLit(buf, "/>\n"); + } +} + + static void virQEMUCapsFormatAccel(virQEMUCapsPtr qemuCaps, virBufferPtr buf, @@ -4101,20 +4123,7 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM); virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU); =20 - for (i =3D 0; i < qemuCaps->nmachineTypes; i++) { - virBufferEscapeString(&buf, "machineTypes[i].name); - if (qemuCaps->machineTypes[i].alias) - virBufferEscapeString(&buf, " alias=3D'%s'", - qemuCaps->machineTypes[i].alias); - if (qemuCaps->machineTypes[i].hotplugCpus) - virBufferAddLit(&buf, " hotplugCpus=3D'yes'"); - virBufferAsprintf(&buf, " maxCpus=3D'%u'", - qemuCaps->machineTypes[i].maxCpus); - if (qemuCaps->machineTypes[i].qemuDefault) - virBufferAddLit(&buf, " default=3D'yes'"); - virBufferAddLit(&buf, "/>\n"); - } + virQEMUCapsFormatMachines(qemuCaps, &buf); =20 for (i =3D 0; i < qemuCaps->ngicCapabilities; i++) { virGICCapabilityPtr cap; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list