1. 12 12月, 2014 6 次提交
    • M
      vmdk: Fix error for JSON descriptor file names · 5c98415b
      Max Reitz 提交于
      If vmdk blindly tries to use path_combine() using bs->file->filename as
      the base file name, this will result in a bad error message for JSON
      file names when calling bdrv_open(). It is better to only try
      bs->file->exact_filename; if that is empty, bs->file->filename will be
      useless for path_combine() and an error should be emitted (containing
      bs->file->filename because desc_file_path (which is
      bs->file->exact_filename) is empty).
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NFam Zheng <famz@redhat.com>
      Message-id: 1417615043-26174-2-git-send-email-mreitz@redhat.com
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      5c98415b
    • G
      block migration: fix return value · ebd9fbd7
      Gary R Hook 提交于
      Modify block_save_iterate() to return positive/zero/negative
      (success/not done/failure) return status. The computation of
      the blocks transferred (an int64_t) exceeds the size of an
      int return value.
      Signed-off-by: NGary R Hook <gary.hook@nimboxx.com>
      Reviewed-by: NChenLiang <chenliang88@huawei.com>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      Message-id: 1416958202-15913-1-git-send-email-gary.hook@nimboxx.com
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      ebd9fbd7
    • P
      Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-12-11' into staging · 99c9c3cb
      Peter Maydell 提交于
      trivial patches for 2014-12-11
      
      # gpg: Signature made Thu 11 Dec 2014 18:13:58 GMT using RSA key ID A4C3D7DB
      # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
      # gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
      # gpg:                 aka "Michael Tokarev <mjt@debian.org>"
      
      * remotes/mjt/tags/pull-trivial-patches-2014-12-11:
        Sort include/qemu/typedefs.h
        hpet: increase spelling precision
        pflash_cfi02.c: associate "cfi.pflash02" to "Storage devices" category
        vt82c686: fix coverity warning about out-of-bounds write
        virtio: remove useless declaration of virtio_net_init()
        qapi-schema: fix typo about change-vnc-password
        fw_cfg: remove superfluous blank line
        get_maintainer.pl: Remove the --git-chief-penguins option
        configure: Replace which(1) with "has"
        util: Use g_new() & friends where that makes obvious sense
        util: Fuse g_malloc(); memset() into g_new0()
        util: Drop superfluous conditionals around g_free()
        Drop superfluous conditionals around g_strdup()
        Drop superfluous conditionals around qemu_opts_del()
        usb: delete redundant brackets in usb_host_handle_control()
        virtio-bus: avoid breaking build when open DEBUG switch
        acpi-build: Make DPRINTF working for acpi-build
        acpi-build: adjust indention 8 -> 4 spaces
        target-s390x: fix possible out of bounds read
        qmp: fix typo in input-send-event examples
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      99c9c3cb
    • D
      Sort include/qemu/typedefs.h · 64baadc2
      Dr. David Alan Gilbert 提交于
      Mainly to make it less likely to conflict during merges.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Reviewed-by: NAlex Bennée <alex.bennee@linaro.org>
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      64baadc2
    • S
      hpet: increase spelling precision · 97c61fb7
      Stefan Hajnoczi 提交于
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      97c61fb7
    • P
      Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20141211' into staging · b1412904
      Peter Maydell 提交于
      target-arm queue:
       * pass semihosting exit code out to system
       * more TrustZone support code (still not enabled yet)
       * allow user to direct semihosting to gdb or native explicitly
         rather than always auto-guessing the destination
       * fix memory leak in realview_init
       * fix coverity warning in hw/arm/boot
       * get state migration working for AArch64 CPUs
       * check errors in kvm_arm_reset_vcpu
      
      # gpg: Signature made Thu 11 Dec 2014 12:16:19 GMT using RSA key ID 14360CDE
      # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
      
      * remotes/pmaydell/tags/pull-target-arm-20141211: (33 commits)
        target-arm: Check error conditions on kvm_arm_reset_vcpu
        target-arm: Support save/load for 64 bit CPUs
        target-arm/kvm: make reg sync code common between kvm32/64
        arm_gic_kvm: Tell kernel about number of IRQs
        hw/arm/boot: fix uninitialized scalar variable warning reported by coverity
        hw/arm/realview.c: Fix memory leak in realview_init()
        target-arm: make MAIR0/1 banked
        target-arm: make c13 cp regs banked (FCSEIDR, ...)
        target-arm: make VBAR banked
        target-arm: make PAR banked
        target-arm: make IFAR/DFAR banked
        target-arm: make DFSR banked
        target-arm: make IFSR banked
        target-arm: make DACR banked
        target-arm: make TTBCR banked
        target-arm: make TTBR0/1 banked
        target-arm: make CSSELR banked
        target-arm: respect SCR.FW, SCR.AW and SCTLR.NMFI
        target-arm: add SCTLR_EL3 and make SCTLR banked
        target-arm: add MVBAR support
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b1412904
  2. 11 12月, 2014 34 次提交