Skip to content

Commit cfb18a4

Browse files
committed
internal/qmp-gen: AIO is acronym
1 parent 319934c commit cfb18a4

File tree

2 files changed

+49
-48
lines changed

2 files changed

+49
-48
lines changed

internal/qmp-gen/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ var builtinTypes = map[string]string{
454454
var upperWords = map[string]bool{
455455
"acpi": true,
456456
"acpiost": true,
457+
"aio": true,
457458
"cpu": true,
458459
"fd": true,
459460
"ftp": true,

qmp/raw/autogen.go

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ const (
191191
BlkdebugEventL2UpdateCompressed
192192
BlkdebugEventL2AllocCowRead
193193
BlkdebugEventL2AllocWrite
194-
BlkdebugEventReadAio
195-
BlkdebugEventReadBackingAio
194+
BlkdebugEventReadAIO
195+
BlkdebugEventReadBackingAIO
196196
BlkdebugEventReadCompressed
197-
BlkdebugEventWriteAio
197+
BlkdebugEventWriteAIO
198198
BlkdebugEventWriteCompressed
199199
BlkdebugEventVmstateLoad
200200
BlkdebugEventVmstateSave
@@ -248,13 +248,13 @@ func (e BlkdebugEvent) String() string {
248248
return "l2_alloc_cow_read"
249249
case BlkdebugEventL2AllocWrite:
250250
return "l2_alloc_write"
251-
case BlkdebugEventReadAio:
251+
case BlkdebugEventReadAIO:
252252
return "read_aio"
253-
case BlkdebugEventReadBackingAio:
253+
case BlkdebugEventReadBackingAIO:
254254
return "read_backing_aio"
255255
case BlkdebugEventReadCompressed:
256256
return "read_compressed"
257-
case BlkdebugEventWriteAio:
257+
case BlkdebugEventWriteAIO:
258258
return "write_aio"
259259
case BlkdebugEventWriteCompressed:
260260
return "write_compressed"
@@ -342,13 +342,13 @@ func (e BlkdebugEvent) MarshalJSON() ([]byte, error) {
342342
return json.Marshal("l2_alloc_cow_read")
343343
case BlkdebugEventL2AllocWrite:
344344
return json.Marshal("l2_alloc_write")
345-
case BlkdebugEventReadAio:
345+
case BlkdebugEventReadAIO:
346346
return json.Marshal("read_aio")
347-
case BlkdebugEventReadBackingAio:
347+
case BlkdebugEventReadBackingAIO:
348348
return json.Marshal("read_backing_aio")
349349
case BlkdebugEventReadCompressed:
350350
return json.Marshal("read_compressed")
351-
case BlkdebugEventWriteAio:
351+
case BlkdebugEventWriteAIO:
352352
return json.Marshal("write_aio")
353353
case BlkdebugEventWriteCompressed:
354354
return json.Marshal("write_compressed")
@@ -441,13 +441,13 @@ func (e *BlkdebugEvent) UnmarshalJSON(bs []byte) error {
441441
case "l2_alloc_write":
442442
*e = BlkdebugEventL2AllocWrite
443443
case "read_aio":
444-
*e = BlkdebugEventReadAio
444+
*e = BlkdebugEventReadAIO
445445
case "read_backing_aio":
446-
*e = BlkdebugEventReadBackingAio
446+
*e = BlkdebugEventReadBackingAIO
447447
case "read_compressed":
448448
*e = BlkdebugEventReadCompressed
449449
case "write_aio":
450-
*e = BlkdebugEventWriteAio
450+
*e = BlkdebugEventWriteAIO
451451
case "write_compressed":
452452
*e = BlkdebugEventWriteCompressed
453453
case "vmstate_load":
@@ -897,54 +897,54 @@ type BlockStats struct {
897897
Backing *BlockStats `json:"backing,omitempty"`
898898
}
899899

900-
// BlockdevAioOptions -> BlockdevAioOptions (enum)
900+
// BlockdevAioOptions -> BlockdevAIOOptions (enum)
901901

902-
// BlockdevAioOptions implements the "BlockdevAioOptions" QMP API type.
903-
type BlockdevAioOptions int
902+
// BlockdevAIOOptions implements the "BlockdevAioOptions" QMP API type.
903+
type BlockdevAIOOptions int
904904

905-
// Known values of BlockdevAioOptions.
905+
// Known values of BlockdevAIOOptions.
906906
const (
907-
BlockdevAioOptionsThreads BlockdevAioOptions = iota
908-
BlockdevAioOptionsNative
907+
BlockdevAIOOptionsThreads BlockdevAIOOptions = iota
908+
BlockdevAIOOptionsNative
909909
)
910910

911911
// String implements fmt.Stringer.
912-
func (e BlockdevAioOptions) String() string {
912+
func (e BlockdevAIOOptions) String() string {
913913
switch e {
914-
case BlockdevAioOptionsThreads:
914+
case BlockdevAIOOptionsThreads:
915915
return "threads"
916-
case BlockdevAioOptionsNative:
916+
case BlockdevAIOOptionsNative:
917917
return "native"
918918
default:
919-
return fmt.Sprintf("BlockdevAioOptions(%d)", e)
919+
return fmt.Sprintf("BlockdevAIOOptions(%d)", e)
920920
}
921921
}
922922

923923
// MarshalJSON implements json.Marshaler.
924-
func (e BlockdevAioOptions) MarshalJSON() ([]byte, error) {
924+
func (e BlockdevAIOOptions) MarshalJSON() ([]byte, error) {
925925
switch e {
926-
case BlockdevAioOptionsThreads:
926+
case BlockdevAIOOptionsThreads:
927927
return json.Marshal("threads")
928-
case BlockdevAioOptionsNative:
928+
case BlockdevAIOOptionsNative:
929929
return json.Marshal("native")
930930
default:
931-
return nil, fmt.Errorf("unknown enum value %q for BlockdevAioOptions", e)
931+
return nil, fmt.Errorf("unknown enum value %q for BlockdevAIOOptions", e)
932932
}
933933
}
934934

935935
// UnmarshalJSON implements json.Unmarshaler.
936-
func (e *BlockdevAioOptions) UnmarshalJSON(bs []byte) error {
936+
func (e *BlockdevAIOOptions) UnmarshalJSON(bs []byte) error {
937937
var s string
938938
if err := json.Unmarshal(bs, &s); err != nil {
939939
return err
940940
}
941941
switch s {
942942
case "threads":
943-
*e = BlockdevAioOptionsThreads
943+
*e = BlockdevAIOOptionsThreads
944944
case "native":
945-
*e = BlockdevAioOptionsNative
945+
*e = BlockdevAIOOptionsNative
946946
default:
947-
return fmt.Errorf("unknown enum value %q for BlockdevAioOptions", s)
947+
return fmt.Errorf("unknown enum value %q for BlockdevAIOOptions", s)
948948
}
949949
return nil
950950
}
@@ -1172,7 +1172,7 @@ const (
11721172
BlockdevDriverHTTP
11731173
BlockdevDriverHTTPS
11741174
BlockdevDriverLUKS
1175-
BlockdevDriverNullAio
1175+
BlockdevDriverNullAIO
11761176
BlockdevDriverNullCo
11771177
BlockdevDriverParallels
11781178
BlockdevDriverQcow
@@ -1222,7 +1222,7 @@ func (e BlockdevDriver) String() string {
12221222
return "https"
12231223
case BlockdevDriverLUKS:
12241224
return "luks"
1225-
case BlockdevDriverNullAio:
1225+
case BlockdevDriverNullAIO:
12261226
return "null-aio"
12271227
case BlockdevDriverNullCo:
12281228
return "null-co"
@@ -1290,7 +1290,7 @@ func (e BlockdevDriver) MarshalJSON() ([]byte, error) {
12901290
return json.Marshal("https")
12911291
case BlockdevDriverLUKS:
12921292
return json.Marshal("luks")
1293-
case BlockdevDriverNullAio:
1293+
case BlockdevDriverNullAIO:
12941294
return json.Marshal("null-aio")
12951295
case BlockdevDriverNullCo:
12961296
return json.Marshal("null-co")
@@ -1363,7 +1363,7 @@ func (e *BlockdevDriver) UnmarshalJSON(bs []byte) error {
13631363
case "luks":
13641364
*e = BlockdevDriverLUKS
13651365
case "null-aio":
1366-
*e = BlockdevDriverNullAio
1366+
*e = BlockdevDriverNullAIO
13671367
case "null-co":
13681368
*e = BlockdevDriverNullCo
13691369
case "parallels":
@@ -1491,7 +1491,7 @@ func (e *BlockdevOnError) UnmarshalJSON(bs []byte) error {
14911491
// - BlockdevOptionsHTTP
14921492
// - BlockdevOptionsHTTPS
14931493
// - BlockdevOptionsLUKS
1494-
// - BlockdevOptionsNullAio
1494+
// - BlockdevOptionsNullAIO
14951495
// - BlockdevOptionsNullCo
14961496
// - BlockdevOptionsParallels
14971497
// - BlockdevOptionsQcow
@@ -1670,7 +1670,7 @@ type BlockdevOptionsFile struct {
16701670
ReadOnly *bool `json:"read-only,omitempty"`
16711671
DetectZeroes *BlockdevDetectZeroesOptions `json:"detect-zeroes,omitempty"`
16721672
Filename string `json:"filename"`
1673-
Aio *BlockdevAioOptions `json:"aio,omitempty"`
1673+
AIO *BlockdevAIOOptions `json:"aio,omitempty"`
16741674
}
16751675

16761676
func (BlockdevOptionsFile) isBlockdevOptions() {}
@@ -1771,7 +1771,7 @@ type BlockdevOptionsHostCdrom struct {
17711771
ReadOnly *bool `json:"read-only,omitempty"`
17721772
DetectZeroes *BlockdevDetectZeroesOptions `json:"detect-zeroes,omitempty"`
17731773
Filename string `json:"filename"`
1774-
Aio *BlockdevAioOptions `json:"aio,omitempty"`
1774+
AIO *BlockdevAIOOptions `json:"aio,omitempty"`
17751775
}
17761776

17771777
func (BlockdevOptionsHostCdrom) isBlockdevOptions() {}
@@ -1796,7 +1796,7 @@ type BlockdevOptionsHostDevice struct {
17961796
ReadOnly *bool `json:"read-only,omitempty"`
17971797
DetectZeroes *BlockdevDetectZeroesOptions `json:"detect-zeroes,omitempty"`
17981798
Filename string `json:"filename"`
1799-
Aio *BlockdevAioOptions `json:"aio,omitempty"`
1799+
AIO *BlockdevAIOOptions `json:"aio,omitempty"`
18001800
}
18011801

18021802
func (BlockdevOptionsHostDevice) isBlockdevOptions() {}
@@ -1885,8 +1885,8 @@ func (s BlockdevOptionsLUKS) MarshalJSON() ([]byte, error) {
18851885
return json.Marshal(v)
18861886
}
18871887

1888-
// BlockdevOptionsNullAio is an implementation of BlockdevOptions.
1889-
type BlockdevOptionsNullAio struct {
1888+
// BlockdevOptionsNullAIO is an implementation of BlockdevOptions.
1889+
type BlockdevOptionsNullAIO struct {
18901890
NodeName *string `json:"node-name,omitempty"`
18911891
Discard *BlockdevDiscardOptions `json:"discard,omitempty"`
18921892
Cache *BlockdevCacheOptions `json:"cache,omitempty"`
@@ -1896,15 +1896,15 @@ type BlockdevOptionsNullAio struct {
18961896
LatencyNs *uint64 `json:"latency-ns,omitempty"`
18971897
}
18981898

1899-
func (BlockdevOptionsNullAio) isBlockdevOptions() {}
1899+
func (BlockdevOptionsNullAIO) isBlockdevOptions() {}
19001900

19011901
// MarshalJSON implements json.Marshaler.
1902-
func (s BlockdevOptionsNullAio) MarshalJSON() ([]byte, error) {
1902+
func (s BlockdevOptionsNullAIO) MarshalJSON() ([]byte, error) {
19031903
v := struct {
19041904
Driver BlockdevDriver `json:"driver"`
1905-
BlockdevOptionsNullAio
1905+
BlockdevOptionsNullAIO
19061906
}{
1907-
BlockdevDriverNullAio,
1907+
BlockdevDriverNullAIO,
19081908
s,
19091909
}
19101910
return json.Marshal(v)
@@ -2332,8 +2332,8 @@ func decodeBlockdevOptions(bs json.RawMessage) (BlockdevOptions, error) {
23322332
var ret BlockdevOptionsLUKS
23332333
err := json.Unmarshal([]byte(bs), &ret)
23342334
return ret, err
2335-
case BlockdevDriverNullAio:
2336-
var ret BlockdevOptionsNullAio
2335+
case BlockdevDriverNullAIO:
2336+
var ret BlockdevOptionsNullAIO
23372337
err := json.Unmarshal([]byte(bs), &ret)
23382338
return ret, err
23392339
case BlockdevDriverNullCo:
@@ -2426,7 +2426,7 @@ func (BlockdevOptionsHostDevice) isBlockdevRef() {}
24262426
func (BlockdevOptionsHTTP) isBlockdevRef() {}
24272427
func (BlockdevOptionsHTTPS) isBlockdevRef() {}
24282428
func (BlockdevOptionsLUKS) isBlockdevRef() {}
2429-
func (BlockdevOptionsNullAio) isBlockdevRef() {}
2429+
func (BlockdevOptionsNullAIO) isBlockdevRef() {}
24302430
func (BlockdevOptionsNullCo) isBlockdevRef() {}
24312431
func (BlockdevOptionsParallels) isBlockdevRef() {}
24322432
func (BlockdevOptionsQcow) isBlockdevRef() {}
@@ -2485,7 +2485,7 @@ func decodeBlockdevRef(bs json.RawMessage) (BlockdevRef, error) {
24852485
return impl, nil
24862486
case BlockdevOptionsLUKS:
24872487
return impl, nil
2488-
case BlockdevOptionsNullAio:
2488+
case BlockdevOptionsNullAIO:
24892489
return impl, nil
24902490
case BlockdevOptionsNullCo:
24912491
return impl, nil

0 commit comments

Comments
 (0)