v2: - tab replacing patch now also includes files Martin added in his keepalive series (trivial, ready to be pushed) - admin_server now marked as renamed instead of deleted and formated with -M - introduction of virAdmServe structure split to a separate patch - resolved server naming issues from review (added fallback data) - refactored lock_daemon a little not to store duplicate reference to a server, since we now have daemon structure - tweaked virnetdaemontest and included new data for it virt-admin still missing in this series, because first we need to handle proper connecting to daemons, i.e. discuss the URI format and then we can add individual commands, so I postponed it in this series and will look at the connect routine first. Erik Skultety (9): test: Replace tabs with spaces in virnetdaemondata json files test: s/{in,out}put-data-admin-nomdns/{in,out}put-data-admin-nomdns-nonames locking: Remove redundant 'srv' element from virLockDaemon rpc: Introduce new elements 'id' and 'name' to virnetserver structure virnetdaemon: Add post exec restart support for multiple servers admin: Move admin_server.{h,c} to admin.{h,c} admin: Introduce virAdmServer structure admin: Introduce adminDaemonConnectListServers API admin: Usage example of the new server listing API (not to be pushed) .gitignore | 1 + Makefile.am | 2 +- configure.ac | 1 + daemon/Makefile.am | 6 +- daemon/admin.c | 174 +++++++++++++++ daemon/admin.h | 36 ++++ daemon/admin_server.c | 103 +++------ daemon/admin_server.h | 23 +- daemon/libvirtd.c | 10 +- examples/admin/Makefile.am | 25 +++ examples/admin/listservers.c | 65 ++++++ include/libvirt/libvirt-admin.h | 12 ++ po/POTFILES.in | 2 +- src/admin/admin_protocol.x | 27 ++- src/admin_protocol-structs | 16 ++ src/datatypes.c | 35 +++ src/datatypes.h | 36 ++++ src/libvirt-admin.c | 171 +++++++++++++++ src/libvirt_admin_private.syms | 5 + src/libvirt_admin_public.syms | 4 + src/libvirt_remote.syms | 3 +- src/locking/lock_daemon.c | 42 ++-- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetdaemon.c | 111 +++++++--- src/rpc/virnetdaemon.h | 30 ++- src/rpc/virnetserver.c | 46 +++- src/rpc/virnetserver.h | 5 + .../input-data-admin-nomdns-names.json | 128 +++++++++++ .../input-data-admin-nomdns-nonames.json | 126 +++++++++++ .../virnetdaemondata/input-data-admin-nomdns.json | 126 ----------- .../input-data-no-keepalive-required.json | 240 ++++++++++----------- .../output-data-admin-nomdns-names.json | 128 +++++++++++ ....json => output-data-admin-nomdns-nonames.json} | 2 + .../virnetdaemondata/output-data-anon-clients.json | 1 + .../output-data-initial-nomdns.json | 1 + tests/virnetdaemondata/output-data-initial.json | 1 + .../output-data-no-keepalive-required.json | 240 ++++++++++----------- tests/virnetdaemontest.c | 52 ++--- 38 files changed, 1492 insertions(+), 546 deletions(-) create mode 100644 daemon/admin.c create mode 100644 daemon/admin.h create mode 100644 examples/admin/Makefile.am create mode 100644 examples/admin/listservers.c create mode 100644 tests/virnetdaemondata/input-data-admin-nomdns-names.json create mode 100644 tests/virnetdaemondata/input-data-admin-nomdns-nonames.json delete mode 100644 tests/virnetdaemondata/input-data-admin-nomdns.json create mode 100644 tests/virnetdaemondata/output-data-admin-nomdns-names.json rename tests/virnetdaemondata/{output-data-admin-nomdns.json => output-data-admin-nomdns-nonames.json} (98%) -- 2.4.3 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list