Skip to content

Commit

Permalink
Merge pull request #127 from digitalocean/qmp-raw-regenerate
Browse files Browse the repository at this point in the history
qmp/raw: regenerate for CPUDefinitionInfo.UnavailableFeatures
  • Loading branch information
mdlayher authored Oct 18, 2016
2 parents d495d36 + 37c6f45 commit 8ac9d34
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 4 deletions.
7 changes: 4 additions & 3 deletions qmp/raw/autogen.go
Original file line number Diff line number Diff line change
Expand Up @@ -3261,9 +3261,10 @@ func (e *CommandLineParameterType) UnmarshalJSON(bs []byte) error {

// CPUDefinitionInfo implements the "CpuDefinitionInfo" QMP API type.
type CPUDefinitionInfo struct {
Name string `json:"name"`
MigrationSafe *bool `json:"migration-safe,omitempty"`
Static bool `json:"static"`
Name string `json:"name"`
MigrationSafe *bool `json:"migration-safe,omitempty"`
Static bool `json:"static"`
UnavailableFeatures []string `json:"unavailable-features,omitempty"`
}

// CpuInfo -> CPUInfo (flat union)
Expand Down
25 changes: 24 additions & 1 deletion qmp/raw/spec.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9263,14 +9263,37 @@
# QEMU version, machine type, machine options and accelerator options.
# A static model is always migration-safe. (since 2.8)
#
# @unavailable-features: #optional List of properties that prevent
# the CPU model from running in the current
# host. (since 2.8)
#
# @unavailable-features is a list of QOM property names that
# represent CPU model attributes that prevent the CPU from running.
# If the QOM property is read-only, that means there's no known
# way to make the CPU model run in the current host. Implementations
# that choose not to provide specific information return the
# property name "type".
# If the property is read-write, it means that it MAY be possible
# to run the CPU model in the current host if that property is
# changed. Management software can use it as hints to suggest or
# choose an alternative for the user, or just to generate meaningful
# error messages explaining why the CPU model can't be used.
# If @unavailable-features is an empty list, the CPU model is
# runnable using the current host and machine-type.
# If @unavailable-features is not present, runnability
# information for the CPU is not available.
#
# Since: 1.2.0
##
{
"struct": "CpuDefinitionInfo",
"data": {
"name": "str",
"*migration-safe": "bool",
"static": "bool"
"static": "bool",
"*unavailable-features": [
"str"
]
}
}

Expand Down

0 comments on commit 8ac9d34

Please sign in to comment.