aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel De Graaf <dgdegra@tycho.nsa.gov>2011-10-10 11:21:51 +0100
committerDaniel De Graaf <dgdegra@tycho.nsa.gov>2011-10-10 11:21:51 +0100
commitdf0c75a05f6782a88e0471a9c5e070f8900a875f (patch)
tree68792e9d346fe3c97c570582c3e463e11a8af993
parent40b004d6ee858af7ad162ceb4d7f13be7ae2b129 (diff)
downloadxen-df0c75a05f6782a88e0471a9c5e070f8900a875f.tar.gz
xen-df0c75a05f6782a88e0471a9c5e070f8900a875f.tar.bz2
xen-df0c75a05f6782a88e0471a9c5e070f8900a875f.zip
libxl: correctly parse disk "backendtype" field
The expression for backendtype was missing a comma. Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r--tools/libxl/libxlu_disk_l.c272
-rw-r--r--tools/libxl/libxlu_disk_l.l2
2 files changed, 138 insertions, 136 deletions
diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c
index 1ed1ec548c..5e852b7cff 100644
--- a/tools/libxl/libxlu_disk_l.c
+++ b/tools/libxl/libxlu_disk_l.c
@@ -366,7 +366,7 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_acclist[453] =
+static yyconst flex_int16_t yy_acclist[456] =
{ 0,
24, 24, 26, 22, 23, 25, 8193, 22, 23, 25,
16385, 8193, 22, 25,16385, 22, 23, 25, 23, 25,
@@ -416,11 +416,11 @@ static yyconst flex_int16_t yy_acclist[453] =
15, 8213, 22, 15, 22, 15, 8213, 11, 12, 22,
6, 6, 12, 6, 6, 15, 8213, 22, 15, 8213,
22, 15, 8213, 15, 22, 15, 22, 6, 6, 8,
- 6, 5, 6, 8, 12, 4, 6, 5, 6, 8,
- 4, 6
+ 6, 5, 6, 8, 12, 8, 4, 6, 5, 6,
+ 8, 8, 12, 4, 6
} ;
-static yyconst flex_int16_t yy_accept[255] =
+static yyconst flex_int16_t yy_accept[257] =
{ 0,
1, 1, 1, 2, 3, 4, 7, 12, 16, 19,
21, 24, 27, 30, 33, 36, 39, 42, 45, 48,
@@ -448,8 +448,8 @@ static yyconst flex_int16_t yy_accept[255] =
380, 381, 385, 387, 388, 389, 391, 392, 394, 395,
397, 399, 400, 402, 405, 406, 408, 411, 414, 416,
418, 420, 421, 422, 424, 425, 426, 429, 432, 434,
- 436, 437, 438, 439, 440, 441, 442, 444, 446, 448,
- 450, 451, 453, 453
+ 436, 437, 438, 439, 440, 441, 442, 444, 446, 447,
+ 449, 451, 452, 454, 456, 456
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -492,80 +492,82 @@ static yyconst flex_int32_t yy_meta[34] =
1, 1, 1
} ;
-static yyconst flex_int16_t yy_base[311] =
+static yyconst flex_int16_t yy_base[313] =
{ 0,
- 0, 0, 560, 556, 555, 539, 32, 35, 662, 662,
- 44, 62, 30, 40, 32, 50, 525, 49, 47, 59,
- 68, 517, 69, 509, 72, 0, 662, 507, 662, 83,
- 91, 0, 0, 100, 489, 109, 0, 78, 51, 86,
+ 0, 0, 572, 560, 559, 551, 32, 35, 662, 662,
+ 44, 62, 30, 40, 32, 50, 533, 49, 47, 59,
+ 68, 525, 69, 517, 72, 0, 662, 515, 662, 83,
+ 91, 0, 0, 100, 501, 109, 0, 78, 51, 86,
89, 74, 96, 105, 109, 110, 111, 112, 117, 73,
119, 118, 121, 120, 122, 0, 134, 0, 0, 138,
- 0, 0, 471, 130, 144, 129, 143, 145, 146, 147,
+ 0, 0, 495, 130, 144, 129, 143, 145, 146, 147,
148, 149, 153, 154, 155, 158, 161, 165, 166, 170,
180, 0, 0, 662, 171, 201, 176, 175, 178, 183,
- 458, 182, 190, 446, 212, 188, 221, 208, 224, 234,
+ 465, 182, 190, 455, 212, 188, 221, 208, 224, 234,
209, 230, 236, 221, 244, 0, 247, 0, 184, 248,
244, 269, 231, 247, 251, 258, 272, 0, 279, 0,
283, 0, 286, 0, 255, 290, 0, 293, 0, 270,
- 281, 447, 254, 297, 0, 0, 0, 0, 294, 662,
+ 281, 455, 254, 297, 0, 0, 0, 0, 294, 662,
295, 308, 0, 310, 0, 257, 319, 328, 304, 331,
0, 0, 0, 0, 335, 0, 0, 0, 0, 316,
- 338, 0, 0, 0, 0, 333, 336, 429, 662, 428,
- 338, 340, 348, 0, 0, 0, 0, 427, 351, 0,
- 355, 0, 359, 0, 362, 0, 357, 426, 308, 369,
- 425, 662, 423, 662, 346, 365, 421, 662, 371, 0,
-
- 0, 0, 0, 378, 0, 0, 0, 0, 380, 420,
- 662, 388, 419, 0, 418, 662, 373, 417, 662, 372,
- 382, 416, 662, 398, 415, 662, 400, 0, 402, 0,
- 0, 385, 264, 662, 390, 275, 409, 0, 0, 0,
- 0, 405, 404, 406, 0, 412, 224, 129, 87, 662,
- 47, 662, 662, 434, 438, 441, 445, 449, 453, 457,
- 461, 465, 469, 473, 477, 481, 485, 489, 493, 497,
- 501, 505, 509, 513, 517, 521, 525, 529, 533, 537,
- 541, 545, 549, 553, 557, 561, 565, 569, 573, 577,
- 581, 585, 589, 593, 597, 601, 605, 609, 613, 617,
-
- 621, 625, 629, 633, 637, 641, 645, 649, 653, 657
+ 338, 0, 0, 0, 0, 333, 336, 447, 662, 429,
+ 338, 340, 348, 0, 0, 0, 0, 428, 351, 0,
+ 355, 0, 359, 0, 362, 0, 357, 427, 308, 369,
+ 426, 662, 425, 662, 346, 365, 423, 662, 371, 0,
+
+ 0, 0, 0, 378, 0, 0, 0, 0, 380, 421,
+ 662, 388, 420, 0, 419, 662, 373, 418, 662, 372,
+ 382, 417, 662, 398, 416, 662, 400, 0, 402, 0,
+ 0, 385, 415, 662, 390, 275, 409, 0, 0, 0,
+ 0, 405, 404, 406, 264, 412, 224, 129, 662, 87,
+ 662, 47, 662, 662, 662, 434, 438, 441, 445, 449,
+ 453, 457, 461, 465, 469, 473, 477, 481, 485, 489,
+ 493, 497, 501, 505, 509, 513, 517, 521, 525, 529,
+ 533, 537, 541, 545, 549, 553, 557, 561, 565, 569,
+ 573, 577, 581, 585, 589, 593, 597, 601, 605, 609,
+
+ 613, 617, 621, 625, 629, 633, 637, 641, 645, 649,
+ 653, 657
} ;
-static yyconst flex_int16_t yy_def[311] =
+static yyconst flex_int16_t yy_def[313] =
{ 0,
- 253, 1, 254, 254, 253, 255, 256, 256, 253, 253,
- 257, 257, 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 258, 253, 255, 253, 259,
- 256, 260, 260, 261, 12, 255, 262, 12, 12, 12,
+ 255, 1, 256, 256, 255, 257, 258, 258, 255, 255,
+ 259, 259, 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 260, 255, 257, 255, 261,
+ 258, 262, 262, 263, 12, 257, 264, 12, 12, 12,
12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 258, 259, 260, 260, 263,
- 264, 264, 253, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 260, 261, 262, 262, 265,
+ 266, 266, 255, 12, 12, 12, 12, 12, 12, 12,
12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
- 263, 264, 264, 253, 12, 265, 12, 12, 12, 12,
- 12, 12, 12, 36, 266, 12, 267, 12, 12, 268,
-
- 12, 12, 12, 12, 269, 270, 265, 270, 12, 12,
- 12, 271, 12, 12, 12, 255, 272, 273, 266, 273,
- 274, 275, 267, 275, 12, 276, 277, 268, 277, 12,
- 12, 278, 12, 269, 270, 270, 279, 279, 12, 253,
- 12, 280, 281, 271, 281, 12, 282, 283, 255, 272,
- 273, 273, 284, 284, 274, 275, 275, 285, 285, 12,
- 276, 277, 277, 286, 286, 12, 12, 287, 253, 288,
- 12, 12, 280, 281, 281, 289, 289, 290, 291, 292,
- 282, 292, 293, 294, 283, 294, 255, 295, 12, 296,
- 287, 253, 297, 253, 12, 298, 299, 253, 291, 292,
-
- 292, 300, 300, 293, 294, 294, 301, 301, 255, 302,
- 253, 303, 304, 304, 297, 253, 12, 305, 253, 305,
- 305, 299, 253, 283, 302, 253, 306, 307, 303, 307,
- 304, 12, 305, 253, 305, 305, 306, 307, 307, 308,
- 308, 12, 305, 305, 309, 305, 305, 310, 305, 253,
- 310, 253, 0, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
-
- 253, 253, 253, 253, 253, 253, 253, 253, 253, 253
+ 265, 266, 266, 255, 12, 267, 12, 12, 12, 12,
+ 12, 12, 12, 36, 268, 12, 269, 12, 12, 270,
+
+ 12, 12, 12, 12, 271, 272, 267, 272, 12, 12,
+ 12, 273, 12, 12, 12, 257, 274, 275, 268, 275,
+ 276, 277, 269, 277, 12, 278, 279, 270, 279, 12,
+ 12, 280, 12, 271, 272, 272, 281, 281, 12, 255,
+ 12, 282, 283, 273, 283, 12, 284, 285, 257, 274,
+ 275, 275, 286, 286, 276, 277, 277, 287, 287, 12,
+ 278, 279, 279, 288, 288, 12, 12, 289, 255, 290,
+ 12, 12, 282, 283, 283, 291, 291, 292, 293, 294,
+ 284, 294, 295, 296, 285, 296, 257, 297, 12, 298,
+ 289, 255, 299, 255, 12, 300, 301, 255, 293, 294,
+
+ 294, 302, 302, 295, 296, 296, 303, 303, 257, 304,
+ 255, 305, 306, 306, 299, 255, 12, 307, 255, 307,
+ 307, 301, 255, 285, 304, 255, 308, 309, 305, 309,
+ 306, 12, 307, 255, 307, 307, 308, 309, 309, 310,
+ 310, 12, 307, 307, 311, 307, 307, 312, 255, 307,
+ 255, 312, 255, 255, 0, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255
} ;
static yyconst flex_int16_t yy_nxt[696] =
@@ -575,16 +577,16 @@ static yyconst flex_int16_t yy_nxt[696] =
17, 17, 19, 17, 20, 21, 22, 23, 24, 17,
25, 17, 17, 31, 31, 32, 31, 31, 32, 35,
33, 35, 41, 33, 28, 28, 28, 29, 34, 35,
- 253, 36, 37, 42, 43, 38, 35, 48, 35, 35,
+ 249, 36, 37, 42, 43, 38, 35, 48, 35, 35,
35, 39, 28, 28, 28, 29, 34, 44, 35, 36,
37, 40, 46, 45, 65, 49, 47, 35, 35, 50,
52, 35, 35, 35, 54, 28, 58, 35, 55, 64,
- 252, 59, 31, 31, 32, 35, 75, 66, 35, 33,
+ 254, 59, 31, 31, 32, 35, 75, 66, 35, 33,
28, 28, 28, 29, 68, 35, 48, 28, 37, 60,
60, 60, 61, 60, 35, 67, 60, 62, 35, 35,
35, 35, 72, 71, 73, 69, 35, 35, 35, 35,
- 35, 35, 84, 80, 76, 70, 28, 58, 35, 35,
+ 35, 35, 253, 80, 76, 70, 28, 58, 35, 35,
28, 82, 59, 85, 77, 78, 83, 79, 87, 74,
76, 86, 35, 35, 35, 35, 35, 35, 35, 90,
94, 95, 35, 35, 35, 97, 88, 35, 91, 92,
@@ -594,11 +596,11 @@ static yyconst flex_int16_t yy_nxt[696] =
103, 105, 105, 60, 106, 105, 139, 115, 105, 108,
111, 114, 117, 117, 60, 118, 117, 35, 35, 117,
- 120, 121, 121, 60, 122, 121, 130, 250, 121, 124,
+ 120, 121, 121, 60, 122, 121, 130, 251, 121, 124,
35, 100, 125, 35, 126, 126, 60, 127, 126, 35,
35, 126, 129, 131, 132, 35, 28, 135, 133, 28,
137, 140, 136, 35, 147, 138, 35, 35, 148, 146,
- 35, 29, 170, 35, 35, 178, 35, 219, 141, 142,
+ 35, 29, 170, 35, 35, 178, 35, 249, 141, 142,
142, 60, 143, 142, 28, 151, 142, 145, 219, 35,
152, 28, 153, 160, 149, 28, 156, 154, 28, 158,
35, 157, 28, 162, 159, 28, 164, 166, 163, 28,
@@ -615,37 +617,37 @@ static yyconst flex_int16_t yy_nxt[696] =
60, 228, 227, 219, 35, 227, 230, 232, 242, 236,
28, 207, 28, 238, 28, 240, 208, 219, 239, 219,
- 241, 28, 238, 245, 35, 219, 243, 239, 211, 198,
- 234, 194, 231, 226, 223, 247, 216, 246, 169, 211,
- 198, 194, 192, 249, 26, 26, 26, 26, 28, 28,
+ 241, 28, 238, 245, 35, 219, 243, 239, 219, 211,
+ 198, 234, 194, 231, 226, 247, 223, 246, 216, 169,
+ 211, 198, 194, 250, 26, 26, 26, 26, 28, 28,
28, 30, 30, 30, 30, 35, 35, 35, 35, 56,
- 169, 56, 56, 57, 57, 57, 57, 59, 116, 59,
- 59, 34, 34, 34, 34, 63, 63, 113, 63, 81,
- 81, 81, 81, 83, 84, 83, 83, 107, 107, 107,
+ 192, 56, 56, 57, 57, 57, 57, 59, 169, 59,
+ 59, 34, 34, 34, 34, 63, 63, 116, 63, 81,
+ 81, 81, 81, 83, 113, 83, 83, 107, 107, 107,
107, 119, 119, 119, 119, 123, 123, 123, 123, 128,
- 128, 128, 128, 134, 134, 134, 134, 136, 35, 136,
+ 128, 128, 128, 134, 134, 134, 134, 136, 84, 136,
136, 144, 144, 144, 144, 150, 150, 150, 150, 152,
- 29, 152, 152, 155, 155, 155, 155, 157, 53, 157,
- 157, 161, 161, 161, 161, 163, 51, 163, 163, 168,
- 168, 168, 168, 138, 35, 138, 138, 173, 173, 173,
- 173, 175, 29, 175, 175, 181, 181, 181, 181, 185,
- 185, 185, 185, 154, 253, 154, 154, 159, 27, 159,
+ 35, 152, 152, 155, 155, 155, 155, 157, 29, 157,
+ 157, 161, 161, 161, 161, 163, 53, 163, 163, 168,
+ 168, 168, 168, 138, 51, 138, 138, 173, 173, 173,
+ 173, 175, 35, 175, 175, 181, 181, 181, 181, 185,
+ 185, 185, 185, 154, 29, 154, 154, 159, 255, 159,
159, 165, 27, 165, 165, 191, 191, 191, 191, 193,
- 193, 193, 193, 177, 253, 177, 177, 197, 197, 197,
- 197, 199, 199, 199, 199, 201, 253, 201, 201, 204,
- 204, 204, 204, 206, 253, 206, 206, 210, 210, 210,
+ 193, 193, 193, 177, 27, 177, 177, 197, 197, 197,
+ 197, 199, 199, 199, 199, 201, 255, 201, 201, 204,
+ 204, 204, 204, 206, 255, 206, 206, 210, 210, 210,
210, 213, 213, 213, 213, 215, 215, 215, 215, 218,
- 218, 218, 218, 222, 222, 222, 222, 203, 253, 203,
- 203, 208, 253, 208, 208, 225, 225, 225, 225, 229,
- 229, 229, 229, 214, 253, 214, 214, 233, 233, 233,
- 233, 237, 237, 237, 237, 239, 253, 239, 239, 241,
- 253, 241, 241, 248, 248, 253, 248, 251, 251, 251,
- 251, 5, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253
+ 218, 218, 218, 222, 222, 222, 222, 203, 255, 203,
+ 203, 208, 255, 208, 208, 225, 225, 225, 225, 229,
+ 229, 229, 229, 214, 255, 214, 214, 233, 233, 233,
+ 233, 237, 237, 237, 237, 239, 255, 239, 239, 241,
+ 255, 241, 241, 248, 248, 248, 248, 252, 252, 252,
+ 252, 5, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255
} ;
@@ -656,11 +658,11 @@ static yyconst flex_int16_t yy_chk[696] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 7, 7, 7, 8, 8, 8, 13,
7, 15, 13, 8, 11, 11, 11, 11, 11, 14,
- 251, 11, 11, 14, 15, 11, 19, 19, 18, 16,
+ 252, 11, 11, 14, 15, 11, 19, 19, 18, 16,
39, 11, 12, 12, 12, 12, 12, 16, 20, 12,
12, 12, 18, 16, 39, 20, 18, 21, 23, 21,
23, 25, 50, 42, 25, 30, 30, 38, 25, 38,
- 249, 30, 31, 31, 31, 40, 50, 40, 41, 31,
+ 250, 30, 31, 31, 31, 40, 50, 40, 41, 31,
34, 34, 34, 34, 42, 43, 43, 34, 34, 36,
36, 36, 36, 36, 44, 41, 36, 36, 45, 46,
@@ -679,7 +681,7 @@ static yyconst flex_int16_t yy_chk[696] =
104, 99, 98, 99, 100, 100, 100, 100, 100, 102,
113, 100, 100, 102, 103, 103, 105, 105, 104, 107,
107, 110, 105, 111, 114, 107, 114, 110, 115, 113,
- 115, 116, 133, 133, 125, 146, 146, 233, 111, 112,
+ 115, 116, 133, 133, 125, 146, 146, 245, 111, 112,
112, 112, 112, 112, 117, 117, 112, 112, 236, 130,
117, 119, 119, 125, 116, 121, 121, 119, 123, 123,
131, 121, 126, 126, 123, 128, 128, 130, 126, 134,
@@ -696,37 +698,37 @@ static yyconst flex_int16_t yy_chk[696] =
212, 212, 212, 235, 232, 212, 212, 217, 232, 221,
224, 224, 227, 227, 229, 229, 224, 243, 227, 244,
- 229, 237, 237, 242, 242, 246, 235, 237, 225, 222,
- 218, 215, 213, 210, 197, 244, 193, 243, 191, 188,
- 178, 170, 168, 246, 254, 254, 254, 254, 255, 255,
- 255, 256, 256, 256, 256, 257, 257, 257, 257, 258,
- 132, 258, 258, 259, 259, 259, 259, 260, 94, 260,
- 260, 261, 261, 261, 261, 262, 262, 91, 262, 263,
- 263, 263, 263, 264, 63, 264, 264, 265, 265, 265,
- 265, 266, 266, 266, 266, 267, 267, 267, 267, 268,
- 268, 268, 268, 269, 269, 269, 269, 270, 35, 270,
-
- 270, 271, 271, 271, 271, 272, 272, 272, 272, 273,
- 28, 273, 273, 274, 274, 274, 274, 275, 24, 275,
- 275, 276, 276, 276, 276, 277, 22, 277, 277, 278,
- 278, 278, 278, 279, 17, 279, 279, 280, 280, 280,
- 280, 281, 6, 281, 281, 282, 282, 282, 282, 283,
- 283, 283, 283, 284, 5, 284, 284, 285, 4, 285,
- 285, 286, 3, 286, 286, 287, 287, 287, 287, 288,
- 288, 288, 288, 289, 0, 289, 289, 290, 290, 290,
- 290, 291, 291, 291, 291, 292, 0, 292, 292, 293,
- 293, 293, 293, 294, 0, 294, 294, 295, 295, 295,
-
- 295, 296, 296, 296, 296, 297, 297, 297, 297, 298,
- 298, 298, 298, 299, 299, 299, 299, 300, 0, 300,
- 300, 301, 0, 301, 301, 302, 302, 302, 302, 303,
- 303, 303, 303, 304, 0, 304, 304, 305, 305, 305,
- 305, 306, 306, 306, 306, 307, 0, 307, 307, 308,
- 0, 308, 308, 309, 309, 0, 309, 310, 310, 310,
- 310, 253, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253
+ 229, 237, 237, 242, 242, 246, 235, 237, 233, 225,
+ 222, 218, 215, 213, 210, 244, 197, 243, 193, 191,
+ 188, 178, 170, 246, 256, 256, 256, 256, 257, 257,
+ 257, 258, 258, 258, 258, 259, 259, 259, 259, 260,
+ 168, 260, 260, 261, 261, 261, 261, 262, 132, 262,
+ 262, 263, 263, 263, 263, 264, 264, 94, 264, 265,
+ 265, 265, 265, 266, 91, 266, 266, 267, 267, 267,
+ 267, 268, 268, 268, 268, 269, 269, 269, 269, 270,
+ 270, 270, 270, 271, 271, 271, 271, 272, 63, 272,
+
+ 272, 273, 273, 273, 273, 274, 274, 274, 274, 275,
+ 35, 275, 275, 276, 276, 276, 276, 277, 28, 277,
+ 277, 278, 278, 278, 278, 279, 24, 279, 279, 280,
+ 280, 280, 280, 281, 22, 281, 281, 282, 282, 282,
+ 282, 283, 17, 283, 283, 284, 284, 284, 284, 285,
+ 285, 285, 285, 286, 6, 286, 286, 287, 5, 287,
+ 287, 288, 4, 288, 288, 289, 289, 289, 289, 290,
+ 290, 290, 290, 291, 3, 291, 291, 292, 292, 292,
+ 292, 293, 293, 293, 293, 294, 0, 294, 294, 295,
+ 295, 295, 295, 296, 0, 296, 296, 297, 297, 297,
+
+ 297, 298, 298, 298, 298, 299, 299, 299, 299, 300,
+ 300, 300, 300, 301, 301, 301, 301, 302, 0, 302,
+ 302, 303, 0, 303, 303, 304, 304, 304, 304, 305,
+ 305, 305, 305, 306, 0, 306, 306, 307, 307, 307,
+ 307, 308, 308, 308, 308, 309, 0, 309, 309, 310,
+ 0, 310, 310, 311, 311, 311, 311, 312, 312, 312,
+ 312, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255
} ;
@@ -858,7 +860,7 @@ static void setbackendtype(DiskParseContext *dpc, const char *str) {
#define DEPRECATE(usewhatinstead) /* not currently reported */
-#line 862 "libxlu_disk_l.c"
+#line 864 "libxlu_disk_l.c"
#define INITIAL 0
#define LEXERR 1
@@ -1099,7 +1101,7 @@ YY_DECL
/*----- the scanner rules which do the parsing -----*/
-#line 1103 "libxlu_disk_l.c"
+#line 1105 "libxlu_disk_l.c"
if ( !yyg->yy_init )
{
@@ -1163,14 +1165,14 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 254 )
+ if ( yy_current_state >= 256 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
*yyg->yy_state_ptr++ = yy_current_state;
++yy_cp;
}
- while ( yy_current_state != 253 );
+ while ( yy_current_state != 255 );
yy_find_action:
yy_current_state = *--yyg->yy_state_ptr;
@@ -1422,7 +1424,7 @@ YY_RULE_SETUP
#line 227 "libxlu_disk_l.l"
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
-#line 1426 "libxlu_disk_l.c"
+#line 1428 "libxlu_disk_l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(LEXERR):
yyterminate();
@@ -1686,7 +1688,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 254 )
+ if ( yy_current_state >= 256 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1710,11 +1712,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 254 )
+ if ( yy_current_state >= 256 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 253);
+ yy_is_jam = (yy_current_state == 255);
if ( ! yy_is_jam )
*yyg->yy_state_ptr++ = yy_current_state;
diff --git a/tools/libxl/libxlu_disk_l.l b/tools/libxl/libxlu_disk_l.l
index 22037d6f17..a3e71808fa 100644
--- a/tools/libxl/libxlu_disk_l.l
+++ b/tools/libxl/libxlu_disk_l.l
@@ -139,7 +139,7 @@ devtype=disk,? { DPC->disk->is_cdrom = 0; }
devtype=[^,]*,? { xlu__disk_err(DPC,yytext,"unknown value for type"); }
access=[^,]*,? { STRIP(','); setaccess(DPC, FROMEQUALS); }
-backendtype=[^,]*? { STRIP(','); setbackendtype(DPC,FROMEQUALS); }
+backendtype=[^,]*,? { STRIP(','); setbackendtype(DPC,FROMEQUALS); }
vdev=[^,]*,? { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); }
script=[^,]*,? { STRIP(','); SAVESTRING("script", script, FROMEQUALS); }