git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
README: virtio-serial is required.
[libguestfs.git]
/
daemon
/
debug.c
diff --git
a/daemon/debug.c
b/daemon/debug.c
index
b6d9f68
..
cd3e8a5
100644
(file)
--- a/
daemon/debug.c
+++ b/
daemon/debug.c
@@
-28,7
+28,7
@@
#include <dirent.h>
#include <sys/resource.h>
#include <dirent.h>
#include <sys/resource.h>
-#include "
../src/
guestfs_protocol.h"
+#include "guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
@@
-540,8
+540,11
@@
do_debug_upload (const char *filename, int mode)
return -1;
}
if (r == -2) { /* cancellation from library */
return -1;
}
if (r == -2) { /* cancellation from library */
+ /* This error is ignored by the library since it initiated the
+ * cancel. Nevertheless we must send an error reply here.
+ */
+ reply_with_error ("file upload cancelled");
close (fd);
close (fd);
- /* Do NOT send any error. */
return -1;
}
return -1;
}