From 593080936a06a04eacc589350e3a7ebc02f2ed8e Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Thu, 8 Jun 2017 19:27:43 +0200 Subject: Revert "spapr: fix memory hot-unplugging" This reverts commit fe6824d12642b005c69123ecf8631f9b13553f8b. Conflicts hw/ppc/spapr_drc.c, because get_index() has been renamed spapr_get_index(). This didn't fix the problem. Once the hotplug has been started some memory is allocated and some structures are allocated. We don't free it when we ignore the unplug, and we can't because they can be in use by the kernel. Signed-off-by: Laurent Vivier Tested-by: Daniel Barboza Signed-off-by: David Gibson --- include/hw/ppc/spapr_drc.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/hw') diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index c487123..bc9f988 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -201,7 +201,6 @@ typedef struct sPAPRDRConnector { bool awaiting_release; bool signalled; bool awaiting_allocation; - bool awaiting_allocation_skippable; /* device pointer, via link property */ DeviceState *dev; -- cgit v1.1