From patchwork Fri Jul 11 09:59:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Zheng X-Patchwork-Id: 369116 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A6751140080 for ; Fri, 11 Jul 2014 20:42:58 +1000 (EST) Received: from localhost ([::1]:43930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5YI4-0002x4-MW for incoming@patchwork.ozlabs.org; Fri, 11 Jul 2014 06:42:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5YF9-0007Jj-3T for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:40:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5YF1-0001sQ-Mr for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:39:55 -0400 Received: from fgwmail8.fujitsu.co.jp ([192.51.44.38]:48953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5YF1-0001s0-34 for qemu-devel@nongnu.org; Fri, 11 Jul 2014 06:39:47 -0400 Received: from fgwmail6.fujitsu.co.jp (fgwmail6.fujitsu.co.jp [192.51.44.36]) by fgwmail8.fujitsu.co.jp (Postfix) with ESMTP id 569081504091 for ; Fri, 11 Jul 2014 19:18:10 +0900 (JST) Received: from kw-mxq.gw.nic.fujitsu.com (unknown [10.0.237.131]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 736B53EE0C0 for ; Fri, 11 Jul 2014 19:18:09 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.nic.fujitsu.com [10.0.50.94]) by kw-mxq.gw.nic.fujitsu.com (Postfix) with ESMTP id 8A2FEAC0A82 for ; Fri, 11 Jul 2014 19:18:08 +0900 (JST) Received: from s00.gw.fujitsu.co.jp (s00.gw.nic.fujitsu.com [133.161.11.15]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 1F6F51DB8037 for ; Fri, 11 Jul 2014 19:18:08 +0900 (JST) Received: from s00.gw.fujitsu.co.jp (kw-mxio2.gw.nic.fujitsu.com [10.0.237.142]) by s00.gw.fujitsu.co.jp (Postfix) with ESMTP id 098D811812B; Fri, 11 Jul 2014 19:18:08 +0900 (JST) Received: from guz (unknown [10.167.226.100]) by s00.gw.fujitsu.co.jp (Postfix) with ESMTP id C6B588A002; Fri, 11 Jul 2014 19:18:07 +0900 (JST) Received: (from root@localhost) by guz (8.14.5/8.14.5/Submit) id s6BA4LZ6014598; Fri, 11 Jul 2014 18:04:21 +0800 From: Gu Zheng To: qemu-devel@nongnu.org Date: Fri, 11 Jul 2014 17:59:51 +0800 Message-Id: <1405072795-14342-4-git-send-email-guz.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1405072795-14342-1-git-send-email-guz.fnst@cn.fujitsu.com> References: <1405072795-14342-1-git-send-email-guz.fnst@cn.fujitsu.com> X-TM-AS-MML: disable X-TMASE-MatchedRID: jt307Y4f8rzRpd8KAFU/vcC2JPjUsXOa1cuIRwt/4MgsfFlFugSGUMmi h10F43avkZ3T6ylBNAUBtjkcfRMmqWVnjx+sD6KyXP5rFAucBUH54F/2i/DwjaJd7mc2dRi3LMR TlXcK2C1QftdzsIGQ71Lil+9DIcvM8NmY4nPNNzzMuewaQUInJB+ORlygA2yivG/ZjO2Z8dQHG2 PFAhzE0eLzNWBegCW2wgn7iDBesS0gBwKKRHe+r7ApHMp4QEXlxxhEQINZ7GzpGcfH9H9lofcqr p+inO7rHIwpRXL6JxQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 192.51.44.38 Cc: tangchen@cn.fujitsu.com, Gu Zheng , isimatu.yasuaki@jp.fujitsu.com, imammedo@redhat.com, Chen Fan , anshul.makkar@profitbricks.com, afaerber@suse.de Subject: [Qemu-devel] [RFC PATCH 3/7] qom cpu: rename variable 'cpu_added_notifier' to 'cpu_hotplug_notifier' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chen Fan Rename variable 'cpu_added_notifier' to 'cpu_hotplug_notifier' for adding remove vcpu notifier support. Signed-off-by: Chen Fan Signed-off-by: Gu Zheng --- hw/acpi/ich9.c | 8 ++++---- hw/acpi/piix4.c | 10 +++++----- hw/i386/pc.c | 2 +- include/hw/acpi/ich9.h | 2 +- include/sysemu/sysemu.h | 2 +- qom/cpu.c | 10 +++++----- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index e7d6c77..fa4150a 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -209,9 +209,9 @@ static void pm_powerdown_req(Notifier *n, void *opaque) acpi_pm1_evt_power_down(&pm->acpi_regs); } -static void ich9_cpu_added_req(Notifier *n, void *opaque) +static void ich9_cpu_hotplug_req(Notifier *n, void *opaque) { - ICH9LPCPMRegs *pm = container_of(n, ICH9LPCPMRegs, cpu_added_notifier); + ICH9LPCPMRegs *pm = container_of(n, ICH9LPCPMRegs, cpu_hotplug_notifier); assert(pm != NULL); AcpiCpuHotplug_add(&pm->acpi_regs.gpe, &pm->gpe_cpu, CPU(opaque)); @@ -246,8 +246,8 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, AcpiCpuHotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci), &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE); - pm->cpu_added_notifier.notify = ich9_cpu_added_req; - qemu_register_cpu_added_notifier(&pm->cpu_added_notifier); + pm->cpu_hotplug_notifier.notify = ich9_cpu_hotplug_req; + qemu_register_cpu_hotplug_notifier(&pm->cpu_hotplug_notifier); if (pm->acpi_memory_hotplug.is_enabled) { acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci), diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index b72b34e..5cd6300 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -83,7 +83,7 @@ typedef struct PIIX4PMState { uint8_t s4_val; AcpiCpuHotplug gpe_cpu; - Notifier cpu_added_notifier; + Notifier cpu_hotplug_notifier; MemHotplugState acpi_memory_hotplug; } PIIX4PMState; @@ -544,9 +544,9 @@ static const MemoryRegionOps piix4_gpe_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; -static void piix4_cpu_added_req(Notifier *n, void *opaque) +static void piix4_cpu_hotplug(Notifier *n, void *opaque) { - PIIX4PMState *s = container_of(n, PIIX4PMState, cpu_added_notifier); + PIIX4PMState *s = container_of(n, PIIX4PMState, cpu_hotplug_notifier); assert(s != NULL); AcpiCpuHotplug_add(&s->ar.gpe, &s->gpe_cpu, CPU(opaque)); @@ -565,8 +565,8 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, AcpiCpuHotplug_init(parent, OBJECT(s), &s->gpe_cpu, PIIX4_CPU_HOTPLUG_IO_BASE); - s->cpu_added_notifier.notify = piix4_cpu_added_req; - qemu_register_cpu_added_notifier(&s->cpu_added_notifier); + s->cpu_hotplug_notifier.notify = piix4_cpu_hotplug; + qemu_register_cpu_hotplug_notifier(&s->cpu_hotplug_notifier); if (s->acpi_memory_hotplug.is_enabled) { acpi_memory_hotplug_init(parent, OBJECT(s), &s->acpi_memory_hotplug); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2cf22b1..bb474a8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -413,7 +413,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, /* init CPU hotplug notifier */ cpu_hotplug_cb.rtc_state = s; cpu_hotplug_cb.cpu_added_notifier.notify = rtc_notify_cpu_added; - qemu_register_cpu_added_notifier(&cpu_hotplug_cb.cpu_added_notifier); + qemu_register_cpu_hotplug_notifier(&cpu_hotplug_cb.cpu_added_notifier); if (set_boot_dev(s, boot_device)) { exit(1); diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index 7e42448..bbb5d2c 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -47,7 +47,7 @@ typedef struct ICH9LPCPMRegs { Notifier powerdown_notifier; AcpiCpuHotplug gpe_cpu; - Notifier cpu_added_notifier; + Notifier cpu_hotplug_notifier; MemHotplugState acpi_memory_hotplug; } ICH9LPCPMRegs; diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index d8539fd..6810f70 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -184,7 +184,7 @@ void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict); void drive_hot_add(Monitor *mon, const QDict *qdict); /* CPU hotplug */ -void qemu_register_cpu_added_notifier(Notifier *notifier); +void qemu_register_cpu_hotplug_notifier(Notifier *notifier); /* pcie aer error injection */ void pcie_aer_inject_error_print(Monitor *mon, const QObject *data); diff --git a/qom/cpu.c b/qom/cpu.c index bf16590..add92b1 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -108,12 +108,12 @@ static void cpu_common_get_memory_mapping(CPUState *cpu, } /* CPU hot-plug notifiers */ -static NotifierList cpu_added_notifiers = - NOTIFIER_LIST_INITIALIZER(cpu_add_notifiers); +static NotifierList cpu_hotplug_notifiers = + NOTIFIER_LIST_INITIALIZER(cpu_hotplug_notifiers); -void qemu_register_cpu_added_notifier(Notifier *notifier) +void qemu_register_cpu_hotplug_notifier(Notifier *notifier) { - notifier_list_add(&cpu_added_notifiers, notifier); + notifier_list_add(&cpu_hotplug_notifiers, notifier); } void cpu_reset_interrupt(CPUState *cpu, int mask) @@ -305,7 +305,7 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp) if (dev->hotplugged) { cpu_synchronize_post_init(cpu); - notifier_list_notify(&cpu_added_notifiers, dev); + notifier_list_notify(&cpu_hotplug_notifiers, dev); cpu_resume(cpu); } }