1. 16 9月, 2015 23 次提交
  2. 15 9月, 2015 2 次提交
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · 007e620a
      Peter Maydell 提交于
      Block layer patches (v2)
      
      # gpg: Signature made Mon 14 Sep 2015 15:56:54 BST using RSA key ID C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
      
      * remotes/kevin/tags/for-upstream: (23 commits)
        qcow2: Make qcow2_alloc_bytes() more explicit
        vmdk: Fix next_cluster_sector for compressed write
        iotests: Add test for checking large image files
        qcow2: Make size_to_clusters() return uint64_t
        qemu-iotests: More qcow2 reopen tests
        qemu-iotests: Reopen qcow2 with lazy-refcounts change
        qcow2: Support updating driver-specific options in reopen
        qcow2: Make qcow2_update_options() suitable for transactions
        qcow2: Fix memory leak in qcow2_update_options() error path
        qcow2: Leave s unchanged on qcow2_update_options() failure
        qcow2: Move rest of option handling to qcow2_update_options()
        qcow2: Move qcow2_update_options() call up
        qcow2: Factor out qcow2_update_options()
        qcow2: Improve error message
        qemu-io: Add command 'reopen'
        qemu-io: Remove duplicate 'open' error message
        block: Allow specifying driver-specific options to reopen
        qcow2: Rename BDRVQcowState to BDRVQcow2State
        block: Drop bdrv_find_whitelisted_format()
        block: Drop drv parameter from bdrv_fill_options()
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      007e620a
    • M
      qapi: Fix cgen() for Python older than 2.7 · 2752e5be
      Markus Armbruster 提交于
      A feature new in Python 2.7 crept into commit 77e703b8: re.subn()'s
      fifth argument.  Avoid that, use re.compile().
      Reported-by: NLaurent Desnogues <laurent.desnogues@gmail.com>
      Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Tested-by: NLaurent Desnogues <laurent.desnogues@gmail.com>
      Message-id: 1441640755-23902-1-git-send-email-armbru@redhat.com
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2752e5be
  3. 14 9月, 2015 15 次提交