From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54432 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pntr1-0001he-Cr for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pntr0-0003ac-2G for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pntqz-0003aW-Py for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:09 -0500 From: Kevin Wolf Date: Fri, 11 Feb 2011 15:21:32 +0100 Message-Id: <1297434094-24965-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1297434094-24965-1-git-send-email-kwolf@redhat.com> References: <1297434094-24965-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH STABLE 0.14 7/9] qed: Report error for unsupported features List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: jmforbes@linuxtx.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Instead of just returning -ENOTSUP, generate a more detailed error. Unfortunately we don't have a helpful text for features that we don't know yet, so just print the feature mask. It might be useful at least if someone asks for help. Signed-off-by: Kevin Wolf Reviewed-by: Anthony Liguori Acked-by: Stefan Hajnoczi (cherry picked from commit 10b758e85c9b38b4b370cff81435f6ed26024a26) --- block/qed.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/block/qed.c b/block/qed.c index 3273448..75ae244 100644 --- a/block/qed.c +++ b/block/qed.c @@ -14,6 +14,7 @@ #include "trace.h" #include "qed.h" +#include "qerror.h" static void qed_aio_cancel(BlockDriverAIOCB *blockacb) { @@ -311,7 +312,13 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) return -EINVAL; } if (s->header.features & ~QED_FEATURE_MASK) { - return -ENOTSUP; /* image uses unsupported feature bits */ + /* image uses unsupported feature bits */ + char buf[64]; + snprintf(buf, sizeof(buf), "%" PRIx64, + s->header.features & ~QED_FEATURE_MASK); + qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, + bs->device_name, "QED", buf); + return -ENOTSUP; } if (!qed_is_cluster_size_valid(s->header.cluster_size)) { return -EINVAL; -- 1.7.2.3