From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT2gn-0002kg-3n for qemu-devel@nongnu.org; Wed, 13 Jun 2018 06:07:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fT2gi-0003qW-2E for qemu-devel@nongnu.org; Wed, 13 Jun 2018 06:07:41 -0400 Date: Wed, 13 Jun 2018 12:07:33 +0200 From: Igor Mammedov Message-ID: <20180613120733.1bb8ee10@redhat.com> In-Reply-To: <20180611121655.19616-4-david@redhat.com> References: <20180611121655.19616-1-david@redhat.com> <20180611121655.19616-4-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 03/11] pc: factor out pc-dimm checks into pc_dimm_pre_plug() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand Cc: qemu-devel@nongnu.org, Eduardo Habkost , "Michael S . Tsirkin" , Xiao Guangrong , Alexander Graf , qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , Richard Henderson On Mon, 11 Jun 2018 14:16:47 +0200 David Hildenbrand wrote: > We can perform these checks before the device is actually realized. > > Signed-off-by: David Hildenbrand Reviewed-by: Igor Mammedov > --- > hw/i386/pc.c | 44 ++++++++++++++++++++++++++------------------ > 1 file changed, 26 insertions(+), 18 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index f3befe6721..85c040482e 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1674,6 +1674,29 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name) > } > } > > +static void pc_dimm_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > + Error **errp) > +{ > + const PCMachineState *pcms = PC_MACHINE(hotplug_dev); > + const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); > + > + /* > + * When -no-acpi is used with Q35 machine type, no ACPI is built, > + * but pcms->acpi_dev is still created. Check !acpi_enabled in > + * addition to cover this case. > + */ > + if (!pcms->acpi_dev || !acpi_enabled) { > + error_setg(errp, > + "memory hotplug is not enabled: missing acpi device or acpi disabled"); > + return; > + } > + > + if (is_nvdimm && !pcms->acpi_nvdimm_state.is_enabled) { > + error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'"); > + return; > + } > +} > + > static void pc_dimm_plug(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > @@ -1696,23 +1719,6 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, > align = memory_region_get_alignment(mr); > } > > - /* > - * When -no-acpi is used with Q35 machine type, no ACPI is built, > - * but pcms->acpi_dev is still created. Check !acpi_enabled in > - * addition to cover this case. > - */ > - if (!pcms->acpi_dev || !acpi_enabled) { > - error_setg(&local_err, > - "memory hotplug is not enabled: missing acpi device or acpi disabled"); > - goto out; > - } > - > - if (is_nvdimm && !pcms->acpi_nvdimm_state.is_enabled) { > - error_setg(&local_err, > - "nvdimm is not enabled: missing 'nvdimm' in '-M'"); > - goto out; > - } > - > pc_dimm_memory_plug(dev, MACHINE(pcms), align, &local_err); > if (local_err) { > goto out; > @@ -2006,7 +2012,9 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, > static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > - if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > + pc_dimm_pre_plug(hotplug_dev, dev, errp); > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > pc_cpu_pre_plug(hotplug_dev, dev, errp); > } > }