External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: don't pull anonymous enums into rpc protocol structs

Browse Source 
The VIR_TYPED_PARAM_* enum fields are defined in libvirt-common.h, not
in the remote protcol, so shouldn't be part of the protocol structs
output check. This avoids similar problems hitting when we add use of
glib, which has other such anonymous enums.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-09-17 12:24:25 +01:00
parent 557ac8cbf5
commit 509a1d9da4
3 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -240,8 +240,7 @@ PDWTAGS = \
else \ else \
$(PERL) -0777 -n \ $(PERL) -0777 -n \
-e 'foreach my $$p (split m!\n*(?:$(r1)|$(r2))\n!) {' \ -e 'foreach my $$p (split m!\n*(?:$(r1)|$(r2))\n!) {' \
-e ' if ($$p =~ /^(struct|enum) $(struct_prefix)/ ||' \ -e ' if ($$p =~ /^(struct|enum) $(struct_prefix)/) {' \
-e ' $$p =~ /^enum \{/) {' \
-e ' $$p =~ s!\t*/\*.*?\*/!!sg;' \ -e ' $$p =~ s!\t*/\*.*?\*/!!sg;' \
-e ' $$p =~ s!\s+\n!\n!sg;' \ -e ' $$p =~ s!\s+\n!\n!sg;' \
-e ' $$p =~ s!\s+$$!!;' \ -e ' $$p =~ s!\s+$$!!;' \

9
src/admin_protocol-structs
View File

@ -1,13 +1,4 @@
/* -*- c -*- */ /* -*- c -*- */
enum {
VIR_TYPED_PARAM_INT = 1,
VIR_TYPED_PARAM_UINT = 2,
VIR_TYPED_PARAM_LLONG = 3,
VIR_TYPED_PARAM_ULLONG = 4,
VIR_TYPED_PARAM_DOUBLE = 5,
VIR_TYPED_PARAM_BOOLEAN = 6,
VIR_TYPED_PARAM_STRING = 7,
};
struct admin_typed_param_value { struct admin_typed_param_value {
int type; int type;
union { union {

9
src/remote_protocol-structs
View File

@ -1,13 +1,4 @@
/* -*- c -*- */ /* -*- c -*- */
enum {
VIR_TYPED_PARAM_INT = 1,
VIR_TYPED_PARAM_UINT = 2,
VIR_TYPED_PARAM_LLONG = 3,
VIR_TYPED_PARAM_ULLONG = 4,
VIR_TYPED_PARAM_DOUBLE = 5,
VIR_TYPED_PARAM_BOOLEAN = 6,
VIR_TYPED_PARAM_STRING = 7,
};
struct remote_nonnull_domain { struct remote_nonnull_domain {
remote_nonnull_string name; remote_nonnull_string name;
remote_uuid uuid; remote_uuid uuid;