From nobody Sun Feb 8 11:22:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594895385; cv=none; d=zohomail.com; s=zohoarc; b=HeZpGjGq0r5xyr4VIWKfGUd2M8Z/kY0bO2hopztGec8lz2iUC2aarL1RIE7cmpmKZXtMGsip12jMNYkmheD04MPAN1RHJ5jZm4KstLl0gXFtDrfVu5qGq7MyACSUMQoQkNTcvW0EP1UiyX8ZLNZ5ObsCgek5u+NgKOx9ocUgQME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895385; 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=5H0jBuK06wSJiUo8dz+CxxAA+ig+5W3NWGjsEojVkjM=; b=ecwtmdK42r3j/ZaoFLjDuJOtwwamLSpDC53tR+53BNXInss8gn24OPnvn4LeryCwileVP35BZ0hPyWFp+i6mueTzzDjNw2k0HZMhSnVS6JFt/u71sdiOawYavZQFeJCXBYhHeP2giraG9qPnlqBPZUCWPvuMWovH41kbu7/LCQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 15948953852741018.775267184482; Thu, 16 Jul 2020 03:29:45 -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-511-CRQodcbJNm6lAnWM1XwOIw-1; Thu, 16 Jul 2020 06:08:15 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 265D480BCBA; Thu, 16 Jul 2020 10:08:10 +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 05C805D9DC; Thu, 16 Jul 2020 10:08:10 +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 C6DD5180476F; Thu, 16 Jul 2020 10:08:09 +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 06GA4I65017809 for ; Thu, 16 Jul 2020 06:04:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0A16B2DE73; Thu, 16 Jul 2020 10:04:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 792A82DE72 for ; Thu, 16 Jul 2020 10:04:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895384; 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=5H0jBuK06wSJiUo8dz+CxxAA+ig+5W3NWGjsEojVkjM=; b=Fgjqy6GpqAcQxXB9wt3fipe7P1mIHO2EBBjtwphWy6zho8g+vFFbHnNzHHUZxNIc8HSL/k 8c8K2P8gPA0FjRA8t3P9oS+Nia9+qwv8fFnLKuOoIRzmmmoqDAmLdX48Eqd+ekgPz3l0AF MUNQ5q7LCmKO0zFOiEkJ/uLa0ejofxs= X-MC-Unique: CRQodcbJNm6lAnWM1XwOIw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 166/351] meson: src: build libvirt_driver_vbox_impl.a static library Date: Thu, 16 Jul 2020 11:56:42 +0200 Message-Id: <4feeb46612803ee268ce3e937bb57370d03ce9d4.1594891445.git.phrdina@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.14 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 --- src/meson.build | 1 + src/vbox/Makefile.inc.am | 34 ---------------------------------- src/vbox/meson.build | 31 +++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 34 deletions(-) create mode 100644 src/vbox/meson.build diff --git a/src/meson.build b/src/meson.build index aac5a256b07..87d1410b218 100644 --- a/src/meson.build +++ b/src/meson.build @@ -157,6 +157,7 @@ subdir('lxc') subdir('openvz') subdir('qemu') subdir('test') +subdir('vbox') subdir('vmware') =20 =20 diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 8acbdc84609..19ffff223b1 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -1,26 +1,5 @@ # vim: filetype=3Dautomake =20 -VBOX_DRIVER_SOURCES =3D \ - vbox/vbox_driver.c \ - vbox/vbox_driver.h \ - vbox/vbox_snapshot_conf.c \ - vbox/vbox_snapshot_conf.h \ - vbox/vbox_V5_2.c \ - vbox/vbox_CAPI_v5_2.h \ - vbox/vbox_CAPI_v6_0.h \ - vbox/vbox_V6_0.c \ - vbox/vbox_CAPI_v6_1.h \ - vbox/vbox_V6_1.c \ - vbox/vbox_common.c \ - vbox/vbox_common.h \ - vbox/vbox_uniformed_api.h \ - vbox/vbox_get_driver.h \ - vbox/vbox_network.c \ - vbox/vbox_storage.c \ - vbox/vbox_XPCOMCGlue.c \ - vbox/vbox_XPCOMCGlue.h \ - $(NULL) - DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ $(srcdir)/vbox/vbox_tmpl.c \ @@ -37,19 +16,6 @@ libvirt_driver_vbox_la_LIBADD =3D \ mod_LTLIBRARIES +=3D libvirt_driver_vbox.la libvirt_driver_vbox_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) =20 -libvirt_driver_vbox_impl_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - -DVBOX_DRIVER \ - $(NULL) -libvirt_driver_vbox_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_vbox_impl_la_LIBADD =3D \ - $(DLOPEN_LIBS) \ - $(WIN32_EXTRA_LIBS) \ - $(LIBXML_LIBS) \ - $(NULL) -libvirt_driver_vbox_impl_la_SOURCES =3D $(VBOX_DRIVER_SOURCES) - sbin_PROGRAMS +=3D virtvboxd =20 nodist_conf_DATA +=3D vbox/virtvboxd.conf diff --git a/src/vbox/meson.build b/src/vbox/meson.build new file mode 100644 index 00000000000..c27f9418249 --- /dev/null +++ b/src/vbox/meson.build @@ -0,0 +1,31 @@ +vbox_driver_sources =3D [ + 'vbox_V5_2.c', + 'vbox_V6_0.c', + 'vbox_V6_1.c', + 'vbox_common.c', + 'vbox_driver.c', + 'vbox_network.c', + 'vbox_snapshot_conf.c', + 'vbox_storage.c', + 'vbox_XPCOMCGlue.c', +] + +if conf.has('WITH_VBOX') + vbox_driver_impl =3D static_library( + 'virt_driver_vbox_impl', + [ + vbox_driver_sources, + ], + c_args: [ + '-DVBOX_DRIVER', + ], + dependencies: [ + dlopen_dep, + src_dep, + win32_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2