From nobody Sun Feb 8 21:29:00 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=1641462287; cv=none; d=zohomail.com; s=zohoarc; b=Uhi6JSi8VQNpaO3Z0X0S23OkdSO0Q2OixP1A8QD7CpslORMAJok8IG3xKGVgqHJ8ARne55GuT3q+oa8/Bg/xFzv09OJhkLcNAq1wXVGqUqOyEK1vEuh+fbdE6PUd9pAaueUvPmwv+WJf38x7uQAJxzzKnAHFbItWCWVznzi/McM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462287; 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=TmcsYUntDJDt4rc3+pF6UdVGt4/NrgpoBGCJL825wmE=; b=Ne9fsagED8bNHCQeIVkE3slbDtK2dstLMuh8eNSTdZyswK+X5Lt6rgikPxTerijULaBtvI4bIiK/4/x/oxv6tmxmn0E4tpvqT783NGSiEDNTCUIompk9RR8GjRg8g8fGMP8gcZ6f9kbxpxNbWr7QSBdCh0TApGEjDi9DZrrl6uE= 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 1641462287710977.1436304148964; Thu, 6 Jan 2022 01:44:47 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-120-4oIoATI3OkCnMn4bSwAK4Q-1; Thu, 06 Jan 2022 04:44:42 -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 1B864801AAB; Thu, 6 Jan 2022 09:44:38 +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 516917AB7E; Thu, 6 Jan 2022 09:44:37 +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 0DAFF1809CBA; Thu, 6 Jan 2022 09:44:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069iYic005360 for ; Thu, 6 Jan 2022 04:44:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id 429BC7CD68; Thu, 6 Jan 2022 09:44:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99FC27CAD2 for ; Thu, 6 Jan 2022 09:44:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462286; 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=TmcsYUntDJDt4rc3+pF6UdVGt4/NrgpoBGCJL825wmE=; b=XiuwMrfUdvQ0SzdmKK1nqVBPAnayGbQpPIOwuO21fFZyqngbwcTrOjg4+RyTbujkChdmHq x8O/7Uem4u7BQ8QiS0WsNvJLL9kJtD1YK0Y8wRxdnmIDljLuz5uetBf/kHUpP8K/WN9VHt lb5ZIY07Wf0JmZp/iV2oggXqpN8QaxM= X-MC-Unique: 4oIoATI3OkCnMn4bSwAK4Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/21] qemuProcessPrepareQEMUCaps: Don't clear QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE Date: Thu, 6 Jan 2022 10:44:00 +0100 Message-Id: <20cfacda92c133c504decce0d91f23150217e3a3.1641461748.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1641462289816100001 Content-Type: text/plain; charset="utf-8" All the fd-passing setup of chardevs which this hack meant to disable was moved to the host-preparation phase which is skipped for formatting of non-real commandlines. Signed-off-by: Peter Krempa --- src/qemu/qemu_process.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index de1146251d..76a52f7a5d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5522,7 +5522,6 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm) * qemuProcessPrepareQEMUCaps: * @vm: domain object * @qemuCapsCache: cache of QEMU capabilities - * @processStartFlags: flags based on the VIR_QEMU_PROCESS_START_* enum * * Prepare the capabilities of a QEMU process for startup. This includes * copying the caps to a static cache and potential post-processing depend= ing @@ -5532,8 +5531,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm) */ static int qemuProcessPrepareQEMUCaps(virDomainObj *vm, - virFileCache *qemuCapsCache, - unsigned int processStartFlags) + virFileCache *qemuCapsCache) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -5544,9 +5542,6 @@ qemuProcessPrepareQEMUCaps(virDomainObj *vm, vm->def->os.machine)= )) return -1; - if (processStartFlags & VIR_QEMU_PROCESS_START_STANDALONE) - virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMAND= LINE); - /* Update qemu capabilities according to lists passed in via namespace= */ if (qemuProcessStartUpdateCustomCaps(vm) < 0) return -1; @@ -5605,7 +5600,7 @@ qemuProcessInit(virQEMUDriver *driver, } VIR_DEBUG("Determining emulator version"); - if (qemuProcessPrepareQEMUCaps(vm, driver->qemuCapsCache, flags) < 0) + if (qemuProcessPrepareQEMUCaps(vm, driver->qemuCapsCache) < 0) goto cleanup; if (qemuDomainUpdateCPU(vm, updatedCPU, &origCPU) < 0) --=20 2.31.1