From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sm2ua-0003XO-7u for qemu-devel@nongnu.org; Tue, 03 Jul 2012 09:13:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sm2uR-0006Gj-R3 for qemu-devel@nongnu.org; Tue, 03 Jul 2012 09:12:59 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:58551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sm2uR-0006G7-Ij for qemu-devel@nongnu.org; Tue, 03 Jul 2012 09:12:51 -0400 Received: by pbbro12 with SMTP id ro12so10293118pbb.4 for ; Tue, 03 Jul 2012 06:12:49 -0700 (PDT) From: Dunrong Huang Date: Tue, 3 Jul 2012 21:13:12 +0800 Message-Id: <1341321192-30258-1-git-send-email-riegamaths@gmail.com> Subject: [Qemu-devel] [PATCH] slirp: Ensure smbd and shared directory exist when enable smb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ark McLoughlin , Anthony Liguori 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 exists or not when QEMU's "built-in" SMB server is enabled. Signed-off-by: Dunrong Huang --- net/slirp.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index 37b6ccf..a672cff 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -489,6 +489,20 @@ static int slirp_smb(SlirpState* s, const char *exported_dir, char smb_cmdline[128]; FILE *f; + if (access(CONFIG_SMBD_COMMAND, F_OK)) { + slirp_smb_cleanup(s); + error_report("could not find '%s', please install it", + CONFIG_SMBD_COMMAND); + return -1; + } + + if (access(exported_dir, F_OK)) { + slirp_smb_cleanup(s); + error_report("no such shared directory '%s', 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) { -- 1.7.8.4