From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com,
vkuznets@redhat.com, jasowang@redhat.com
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Subject: [PATCH RESEND 03/27] tools: hv: report ENOSPC errors in hv_fcopy_daemon
Date: Fri, 11 Dec 2015 20:21:23 -0800 [thread overview]
Message-ID: <1449894107-3389-3-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1449894107-3389-1-git-send-email-kys@microsoft.com>
From: Olaf Hering <olaf@aepfle.de>
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>
---
include/uapi/linux/hyperv.h | 1 +
tools/hv/hv_fcopy_daemon.c | 20 +++++++++++++++++---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h
index e4c0a35..e347b24 100644
--- 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 5480e4e..f1d7426 100644
--- 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)
--
1.7.4.1
next prev parent reply other threads:[~2015-12-12 2:48 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-12 4:21 [PATCH RESEND 00/27] Drivers: hv: Miscellaneous fixes K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 01/27] Drivers: hv: util: Increase the timeout for util services K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 02/27] Drivers: hv: utils: run polling callback always in interrupt context K. Y. Srinivasan
2015-12-12 4:21 ` K. Y. Srinivasan [this message]
2015-12-12 4:21 ` [PATCH RESEND 04/27] tools: hv: remove repeated HV_FCOPY string K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 05/27] Drivers: hv: util: catch allocation errors K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 06/27] Drivers: hv: utils: use memdup_user in hvt_op_write K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 07/27] drivers/hv: cleanup synic msrs if vmbus connect failed K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 08/27] drivers:hv: Export a function that maps Linux CPU num onto Hyper-V proc num K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 09/27] drivers:hv: Export the API to invoke a hypercall on Hyper-V K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 10/27] drivers:hv: Define the channel type for Hyper-V PCI Express pass-through K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 11/27] Drivers: hv: vss: run only on supported host versions K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 12/27] Drivers: hv: vmbus: Use uuid_le type consistently K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 13/27] Drivers: hv: vmbus: Use uuid_le_cmp() for comparing GUIDs K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 14/27] Drivers: hv: vmbus: Get rid of the unused macro K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 15/27] Drivers: hv: vmbus: Get rid of the unused irq variable K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 16/27] Drivers: hv: vmbus: serialize process_chn_event() and vmbus_close_internal() K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 17/27] Drivers: hv: vmbus: do sanity check of channel state in vmbus_close_internal() K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 18/27] Drivers: hv: vmbus: fix rescind-offer handling for device without a driver K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 19/27] Drivers: hv: vmbus: release relid on error in vmbus_process_offer() K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 20/27] Drivers: hv: vmbus: channge vmbus_connection.channel_lock to mutex K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 21/27] drivers:hv: Allow for MMIO claims that span ACPI _CRS records K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 22/27] tools/hv: Use include/uapi with __EXPORTED_HEADERS__ K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 23/27] Drivers: hv: vmbus: Fix a Host signaling bug K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH RESEND 24/27] drivers/hv: correct tsc page sequence invalid value K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH 25/27] Drivers: hv: vmbus: Force all channel messages to be delivered on CPU 0 K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH 26/27] Drivers: hv: utils: Invoke the poll function after handshake K. Y. Srinivasan
2015-12-12 4:21 ` [PATCH 27/27] tools: hv: vss: fix the write()'s argument: error -> vss_msg K. Y. Srinivasan
2015-12-14 18:59 ` [PATCH RESEND 00/27] Drivers: hv: Miscellaneous fixes Greg KH
2015-12-14 22:21 ` KY Srinivasan
-- strict thread matches above, loose matches on Subject: below --
2015-12-15 0:01 K. Y. Srinivasan
2015-12-15 0:01 ` [PATCH RESEND 01/27] Drivers: hv: util: Increase the timeout for util services K. Y. Srinivasan
2015-12-15 0:01 ` [PATCH RESEND 03/27] tools: hv: report ENOSPC errors in hv_fcopy_daemon K. Y. Srinivasan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449894107-3389-3-git-send-email-kys@microsoft.com \
--to=kys@microsoft.com \
--cc=apw@canonical.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=olaf@aepfle.de \
--cc=vkuznets@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox