From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luiz Capitulino Subject: [PATCH] QMP: Sync with upstream event changes Date: Wed, 10 Mar 2010 11:59:53 -0300 Message-ID: <20100310115953.5ffd1690@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: mtosatti@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:62242 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756673Ab0CJPAA (ORCPT ); Wed, 10 Mar 2010 10:00:00 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2AF00B4021978 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Mar 2010 10:00:00 -0500 Sender: kvm-owner@vger.kernel.org List-ID: This commit contains the following QMP event changes to sync kvm_main_loop() with upstream: - Add the SHUTDOWN event (it's currently missing here) - Drop the RESET event (it's now emitted in qemu_system_reset()) - Drop the DEBUG event (it has been dropped upstream) Signed-off-by: Luiz Capitulino --- qemu-kvm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index e417f21..2233a37 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -2038,6 +2038,7 @@ int kvm_main_loop(void) while (1) { main_loop_wait(1000); if (qemu_shutdown_requested()) { + monitor_protocol_event(QEVENT_SHUTDOWN, NULL); if (qemu_no_shutdown()) { vm_stop(0); } else @@ -2046,10 +2047,8 @@ int kvm_main_loop(void) monitor_protocol_event(QEVENT_POWERDOWN, NULL); qemu_irq_raise(qemu_system_powerdown); } else if (qemu_reset_requested()) { - monitor_protocol_event(QEVENT_RESET, NULL); qemu_kvm_system_reset(); } else if (kvm_debug_cpu_requested) { - monitor_protocol_event(QEVENT_DEBUG, NULL); gdb_set_stop_cpu(kvm_debug_cpu_requested); vm_stop(EXCP_DEBUG); kvm_debug_cpu_requested = NULL; -- 1.7.0.2.182.ge007