diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index dfcf7552c1..312af0d962 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -387,6 +387,37 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque) } +static int +testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque) +{ + struct testQemuDiskXMLToJSONData *data = (void *) opaque; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_autofree char *jsonpath = NULL; + g_autofree char *actual = NULL; + size_t i; + + if (data->fail) + return EXIT_AM_SKIP; + + jsonpath = g_strdup_printf("%s%s-srconly.json", testQemuDiskXMLToJSONPath, + data->name); + + for (i = 0; i < data->npropssrc; i++) { + g_autofree char *jsonstr = NULL; + + if (!(jsonstr = virJSONValueToString(data->propssrc[i], true))) + return -1; + + virBufferAdd(&buf, jsonstr, -1); + } + + actual = virBufferContentAndReset(&buf); + + return virTestCompareToFile(actual, jsonpath); +} + + + struct testQemuImageCreateData { const char *name; const char *backingname; @@ -515,36 +546,6 @@ testQemuImageCreate(const void *opaque) } -static int -testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque) -{ - struct testQemuDiskXMLToJSONData *data = (void *) opaque; - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - g_autofree char *jsonpath = NULL; - g_autofree char *actual = NULL; - size_t i; - - if (data->fail) - return EXIT_AM_SKIP; - - jsonpath = g_strdup_printf("%s%s-srconly.json", testQemuDiskXMLToJSONPath, - data->name); - - for (i = 0; i < data->npropssrc; i++) { - g_autofree char *jsonstr = NULL; - - if (!(jsonstr = virJSONValueToString(data->propssrc[i], true))) - return -1; - - virBufferAdd(&buf, jsonstr, -1); - } - - actual = virBufferContentAndReset(&buf); - - return virTestCompareToFile(actual, jsonpath); -} - - static const char *bitmapDetectPrefix = "qemublocktestdata/bitmap/"; static void