qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 6ce310: net/filter-rewriter.c: Fix rewirter c

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 6ce310: net/filter-rewriter.c: Fix rewirter checksum bug w...
Date: Fri, 08 Sep 2017 06:00:09 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6ce310b5356abb7edc3aa8b8b097d0b8cc76f83f
      
https://github.com/qemu/qemu/commit/6ce310b5356abb7edc3aa8b8b097d0b8cc76f83f
  Author: Zhang Chen <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M net/filter-rewriter.c

  Log Message:
  -----------
  net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net

Because vnet_hdr have a offset to net packet, we must add it when use
virtio-net.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 107e4b352cc309f9bd7588ef1a44549200620078
      
https://github.com/qemu/qemu/commit/107e4b352cc309f9bd7588ef1a44549200620078
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M hw/net/rocker/rocker.c
    M hw/net/rocker/rocker_desc.c
    M hw/net/rocker/rocker_fp.c
    M hw/net/rocker/rocker_of_dpa.c
    M hw/net/rocker/rocker_world.c

  Log Message:
  -----------
  net/rocker: Remove the dead error handling

Memory allocation functions like world_alloc, desc_ring_alloc etc,
they are all wrappers around g_malloc, g_new etc. But g_malloc and
similar functions doesn't return null. Because they ignore the fact
that g_malloc() of 0 bytes returns null. So error checks for these
allocation failure are superfluous. Now, remove them entirely.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 1343a107e46feed8b901bf08ad8485bd5f302912
      
https://github.com/qemu/qemu/commit/1343a107e46feed8b901bf08ad8485bd5f302912
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M hw/net/rocker/rocker.c

  Log Message:
  -----------
  net/rocker: Plug memory leak in pci_rocker_init()

pci_rocker_init() leaks a World when the name more than 9 chars,
then return a negative value directly, doesn't make a correct
cleanup. So add a new goto label to fix it.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 0c8f86ea98945678622c6e4b070c4218a53a0d19
      
https://github.com/qemu/qemu/commit/0c8f86ea98945678622c6e4b070c4218a53a0d19
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M hw/net/rocker/rocker.c

  Log Message:
  -----------
  net/rocker: Convert to realize()

The rocker device still implements the old PCIDeviceClass .init()
instead of the new .realize(). All devices need to be converted to
.realize().

.init() reports errors with fprintf() and return 0 on success, negative
number on failure. Meanwhile, when -device rocker fails, it first report
a specific error, then a generic one, like this:

    $ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=qemu-rocker
    rocker: name too long; please shorten to at most 9 chars
    qemu-system-x86_64: -device rocker,name=qemu-rocker: Device initialization 
failed

Now, convert it to .realize() that passes errors to its callers via its
errp argument. Also avoid the superfluous second error message. After
the patch, effect like this:

    $ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=qemu-rocker
    qemu-system-x86_64: -device rocker,name=qemu-rocker: name too long; please 
shorten to at most 9 chars

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: ac7bc031408491cf17da0a46e3fe34e34a1c1b85
      
https://github.com/qemu/qemu/commit/ac7bc031408491cf17da0a46e3fe34e34a1c1b85
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M hw/net/rocker/rocker.c

  Log Message:
  -----------
  net/rocker: Fix the unusual macro name

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 726ec828bdc186b98379b1d4dc5942aadfcdda52
      
https://github.com/qemu/qemu/commit/726ec828bdc186b98379b1d4dc5942aadfcdda52
  Author: Matt Parker <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M hw/net/rtl8139.c

  Log Message:
  -----------
  net: rtl8139: do not use old_mmio accesses

Both io and memory use the same mmio functions in the rtl8139 device.
This patch removes the separate MemoryRegionOps and old_mmio accessors
for memory, and replaces it with an alias to the io memory region.

Signed-off-by: Matt Parker <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: b38576cd020c3192d06aeabb6090d9f0d2b6d664
      
https://github.com/qemu/qemu/commit/b38576cd020c3192d06aeabb6090d9f0d2b6d664
  Author: Zhang Chen <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Update mail address for COLO Proxy

My Fujitsu mail account will be disabled soon, update the mail info
to my private mail.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: e1b24b649a8dbd941488402b719a81618980a3c0
      
https://github.com/qemu/qemu/commit/e1b24b649a8dbd941488402b719a81618980a3c0
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M net/socket.c

  Log Message:
  -----------
  net/socket: Don't treat odd socket type as SOCK_STREAM

