summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Wolf2016-04-27 14:18:16 +0200
committerKevin Wolf2016-04-29 11:14:13 +0200
commitd208c50d9dbf98c0eca337723cd6497653ceb743 (patch)
tree39230e02d9dc18693b5aff79e635b0924ef48ae6
parentvvfat: Fix volume name assertion (diff)
downloadqemu-d208c50d9dbf98c0eca337723cd6497653ceb743.tar.gz
qemu-d208c50d9dbf98c0eca337723cd6497653ceb743.tar.xz
qemu-d208c50d9dbf98c0eca337723cd6497653ceb743.zip
vvfat: Fix default volume label
Commit d5941dd documented that it leaves the default volume name as it was ("QEMU VVFAT"), but it doesn't actually implement this. You get an empty name (eleven space characters) instead. This fixes the implementation to apply the advertised default. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--block/vvfat.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/vvfat.c b/block/vvfat.c
index ff3df35eb0..183fc4f049 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -1109,6 +1109,8 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
goto fail;
}
memcpy(s->volume_label, label, label_length);
+ } else {
+ memcpy(s->volume_label, "QEMU VVFAT", 10);
}
if (floppy) {