From patchwork Fri Apr 29 09:55:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 8979491 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 526C49F372 for ; Fri, 29 Apr 2016 10:15:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D9AD4201DD for ; Fri, 29 Apr 2016 10:15:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A7BC201FA for ; Fri, 29 Apr 2016 10:15:13 +0000 (UTC) Received: from localhost ([::1]:53513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aw5S1-0006j2-83 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Apr 2016 06:15:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aw5Rp-0006Xm-7O for qemu-devel@nongnu.org; Fri, 29 Apr 2016 06:15:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aw5Rd-0008E4-Je for qemu-devel@nongnu.org; Fri, 29 Apr 2016 06:14:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aw5RL-000887-Mz; Fri, 29 Apr 2016 06:14:27 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8D4D6627C9; Fri, 29 Apr 2016 09:55:37 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-90.ams2.redhat.com [10.36.116.90]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3T9tWa8027509; Fri, 29 Apr 2016 05:55:36 -0400 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 29 Apr 2016 11:55:28 +0200 Message-Id: <1461923728-23602-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1461923728-23602-1-git-send-email-kwolf@redhat.com> References: <1461923728-23602-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 29 Apr 2016 09:55:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] vvfat: Fix default volume label X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Max Reitz Reviewed-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi --- block/vvfat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/vvfat.c b/block/vvfat.c index ff3df35..183fc4f 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) {