Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

internal/qmp-gen: correctly capitalize function arguments. #134

Merged
merged 1 commit into from
Oct 20, 2016
Merged

internal/qmp-gen: correctly capitalize function arguments. #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion internal/qmp-gen/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (
"reflect"
"strings"
"text/template"

"github.com/fatih/camelcase"
)

// neededTypes returns the subset of API that should be rendered to file.
Expand Down Expand Up @@ -137,7 +139,13 @@ func renderAPI(templateDir string, api, need map[name]interface{}) ([]byte, erro
return strings.ToLower(reflect.TypeOf(v).Name())
},
"unexport": func(s string) string {
ret := strings.ToLower(s[:1]) + s[1:]
ws := camelcase.Split(s)
if upperWords[strings.ToLower(ws[0])] {
ws[0] = strings.ToLower(ws[0])
} else {
ws[0] = strings.ToLower(ws[0][:1]) + ws[0][1:]
}
ret := strings.Join(ws, "")
if ret == "type" {
return "typ"
}
Expand Down
88 changes: 44 additions & 44 deletions qmp/raw/autogen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9008,7 +9008,7 @@ func (m *Monitor) AddFD(fdsetID *int64, opaque *string) (ret AddfdInfo, err erro
// add_client -> AddClient (command)

// AddClient implements the "add_client" QMP API call.
func (m *Monitor) AddClient(protocol string, fdname string, skipauth *bool, tLS *bool) (err error) {
func (m *Monitor) AddClient(protocol string, fdname string, skipauth *bool, tls *bool) (err error) {
cmd := struct {
Protocol string `json:"protocol"`
Fdname string `json:"fdname"`
Expand All @@ -9018,7 +9018,7 @@ func (m *Monitor) AddClient(protocol string, fdname string, skipauth *bool, tLS
protocol,
fdname,
skipauth,
tLS,
tls,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "add_client",
Expand Down Expand Up @@ -9460,7 +9460,7 @@ func (m *Monitor) BlockdevBackup(cmd *BlockdevBackup) (err error) {
// blockdev-change-medium -> BlockdevChangeMedium (command)

// BlockdevChangeMedium implements the "blockdev-change-medium" QMP API call.
func (m *Monitor) BlockdevChangeMedium(device *string, iD *string, filename string, format *string, readOnlyMode *BlockdevChangeReadOnlyMode) (err error) {
func (m *Monitor) BlockdevChangeMedium(device *string, id *string, filename string, format *string, readOnlyMode *BlockdevChangeReadOnlyMode) (err error) {
cmd := struct {
Device *string `json:"device,omitempty"`
ID *string `json:"id,omitempty"`
Expand All @@ -9469,7 +9469,7 @@ func (m *Monitor) BlockdevChangeMedium(device *string, iD *string, filename stri
ReadOnlyMode *BlockdevChangeReadOnlyMode `json:"read-only-mode,omitempty"`
}{
device,
iD,
id,
filename,
format,
readOnlyMode,
Expand All @@ -9491,13 +9491,13 @@ func (m *Monitor) BlockdevChangeMedium(device *string, iD *string, filename stri
// blockdev-close-tray -> BlockdevCloseTray (command)

// BlockdevCloseTray implements the "blockdev-close-tray" QMP API call.
func (m *Monitor) BlockdevCloseTray(device *string, iD *string) (err error) {
func (m *Monitor) BlockdevCloseTray(device *string, id *string) (err error) {
cmd := struct {
Device *string `json:"device,omitempty"`
ID *string `json:"id,omitempty"`
}{
device,
iD,
id,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "blockdev-close-tray",
Expand Down Expand Up @@ -9557,14 +9557,14 @@ func (m *Monitor) BlockdevMirror(jobID *string, device string, target string, re
// blockdev-open-tray -> BlockdevOpenTray (command)

// BlockdevOpenTray implements the "blockdev-open-tray" QMP API call.
func (m *Monitor) BlockdevOpenTray(device *string, iD *string, force *bool) (err error) {
func (m *Monitor) BlockdevOpenTray(device *string, id *string, force *bool) (err error) {
cmd := struct {
Device *string `json:"device,omitempty"`
ID *string `json:"id,omitempty"`
Force *bool `json:"force,omitempty"`
}{
device,
iD,
id,
force,
}
bs, err := json.Marshal(map[string]interface{}{
Expand Down Expand Up @@ -9609,14 +9609,14 @@ func (m *Monitor) BlockdevSnapshot(node string, overlay string) (err error) {
// blockdev-snapshot-delete-internal-sync -> BlockdevSnapshotDeleteInternalSync (command)

// BlockdevSnapshotDeleteInternalSync implements the "blockdev-snapshot-delete-internal-sync" QMP API call.
func (m *Monitor) BlockdevSnapshotDeleteInternalSync(device string, iD *string, name *string) (ret SnapshotInfo, err error) {
func (m *Monitor) BlockdevSnapshotDeleteInternalSync(device string, id *string, name *string) (ret SnapshotInfo, err error) {
cmd := struct {
Device string `json:"device"`
ID *string `json:"id,omitempty"`
Name *string `json:"name,omitempty"`
}{
device,
iD,
id,
name,
}
bs, err := json.Marshal(map[string]interface{}{
Expand Down Expand Up @@ -9780,12 +9780,12 @@ func (m *Monitor) ChangeVNCPassword(password string) (err error) {
// chardev-add -> ChardevAdd (command)

// ChardevAdd implements the "chardev-add" QMP API call.
func (m *Monitor) ChardevAdd(iD string, backend ChardevBackend) (ret ChardevReturn, err error) {
func (m *Monitor) ChardevAdd(id string, backend ChardevBackend) (ret ChardevReturn, err error) {
cmd := struct {
ID string `json:"id"`
Backend ChardevBackend `json:"backend"`
}{
iD,
id,
backend,
}
bs, err := json.Marshal(map[string]interface{}{
Expand Down Expand Up @@ -9814,11 +9814,11 @@ func (m *Monitor) ChardevAdd(iD string, backend ChardevBackend) (ret ChardevRetu
// chardev-remove -> ChardevRemove (command)

// ChardevRemove implements the "chardev-remove" QMP API call.
func (m *Monitor) ChardevRemove(iD string) (err error) {
func (m *Monitor) ChardevRemove(id string) (err error) {
cmd := struct {
ID string `json:"id"`
}{
iD,
id,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "chardev-remove",
Expand All @@ -9837,7 +9837,7 @@ func (m *Monitor) ChardevRemove(iD string) (err error) {
// client_migrate_info -> ClientMigrateInfo (command)

// ClientMigrateInfo implements the "client_migrate_info" QMP API call.
func (m *Monitor) ClientMigrateInfo(protocol string, hostname string, port *int64, tLSPort *int64, certSubject *string) (err error) {
func (m *Monitor) ClientMigrateInfo(protocol string, hostname string, port *int64, tlsPort *int64, certSubject *string) (err error) {
cmd := struct {
Protocol string `json:"protocol"`
Hostname string `json:"hostname"`
Expand All @@ -9848,7 +9848,7 @@ func (m *Monitor) ClientMigrateInfo(protocol string, hostname string, port *int6
protocol,
hostname,
port,
tLSPort,
tlsPort,
certSubject,
}
bs, err := json.Marshal(map[string]interface{}{
Expand Down Expand Up @@ -9934,11 +9934,11 @@ func (m *Monitor) CPU(index int64) (err error) {
// cpu-add -> CPUAdd (command)

// CPUAdd implements the "cpu-add" QMP API call.
func (m *Monitor) CPUAdd(iD int64) (err error) {
func (m *Monitor) CPUAdd(id int64) (err error) {
cmd := struct {
ID int64 `json:"id"`
}{
iD,
id,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "cpu-add",
Expand Down Expand Up @@ -9989,13 +9989,13 @@ func (m *Monitor) DeviceListProperties(typename string) (ret []DevicePropertyInf
// device_add -> DeviceAdd (command)

// DeviceAdd implements the "device_add" QMP API call.
func (m *Monitor) DeviceAdd(driver string, iD string) (err error) {
func (m *Monitor) DeviceAdd(driver string, id string) (err error) {
cmd := struct {
Driver string `json:"driver"`
ID string `json:"id"`
}{
driver,
iD,
id,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "device_add",
Expand All @@ -10014,11 +10014,11 @@ func (m *Monitor) DeviceAdd(driver string, iD string) (err error) {
// device_del -> DeviceDel (command)

// DeviceDel implements the "device_del" QMP API call.
func (m *Monitor) DeviceDel(iD string) (err error) {
func (m *Monitor) DeviceDel(id string) (err error) {
cmd := struct {
ID string `json:"id"`
}{
iD,
id,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "device_del",
Expand Down Expand Up @@ -10129,14 +10129,14 @@ func (m *Monitor) DumpSkeys(filename string) (err error) {
// eject -> Eject (command)

// Eject implements the "eject" QMP API call.
func (m *Monitor) Eject(device *string, iD *string, force *bool) (err error) {
func (m *Monitor) Eject(device *string, id *string, force *bool) (err error) {
cmd := struct {
Device *string `json:"device,omitempty"`
ID *string `json:"id,omitempty"`
Force *bool `json:"force,omitempty"`
}{
device,
iD,
id,
force,
}
bs, err := json.Marshal(map[string]interface{}{
Expand Down Expand Up @@ -10204,13 +10204,13 @@ func (m *Monitor) Getfd(fdname string) (err error) {
// human-monitor-command -> HumanMonitorCommand (command)

// HumanMonitorCommand implements the "human-monitor-command" QMP API call.
func (m *Monitor) HumanMonitorCommand(commandLine string, cPUIndex *int64) (ret string, err error) {
func (m *Monitor) HumanMonitorCommand(commandLine string, cpuIndex *int64) (ret string, err error) {
cmd := struct {
CommandLine string `json:"command-line"`
CPUIndex *int64 `json:"cpu-index,omitempty"`
}{
commandLine,
cPUIndex,
cpuIndex,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "human-monitor-command",
Expand Down Expand Up @@ -10285,7 +10285,7 @@ func (m *Monitor) InputSendEvent(device *string, head *int64, events []InputEven
// memsave -> Memsave (command)

// Memsave implements the "memsave" QMP API call.
func (m *Monitor) Memsave(val int64, size int64, filename string, cPUIndex *int64) (err error) {
func (m *Monitor) Memsave(val int64, size int64, filename string, cpuIndex *int64) (err error) {
cmd := struct {
Val int64 `json:"val"`
Size int64 `json:"size"`
Expand All @@ -10295,7 +10295,7 @@ func (m *Monitor) Memsave(val int64, size int64, filename string, cPUIndex *int6
val,
size,
filename,
cPUIndex,
cpuIndex,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "memsave",
Expand Down Expand Up @@ -10541,13 +10541,13 @@ func (m *Monitor) NBDServerAdd(device string, writable *bool) (err error) {
// nbd-server-start -> NBDServerStart (command)

// NBDServerStart implements the "nbd-server-start" QMP API call.
func (m *Monitor) NBDServerStart(addr SocketAddress, tLSCreds *string) (err error) {
func (m *Monitor) NBDServerStart(addr SocketAddress, tlsCreds *string) (err error) {
cmd := struct {
Addr SocketAddress `json:"addr"`
TLSCreds *string `json:"tls-creds,omitempty"`
}{
addr,
tLSCreds,
tlsCreds,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "nbd-server-start",
Expand Down Expand Up @@ -10586,13 +10586,13 @@ func (m *Monitor) NBDServerStop() (err error) {
// netdev_add -> NetdevAdd (command)

// NetdevAdd implements the "netdev_add" QMP API call.
func (m *Monitor) NetdevAdd(typ string, iD string) (err error) {
func (m *Monitor) NetdevAdd(typ string, id string) (err error) {
cmd := struct {
Type string `json:"type"`
ID string `json:"id"`
}{
typ,
iD,
id,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "netdev_add",
Expand All @@ -10611,11 +10611,11 @@ func (m *Monitor) NetdevAdd(typ string, iD string) (err error) {
// netdev_del -> NetdevDel (command)

// NetdevDel implements the "netdev_del" QMP API call.
func (m *Monitor) NetdevDel(iD string) (err error) {
func (m *Monitor) NetdevDel(id string) (err error) {
cmd := struct {
ID string `json:"id"`
}{
iD,
id,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "netdev_del",
Expand All @@ -10634,14 +10634,14 @@ func (m *Monitor) NetdevDel(iD string) (err error) {
// object-add -> ObjectAdd (command)

// ObjectAdd implements the "object-add" QMP API call.
func (m *Monitor) ObjectAdd(qomType string, iD string, props *interface{}) (err error) {
func (m *Monitor) ObjectAdd(qomType string, id string, props *interface{}) (err error) {
cmd := struct {
QomType string `json:"qom-type"`
ID string `json:"id"`
Props *interface{} `json:"props,omitempty"`
}{
qomType,
iD,
id,
props,
}
bs, err := json.Marshal(map[string]interface{}{
Expand All @@ -10661,11 +10661,11 @@ func (m *Monitor) ObjectAdd(qomType string, iD string, props *interface{}) (err
// object-del -> ObjectDel (command)

// ObjectDel implements the "object-del" QMP API call.
func (m *Monitor) ObjectDel(iD string) (err error) {
func (m *Monitor) ObjectDel(id string) (err error) {
cmd := struct {
ID string `json:"id"`
}{
iD,
id,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "object-del",
Expand Down Expand Up @@ -12363,13 +12363,13 @@ func (m *Monitor) Quit() (err error) {
// remove-fd -> RemoveFD (command)

// RemoveFD implements the "remove-fd" QMP API call.
func (m *Monitor) RemoveFD(fdsetID int64, fD *int64) (err error) {
func (m *Monitor) RemoveFD(fdsetID int64, fd *int64) (err error) {
cmd := struct {
FdsetID int64 `json:"fdset-id"`
FD *int64 `json:"fd,omitempty"`
}{
fdsetID,
fD,
fd,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "remove-fd",
Expand Down Expand Up @@ -12789,14 +12789,14 @@ func (m *Monitor) XBlockdevDel(nodeName string) (err error) {
// x-blockdev-insert-medium -> XBlockdevInsertMedium (command)

// XBlockdevInsertMedium implements the "x-blockdev-insert-medium" QMP API call.
func (m *Monitor) XBlockdevInsertMedium(device *string, iD *string, nodeName string) (err error) {
func (m *Monitor) XBlockdevInsertMedium(device *string, id *string, nodeName string) (err error) {
cmd := struct {
Device *string `json:"device,omitempty"`
ID *string `json:"id,omitempty"`
NodeName string `json:"node-name"`
}{
device,
iD,
id,
nodeName,
}
bs, err := json.Marshal(map[string]interface{}{
Expand All @@ -12816,13 +12816,13 @@ func (m *Monitor) XBlockdevInsertMedium(device *string, iD *string, nodeName str
// x-blockdev-remove-medium -> XBlockdevRemoveMedium (command)

// XBlockdevRemoveMedium implements the "x-blockdev-remove-medium" QMP API call.
func (m *Monitor) XBlockdevRemoveMedium(device *string, iD *string) (err error) {
func (m *Monitor) XBlockdevRemoveMedium(device *string, id *string) (err error) {
cmd := struct {
Device *string `json:"device,omitempty"`
ID *string `json:"id,omitempty"`
}{
device,
iD,
id,
}
bs, err := json.Marshal(map[string]interface{}{
"execute": "x-blockdev-remove-medium",
Expand Down