1. 24 5月, 2014 1 次提交
  2. 23 5月, 2014 3 次提交
  3. 22 5月, 2014 2 次提交
    • P
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140520' into staging · 45e66b7b
      Peter Maydell 提交于
      some s390 patches:
      
      - Enable irqfds on s390 via the new adapter interrupt routing type.
        As a prereq, fix the kvm enable_cap helpers for some compilers and
        split the s390 flic into kvm and non-kvm parts.
      - Enable software and hardware debugging support on s390. This needs a
        kernel headers update.
      
      # gpg: Signature made Tue 20 May 2014 12:30:54 BST using RSA key ID C6F02FAF
      # gpg: Can't check signature: public key not found
      
      * remotes/cohuck/tags/s390x-20140520:
        s390x/kvm: hw debugging support via guest PER facility
        s390x/kvm: software breakpoint support
        s390x: remove duplicate definitions of DIAG 501
        linux-headers: update
        s390x/virtio-ccw: wire up irq routing and irqfds
        s390x/virtio-ccw: reference-counted indicators
        s390x: add I/O adapter registration
        s390x: split flic into kvm and non-kvm parts
        kvm: Fix enable_cap helpers on older gcc
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      45e66b7b
    • P
      Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging · 65903a8b
      Peter Maydell 提交于
      * remotes/bonzini/scsi-next:
        megasas: remove buildtime strings
        block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined
        virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path
        scsi: Document intentional fall through in scsi_req_length()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      65903a8b
  4. 21 5月, 2014 8 次提交
  5. 20 5月, 2014 14 次提交
  6. 19 5月, 2014 12 次提交
    • 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
      block: optimize zero writes with bdrv_write_zeroes · 465bee1d
      Peter Lieven 提交于
      this patch tries to optimize zero write requests
      by automatically using bdrv_write_zeroes if it is
      supported by the format.
      
      This significantly speeds up file system initialization and
      should speed zero write test used to test backend storage
      performance.
      
      I ran the following 2 tests on my internal SSD with a
      50G QCOW2 container and on an attached iSCSI storage.
      
      a) mkfs.ext4 -E lazy_itable_init=0,lazy_journal_init=0 /dev/vdX
      
      QCOW2         [off]     [on]     [unmap]
      -----
      runtime:       14secs    1.1secs  1.1secs
      filesize:      937M      18M      18M
      
      iSCSI         [off]     [on]     [unmap]
      ----
      runtime:       9.3s      0.9s     0.9s
      
      b) dd if=/dev/zero of=/dev/vdX bs=1M oflag=direct
      
      QCOW2         [off]     [on]     [unmap]
      -----
      runtime:       246secs   18secs   18secs
      filesize:      51G       192K     192K
      throughput:    203M/s    2.3G/s   2.3G/s
      
      iSCSI*        [off]     [on]     [unmap]
      ----
      runtime:       8mins     45secs   33secs
      throughput:    106M/s    1.2G/s   1.6G/s
      allocated:     100%      100%     0%
      
      * The storage was connected via an 1Gbit interface.
        It seems to internally handle writing zeroes
        via WRITESAME16 very fast.
      Signed-off-by: NPeter Lieven <pl@kamp.de>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      465bee1d
    • 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
    • P
      blockdev: add a function to parse enum ids from strings · 82a402e9
      Peter Lieven 提交于
      this adds a generic function to recover the enum id of a parameter
      given as a string.
      Signed-off-by: NPeter Lieven <pl@kamp.de>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      82a402e9
    • P
      util: add qemu_iovec_is_zero · 43f35cb5
      Peter Lieven 提交于
      Signed-off-by: NPeter Lieven <pl@kamp.de>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      43f35cb5
    • K
      qcow1: Stricter backing file length check · d66e5cee
      Kevin Wolf 提交于
      Like qcow2 since commit 6d33e8e7, error out on invalid lengths instead
      of silently truncating them to 1023.
      
      Also don't rely on bdrv_pread() catching integer overflows that make len
      negative, but use unsigned variables in the first place.
      
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NBenoit Canet <benoit@irqsave.net>
      d66e5cee
    • K
      qcow1: Validate image size (CVE-2014-0223) · 46485de0
      Kevin Wolf 提交于
      A huge image size could cause s->l1_size to overflow. Make sure that
      images never require a L1 table larger than what fits in s->l1_size.
      
      This cannot only cause unbounded allocations, but also the allocation of
      a too small L1 table, resulting in out-of-bounds array accesses (both
      reads and writes).
      
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      46485de0
    • K
      qcow1: Validate L2 table size (CVE-2014-0222) · 42eb5817
      Kevin Wolf 提交于
      Too large L2 table sizes cause unbounded allocations. Images actually
      created by qemu-img only have 512 byte or 4k L2 tables.
      
      To keep things consistent with cluster sizes, allow ranges between 512
      bytes and 64k (in fact, down to 1 entry = 8 bytes is technically
      working, but L2 table sizes smaller than a cluster don't make a lot of
      sense).
      
      This also means that the number of bytes on the virtual disk that are
      described by the same L2 table is limited to at most 8k * 64k or 2^29,
      preventively avoiding any integer overflows.
      
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NBenoit Canet <benoit@irqsave.net>
      42eb5817
    • K
      qcow1: Check maximum cluster size · 7159a45b
      Kevin Wolf 提交于
      Huge values for header.cluster_bits cause unbounded allocations (e.g.
      for s->cluster_cache) and crash qemu this way. Less huge values may
      survive those allocations, but can cause integer overflows later on.
      
      The only cluster sizes that qemu can create are 4k (for standalone
      images) and 512 (for images with backing files), so we can limit it
      to 64k.
      
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NBenoit Canet <benoit@irqsave.net>
      7159a45b
    • K
      qcow1: Make padding in the header explicit · ea54feff
      Kevin Wolf 提交于
      We were relying on all compilers inserting the same padding in the
      header struct that is used for the on-disk format. Let's not do that.
      Mark the struct as packed and insert an explicit padding field for
      compatibility.
      
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NBenoit Canet <benoit@irqsave.net>
      ea54feff
    • M
      curl: Add usage documentation · 0a86cb73
      Matthew Booth 提交于
      Signed-off-by: NMatthew Booth <mbooth@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      0a86cb73