From nobody Tue Feb 10 17:03:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1680796748; cv=none; d=zohomail.com; s=zohoarc; b=fq2m7NMsVJC29j/UaulaJP9RQF4EQ7mA9PZ5zTz+/5C0IfOzF8oBFETZNa8BvDxyN5GBakAC1xrrmSl4nK4ysFb7Qeje9jHLSW1G4ntVxdQn2iZlJxVdCfrnhGZ3T1tIsgTu7jFtphZr+5Xeg55aJxMEHciuWTROjFcUOpydenU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680796748; h=Content-Type:Content-Transfer-Encoding:Cc: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=PZug1J2DOD3zH051FeQdS3aNBfnjUStOBidtIdkis1Y=; b=TbwSaQ0KCqcn4wmua2g/OK3ZfM8ZbtlSMhHRchYYWbY1SPdthYOH7dvwm2UlCjlvhgKznC6rVwOBmFR18fyq538feOMYVOPS3hWaZkaGyeCd5Mu0XngPaQcveLfbl5L9OHBWq+vqkJicptUCe8qPqSmnUfuqAGMFhjoyI5qB1WA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1680796748376568.5939950760736; Thu, 6 Apr 2023 08:59:08 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-KNG2K3jnMTGtQIrnmWgI4g-1; Thu, 06 Apr 2023 11:59:04 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D2FDA29DD98C; Thu, 6 Apr 2023 15:59:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C110B492C14; Thu, 6 Apr 2023 15:59:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 958661946595; Thu, 6 Apr 2023 15:59:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 428FD1946587 for ; Thu, 6 Apr 2023 15:59:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 250D1C32950; Thu, 6 Apr 2023 15:59:00 +0000 (UTC) Received: from localhost (unknown [10.39.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E3BCC32959; Thu, 6 Apr 2023 15:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680796747; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=PZug1J2DOD3zH051FeQdS3aNBfnjUStOBidtIdkis1Y=; b=CxL9O6vGiDXzMIX7pUhdqPgi6sOLcVf/OQ3FezwvZIHwWI6+pTjPwQrXxqMsKP5YpR6jD0 ClS45ewXAWJ7U4abr/5FxKetwM2lWQPKH+Zi9n+afx/CQPTGdrI/zTILwx7yGcsBuhc9jf 7gH8TbhIF7h0mYZro75rmogoDdith6A= X-MC-Unique: KNG2K3jnMTGtQIrnmWgI4g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] meson: don't look for unix paths on win32 Date: Thu, 6 Apr 2023 19:58:50 +0400 Message-Id: <20230406155852.299579-2-marcandre.lureau@redhat.com> In-Reply-To: <20230406155852.299579-1-marcandre.lureau@redhat.com> References: <20230406155852.299579-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1680796750478100001 From: Marc-Andr=C3=A9 Lureau Or meson will complain with: ../meson.build:770:2: ERROR: Search directory /sbin is not an absolute path. Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 47ec7fcb74..f7f31a278d 100644 --- a/meson.build +++ b/meson.build @@ -742,11 +742,15 @@ conf.set('SIZEOF_LONG', cc.sizeof('long')) =20 # Where we look for daemons and admin binaries during configure =20 -libvirt_sbin_path =3D [ - '/sbin', - '/usr/sbin', - '/usr/local/sbin', -] +libvirt_sbin_path =3D [] + +if host_machine.system() !=3D 'windows' + libvirt_sbin_path +=3D [ + '/sbin', + '/usr/sbin', + '/usr/local/sbin', + ] +endif =20 =20 # required programs check --=20 2.39.2 From nobody Tue Feb 10 17:03:11 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=1680796863; cv=none; d=zohomail.com; s=zohoarc; b=Bc0DIWwGyzDWeHiFuuzrIgP0CGA1SVrvpE9iMnWp9k6ZkztOso+5ztdT0ivHDMxIQ4G0DcZtaRTumdtv+gk8MWja48lvyQkBxHMvOovNVxEWOPfmu0htyzzS6iWtgN0w57LTnlc8iW8ejLa5wuRKYcQSgtTdvSsOyML7UR30K/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680796863; h=Content-Type:Content-Transfer-Encoding:Cc: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=bOkaTgzoDiiOQVTa/Db2RE+pjghcT/Q8jdBS+w0nWa0=; b=TZrhs+z8jEMY8KW3PDK41zidf1llgoFLjFdmlmngb15yd/HGiMWtmxdGMmm5YQvTxYojZC3vn5hYgvayFJxjHkIX5iKvfPzxhMVQq4MQNqYnlH2ZfahAje2mHtmelrY6rsyEZIuvZZ+i5b18e99+lBf2GCjkg6yPN1MI3ojt76A= 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 1680796863101839.349977912733; Thu, 6 Apr 2023 09:01:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-374-ZuEfqcXONdGkBM42veB7hA-1; Thu, 06 Apr 2023 11:59:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0C7D3185A7A2; Thu, 6 Apr 2023 15:59:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED27B141511D; Thu, 6 Apr 2023 15:59:05 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CF94E194658F; Thu, 6 Apr 2023 15:59:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8BF581946587 for ; Thu, 6 Apr 2023 15:59:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6012B492B00; Thu, 6 Apr 2023 15:59:04 +0000 (UTC) Received: from localhost (unknown [10.39.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7EB4492C3E; Thu, 6 Apr 2023 15:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680796862; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=bOkaTgzoDiiOQVTa/Db2RE+pjghcT/Q8jdBS+w0nWa0=; b=jVyQtEpd8xGNPBTVNCVef676k112u0QVTjDKwi49lZfrdOexSr2+6Tg0Q+jUU9BHR+8XkW MC+yqC8Lq3YoUdtS0o9SpBYdf1KlrswMA3O9HV+f3c6YKjeHar73tA+p5cjy6WmXyG16Yx 03KoDJ+udelVRZQeeTRx7dE0/O2sfvA= X-MC-Unique: ZuEfqcXONdGkBM42veB7hA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] meson: drop explicit python interpreter Date: Thu, 6 Apr 2023 19:58:51 +0400 Message-Id: <20230406155852.299579-3-marcandre.lureau@redhat.com> In-Reply-To: <20230406155852.299579-1-marcandre.lureau@redhat.com> References: <20230406155852.299579-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1680796864469100001 From: Marc-Andr=C3=A9 Lureau meson wraps python scripts already on win32, so we end up with these failing commands: [1/359] "C:/msys64/ucrt64/bin/meson" "--internal" "exe" "--capture" "src/ut= il/virkeycodetable_atset1.h" "--" "sh" "C:/msys64/home/marca/src/libvirt/sc= ripts/meson-python.sh" "C:/msys64/ucrt64/bin/python3.EXE" "python" "C:/msys= 64/home/marca/src/libvirt/src/keycodemapdb/tools/keymap-gen" "code-table" "= --lang" "stdc" "--varname" "virKeyCodeTable_atset1" "C:/msys64/home/marca/s= rc/libvirt/src/keycodemapdb/data/keymaps.csv" "atset1" FAILED: src/util/virkeycodetable_atset1.h "C:/msys64/ucrt64/bin/meson" "--internal" "exe" "--capture" "src/util/virke= ycodetable_atset1.h" "--" "sh" "C:/msys64/home/marca/src/libvirt/scripts/me= son-python.sh" "C:/msys64/ucrt64/bin/python3.EXE" "python" "C:/msys64/home/= marca/src/libvirt/src/keycodemapdb/tools/keymap-gen" "code-table" "--lang" = "stdc" "--varname" "virKeyCodeTable_atset1" "C:/msys64/home/marca/src/libvi= rt/src/keycodemapdb/data/keymaps.csv" "atset1" If LC_ALL, LANG and LC_CTYPE need to be set, it would probably be better to use a meson environment() instead. Signed-off-by: Marc-Andr=C3=A9 Lureau --- docs/manpages/meson.build | 4 ++-- docs/meson.build | 6 ++---- src/admin/meson.build | 4 ++-- src/esx/meson.build | 4 ++-- src/hyperv/meson.build | 2 +- src/meson.build | 8 ++++---- src/util/meson.build | 4 ++-- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index 84b2e247e9..afcadaefbd 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -49,7 +49,7 @@ foreach name : keycode_list input: keymap_src_file, output: 'virkeycode-@0@.rst'.format(name), command: [ - meson_python_prog, python3_prog, keymap_gen_prog, 'code-docs', + keymap_gen_prog, 'code-docs', '--lang', 'rst', '--title', 'virkeycode-@0@'.format(name), '--subtitle', 'Key code values for @0@'.format(name), @@ -70,7 +70,7 @@ foreach name : keyname_list input: keymap_src_file, output: 'virkeyname-@0@.rst'.format(name), command: [ - meson_python_prog, python3_prog, keymap_gen_prog, 'name-docs', + keymap_gen_prog, 'name-docs', '--lang', 'rst', '--title', 'virkeyname-@0@'.format(name), '--subtitle', 'Key name values for @0@'.format(name), diff --git a/docs/meson.build b/docs/meson.build index 8f84d08912..769efe7b6a 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -123,7 +123,7 @@ aclperms_gen =3D custom_target( input: access_perm_h, output: 'aclperms.htmlinc', command: [ - meson_python_prog, python3_prog, genaclperms_prog, '@INPUT@', + genaclperms_prog, '@INPUT@', ], capture: true, ) @@ -145,7 +145,7 @@ docs_api_generated =3D custom_target( 'libvirt-admin-api.xml', ], command: [ - meson_python_prog, python3_prog, apibuild_prog, + apibuild_prog, meson.current_source_dir(), meson.current_build_dir(), ], @@ -264,8 +264,6 @@ hvsupport_html_in =3D custom_target( 'hvsupport.html.in', output: 'hvsupport.html.in', command: [ - meson_python_prog, - python3_prog, hvsupport_prog, meson.project_source_root(), meson.project_build_root(), diff --git a/src/admin/meson.build b/src/admin/meson.build index 692cc128a3..e04d610f92 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -68,7 +68,7 @@ libvirt_admin_syms =3D custom_target( ], output: 'libvirt_admin.syms', command: [ - meson_python_prog, python3_prog, meson_gen_sym_prog, + meson_gen_sym_prog, '@OUTPUT@', 'LIBVIRT_ADMIN_PRIVATE_' + meson.project_version(), '@INPU= T@', ], ) @@ -79,7 +79,7 @@ if host_machine.system() =3D=3D 'windows' input: libvirt_admin_syms, output: 'libvirt_admin.def', command: [ - meson_python_prog, python3_prog, meson_gen_def_prog, + meson_gen_def_prog, '@INPUT@', '@OUTPUT@', ], ) diff --git a/src/esx/meson.build b/src/esx/meson.build index d1f42fdcc4..4bd0dadd51 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -25,7 +25,7 @@ esx_gen_headers =3D custom_target( 'esx_vi_types.generated.typeenum', ], command: [ - meson_python_prog, python3_prog, esx_vi_generator_prog, + esx_vi_generator_prog, meson.project_source_root() / 'src', meson.project_build_root() / 'src', 'header', @@ -46,7 +46,7 @@ esx_gen_sources =3D custom_target( 'esx_vi_types.generated.typetostring', ], command: [ - meson_python_prog, python3_prog, esx_vi_generator_prog, + esx_vi_generator_prog, meson.project_source_root() / 'src', meson.project_build_root() / 'src', 'source', diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build index 3509ce12f7..446b6ddada 100644 --- a/src/hyperv/meson.build +++ b/src/hyperv/meson.build @@ -17,7 +17,7 @@ hyperv_gen_sources =3D custom_target( 'hyperv_wmi_classes.generated.typedef', ], command: [ - meson_python_prog, python3_prog, hyperv_wmi_generator_prog, + hyperv_wmi_generator_prog, meson.project_source_root() / 'src', meson.project_build_root() / 'src', ], diff --git a/src/meson.build b/src/meson.build index 35951d8990..ad7796f03d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -350,7 +350,7 @@ libvirt_syms =3D custom_target( input: [ public_sym_file ] + used_sym_files + generated_sym_files, output: 'libvirt.syms', command: [ - meson_python_prog, python3_prog, meson_gen_sym_prog, + meson_gen_sym_prog, '@OUTPUT@', 'LIBVIRT_PRIVATE_' + meson.project_version(), '@INPUT@', ], ) @@ -361,7 +361,7 @@ if host_machine.system() =3D=3D 'windows' input: libvirt_syms, output: 'libvirt.def', command: [ - meson_python_prog, python3_prog, meson_gen_def_prog, + meson_gen_def_prog, '@INPUT@', '@OUTPUT@', ], ) @@ -417,7 +417,7 @@ if host_machine.system() =3D=3D 'windows' input: libvirt_qemu_syms, output: 'libvirt_qemu.def', command: [ - meson_python_prog, python3_prog, meson_gen_def_prog, + meson_gen_def_prog, '@INPUT@', '@OUTPUT@', ], ) @@ -476,7 +476,7 @@ if host_machine.system() =3D=3D 'windows' input: libvirt_lxc_syms, output: 'libvirt_lxc.def', command: [ - meson_python_prog, python3_prog, meson_gen_def_prog, + meson_gen_def_prog, '@INPUT@', '@OUTPUT@', ], ) diff --git a/src/util/meson.build b/src/util/meson.build index 2fe6f7699e..ace5bb04a5 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -147,7 +147,7 @@ foreach name : keycode_list input: keymap_src_file, output: 'virkeycodetable_@0@.h'.format(name), command: [ - meson_python_prog, python3_prog, keymap_gen_prog, 'code-table', + keymap_gen_prog, 'code-table', '--lang', 'stdc', '--varname', 'virKeyCodeTable_@0@'.format(name), '@INPUT@', name, @@ -162,7 +162,7 @@ foreach name : keyname_list input: keymap_src_file, output: 'virkeynametable_@0@.h'.format(name), command: [ - meson_python_prog, python3_prog, keymap_gen_prog, 'name-table', + keymap_gen_prog, 'name-table', '--lang', 'stdc', '--varname', 'virKeyNameTable_@0@'.format(name), '@INPUT@', name, --=20 2.39.2 From nobody Tue Feb 10 17:03:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1680796758; cv=none; d=zohomail.com; s=zohoarc; b=JbdjdJAEwnKjflND5ecQtoE+4R703jQeWZLfDCQxq+R4BnGP9vNS7Y+pi9zhCal10qc5o7+Of4fjmrUunG6xwpJblTlbaWLM0ipqWQ1RcKFnz2V7XN84YUEK9nbUYAaXGbazTOJysxu/3XYrAC+B2UQCgG2gxtc0ENd9StqqPiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680796758; h=Content-Type:Content-Transfer-Encoding:Cc: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=xOoN6Hf7N4zo3Xbyo5xDHgiNfRwqKXZ20kW3BhNnqzc=; b=S2lx3Fnwym46lCeEt0+pwLjTe6yoh4pzYIQxx95+J1+x1VKkKUYwXX0ohRVNXP2hFyQqHtM1UMNsoUZ2p8/L0pY9dR0//v1rrOE2+Ld8M10bqhCUWLDn+wFRKjHOHXr9NDFMIUvnv8Xj2L9HGWKwCx8dk40BtaZfB6JmQJTDvfg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1680796758308361.7619572792685; Thu, 6 Apr 2023 08:59:18 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-329-G8aW6nZgPkuoLqKmMw9uHA-1; Thu, 06 Apr 2023 11:59:12 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B232B858F0E; Thu, 6 Apr 2023 15:59:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F27B492C3E; Thu, 6 Apr 2023 15:59:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 71428194658F; Thu, 6 Apr 2023 15:59:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 988991946587 for ; Thu, 6 Apr 2023 15:59:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7C79F14171B8; Thu, 6 Apr 2023 15:59:08 +0000 (UTC) Received: from localhost (unknown [10.39.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA5CA14171B6; Thu, 6 Apr 2023 15:59:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680796757; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=xOoN6Hf7N4zo3Xbyo5xDHgiNfRwqKXZ20kW3BhNnqzc=; b=eziLcd93ZeACBLd53gKrI58D6r3hYsCAOLSCuoUnN/q9C0D2f35FbwsjiDHquOE+CppTrB ixeEwqGUgi8mPCVA0pXx+0URsNugU1/cBqz/wxNHFFZMP/GevKu7QqatebW11x1mGBMt8D /i5Jlp/t2RyiTV6PECTXptG5cqvxEI0= X-MC-Unique: G8aW6nZgPkuoLqKmMw9uHA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] rpc/ssh: ssh_userauth_agent() is not supported on win32 Date: Thu, 6 Apr 2023 19:58:52 +0400 Message-Id: <20230406155852.299579-4-marcandre.lureau@redhat.com> In-Reply-To: <20230406155852.299579-1-marcandre.lureau@redhat.com> References: <20230406155852.299579-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1680796758670100001 From: Marc-Andr=C3=A9 Lureau The function does not exist on win32. Signed-off-by: Marc-Andr=C3=A9 Lureau --- src/rpc/virnetlibsshsession.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index e71a79d0fb..e94b0d7a2e 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -60,7 +60,9 @@ typedef enum { VIR_NET_LIBSSH_AUTH_KEYBOARD_INTERACTIVE, VIR_NET_LIBSSH_AUTH_PASSWORD, VIR_NET_LIBSSH_AUTH_PRIVKEY, - VIR_NET_LIBSSH_AUTH_AGENT +#ifndef WIN32 + VIR_NET_LIBSSH_AUTH_AGENT, +#endif } virNetLibsshAuthMethods; =20 =20 @@ -698,6 +700,7 @@ virNetLibsshAuthenticate(virNetLibsshSession *sess) /* try to authenticate using the keyboard interactive way */ ret =3D virNetLibsshAuthenticateKeyboardInteractive(sess, auth= ); break; +#ifndef WIN32 case VIR_NET_LIBSSH_AUTH_AGENT: /* try to authenticate using ssh-agent */ ret =3D ssh_userauth_agent(sess->session, NULL); @@ -708,6 +711,7 @@ virNetLibsshAuthenticate(virNetLibsshSession *sess) errmsg); } break; +#endif case VIR_NET_LIBSSH_AUTH_PRIVKEY: /* try to authenticate using the provided ssh key */ ret =3D virNetLibsshAuthenticatePrivkey(sess, auth); @@ -861,8 +865,13 @@ virNetLibsshSessionAuthAddPasswordAuth(virNetLibsshSes= sion *sess, } =20 int -virNetLibsshSessionAuthAddAgentAuth(virNetLibsshSession *sess) +virNetLibsshSessionAuthAddAgentAuth(virNetLibsshSession *sess G_GNUC_UNUSE= D) { +#ifdef WIN32 + virReportError(VIR_ERR_LIBSSH, "%s", + _("Agent authentication is not supported on this host")= ); + return -1; +#else virNetLibsshAuthMethod *auth; =20 virObjectLock(sess); @@ -873,6 +882,7 @@ virNetLibsshSessionAuthAddAgentAuth(virNetLibsshSession= *sess) =20 virObjectUnlock(sess); return 0; +#endif } =20 int --=20 2.39.2