1. 02 6月, 2014 7 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-3' into staging · 36f5db59
      Peter Maydell 提交于
      misc minor vnc patches
      
      # gpg: Signature made Mon 02 Jun 2014 15:31:53 BST using RSA key ID D3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      
      * remotes/kraxel/tags/pull-vnc-3:
        vnc-enc-tight: Fix divide-by-zero in tight_detect_smooth_image{16,24,32}
        vnc: add trace events for key events
        vnc: refuse to set a password with VNC_AUTH_NONE
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      36f5db59
    • G
      vnc-enc-tight: Fix divide-by-zero in tight_detect_smooth_image{16,24,32} · b5299153
      Gonglei 提交于
      Spotted by Coverity:
      
      (1) Event assignment:  Assigning: "pixels" = "0".
      (2) Event cond_true:  Condition "y < h", taking true branch
      (3) Event cond_false:  Condition "x < w", taking false branch
      (4) Event loop_end:  Reached end of loop
      (5) Event divide_by_zero:  In expression "(stats[0] + stats[1]) * 100U / pixels",
      division by expression "pixels" which may be zero has undefined behavior.
      
      290     DEFINE_DETECT_FUNCTION(16)
      291     DEFINE_DETECT_FUNCTION(32)
      Signed-off-by: NGonglei <arei.gonglei@huawei.com>
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      b5299153
    • G
      vnc: add trace events for key events · 40066175
      Gerd Hoffmann 提交于
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      40066175
    • G
      vnc: refuse to set a password with VNC_AUTH_NONE · cf864569
      Gerd Hoffmann 提交于
      Current code silently changes the authentication settings
      in case you try to set a password without password authentication
      turned on.  This is bad.  Return an error instead.
      
      If we want allow changing auth settings at runtime this should
      be done explicitly using a separate monitor command, not as
      side effect of set_passwd.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      cf864569
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · f72b4939
      Peter Maydell 提交于
      Block patches
      
      # gpg: Signature made Mon 02 Jun 2014 14:56:00 BST using RSA key ID C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
      
      * remotes/kevin/tags/for-upstream:
        qemu-img: Report error even with --oformat=json
        vmdk: Fix local_err in vmdk_create
        block/raw-posix.c: Avoid nonstandard LONG_LONG_MAX
        qemu-img: Plug memory leak in convert command
        block/sheepdog: Plug memory leak in sd_snapshot_create()
        block/vvfat: Plug memory leak in read_directory()
        block/vvfat: Plug memory leak in check_directory_consistency()
        block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR
        blockdev: Plug memory leak in drive_init()
        blockdev: Plug memory leak in blockdev_init()
        qemu-io: Don't print NULL when open without non-option arg fails
        qemu-io: Plug memory leak in open command
        qemu-io: Support multiple -o in open command
        block: Plug memory leak on brv_open_image() error path
        qcow2: Plug memory leak on qcow2_invalidate_cache() error paths
        block/vvfat: Plug memory leak in enable_write_target()
        qemu-img: Plug memory leak on block option help error path
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      f72b4939
    • P
      Revert "bsd-user: replace fprintf(stderr, ...) with error_report()" · 9bb93180
      Peter Maydell 提交于
      This reverts commit 1fba5095.
      
      That commit converted various fprintf(stderr, ...) calls to
      use error_report(); however none of these bsd-user files include
      a header which gives a prototype for error_report, so this
      causes compiler warnings. Since these are just straightforward
      reporting of command line errors, we should handle these in the
      obvious way by printing to stderr, as we do for linux-user.
      There's no need to drag in the error-handling framework for this,
      especially since user-mode doesn't have the "maybe we need to
      send this to the monitor" issues system emulation does.
      Acked-by: NMichael Tokarev <mjt@tls.msk.ru>
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9bb93180
    • M
      qemu-img: Report error even with --oformat=json · 55d492d7
      Max Reitz 提交于
      img_check() should report that the format of the given image does not
      support checks even if JSON output is desired. JSON data is output to
      stdout, as opposed to error messages, which are (in the case of
      qemu-img) printed to stderr. Therefore, it is easy to distinguish
      between the two.
      
      Also, img_info() does already use error_report() for human-readable
      messages even though JSON output is desired (through
      collect_image_info_list()).
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      55d492d7
  2. 30 5月, 2014 16 次提交
  3. 29 5月, 2014 17 次提交