From nobody Thu Apr 25 19:55:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1574686463; cv=none; d=zohomail.com; s=zohoarc; b=Sqd4Rvfxr2z3+xEL+I2N05DhmMDq8z/7HXSonpcEeSiZYj5SPAlFcEvG5TpbSyWitJY/hN1gZLxw5PaeM3/zgk6RVi3ikqiolV6XiWWdH1QbWYBWRG/DKqPTO4g6F3D/gZUkZHeL1xFUfPEf2+YbGYcgjoXy76JKiqW5A+qIJsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574686463; 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=aBc8P+AfMffTMqueYCCqhzitOhkW/8RbP6v8jZkMkaw=; b=UrMCd2c18gumQfy0OhAUqKSnZIaiYimqzK9NrInDvRiouh0bfelazC4toTYovTj612emx7SnXwPKVzmJCrK+XpRoYxc4GfJklHbeYdrnHMIrexuGwJ0Ft5yAGOGw4ovpMdkf8LNBMqXDUpQJKuHBXY8CE1nGtrNwVXCnoOq73Lw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.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 15746864639171019.8995046336296; Mon, 25 Nov 2019 04:54:23 -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-300-qKjXQfqCMJ-FmmICTJSLww-1; Mon, 25 Nov 2019 07:54:21 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9885A8E3EEE; Mon, 25 Nov 2019 12:54:16 +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 6FE2B10016E8; Mon, 25 Nov 2019 12:54:16 +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 276C54E567; Mon, 25 Nov 2019 12:54:16 +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 xAPCs2A2016662 for ; Mon, 25 Nov 2019 07:54:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id C5B8F600C8; Mon, 25 Nov 2019 12:54:02 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CF8E600CA for ; Mon, 25 Nov 2019 12:54:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574686462; 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=aBc8P+AfMffTMqueYCCqhzitOhkW/8RbP6v8jZkMkaw=; b=fZ/OLKVIhbhDMO22lGhVvCZRgUSYiWRlfvcgT3owDpyw0D0F/dGPgBbhcm73IiW63cpXRE 4KDdfxGWKjZ59J7ey/wHHFcprx14g+Ezu7im5RlkDA762AuhBWpgp4nn7vB2jHnZTzWh1C deiUFQITCU1vXT6BEPpljJYC3B0K+Lo= From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 25 Nov 2019 13:53:51 +0100 Message-Id: <4226b8b0cf7fb39f12cb5ec8054237a5e896df57.1574686331.git.pkrempa@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 6/9] qemu: process: Move handling of qemu capability overrides 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.84 on 10.5.11.22 X-MC-Unique: qKjXQfqCMJ-FmmICTJSLww-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" Do all post-processing of capabilities in qemuProcessPrepareQEMUCaps. Signed-off-by: Peter Krempa Reviewed-by: Cole Robinson --- src/qemu/qemu_process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f36d03b0a6..f170554198 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5524,6 +5524,10 @@ qemuProcessPrepareQEMUCaps(virDomainObjPtr vm, if (processStartFlags & VIR_QEMU_PROCESS_START_STANDALONE) virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS); + /* Update qemu capabilities according to lists passed in via namespace= */ + if (qemuProcessStartUpdateCustomCaps(vm) < 0) + return -1; + return 0; } @@ -5596,10 +5600,6 @@ qemuProcessInit(virQEMUDriverPtr driver, if (virDomainObjSetDefTransient(caps, driver->xmlopt, vm, priv->qemuCa= ps) < 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.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list