diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-13 12:55:47 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-13 12:55:47 +0100 |
| commit | e0b4891ae6647b0009b5c0f877255e6723bffed8 (patch) | |
| tree | ef8f623ed856e465a82b5ae4afa21d5743324816 /block | |
| parent | 9746211baa6ff1275e9c726c6f3a3bcfe4b1f8bd (diff) | |
| parent | 56faeb9bb6872b3f926b3b3e0452a70beea10af2 (diff) | |
| download | qemu-e0b4891ae6647b0009b5c0f877255e6723bffed8.zip qemu-e0b4891ae6647b0009b5c0f877255e6723bffed8.tar.gz qemu-e0b4891ae6647b0009b5c0f877255e6723bffed8.tar.bz2 | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Fri 09 Jun 2017 13:41:59 BST
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
block/gluster.c: Handle qdict_array_entries() failure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/gluster.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/gluster.c b/block/gluster.c index 031596a..addceed 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -493,8 +493,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, Error *local_err = NULL; char *str = NULL; const char *ptr; - size_t num_servers; - int i, type; + int i, type, num_servers; /* create opts info from runtime_json_opts list */ opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort); |