1. 09 2月, 2019 7 次提交
  2. 08 2月, 2019 3 次提交
    • P
      Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging · e47f81b6
      Peter Maydell 提交于
      More work towards libslirp
      
      Marc-André Lureau (27):
        slirp: generalize guestfwd with a callback based approach
        net/slirp: simplify checking for cmd: prefix
        net/slirp: free forwarding rules on cleanup
        net/slirp: fix leaks on forwarding rule registration error
        slirp: add callbacks for timer
        slirp: replace trace functions with DEBUG calls
        slirp: replace QEMU_PACKED with SLIRP_PACKED
        slirp: replace most qemu socket utilities with slirp own version
        slirp: replace qemu_set_nonblock()
        slirp: add unregister_poll_fd() callback
        slirp: replace qemu_notify_event() with a callback
        slirp: move QEMU state saving to a separate unit
        slirp: do not include qemu headers in libslirp.h public API header
        slirp: improve windows headers inclusion
        slirp: add slirp own version of pstrcpy
        slirp: remove qemu timer.h dependency
        slirp: remove now useless QEMU headers inclusions
        slirp: replace net/eth.h inclusion with own defines
        slirp: replace qemu qtailq with slirp own copy
        slirp: replace remaining qemu headers dependency
        slirp: prefer c99 types over BSD kind
        slirp: improve send_packet() callback
        slirp: replace global polling with per-instance & notifier
        slirp: remove slirp_instances list
        slirp: use polling callbacks, drop glib requirement
        slirp: pass opaque to all callbacks
        slirp: API is extern C
      
      Peter Maydell (2):
        slirp: Avoid marking naturally packed structs as QEMU_PACKED
        slirp: Don't mark struct ipq or struct ipasfrag as packed
      
      Samuel Thibault (3):
        slirp: Avoid unaligned 16bit memory access
        slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
        slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/
      
      # gpg: Signature made Thu 07 Feb 2019 14:02:41 GMT
      # gpg:                using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
      # gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
      # gpg:                 aka "Samuel Thibault <sthibault@debian.org>" [marginal]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
      # gpg:                 aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [unknown]
      # 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: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
      #      Subkey fingerprint: E61D BB15 D417 2BDE C97E  92D9 DB55 0E89 F0FA 54F3
      
      * remotes/thibault/tags/samuel-thibault: (32 commits)
        slirp: API is extern C
        slirp: pass opaque to all callbacks
        slirp: use polling callbacks, drop glib requirement
        slirp: remove slirp_instances list
        slirp: replace global polling with per-instance & notifier
        slirp: improve send_packet() callback
        slirp: prefer c99 types over BSD kind
        slirp: replace remaining qemu headers dependency
        slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/
        slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT
        slirp: replace qemu qtailq with slirp own copy
        slirp: replace net/eth.h inclusion with own defines
        slirp: remove now useless QEMU headers inclusions
        slirp: remove qemu timer.h dependency
        slirp: add slirp own version of pstrcpy
        slirp: improve windows headers inclusion
        slirp: do not include qemu headers in libslirp.h public API header
        slirp: move QEMU state saving to a separate unit
        slirp: replace qemu_notify_event() with a callback
        slirp: add unregister_poll_fd() callback
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      e47f81b6
    • P
      Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.0-pull-request' into staging · ff372bb5
      Peter Maydell 提交于
      - add new netlink type from linux v4.18 and v4.19
      - fix coverity warning (CID 1390634)
      - fix ioctl(SIOCGIFCONF) crash
      
      # gpg: Signature made Thu 07 Feb 2019 13:12:53 GMT
      # gpg:                using RSA key F30C38BD3F2FBE3C
      # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
      # gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
      # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
      # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C
      
      * remotes/vivier2/tags/linux-user-for-4.0-pull-request:
        linux-user: add new netlink types
        linux-user: Check sscanf return value in open_net_route()
        Fix linux-user crashes in ioctl(SIOCGIFCONF) when ifc_buf is NULL.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ff372bb5
    • P
      Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20190206' into staging · d55451dc
      Peter Maydell 提交于
      qemu-sparc queue
      
      # gpg: Signature made Wed 06 Feb 2019 21:25:18 GMT
      # gpg:                using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
      # gpg:                issuer "mark.cave-ayland@ilande.co.uk"
      # gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" [full]
      # Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F
      
      * remotes/mcayland/tags/qemu-sparc-20190206:
        sun4m: pass initrd size to OpenBIOS via fw_cfg interface
        sun4u: add power_mem_read routine
        hw/sparc64: Create VGA device only if it has really been requested
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d55451dc
  3. 07 2月, 2019 30 次提交