[Qemu-commits] [qemu/qemu] df18b2: spapr_drc: fix aborts during DRC-count based hotpl...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: df18b2db69fd1696e1f2eb1d8652340b4c57793a
      
https://github.com/qemu/qemu/commit/df18b2db69fd1696e1f2eb1d8652340b4c57793a
  Author: Michael Roth <address@hidden>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

  Changed paths:
    M hw/ppc/spapr_drc.c
    M hw/ppc/spapr_events.c

  Log Message:
  -----------
  spapr_drc: fix aborts during DRC-count based hotplug

CPU/memory resources can be signalled en-masse via
spapr_hotplug_req_add_by_count(), and when doing so, actually change
the meaning of the 'drc' parameter passed to
spapr_hotplug_req_event() to be a count rather than an index.

f40eb92 added a hook in spapr_hotplug_req_event() to record when a
device had been 'signalled' to the guest, but that code assumes that
drc is always an index. In cases where it's a count, such as memory
hotplug, the DRC lookup will fail, leading to an assert.

Fix this by only explicitly setting the signalled state for cases where
we are doing PCI hotplug.

For other resources types, since we cannot selectively track whether a
resource has been signalled in cases where we signal attach as a count,
set the 'signalled' state to true immediately upon making the
resource available via drck->attach().

Reported-by: Bharata B Rao <address@hidden>
Cc: Bharata B Rao <address@hidden>
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Michael Roth <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 61861eff69279e20428c10be269ce1c1bba2c7b1
      
https://github.com/qemu/qemu/commit/61861eff69279e20428c10be269ce1c1bba2c7b1
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M hw/ppc/spapr_drc.c
    M hw/ppc/spapr_events.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160426' into 
staging

ppc patch queue for 2016-04-26 (last minute qemu-2.6 fix)

This just has one, last-minute, fix for a serious regression of memory
hotplug.

Patch author's comment:
    Really sorry for the way last-minute fix, but without this memory
    hotplug is totally broken :( Hoping to get this in for Wednesday's
    RC4, which I think will be the final before release.

# gpg: Signature made Tue 26 Apr 2016 03:52:20 BST using RSA key ID 20D9B392
# gpg: Good signature from "David Gibson <address@hidden>"
# gpg:                 aka "David Gibson (Red Hat) <address@hidden>"
# gpg:                 aka "David Gibson (ozlabs.org) <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: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.6-20160426:
  spapr_drc: fix aborts during DRC-count based hotplug

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


Compare: https://github.com/qemu/qemu/compare/f419a626c76b...61861eff6927