From nobody Sun May 19 18:35:16 2024 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=1627386782; cv=none; d=zohomail.com; s=zohoarc; b=aVNI5t2hHr/SokFTuDd8C9GKvvqZv3A0NzpViODuKO//svSWi7yw7GS5OJDyZhlVvU44OKo6F/o59anbjKS6UZPygcusXOapkdMNUgKnWJwxD6rT17Yzz3h/4h0k5KWpT/51QF2qVt7POJ/Xplicj7+eUXeJ23qd1lDKF2rvMto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627386782; 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=qUmj/U9YeunzTUobWpqtXwe905LTI4XdGMQePOhidvI=; b=fPb2I/HypVm5rt+DRot8qhCNM9nldTjurcOl6EvKwxaqCj85M8G9RxbaH1cP9HIlRA/i0RdVbWDjDWnSQYG+aAhR8CG67dtZEVJQr0rCtdNf5/Q/X3HoWiLSqHkU+PbcTXGGrCBS2V8ZpEAARALgKYSSZdQhR/k9qODTA65wufE= 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 1627386782860652.9536231909301; Tue, 27 Jul 2021 04:53:02 -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-546-QXxRBc_9OE2E56NiDczOUg-1; Tue, 27 Jul 2021 07:52:59 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6659A107AD82; Tue, 27 Jul 2021 11:52:54 +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 3B62718432; Tue, 27 Jul 2021 11:52:54 +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 D44584A7CA; Tue, 27 Jul 2021 11:52:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16RBqduw015384 for ; Tue, 27 Jul 2021 07:52:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 534B55DAA5; Tue, 27 Jul 2021 11:52:39 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0C925DD68 for ; Tue, 27 Jul 2021 11:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627386781; 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=qUmj/U9YeunzTUobWpqtXwe905LTI4XdGMQePOhidvI=; b=YNV4NPNw3ZlUMl4/zmz6FlqHJRigWUAVnUOEv7pfkMg+f471Xp7ak/HmRAOkHKpnZAiTId LtCt5U8CthQwWAY/pZWmfJFtlP2uSF8pVedH+xfoJI0xxYQtICOEZUyRnrc478b2TidjoN FW+TDlYTyrFRosXqpmOvw4SkfJ4mhsU= X-MC-Unique: QXxRBc_9OE2E56NiDczOUg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] domxml-to-native: add disclaimer about fd passing Date: Tue, 27 Jul 2021 13:52:31 +0200 Message-Id: <78a32b2252ffddb3baa4536a771016da3478850a.1627386618.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.15 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1627386784165100001 For some configs where FD passing is used, we cannot generate a corresponding native config without writing extra code just for domxml-to-native. Add a disclaimer to the API documentation and the virsh man page. Signed-off-by: J=C3=A1n Tomko --- docs/manpages/virsh.rst | 2 ++ src/libvirt-domain.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 20936994ce..673dc8f434 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -2532,6 +2532,8 @@ Convert the file *xml* into domain XML format or conv= ert an existing *--domain* to the native guest configuration format named by *format*. The *xml* and *--domain* arguments are mutually exclusive. For the types of *format* argument, refer to ``domxml-from-native``. +Note that some domain configs cannot be converted to the native format, +because they rely on passing pre-opened file descriptors. =20 =20 dump diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4eb14d4176..156939fe22 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -2675,6 +2675,9 @@ virConnectDomainXMLFromNative(virConnectPtr conn, * a native configuration file describing the domain. * The format of the native data is hypervisor dependent. * + * Note that some configs cannot be converted to the native format, + * because they rely on passing pre-opened file descriptors. + * * Returns a 0 terminated UTF-8 encoded native config datafile, or * NULL in case of error. The caller must free() the returned value. */ --=20 2.31.1 From nobody Sun May 19 18:35:16 2024 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=1627386843; cv=none; d=zohomail.com; s=zohoarc; b=HC6pG/a6vmC9UJZi9IHZnU1qIBaiUKowUimvJfLkv34eyzzOiMvQMyNI3MYFhwf7e/ahhZnjncwMLpgahFKxEQJdsDYnkIMI/mcvUKhTEqoVo+1ADIcXEsFGVgkXEVdIyZ3OEGuh5QGk6/OY9ilhlFRWpiVHd5okbUc+G+WX32M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627386843; 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=Jy6S+BvzNgpSaFnuiB1UO/qlSsPzn/2V4XbRKZyX/hQ=; b=AfEnsxst6Ox5fTTwRomfgUlM5aRnNzarOfw7Qcy4Xx8ByA4Tr35Lt+MM35kiqAZ3j46O4/IRS+AbdXIJFAJPzm+3MJDF1pNImjDkRE95+JxYGgn03JWcRfkbBHDja+LEiJrRbcwhRgWFvVviqxd4i+B7OLQIsBod4xwdez4ZIHc= 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 1627386843688195.62838053059545; Tue, 27 Jul 2021 04:54:03 -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-140-6Z-k2swkNiafc14FZiRoJA-1; Tue, 27 Jul 2021 07:53:03 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5A8980292A; Tue, 27 Jul 2021 11:52: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 42CAC272A5; Tue, 27 Jul 2021 11:52:58 +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 DF954180BAB1; Tue, 27 Jul 2021 11:52:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16RBqfxf015396 for ; Tue, 27 Jul 2021 07:52:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0FA315DAA5; Tue, 27 Jul 2021 11:52:41 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F5615DD68 for ; Tue, 27 Jul 2021 11:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627386842; 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=Jy6S+BvzNgpSaFnuiB1UO/qlSsPzn/2V4XbRKZyX/hQ=; b=D5CmXGqK+1Fa7if1mkntDDQT0HrTkrg5OsngOB9uXnQ/6u0YF+HagIylCqGe+9nH+JeIYg GlMzFKoJ97JNqtA2nbF4Fyub99ATrze/LrF0vf7VVoB+sN/dOXso+e7GQfXvJ++36OxW3T xSSDy//ILGXjG//CocJQwUwvINd6ZOs= X-MC-Unique: 6Z-k2swkNiafc14FZiRoJA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] qemu: error out if vsock does not have a pre-opened file descriptor Date: Tue, 27 Jul 2021 13:52:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.23 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1627386845794100001 This improves the error message when used with domxml-to-native from: error: internal error: invalid use of command API https://bugzilla.redhat.com/show_bug.cgi?id=3D1777212 Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 156af4caee..f71f867942 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10291,6 +10291,12 @@ qemuBuildVsockCommandLine(virCommand *cmd, qemuDomainVsockPrivate *priv =3D (qemuDomainVsockPrivate *)vsock->priv= ateData; g_autofree char *devstr =3D NULL; =20 + if (priv->vhostfd =3D=3D -1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only pre-opened file descriptors are supported f= or vsock devices")); + return -1; + } + if (!(devstr =3D qemuBuildVsockDevStr(def, vsock, qemuCaps, ""))) return -1; =20 --=20 2.31.1