1. 30 11月, 2015 1 次提交
  2. 27 11月, 2015 8 次提交
    • P
      Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging · 71448751
      Peter Maydell 提交于
      # gpg: Signature made Fri 27 Nov 2015 02:42:02 GMT using RSA key ID 398D6211
      # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211
      
      * remotes/jasowang/tags/net-pull-request:
        tap-win32: disable broken async write path
        tap-win32: skip unexpected nodes during registry enumeration
        eepro100: Prevent two endless loops
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      71448751
    • A
      tap-win32: disable broken async write path · b73c1849
      Andrew Baumann 提交于
      The code under the TUN_ASYNCHRONOUS_WRITES path makes two incorrect
      assumptions about the behaviour of the WriteFile API for overlapped
      file handles. First, WriteFile does not update the
      lpNumberOfBytesWritten parameter when the write completes
      asynchronously (the number of bytes written is known only when the
      operation completes). Second, the buffer shouldn't be touched (or
      freed) until the operation completes. This led to at least one bug
      where tap_win32_write returned zero bytes written, which in turn
      caused further writes ("receives") to be disabled for that device.
      
      This change disables the asynchronous write path, while keeping most
      of the code around in case someone sees value in resurrecting it. It
      also adds some conditional debug output, similar to the read path.
      Signed-off-by: NAndrew Baumann <Andrew.Baumann@microsoft.com>
      Acked-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      b73c1849
    • A
      tap-win32: skip unexpected nodes during registry enumeration · ee0428e3
      Andrew Baumann 提交于
      In order to find a named tap device, get_device_guid() enumerates children of
      HKLM\SYSTEM\CCS\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}
      (aka NETWORK_CONNECTIONS_KEY). For each child, it then looks for a
      "Connection" subkey, but if this key doesn't exist, it aborts the
      entire search. This was observed to fail on at least one Windows 10
      machine, where there is an additional child of NETWORK_CONNECTIONS_KEY
      (named "Descriptions"). Since registry enumeration doesn't guarantee
      any particular sort order, we should continue to search for matching
      children rather than aborting the search.
      Signed-off-by: NAndrew Baumann <Andrew.Baumann@microsoft.com>
      Reviewed-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      ee0428e3
    • S
      eepro100: Prevent two endless loops · 00837731
      Stefan Weil 提交于
      http://lists.nongnu.org/archive/html/qemu-devel/2015-11/msg04592.html
      shows an example how an endless loop in function action_command can
      be achieved.
      
      During my code review, I noticed a 2nd case which can result in an
      endless loop.
      Reported-by: NQinghao Tang <luodalongde@gmail.com>
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      00837731
    • P
      Update version for v2.5.0-rc2 release · b04fc428
      Peter Maydell 提交于
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b04fc428
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 72f75c76
      Peter Maydell 提交于
      vhost, pc: fixes for 2.5
      
      Minor vhost fixes.  HW version tweak for PC.
      Documentation and test updates.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Thu 26 Nov 2015 16:40:25 GMT using RSA key ID D28D5469
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
      
      * remotes/mst/tags/for_upstream:
        vhost-user-test: fix migration overlap test
        Fix memory leak on error
        Revert "vhost: send SET_VRING_ENABLE at start/stop"
        tests/vhost-user-bridge: read command line arguments
        tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature
        vhost-user: clarify start and enable
        vhost-user: set link down when the char device is closed
        pc: Don't set hw_version on pc-*-2.5
        osdep: Change default value of qemu_hw_version() to "2.5+"
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      72f75c76
    • M
      vhost-user-test: fix migration overlap test · d08e42a1
      Michael S. Tsirkin 提交于
      During migration, source does GET_BASE, destination does SET_BASE.
      Use that as opposed to fds being configured to detect
      vhost user running on both source and destination.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      d08e42a1
    • P
      Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-11-26' into staging · a5df3507
      Peter Maydell 提交于
      QMP and QObject patches
      
      # gpg: Signature made Thu 26 Nov 2015 09:07:18 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-monitor-2015-11-26:
        qjson: Limit number of tokens in addition to total size
        qjson: surprise, allocating 6 QObjects per token is expensive
        qjson: store tokens in a GQueue
        qjson: Convert to parser to recursive descent
        qjson: replace QString in JSONLexer with GString
        qjson: Inline token_is_escape() and simplify
        qjson: Inline token_is_keyword() and simplify
        qjson: Give each of the six structural chars its own token type
        qjson: Spell out some silent assumptions
        check-qjson: Add test for JSON nesting depth limit
        qjson: Don't crash when input exceeds nesting limit
        qjson: Apply nesting limit more sanely
        monitor: Plug memory leak on QMP error
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a5df3507
  3. 26 11月, 2015 31 次提交