From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NcF6R-0007TQ-9v for qemu-devel@nongnu.org; Tue, 02 Feb 2010 04:31:23 -0500 Received: from [199.232.76.173] (port=59035 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcF6Q-0007T4-RY for qemu-devel@nongnu.org; Tue, 02 Feb 2010 04:31:22 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NcF6P-0002xy-6W for qemu-devel@nongnu.org; Tue, 02 Feb 2010 04:31:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12453) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NcF6O-0002xi-KJ for qemu-devel@nongnu.org; Tue, 02 Feb 2010 04:31:20 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o129VJj4029057 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 2 Feb 2010 04:31:19 -0500 Message-ID: <4B67F0B3.3020303@redhat.com> Date: Tue, 02 Feb 2010 10:30:27 +0100 From: Kevin Wolf MIME-Version: 1.0 References: <1265047668-15039-1-git-send-email-lcapitulino@redhat.com> <1265047668-15039-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1265047668-15039-3-git-send-email-lcapitulino@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 2/2] QMP: Introduce DISK_ERROR event List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org Am 01.02.2010 19:07, schrieb Luiz Capitulino: > It's emitted when a disk write or read fails, some device information > is provided. We can also provide error details in the future. > > Example: > > { "event": "DISK_ERROR", > "data": { "device": "ide0-hd1", > "operation": "write", > "action": "stop" } > "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } > > NOTE: Adding a small reference in QMP/qmp-events.txt, but this file is > wrong and will be replaced by proper documentation shortly. > > Signed-off-by: Luiz Capitulino > --- > QMP/qmp-events.txt | 7 +++++++ > monitor.c | 3 +++ > monitor.h | 1 + > vl.c | 34 +++++++++++++++++++++++++++++++++- > 4 files changed, 44 insertions(+), 1 deletions(-) > > diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt > index dc48ccc..e968ef5 100644 > --- a/QMP/qmp-events.txt > +++ b/QMP/qmp-events.txt > @@ -43,3 +43,10 @@ Data: 'server' and 'client' keys with the same keys as 'query-vnc'. > > Description: Issued when the VNC session is made active. > Data: 'server' and 'client' keys with the same keys as 'query-vnc'. > + > +7 DISK_ERROR > +------------ > + > +Description: Issued when a disk I/O error occurs > +Data: 'device' (device name), 'action' (action to be taken), > + 'operation' ("read" or "write") > diff --git a/monitor.c b/monitor.c > index fb7c572..82edd79 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -378,6 +378,9 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) > case QEVENT_VNC_DISCONNECTED: > event_name = "VNC_DISCONNECTED"; > break; > + case QEVENT_DISK_ERROR: > + event_name = "DISK_ERROR"; > + break; > default: > abort(); > break; > diff --git a/monitor.h b/monitor.h > index b0f9270..beaddaf 100644 > --- a/monitor.h > +++ b/monitor.h > @@ -23,6 +23,7 @@ typedef enum MonitorEvent { > QEVENT_VNC_CONNECTED, > QEVENT_VNC_INITIALIZED, > QEVENT_VNC_DISCONNECTED, > + QEVENT_DISK_ERROR, > QEVENT_MAX, > } MonitorEvent; > > diff --git a/vl.c b/vl.c > index 57c439d..1f69f56 100644 > --- a/vl.c > +++ b/vl.c > @@ -1856,10 +1856,42 @@ static BlockInterfaceErrorAction drive_get_err_action( > return is_read ? BLOCK_ERR_REPORT : BLOCK_ERR_STOP_ENOSPC; > } > > +static void driver_err_event( > + BlockInterfaceErrorAction action, int is_read, const char *device) > +{ > + QObject *data; > + const char *action_str; > + > + switch (action) { > + case BLOCK_ERR_REPORT: > + action_str = "report"; > + break; > + case BLOCK_ERR_IGNORE: > + action_str = "ignore"; > + break; > + case BLOCK_ERR_STOP_ANY: > + case BLOCK_ERR_STOP_ENOSPC: > + action_str = "stop"; This is wrong. If it's BLOCK_ERR_STOP_ENOSPC, the action taken depends on the error code. It might as well be a "report" instead of "stop" if it was an EIO, for example. But the problem is probably going to go away when you stop abusing a getter function and add some calls that are explicitly made for your requirements. Kevin