Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 340e01248478ba8b78a6d4d1809b1eff > files > 208

kvm-83-270.el5_11.src.rpm

From 7a9750fa919fc65ba1716ad778df72e3b877bbad Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 3 Sep 2009 16:22:18 -0300
Subject: [PATCH 2/2] Revert "Work around VM state change handlers running out of order."

Message-id: <280804f2002d6e58fe21a02710ca13c10f0a2b64.1251753446.git.armbru@redhat.com>
RH-Author: Markus Armbruster <armbru@redhat.com>
Patchwork-id: 3355
O-Subject: [PATCH 2/2 RHEL-5] Revert "Work around VM state change handlers
	running out of order."
Bugzilla: 514522
CVE:
RH-Acked-by: Juan Quintela <quintela@redhat.com>
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

This reverts commit cea092a88b1fc02f130b536ea9b3e949e2301646.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qemu/hw/qxl.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/hw/qxl.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/qemu/hw/qxl.c b/qemu/hw/qxl.c
index c3322b5..8a02d07 100644
--- a/qemu/hw/qxl.c
+++ b/qemu/hw/qxl.c
@@ -1414,10 +1414,6 @@ static void qxl_vm_change_state_handler(void *opaque, int running)
 
     printf("QXL: %s: running=%d\n", __FUNCTION__, running);
 
-    if (running == d->state.running) {
-        return;
-    }
-
     if (running) {
         d->state.running = TRUE;
         qemu_set_fd_handler(d->pipe_fd[0], qxl_pipe_read, NULL, d);
@@ -1829,10 +1825,6 @@ static void vdi_port_vm_change_state_handler(void *opaque, int running)
 {
     PCIVDIPortDevice* d=(PCIVDIPortDevice*)opaque;
 
-    if (running == d->running ) {
-        return;
-    }
-
     if (running) {
         d->running = TRUE;
         if (d->new_gen_on_resume) {
-- 
1.6.3.rc4.29.g8146