From 3c5bd59dc74b3862a237ba712db1c29804e44bec Mon Sep 17 00:00:00 2001 From: Geoff Hickey Date: Thu, 16 Nov 2017 19:14:34 -0500 Subject: [PATCH] Build changes: - Bump the minimum libvirt version from 1.2.2 to 1.2.12, because virDomainDefineXMLFlags wasn't introduced until that version. - Use the correct format for the generated file notice, so that golint ignores the generated files. --- .travis.yml | 2 +- internal/constants/constants.gen.go | 10 +- internal/constants/constants.go | 1 + internal/lvgen/constants.tmpl | 10 +- internal/lvgen/procedures.tmpl | 10 +- internal/lvgen/sunrpc.y | 24 +++++ internal/lvgen/y.go | 70 +++++++------ internal/lvgen/y.output | 146 ++++++++++++++-------------- libvirt.gen.go | 10 +- 9 files changed, 157 insertions(+), 126 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e599db..bf1d346 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ go: - 1.9 env: - - LIBVIRT=1.2.2 EXT=gz + - LIBVIRT=1.2.12 EXT=gz - LIBVIRT=2.3.0 EXT=xz - LIBVIRT=3.1.0 EXT=xz diff --git a/internal/constants/constants.gen.go b/internal/constants/constants.gen.go index e27b5ed..afbab13 100644 --- a/internal/constants/constants.gen.go +++ b/internal/constants/constants.gen.go @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -/* - * This file generated by internal/lvgen/generate.go. DO NOT EDIT BY HAND! - * - * To regenerate, run 'go generate' in internal/lvgen. - */ +// +// Code generated by internal/lvgen/generate.go. DO NOT EDIT. +// +// To regenerate, run 'go generate' in internal/lvgen. +// // Package constants contains libvirt procedure identifiers and other enums and // constants. diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 4b7a90c..da94c25 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -18,6 +18,7 @@ // definitions. package constants +// qemu constants const ( ProgramQEMU = 0x20008087 ProgramKeepAlive = 0x6b656570 diff --git a/internal/lvgen/constants.tmpl b/internal/lvgen/constants.tmpl index 876c40f..2e3abe0 100644 --- a/internal/lvgen/constants.tmpl +++ b/internal/lvgen/constants.tmpl @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -/* - * This file generated by internal/lvgen/generate.go. DO NOT EDIT BY HAND! - * - * To regenerate, run 'go generate' in internal/lvgen. - */ +// +// Code generated by internal/lvgen/generate.go. DO NOT EDIT. +// +// To regenerate, run 'go generate' in internal/lvgen. +// // Package constants contains libvirt procedure identifiers and other enums and // constants. diff --git a/internal/lvgen/procedures.tmpl b/internal/lvgen/procedures.tmpl index c39b3e4..b4047fd 100644 --- a/internal/lvgen/procedures.tmpl +++ b/internal/lvgen/procedures.tmpl @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -/* - * This file generated by internal/lvgen/generate.go. DO NOT EDIT BY HAND! - * - * To regenerate, run 'go generate' in internal/lvgen. - */ +// +// Code generated by internal/lvgen/generate.go. DO NOT EDIT. +// +// To regenerate, run 'go generate' in internal/lvgen. +// package libvirt diff --git a/internal/lvgen/sunrpc.y b/internal/lvgen/sunrpc.y index ea1be41..d7b71ff 100644 --- a/internal/lvgen/sunrpc.y +++ b/internal/lvgen/sunrpc.y @@ -1,3 +1,21 @@ +// Copyright 2017 The go-libvirt Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// The generated code notice below is output to the generated file. *This* file, +// (sunrpc.y) is the yacc grammar for the sunrpc protocol language, and is *not* +// generated. + %{ // Copyright 2017 The go-libvirt Authors. // @@ -13,6 +31,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +// +// Code generated by goyacc. DO NOT EDIT. +// +// To regenerate, run 'go generate' in internal/lvgen. +// + package lvgen import ( diff --git a/internal/lvgen/y.go b/internal/lvgen/y.go index c201e78..ce6e698 100644 --- a/internal/lvgen/y.go +++ b/internal/lvgen/y.go @@ -1,4 +1,4 @@ -//line sunrpc.y:2 +//line sunrpc.y:20 // Copyright 2017 The go-libvirt Authors. // @@ -14,16 +14,22 @@ // See the License for the specific language governing permissions and // limitations under the License. +// +// Code generated by goyacc. DO NOT EDIT. +// +// To regenerate, run 'go generate' in internal/lvgen. +// + package lvgen import __yyfmt__ "fmt" -//line sunrpc.y:16 +//line sunrpc.y:40 import ( //"fmt" ) -//line sunrpc.y:25 +//line sunrpc.y:49 type yySymType struct { yys int val string @@ -102,7 +108,7 @@ const yyEofCode = 1 const yyErrCode = 2 const yyInitialStackSize = 16 -//line sunrpc.y:235 +//line sunrpc.y:259 //line yacctab:1 var yyExca = [...]int{ @@ -579,13 +585,13 @@ yydefault: case 12: yyDollar = yyS[yypt-5 : yypt+1] - //line sunrpc.y:62 + //line sunrpc.y:86 { StartEnum(yyDollar[2].val) } case 15: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:71 + //line sunrpc.y:95 { err := AddEnumAutoVal(yyDollar[1].val) if err != nil { @@ -595,7 +601,7 @@ yydefault: } case 16: yyDollar = yyS[yypt-3 : yypt+1] - //line sunrpc.y:78 + //line sunrpc.y:102 { err := AddEnumVal(yyDollar[1].val, yyDollar[3].val) if err != nil { @@ -605,7 +611,7 @@ yydefault: } case 20: yyDollar = yyS[yypt-4 : yypt+1] - //line sunrpc.y:100 + //line sunrpc.y:124 { err := AddConst(yyDollar[2].val, yyDollar[4].val) if err != nil { @@ -615,145 +621,145 @@ yydefault: } case 22: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:114 + //line sunrpc.y:138 { StartTypedef() } case 28: yyDollar = yyS[yypt-2 : yypt+1] - //line sunrpc.y:125 + //line sunrpc.y:149 { AddDeclaration(yyDollar[2].val, yyDollar[1].val) } case 30: yyDollar = yyS[yypt-2 : yypt+1] - //line sunrpc.y:130 + //line sunrpc.y:154 { yyVAL.val = "u" + yyDollar[2].val } case 31: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:131 + //line sunrpc.y:155 { yyVAL.val = "float32" } case 32: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:132 + //line sunrpc.y:156 { yyVAL.val = "float64" } case 33: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:133 + //line sunrpc.y:157 { yyVAL.val = "bool" } case 34: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:134 + //line sunrpc.y:158 { yyVAL.val = "string" } case 35: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:135 + //line sunrpc.y:159 { yyVAL.val = "byte" } case 40: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:143 + //line sunrpc.y:167 { yyVAL.val = "int64" } case 41: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:144 + //line sunrpc.y:168 { yyVAL.val = "int32" } case 42: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:145 + //line sunrpc.y:169 { yyVAL.val = "int16" } case 43: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:146 + //line sunrpc.y:170 { yyVAL.val = "int8" } case 45: yyDollar = yyS[yypt-5 : yypt+1] - //line sunrpc.y:154 + //line sunrpc.y:178 { AddFixedArray(yyDollar[2].val, yyDollar[1].val, yyDollar[4].val) } case 46: yyDollar = yyS[yypt-5 : yypt+1] - //line sunrpc.y:158 + //line sunrpc.y:182 { AddVariableArray(yyDollar[2].val, yyDollar[1].val, yyDollar[4].val) } case 47: yyDollar = yyS[yypt-4 : yypt+1] - //line sunrpc.y:159 + //line sunrpc.y:183 { AddVariableArray(yyDollar[2].val, yyDollar[1].val, "") } case 48: yyDollar = yyS[yypt-3 : yypt+1] - //line sunrpc.y:167 + //line sunrpc.y:191 { AddVariableArray(yyDollar[3].val, yyDollar[1].val, "1") } case 49: yyDollar = yyS[yypt-3 : yypt+1] - //line sunrpc.y:171 + //line sunrpc.y:195 { StartStruct(yyDollar[2].val) } case 50: yyDollar = yyS[yypt-6 : yypt+1] - //line sunrpc.y:171 + //line sunrpc.y:195 { AddStruct() } case 54: yyDollar = yyS[yypt-2 : yypt+1] - //line sunrpc.y:184 + //line sunrpc.y:208 { StartUnion(yyDollar[2].val) } case 55: yyDollar = yyS[yypt-10 : yypt+1] - //line sunrpc.y:184 + //line sunrpc.y:208 { AddUnion() } case 59: yyDollar = yyS[yypt-2 : yypt+1] - //line sunrpc.y:197 + //line sunrpc.y:221 { StartCase(yyDollar[2].val) } case 60: yyDollar = yyS[yypt-5 : yypt+1] - //line sunrpc.y:197 + //line sunrpc.y:221 { AddCase() } case 61: yyDollar = yyS[yypt-1 : yypt+1] - //line sunrpc.y:198 + //line sunrpc.y:222 { StartCase("default") } case 62: yyDollar = yyS[yypt-4 : yypt+1] - //line sunrpc.y:198 + //line sunrpc.y:222 { AddCase() } diff --git a/internal/lvgen/y.output b/internal/lvgen/y.output index e26528d..f23bce4 100644 --- a/internal/lvgen/y.output +++ b/internal/lvgen/y.output @@ -30,7 +30,7 @@ state 1 state 2 specification: definition_list. (1) - . reduce 1 (src line 38) + . reduce 1 (src line 62) state 3 @@ -44,37 +44,37 @@ state 3 state 4 definition: enum_definition. (6) - . reduce 6 (src line 52) + . reduce 6 (src line 76) state 5 definition: const_definition. (7) - . reduce 7 (src line 54) + . reduce 7 (src line 78) state 6 definition: typedef_definition. (8) - . reduce 8 (src line 55) + . reduce 8 (src line 79) state 7 definition: struct_definition. (9) - . reduce 9 (src line 56) + . reduce 9 (src line 80) state 8 definition: union_definition. (10) - . reduce 10 (src line 57) + . reduce 10 (src line 81) state 9 definition: program_definition. (11) - . reduce 11 (src line 58) + . reduce 11 (src line 82) state 10 @@ -98,7 +98,7 @@ state 12 typedef_definition: TYPEDEF.$$22 declaration $$22: . (22) - . reduce 22 (src line 113) + . reduce 22 (src line 137) $$22 goto 21 @@ -136,7 +136,7 @@ state 16 TYPEDEF shift 12 UNION shift 14 PROGRAM shift 15 - . reduce 4 (src line 47) + . reduce 4 (src line 71) definition_list goto 28 definition goto 3 @@ -157,7 +157,7 @@ state 17 state 18 enum_ident: IDENTIFIER. (17) - . reduce 17 (src line 87) + . reduce 17 (src line 111) state 19 @@ -171,7 +171,7 @@ state 19 state 20 const_ident: IDENTIFIER. (21) - . reduce 21 (src line 109) + . reduce 21 (src line 133) state 21 @@ -214,21 +214,21 @@ state 22 state 23 struct_ident: IDENTIFIER. (51) - . reduce 51 (src line 174) + . reduce 51 (src line 198) state 24 union_definition: UNION union_ident.$$54 SWITCH '(' simple_declaration ')' '{' case_list '}' $$54: . (54) - . reduce 54 (src line 183) + . reduce 54 (src line 207) $$54 goto 53 state 25 union_ident: IDENTIFIER. (56) - . reduce 56 (src line 187) + . reduce 56 (src line 211) state 26 @@ -241,13 +241,13 @@ state 26 state 27 program_ident: IDENTIFIER. (64) - . reduce 64 (src line 205) + . reduce 64 (src line 229) state 28 definition_list: definition ';' definition_list. (5) - . reduce 5 (src line 49) + . reduce 5 (src line 73) state 29 @@ -272,31 +272,31 @@ state 30 state 31 typedef_definition: TYPEDEF $$22 declaration. (23) - . reduce 23 (src line 114) + . reduce 23 (src line 138) state 32 declaration: simple_declaration. (24) - . reduce 24 (src line 117) + . reduce 24 (src line 141) state 33 declaration: fixed_array_declaration. (25) - . reduce 25 (src line 119) + . reduce 25 (src line 143) state 34 declaration: variable_array_declaration. (26) - . reduce 26 (src line 120) + . reduce 26 (src line 144) state 35 declaration: pointer_declaration. (27) - . reduce 27 (src line 121) + . reduce 27 (src line 145) state 36 @@ -315,7 +315,7 @@ state 36 state 37 type_specifier: int_spec. (29) - . reduce 29 (src line 128) + . reduce 29 (src line 152) state 38 @@ -332,86 +332,86 @@ state 38 state 39 type_specifier: FLOAT. (31) - . reduce 31 (src line 131) + . reduce 31 (src line 155) state 40 type_specifier: DOUBLE. (32) - . reduce 32 (src line 132) + . reduce 32 (src line 156) state 41 type_specifier: BOOL. (33) - . reduce 33 (src line 133) + . reduce 33 (src line 157) state 42 type_specifier: STRING. (34) - . reduce 34 (src line 134) + . reduce 34 (src line 158) state 43 type_specifier: OPAQUE. (35) - . reduce 35 (src line 135) + . reduce 35 (src line 159) state 44 type_specifier: enum_definition. (36) - . reduce 36 (src line 136) + . reduce 36 (src line 160) state 45 type_specifier: struct_definition. (37) - . reduce 37 (src line 137) + . reduce 37 (src line 161) state 46 type_specifier: union_definition. (38) - . reduce 38 (src line 138) + . reduce 38 (src line 162) state 47 type_specifier: IDENTIFIER. (39) - . reduce 39 (src line 139) + . reduce 39 (src line 163) state 48 int_spec: HYPER. (40) - . reduce 40 (src line 142) + . reduce 40 (src line 166) state 49 int_spec: INT. (41) - . reduce 41 (src line 144) + . reduce 41 (src line 168) state 50 int_spec: SHORT. (42) - . reduce 42 (src line 145) + . reduce 42 (src line 169) state 51 int_spec: CHAR. (43) - . reduce 43 (src line 146) + . reduce 43 (src line 170) state 52 struct_definition: STRUCT struct_ident '{'.$$49 declaration_list '}' $$49: . (49) - . reduce 49 (src line 170) + . reduce 49 (src line 194) $$49 goto 65 @@ -443,7 +443,7 @@ state 56 enum_value_list: enum_value.',' enum_value_list ',' shift 71 - . reduce 13 (src line 65) + . reduce 13 (src line 89) state 57 @@ -451,25 +451,25 @@ state 57 enum_value: enum_value_ident.'=' value '=' shift 72 - . reduce 15 (src line 70) + . reduce 15 (src line 94) state 58 enum_value_ident: IDENTIFIER. (18) - . reduce 18 (src line 91) + . reduce 18 (src line 115) state 59 const_definition: CONST const_ident '=' IDENTIFIER. (19) - . reduce 19 (src line 98) + . reduce 19 (src line 122) state 60 const_definition: CONST const_ident '=' CONSTANT. (20) - . reduce 20 (src line 100) + . reduce 20 (src line 124) state 61 @@ -480,7 +480,7 @@ state 61 '[' shift 73 '<' shift 74 - . reduce 28 (src line 124) + . reduce 28 (src line 148) state 62 @@ -494,13 +494,13 @@ state 62 state 63 variable_ident: IDENTIFIER. (44) - . reduce 44 (src line 149) + . reduce 44 (src line 173) state 64 type_specifier: UNSIGNED int_spec. (30) - . reduce 30 (src line 130) + . reduce 30 (src line 154) state 65 @@ -567,7 +567,7 @@ state 69 state 70 enum_definition: ENUM enum_ident '{' enum_value_list '}'. (12) - . reduce 12 (src line 61) + . reduce 12 (src line 85) state 71 @@ -612,7 +612,7 @@ state 74 state 75 pointer_declaration: type_specifier '*' variable_ident. (48) - . reduce 48 (src line 166) + . reduce 48 (src line 190) state 76 @@ -668,7 +668,7 @@ state 80 version_list: version ';'.version_list VERSION shift 69 - . reduce 65 (src line 209) + . reduce 65 (src line 233) version_list goto 95 version goto 68 @@ -683,31 +683,31 @@ state 81 state 82 version_ident: IDENTIFIER. (68) - . reduce 68 (src line 218) + . reduce 68 (src line 242) state 83 enum_value_list: enum_value ',' enum_value_list. (14) - . reduce 14 (src line 67) + . reduce 14 (src line 91) state 84 enum_value: enum_value_ident '=' value. (16) - . reduce 16 (src line 78) + . reduce 16 (src line 102) state 85 value: IDENTIFIER. (2) - . reduce 2 (src line 42) + . reduce 2 (src line 66) state 86 value: CONSTANT. (3) - . reduce 3 (src line 44) + . reduce 3 (src line 68) state 87 @@ -727,13 +727,13 @@ state 88 state 89 variable_array_declaration: type_specifier variable_ident '<' '>'. (47) - . reduce 47 (src line 159) + . reduce 47 (src line 183) state 90 struct_definition: STRUCT struct_ident '{' $$49 declaration_list '}'. (50) - . reduce 50 (src line 171) + . reduce 50 (src line 195) state 91 @@ -754,7 +754,7 @@ state 91 SHORT shift 50 CHAR shift 51 IDENTIFIER shift 47 - . reduce 52 (src line 178) + . reduce 52 (src line 202) enum_definition goto 44 struct_definition goto 45 @@ -795,7 +795,7 @@ state 94 state 95 version_list: version ';' version_list. (66) - . reduce 66 (src line 211) + . reduce 66 (src line 235) state 96 @@ -828,19 +828,19 @@ state 96 state 97 fixed_array_declaration: type_specifier variable_ident '[' value ']'. (45) - . reduce 45 (src line 153) + . reduce 45 (src line 177) state 98 variable_array_declaration: type_specifier variable_ident '<' value '>'. (46) - . reduce 46 (src line 157) + . reduce 46 (src line 181) state 99 declaration_list: declaration ';' declaration_list. (53) - . reduce 53 (src line 180) + . reduce 53 (src line 204) state 100 @@ -853,13 +853,13 @@ state 100 state 101 simple_declaration: type_specifier variable_ident. (28) - . reduce 28 (src line 124) + . reduce 28 (src line 148) state 102 program_definition: PROGRAM program_ident '{' version_list '}' '=' value. (63) - . reduce 63 (src line 201) + . reduce 63 (src line 225) state 103 @@ -920,7 +920,7 @@ state 108 SHORT shift 50 CHAR shift 51 IDENTIFIER shift 47 - . reduce 69 (src line 222) + . reduce 69 (src line 246) enum_definition goto 44 struct_definition goto 45 @@ -940,7 +940,7 @@ state 109 state 110 procedure_ident: IDENTIFIER. (72) - . reduce 72 (src line 231) + . reduce 72 (src line 255) state 111 @@ -971,7 +971,7 @@ state 114 case: DEFAULT.$$61 ':' declaration $$61: . (61) - . reduce 61 (src line 198) + . reduce 61 (src line 222) $$61 goto 121 @@ -987,7 +987,7 @@ state 115 state 116 procedure_list: procedure ';' procedure_list. (70) - . reduce 70 (src line 224) + . reduce 70 (src line 248) state 117 @@ -1018,7 +1018,7 @@ state 117 state 118 union_definition: UNION union_ident $$54 SWITCH '(' simple_declaration ')' '{' case_list '}'. (55) - . reduce 55 (src line 184) + . reduce 55 (src line 208) state 119 @@ -1027,7 +1027,7 @@ state 119 CASE shift 113 DEFAULT shift 114 - . reduce 57 (src line 191) + . reduce 57 (src line 215) case_list goto 124 case goto 112 @@ -1036,7 +1036,7 @@ state 120 case: CASE value.$$59 ':' declaration $$59: . (59) - . reduce 59 (src line 196) + . reduce 59 (src line 220) $$59 goto 125 @@ -1064,7 +1064,7 @@ state 123 state 124 case_list: case ';' case_list. (58) - . reduce 58 (src line 193) + . reduce 58 (src line 217) state 125 @@ -1107,7 +1107,7 @@ state 126 state 127 version: VERSION version_ident '{' procedure_list '}' '=' value ';'. (67) - . reduce 67 (src line 214) + . reduce 67 (src line 238) state 128 @@ -1150,7 +1150,7 @@ state 129 state 130 case: DEFAULT $$61 ':' declaration. (62) - . reduce 62 (src line 198) + . reduce 62 (src line 222) state 131 @@ -1165,7 +1165,7 @@ state 131 state 132 case: CASE value $$59 ':' declaration. (60) - . reduce 60 (src line 197) + . reduce 60 (src line 221) state 133 @@ -1178,7 +1178,7 @@ state 133 state 134 procedure: type_specifier procedure_ident '(' type_specifier ')' '=' value ';'. (71) - . reduce 71 (src line 227) + . reduce 71 (src line 251) 40 terminals, 41 nonterminals diff --git a/libvirt.gen.go b/libvirt.gen.go index af0279e..6e3b365 100644 --- a/libvirt.gen.go +++ b/libvirt.gen.go @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -/* - * This file generated by internal/lvgen/generate.go. DO NOT EDIT BY HAND! - * - * To regenerate, run 'go generate' in internal/lvgen. - */ +// +// Code generated by internal/lvgen/generate.go. DO NOT EDIT. +// +// To regenerate, run 'go generate' in internal/lvgen. +// package libvirt