openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE----- 

iQEcBAABAgAGBQJY0nQFAAoJEJykq7OBq3PI7JQH/3wtaeHZknvLE5udaNHmYGk9
 pJ56q85Jxvgb6j83kqgMSlLFy82Gg78Lki6FnEo8SqEhyXLEujw5yQvq35U8j7d6
 ddj6MpmKrtNmuKiTL7zgQjWdp+Y7HzK4VW2XKxRH82pkg+pSG0bYlZ/5vfK7nUbh
 1hhu7JCAATfzFx5Ra/KzmNAUDTUuGp2ckoTYqnx2x3r201r6s4J+c8lt8Oea8SK8
 LZjt9392ctxsc5aXIjZsgEkmTWun/6jvidP2y1+MotwnFZebw1k8jt6PQkRBCUjZ
 PdyfmO1WCsdO1S/NfzNm7QvfDQJRqihqEoi+JLZMhkAeW9UiQfgCiIw2JQOBIQk=
 =lKds
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Wed 22 Mar 2017 12:54:29 GMT
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  parallels: fix default options parsing

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-03-23 09:56:54 +00:00
parent 55a19ad8b2 ff5bbe56c6
commit ad3c6418c2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/parallels.c
View File

@ -114,7 +114,7 @@ static QemuOptsList parallels_runtime_opts = {
.name = PARALLELS_OPT_PREALLOC_SIZE,
.type = QEMU_OPT_SIZE,
.help = "Preallocation size on image expansion",
.def_value_str = "128MiB",
.def_value_str = "128M",
},
{
.name = PARALLELS_OPT_PREALLOC_MODE,