From patchwork Mon Jan 10 08:32:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 78093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 20FCFB708B for ; Mon, 10 Jan 2011 19:43:44 +1100 (EST) Received: from localhost ([127.0.0.1]:53482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PcDLo-0000Nq-EV for incoming@patchwork.ozlabs.org; Mon, 10 Jan 2011 03:43:40 -0500 Received: from [140.186.70.92] (port=52269 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PcDAx-0003eQ-M1 for qemu-devel@nongnu.org; Mon, 10 Jan 2011 03:32:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PcDAw-0006OZ-A5 for qemu-devel@nongnu.org; Mon, 10 Jan 2011 03:32:27 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:50269) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PcDAv-0006O3-QE for qemu-devel@nongnu.org; Mon, 10 Jan 2011 03:32:26 -0500 Received: from smtp06.web.de ( [172.20.5.172]) by fmmailgate01.web.de (Postfix) with ESMTP id 08BA4184F8C2C; Mon, 10 Jan 2011 09:32:25 +0100 (CET) Received: from [92.75.141.173] (helo=localhost.localdomain) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PcDAu-0006T2-01; Mon, 10 Jan 2011 09:32:24 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 10 Jan 2011 09:32:03 +0100 Message-Id: <335a7046a9915ddbb22b6c867e60148b3e5bed50.1294648329.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX19wagod++LBMjszA58NjQzfhiJy2qWNaiZMt3AM qbOkBHMRoZFbEZoF1iCpbIikD9ksux08kgOLIaOki4fszJJWzF EwnhoxCzA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 10/18] Fix a few coding style violations in cpus.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka No functional changes. Signed-off-by: Jan Kiszka --- cpus.c | 96 ++++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 58 insertions(+), 38 deletions(-) diff --git a/cpus.c b/cpus.c index e482fdb..89b4bd7 100644 --- a/cpus.c +++ b/cpus.c @@ -130,25 +130,26 @@ static void do_vm_stop(int reason) static int cpu_can_run(CPUState *env) { - if (env->stop) + if (env->stop) { return 0; - if (env->stopped || !vm_running) + } + if (env->stopped || !vm_running) { return 0; + } return 1; } static int cpu_has_work(CPUState *env) { - if (env->stop) + if (env->stop || env->queued_work_first) { return 1; - if (env->queued_work_first) - return 1; - if (env->stopped || !vm_running) + } + if (env->stopped || !vm_running) { return 0; - if (!env->halted) - return 1; - if (qemu_cpu_has_work(env)) + } + if (!env->halted || qemu_cpu_has_work(env)) { return 1; + } return 0; } @@ -156,9 +157,11 @@ static int any_cpu_has_work(void) { CPUState *env; - for (env = first_cpu; env != NULL; env = env->next_cpu) - if (cpu_has_work(env)) + for (env = first_cpu; env != NULL; env = env->next_cpu) { + if (cpu_has_work(env)) { return 1; + } + } return 0; } @@ -234,9 +237,9 @@ static void qemu_event_increment(void) static const uint64_t val = 1; ssize_t ret; - if (io_thread_fd == -1) + if (io_thread_fd == -1) { return; - + } do { ret = write(io_thread_fd, &val, sizeof(val)); } while (ret < 0 && errno == EINTR); @@ -267,17 +270,17 @@ static int qemu_event_init(void) int fds[2]; err = qemu_eventfd(fds); - if (err == -1) + if (err == -1) { return -errno; - + } err = fcntl_setfl(fds[0], O_NONBLOCK); - if (err < 0) + if (err < 0) { goto fail; - + } err = fcntl_setfl(fds[1], O_NONBLOCK); - if (err < 0) + if (err < 0) { goto fail; - + } qemu_set_fd_handler2(fds[0], NULL, qemu_event_read, NULL, (void *)(unsigned long)fds[0]); @@ -598,13 +601,15 @@ int qemu_init_main_loop(void) blocked_signals = block_io_signals(); ret = qemu_signalfd_init(blocked_signals); - if (ret) + if (ret) { return ret; + } /* Note eventfd must be drained before signalfd handlers run */ ret = qemu_event_init(); - if (ret) + if (ret) { return ret; + } qemu_cond_init(&qemu_pause_cond); qemu_cond_init(&qemu_system_cond); @@ -634,10 +639,11 @@ void run_on_cpu(CPUState *env, void (*func)(void *data), void *data) wi.func = func; wi.data = data; - if (!env->queued_work_first) + if (!env->queued_work_first) { env->queued_work_first = &wi; - else + } else { env->queued_work_last->next = &wi; + } env->queued_work_last = &wi; wi.next = NULL; wi.done = false; @@ -655,8 +661,9 @@ static void flush_queued_work(CPUState *env) { struct qemu_work_item *wi; - if (!env->queued_work_first) + if (!env->queued_work_first) { return; + } while ((wi = env->queued_work_first)) { env->queued_work_first = wi->next; @@ -681,8 +688,9 @@ static void qemu_tcg_wait_io_event(void) { CPUState *env; - while (!any_cpu_has_work()) + while (!any_cpu_has_work()) { qemu_cond_timedwait(tcg_halt_cond, &qemu_global_mutex, 1000); + } qemu_mutex_unlock(&qemu_global_mutex); @@ -703,9 +711,9 @@ static void qemu_tcg_wait_io_event(void) static void qemu_kvm_wait_io_event(CPUState *env) { - while (!cpu_has_work(env)) + while (!cpu_has_work(env)) { qemu_cond_timedwait(env->halt_cond, &qemu_global_mutex, 1000); - + } qemu_kvm_eat_signals(env); qemu_wait_io_event_common(env); } @@ -732,12 +740,14 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) qemu_cond_signal(&qemu_cpu_cond); /* and wait for machine initialization */ - while (!qemu_system_ready) + while (!qemu_system_ready) { qemu_cond_timedwait(&qemu_system_cond, &qemu_global_mutex, 100); + } while (1) { - if (cpu_can_run(env)) + if (cpu_can_run(env)) { qemu_cpu_exec(env); + } qemu_kvm_wait_io_event(env); } @@ -753,13 +763,15 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) /* signal CPU creation */ qemu_mutex_lock(&qemu_global_mutex); - for (env = first_cpu; env != NULL; env = env->next_cpu) + for (env = first_cpu; env != NULL; env = env->next_cpu) { env->created = 1; + } qemu_cond_signal(&qemu_cpu_cond); /* and wait for machine initialization */ - while (!qemu_system_ready) + while (!qemu_system_ready) { qemu_cond_timedwait(&qemu_system_cond, &qemu_global_mutex, 100); + } while (1) { cpu_exec_all(); @@ -772,6 +784,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) void qemu_cpu_kick(void *_env) { CPUState *env = _env; + qemu_cond_broadcast(env->halt_cond); qemu_thread_signal(env->thread, SIG_IPI); } @@ -810,8 +823,9 @@ static int all_vcpus_paused(void) CPUState *penv = first_cpu; while (penv) { - if (!penv->stopped) + if (!penv->stopped) { return 0; + } penv = (CPUState *)penv->next_cpu; } @@ -853,14 +867,16 @@ void resume_all_vcpus(void) static void qemu_tcg_init_vcpu(void *_env) { CPUState *env = _env; + /* share a single thread for all cpus with TCG */ if (!tcg_cpu_thread) { env->thread = qemu_mallocz(sizeof(QemuThread)); env->halt_cond = qemu_mallocz(sizeof(QemuCond)); qemu_cond_init(env->halt_cond); qemu_thread_create(env->thread, qemu_tcg_cpu_thread_fn, env); - while (env->created == 0) + while (env->created == 0) { qemu_cond_timedwait(&qemu_cpu_cond, &qemu_global_mutex, 100); + } tcg_cpu_thread = env->thread; tcg_halt_cond = env->halt_cond; } else { @@ -875,8 +891,9 @@ static void qemu_kvm_start_vcpu(CPUState *env) env->halt_cond = qemu_mallocz(sizeof(QemuCond)); qemu_cond_init(env->halt_cond); qemu_thread_create(env->thread, qemu_kvm_cpu_thread_fn, env); - while (env->created == 0) + while (env->created == 0) { qemu_cond_timedwait(&qemu_cpu_cond, &qemu_global_mutex, 100); + } } void qemu_init_vcpu(void *_env) @@ -885,10 +902,11 @@ void qemu_init_vcpu(void *_env) env->nr_cores = smp_cores; env->nr_threads = smp_threads; - if (kvm_enabled()) + if (kvm_enabled()) { qemu_kvm_start_vcpu(env); - else + } else { qemu_tcg_init_vcpu(env); + } } void qemu_notify_event(void) @@ -966,16 +984,18 @@ bool cpu_exec_all(void) { int r; - if (next_cpu == NULL) + if (next_cpu == NULL) { next_cpu = first_cpu; + } for (; next_cpu != NULL && !exit_request; next_cpu = next_cpu->next_cpu) { CPUState *env = next_cpu; qemu_clock_enable(vm_clock, (env->singlestep_enabled & SSTEP_NOTIMER) == 0); - if (qemu_alarm_pending()) + if (qemu_alarm_pending()) { break; + } if (cpu_can_run(env)) { r = qemu_cpu_exec(env); if (kvm_enabled()) {