diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-11-29 15:37:31 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-11-29 15:37:31 +0100 |
| commit | 5591c001a1056910afd903df3fc3c03f30746623 (patch) | |
| tree | d49e6cb415f2823f007d774e95531de2a765b86e | |
| parent | fc24908e7d232b79c2a6f0363f52bda18dedb57b (diff) | |
| parent | f1a7ff770f7d71ee7833ff019aac9d6cc3d13f71 (diff) | |
Merge remote-tracking branch 'mreitz/tags/pull-block-2017-11-29' into queue-block
One block patch for 2.11.0-rc3
# gpg: Signature made Wed Nov 29 15:28:38 2017 CET
# gpg: using RSA key F407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* mreitz/tags/pull-block-2017-11-29:
block/nfs: fix nfs_client_open for filesize greater than 1TB
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/nfs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/block/nfs.c b/block/nfs.c index 337fcd9c84..effc8719b5 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -1,7 +1,7 @@ /* * QEMU Block driver for native access to files on NFS shares * - * Copyright (c) 2014-2016 Peter Lieven <pl@kamp.de> + * Copyright (c) 2014-2017 Peter Lieven <pl@kamp.de> * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -496,7 +496,7 @@ out: static int64_t nfs_client_open(NFSClient *client, QDict *options, int flags, int open_flags, Error **errp) { - int ret = -EINVAL; + int64_t ret = -EINVAL; QemuOpts *opts = NULL; Error *local_err = NULL; struct stat st; @@ -686,8 +686,7 @@ static QemuOptsList nfs_create_opts = { static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp) { - int ret = 0; - int64_t total_size = 0; + int64_t ret, total_size; NFSClient *client = g_new0(NFSClient, 1); QDict *options = NULL; |