diff options
| author | Stefan Hajnoczi | 2016-12-01 14:39:29 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2016-12-01 14:39:29 +0100 |
| commit | bd8ef5060dd2124a54578241da9a572faf7658dd (patch) | |
| tree | 99bcfaf118c88f4ea178b8049ed273588770df7a | |
| parent | Merge remote-tracking branch 'mst/tags/for_upstream' into staging (diff) | |
| parent | spapr: fix default DRC state for coldplugged LMBs (diff) | |
| download | qemu-bd8ef5060dd2124a54578241da9a572faf7658dd.tar.gz qemu-bd8ef5060dd2124a54578241da9a572faf7658dd.tar.xz qemu-bd8ef5060dd2124a54578241da9a572faf7658dd.zip | |
Merge remote-tracking branch 'dgibson/tags/ppc-for-2.8-20161201' into staging
ppc patch queue 2016-12-01
Just a single migration / hotplug fix in this set. I believe it's
important enough to go in this late in the 2.8 release process.
# gpg: Signature made Thu 01 Dec 2016 04:43:49 AM GMT
# gpg: using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>"
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* dgibson/tags/ppc-for-2.8-20161201:
spapr: fix default DRC state for coldplugged LMBs
Message-id: 20161201044441.14365-1-david@gibson.dropbear.id.au
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/ppc/spapr.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c3269c7f50..208ef7b110 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2290,6 +2290,11 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size, drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); drck->attach(drc, dev, fdt, fdt_offset, !dev->hotplugged, errp); addr += SPAPR_MEMORY_BLOCK_SIZE; + if (!dev->hotplugged) { + /* guests expect coldplugged LMBs to be pre-allocated */ + drck->set_allocation_state(drc, SPAPR_DR_ALLOCATION_STATE_USABLE); + drck->set_isolation_state(drc, SPAPR_DR_ISOLATION_STATE_UNISOLATED); + } } /* send hotplug notification to the * guest only in case of hotplugged memory |