In net_socket_fd_init(), the 'default' case is odd: it warns,
then continues as if the socket type was SOCK_STREAM. The
comment explains "this could be a eg. a pty", but that makes
no sense. If @fd really was a pty, getsockopt() would fail
with ENOTSOCK. If @fd was a socket, but neither SOCK_DGRAM nor
SOCK_STREAM. It should not be treated as if it was SOCK_STREAM.

Turn this case into an Error. If there is a genuine reason to
support something like SOCK_RAW, it should be explicitly
handled.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Suggested-by: Markus Armbruster <address@hidden>
Suggested-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: c37f0bb1d0d24e3a6b5f4659bb305913dcb798a6
      
https://github.com/qemu/qemu/commit/c37f0bb1d0d24e3a6b5f4659bb305913dcb798a6
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M net/socket.c

  Log Message:
  -----------
  net/socket: Convert several helper functions to Error

Currently, net_socket_mcast_create(), net_socket_fd_init_dgram() and
net_socket_fd_init() use the function such as fprintf(), perror() to
report an error message.

Now, convert these functions to Error.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: bcd4dfd6852361361d6622de7e67f94e2b475d27
      
https://github.com/qemu/qemu/commit/bcd4dfd6852361361d6622de7e67f94e2b475d27
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M include/qemu/sockets.h
    M net/net.c
    M net/socket.c

  Log Message:
  -----------
  net/net: Convert parse_host_port() to Error

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 0522a959aec29768610900636f6234ab40530f82
      
https://github.com/qemu/qemu/commit/0522a959aec29768610900636f6234ab40530f82
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M net/socket.c

  Log Message:
  -----------
  net/socket: Improve -net socket error reporting

When -net socket fails, it first reports a specific error, then
a generic one, like this:

    $ ./x86_64-softmmu/qemu-system-x86_64 -net 
socket,mcast=230.0.0.1:1234,listen
    qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: exactly one of 
listen=, connect=, mcast= or udp= is required
    qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: Device 
'socket' could not be initialized

Convert net_socket_*_init() to Error to get rid of the superfluous second
error message. After the patch, the effect like this:

    $ ./x86_64-softmmu/qemu-system-x86_64 -net 
socket,mcast=230.0.0.1:1234,listen
    qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: exactly one of 
listen=, connect=, mcast= or udp= is requireda

This also fixes a few silent failures to report an error.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 757704f1b7bffd441101bdab0bbcff27cd11ab34
      
https://github.com/qemu/qemu/commit/757704f1b7bffd441101bdab0bbcff27cd11ab34
  Author: Kamil Rytarowski <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M hw/net/e1000.c
    M hw/net/e1000_regs.h
    M hw/net/e1000e_core.c
    M hw/net/e1000x_common.h

  Log Message:
  -----------
  e1000: Rename the SEC symbol to SEQEC

SunOS defines SEC in <sys/time.h> as 1 (commonly used time symbols).

This fixes build on SmartOS (Joyent).

Patch cherry-picked from pkgsrc by jperkin (Joyent).

Signed-off-by: Kamil Rytarowski <address@hidden>
Reviewed-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 6f5009c38cafad883212810a2219479a8ff408c0
      
https://github.com/qemu/qemu/commit/6f5009c38cafad883212810a2219479a8ff408c0
  Author: Zhang Chen <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  net/colo-compare.c: Optimize unpredictable tcp options comparison

When network is busy, some tcp options(like sack) will unpredictable
occur in primary side or secondary side. it will make packet size
not same, but the two packet's payload is identical. colo just
care about packet payload, so we skip the option field.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 626bba988af8f38b2820f60cfdf5a27bcb74123b
      
https://github.com/qemu/qemu/commit/626bba988af8f38b2820f60cfdf5a27bcb74123b
  Author: Zhang Chen <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  net/colo-compare.c: Adjust net queue pop order for performance

The packet_enqueue() use g_queue_push_tail() to
enqueue net packet, so it is more efficent way use
g_queue_pop_head() to get packet for compare.
That will improve the success rate of comparison.
In my test the performance of ftp put 1000M file
will increase 10%

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 61c5f46959ee74d6dabd0ee648ca555932f91955
      
https://github.com/qemu/qemu/commit/61c5f46959ee74d6dabd0ee648ca555932f91955
  Author: Zhang Chen <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  net/colo-compare.c: Fix comments and scheme

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 329163cbe64a615b4edf6c40f2fff8c79dbc8fb4
      
