On 09/10/2014 03:26 PM, Michal Privoznik wrote:
So far no ConnectOpen() is introduced as it's not needed for
such
simple use case like this. It's crucial to separate this from
virLockSpace program that already exists. Not only it requires
virDomainObjPtr for its ConnectOpen() (subsequently all security
drivers would need rework as they use virDomainDefPtr), but from
nature of things it doesn't belong there either. virLockSpace handles
disk locking, not labeling and it's not clean to pollute its
namespace anyway.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
.gitignore | 2 ++
src/Makefile.am | 27 ++++++++++++++----
src/lock_seclabel_protocol-structs | 21 ++++++++++++++
src/locking/lock_seclabel_protocol.x | 53 ++++++++++++++++++++++++++++++++++++
4 files changed, 98 insertions(+), 5 deletions(-)
create mode 100644 src/lock_seclabel_protocol-structs
create mode 100644 src/locking/lock_seclabel_protocol.x
@@ -387,7 +397,8 @@ EXTRA_DIST += $(REMOTE_DRIVER_PROTOCOL) \
# The alternation of the following regexps matches both cases.
r1 = /\* \d+ \*/
r2 = /\* <[[:xdigit:]]+> \S+:\d+ \*/
-struct_prefix = (remote_|qemu_|lxc_|keepalive|vir(Net|LockSpace|LXCMonitor))
+struct_prefix1 = (remote_|qemu_|lxc_|keepalive)
+struct_prefix2 = vir(Net|LockSpace|LockSeclabel|LXCMonitor)
# Depending on configure options, libtool creates one or both of
# remote/{,.libs/}libvirt_driver_remote_la-remote_protocol.o. We want
@@ -406,7 +417,8 @@ PDWTAGS = \
else \
$(PERL) -0777 -n \
-e 'foreach my $$p (split m!\n*(?:$(r1)|$(r2))\n!) {' \
- -e ' if ($$p =~ /^(struct|enum) $(struct_prefix)/ ||' \
+ -e ' if ($$p =~ /^(struct|enum) $(struct_prefix1)/ ||' \
+ -e ' $$P =~ /^(struct|enum) $(struct_prefix2)/ ||' \
This p should be lowercase.
Jan