From nobody Sun Feb 8 14:06:44 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=1572960609; cv=none; d=zoho.com; s=zohoarc; b=QMxcaDziaYxhwpwzCbwBUjOgt+vSVFEZWm0DRBLPDTO10L4Fse2Qq1JlX12QW85xulmcn/XibFmFypeiug4V0Q1cf+AMMKJGCKlmvxKFUCk7tadqM4FyAsigL1AlbLdXGFWlPRLhbrQpi3WgsrfFknjBXlNhqXnzWJq6s7gIAXU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572960609; 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=uNAAnSzsl+NSCdlTKCwv/x/mLeDiS4hQ+gEBTA597pc=; b=bF6OOowiMwFDrpveEUObt5Bzf5FtC8Kmpg+WPDHO3FVrIyoSeJJrabiJS5GoPAMdjeJ72axA1drqyxHb4V7pduDKkV+wD/qzN00ylx+/e/iZfjlrMcpqALlsp4IjZYysY62ASRdF6h/5Y8zbUUtD5ky6xbMPXEg6xwtimzChDIw= 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 1572960609817386.5865995524937; Tue, 5 Nov 2019 05:30:09 -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-207-sys4SaDSPzuBxBFr4A720w-1; Tue, 05 Nov 2019 08:29:30 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D4DE1005516; Tue, 5 Nov 2019 13:29:25 +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 410D25D9C9; Tue, 5 Nov 2019 13:29:25 +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 EC0CF4EDBD; Tue, 5 Nov 2019 13:29:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xA5DS31m004120 for ; Tue, 5 Nov 2019 08:28:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3C3E41001B11; 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 BBC781001B32 for ; Tue, 5 Nov 2019 13:28:01 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 14085105B1E; 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=1572960608; 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=uNAAnSzsl+NSCdlTKCwv/x/mLeDiS4hQ+gEBTA597pc=; b=F5nBj4MQRHUQTm+Xt9x827SXyEyN7o13donRfXT5OjraEm5KKDJeyEmm7kayNaEEx3bVl9 wEJW3zm8anIoCdmhmZcUSjDuQAjC8TODHiq+11InvGWlMOGAkeTU7kbsS129UrFQ8BP50b 0kd4rA7uePmWXZQhFhHzXfDjywYlTjs= From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 5 Nov 2019 14:27:35 +0100 Message-Id: <64279f2ffbd66465f1ad808875ef8cd8417e3f92.1572958254.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 37/52] qemu: Pass virDomainVirtType to APIs dealing with machine types 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.14 X-MC-Unique: sys4SaDSPzuBxBFr4A720w-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" Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 3: - new patch src/qemu/qemu_capabilities.c | 64 +++++++++++++++++++++--------------- src/qemu/qemu_capabilities.h | 8 ++++- src/qemu/qemu_domain.c | 8 +++-- tests/domaincapstest.c | 10 ++++-- 4 files changed, 59 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 52a7248574..68ae8be5c3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2106,8 +2106,10 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCap= s, * Resolves aliased machine names to the actual machine name. If qemuCaps = isn't * present @name is returned. */ -const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, - const char *name) +const char * +virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType G_GNUC_UNUSED, + const char *name) { size_t i; =20 @@ -2125,8 +2127,10 @@ const char *virQEMUCapsGetCanonicalMachine(virQEMUCa= psPtr qemuCaps, } =20 =20 -int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, - const char *name) +int +virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType G_GNUC_UNUSED, + const char *name) { size_t i; =20 @@ -2144,8 +2148,10 @@ int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemu= Caps, } =20 =20 -bool virQEMUCapsGetMachineHotplugCpus(virQEMUCapsPtr qemuCaps, - const char *name) +bool +virQEMUCapsGetMachineHotplugCpus(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType G_GNUC_UNUSED, + const char *name) { size_t i; =20 @@ -2431,6 +2437,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCa= ps, =20 static bool virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType G_GNUC_UNUSED, const char *canonical_machine) { size_t i; @@ -2445,6 +2452,7 @@ virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps, =20 static int virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType, qemuMonitorPtr mon) { char **values; @@ -2456,10 +2464,10 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemu= Caps, =20 for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsMachineProps); i++) { virQEMUCapsObjectTypeProps props =3D virQEMUCapsMachineProps[i]; - const char *canon =3D virQEMUCapsGetCanonicalMachine(qemuCaps, pro= ps.type); + const char *canon =3D virQEMUCapsGetCanonicalMachine(qemuCaps, vir= tType, props.type); g_autofree char *type =3D NULL; =20 - if (!virQEMUCapsIsMachineSupported(qemuCaps, canon)) + if (!virQEMUCapsIsMachineSupported(qemuCaps, virtType, canon)) continue; =20 /* The QOM type for machine types is the machine type name @@ -4641,7 +4649,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, return -1; if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, mon) < 0) return -1; - if (virQEMUCapsProbeQMPMachineProps(qemuCaps, mon) < 0) + if (virQEMUCapsProbeQMPMachineProps(qemuCaps, type, mon) < 0) return -1; if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, accel, mon) < 0) return -1; @@ -4878,6 +4886,7 @@ static const struct virQEMUCapsMachineTypeFilter virQ= EMUCapsMachineFilter[] =3D { =20 void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType, const char *machineType) { size_t i; @@ -4896,7 +4905,7 @@ virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCap= s, virQEMUCapsClear(qemuCaps, filter->flags[j]); } =20 - if (!virQEMUCapsGetMachineHotplugCpus(qemuCaps, machineType)) + if (!virQEMUCapsGetMachineHotplugCpus(qemuCaps, virtType, machineType)) virQEMUCapsClear(qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); } =20 @@ -4972,6 +4981,7 @@ virQEMUCapsCacheLookup(virFileCachePtr cache, =20 virQEMUCapsPtr virQEMUCapsCacheLookupCopy(virFileCachePtr cache, + virDomainVirtType virtType, const char *binary, const char *machineType) { @@ -4987,7 +4997,7 @@ virQEMUCapsCacheLookupCopy(virFileCachePtr cache, if (!ret) return NULL; =20 - virQEMUCapsFilterByMachineType(ret, machineType); + virQEMUCapsFilterByMachineType(ret, virtType, machineType); return ret; } =20 @@ -5130,20 +5140,6 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, binary =3D virQEMUCapsGetBinary(qemuCaps); } =20 - if (machine) { - /* Turn @machine into canonical name */ - machine =3D virQEMUCapsGetCanonicalMachine(qemuCaps, machine); - - if (!virQEMUCapsIsMachineSupported(qemuCaps, machine)) { - virReportError(VIR_ERR_INVALID_ARG, - _("the machine '%s' is not supported by emulato= r '%s'"), - machine, binary); - goto cleanup; - } - } else { - machine =3D virQEMUCapsGetPreferredMachine(qemuCaps); - } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) capsType =3D VIR_DOMAIN_VIRT_KVM; else @@ -5159,6 +5155,20 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, goto cleanup; } =20 + if (machine) { + /* Turn @machine into canonical name */ + machine =3D virQEMUCapsGetCanonicalMachine(qemuCaps, virttype, mac= hine); + + if (!virQEMUCapsIsMachineSupported(qemuCaps, virttype, machine)) { + virReportError(VIR_ERR_INVALID_ARG, + _("the machine '%s' is not supported by emulato= r '%s'"), + machine, binary); + goto cleanup; + } + } else { + machine =3D virQEMUCapsGetPreferredMachine(qemuCaps, virttype); + } + if (retArch) *retArch =3D arch; if (retVirttype) @@ -5191,7 +5201,8 @@ virQEMUCapsSupportsVmport(virQEMUCapsPtr qemuCaps, * Note that this may differ from QEMU's own default machine */ const char * -virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps) +virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType G_GNUC_UNUSED) { if (!qemuCaps->nmachineTypes) return NULL; @@ -5650,6 +5661,7 @@ virQEMUCapsFillDomainCaps(virCapsPtr caps, virDomainCapsDeviceRNGPtr rng =3D &domCaps->rng; =20 domCaps->maxvcpus =3D virQEMUCapsGetMachineMaxCpus(qemuCaps, + domCaps->virttype, domCaps->machine); if (domCaps->virttype =3D=3D VIR_DOMAIN_VIRT_KVM) { int hostmaxvcpus; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c0e1ce41e3..bc43b99579 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -601,13 +601,17 @@ bool virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qem= uCaps, virDomainVirtType type, virCPUMode mode); const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType, const char *name); int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType, const char *name); bool virQEMUCapsGetMachineHotplugCpus(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType, const char *name); =20 void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType, const char *machineType); =20 virFileCachePtr virQEMUCapsCacheNew(const char *libDir, @@ -617,6 +621,7 @@ virFileCachePtr virQEMUCapsCacheNew(const char *libDir, virQEMUCapsPtr virQEMUCapsCacheLookup(virFileCachePtr cache, const char *binary); virQEMUCapsPtr virQEMUCapsCacheLookupCopy(virFileCachePtr cache, + virDomainVirtType virtType, const char *binary, const char *machineType); virQEMUCapsPtr virQEMUCapsCacheLookupByArch(virFileCachePtr cache, @@ -642,7 +647,8 @@ bool virQEMUCapsSupportsGICVersion(virQEMUCapsPtr qemuC= aps, virDomainVirtType virtType, virGICVersion version); =20 -const char *virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps); +const char *virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps, + virDomainVirtType virtType); =20 int virQEMUCapsInitGuestFromBinary(virCapsPtr caps, const char *binary, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 667cc89072..8627238c6a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4340,7 +4340,8 @@ qemuCanonicalizeMachine(virDomainDefPtr def, virQEMUC= apsPtr qemuCaps) { const char *canon; =20 - if (!(canon =3D virQEMUCapsGetCanonicalMachine(qemuCaps, def->os.machi= ne))) + if (!(canon =3D virQEMUCapsGetCanonicalMachine(qemuCaps, def->virtType, + def->os.machine))) return 0; =20 if (STRNEQ(canon, def->os.machine)) { @@ -4839,7 +4840,8 @@ static int qemuDomainValidateCpuCount(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - unsigned int maxCpus =3D virQEMUCapsGetMachineMaxCpus(qemuCaps, def->o= s.machine); + unsigned int maxCpus =3D virQEMUCapsGetMachineMaxCpus(qemuCaps, def->v= irtType, + def->os.machine); =20 if (virDomainDefGetVcpus(def) =3D=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -8916,6 +8918,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, qCaps =3D virObjectRef(qemuCaps); } else { if (!(qCaps =3D virQEMUCapsCacheLookupCopy(driver->qemuCapsCac= he, + def->virtType, def->emulator, def->os.machine))) goto cleanup; @@ -14992,6 +14995,7 @@ qemuDomainUpdateQEMUCaps(virDomainObjPtr vm, =20 virObjectUnref(priv->qemuCaps); if (!(priv->qemuCaps =3D virQEMUCapsCacheLookupCopy(qemuCapsCache, + vm->def->virtType, vm->def->emulator, vm->def->os.machine)= )) return -1; diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index f77accdb76..a3295cdd80 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -83,6 +83,7 @@ fillQemuCaps(virDomainCapsPtr domCaps, virCapsPtr caps =3D NULL; virQEMUCapsPtr qemuCaps =3D NULL; virDomainCapsLoaderPtr loader =3D &domCaps->os.loader; + virDomainVirtType virtType; =20 if (!(caps =3D virCapabilitiesNew(domCaps->arch, false, false)) || fakeHostCPU(caps, domCaps->arch) < 0) @@ -93,13 +94,18 @@ fillQemuCaps(virDomainCapsPtr domCaps, !(qemuCaps =3D qemuTestParseCapabilities(caps, path))) goto cleanup; =20 + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) + virtType =3D VIR_DOMAIN_VIRT_KVM; + else + virtType =3D VIR_DOMAIN_VIRT_QEMU; + if (machine) { VIR_FREE(domCaps->machine); - domCaps->machine =3D g_strdup(virQEMUCapsGetCanonicalMachine(qemuC= aps, machine)); + domCaps->machine =3D g_strdup(virQEMUCapsGetCanonicalMachine(qemuC= aps, virtType, machine)); } =20 if (!domCaps->machine) - domCaps->machine =3D g_strdup(virQEMUCapsGetPreferredMachine(qemuC= aps)); + domCaps->machine =3D g_strdup(virQEMUCapsGetPreferredMachine(qemuC= aps, virtType)); =20 if (virQEMUCapsFillDomainCaps(caps, domCaps, qemuCaps, false, --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list