From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDftU-00088K-DI for qemu-devel@nongnu.org; Tue, 01 May 2018 20:45:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDftT-00016s-FS for qemu-devel@nongnu.org; Tue, 01 May 2018 20:45:16 -0400 Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= References: <1525176522-200354-1-git-send-email-imammedo@redhat.com> <1525176522-200354-6-git-send-email-imammedo@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <7d23da37-f15a-e2b3-7654-a737c990ecad@amsat.org> Date: Tue, 1 May 2018 21:45:01 -0300 MIME-Version: 1.0 In-Reply-To: <1525176522-200354-6-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [Qemu-arm] [PATCH v3 5/5] make sure that we aren't overwriting mc->get_hotplug_handler by accident List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, eric.auger@redhat.com On 05/01/2018 09:08 AM, Igor Mammedov wrote: > Suggested-by: Eduardo Habkost > Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé > --- > hw/arm/virt.c | 1 + > hw/i386/pc.c | 1 + > hw/ppc/e500plat.c | 1 + > hw/ppc/spapr.c | 1 + > hw/s390x/s390-virtio-ccw.c | 1 + > 5 files changed, 5 insertions(+) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 71661c6..9b0a931 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1578,6 +1578,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) > mc->cpu_index_to_instance_props = virt_cpu_index_to_props; > mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"); > mc->get_default_cpu_node_id = virt_get_default_cpu_node_id; > + assert(!mc->get_hotplug_handler); > mc->get_hotplug_handler = virt_machine_get_hotplug_handler; > hc->plug = virt_machine_device_plug_cb; > } > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 018fd8d..019be25 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -2355,6 +2355,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) > pcmc->acpi_data_size = 0x20000 + 0x8000; > pcmc->save_tsc_khz = true; > pcmc->linuxboot_dma_enabled = true; > + assert(!mc->get_hotplug_handler); > mc->get_hotplug_handler = pc_get_hotpug_handler; > mc->cpu_index_to_instance_props = pc_cpu_index_to_props; > mc->get_default_cpu_node_id = pc_get_default_cpu_node_id; > diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c > index 1a469ba..d8e3f20 100644 > --- a/hw/ppc/e500plat.c > +++ b/hw/ppc/e500plat.c > @@ -74,6 +74,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data) > HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); > MachineClass *mc = MACHINE_CLASS(oc); > > + assert(!mc->get_hotplug_handler); > mc->get_hotplug_handler = e500plat_machine_get_hotpug_handler; > hc->plug = e500plat_machine_device_plug_cb; > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index b35aff5..5b2b00a 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3995,6 +3995,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) > mc->kvm_type = spapr_kvm_type; > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SPAPR_PCI_HOST_BRIDGE); > mc->pci_allow_0_address = true; > + assert(!mc->get_hotplug_handler); > mc->get_hotplug_handler = spapr_get_hotplug_handler; > hc->pre_plug = spapr_machine_device_pre_plug; > hc->plug = spapr_machine_device_plug; > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 435f7c9..905583a 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -476,6 +476,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) > mc->use_sclp = 1; > mc->max_cpus = S390_MAX_CPUS; > mc->has_hotpluggable_cpus = true; > + assert(!mc->get_hotplug_handler); > mc->get_hotplug_handler = s390_get_hotplug_handler; > mc->cpu_index_to_instance_props = s390_cpu_index_to_props; > mc->possible_cpu_arch_ids = s390_possible_cpu_arch_ids; >