summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDunrong Huang <riegamaths@gmail.com>2012-07-06 14:04:43 +0800
committerJan Kiszka <jan.kiszka@siemens.com>2012-07-09 17:38:13 +0200
commit927d811b282ffdf5386bd63f435c1507634ba49a (patch)
tree77d336dbfd5bdf6eab6931e09b53175e9ea978f8 /net
parentb412eb61bfd400ad70afe11ac3a5fb2931124804 (diff)
downloadhqemu-927d811b282ffdf5386bd63f435c1507634ba49a.zip
hqemu-927d811b282ffdf5386bd63f435c1507634ba49a.tar.gz
slirp: Ensure smbd and shared directory exist when enable smb
Users may pass the following parameters to qemu: $ qemu-kvm -net nic -net user,smb= ... $ qemu-kvm -net nic -net user,smb ... $ qemu-kvm -net nic -net user,smb=bad_directory ... In these cases, qemu started successfully while samba server failed to start. Users will confuse since samba server failed silently without any indication of what it did wrong. To avoid it, we check whether the shared directory exist and if users have permission to access this directory when QEMU's "built-in" SMB server is enabled. Signed-off-by: Dunrong Huang <riegamaths@gmail.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Diffstat (limited to 'net')
-rw-r--r--net/slirp.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/slirp.c b/net/slirp.c
index 180147e..eb80889 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -497,6 +497,18 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
return -1;
}
+ if (access(CONFIG_SMBD_COMMAND, F_OK)) {
+ error_report("could not find '%s', please install it",
+ CONFIG_SMBD_COMMAND);
+ return -1;
+ }
+
+ if (access(exported_dir, R_OK | X_OK)) {
+ error_report("no such directory '%s', or you do not have permission "
+ "to access it, please check it", exported_dir);
+ return -1;
+ }
+
snprintf(s->smb_dir, sizeof(s->smb_dir), "/tmp/qemu-smb.%ld-%d",
(long)getpid(), instance++);
if (mkdir(s->smb_dir, 0700) < 0) {
OpenPOWER on IntegriCloud