From nobody Sun Feb 8 17:22:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1560863524; cv=none; d=zoho.com; s=zohoarc; b=a+3ma9Dz60BjSwNNmAKmXWFPiHuM7TdbNUDEdoqIcLMJK3EYNAlICE08dXQ9abohI+gy11hchqFOV3V/2aQLZ+gb5wc5h5eOsMcmRaILR9FQHKndTEtTekjKrkrR0o5rOlNidzpib1DcI8b6UcX+GD1zpv3eqj0KWN+MmMALaQQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560863524; 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:ARC-Authentication-Results; bh=IpbO2dA+/L74ipk77f8cyKZqQo+is8hw0QVcr92YZU4=; b=dcDqSjrmOvfwQhkoS6naq01+1l1fX24pLjfqejmg/HZ05gLAUKLkrKzcg7DLUbtSQIhcduNQTB0U1DZ5KDZrT35FyPjVvZPXQTSr9TIDK9VQ7hGqtdsm8W7v8fAk/fRF0v6sHYdDSRMvG7tAZ8CNPGGpJeXqg1AP6pBGtg9gwRs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560863524984421.2692656464802; Tue, 18 Jun 2019 06:12:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E65F30C1AFC; Tue, 18 Jun 2019 13:11:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E5E5119492; Tue, 18 Jun 2019 13:11:56 +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 B537C1806B1F; Tue, 18 Jun 2019 13:11:54 +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 x5IDAeDM018768 for ; Tue, 18 Jun 2019 09:10:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 480151001B3D; Tue, 18 Jun 2019 13:10:40 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id C75F71001DE4 for ; Tue, 18 Jun 2019 13:10:39 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 15:10:19 +0200 Message-Id: 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 10/15] qemu: domain: Add support for modifying qemu capability list via qemu namespace 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 18 Jun 2019 13:12:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" For testing purposes it's sometimes desired to be able to control the presence of capabilities of qemu. This adds the possibility to do this via the qemu namespace. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 8 ++++++++ src/qemu/qemu_process.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5caa31d3bc..2e0a0ca88b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8285,6 +8285,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, size_t i; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D obj->privateData; + bool custom_hypervisor_feat =3D false; if (virQEMUDriverIsPrivileged(driver) && (!cfg->clearEmulatorCapabilities || @@ -8299,6 +8300,13 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, qemuDomainXmlNsDefPtr qemuxmlns =3D obj->def->namespaceData; if (qemuxmlns->num_args || qemuxmlns->num_env) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CUSTOM_ARGV, = logCtxt); + if (qemuxmlns->ncapsadd > 0 || qemuxmlns->ncapsdel > 0) + custom_hypervisor_feat =3D true; + } + + if (custom_hypervisor_feat) { + qemuDomainObjTaint(driver, obj, + VIR_DOMAIN_TAINT_CUSTOM_HYPERVISOR_FEATURE, log= Ctxt); } if (obj->def->cpu && obj->def->cpu->mode =3D=3D VIR_CPU_MODE_HOST_PASS= THROUGH) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1626796c19..8fafd067ce 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5406,6 +5406,42 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, } +static int +qemuProcessStartUpdateCustomCaps(virDomainObjPtr vm) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + qemuDomainXmlNsDefPtr nsdef =3D vm->def->namespaceData; + int tmp; + size_t i; + + if (nsdef) { + for (i =3D 0; i < nsdef->ncapsadd; i++) { + if ((tmp =3D virQEMUCapsTypeFromString(nsdef->capsadd[i])) < 0= ) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid qemu namespace capability '%s'"), + nsdef->capsadd[i]); + return -1; + } + + virQEMUCapsSet(priv->qemuCaps, tmp); + } + + for (i =3D 0; i < nsdef->ncapsdel; i++) { + if ((tmp =3D virQEMUCapsTypeFromString(nsdef->capsdel[i])) < 0= ) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid qemu namespace capability '%s'"), + nsdef->capsdel[i]); + return -1; + } + + virQEMUCapsClear(priv->qemuCaps, tmp); + } + } + + return 0; +} + + /** * qemuProcessInit: * @@ -5476,6 +5512,10 @@ qemuProcessInit(virQEMUDriverPtr driver, if (virDomainObjSetDefTransient(caps, driver->xmlopt, vm) < 0) goto cleanup; + /* Update qemu capabilities according to lists passed in via namespace= */ + if (qemuProcessStartUpdateCustomCaps(vm) < 0) + goto cleanup; + if (flags & VIR_QEMU_PROCESS_START_PRETEND) { if (qemuDomainSetPrivatePaths(driver, vm) < 0) { virDomainObjRemoveTransientDef(vm); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list