From patchwork Wed Oct 9 09:43:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenfan X-Patchwork-Id: 281773 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 01E0B2C00CD for ; Wed, 9 Oct 2013 20:46:53 +1100 (EST) Received: from localhost ([::1]:40907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTqLw-0006Ot-7d for incoming@patchwork.ozlabs.org; Wed, 09 Oct 2013 05:46:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTqLH-0006CI-71 for qemu-devel@nongnu.org; Wed, 09 Oct 2013 05:46:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTqLC-0002MK-By for qemu-devel@nongnu.org; Wed, 09 Oct 2013 05:46:07 -0400 Received: from [222.73.24.84] (port=1552 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTqLB-0002FT-Vd for qemu-devel@nongnu.org; Wed, 09 Oct 2013 05:46:02 -0400 X-IronPort-AV: E=Sophos;i="4.90,1062,1371052800"; d="scan'208";a="8701015" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 09 Oct 2013 17:42:32 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r999jhL7012742; Wed, 9 Oct 2013 17:45:46 +0800 Received: from G08FNSTD131468.fnst.cn.fujitsu.com ([10.167.226.78]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013100917433656-2111567 ; Wed, 9 Oct 2013 17:43:36 +0800 From: Chen Fan To: qemu-devel@nongnu.org Date: Wed, 9 Oct 2013 17:43:14 +0800 Message-Id: X-Mailer: git-send-email 1.8.1.4 In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/10/09 17:43:36, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/10/09 17:43:40, Serialize complete at 2013/10/09 17:43:40 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC qom-cpu v4 06/10] 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 Rename variable 'cpu_added_notifier' to 'cpu_hotplug_notifier', for adding vcpu-remove notifier support. Signed-off-by: Chen Fan --- hw/acpi/piix4.c | 10 +++++----- hw/i386/pc.c | 2 +- include/sysemu/sysemu.h | 2 +- qom/cpu.c | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index b46bd5e..06f55d6 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -95,7 +95,7 @@ typedef struct PIIX4PMState { uint8_t s4_val; CPUStatus gpe_cpu; - Notifier cpu_added_notifier; + Notifier cpu_hotplug_notifier; } PIIX4PMState; #define TYPE_PIIX4_PM "PIIX4_PM" @@ -661,9 +661,9 @@ static void piix4_cpu_hotplug_req(PIIX4PMState *s, CPUState *cpu, pm_update_sci(s); } -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); piix4_cpu_hotplug_req(s, CPU(opaque), PLUG); } @@ -696,8 +696,8 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, memory_region_init_io(&s->io_cpu, OBJECT(s), &cpu_hotplug_ops, s, "acpi-cpu-hotplug", PIIX4_PROC_LEN); memory_region_add_subregion(parent, PIIX4_PROC_BASE, &s->io_cpu); - 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); } static void enable_device(PIIX4PMState *s, int slot) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 40d611e..8ab6e4f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -406,7 +406,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/sysemu/sysemu.h b/include/sysemu/sysemu.h index cd5791e..72c5ff9 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -158,7 +158,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 818fb26..0913c9c 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -67,12 +67,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) @@ -219,7 +219,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); } }