fix build by correcting functions order and src/Makefile.am

commit 30c61901 added new functions to libvirt_private.syms
not alpabetically sorted and erroneously added vz sources to
STATEFUL_DRIVER_SOURCE_FILES, which triggered check-aclrules
running while vz driver isn't ready for it yet.

Pushing under build-breaker rule.

Signed-off-by: Maxim Nestratov <mnestratov@virtuozzo.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 08ff301ed4eab023ee5736a1deabf6f1cb25aea4..f5e57c03c03e948ee934a498af1db65151411024 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -630,7 +630,6 @@ DRIVER_SOURCE_FILES = \
        $(NULL)
 
 STATEFUL_DRIVER_SOURCE_FILES = \
-       $(VZ_DRIVER_SOURCES) \
        $(BHYVE_DRIVER_SOURCES) \
        $(INTERFACE_DRIVER_SOURCES) \
        $(LIBXL_DRIVER_SOURCES) \

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 1bcb3af37b5badbcb8b1712ff9f843a86ae1aba7..a9025f50c4ee9cdc212e6581d45878d8594dd1c4 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -916,6 +916,11 @@ virCPUx86MakeData;
 
 # datatypes.h
 virConnectClass;
+virConnectCloseCallbackDataCall;
+virConnectCloseCallbackDataClass;
+virConnectCloseCallbackDataGetCallback;
+virConnectCloseCallbackDataRegister;
+virConnectCloseCallbackDataUnregister;
 virDomainClass;
 virDomainSnapshotClass;
 virGetConnect;
@@ -929,20 +934,15 @@ virGetSecret;
 virGetStoragePool;
 virGetStorageVol;
 virGetStream;
-virConnectCloseCallbackDataGetCallback;
-virNewConnectCloseCallbackData;
-virConnectCloseCallbackDataUnregister;
-virConnectCloseCallbackDataRegister;
-virConnectCloseCallbackDataCall;
 virInterfaceClass;
 virNetworkClass;
+virNewConnectCloseCallbackData;
 virNodeDeviceClass;
 virNWFilterClass;
 virSecretClass;
 virStoragePoolClass;
 virStorageVolClass;
 virStreamClass;
-virConnectCloseCallbackDataClass;
 
 
 # fdstream.h