Skip to content
  • Fam Zheng's avatar
    dmg: Move libbz2 code to dmg-bz2.so · 27685a8d
    Fam Zheng authored
    dmg.o was moved to block-obj-m in 5505e8b7 to become a separate module,
    so that its reference to libbz2, since 6b383c08
    
    , doesn't add an extra
    library to the main executable.
    
    Until recently, commit 06e60f70a (blockdev: Add dynamic module loading
    for block drivers) moved it back to block-obj-y to simplify the design
    of dynamic loading of block modules. But we don't want to lose the
    feature of less library dependency on the main executable.
    
    The solution here is to move only the bz2 related code to a separate
    DSO file, and load it when dmg_open is called.
    
    dmg_probe doesn't depend on bz2 support to work, and is the only code in
    this file which can run before dmg_open.
    
    While we are at it, fix the unhelpful cast of last argument passed to
    dmg_uncompress_bz2.
    
    Signed-off-by: default avatarFam Zheng <famz@redhat.com>
    Message-id: 1473043845-13197-4-git-send-email-famz@redhat.com
    Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
    Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
    27685a8d