From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRBLf-0000wc-QA for qemu-devel@nongnu.org; Thu, 26 Feb 2015 22:12:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRBLV-0003MA-7r for qemu-devel@nongnu.org; Thu, 26 Feb 2015 22:12:19 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:42691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRBLV-0003Lv-0Q for qemu-devel@nongnu.org; Thu, 26 Feb 2015 22:12:09 -0500 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Feb 2015 20:12:08 -0700 From: Michael Roth Date: Thu, 26 Feb 2015 21:11:11 -0600 Message-Id: <1425006675-19976-12-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1425006675-19976-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1425006675-19976-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v6 11/15] spapr_pci: add dynamic-reconfiguration option for spapr-pci-host-bridge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aik@ozlabs.ru, agraf@suse.de, ncmike@ncultra.org, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, bharata.rao@gmail.com, nfont@linux.vnet.ibm.com, david@gibson.dropbear.id.au This option enables/disables PCI hotplug for a particular PHB. Also add machine compatibility code to disable it by default for machine types prior to pseries-2.3. Signed-off-by: Michael Roth Reviewed-by: David Gibson --- hw/ppc/spapr.c | 5 +++++ hw/ppc/spapr_pci.c | 2 ++ include/hw/pci-host/spapr.h | 1 + 3 files changed, 8 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c967721..7272509 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1801,6 +1801,11 @@ static const TypeInfo spapr_machine_info = { .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\ .property = "mem_win_size",\ .value = "0x20000000",\ + },\ + {\ + .driver = "spapr-pci-host-bridge",\ + .property = "dynamic-reconfiguration",\ + .value = "off",\ } #define SPAPR_COMPAT_2_1 \ diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 7d37d83..e6e2f7b 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -684,6 +684,8 @@ static Property spapr_phb_properties[] = { DEFINE_PROP_UINT64("io_win_addr", sPAPRPHBState, io_win_addr, -1), DEFINE_PROP_UINT64("io_win_size", sPAPRPHBState, io_win_size, SPAPR_PCI_IO_WIN_SIZE), + DEFINE_PROP_BOOL("dynamic-reconfiguration", sPAPRPHBState, dr_enabled, + true), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index d725f0e..24867b0 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -67,6 +67,7 @@ struct sPAPRPHBState { uint32_t index; uint64_t buid; char *dtbusname; + bool dr_enabled; MemoryRegion memspace, iospace; hwaddr mem_win_addr, mem_win_size, io_win_addr, io_win_size; -- 1.9.1