tools: hv: report ENOSPC errors in hv_fcopy_daemon

[ Upstream commit b4ed5d1682c6613988c2eb1de55df5ac9988afcc ]

Currently some "Unspecified error 0x80004005" is reported on the Windows
side if something fails. Handle the ENOSPC case and return
ERROR_DISK_FULL, which allows at least Copy-VMFile to report a meaning
full error.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h
index e4c0a35d6417cd6a4ca0f44bdfc4900a2e2a8e11..e347b24ef9fb645cd3d74b4a0e09ca3296c7b58b 100644 (file)
--- a/include/uapi/linux/hyperv.h
+++ b/include/uapi/linux/hyperv.h
@@ -313,6 +313,7 @@ enum hv_kvp_exchg_pool {
 #define HV_INVALIDARG                  0x80070057
 #define HV_GUID_NOTFOUND               0x80041002
 #define HV_ERROR_ALREADY_EXISTS                0x80070050
+#define HV_ERROR_DISK_FULL             0x80070070
 
 #define ADDR_FAMILY_NONE       0x00
 #define ADDR_FAMILY_IPV4       0x01

diff --git a/tools/hv/hv_fcopy_daemon.c b/tools/hv/hv_fcopy_daemon.c
index 5480e4e424eb1906a2cd4118792d97bc6b6f365c..f1d74268231792e7b41fbc7200de0a043351b62c 100644 (file)
--- a/tools/hv/hv_fcopy_daemon.c
+++ b/tools/hv/hv_fcopy_daemon.c
@@ -37,12 +37,14 @@
 
 static int target_fd;
 static char target_fname[W_MAX_PATH];
+static unsigned long long filesize;
 
 static int hv_start_fcopy(struct hv_start_fcopy *smsg)
 {
        int error = HV_E_FAIL;
        char *q, *p;
 
+       filesize = 0;
        p = (char *)smsg->path_name;
        snprintf(target_fname, sizeof(target_fname), "%s/%s",
                 (char *)smsg->path_name, (char *)smsg->file_name);
@@ -98,14 +100,26 @@ done:
 static int hv_copy_data(struct hv_do_fcopy *cpmsg)
 {
        ssize_t bytes_written;
+       int ret = 0;
 
        bytes_written = pwrite(target_fd, cpmsg->data, cpmsg->size,
                                cpmsg->offset);
 
-       if (bytes_written != cpmsg->size)
-               return HV_E_FAIL;
+       filesize += cpmsg->size;
+       if (bytes_written != cpmsg->size) {
+               switch (errno) {
+               case ENOSPC:
+                       ret = HV_ERROR_DISK_FULL;
+                       break;
+               default:
+                       ret = HV_E_FAIL;
+                       break;
+               }
+               syslog(LOG_ERR, "pwrite failed to write %llu bytes: %ld (%s)",
+                      filesize, (long)bytes_written, strerror(errno));
+       }
 
-       return 0;
+       return ret;
 }
 
 static int hv_copy_finished(void)