From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGt7r-0003gt-Iz for qemu-devel@nongnu.org; Tue, 03 Sep 2013 12:06:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGt7l-0006nX-Hu for qemu-devel@nongnu.org; Tue, 03 Sep 2013 12:06:43 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43534 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGt7l-0006nK-7f for qemu-devel@nongnu.org; Tue, 03 Sep 2013 12:06:37 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 3 Sep 2013 18:06:26 +0200 Message-Id: <1378224387-18760-4-git-send-email-afaerber@suse.de> In-Reply-To: <1378224387-18760-1-git-send-email-afaerber@suse.de> References: <1378224387-18760-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/4] cpu: Replace qemu_for_each_cpu() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" It was introduced to loop over CPUs from target-independent code, but since commit 182735efaf956ccab50b6d74a4fed163e0f35660 target-independent CPUState is used. A loop can be considered more efficient than function calls in a loop, and CPU_FOREACH() hides implementation details just as well, so use that instead. Suggested-by: Markus Armbruster Acked-by: Michael S. Tsirkin Signed-off-by: Andreas F=C3=A4rber --- arch_init.c | 11 +++++------ cpus.c | 11 ++++------- exec.c | 9 --------- hw/acpi/piix4.c | 20 +++++++++----------- include/qom/cpu.h | 9 --------- qom/cpu.c | 30 +++++++++--------------------- 6 files changed, 27 insertions(+), 63 deletions(-) diff --git a/arch_init.c b/arch_init.c index 0471cd5..e47e139 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1196,15 +1196,14 @@ static void mig_sleep_cpu(void *opq) much time in the VM. The migration thread will try to catchup. Workload will experience a performance drop. */ -static void mig_throttle_cpu_down(CPUState *cpu, void *data) -{ - async_run_on_cpu(cpu, mig_sleep_cpu, NULL); -} - static void mig_throttle_guest_down(void) { + CPUState *cpu; + qemu_mutex_lock_iothread(); - qemu_for_each_cpu(mig_throttle_cpu_down, NULL); + CPU_FOREACH(cpu) { + async_run_on_cpu(cpu, mig_sleep_cpu, NULL); + } qemu_mutex_unlock_iothread(); } =20 diff --git a/cpus.c b/cpus.c index 363d392..e566297 100644 --- a/cpus.c +++ b/cpus.c @@ -854,12 +854,6 @@ static void *qemu_dummy_cpu_thread_fn(void *arg) =20 static void tcg_exec_all(void); =20 -static void tcg_signal_cpu_creation(CPUState *cpu, void *data) -{ - cpu->thread_id =3D qemu_get_thread_id(); - cpu->created =3D true; -} - static void *qemu_tcg_cpu_thread_fn(void *arg) { CPUState *cpu =3D arg; @@ -868,7 +862,10 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) qemu_thread_get_self(cpu->thread); =20 qemu_mutex_lock(&qemu_global_mutex); - qemu_for_each_cpu(tcg_signal_cpu_creation, NULL); + CPU_FOREACH(cpu) { + cpu->thread_id =3D qemu_get_thread_id(); + cpu->created =3D true; + } qemu_cond_signal(&qemu_cpu_cond); =20 /* wait for initial kick-off after machine start */ diff --git a/exec.c b/exec.c index ca2a504..87b0b39 100644 --- a/exec.c +++ b/exec.c @@ -362,15 +362,6 @@ CPUState *qemu_get_cpu(int index) return NULL; } =20 -void qemu_for_each_cpu(void (*func)(CPUState *cpu, void *data), void *da= ta) -{ - CPUState *cpu; - - CPU_FOREACH(cpu) { - func(cpu, data); - } -} - void cpu_exec_init(CPUArchState *env) { CPUState *cpu =3D ENV_GET_CPU(env); diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 613d987..0b8d1d9 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -667,22 +667,14 @@ static void piix4_cpu_added_req(Notifier *n, void *= opaque) piix4_cpu_hotplug_req(s, CPU(opaque), PLUG); } =20 -static void piix4_init_cpu_status(CPUState *cpu, void *data) -{ - CPUStatus *g =3D (CPUStatus *)data; - CPUClass *k =3D CPU_GET_CLASS(cpu); - int64_t id =3D k->get_arch_id(cpu); - - g_assert((id / 8) < PIIX4_PROC_LEN); - g->sts[id / 8] |=3D (1 << (id % 8)); -} - static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, PCIHotplugState state); =20 static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, PCIBus *bus, PIIX4PMState *s) { + CPUState *cpu; + memory_region_init_io(&s->io_gpe, OBJECT(s), &piix4_gpe_ops, s, "acpi-gpe0", GPE_LEN); memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); @@ -693,7 +685,13 @@ static void piix4_acpi_system_hot_add_init(MemoryReg= ion *parent, &s->io_pci); pci_bus_hotplug(bus, piix4_device_hotplug, DEVICE(s)); =20 - qemu_for_each_cpu(piix4_init_cpu_status, &s->gpe_cpu); + CPU_FOREACH(cpu) { + CPUClass *cc =3D CPU_GET_CLASS(cpu); + int64_t id =3D cc->get_arch_id(cpu); + + g_assert((id / 8) < PIIX4_PROC_LEN); + s->gpe_cpu.sts[id / 8] |=3D (1 << (id % 8)); + } 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); diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 79f7c87..7739e00 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -403,15 +403,6 @@ void run_on_cpu(CPUState *cpu, void (*func)(void *da= ta), void *data); void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *dat= a); =20 /** - * qemu_for_each_cpu: - * @func: The function to be executed. - * @data: Data to pass to the function. - * - * Executes @func for each CPU. - */ -void qemu_for_each_cpu(void (*func)(CPUState *cpu, void *data), void *da= ta); - -/** * qemu_get_cpu: * @index: The CPUState@cpu_index value of the CPU to obtain. * diff --git a/qom/cpu.c b/qom/cpu.c index e71e57b..fa7ec6b 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -25,30 +25,18 @@ #include "qemu/log.h" #include "sysemu/sysemu.h" =20 -typedef struct CPUExistsArgs { - int64_t id; - bool found; -} CPUExistsArgs; - -static void cpu_exist_cb(CPUState *cpu, void *data) -{ - CPUClass *klass =3D CPU_GET_CLASS(cpu); - CPUExistsArgs *arg =3D data; - - if (klass->get_arch_id(cpu) =3D=3D arg->id) { - arg->found =3D true; - } -} - bool cpu_exists(int64_t id) { - CPUExistsArgs data =3D { - .id =3D id, - .found =3D false, - }; + CPUState *cpu; + + CPU_FOREACH(cpu) { + CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - qemu_for_each_cpu(cpu_exist_cb, &data); - return data.found; + if (cc->get_arch_id(cpu) =3D=3D id) { + return true; + } + } + return false; } =20 bool cpu_paging_enabled(const CPUState *cpu) --=20 1.8.1.4