diff options
| -rw-r--r-- | docs/qapi-code-gen.txt | 2 | ||||
| -rw-r--r-- | qemu-options.hx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt index d7d6987821..eff207502f 100644 --- a/docs/qapi-code-gen.txt +++ b/docs/qapi-code-gen.txt @@ -322,7 +322,7 @@ enum. The value for each branch can be of any type. A flat union definition avoids nesting on the wire, and specifies a set of common members that occur in all variants of the union. The -'base' key must specifiy either a type name (the type must be a +'base' key must specify either a type name (the type must be a struct, not a union), or a dictionary representing an anonymous type. All branches of the union must be complex types, and the top-level members of the union dictionary on the wire will be combination of diff --git a/qemu-options.hx b/qemu-options.hx index 9f33361876..b780ed12e7 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -569,7 +569,7 @@ These options have the same definition as they have in @option{-hdachs}. @var{discard} is one of "ignore" (or "off") or "unmap" (or "on") and controls whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) requests are ignored or passed to the filesystem. Some machine types may not support discard requests. @item format=@var{format} Specify which disk @var{format} will be used rather than detecting -the format. Can be used to specifiy format=raw to avoid interpreting +the format. Can be used to specify format=raw to avoid interpreting an untrusted format header. @item serial=@var{serial} This option specifies the serial number to assign to the device. @@ -894,7 +894,7 @@ mouse. Also overrides the PS/2 mouse emulation when activated. @item disk:[format=@var{format}]:@var{file} Mass storage device based on file. The optional @var{format} argument -will be used rather than detecting the format. Can be used to specifiy +will be used rather than detecting the format. Can be used to specify @code{format=raw} to avoid interpreting an untrusted format header. @item host:@var{bus}.@var{addr} |