[Qemu-commits] [qemu/qemu] d4aa43: docs: Fix description of the sentence

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d4aa431f945bbbff75129af0cd0b155f988150ba
      
https://github.com/qemu/qemu/commit/d4aa431f945bbbff75129af0cd0b155f988150ba
  Author: Zhang Chen <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M docs/colo-proxy.txt

  Log Message:
  -----------
  docs: Fix description of the sentence

Say it in another way to make it easier to understand.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: d5aa3e6e0cd6259003790769c448d4fbb5b5c810
      
https://github.com/qemu/qemu/commit/d5aa3e6e0cd6259003790769c448d4fbb5b5c810
  Author: Ladi Prosek <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M net/checksum.c

  Log Message:
  -----------
  net: optimize checksum computation

Very simple loop optimization with a significant performance impact.

Microbenchmark results, modern x86-64:

buffer size | speed up
------------+---------
1500        | 1.7x
64          | 1.5x
8           | 1.15x

Microbenchmark results, POWER7:

buffer size | speed up
------------+---------
1500        | 5x
64          | 3.3x
8           | 1.13x

There is a lot of room for further improvement at the expense of
code complexity - aligned multibyte reads, LE/BE considerations,
architecture-specific optimizations, etc. This patch still keeps
things simple and readable.

Signed-off-by: Ladi Prosek <address@hidden>
Reviewed-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 6ac38ed42b3468e37f9ce681b65c796a3be4e387
      
https://github.com/qemu/qemu/commit/6ac38ed42b3468e37f9ce681b65c796a3be4e387
  Author: Thomas Huth <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M hw/m68k/mcf5208.c
    M hw/net/mcf_fec.c
    M include/hw/m68k/mcf.h
    A include/hw/m68k/mcf_fec.h

  Log Message:
  -----------
  m68k: QOMify the MCF Fast Ethernet Controller device

When running qemu-system-m68k with the "-net" parameter (for example
simply "-net nic -net user"), there is currently a confusing warning
message saying:

 Warning: requested NIC (anonymous, model mcf_fec) was not created
 (not supported by this machine?)

This seems to happen because the MCF NIC has never been adapted to
the currently expected QEMU device behavior. Thus let's QOMify the
NIC now to get rid of the warning message.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 581f7b127dfe9ed10ce3216e440cc5be1582911b
      
https://github.com/qemu/qemu/commit/581f7b127dfe9ed10ce3216e440cc5be1582911b
  Author: Peter Maydell <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M hw/net/dp8393x.c

  Log Message:
  -----------
  hw/net/dp8393x: Avoid unintentional sign extensions on addresses

The dp8393x has several 32-bit values which are formed by concatenating
two 16 bit device register values. Attempting to do these inline
with ((s->reg[HI] << 16) | s->reg[LO]) can result in an unintended
sign extension because "x << 16" is of type 'int' even though s->reg
is unsigned, and so if the expression is used in a context where
it is cast to uint64_t the value is incorrectly sign-extended.
Fix this by using accessor functions with a uint32_t return type;
this also makes the code a bit easier to read.

This should fix Coverity issues 1307765, 1307766, 1307767, 1307768.

(To avoid having a ctda read function only used in a DPRINTF,
we move the DPRINTF down slightly so it can use the ttda function.)

Reviewed-by: Laurent Vivier <address@hidden>
Tested-by: Laurent Vivier <address@hidden>
Reviewed-by: Hervé Poussineau <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: a023b7ac6262106e9a7d248bb61ec928fbf94896
      
https://github.com/qemu/qemu/commit/a023b7ac6262106e9a7d248bb61ec928fbf94896
  Author: Alex Kompel <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  hw/pci: use-after-free in pci_nic_init_nofail when nic device fails to 
initialize

object_property_set_bool(OBJECT(dev), true, "realized", &err) in
pci_nic_init_nofail may release the object if device fails to
initialize which leads to use-after-free in error handling block.
qdev_init_nofail does the same thing while holding the reference.

(gdb) run -net nic
qemu-system-x86_64: failed to find romfile "efi-e1000.rom"

Program received signal SIGSEGV, Segmentation fault.
object_unparent (obj=0x7fffe96a0010) at qom/object.c:440
440     in qom/object.c
(gdb) bt
<nd_table>, rootbus=0x5555567ed990, default_model=<optimized out>,
default_devaddr=<optimized out>) at hw/pci/pci.c:1812
pci_bus=0x5555567ed990) at hw/i386/pc.c:1634
pci_type=0x555555c1a523 "i440FX", host_type=0x555555ba564e
"i440FX-pcihost") at hw/i386/pc_piix.c:241
out>, envp=<optimized out>) at vl.c:4481

Signed-off-by: Alex Kompel <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: fac7d7b1cdb21f921d7ac396365f5e920ef03096
      
https://github.com/qemu/qemu/commit/fac7d7b1cdb21f921d7ac396365f5e920ef03096
  Author: Peter Maydell <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  tap: fix memory leak on failure in net_init_tap()

Commit 091a6b2ac fixed most of the memory leaks in failure
paths in net_init_tap() reported by Coverity (CID 1356216),
but missed one. Fix it by deferring the allocation of
fds and vhost_fds until after the error check.

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


  Commit: db655a9653af05aaa90f41e55433d41e398d4b75
      
https://github.com/qemu/qemu/commit/db655a9653af05aaa90f41e55433d41e398d4b75
  Author: Peter Maydell <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M docs/colo-proxy.txt
    M hw/m68k/mcf5208.c
    M hw/net/dp8393x.c
    M hw/net/mcf_fec.c
    M hw/pci/pci.c
    M include/hw/m68k/mcf.h
    A include/hw/m68k/mcf_fec.h
    M net/checksum.c
    M net/tap.c

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

# gpg: Signature made Fri 20 Jan 2017 02:58:57 GMT
# 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:
  tap: fix memory leak on failure in net_init_tap()
  hw/pci: use-after-free in pci_nic_init_nofail when nic device fails to 
initialize
  hw/net/dp8393x: Avoid unintentional sign extensions on addresses
  m68k: QOMify the MCF Fast Ethernet Controller device
  net: optimize checksum computation
  docs: Fix description of the sentence

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


Compare: https://github.com/qemu/qemu/compare/4383fa7c8019...db655a9653af