[Qemu-commits] [qemu/qemu] adbffc: fsdev: fix compilation with VIRTIO but not VIRTIO_...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: adbffc2074754aff8d806843d9e83443590ce5e0
      
https://github.com/qemu/qemu/commit/adbffc2074754aff8d806843d9e83443590ce5e0
  Author: Paolo Bonzini <address@hidden>
  Date:   2018-08-22 (Wed, 22 Aug 2018)

  Changed paths:
    M fsdev/Makefile.objs

  Log Message:
  -----------
  fsdev: fix compilation with VIRTIO but not VIRTIO_9P

hw/9pfs/Makefile.objs uses CONFIG_VIRTIO_9P to guard the definition for
FileOperations structs, while fsdev/Makefile.objs uses CONFIG_VIRTIO
to guard the use.  Mismatch causes linking to fail when CONFIG_VIRTIO
is set but CONFIG_VIRTIO_9P is not.

Fix it and use if/else to clarify that the two lines are for opposite
conditions.

Reported-by: Peter Maydell <address@hidden>
Fixes: b5dfdb082fc350f3e68dfa61dc988d97cad28cfe
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Acked-by: Greg Kurz <address@hidden>
Tested-by: Greg Kurz <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>


  Commit: 746b7907feeba7eced022b96b8effa079bd27a2e
      
https://github.com/qemu/qemu/commit/746b7907feeba7eced022b96b8effa079bd27a2e
  Author: Peter Maydell <address@hidden>
  Date:   2018-08-24 (Fri, 24 Aug 2018)

  Changed paths:
    M fsdev/Makefile.objs

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

Just a build fix that I had queued during soft freeze.

# gpg: Signature made Wed 22 Aug 2018 11:22:56 BST
# gpg:                using RSA key 71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <address@hidden>"
# gpg:                 aka "Gregory Kurz <address@hidden>"
# gpg:                 aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz/tags/for-upstream:
  fsdev: fix compilation with VIRTIO but not VIRTIO_9P

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


Compare: https://github.com/qemu/qemu/compare/54906fe0ce5d...746b7907feeb
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.