Skip to content

Commit 35c517f

Browse files
dandersondanderson
authored
Merge pull request digitalocean#134 from danderson/fix-funcargs
internal/qmp-gen: correctly capitalize function arguments.
2 parents 8ae9a10 + 7587f84 commit 35c517f

File tree

2 files changed

+53
-45
lines changed

2 files changed

+53
-45
lines changed

‎internal/qmp-gen/generate.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"reflect"
2222
"strings"
2323
"text/template"
24+
25+
"github.com/fatih/camelcase"
2426
)
2527

2628
// neededTypes returns the subset of API that should be rendered to file.
@@ -137,7 +139,13 @@ func renderAPI(templateDir string, api, need map[name]interface{}) ([]byte, erro
137139
return strings.ToLower(reflect.TypeOf(v).Name())
138140
},
139141
"unexport": func(s string) string {
140-
ret := strings.ToLower(s[:1]) + s[1:]
142+
ws := camelcase.Split(s)
143+
if upperWords[strings.ToLower(ws[0])] {
144+
ws[0] = strings.ToLower(ws[0])
145+
} else {
146+
ws[0] = strings.ToLower(ws[0][:1]) + ws[0][1:]
147+
}
148+
ret := strings.Join(ws, "")
141149
if ret == "type" {
142150
return "typ"
143151
}

‎qmp/raw/autogen.go‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9008,7 +9008,7 @@ func (m *Monitor) AddFD(fdsetID *int64, opaque *string) (ret AddfdInfo, err erro
90089008
// add_client -> AddClient (command)
90099009

90109010
// AddClient implements the "add_client" QMP API call.
9011-
func (m *Monitor) AddClient(protocol string, fdname string, skipauth *bool, tLS *bool) (err error) {
9011+
func (m *Monitor) AddClient(protocol string, fdname string, skipauth *bool, tls *bool) (err error) {
90129012
cmd := struct {
90139013
Protocol string `json:"protocol"`
90149014
Fdname string `json:"fdname"`
@@ -9018,7 +9018,7 @@ func (m *Monitor) AddClient(protocol string, fdname string, skipauth *bool, tLS
90189018
protocol,
90199019
fdname,
90209020
skipauth,
9021-
tLS,
9021+
tls,
90229022
}
90239023
bs, err := json.Marshal(map[string]interface{}{
90249024
"execute": "add_client",
@@ -9460,7 +9460,7 @@ func (m *Monitor) BlockdevBackup(cmd *BlockdevBackup) (err error) {
94609460
// blockdev-change-medium -> BlockdevChangeMedium (command)
94619461

94629462
// BlockdevChangeMedium implements the "blockdev-change-medium" QMP API call.
9463-
func (m *Monitor) BlockdevChangeMedium(device *string, iD *string, filename string, format *string, readOnlyMode *BlockdevChangeReadOnlyMode) (err error) {
9463+
func (m *Monitor) BlockdevChangeMedium(device *string, id *string, filename string, format *string, readOnlyMode *BlockdevChangeReadOnlyMode) (err error) {
94649464
cmd := struct {
94659465
Device *string `json:"device,omitempty"`
94669466
ID *string `json:"id,omitempty"`
@@ -9469,7 +9469,7 @@ func (m *Monitor) BlockdevChangeMedium(device *string, iD *string, filename stri
94699469
ReadOnlyMode *BlockdevChangeReadOnlyMode `json:"read-only-mode,omitempty"`
94709470
}{
94719471
device,
9472-
iD,
9472+
id,
94739473
filename,
94749474
format,
94759475
readOnlyMode,
@@ -9491,13 +9491,13 @@ func (m *Monitor) BlockdevChangeMedium(device *string, iD *string, filename stri
94919491
// blockdev-close-tray -> BlockdevCloseTray (command)
94929492

94939493
// BlockdevCloseTray implements the "blockdev-close-tray" QMP API call.
9494-
func (m *Monitor) BlockdevCloseTray(device *string, iD *string) (err error) {
9494+
func (m *Monitor) BlockdevCloseTray(device *string, id *string) (err error) {
94959495
cmd := struct {
94969496
Device *string `json:"device,omitempty"`
94979497
ID *string `json:"id,omitempty"`
94989498
}{
94999499
device,
9500-
iD,
9500+
id,
95019501
}
95029502
bs, err := json.Marshal(map[string]interface{}{
95039503
"execute": "blockdev-close-tray",
@@ -9557,14 +9557,14 @@ func (m *Monitor) BlockdevMirror(jobID *string, device string, target string, re
95579557
// blockdev-open-tray -> BlockdevOpenTray (command)
95589558

95599559
// BlockdevOpenTray implements the "blockdev-open-tray" QMP API call.
9560-
func (m *Monitor) BlockdevOpenTray(device *string, iD *string, force *bool) (err error) {
9560+
func (m *Monitor) BlockdevOpenTray(device *string, id *string, force *bool) (err error) {
95619561
cmd := struct {
95629562
Device *string `json:"device,omitempty"`
95639563
ID *string `json:"id,omitempty"`
95649564
Force *bool `json:"force,omitempty"`
95659565
}{
95669566
device,
9567-
iD,
9567+
id,
95689568
force,
95699569
}
95709570
bs, err := json.Marshal(map[string]interface{}{
@@ -9609,14 +9609,14 @@ func (m *Monitor) BlockdevSnapshot(node string, overlay string) (err error) {
96099609
// blockdev-snapshot-delete-internal-sync -> BlockdevSnapshotDeleteInternalSync (command)
96109610

96119611
// BlockdevSnapshotDeleteInternalSync implements the "blockdev-snapshot-delete-internal-sync" QMP API call.
9612-
func (m *Monitor) BlockdevSnapshotDeleteInternalSync(device string, iD *string, name *string) (ret SnapshotInfo, err error) {
9612+
func (m *Monitor) BlockdevSnapshotDeleteInternalSync(device string, id *string, name *string) (ret SnapshotInfo, err error) {
96139613
cmd := struct {
96149614
Device string `json:"device"`
96159615
ID *string `json:"id,omitempty"`
96169616
Name *string `json:"name,omitempty"`
96179617
}{
96189618
device,
9619-
iD,
9619+
id,
96209620
name,
96219621
}
96229622
bs, err := json.Marshal(map[string]interface{}{
@@ -9780,12 +9780,12 @@ func (m *Monitor) ChangeVNCPassword(password string) (err error) {
97809780
// chardev-add -> ChardevAdd (command)
97819781

97829782
// ChardevAdd implements the "chardev-add" QMP API call.
9783-
func (m *Monitor) ChardevAdd(iD string, backend ChardevBackend) (ret ChardevReturn, err error) {
9783+
func (m *Monitor) ChardevAdd(id string, backend ChardevBackend) (ret ChardevReturn, err error) {
97849784
cmd := struct {
97859785
ID string `json:"id"`
97869786
Backend ChardevBackend `json:"backend"`
97879787
}{
9788-
iD,
9788+
id,
97899789
backend,
97909790
}
97919791
bs, err := json.Marshal(map[string]interface{}{
@@ -9814,11 +9814,11 @@ func (m *Monitor) ChardevAdd(iD string, backend ChardevBackend) (ret ChardevRetu
98149814
// chardev-remove -> ChardevRemove (command)
98159815

98169816
// ChardevRemove implements the "chardev-remove" QMP API call.
9817-
func (m *Monitor) ChardevRemove(iD string) (err error) {
9817+
func (m *Monitor) ChardevRemove(id string) (err error) {
98189818
cmd := struct {
98199819
ID string `json:"id"`
98209820
}{
9821-
iD,
9821+
id,
98229822
}
98239823
bs, err := json.Marshal(map[string]interface{}{
98249824
"execute": "chardev-remove",
@@ -9837,7 +9837,7 @@ func (m *Monitor) ChardevRemove(iD string) (err error) {
98379837
// client_migrate_info -> ClientMigrateInfo (command)
98389838

98399839
// ClientMigrateInfo implements the "client_migrate_info" QMP API call.
9840-
func (m *Monitor) ClientMigrateInfo(protocol string, hostname string, port *int64, tLSPort *int64, certSubject *string) (err error) {
9840+
func (m *Monitor) ClientMigrateInfo(protocol string, hostname string, port *int64, tlsPort *int64, certSubject *string) (err error) {
98419841
cmd := struct {
98429842
Protocol string `json:"protocol"`
98439843
Hostname string `json:"hostname"`
@@ -9848,7 +9848,7 @@ func (m *Monitor) ClientMigrateInfo(protocol string, hostname string, port *int6
98489848
protocol,
98499849
hostname,
98509850
port,
9851-
tLSPort,
9851+
tlsPort,
98529852
certSubject,
98539853
}
98549854
bs, err := json.Marshal(map[string]interface{}{
@@ -9934,11 +9934,11 @@ func (m *Monitor) CPU(index int64) (err error) {
99349934
// cpu-add -> CPUAdd (command)
99359935

99369936
// CPUAdd implements the "cpu-add" QMP API call.
9937-
func (m *Monitor) CPUAdd(iD int64) (err error) {
9937+
func (m *Monitor) CPUAdd(id int64) (err error) {
99389938
cmd := struct {
99399939
ID int64 `json:"id"`
99409940
}{
9941-
iD,
9941+
id,
99429942
}
99439943
bs, err := json.Marshal(map[string]interface{}{
99449944
"execute": "cpu-add",
@@ -9989,13 +9989,13 @@ func (m *Monitor) DeviceListProperties(typename string) (ret []DevicePropertyInf
99899989
// device_add -> DeviceAdd (command)
99909990

99919991
// DeviceAdd implements the "device_add" QMP API call.
9992-
func (m *Monitor) DeviceAdd(driver string, iD string) (err error) {
9992+
func (m *Monitor) DeviceAdd(driver string, id string) (err error) {
99939993
cmd := struct {
99949994
Driver string `json:"driver"`
99959995
ID string `json:"id"`
99969996
}{
99979997
driver,
9998-
iD,
9998+
id,
99999999
}
1000010000
bs, err := json.Marshal(map[string]interface{}{
1000110001
"execute": "device_add",
@@ -10014,11 +10014,11 @@ func (m *Monitor) DeviceAdd(driver string, iD string) (err error) {
1001410014
// device_del -> DeviceDel (command)
1001510015

1001610016
// DeviceDel implements the "device_del" QMP API call.
10017-
func (m *Monitor) DeviceDel(iD string) (err error) {
10017+
func (m *Monitor) DeviceDel(id string) (err error) {
1001810018
cmd := struct {
1001910019
ID string `json:"id"`
1002010020
}{
10021-
iD,
10021+
id,
1002210022
}
1002310023
bs, err := json.Marshal(map[string]interface{}{
1002410024
"execute": "device_del",
@@ -10129,14 +10129,14 @@ func (m *Monitor) DumpSkeys(filename string) (err error) {
1012910129
// eject -> Eject (command)
1013010130

1013110131
// Eject implements the "eject" QMP API call.
10132-
func (m *Monitor) Eject(device *string, iD *string, force *bool) (err error) {
10132+
func (m *Monitor) Eject(device *string, id *string, force *bool) (err error) {
1013310133
cmd := struct {
1013410134
Device *string `json:"device,omitempty"`
1013510135
ID *string `json:"id,omitempty"`
1013610136
Force *bool `json:"force,omitempty"`
1013710137
}{
1013810138
device,
10139-
iD,
10139+
id,
1014010140
force,
1014110141
}
1014210142
bs, err := json.Marshal(map[string]interface{}{
@@ -10204,13 +10204,13 @@ func (m *Monitor) Getfd(fdname string) (err error) {
1020410204
// human-monitor-command -> HumanMonitorCommand (command)
1020510205

1020610206
// HumanMonitorCommand implements the "human-monitor-command" QMP API call.
10207-
func (m *Monitor) HumanMonitorCommand(commandLine string, cPUIndex *int64) (ret string, err error) {
10207+
func (m *Monitor) HumanMonitorCommand(commandLine string, cpuIndex *int64) (ret string, err error) {
1020810208
cmd := struct {
1020910209
CommandLine string `json:"command-line"`
1021010210
CPUIndex *int64 `json:"cpu-index,omitempty"`
1021110211
}{
1021210212
commandLine,
10213-
cPUIndex,
10213+
cpuIndex,
1021410214
}
1021510215
bs, err := json.Marshal(map[string]interface{}{
1021610216
"execute": "human-monitor-command",
@@ -10285,7 +10285,7 @@ func (m *Monitor) InputSendEvent(device *string, head *int64, events []InputEven
1028510285
// memsave -> Memsave (command)
1028610286

1028710287
// Memsave implements the "memsave" QMP API call.
10288-
func (m *Monitor) Memsave(val int64, size int64, filename string, cPUIndex *int64) (err error) {
10288+
func (m *Monitor) Memsave(val int64, size int64, filename string, cpuIndex *int64) (err error) {
1028910289
cmd := struct {
1029010290
Val int64 `json:"val"`
1029110291
Size int64 `json:"size"`
@@ -10295,7 +10295,7 @@ func (m *Monitor) Memsave(val int64, size int64, filename string, cPUIndex *int6
1029510295
val,
1029610296
size,
1029710297
filename,
10298-
cPUIndex,
10298+
cpuIndex,
1029910299
}
1030010300
bs, err := json.Marshal(map[string]interface{}{
1030110301
"execute": "memsave",
@@ -10541,13 +10541,13 @@ func (m *Monitor) NBDServerAdd(device string, writable *bool) (err error) {
1054110541
// nbd-server-start -> NBDServerStart (command)
1054210542

1054310543
// NBDServerStart implements the "nbd-server-start" QMP API call.
10544-
func (m *Monitor) NBDServerStart(addr SocketAddress, tLSCreds *string) (err error) {
10544+
func (m *Monitor) NBDServerStart(addr SocketAddress, tlsCreds *string) (err error) {
1054510545
cmd := struct {
1054610546
Addr SocketAddress `json:"addr"`
1054710547
TLSCreds *string `json:"tls-creds,omitempty"`
1054810548
}{
1054910549
addr,
10550-
tLSCreds,
10550+
tlsCreds,
1055110551
}
1055210552
bs, err := json.Marshal(map[string]interface{}{
1055310553
"execute": "nbd-server-start",
@@ -10586,13 +10586,13 @@ func (m *Monitor) NBDServerStop() (err error) {
1058610586
// netdev_add -> NetdevAdd (command)
1058710587

1058810588
// NetdevAdd implements the "netdev_add" QMP API call.
10589-
func (m *Monitor) NetdevAdd(typ string, iD string) (err error) {
10589+
func (m *Monitor) NetdevAdd(typ string, id string) (err error) {
1059010590
cmd := struct {
1059110591
Type string `json:"type"`
1059210592
ID string `json:"id"`
1059310593
}{
1059410594
typ,
10595-
iD,
10595+
id,
1059610596
}
1059710597
bs, err := json.Marshal(map[string]interface{}{
1059810598
"execute": "netdev_add",
@@ -10611,11 +10611,11 @@ func (m *Monitor) NetdevAdd(typ string, iD string) (err error) {
1061110611
// netdev_del -> NetdevDel (command)
1061210612

1061310613
// NetdevDel implements the "netdev_del" QMP API call.
10614-
func (m *Monitor) NetdevDel(iD string) (err error) {
10614+
func (m *Monitor) NetdevDel(id string) (err error) {
1061510615
cmd := struct {
1061610616
ID string `json:"id"`
1061710617
}{
10618-
iD,
10618+
id,
1061910619
}
1062010620
bs, err := json.Marshal(map[string]interface{}{
1062110621
"execute": "netdev_del",
@@ -10634,14 +10634,14 @@ func (m *Monitor) NetdevDel(iD string) (err error) {
1063410634
// object-add -> ObjectAdd (command)
1063510635

1063610636
// ObjectAdd implements the "object-add" QMP API call.
10637-
func (m *Monitor) ObjectAdd(qomType string, iD string, props *interface{}) (err error) {
10637+
func (m *Monitor) ObjectAdd(qomType string, id string, props *interface{}) (err error) {
1063810638
cmd := struct {
1063910639
QomType string `json:"qom-type"`
1064010640
ID string `json:"id"`
1064110641
Props *interface{} `json:"props,omitempty"`
1064210642
}{
1064310643
qomType,
10644-
iD,
10644+
id,
1064510645
props,
1064610646
}
1064710647
bs, err := json.Marshal(map[string]interface{}{
@@ -10661,11 +10661,11 @@ func (m *Monitor) ObjectAdd(qomType string, iD string, props *interface{}) (err
1066110661
// object-del -> ObjectDel (command)
1066210662

1066310663
// ObjectDel implements the "object-del" QMP API call.
10664-
func (m *Monitor) ObjectDel(iD string) (err error) {
10664+
func (m *Monitor) ObjectDel(id string) (err error) {
1066510665
cmd := struct {
1066610666
ID string `json:"id"`
1066710667
}{
10668-
iD,
10668+
id,
1066910669
}
1067010670
bs, err := json.Marshal(map[string]interface{}{
1067110671
"execute": "object-del",
@@ -12363,13 +12363,13 @@ func (m *Monitor) Quit() (err error) {
1236312363
// remove-fd -> RemoveFD (command)
1236412364

1236512365
// RemoveFD implements the "remove-fd" QMP API call.
12366-
func (m *Monitor) RemoveFD(fdsetID int64, fD *int64) (err error) {
12366+
func (m *Monitor) RemoveFD(fdsetID int64, fd *int64) (err error) {
1236712367
cmd := struct {
1236812368
FdsetID int64 `json:"fdset-id"`
1236912369
FD *int64 `json:"fd,omitempty"`
1237012370
}{
1237112371
fdsetID,
12372-
fD,
12372+
fd,
1237312373
}
1237412374
bs, err := json.Marshal(map[string]interface{}{
1237512375
"execute": "remove-fd",
@@ -12789,14 +12789,14 @@ func (m *Monitor) XBlockdevDel(nodeName string) (err error) {
1278912789
// x-blockdev-insert-medium -> XBlockdevInsertMedium (command)
1279012790

1279112791
// XBlockdevInsertMedium implements the "x-blockdev-insert-medium" QMP API call.
12792-
func (m *Monitor) XBlockdevInsertMedium(device *string, iD *string, nodeName string) (err error) {
12792+
func (m *Monitor) XBlockdevInsertMedium(device *string, id *string, nodeName string) (err error) {
1279312793
cmd := struct {
1279412794
Device *string `json:"device,omitempty"`
1279512795
ID *string `json:"id,omitempty"`
1279612796
NodeName string `json:"node-name"`
1279712797
}{
1279812798
device,
12799-
iD,
12799+
id,
1280012800
nodeName,
1280112801
}
1280212802
bs, err := json.Marshal(map[string]interface{}{
@@ -12816,13 +12816,13 @@ func (m *Monitor) XBlockdevInsertMedium(device *string, iD *string, nodeName str
1281612816
// x-blockdev-remove-medium -> XBlockdevRemoveMedium (command)
1281712817

1281812818
// XBlockdevRemoveMedium implements the "x-blockdev-remove-medium" QMP API call.
12819-
func (m *Monitor) XBlockdevRemoveMedium(device *string, iD *string) (err error) {
12819+
func (m *Monitor) XBlockdevRemoveMedium(device *string, id *string) (err error) {
1282012820
cmd := struct {
1282112821
Device *string `json:"device,omitempty"`
1282212822
ID *string `json:"id,omitempty"`
1282312823
}{
1282412824
device,
12825-
iD,
12825+
id,
1282612826
}
1282712827
bs, err := json.Marshal(map[string]interface{}{
1282812828
"execute": "x-blockdev-remove-medium",

0 commit comments

Comments
 (0)