From patchwork Tue Jul 3 13:13:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dunrong huang X-Patchwork-Id: 168807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6A08F2C00CD for ; Tue, 3 Jul 2012 23:13:14 +1000 (EST) Received: from localhost ([::1]:46583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sm2um-0003Y7-97 for incoming@patchwork.ozlabs.org; Tue, 03 Jul 2012 09:13:12 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=s2UfiZc8cCqHZ0n8Yhxd/3w40VQrv1GIiiJWgUYrGiI=; b=jD6/FJxVoxZLS4Bby/UkXxkPhs+3XvIgulrV059lk4UlxQT0j/6P/wbQHx9DReicFf H+8/5aHHkKYcqmN3EYYfRxW0ooU1MZ/dCZyYHTEEEs8bwI9fxtIjfxPBz4izHCgWnKkP q8DGPuChyN7mQcBJGepbB/xrFwdE+qt0ejC/d8/o2dPUdoSqJksMa7J1JN1tqhddv21J 1Yfot3so5mnOzQPbSuo6UPjBgmwN/f2vZ2UWzgoWMJnZD9CR9N9BILbB3OOM77Aop+wH f1Sv8d09zSr/1LjgW7kb2LELDDR6exRVI4OrxukxJEZgHNkjcDVwus21eVhjffrmplcR iXSg== Received: by 10.68.228.102 with SMTP id sh6mr6810639pbc.134.1341321168932; Tue, 03 Jul 2012 06:12:48 -0700 (PDT) Received: from riegamaths@gmail.com ([119.255.44.227]) by mx.google.com with ESMTPS id tj4sm15565392pbc.33.2012.07.03.06.12.41 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 06:12:47 -0700 (PDT) Received: by riegamaths@gmail.com (sSMTP sendmail emulation); Tue, 03 Jul 2012 21:13:12 +0800 From: Dunrong Huang To: qemu-devel@nongnu.org Date: Tue, 3 Jul 2012 21:13:12 +0800 Message-Id: <1341321192-30258-1-git-send-email-riegamaths@gmail.com> X-Mailer: git-send-email 1.7.8.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: ark McLoughlin , Anthony Liguori Subject: [Qemu-devel] [PATCH] slirp: Ensure smbd and shared directory exist when enable smb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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) {