[Qemu-commits] [qemu/qemu] 616018: Revert "Change net/socket.c to use socket_*() func...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 616018352c244d8b0ea4626407b0801844ae0748
      
https://github.com/qemu/qemu/commit/616018352c244d8b0ea4626407b0801844ae0748
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M net/socket.c

  Log Message:
  -----------
  Revert "Change net/socket.c to use socket_*() functions"

Since commit 7e8449594c929, the socket connect code is blocking, because
calling socket_connect() without callback is blocking.  This reverts the
commit.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 336d5881a927cd80e8c0ff61c7f76b1433f91bb0
      
https://github.com/qemu/qemu/commit/336d5881a927cd80e8c0ff61c7f76b1433f91bb0
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M pc-bios/optionrom/Makefile

  Log Message:
  -----------
  optionrom: cope with multiple -O options

Reproducer:

    CFLAGS="-g3 -O0" ./configure --target-list=aarch64-softmmu,arm-softmmu 
--enable-vhost-net --enable-virtfs

Here CFLAGS ends up with "-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ... -g3 -O0"
and pc-bios/optionrom/Makefile forgets to add the -O2 it needs.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 2b294f6b65c7cf1725eeecf97b16024cc565998a
      
https://github.com/qemu/qemu/commit/2b294f6b65c7cf1725eeecf97b16024cc565998a
  Author: Peter Maydell <address@hidden>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M net/socket.c
    M pc-bios/optionrom/Makefile

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* pc-bios/optionrom/Makefile fix for -O0
* revert socket_connect change

# gpg: Signature made Tue 30 Aug 2016 15:36:59 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  optionrom: cope with multiple -O options
  Revert "Change net/socket.c to use socket_*() functions"

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/135a972b4520...2b294f6b65c7