From nobody Sun Feb 8 19:21:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1594895403; cv=none; d=zohomail.com; s=zohoarc; b=TBVOx2QNNxzIKIgXV1pveXJ8S+5NFW0YB8+btLhw6iHvlvAEJWencwXypwnvSBHWV1hq/7WoPO3Gpfe5b+JsKffD72RNZeetwmoZYVdsmgC90izx+8C/6EJgJ+nrawpi67XEXsYe8zkNWI4Qq25lK1vWLsZ7lcRUZPc2tjqixAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895403; 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=tJV4Pov6qrs1VjU2RH9mKWlpSy7wun8+4ry0ELOH9cs=; b=WGFhDmYLJPpq1DlRx4QbL/rvd18oOuS/YUjzaTQ7Glsece6OV38GYZzbMh1VtZihWTPM215WGCQ1HNAa1tp90IGsyebT7uE2VufRIKfvORyX44zQN3xE032UIKLgpMQvVVbhwRKd2tWzJjkJdhMgNMjvjXFBfy4shXntoTk/LQs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594895403780512.2957853466436; Thu, 16 Jul 2020 03:30: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-300-BdmKCgRgNwKtOdwqV2nNzQ-1; Thu, 16 Jul 2020 06:03:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE889101A52C; Thu, 16 Jul 2020 10:02:56 +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 8D1FF79D1F; Thu, 16 Jul 2020 10:02:56 +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 4CABD1809557; Thu, 16 Jul 2020 10:02:56 +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 06GA2mYe016710 for ; Thu, 16 Jul 2020 06:02:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id DB32E2DE6B; Thu, 16 Jul 2020 10:02:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C6202B6E2 for ; Thu, 16 Jul 2020 10:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895402; 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=tJV4Pov6qrs1VjU2RH9mKWlpSy7wun8+4ry0ELOH9cs=; b=aIn3tKjDT75OXTFKWClWWCJKyuB4a5TxV8aZxVs6gXJWxGvLbBgHkpjbTI00oRuhYN5T+V BX67uZFpGw7NPIeIAa1t3cDcre4UfQJHK/qKGDBlB5d07B5fRpE67Gz/pIf5ZJmtVwZQKl pb3N/X6HQA35e0M7nw205vgSOC4n72A= X-MC-Unique: BdmKCgRgNwKtOdwqV2nNzQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 090/351] meson: add vbox driver build options Date: Thu, 16 Jul 2020 11:55:26 +0200 Message-Id: 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.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- configure.ac | 8 -------- m4/virt-driver-vbox.m4 | 44 ------------------------------------------ meson.build | 6 ++++++ meson_options.txt | 2 ++ 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 m4/virt-driver-vbox.m4 diff --git a/configure.ac b/configure.ac index ab1b2145756..c0a6da1f3c6 100644 --- a/configure.ac +++ b/configure.ac @@ -83,11 +83,6 @@ AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "ye= s"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes"]) =20 -# Stateful drivers are useful only when building the daemon. -if test "$with_libvirtd" =3D "no" ; then - with_vbox=3Dno -fi - # Check for compiler and library settings. =20 LIBVIRT_ARG_NSS @@ -103,13 +98,11 @@ dnl Virtualization drivers check dnl =20 LIBVIRT_DRIVER_ARG_VMWARE -LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 LIBVIRT_DRIVER_CHECK_VMWARE -LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_VZ LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -307,7 +300,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) LIBVIRT_DRIVER_RESULT_VMWARE -LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE diff --git a/m4/virt-driver-vbox.m4 b/m4/virt-driver-vbox.m4 deleted file mode 100644 index 589b1c3ed5e..00000000000 --- a/m4/virt-driver-vbox.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl The VirtualBox driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_VBOX], [ - LIBVIRT_ARG_WITH_FEATURE([VBOX], [VirtualBox XPCOMC], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_VBOX], [ - vbox_xpcomc_dir=3D - - if test "x$with_vbox" !=3D "xyes" && test "x$with_vbox" !=3D "xno"; then - # intentionally don't do any further checks here on the provided path - vbox_xpcomc_dir=3D$with_vbox - with_vbox=3Dyes - fi - - AC_DEFINE_UNQUOTED([VBOX_XPCOMC_DIR], ["$vbox_xpcomc_dir"], - [Location of directory containing VirtualBox XPCOMC l= ibrary]) - - if test "x$with_vbox" =3D "xyes"; then - AC_DEFINE_UNQUOTED([WITH_VBOX], 1, [whether VirtualBox driver is enabl= ed]) - fi - AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_VBOX], [ - LIBVIRT_RESULT([VBox], [$with_vbox]) -]) diff --git a/meson.build b/meson.build index 6a32554bb41..3309032face 100644 --- a/meson.build +++ b/meson.build @@ -1808,6 +1808,11 @@ if get_option('driver_test').enabled() conf.set('WITH_TEST', 1) endif =20 +if not get_option('driver_vbox').disabled() and conf.has('WITH_LIBVIRTD') + conf.set('WITH_VBOX', 1) + conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir')) +endif + =20 # define top include directory =20 @@ -1830,6 +1835,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) driver_summary =3D { 'QEMU': conf.has('WITH_QEMU'), 'OpenVZ': conf.has('WITH_OPENVZ'), + 'VBox': conf.has('WITH_VBOX'), 'libxl': conf.has('WITH_LIBXL'), 'LXC': conf.has('WITH_LXC'), 'ESX': conf.has('WITH_ESX'), diff --git a/meson_options.txt b/meson_options.txt index f9f9e3f79fe..4ea5555a914 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -60,3 +60,5 @@ option('qemu_group', type: 'string', value: '', descripti= on: 'groupname to run Q option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') option('driver_test', type: 'feature', value: 'enabled', description: 'tes= t driver') +option('driver_vbox', type: 'feature', value: 'enabled', description: 'Vir= tualBox XPCOMC driver') +option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Locatio= n of directory containing VirtualBox XPCOMC library') --=20 2.26.2