[Qemu-commits] [qemu/qemu] ebb72c: vvfat: Fix volume name assertion

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ebb72c9f066e5f85259e1541a6d3fb5bfd6e73ff
      
https://github.com/qemu/qemu/commit/ebb72c9f066e5f85259e1541a6d3fb5bfd6e73ff
  Author: Kevin Wolf <address@hidden>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Changed paths:
    M block/vvfat.c

  Log Message:
  -----------
  vvfat: Fix volume name assertion

Commit d5941dd made the volume name configurable, but it didn't consider
that the rw code compares the volume name string to assert that the
first directory entry is the volume name. This made vvfat crash in rw
mode.

This fixes the assertion to compare with the configured volume name
instead of a literal string.

Cc: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: d208c50d9dbf98c0eca337723cd6497653ceb743
      
https://github.com/qemu/qemu/commit/d208c50d9dbf98c0eca337723cd6497653ceb743
  Author: Kevin Wolf <address@hidden>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Changed paths:
    M block/vvfat.c

  Log Message:
  -----------
  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: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 47dac82d8b013a5c7dd044a797ae6727b553959a
      
https://github.com/qemu/qemu/commit/47dac82d8b013a5c7dd044a797ae6727b553959a
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Changed paths:
    M block/vvfat.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

vvfat fixes for 2.6.0-rc4

# gpg: Signature made Fri 29 Apr 2016 10:52:13 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream:
  vvfat: Fix default volume label
  vvfat: Fix volume name assertion

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/849880978eb2...47dac82d8b01