7:53 p.m.
Most C examples live in their own directory, which seems a
bit unnecessary especially considering that all virt-admin
related examples share a single admin/ directory. Reorganize
non-admin C examples in two categories: domain/ for those
that act on a domain, and misc/ for everything else.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitignore | 16 +++----
examples/Makefile.am | 45 +++++++++----------
examples/{dommigrate => domain}/dommigrate.c | 0
examples/{domtop => domain}/domtop.c | 0
examples/{dominfo => domain}/info1.c | 0
examples/{rename => domain}/rename.c | 0
examples/{domsuspend => domain}/suspend.c | 0
examples/{object-events => misc}/event-test.c | 0
.../{hellolibvirt => misc}/hellolibvirt.c | 0
examples/{openauth => misc}/openauth.c | 0
10 files changed, 29 insertions(+), 32 deletions(-)
rename examples/{dommigrate => domain}/dommigrate.c (100%)
rename examples/{domtop => domain}/domtop.c (100%)
rename examples/{dominfo => domain}/info1.c (100%)
rename examples/{rename => domain}/rename.c (100%)
rename examples/{domsuspend => domain}/suspend.c (100%)
rename examples/{object-events => misc}/event-test.c (100%)
rename examples/{hellolibvirt => misc}/hellolibvirt.c (100%)
rename examples/{openauth => misc}/openauth.c (100%)
diff --git a/.gitignore b/.gitignore
index 16eb4a3e2e..c15263037d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,14 +75,14 @@
/examples/admin/list_servers
/examples/admin/logging
/examples/admin/threadpool_params
-/examples/object-events/event-test
-/examples/dominfo/info1
-/examples/domsuspend/suspend
-/examples/dommigrate/dommigrate
-/examples/domtop/domtop
-/examples/hellolibvirt/hellolibvirt
-/examples/openauth/openauth
-/examples/rename/rename
+/examples/domain/dommigrate
+/examples/domain/domtop
+/examples/domain/info1
+/examples/domain/rename
+/examples/domain/suspend
+/examples/misc/event-test
+/examples/misc/hellolibvirt
+/examples/misc/openauth
/gnulib/lib/*
/gnulib/m4/*
/gnulib/tests/*
diff --git a/examples/Makefile.am b/examples/Makefile.am
index d613135086..832e5fea08 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -78,38 +78,35 @@ EXAMPLES = \
admin/list_servers \
admin/logging \
admin/threadpool_params \
- dominfo/info1 \
- dommigrate/dommigrate \
- domsuspend/suspend \
- domtop/domtop \
- hellolibvirt/hellolibvirt \
- object-events/event-test \
- openauth/openauth \
- rename/rename \
+ domain/dommigrate \
+ domain/domtop \
+ domain/info1 \
+ domain/rename \
+ domain/suspend \
+ misc/event-test \
+ misc/hellolibvirt \
+ misc/openauth \
$(NULL)
noinst_PROGRAMS = \
$(EXAMPLES) \
$(NULL)
-dominfo_info1_SOURCES = dominfo/info1.c
-dommigrate_dommigrate_SOURCES = dommigrate/dommigrate.c
-domsuspend_suspend_SOURCES = domsuspend/suspend.c
-domtop_domtop_SOURCES = domtop/domtop.c
-hellolibvirt_hellolibvirt_SOURCES = hellolibvirt/hellolibvirt.c
-
-object_events_event_test_SOURCES = object-events/event-test.c
-
-openauth_openauth_SOURCES = openauth/openauth.c
-rename_rename_SOURCES = rename/rename.c
-
-admin_list_servers_SOURCES = admin/list_servers.c
-admin_list_clients_SOURCES = admin/list_clients.c
-admin_threadpool_params_SOURCES = admin/threadpool_params.c
-admin_client_limits_SOURCES = admin/client_limits.c
-admin_client_info_SOURCES = admin/client_info.c
admin_client_close_SOURCES = admin/client_close.c
+admin_client_info_SOURCES = admin/client_info.c
+admin_client_limits_SOURCES = admin/client_limits.c
+admin_list_clients_SOURCES = admin/list_clients.c
+admin_list_servers_SOURCES = admin/list_servers.c
admin_logging_SOURCES = admin/logging.c
+admin_threadpool_params_SOURCES = admin/threadpool_params.c
+domain_dommigrate_SOURCES = domain/dommigrate.c
+domain_domtop_SOURCES = domain/domtop.c
+domain_info1_SOURCES = domain/info1.c
+domain_rename_SOURCES = domain/rename.c
+domain_suspend_SOURCES = domain/suspend.c
+misc_event_test_SOURCES = misc/event-test.c
+misc_hellolibvirt_SOURCES = misc/hellolibvirt.c
+misc_openauth_SOURCES = misc/openauth.c
if WITH_NWFILTER
diff --git a/examples/dommigrate/dommigrate.c b/examples/domain/dommigrate.c
similarity index 100%
rename from examples/dommigrate/dommigrate.c
rename to examples/domain/dommigrate.c
diff --git a/examples/domtop/domtop.c b/examples/domain/domtop.c
similarity index 100%
rename from examples/domtop/domtop.c
rename to examples/domain/domtop.c
diff --git a/examples/dominfo/info1.c b/examples/domain/info1.c
similarity index 100%
rename from examples/dominfo/info1.c
rename to examples/domain/info1.c
diff --git a/examples/rename/rename.c b/examples/domain/rename.c
similarity index 100%
rename from examples/rename/rename.c
rename to examples/domain/rename.c
diff --git a/examples/domsuspend/suspend.c b/examples/domain/suspend.c
similarity index 100%
rename from examples/domsuspend/suspend.c
rename to examples/domain/suspend.c
diff --git a/examples/object-events/event-test.c b/examples/misc/event-test.c
similarity index 100%
rename from examples/object-events/event-test.c
rename to examples/misc/event-test.c
diff --git a/examples/hellolibvirt/hellolibvirt.c b/examples/misc/hellolibvirt.c
similarity index 100%
rename from examples/hellolibvirt/hellolibvirt.c
rename to examples/misc/hellolibvirt.c
diff --git a/examples/openauth/openauth.c b/examples/misc/openauth.c
similarity index 100%
rename from examples/openauth/openauth.c
rename to examples/misc/openauth.c
--
2.21.0