From patchwork Thu Sep 15 20:05:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 114832 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6B760B6F93 for ; Fri, 16 Sep 2011 06:57:37 +1000 (EST) Received: from localhost ([::1]:52970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ICr-0006u7-CM for incoming@patchwork.ozlabs.org; Thu, 15 Sep 2011 16:06:45 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ICG-0005Lf-W4 for qemu-devel@nongnu.org; Thu, 15 Sep 2011 16:06:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4ICE-00013E-Ky for qemu-devel@nongnu.org; Thu, 15 Sep 2011 16:06:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ICE-00012x-9M for qemu-devel@nongnu.org; Thu, 15 Sep 2011 16:06:06 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8FK65nS013915 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 15 Sep 2011 16:06:05 -0400 Received: from localhost (ovpn-113-50.phx2.redhat.com [10.3.113.50]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8FK64Xn025929; Thu, 15 Sep 2011 16:06:05 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Thu, 15 Sep 2011 17:05:46 -0300 Message-Id: <1316117149-9293-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1316117149-9293-1-git-send-email-lcapitulino@redhat.com> References: <1316117149-9293-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 6/9] Drop the vm_running global variable 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 Use runstate_is_running() instead, which is introduced by this commit. Signed-off-by: Luiz Capitulino --- cpus.c | 9 ++++----- gdbstub.c | 4 ++-- hw/etraxfs_dma.c | 2 +- hw/kvmclock.c | 2 +- hw/virtio.c | 2 +- migration.c | 2 +- monitor.c | 4 ++-- qemu-timer.c | 6 +++--- savevm.c | 4 ++-- sysemu.h | 2 +- target-i386/kvm.c | 2 +- ui/sdl.c | 6 +++--- vl.c | 9 ++++++--- xen-all.c | 2 +- 14 files changed, 29 insertions(+), 27 deletions(-) diff --git a/cpus.c b/cpus.c index 3444bc0..883c27a 100644 --- a/cpus.c +++ b/cpus.c @@ -115,14 +115,13 @@ void cpu_synchronize_all_post_init(void) int cpu_is_stopped(CPUState *env) { - return !vm_running || env->stopped; + return !runstate_is_running() || env->stopped; } static void do_vm_stop(RunState state) { - if (vm_running) { + if (runstate_is_running()) { cpu_disable_ticks(); - vm_running = 0; pause_all_vcpus(); runstate_set(state); vm_state_notify(0, state); @@ -137,7 +136,7 @@ static int cpu_can_run(CPUState *env) if (env->stop) { return 0; } - if (env->stopped || !vm_running) { + if (env->stopped || !runstate_is_running()) { return 0; } return 1; @@ -148,7 +147,7 @@ static bool cpu_thread_is_idle(CPUState *env) if (env->stop || env->queued_work_first) { return false; } - if (env->stopped || !vm_running) { + if (env->stopped || !runstate_is_running()) { return true; } if (!env->halted || qemu_cpu_has_work(env) || diff --git a/gdbstub.c b/gdbstub.c index 75b52e2..12dd100 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2534,7 +2534,7 @@ static void gdb_read_byte(GDBState *s, int ch) if (ch != '$') return; } - if (vm_running) { + if (runstate_is_running()) { /* when the CPU is running, we cannot do anything except stop it when receiving a char */ vm_stop(RSTATE_PAUSED); @@ -2839,7 +2839,7 @@ static int gdb_monitor_write(CharDriverState *chr, const uint8_t *buf, int len) #ifndef _WIN32 static void gdb_sigterm_handler(int signal) { - if (vm_running) { + if (runstate_is_running()) { vm_stop(RSTATE_PAUSED); } } diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c index e8ad9e6..d3082ac 100644 --- a/hw/etraxfs_dma.c +++ b/hw/etraxfs_dma.c @@ -732,7 +732,7 @@ static void DMA_run(void *opaque) struct fs_dma_ctrl *etraxfs_dmac = opaque; int p = 1; - if (vm_running) + if (runstate_is_running()) p = etraxfs_dmac_run(etraxfs_dmac); if (p) diff --git a/hw/kvmclock.c b/hw/kvmclock.c index 88961be..5388bc4 100644 --- a/hw/kvmclock.c +++ b/hw/kvmclock.c @@ -46,7 +46,7 @@ static void kvmclock_pre_save(void *opaque) * it on next vmsave (which would return a different value). Will be reset * when the VM is continued. */ - s->clock_valid = !vm_running; + s->clock_valid = !runstate_is_running(); } static int kvmclock_post_load(void *opaque, int version_id) diff --git a/hw/virtio.c b/hw/virtio.c index 74ab79e..c577bbe 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -870,7 +870,7 @@ VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, vdev->queue_sel = 0; vdev->config_vector = VIRTIO_NO_VECTOR; vdev->vq = g_malloc0(sizeof(VirtQueue) * VIRTIO_PCI_QUEUE_MAX); - vdev->vm_running = vm_running; + vdev->vm_running = runstate_is_running(); for(i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { vdev->vq[i].vector = VIRTIO_NO_VECTOR; vdev->vq[i].vdev = vdev; diff --git a/migration.c b/migration.c index a63e2a2..7dd8f4e 100644 --- a/migration.c +++ b/migration.c @@ -372,7 +372,7 @@ void migrate_fd_put_ready(void *opaque) DPRINTF("iterate\n"); if (qemu_savevm_state_iterate(s->mon, s->file) == 1) { int state; - int old_vm_running = vm_running; + int old_vm_running = runstate_is_running(); DPRINTF("done iterating\n"); vm_stop(RSTATE_PRE_MIGRATE); diff --git a/monitor.c b/monitor.c index 68956a5..442b4cf 100644 --- a/monitor.c +++ b/monitor.c @@ -2632,7 +2632,7 @@ static void do_info_status_print(Monitor *mon, const QObject *data) static void do_info_status(Monitor *mon, QObject **ret_data) { *ret_data = qobject_from_jsonf("{ 'running': %i, 'singlestep': %i }", - vm_running, singlestep); + runstate_is_running(), singlestep); } static qemu_acl *find_acl(Monitor *mon, const char *name) @@ -2825,7 +2825,7 @@ static int do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) static void do_loadvm(Monitor *mon, const QDict *qdict) { - int saved_vm_running = vm_running; + int saved_vm_running = runstate_is_running(); const char *name = qdict_get_str(qdict, "name"); vm_stop(RSTATE_RESTORE); diff --git a/qemu-timer.c b/qemu-timer.c index b582786..ad1fc8b 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -230,7 +230,7 @@ static void icount_adjust(void) int64_t delta; static int64_t last_delta; /* If the VM is not running, then do nothing. */ - if (!vm_running) + if (!runstate_is_running()) return; cur_time = cpu_get_clock(); @@ -388,7 +388,7 @@ static void icount_warp_rt(void *opaque) return; } - if (vm_running) { + if (runstate_is_running()) { int64_t clock = qemu_get_clock_ns(rt_clock); int64_t warp_delta = clock - vm_clock_warp_start; if (use_icount == 1) { @@ -710,7 +710,7 @@ void qemu_run_all_timers(void) } /* vm time timers */ - if (vm_running) { + if (runstate_is_running()) { qemu_run_timers(vm_clock); } diff --git a/savevm.c b/savevm.c index f1f7735..46f2447 100644 --- a/savevm.c +++ b/savevm.c @@ -1602,7 +1602,7 @@ static int qemu_savevm_state(Monitor *mon, QEMUFile *f) int saved_vm_running; int ret; - saved_vm_running = vm_running; + saved_vm_running = runstate_is_running(); vm_stop(RSTATE_SAVEVM); if (qemu_savevm_state_blocked(mon)) { @@ -1931,7 +1931,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) return; } - saved_vm_running = vm_running; + saved_vm_running = runstate_is_running(); vm_stop(RSTATE_SAVEVM); memset(sn, 0, sizeof(*sn)); diff --git a/sysemu.h b/sysemu.h index a01ddac..9a2c531 100644 --- a/sysemu.h +++ b/sysemu.h @@ -30,7 +30,6 @@ typedef enum { extern const char *bios_name; -extern int vm_running; extern const char *qemu_name; extern uint8_t qemu_uuid[]; int qemu_uuid_parse(const char *str, uint8_t *uuid); @@ -39,6 +38,7 @@ int qemu_uuid_parse(const char *str, uint8_t *uuid); void runstate_init(void); bool runstate_check(RunState state); void runstate_set(RunState new_state); +int runstate_is_running(void); typedef struct vm_change_state_entry VMChangeStateEntry; typedef void VMChangeStateHandler(void *opaque, int running, RunState state); diff --git a/target-i386/kvm.c b/target-i386/kvm.c index ead34ea..b6eef04 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1130,7 +1130,7 @@ static int kvm_get_msrs(CPUState *env) if (!env->tsc_valid) { msrs[n++].index = MSR_IA32_TSC; - env->tsc_valid = !vm_running; + env->tsc_valid = !runstate_is_running(); } #ifdef TARGET_X86_64 diff --git a/ui/sdl.c b/ui/sdl.c index c7aaedf..8cafc44 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -409,7 +409,7 @@ static void sdl_update_caption(void) char icon_title[1024]; const char *status = ""; - if (!vm_running) + if (!runstate_is_running()) status = " [Stopped]"; else if (gui_grab) { if (alt_grab) @@ -853,8 +853,8 @@ static void sdl_refresh(DisplayState *ds) { SDL_Event ev1, *ev = &ev1; - if (last_vm_running != vm_running) { - last_vm_running = vm_running; + if (last_vm_running != runstate_is_running()) { + last_vm_running = runstate_is_running(); sdl_update_caption(); } diff --git a/vl.c b/vl.c index 2fb09f5..9128d48 100644 --- a/vl.c +++ b/vl.c @@ -185,7 +185,6 @@ int mem_prealloc = 0; /* force preallocation of physical target memory */ #endif int nb_nics; NICInfo nd_table[MAX_NICS]; -int vm_running; int autostart; static int rtc_utc = 1; static int rtc_date_offset = -1; /* -1 means no change */ @@ -407,6 +406,11 @@ void runstate_set(RunState new_state) current_run_state = new_state; } +int runstate_is_running(void) +{ + return runstate_check(RSTATE_RUNNING); +} + /***********************************************************/ /* real time host monotonic timer */ @@ -1243,9 +1247,8 @@ void vm_state_notify(int running, RunState state) void vm_start(void) { - if (!vm_running) { + if (!runstate_is_running()) { cpu_enable_ticks(); - vm_running = 1; runstate_set(RSTATE_RUNNING); vm_state_notify(1, RSTATE_RUNNING); resume_all_vcpus(); diff --git a/xen-all.c b/xen-all.c index b119817..b5e28ab 100644 --- a/xen-all.c +++ b/xen-all.c @@ -736,7 +736,7 @@ static void cpu_handle_ioreq(void *opaque) * guest resumes and does a hlt with interrupts disabled which * causes Xen to powerdown the domain. */ - if (vm_running) { + if (runstate_is_running()) { if (qemu_shutdown_requested_get()) { destroy_hvm_domain(); }