From nobody Fri May 3 13:57:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; arc=fail (BodyHash is different from the expected one) Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566590274663437.0647452362185; Fri, 23 Aug 2019 12:57:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2D79B308427D; Fri, 23 Aug 2019 19:57:53 +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 B0D82600C4; Fri, 23 Aug 2019 19:57:52 +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 09207180B536; Fri, 23 Aug 2019 19:57:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7NJvoEv014107 for ; Fri, 23 Aug 2019 15:57:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id C69AE18671; Fri, 23 Aug 2019 19:57:50 +0000 (UTC) Received: from mx1.redhat.com (ext-mx25.extmail.prod.ext.phx2.redhat.com [10.5.110.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C01845D9E5 for ; Fri, 23 Aug 2019 19:57:48 +0000 (UTC) Received: from m4a0040g.houston.softwaregrp.com (m4a0040g.houston.softwaregrp.com [15.124.2.86]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CD1E81027008 for ; Fri, 23 Aug 2019 19:57:42 +0000 (UTC) Received: FROM m4a0040g.houston.softwaregrp.com (15.120.17.147) BY m4a0040g.houston.softwaregrp.com WITH ESMTP FOR libvir-list@redhat.com; Fri, 23 Aug 2019 19:55:51 +0000 Received: from M4W0334.microfocus.com (2002:f78:1192::f78:1192) by M4W0335.microfocus.com (2002:f78:1193::f78:1193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Fri, 23 Aug 2019 19:50:14 +0000 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (15.124.8.10) by M4W0334.microfocus.com (15.120.17.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Fri, 23 Aug 2019 19:50:14 +0000 Received: from BY5PR18MB3315.namprd18.prod.outlook.com (10.255.139.204) by BY5PR18MB3314.namprd18.prod.outlook.com (10.255.138.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.18; Fri, 23 Aug 2019 19:50:12 +0000 Received: from BY5PR18MB3315.namprd18.prod.outlook.com ([fe80::4408:ba97:cbe0:616a]) by BY5PR18MB3315.namprd18.prod.outlook.com ([fe80::4408:ba97:cbe0:616a%6]) with mapi id 15.20.2178.020; Fri, 23 Aug 2019 19:50:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YRWv5ghWOjx/XqJ6NBM46pgy1qYNIxkpgtoX4utIaz/yHfcf82JUd80GtksuGaHD0mpKc9gOxz1pGc+mbCJQDHg5Bd0LZ5+sgk+VYY3TP8fr/PDDQJPGibZ7ic6pI4QZPzGHAPeWIg+Lb9+e38ni05SD+ZnIO6akZpi75wB25RjqU9zPqjBLTXk7X18mz6Cp0A4szG1U1peXFfengSJh1lZX/INWzuUme7TYu8h8wY467O3DTnxzKfkdNEPJgjKMCuPGc4aeOKKykevz5nxy7yFxLHycrSMfmZrMjdsB7Yygfwbup5+p+ATsLMEfBUzCiLPe7Xqtrq/Y1BnMBEyPNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qZfQeBg/y5SOp8R4J1UqSYDmLQbW7qIbCBplYBfokMk=; b=KiFFBxs4aKtf/VkUKUsCNRbjcsyRbRsHPzZVRQ3g0qBcXgkNBY8MXwvBt/FoW4UBK+JnQNa5p4v1VKYCxzjE2vL2XxHTKy7OKGAAkCsO8g4f3hXsJUJSftA7OPRUuSkRYXGt29RDqUykGlbanRM5BWCIqJAemjNQIq1XO7QfCN8Z+7qhJ+UCDyQcy0MpnQF8TOVApdrEgCbXQWDioC4FwCaolXA7Lk3o37o4l4g4MJPy7oKfAKMuzp3eZPQfHylsL8thJ9UotjAlal4P+KXejbQw3J2RUqko6KmUlgVPsOttPrqbIBKFCWoV8hcXlHmfmcAHj8sanWXwic6a752kxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none From: Jim Fehlig To: "libvir-list@redhat.com" Thread-Topic: [PATCH] xenconfig: move contents to libxl driver and remove directory Thread-Index: AQHVWev6V8uXQ2wV80yUpfLerhDmGw== Date: Fri, 23 Aug 2019 19:50:12 +0000 Message-ID: <20190823194951.24421-1-jfehlig@suse.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR07CA0091.namprd07.prod.outlook.com (2603:10b6:a03:12b::32) To BY5PR18MB3315.namprd18.prod.outlook.com (2603:10b6:a03:196::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=JFEHLIG@suse.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [192.150.157.152] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7c8101b9-e643-4c37-761e-08d728031c36 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:BY5PR18MB3314; x-ms-traffictypediagnostic: BY5PR18MB3314: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:747; x-forefront-prvs: 0138CD935C x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(396003)(39860400002)(376002)(136003)(366004)(346002)(189003)(199004)(66556008)(1076003)(99286004)(5640700003)(26005)(478600001)(5660300002)(2906002)(6512007)(102836004)(386003)(6506007)(6916009)(25786009)(6436002)(6486002)(36756003)(256004)(4326008)(14444005)(66446008)(52116002)(66946007)(2351001)(86362001)(66066001)(316002)(8676002)(81166006)(50226002)(8936002)(14454004)(2501003)(2616005)(476003)(486006)(305945005)(53936002)(71190400001)(71200400001)(186003)(7736002)(6116002)(66476007)(3846002)(81156014)(107886003)(64756008); DIR:OUT; SFP:1102; SCL:1; SRVR:BY5PR18MB3314; H:BY5PR18MB3315.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; received-spf: None (protection.outlook.com: suse.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: oz/8FrDHRCo2IjMU/M3/Q3SRnmFTrR49LoM0SzMjneOn762C+4cO41I0GUAUYcpfbzLwnTj/VCExN0pbQxzhIHek+adzl44L6r81Nc7ly7TCYI9sHOtYH4/qDQN8bKI+ncVi4NA/r5ZdhXOKTIcI0CsITvuEsb5ck6AX6v4E514KIIYLuVhGSl4LWkJKLPSRYNgE+I6N1rGd5vwfc3IeFpNgIpCMafkSpYo/qh1hLTIeP4JLGaZxJQHh6+glXFGVA1cincEzf1GMC7T5QD5LJgfgnGqZIVc8Vdf0QHHRVT1kAxAUtgOyTTdrwsiuQ8ToGJYE2EuOsDebAO4uIeyeHdV2qydXb1mXBjKTZhaGJShtd4z4w5Mamps5EGXNEWYlW8H7lJznlntkn7Vqb3Yr5f7hiqrPYq4BmnX+tpwLPtI= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 7c8101b9-e643-4c37-761e-08d728031c36 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Aug 2019 19:50:12.6384 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: slEjPVT60FyToDMA7t4i38FaY4ql+eLsHZUMUJCz9+wrb9CicbcuSswn/RK4syMl0wqIVmSPy9maxIvyKnE7qg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR18MB3314 X-OriginatorOrg: suse.com X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 238 matched, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Fri, 23 Aug 2019 19:57:44 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Fri, 23 Aug 2019 19:57:44 +0000 (UTC) for IP:'15.124.2.86' DOMAIN:'m4a0040g.houston.softwaregrp.com' HELO:'m4a0040g.houston.softwaregrp.com' FROM:'JFEHLIG@suse.com' RCPT:'' X-RedHat-Spam-Score: 0.001 (RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, UNPARSEABLE_RELAY) 15.124.2.86 m4a0040g.houston.softwaregrp.com 15.124.2.86 m4a0040g.houston.softwaregrp.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.66 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id x7NJvoEv014107 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] xenconfig: move contents to libxl driver and remove 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 23 Aug 2019 19:57:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jim Fehlig Reviewed-by: J=C3=A1n Tomko --- cfg.mk | 2 +- configure.ac | 2 -- po/POTFILES | 6 ++--- src/Makefile.am | 1 - src/libvirt_xenconfig.syms | 12 ---------- src/libxl/Makefile.inc.am | 25 ++++++--------------- src/{xenconfig =3D> libxl}/xen_common.c | 0 src/{xenconfig =3D> libxl}/xen_common.h | 0 src/{xenconfig =3D> libxl}/xen_xl.c | 0 src/{xenconfig =3D> libxl}/xen_xl.h | 0 src/{xenconfig =3D> libxl}/xen_xm.c | 0 src/{xenconfig =3D> libxl}/xen_xm.h | 0 src/{xenconfig =3D> libxl}/xenxs_private.h | 0 src/xenconfig/Makefile.inc.am | 28 ------------------------ tests/xlconfigtest.c | 2 +- tests/xmconfigtest.c | 2 +- 16 files changed, 13 insertions(+), 67 deletions(-) diff --git a/cfg.mk b/cfg.mk index c459ad443f..1f29729949 100644 --- a/cfg.mk +++ b/cfg.mk @@ -791,7 +791,7 @@ sc_prohibit_cross_inclusion: access/ | conf/) safe=3D"($$dir|conf|util)";; \ cpu/| network/| node_device/| rpc/| security/| storage/) \ safe=3D"($$dir|util|conf|storage)";; \ - xenapi/ | xenconfig/ ) safe=3D"($$dir|util|conf|xen|cpu)";; \ + xenapi/) safe=3D"($$dir|util|conf|xen|cpu)";; \ *) safe=3D"($$dir|$(mid_dirs)|util)";; \ esac; \ in_vc_files=3D"^src/$$dir" \ diff --git a/configure.ac b/configure.ac index a60543072d..890702a89d 100644 --- a/configure.ac +++ b/configure.ac @@ -465,8 +465,6 @@ LIBVIRT_DRIVER_CHECK_LIBVIRTD LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE =20 -AM_CONDITIONAL([WITH_XENCONFIG], [test "$with_libxl" =3D "yes"]) - =20 dnl dnl in case someone want to build static binaries diff --git a/po/POTFILES b/po/POTFILES index c62bc32bb2..e466e1bc55 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -88,6 +88,9 @@ src/libxl/libxl_conf.c src/libxl/libxl_domain.c src/libxl/libxl_driver.c src/libxl/libxl_migration.c +src/libxl/xen_common.c +src/libxl/xen_xl.c +src/libxl/xen_xm.c src/locking/lock_daemon.c src/locking/lock_daemon_dispatch.c src/locking/lock_driver_lockd.c @@ -291,9 +294,6 @@ src/vz/vz_utils.c src/vz/vz_utils.h src/xenapi/xenapi_driver.c src/xenapi/xenapi_utils.c -src/xenconfig/xen_common.c -src/xenconfig/xen_xl.c -src/xenconfig/xen_xm.c tests/virpolkittest.c tools/libvirt-guests.sh.in tools/virsh-checkpoint.c diff --git a/src/Makefile.am b/src/Makefile.am index adaf61350a..6626659113 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -118,7 +118,6 @@ include vbox/Makefile.inc.am include openvz/Makefile.inc.am include qemu/Makefile.inc.am include bhyve/Makefile.inc.am -include xenconfig/Makefile.inc.am include libxl/Makefile.inc.am include xenapi/Makefile.inc.am include vz/Makefile.inc.am diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms deleted file mode 100644 index 6e2e578b15..0000000000 --- a/src/libvirt_xenconfig.syms +++ /dev/null @@ -1,12 +0,0 @@ -# -# These symbols are dependent upon --with-xen via WITH_XEN or --with-libxl= via WITH_LIBXL. -# - -# xenconfig/xen_xm.h -xenFormatXM; -xenParseXM; - -# Let emacs know we want case-insensitive sorting -# Local Variables: -# sort-fold-case: t -# End: diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 1587404586..560b214877 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -1,6 +1,13 @@ # vim: filetype=3Dautomake =20 LIBXL_DRIVER_SOURCES =3D \ + libxl/xenxs_private.h \ + libxl/xen_common.c \ + libxl/xen_common.h \ + libxl/xen_xl.c \ + libxl/xen_xl.h \ + libxl/xen_xm.c \ + libxl/xen_xm.h \ libxl/libxl_conf.c \ libxl/libxl_conf.h \ libxl/libxl_capabilities.c \ @@ -15,29 +22,13 @@ LIBXL_DRIVER_SOURCES =3D \ libxl/libxl_migration.h \ $(NULL) =20 -XENCONFIG_LIBXL_SOURCES =3D \ - $(XENCONFIG_SOURCES) \ - xenconfig/xen_xl.c \ - xenconfig/xen_xl.h \ - $(NULL) - DRIVER_SOURCE_FILES +=3D $(LIBXL_DRIVER_SOURCES) STATEFUL_DRIVER_SOURCE_FILES +=3D $(LIBXL_DRIVER_SOURCES) EXTRA_DIST +=3D \ $(LIBXL_DRIVER_SOURCES) \ - $(XENCONFIG_LIBXL_SOURCES) \ $(NULL) =20 if WITH_LIBXL -noinst_LTLIBRARIES +=3D libvirt_xenconfig_libxl.la -libvirt_xenconfig_libxl_la_LIBADD =3D $(LIBXL_LIBS) -libvirt_xenconfig_libxl_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(srcdir)/libxl \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_xenconfig_libxl_la_SOURCES =3D $(XENCONFIG_LIBXL_SOURCES) - noinst_LTLIBRARIES +=3D libvirt_driver_libxl_impl.la libvirt_driver_libxl_la_SOURCES =3D libvirt_driver_libxl_la_LIBADD =3D \ @@ -54,14 +45,12 @@ libvirt_driver_libxl_impl_la_CFLAGS =3D \ -I$(srcdir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ - -I$(srcdir)/xenconfig \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_libxl_impl_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_driver_libxl_impl_la_LIBADD =3D \ $(LIBXL_LIBS) \ $(LIBXML_LIBS) \ - libvirt_xenconfig_libxl.la \ $(NULL) libvirt_driver_libxl_impl_la_SOURCES =3D $(LIBXL_DRIVER_SOURCES) =20 diff --git a/src/xenconfig/xen_common.c b/src/libxl/xen_common.c similarity index 100% rename from src/xenconfig/xen_common.c rename to src/libxl/xen_common.c diff --git a/src/xenconfig/xen_common.h b/src/libxl/xen_common.h similarity index 100% rename from src/xenconfig/xen_common.h rename to src/libxl/xen_common.h diff --git a/src/xenconfig/xen_xl.c b/src/libxl/xen_xl.c similarity index 100% rename from src/xenconfig/xen_xl.c rename to src/libxl/xen_xl.c diff --git a/src/xenconfig/xen_xl.h b/src/libxl/xen_xl.h similarity index 100% rename from src/xenconfig/xen_xl.h rename to src/libxl/xen_xl.h diff --git a/src/xenconfig/xen_xm.c b/src/libxl/xen_xm.c similarity index 100% rename from src/xenconfig/xen_xm.c rename to src/libxl/xen_xm.c diff --git a/src/xenconfig/xen_xm.h b/src/libxl/xen_xm.h similarity index 100% rename from src/xenconfig/xen_xm.h rename to src/libxl/xen_xm.h diff --git a/src/xenconfig/xenxs_private.h b/src/libxl/xenxs_private.h similarity index 100% rename from src/xenconfig/xenxs_private.h rename to src/libxl/xenxs_private.h diff --git a/src/xenconfig/Makefile.inc.am b/src/xenconfig/Makefile.inc.am deleted file mode 100644 index 5785b49268..0000000000 --- a/src/xenconfig/Makefile.inc.am +++ /dev/null @@ -1,28 +0,0 @@ -# vim: filetype=3Dautomake - -XENCONFIG_SOURCES =3D \ - xenconfig/xenxs_private.h \ - xenconfig/xen_common.c \ - xenconfig/xen_common.h \ - xenconfig/xen_xm.c \ - xenconfig/xen_xm.h \ - $(NULL) - -EXTRA_DIST +=3D $(XENCONFIG_SOURCES) - -if WITH_XENCONFIG -noinst_LTLIBRARIES +=3D libvirt_xenconfig.la -libvirt_la_BUILT_LIBADD +=3D libvirt_xenconfig.la -libvirt_xenconfig_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_xenconfig_la_SOURCES =3D $(XENCONFIG_SOURCES) - -endif WITH_XENCONFIG - -if WITH_XENCONFIG -USED_SYM_FILES +=3D $(srcdir)/libvirt_xenconfig.syms -else ! WITH_XENCONFIG -SYM_FILES +=3D $(srcdir)/libvirt_xenconfig.syms -endif ! WITH_XENCONFIG diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 59171606d1..ae0db71293 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -27,7 +27,7 @@ =20 #include "internal.h" #include "datatypes.h" -#include "xenconfig/xen_xl.h" +#include "libxl/xen_xl.h" #include "viralloc.h" #include "virstring.h" #include "testutils.h" diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 1de3c33f69..3137dc564c 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -25,7 +25,7 @@ =20 #include "internal.h" #include "datatypes.h" -#include "xenconfig/xen_xm.h" +#include "libxl/xen_xm.h" #include "testutils.h" #include "testutilsxen.h" #include "viralloc.h" --=20 2.22.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list