From nobody Mon Feb 9 00:55:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571736370; cv=none; d=zoho.com; s=zohoarc; b=MznelEAFegSQAfZtt9VM5MqN2hYDsV7xdoR+QAzjgKWf9FEIuILQ8SDAKlzBlPzyLNx5+FfC+WyhjBQfzmuMQS5XGFxPHu5b1fzvDOt//NJc26FJH2cxfO5JK+veIctVHoMz+JYNdjgfxrnWXxT2ftf3tOfiRwQNlg3pAM24dZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736370; 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=4JEWcf657uSWCEfEnSxvX4dZH5Z0bC9clOgLrZUp9ow=; b=VswybtwnTg8/0VPKsDBEfcm/GZcurIhMk1iTZHenpUdNOdyqj/9yFibKbYteObrNPuYLYBwnFmYYs70NPc3l4uvWRTha9Gvb6OeBPOSos8DasE+T+gIMtqsFoQdF/DlBcS01OTiuluO7C/564EdKkT3M/lT2bHwQFTjKjiUmP30= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571736370809189.36996302992839; Tue, 22 Oct 2019 02:26:10 -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-18-Wqg8d7OYN8yVVlBLC4Qz3Q-1; Tue, 22 Oct 2019 05:26:07 -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 900121800E02; Tue, 22 Oct 2019 09:26:02 +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 643E160856; Tue, 22 Oct 2019 09:26:02 +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 1057E180B76F; Tue, 22 Oct 2019 09:26:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L813Fc002434 for ; Mon, 21 Oct 2019 04:01:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6CD591001B11; Mon, 21 Oct 2019 08:01:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF65E10016EB for ; Mon, 21 Oct 2019 08:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736369; 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=4JEWcf657uSWCEfEnSxvX4dZH5Z0bC9clOgLrZUp9ow=; b=Lf+y+c9jHLn4aiIHTTNHT26po5WILVvgBNJkAqY4iy5WAWPO7nTMM4cCpQZR0BNtoyzTA9 VIQfwcVzhHisacz6ciTUN1Lo8KefJbDbWScUbyXaglSjcduIQSHz7AytNRkll//ABZIHC+ WIabp1KszugNPEQJDagz4OiWVZUzrHQ= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:33 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/25] build: move admin code into admin directory 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-MC-Unique: Wqg8d7OYN8yVVlBLC4Qz3Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There is no need to have the libvirt-admin.so library definition in the src directory. In addition the library uses directly code from admin sub-directory so move the remaining bits there as well. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- docs/Makefile.am | 2 +- docs/apibuild.py | 3 +- m4/virt-win-symbols.m4 | 4 +- po/POTFILES | 2 +- src/Makefile.am | 81 +------------------- src/admin/Makefile.inc.am | 87 +++++++++++++++++++++- src/{ =3D> admin}/libvirt-admin.c | 0 src/{ =3D> admin}/libvirt-admin.conf | 0 src/{ =3D> admin}/libvirt_admin_private.syms | 0 src/{ =3D> admin}/libvirt_admin_public.syms | 0 10 files changed, 95 insertions(+), 84 deletions(-) rename src/{ =3D> admin}/libvirt-admin.c (100%) rename src/{ =3D> admin}/libvirt-admin.conf (100%) rename src/{ =3D> admin}/libvirt_admin_private.syms (100%) rename src/{ =3D> admin}/libvirt_admin_public.syms (100%) diff --git a/docs/Makefile.am b/docs/Makefile.am index 10476902a9..5b2896bbe5 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -315,7 +315,7 @@ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \ $(top_srcdir)/src/libvirt-stream.c \ $(top_srcdir)/src/libvirt-lxc.c \ $(top_srcdir)/src/libvirt-qemu.c \ - $(top_srcdir)/src/libvirt-admin.c \ + $(top_srcdir)/src/admin/libvirt-admin.c \ $(top_srcdir)/src/util/virerror.c \ $(top_srcdir)/src/util/virevent.c \ $(top_srcdir)/src/util/virtypedparam-public.c diff --git a/docs/apibuild.py b/docs/apibuild.py index 4f0d170975..e79ead0b53 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -67,7 +67,7 @@ lxc_included_files =3D { =20 admin_included_files =3D { "libvirt-admin.h": "header with admin specific API definitions", - "libvirt-admin.c": "Implementations for the admin specific APIs", + "admin/libvirt-admin.c": "Implementations for the admin specific APIs", } =20 ignored_words =3D { @@ -2549,6 +2549,7 @@ class app: if not quiet: print("Rebuilding API description for %s" % name) dirs =3D [srcdir + "/../src", + srcdir + "/../src/admin", srcdir + "/../src/util", srcdir + "/../include/libvirt"] if (builddir and diff --git a/m4/virt-win-symbols.m4 b/m4/virt-win-symbols.m4 index 3b2038e6bf..66dd3b7b1c 100644 --- a/m4/virt-win-symbols.m4 +++ b/m4/virt-win-symbols.m4 @@ -19,7 +19,7 @@ dnl =20 AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ LIBVIRT_SYMBOL_FILE=3Dlibvirt.syms - LIBVIRT_ADMIN_SYMBOL_FILE=3Dlibvirt_admin.syms + LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.syms LIBVIRT_LXC_SYMBOL_FILE=3D'$(srcdir)/libvirt_lxc.syms' LIBVIRT_QEMU_SYMBOL_FILE=3D'$(srcdir)/libvirt_qemu.syms' case "$host" in @@ -28,7 +28,7 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ # from libvirt.syms and passes libvirt.def instead of libvirt.syms t= o the # linker LIBVIRT_SYMBOL_FILE=3Dlibvirt.def - LIBVIRT_ADMIN_SYMBOL_FILE=3Dlibvirt_admin.def + LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.def LIBVIRT_LXC_SYMBOL_FILE=3Dlibvirt_lxc.def LIBVIRT_QEMU_SYMBOL_FILE=3Dlibvirt_qemu.def ;; diff --git a/po/POTFILES b/po/POTFILES index 8a6df49eeb..8e863dfbea 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -5,6 +5,7 @@ src/access/viraccessmanager.c src/admin/admin_server.c src/admin/admin_server_dispatch.c src/admin/admin_server_dispatch_stubs.h +src/admin/libvirt-admin.c src/bhyve/bhyve_capabilities.c src/bhyve/bhyve_command.c src/bhyve/bhyve_device.c @@ -68,7 +69,6 @@ src/hyperv/hyperv_wmi.c src/interface/interface_backend_netcf.c src/interface/interface_backend_udev.c src/internal.h -src/libvirt-admin.c src/libvirt-domain-checkpoint.c src/libvirt-domain-snapshot.c src/libvirt-domain.c diff --git a/src/Makefile.am b/src/Makefile.am index 937f5216da..56b1ed48cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,6 +65,7 @@ MAINTAINERCLEANFILES =3D nodist_conf_DATA =3D DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D +lib_LTLIBRARIES =3D noinst_LTLIBRARIES =3D mod_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D @@ -145,12 +146,12 @@ SECDRIVER_LIBS +=3D $(APPARMOR_LIBS) endif WITH_SECDRIVER_APPARMOR =20 =20 -lib_LTLIBRARIES =3D libvirt.la libvirt-qemu.la libvirt-lxc.la +lib_LTLIBRARIES +=3D libvirt.la libvirt-qemu.la libvirt-lxc.la =20 moddir =3D $(libdir)/libvirt/connection-driver =20 confdir =3D $(sysconfdir)/libvirt -conf_DATA +=3D libvirt.conf libvirt-admin.conf +conf_DATA +=3D libvirt.conf =20 CLEANFILES +=3D $(nodist_conf_DATA) BUILT_SOURCES +=3D $(nodist_conf_DATA) @@ -276,19 +277,12 @@ if WITH_LINUX check-symfile: libvirt.syms libvirt.la $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \ .libs/libvirt.so -check-admin-symfile: libvirt_admin.syms libvirt-admin.la - $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt_admin.syms \ - .libs/libvirt-admin.so else ! WITH_LINUX check-symfile: -check-admin-symfile: endif ! WITH_LINUX check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ $(srcdir) $(SYM_FILES) -check-admin-symsorting: - $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ - $(srcdir) $(ADMIN_SYM_FILES) EXTRA_DIST +=3D check-symfile.pl check-symsorting.pl =20 # Keep this list synced with RPC_PROBE_FILES @@ -339,7 +333,6 @@ check-drivername: $(AM_V_GEN)$(PERL) $(srcdir)/check-drivername.pl \ $(srcdir)/driver.h \ $(srcdir)/libvirt_public.syms \ - $(srcdir)/libvirt_admin_public.syms \ $(srcdir)/libvirt_qemu.syms \ $(srcdir)/libvirt_lxc.syms =20 @@ -366,7 +359,7 @@ EXTRA_DIST +=3D check-driverimpls.pl check-aclrules.pl = check-aclperms.pl =20 check-local: check-protocol check-symfile check-symsorting \ check-drivername check-driverimpls check-aclrules \ - check-aclperms check-admin-symfile check-admin-symsorting + check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 =20 @@ -393,7 +386,6 @@ SYM_FILES +=3D $(USED_SYM_FILES) USED_SYM_FILES +=3D $(srcdir)/libvirt_private.syms GENERATED_SYM_FILES +=3D \ libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def \ - libvirt_admin.syms libvirt_admin.def \ $(NULL) =20 =20 @@ -480,9 +472,7 @@ EXTRA_DIST +=3D \ libvirt_public.syms \ libvirt_lxc.syms \ libvirt_qemu.syms \ - libvirt_admin_public.syms \ $(SYM_FILES) \ - $(ADMIN_SYM_FILES) \ $(NULL) =20 BUILT_SOURCES +=3D $(GENERATED_SYM_FILES) @@ -509,69 +499,6 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \ chmod a-w $@-tmp && \ mv $@-tmp $@ =20 -libvirt_admin.syms: libvirt_admin_public.syms $(ADMIN_SYM_FILES) \ - $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-tmp $@ ; \ - printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp && \ - cat $(srcdir)/libvirt_admin_public.syms >>$@-tmp && \ - printf '\n\n# Private symbols\n\n' >>$@-tmp && \ - printf 'LIBVIRT_ADMIN_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \ - printf 'global:\n\n' >>$@-tmp && \ - cat $(ADMIN_SYM_FILES) >>$@-tmp && \ - printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \ - chmod a-w $@-tmp && \ - mv $@-tmp libvirt_admin.syms - - -lib_LTLIBRARIES +=3D libvirt-admin.la -libvirt_admin_la_SOURCES =3D \ - libvirt-admin.c \ - $(ADMIN_PROTOCOL_GENERATED) \ - $(DATATYPES_SOURCES) - -libvirt_admin_la_LDFLAGS =3D \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_ADMIN_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(LIBVIRT_NODELETE) \ - $(AM_LDFLAGS) \ - $(NULL) - -libvirt_admin_la_LIBADD =3D \ - libvirt.la \ - $(CYGWIN_EXTRA_LIBADD) - -libvirt_admin_la_CFLAGS =3D \ - $(AM_CFLAGS) \ - -I$(srcdir)/remote \ - -I$(srcdir)/rpc \ - -I$(srcdir)/admin - -libvirt_admin_la_CFLAGS +=3D \ - $(XDR_CFLAGS) \ - $(CAPNG_CFLAGS) \ - $(YAJL_CFLAGS) \ - $(SSH2_CFLAGS) \ - $(SASL_CFLAGS) \ - $(GNUTLS_CFLAGS) \ - $(LIBSSH_CFLAGS) - -libvirt_admin_la_LIBADD +=3D \ - $(CAPNG_LIBS) \ - $(YAJL_LIBS) \ - $(DEVMAPPER_LIBS) \ - $(LIBXML_LIBS) \ - $(GLIB_LIBS) \ - $(SSH2_LIBS) \ - $(SASL_LIBS) \ - $(GNUTLS_LIBS) \ - $(LIBSSH_LIBS) - -ADMIN_SYM_FILES =3D $(srcdir)/libvirt_admin_private.syms - -if WITH_DTRACE_PROBES -libvirt_admin_la_LIBADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES =3D libvirt_la_LDFLAGS =3D \ diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 4cc588a47c..4fd7878e5c 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -40,10 +40,80 @@ libvirt_driver_admin_la_CFLAGS +=3D \ $(NULL) endif WITH_SASL =20 -# admin/admin_remote.c is being included in libvirt-admin.c, so we +GENERATED_SYM_FILES +=3D admin/libvirt_admin.syms admin/libvirt_admin.def + +ADMIN_SYM_FILES =3D $(srcdir)/admin/libvirt_admin_private.syms + +# admin/admin_remote.c is being included in admin/libvirt-admin.c, so we # need to include it in the dist -EXTRA_DIST +=3D admin/admin_remote.c +EXTRA_DIST +=3D \ + admin/admin_remote.c \ + admin/libvirt_admin_public.syms \ + $(ADMIN_SYM_FILES) \ + $(NULL) =20 +conf_DATA +=3D admin/libvirt-admin.conf + +lib_LTLIBRARIES +=3D libvirt-admin.la + +libvirt_admin_la_SOURCES =3D \ + admin/libvirt-admin.c \ + $(ADMIN_PROTOCOL_GENERATED) \ + $(DATATYPES_SOURCES) + +libvirt_admin_la_LDFLAGS =3D \ + $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_ADMIN_SYMBOL_FILE) \ + -version-info $(LIBVIRT_VERSION_INFO) \ + $(LIBVIRT_NODELETE) \ + $(AM_LDFLAGS) \ + $(NULL) + +libvirt_admin_la_LIBADD =3D \ + libvirt.la \ + $(CYGWIN_EXTRA_LIBADD) \ + $(CAPNG_LIBS) \ + $(YAJL_LIBS) \ + $(DEVMAPPER_LIBS) \ + $(LIBXML_LIBS) \ + $(GLIB_LIBS) \ + $(SSH2_LIBS) \ + $(SASL_LIBS) \ + $(GNUTLS_LIBS) \ + $(LIBSSH_LIBS) + +if WITH_DTRACE_PROBES +libvirt_admin_la_LIBADD +=3D libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirt_admin_la_CFLAGS =3D \ + $(AM_CFLAGS) \ + -I$(srcdir)/remote \ + -I$(srcdir)/rpc \ + $(XDR_CFLAGS) \ + $(CAPNG_CFLAGS) \ + $(YAJL_CFLAGS) \ + $(SSH2_CFLAGS) \ + $(SASL_CFLAGS) \ + $(GNUTLS_CFLAGS) \ + $(LIBSSH_CFLAGS) + +if WITH_LINUX +check-admin-symfile: admin/libvirt_admin.syms libvirt-admin.la + $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl admin/libvirt_admin.syms \ + .libs/libvirt-admin.so +else ! WITH_LINUX +check-admin-symfile: +endif ! WITH_LINUX + +check-admin-symsorting: + $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ + $(srcdir) $(ADMIN_SYM_FILES) + +check-admin-drivername: + $(AM_V_GEN)$(PERL) $(srcdir)/check-drivername.pl \ + $(srcdir)/admin/libvirt_admin_public.syms + +check-admin: check-admin-symfile check-admin-symsorting check-admin-driver= name =20 admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ $(ADMIN_PROTOCOL) Makefile.am @@ -56,3 +126,16 @@ admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gend= ispatch.pl \ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ admin ADMIN $(ADMIN_PROTOCOL) \ > $(srcdir)/admin/admin_server_dispatch_stubs.h + +admin/libvirt_admin.syms: admin/libvirt_admin_public.syms $(ADMIN_SYM_FILE= S) \ + $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-tmp $@ ; \ + printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp && \ + cat $(srcdir)/admin/libvirt_admin_public.syms >>$@-tmp && \ + printf '\n\n# Private symbols\n\n' >>$@-tmp && \ + printf 'LIBVIRT_ADMIN_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \ + printf 'global:\n\n' >>$@-tmp && \ + cat $(ADMIN_SYM_FILES) >>$@-tmp && \ + printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \ + chmod a-w $@-tmp && \ + mv $@-tmp admin/libvirt_admin.syms diff --git a/src/libvirt-admin.c b/src/admin/libvirt-admin.c similarity index 100% rename from src/libvirt-admin.c rename to src/admin/libvirt-admin.c diff --git a/src/libvirt-admin.conf b/src/admin/libvirt-admin.conf similarity index 100% rename from src/libvirt-admin.conf rename to src/admin/libvirt-admin.conf diff --git a/src/libvirt_admin_private.syms b/src/admin/libvirt_admin_priva= te.syms similarity index 100% rename from src/libvirt_admin_private.syms rename to src/admin/libvirt_admin_private.syms diff --git a/src/libvirt_admin_public.syms b/src/admin/libvirt_admin_public= .syms similarity index 100% rename from src/libvirt_admin_public.syms rename to src/admin/libvirt_admin_public.syms --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list