1. 20 5月, 2014 2 次提交
  2. 19 5月, 2014 3 次提交
    • P
      Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging · c5fa6c86
      Peter Maydell 提交于
      * remotes/qmp-unstable/queue/qmp:
        qapi: skip redundant includes
        monitor: Add netdev_del id argument completion.
        monitor: Add netdev_add type argument completion.
        monitor: Add set_link arguments completion.
        monitor: Add chardev-add backend argument completion.
        monitor: Add chardev-remove command completion.
        monitor: Convert sendkey to use command_completion.
        qapi: Show qapi-commands.py invocation in qapi-code-gen.txt
        qapi: Replace uncommon use of the error API by the common one
        tests: Don't call visit_end_struct() after visit_start_struct() fails
        hw: Don't call visit_end_struct() after visit_start_struct() fails
        hmp: Call visit_end_struct() after visit_start_struct() succeeds
        qapi: Un-inline visit of implicit struct
        qapi-visit.py: Clean up a sloppy use of field prefix
        qapi: Clean up shadowing of parameters and locals in inner scopes
        qapi-visit.py: Clean up confusing push_indent() / pop_indent() use
        qapi: Replace start_optional()/end_optional() by optional()
        qapi: Remove unused Visitor callbacks start_handle(), end_handle()
        qapi: Normalize marshalling's visitor initialization and cleanup
        qapi: Update qapi-code-gen.txt example to match current code
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      c5fa6c86
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-8' into staging · 5bc8f026
      Peter Maydell 提交于
      Input code update:
       - add keycode mapping helpers to core.
       - start switching devices to new input api.
       - misc bugfixes.
      
      # gpg: Signature made Fri 16 May 2014 07:43:45 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-input-8:
        input: sparc32 kbd: claim en-us layout
        input: sparc32 kbd: fix some key mappings
        input: remove sparc keymap hack
        input: switch sparc32 kbd to new input api
        input: switch ps/2 mouse to new input api
        input: switch ps/2 kbd to new input api
        input: use KeyValue directly in sendkey monitor command
        input: add qemu_input_handler_deactivate
        input: key mapping helpers
        ps2: set ps/2 output buffer size as the same as kernel
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5bc8f026
    • P
      Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging · 6a23082b
      Peter Maydell 提交于
      * remotes/bonzini/scsi-next:
        [PATCH] block/iscsi: bump year in copyright notice
        block/iscsi: allow cluster_size of 4K and greater
        block/iscsi: clarify the meaning of ISCSI_CHECKALLOC_THRES
        block/iscsi: speed up read for unallocated sectors
        block/iscsi: allow fall back to WRITE SAME without UNMAP
        MAINTAINERS: mark megasas as maintained
        megasas: Add MSI support
        megasas: Enable MSI-X support
        megasas: Implement LD_LIST_QUERY
        scsi: Improve error messages more
        scsi-disk: Improve error messager if can't get version number
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6a23082b
  3. 16 5月, 2014 35 次提交