1. 15 1月, 2016 3 次提交
  2. 14 1月, 2016 4 次提交
    • P
      Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-01-13' into staging · 17c8a219
      Peter Maydell 提交于
      Error reporting patches for 2016-01-13
      
      # gpg: Signature made Wed 13 Jan 2016 14:21:48 GMT using RSA key ID EB918653
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
      
      * remotes/armbru/tags/pull-error-2016-01-13: (41 commits)
        checkpatch: Detect newlines in error_report and other error functions
        error: Consistently name Error * objects err, and not errp
        s390/sclp: Simplify control flow in sclp_realize()
        hw/s390x: Rename local variables Error *l_err to just err
        error: Clean up errors with embedded newlines (again)
        vhdx: Fix "log that needs to be replayed" error message
        pci-assign: Clean up "Failed to assign" error messages
        vmdk: Clean up "Invalid extent lines" error message
        vmdk: Clean up control flow in vmdk_parse_extents() a bit
        error: Strip trailing '\n' from error string arguments (again)
        qemu-io qemu-nbd: Use error_report() etc. instead of fprintf()
        migration: Use error_reportf_err() instead of monitor_printf()
        spapr: Use error_reportf_err()
        error: Use error_prepend() where it makes obvious sense
        error: Use error_reportf_err() where it makes obvious sense
        error: Don't decorate original error message when adding to it
        error: New error_prepend(), error_reportf_err()
        test-throttle: Simplify qemu_init_main_loop() error handling
        qemu-nbd: Clean up "Failed to load snapshot" error message
        block: Clean up "Could not create temporary overlay" error message
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      17c8a219
    • P
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160113' into staging · cd0b19a2
      Peter Maydell 提交于
      This first round of s390x patches includes:
      - new compat machine
      - remove the old s390-virtio machine
      - fixes and some cleanup
      
      # gpg: Signature made Wed 13 Jan 2016 14:55:55 GMT using RSA key ID C6F02FAF
      # gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
      # gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
      
      * remotes/cohuck/tags/s390x-20160113:
        s390x/pci: return real state during listing PCI
        virtio-ccw: fix sanity check for vector
        s390: Introduce CCW_COMPAT_2_5
        s390x/virtio: use qemu_check_nic_model()
        s390x/pci: code cleanup
        s390x/pci: reject some operations to disabled PCI function
        s390x: remove s390-virtio devices
        s390x: remove s390-virtio machine
        s390x: add 2.6 compat machine
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      cd0b19a2
    • P
      Merge remote-tracking branch 'remotes/amit/tags/vs-for-2.6-1' into staging · ed56fdb2
      Peter Maydell 提交于
      small change to qom'ify virtio-serial
      
      # gpg: Signature made Wed 13 Jan 2016 09:51:18 GMT using RSA key ID 854083B6
      # gpg: Good signature from "Amit Shah <amit@amitshah.net>"
      # gpg:                 aka "Amit Shah <amit@kernel.org>"
      # gpg:                 aka "Amit Shah <amitshah@gmx.net>"
      
      * remotes/amit/tags/vs-for-2.6-1:
        virtio serial port: fix to incomplete QOMify
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ed56fdb2
    • P
      Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-1' into staging · 91728bda
      Peter Maydell 提交于
      migration fixes for postcopy, xbzrle, multithread decompression
      
      # gpg: Signature made Wed 13 Jan 2016 10:34:49 GMT using RSA key ID 854083B6
      # gpg: Good signature from "Amit Shah <amit@amitshah.net>"
      # gpg:                 aka "Amit Shah <amit@kernel.org>"
      # gpg:                 aka "Amit Shah <amitshah@gmx.net>"
      
      * remotes/amit-migration/tags/migration-for-2.6-1:
        multithread decompression: Avoid one copy
        Use qemu_get_buffer_in_place for xbzrle data
        Migration: Emit event at start of pass
        Postcopy: Send events/change state on incoming side
        migration: Add state records for migration incoming
        migration: Export migrate_set_state()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      91728bda
  3. 13 1月, 2016 33 次提交