From nobody Mon Feb 9 00:56:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1628780188; cv=none; d=zohomail.com; s=zohoarc; b=Nwj2UsmzVJqQomAAhMFcoV1BwQUBV70NHS8HtHOPGJSzEORoOhhjEXAGH4GZKvejy6KFcFHMKkhdbVyGUrry/+rCw2Ju2NXiYVvzgW8gz8NOhDSVxhNh+ElY6aTexZ5G7a0b1IX1ujqf+1qJ/tWeEv9vGoH7/vF02UzWzji+R48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628780188; 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=pErO1qlT9ltjIaWQmFzeXbXDlURrjaG2EOhWroe2j98=; b=Y+1ZItLu2SeRv7pCHShDCi1xKTMZDh5e0ySAq6FFjtem4JPnHLZEfr6zaYDp3mc2eTerMuilfHb6g4Aqjl1NgfqVd7suOah2LueQ+raJMEhjdwduT1ErVXx/38+veWPKgimWxkkh6TQATrAt8UYtqDTV2H4DB4ZZcfZR4oC5ZNk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1628780188702910.0434742781199; Thu, 12 Aug 2021 07:56:28 -0700 (PDT) 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-489-nNUPPasjNWOKlvWz_4ocKA-1; Thu, 12 Aug 2021 10:56:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D2BAD801B3D; Thu, 12 Aug 2021 14:56:20 +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 B111660E1C; Thu, 12 Aug 2021 14:56:20 +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 7CD8D181A2AA; Thu, 12 Aug 2021 14:56:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17CEnTnV008430 for ; Thu, 12 Aug 2021 10:49:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3FCDB4A66; Thu, 12 Aug 2021 14:49:29 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9726219D9F for ; Thu, 12 Aug 2021 14:49:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628780187; 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=pErO1qlT9ltjIaWQmFzeXbXDlURrjaG2EOhWroe2j98=; b=c1iZoieNFc9QuuJJB/CU28BOqjymx1bG8USy35+KuHcPAQtGzR6UzGA0tEhV8vyNo3lK53 pxTd8YETXqzYYqj+SEJgtXW/2rYj8qJL+0nmnfMukAdJWgwwiL+HR201bA7qX+ZQkdHv6h ojxhK7L2vdaqwGbz51XNZ4vAv6QmPl0= X-MC-Unique: nNUPPasjNWOKlvWz_4ocKA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/22] qemu: capabilities: Rename QEMU_CAPS_CHARDEV_FD_PASS to QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE Date: Thu, 12 Aug 2021 16:49:00 +0200 Message-Id: <9cf5effd00b3b953fdd84baf840afe5f91b16cb6.1628778754.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.12 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: 1628780189801100001 Content-Type: text/plain; charset="utf-8" Make it more obvious that we care about passing FDs on the commandline before startup of qemu, which is used to avoid startup monitor polling. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_process.c | 6 +++--- tests/qemuxml2argvtest.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 18d82bc5f3..eb2e2b10c0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -491,7 +491,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "blockdev-del", /* QEMU_CAPS_BLOCKDEV_DEL */ "vmgenid", /* QEMU_CAPS_DEVICE_VMGENID */ "vhost-vsock", /* QEMU_CAPS_DEVICE_VHOST_VSOCK */ - "chardev-fd-pass", /* QEMU_CAPS_CHARDEV_FD_PASS */ + "chardev-fd-pass", /* QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE = */ /* 305 */ "tpm-emulator", /* QEMU_CAPS_DEVICE_TPM_EMULATOR */ @@ -3232,7 +3232,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCaps= CommandLine[] =3D { { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT }, { "boot-opts", "splash-time", QEMU_CAPS_SPLASH_TIMEOUT }, - { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS }, + { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "drive", "detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES }, { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX}, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2b1bb57a49..673e26d502 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -471,7 +471,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */ QEMU_CAPS_DEVICE_VMGENID, /* -device vmgenid */ QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */ - QEMU_CAPS_CHARDEV_FD_PASS, /* Passing pre-opened FDs for chardevs */ + QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE, /* Passing pre-opened FDs for c= hardevs on commandline */ /* 305 */ QEMU_CAPS_DEVICE_TPM_EMULATOR, /* -tpmdev emulator */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ecfed19432..9f3eb22b60 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4957,7 +4957,7 @@ qemuBuildChrChardevStr(virLogManager *logManager, virBufferAsprintf(&buf, "socket,id=3D%s", charAlias); if (dev->data.nix.listen && (cdevflags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) { + virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE= )) { int fd; if (qemuSecuritySetSocketLabel(secManager, (virDomainDef *)def= ) < 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4264191a9a..0bd3cbafd6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2341,7 +2341,7 @@ qemuProcessWaitForMonitor(virQEMUDriver *driver, bool retry =3D true; if (priv->qemuCaps && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLI= NE)) retry =3D false; VIR_DEBUG("Connect monitor to vm=3D%p name=3D'%s' retry=3D%d", @@ -5553,7 +5553,7 @@ qemuProcessPrepareQEMUCaps(virDomainObj *vm, return -1; if (processStartFlags & VIR_QEMU_PROCESS_START_STANDALONE) - virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS); + virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMAND= LINE); /* Update qemu capabilities according to lists passed in via namespace= */ if (qemuProcessStartUpdateCustomCaps(vm) < 0) @@ -8513,7 +8513,7 @@ qemuProcessReconnect(void *opaque) if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) goto error; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLI= NE)) retry =3D false; if (qemuDomainObjStartWorker(obj) < 0) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ef90f663c1..f7109fcbd3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1617,7 +1617,7 @@ mymain(void) DO_TEST("misc-no-reboot", NONE); DO_TEST("misc-uuid", NONE); DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE); - DO_TEST("net-vhostuser", QEMU_CAPS_CHARDEV_FD_PASS); + DO_TEST("net-vhostuser", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE); DO_TEST_CAPS_LATEST("net-vhostuser"); DO_TEST("net-vhostuser-multiq", NONE); DO_TEST_FAILURE("net-vhostuser-fail", NONE); --=20 2.31.1