diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-03 14:55:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-03 14:55:17 +0000 |
| commit | 7135781f65f1267a72bf554ee2b7bd605f9e59aa (patch) | |
| tree | 403f29f7852bf516c8df05fec487281a12b9834e /block | |
| parent | f67d23b1ae32b97064fa8f05330efbb09e5d4b07 (diff) | |
| parent | f18a768efb990d9cd02911159de02e8ff5475239 (diff) | |
| download | qemu-7135781f65f1267a72bf554ee2b7bd605f9e59aa.zip qemu-7135781f65f1267a72bf554ee2b7bd605f9e59aa.tar.gz qemu-7135781f65f1267a72bf554ee2b7bd605f9e59aa.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-11-02' into staging
trivial patches for 2014-11-02
# gpg: Signature made Sun 02 Nov 2014 11:54:43 GMT 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>"
* remotes/mjt/tags/pull-trivial-patches-2014-11-02: (23 commits)
vdi: wrapped uuid_unparse() in #ifdef
tap: fix possible fd leak in net_init_tap
tap: do not close(fd) in net_init_tap_one
target-i386: Remove unused model_features_t struct
tap_int.h: remove repeating NETWORK_SCRIPT defines
os-posix: reorder parent notification for -daemonize
pidfile: stop making pidfile error a special case
os-posix: replace goto again with a proper loop
os-posix: use global daemon_pipe instead of cryptic fds[1]
dump: Fix dump-guest-memory termination and use-after-close
virtio-9p-proxy: improve error messages in connect_namedsocket()
virtio-9p-proxy: fix error return in proxy_init()
virtio-9p-proxy: Fix sockfd leak
target-tricore: check return value before using it
net/slirp: specify logbase for smbd
Revert "os-posix: report error message when lock file failed"
util: Improve os_mem_prealloc error message
sparse: fix build
target-arm: A64: remove redundant store
target-xtensa: mark XtensaConfig structs as unused
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/vdi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/vdi.c b/block/vdi.c index 19701ee..e1d211c 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -137,12 +137,14 @@ static inline int uuid_is_null(const uuid_t uu) return memcmp(uu, null_uuid, sizeof(uuid_t)) == 0; } +# if defined(CONFIG_VDI_DEBUG) static inline void uuid_unparse(const uuid_t uu, char *out) { snprintf(out, 37, UUID_FMT, uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7], uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]); } +# endif #endif typedef struct { |