[Qemu-commits] [qemu/qemu] c167e2: acpi: Add missing GCC_FMT_ATTR to local function

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c167e2e7eda609bbbb58650c1b82e8168106e40e
      
https://github.com/qemu/qemu/commit/c167e2e7eda609bbbb58650c1b82e8168106e40e
  Author: Stefan Weil <address@hidden>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M hw/acpi/aml-build.c

  Log Message:
  -----------
  acpi: Add missing GCC_FMT_ATTR to local function

This fixes these gcc warnings (not enabled in default build):

hw/acpi/aml-build.c:83:5: warning:
 function might be possible candidate for ‘gnu_printf’ format attribute 
[-Wsuggest-attribute=format]
hw/acpi/aml-build.c:88:5: warning:
 function might be possible candidate for ‘gnu_printf’ format attribute 
[-Wsuggest-attribute=format]

Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 7976a6d23151c780474bdac106f3cf1343a2d6ca
      
https://github.com/qemu/qemu/commit/7976a6d23151c780474bdac106f3cf1343a2d6ca
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M hw/char/virtio-serial-bus.c

  Log Message:
  -----------
  virtio-serial: fix virtio config size

commit 9b70c1790acacae54d559d38ca69186a85040bb8
    virtio-serial: switch to standard-headers

changes virtio_console_config size from 8 to 12 bytes:
it adds an optional 4 byte emerg_wr field.

As this crosses a power of two boundary, this changes the PCI BAR size,
which breaks migration compatibility with old qemu machine types.
It's probably a problem for other transports as well.

As a temporary fix, as we don't yet support this new field anyway,
simply make the config size smaller at init time.

Long terms we probably want something along the lines
of virtio_net_set_config_size.

Reported-by: Cole Robinson <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Cole Robinson <address@hidden>


  Commit: 7e0e736ecdfeac6d3517513d3a702304e4f6cf59
      
https://github.com/qemu/qemu/commit/7e0e736ecdfeac6d3517513d3a702304e4f6cf59
  Author: Jason Wang <address@hidden>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: validate backend queue numbers against bus limitation

We don't validate the backend queue numbers against bus limitation,
this will easily crash qemu if it exceeds the limitation which will
hit the abort() in virtio_del_queue(). An example is trying to
starting a virtio-net device with 256 queues. E.g:

./qemu-system-x86_64 -netdev tap,id=hn0,queues=256 -device
virtio-net-pci,netdev=hn0

Fixing this by doing the validation and fail early.

Cc: Michael S. Tsirkin <address@hidden>
Cc: qemu-stable <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 087c4c9419d3086ac0a920899e4fed8ceaf9bb2b
      
https://github.com/qemu/qemu/commit/087c4c9419d3086ac0a920899e4fed8ceaf9bb2b
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M hw/acpi/aml-build.c
    M hw/char/virtio-serial-bus.c
    M hw/net/virtio-net.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc, virtio bugfixes for 2.3

Several bugfixes, nothing stands out especially.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Wed Mar 25 12:42:10 2015 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"

* remotes/mst/tags/for_upstream:
  virtio-net: validate backend queue numbers against bus limitation
  virtio-serial: fix virtio config size
  acpi: Add missing GCC_FMT_ATTR to local function

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


Compare: https://github.com/qemu/qemu/compare/37a518ae5dc2...087c4c9419d3