From patchwork Thu May 19 17:07:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Supriya Kannery X-Patchwork-Id: 96431 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 89A14B718B for ; Fri, 20 May 2011 02:56:50 +1000 (EST) Received: from localhost ([::1]:34416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN6Wm-0006S2-1V for incoming@patchwork.ozlabs.org; Thu, 19 May 2011 12:56:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN6Vw-00059n-NE for qemu-devel@nongnu.org; Thu, 19 May 2011 12:56:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QN6Vv-00031J-Rz for qemu-devel@nongnu.org; Thu, 19 May 2011 12:55:56 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:39509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN6Vv-000312-EY for qemu-devel@nongnu.org; Thu, 19 May 2011 12:55:55 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e37.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4JGqvhU017755 for ; Thu, 19 May 2011 10:52:57 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id p4JGtlbM007618 for ; Thu, 19 May 2011 10:55:48 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p4JAtJPs005221 for ; Thu, 19 May 2011 04:55:19 -0600 Received: from [127.0.0.1] ([9.79.245.66]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p4JAtGnd004980; Thu, 19 May 2011 04:55:18 -0600 From: Supriya Kannery To: qemu-devel@nongnu.org Date: Thu, 19 May 2011 22:37:49 +0530 Message-Id: <20110519170749.29027.45346.sendpatchset@skannery> In-Reply-To: <20110519170730.29027.44430.sendpatchset@skannery> References: <20110519170730.29027.44430.sendpatchset@skannery> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.158 Cc: Kevin Wolf , Supriya Kannery , Christoph Hellwig Subject: [Qemu-devel] [V2 1/2]Qemu: New error classes for file reopen and device insertion X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org New errors defined for device insertion and file reopen Signed-off-by: Supriya Kannery --- qerror.c | 8 ++++++++ qerror.h | 6 ++++++ 2 files changed, 14 insertions(+) Index: qemu/qerror.c =================================================================== --- qemu.orig/qerror.c +++ qemu/qerror.c @@ -93,6 +93,10 @@ static const QErrorStringTable qerror_ta .desc = "Device '%(device)' not found", }, { + .error_fmt = QERR_DEVICE_NOT_INSERTED, + .desc = "Device '%(device)' has not been inserted", + }, + { .error_fmt = QERR_DEVICE_NOT_REMOVABLE, .desc = "Device '%(device)' is not removable", }, @@ -161,6 +165,10 @@ static const QErrorStringTable qerror_ta .desc = "Could not open '%(filename)'", }, { + .error_fmt = QERR_REOPEN_FILE_FAILED, + .desc = "Could not reopen '%(filename)'", + }, + { .error_fmt = QERR_PROPERTY_NOT_FOUND, .desc = "Property '%(device).%(property)' not found", }, Index: qemu/qerror.h =================================================================== --- qemu.orig/qerror.h +++ qemu/qerror.h @@ -84,6 +84,9 @@ QError *qobject_to_qerror(const QObject #define QERR_DEVICE_NOT_FOUND \ "{ 'class': 'DeviceNotFound', 'data': { 'device': %s } }" +#define QERR_DEVICE_NOT_INSERTED \ + "{ 'class': 'DeviceNotInserted', 'data': { 'device': %s } }" + #define QERR_DEVICE_NOT_REMOVABLE \ "{ 'class': 'DeviceNotRemovable', 'data': { 'device': %s } }" @@ -135,6 +138,9 @@ QError *qobject_to_qerror(const QObject #define QERR_OPEN_FILE_FAILED \ "{ 'class': 'OpenFileFailed', 'data': { 'filename': %s } }" +#define QERR_REOPEN_FILE_FAILED \ + "{ 'class': 'ReopenFileFailed', 'data': { 'filename': %s } }" + #define QERR_PROPERTY_NOT_FOUND \ "{ 'class': 'PropertyNotFound', 'data': { 'device': %s, 'property': %s } }"