[Qemu-commits] [qemu/qemu] f46efa: e1000: don't raise interrupt in pre_save()

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f46efa9b0895a7ff8ed0b4e874aee52a49f2a878
      
https://github.com/qemu/qemu/commit/f46efa9b0895a7ff8ed0b4e874aee52a49f2a878
  Author: Jason Wang <address@hidden>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

  Changed paths:
    M hw/net/e1000.c

  Log Message:
  -----------
  e1000: don't raise interrupt in pre_save()

We should not raise any interrupt after VM has been stopped but this
is what e1000 currently did when mit timer is active in
pre_save(). Fixing this by scheduling a timer in post_load() which can
make sure the interrupt was raised when VM is running.

Reported-and-tested-by: Longpeng <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 6f5d8671225dc77190647f18a27a0d156d4ca97a
      
https://github.com/qemu/qemu/commit/6f5d8671225dc77190647f18a27a0d156d4ca97a
  Author: Prasad J Pandit <address@hidden>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

  Changed paths:
    M qemu-bridge-helper.c

  Log Message:
  -----------
  qemu-bridge-helper: restrict interface name to IFNAMSIZ

The network interface name in Linux is defined to be of size
IFNAMSIZ(=16), including the terminating null('\0') byte.
The same is applied to interface names read from 'bridge.conf'
file to form ACL rules. If user supplied '--br=bridge' name
is not restricted to the same length, it could lead to ACL bypass
issue. Restrict interface name to IFNAMSIZ, including null byte.

Reported-by: Riccardo Schirone <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 3283dde4b5b5cce0f96f48d536bebff66d97ce0b
      
https://github.com/qemu/qemu/commit/3283dde4b5b5cce0f96f48d536bebff66d97ce0b
  Author: Prasad J Pandit <address@hidden>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

  Changed paths:
    M qemu-bridge-helper.c

  Log Message:
  -----------
  qemu-bridge-helper: move repeating code in parse_acl_file

Move repeating error handling sequence in parse_acl_file routine
to an 'err' label.

Signed-off-by: Prasad J Pandit <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 389abe1dd1790c0de7a2f1f422dcdf778b509a16
      
https://github.com/qemu/qemu/commit/389abe1dd1790c0de7a2f1f422dcdf778b509a16
  Author: Prasad J Pandit <address@hidden>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  net: tap: replace snprintf with g_strdup_printf calls

When invoking qemu-bridge-helper in 'net_bridge_run_helper',
instead of using fixed sized buffers, use dynamically allocated
ones initialised and returned by g_strdup_printf().

Signed-off-by: Prasad J Pandit <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: f77bed14f01557596727c4eea042e9818c242049
      
https://github.com/qemu/qemu/commit/f77bed14f01557596727c4eea042e9818c242049
  Author: Zhang Chen <address@hidden>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  net/colo-compare.c: Fix memory leak and code style issue.

This patch to fix the origin "char *data" memory leak, code style issue
and add necessary check here.
Reported-by: Coverity (CID 1402785)

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


  Commit: 893dc8300c80e3dc32f31e968cf7aa0904da50c3
      
https://github.com/qemu/qemu/commit/893dc8300c80e3dc32f31e968cf7aa0904da50c3
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

  Changed paths:
    M hw/net/e1000.c
    M net/colo-compare.c
    M net/tap.c
    M qemu-bridge-helper.c

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

# gpg: Signature made Mon 29 Jul 2019 09:30:48 BST
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>" 
[marginal]
# 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:
  net/colo-compare.c: Fix memory leak and code style issue.
  net: tap: replace snprintf with g_strdup_printf calls
  qemu-bridge-helper: move repeating code in parse_acl_file
  qemu-bridge-helper: restrict interface name to IFNAMSIZ
  e1000: don't raise interrupt in pre_save()

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


Compare: https://github.com/qemu/qemu/compare/08831f67d3dd...893dc8300c80