From nobody Mon Sep 16 19:20:50 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=1683309726; cv=none; d=zohomail.com; s=zohoarc; b=CB7HgmJmSH/i1HpE7YLCatnZUSK9DiEs77F3r26K2GA/KapLmRg+Y1b79QGwGA7hFS43vJWAT8uLP/xsvuwJS7nTWyWBXs056pcmLLCRtW4qJbENjsWc1MByKuZFGAo3rLLjmC8hEV+Cj04qytuvYR1opmlrPa7s4Bae06xU18A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683309726; 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=egErQcxZVQS34F4dawisik6FyrVE9or8v/0o2ZHODKs=; b=eRosNu24yP1QoG8uVE3y1oLgiNuUyaoSBbSqg2f0cSjozt0KcoFeI7TjWJkR/tlpsZJ+wA0eUn0ya9cJ1pL6oQQHjRheLRW2NdAvECZvsqVlrAbfCB6kHbyg5cWYvdi98bxO+TQtyz2qfV2ttTx52RgCrYUGvDadnRpTn4nm1QA= 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 1683309726596910.0190171898823; Fri, 5 May 2023 11:02:06 -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-434-O1qYOhfVPbi9T6Z9hNTkBQ-1; Fri, 05 May 2023 14:01:59 -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 3990E1C07543; Fri, 5 May 2023 18:01:54 +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 227C1141511D; Fri, 5 May 2023 18:01:54 +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 3A18A1946A4C; Fri, 5 May 2023 18:01:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9B4BD1946A43 for ; Fri, 5 May 2023 18:01:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 811CA2026D25; Fri, 5 May 2023 18:01:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 105942026D16 for ; Fri, 5 May 2023 18:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683309724; 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=egErQcxZVQS34F4dawisik6FyrVE9or8v/0o2ZHODKs=; b=hQT929y9squMhYZ7U7EMdQZA5N7oHD5f27q2eY1avucHQE7l0l7J+b8hnwH9hds74goad7 NQUfocEwsFEpwt6/m1CHJKvwZta9OmYXyAnDJeQnwcVOX9V/k9odSgK+3NU6OMrS3pzP7t MHHHVNxwIw/BcmEq0ZsF3NIpReULJEc= X-MC-Unique: O1qYOhfVPbi9T6Z9hNTkBQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 4/5] meson: Stop looking for QEMU helpers Date: Fri, 5 May 2023 20:01:45 +0200 Message-Id: <20230505180146.551086-5-abologna@redhat.com> In-Reply-To: <20230505180146.551086-1-abologna@redhat.com> References: <20230505180146.551086-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: , 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683309731576100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that we're performing the lookup at runtime, doing it at build time is no longer necessary. Signed-off-by: Andrea Bolognani --- meson.build | 24 ------------------------ src/qemu/qemu_conf.c | 4 ++++ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/meson.build b/meson.build index 24f52113fa..6e65e9eec3 100644 --- a/meson.build +++ b/meson.build @@ -1655,30 +1655,6 @@ if not get_option('driver_qemu').disabled() conf.set_quoted('QEMU_USER', qemu_user) conf.set_quoted('QEMU_GROUP', qemu_group) =20 - qemu_bridge_prog =3D find_program( - 'qemu-bridge-helper', - dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ], - required: false - ) - if qemu_bridge_prog.found() - qemu_bridge_path =3D qemu_bridge_prog.full_path() - else - qemu_bridge_path =3D '/usr/libexec/qemu-bridge-helper' - endif - conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path) - - qemu_pr_prog =3D find_program( - 'qemu-pr-helper', - dirs: [ '/usr/bin', '/usr/libexec' ], - required: false - ) - if qemu_pr_prog.found() - qemu_pr_path =3D qemu_pr_prog.full_path() - else - qemu_pr_path =3D '/usr/bin/qemu-pr-helper' - endif - conf.set_quoted('QEMU_PR_HELPER', qemu_pr_path) - qemu_slirp_prog =3D find_program( 'slirp-helper', dirs: [ '/usr/bin', '/usr/libexec' ], diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index d9460d82e0..c76ae7ac93 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -97,6 +97,10 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig); #endif =20 =20 +#define QEMU_BRIDGE_HELPER "qemu-bridge-helper" +#define QEMU_PR_HELPER "qemu-pr-helper" + + virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged, const char *root) { --=20 2.40.1