diff options
author | Luiz Capitulino <lcapitulino@redhat.com> | 2011-07-29 15:36:43 -0300 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2011-09-15 16:39:32 -0300 |
commit | 1354869c380cf4560fa3f0520e914cb5ee380ac8 (patch) | |
tree | da76e4d2063b81905a66a8446d9301bd910ee856 /hw | |
parent | 1bcef683bf840a928d633755031ac572d5fdb851 (diff) | |
download | qemu-1354869c380cf4560fa3f0520e914cb5ee380ac8.zip qemu-1354869c380cf4560fa3f0520e914cb5ee380ac8.tar.gz qemu-1354869c380cf4560fa3f0520e914cb5ee380ac8.tar.bz2 |
Drop the vm_running global variable
Use runstate_is_running() instead, which is introduced by this commit.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/etraxfs_dma.c | 2 | ||||
-rw-r--r-- | hw/kvmclock.c | 2 | ||||
-rw-r--r-- | hw/virtio.c | 2 |
3 files changed, 3 insertions, 3 deletions
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; |