diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-28 13:43:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-28 13:43:17 +0100 |
| commit | 93156cef1c9008a549de5fa430b9c6b3d2f5e43b (patch) | |
| tree | b1f25ca6aef7b7cae2752bb0a619ad26069adc9f /net | |
| parent | 13de54eedd40a1b01fa7176dfb96d1c22c5cfa71 (diff) | |
| parent | b87b8a8b32518df9e5285f9b3d4f9d9a0c426a06 (diff) | |
| download | qemu-93156cef1c9008a549de5fa430b9c6b3d2f5e43b.tar.gz qemu-93156cef1c9008a549de5fa430b9c6b3d2f5e43b.tar.bz2 qemu-93156cef1c9008a549de5fa430b9c6b3d2f5e43b.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-04-28' into staging
trivial patches for 2014-04-28
# gpg: Signature made Mon 28 Apr 2014 05:56:01 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514 66A7 BEE5 9D74 A4C3 D7DB
* remotes/mjt/tags/trivial-patches-2014-04-28:
slirp/smb: Move ncalrpc directory to tmp
po: add proper Language: tags to .po files
po/Makefile: fix $SRC_PATH reference
init_paths: fix minor memory leak
virtfs-proxy-helper: fix call to accept
net/net.c: remove unnecessary semicolon
Add QEMU logo (SVG file)
vl: avoid closing stdout with 'writeconfig'
xilinx: Fix typo in comment (Marvel -> Marvell)
vl: Eliminate a superfluous local variable
vl: Remove useless 'continue'
gitignore: cleanups #2
tests/.gitignore: Ignore test-rfifolock
move test-* from .gitignore to tests/.gitignore
configure: Improve help behavior
vl: convert -m to QemuOpts
qemu-option: introduce qemu_find_opts_singleton
misc: Use cpu_physical_memory_read and cpu_physical_memory_write
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/slirp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/slirp.c b/net/slirp.c index cce026bf12..8fddc03841 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -527,6 +527,7 @@ static int slirp_smb(SlirpState* s, const char *exported_dir, "pid directory=%s\n" "lock directory=%s\n" "state directory=%s\n" + "ncalrpc dir=%s/ncalrpc\n" "log file=%s/log.smbd\n" "smb passwd file=%s/smbpasswd\n" "security = user\n" @@ -542,6 +543,7 @@ static int slirp_smb(SlirpState* s, const char *exported_dir, s->smb_dir, s->smb_dir, s->smb_dir, + s->smb_dir, exported_dir, passwd->pw_name ); |