https://github.com/qemu/qemu/commit/329163cbe64a615b4edf6c40f2fff8c79dbc8fb4
  Author: Wang Yong <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M include/sysemu/iothread.h
    M iothread.c

  Log Message:
  -----------
  qemu-iothread: IOThread supports the GMainContext event loop

IOThread uses AioContext event loop and does not run a GMainContext.
Therefore,chardev cannot work in IOThread,such as the chardev is
used for colo-compare packets reception.

This patch makes the IOThread run the GMainContext event loop,
chardev and IOThread can work together.

Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Wang Yong <address@hidden>
Signed-off-by: Wang Guang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: dd321ecfc2e82e6f9578b986060b1aa3f036bd98
      
https://github.com/qemu/qemu/commit/dd321ecfc2e82e6f9578b986060b1aa3f036bd98
  Author: Wang Yong <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  colo-compare: Use IOThread to Check old packet regularly and Process pactkets 
of the primary

Remove the task which check old packet in the comparing thread,
then use IOthread context timer to handle it.

Process pactkets in the IOThread which arrived over the socket.
we use iothread_get_g_main_context to create a new g_main_loop in
the IOThread.then the packets from the primary and the secondary
are processed in the IOThread.

Finally remove the colo-compare thread using the IOThread instead.

Reviewed-by: Zhang Chen<address@hidden>
Signed-off-by: Wang Yong <address@hidden>
Signed-off-by: Wang Guang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 861d51e62bb197b43606f888dbefbabebaf0d854
      
https://github.com/qemu/qemu/commit/861d51e62bb197b43606f888dbefbabebaf0d854
  Author: Wang Yong <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M docs/colo-proxy.txt

  Log Message:
  -----------
  colo-compare: Update the COLO document to add the IOThread configuration

Update colo-proxy.txt,add IOThread configuration.
Later we have to configure IOThread,if not COLO can not work.

Reviewed-by: Zhang Chen <address@hidden>
Signed-off-by: Wang Yong <address@hidden>
Signed-off-by: Wang Guang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 74bbfe024da80a50dbe51fbb17f219d2f3e4d2dd
      
https://github.com/qemu/qemu/commit/74bbfe024da80a50dbe51fbb17f219d2f3e4d2dd
  Author: Peter Maydell <address@hidden>
  Date:   2017-09-08 (Fri, 08 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M docs/colo-proxy.txt
    M hw/net/e1000.c
    M hw/net/e1000_regs.h
    M hw/net/e1000e_core.c
    M hw/net/e1000x_common.h
    M hw/net/rocker/rocker.c
    M hw/net/rocker/rocker_desc.c
    M hw/net/rocker/rocker_fp.c
    M hw/net/rocker/rocker_of_dpa.c
    M hw/net/rocker/rocker_world.c
    M hw/net/rtl8139.c
    M include/qemu/sockets.h
    M include/sysemu/iothread.h
    M iothread.c
    M net/colo-compare.c
    M net/filter-rewriter.c
    M net/net.c
    M net/socket.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into 
staging

# gpg: Signature made Fri 08 Sep 2017 03:00:34 BST
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>"
# 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:
  colo-compare: Update the COLO document to add the IOThread configuration
  colo-compare: Use IOThread to Check old packet regularly and Process pactkets 
of the primary
  qemu-iothread: IOThread supports the GMainContext event loop
  net/colo-compare.c: Fix comments and scheme
  net/colo-compare.c: Adjust net queue pop order for performance
  net/colo-compare.c: Optimize unpredictable tcp options comparison
  e1000: Rename the SEC symbol to SEQEC
  net/socket: Improve -net socket error reporting
  net/net: Convert parse_host_port() to Error
  net/socket: Convert several helper functions to Error
  net/socket: Don't treat odd socket type as SOCK_STREAM
  MAINTAINERS: Update mail address for COLO Proxy
  net: rtl8139: do not use old_mmio accesses
  net/rocker: Fix the unusual macro name
  net/rocker: Convert to realize()
  net/rocker: Plug memory leak in pci_rocker_init()
  net/rocker: Remove the dead error handling
  net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net

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


Compare: https://github.com/qemu/qemu/compare/b3a1179f570b...74bbfe024da8
reply via email to
[Prev in Thread] Current Thread [Next in Thread]