From 1cfdf802a96ca8e56f9b78cd47cae889e609b942 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Wed, 21 Feb 2018 21:55:06 -0500 Subject: [PATCH] qapi: Drop QERR_UNKNOWN_BLOCK_FORMAT_FEATURE Just specifying a custom string is simpler in basically all places that used it, and in addition, specifying the BB or node name is something we generally do not do in other error messages when opening a BDS, so we should not do it here. This changes the output for iotest 036 (to the better, in my opinion), so the reference output needs to be changed accordingly. Backports commit a55448b3681a880b77eaefe8b2c42912000cb481 from qemu --- qemu/include/qapi/qmp/qerror.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/qemu/include/qapi/qmp/qerror.h b/qemu/include/qapi/qmp/qerror.h index 71730eeb..53782efe 100644 --- a/qemu/include/qapi/qmp/qerror.h +++ b/qemu/include/qapi/qmp/qerror.h @@ -127,9 +127,6 @@ #define QERR_UNDEFINED_ERROR \ "An undefined error has occurred" -#define QERR_UNKNOWN_BLOCK_FORMAT_FEATURE \ - "'%s' uses a %s feature which is not supported by this qemu version: %s" - #define QERR_UNSUPPORTED \ "this feature or command is not currently supported"