From patchwork Thu Feb 25 15:07:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 46245 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 714FCB7C67 for ; Fri, 26 Feb 2010 02:16:53 +1100 (EST) Received: from localhost ([127.0.0.1]:33064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkfSM-000728-DD for incoming@patchwork.ozlabs.org; Thu, 25 Feb 2010 10:16:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkfJN-0003c1-90 for qemu-devel@nongnu.org; Thu, 25 Feb 2010 10:07:33 -0500 Received: from [199.232.76.173] (port=38081 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkfJM-0003bC-Hw for qemu-devel@nongnu.org; Thu, 25 Feb 2010 10:07:32 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkfJL-0008RX-BM for qemu-devel@nongnu.org; Thu, 25 Feb 2010 10:07:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46707) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NkfJK-0008RT-VV for qemu-devel@nongnu.org; Thu, 25 Feb 2010 10:07:31 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1PF7TdA032109 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 25 Feb 2010 10:07:30 -0500 Received: from localhost (vpn-9-86.rdu.redhat.com [10.11.9.86]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1PF7SA7018761 for ; Thu, 25 Feb 2010 10:07:28 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 25 Feb 2010 12:07:01 -0300 Message-Id: <1267110422-25873-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1267110422-25873-1-git-send-email-lcapitulino@redhat.com> References: <1267110422-25873-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 4/5] QMP: Drop DEBUG event 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 This event has been introduced in the first round of QMP commits, turns out that it's based on the usage of the EXCP_DEBUG macro, which has discussable semantics when exposed through QMP. As libvirt doesn't use this, let's just drop it. Signed-off-by: Luiz Capitulino --- QMP/qmp-events.txt | 6 ------ monitor.c | 3 --- monitor.h | 1 - vl.c | 1 - 4 files changed, 0 insertions(+), 11 deletions(-) diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index d585a8d..9bf14d0 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -19,12 +19,6 @@ Data: None. Description: Issued when the Virtual Machine is stopped. Data: None. -4 DEBUG -------- - -Description: Issued when the Virtual Machine enters debug mode. -Data: None. - 4 VNC_CONNECTED --------------- diff --git a/monitor.c b/monitor.c index 19470d1..b2f5842 100644 --- a/monitor.c +++ b/monitor.c @@ -399,9 +399,6 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) assert(event < QEVENT_MAX); switch (event) { - case QEVENT_DEBUG: - event_name = "DEBUG"; - break; case QEVENT_SHUTDOWN: event_name = "SHUTDOWN"; break; diff --git a/monitor.h b/monitor.h index fc09505..8cc21f5 100644 --- a/monitor.h +++ b/monitor.h @@ -15,7 +15,6 @@ extern Monitor *cur_mon; /* QMP events */ typedef enum MonitorEvent { - QEVENT_DEBUG, QEVENT_SHUTDOWN, QEVENT_RESET, QEVENT_POWERDOWN, diff --git a/vl.c b/vl.c index 2c766c4..3f580f5 100644 --- a/vl.c +++ b/vl.c @@ -4054,7 +4054,6 @@ static void main_loop(void) } while (vm_can_run()); if (qemu_debug_requested()) { - monitor_protocol_event(QEVENT_DEBUG, NULL); vm_stop(EXCP_DEBUG); } if (qemu_shutdown_requested()) {