From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZhjR-0004y1-4A for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZhjI-0003Tr-56 for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZhjH-0003TQ-UR for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:40 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s92Epd86012750 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 2 Oct 2014 10:51:39 -0400 From: Markus Armbruster Date: Thu, 2 Oct 2014 16:51:32 +0200 Message-Id: <1412261496-24455-3-git-send-email-armbru@redhat.com> In-Reply-To: <1412261496-24455-1-git-send-email-armbru@redhat.com> References: <1412261496-24455-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] blockdev-test: Use single rather than double quotes in QMP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com QMP accepts both single and double quotes. This is the only test using double quotes. They need to be quoted in C strings. Replace them by single quotes. Signed-off-by: Markus Armbruster --- tests/drive_del-test.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index ba3ee12..786f026 100644 --- a/tests/drive_del-test.c +++ b/tests/drive_del-test.c @@ -23,9 +23,9 @@ static void test_drive_without_dev(void) qtest_start("-drive if=none,id=drive0"); /* Delete the drive */ - response = qmp("{\"execute\": \"human-monitor-command\"," - " \"arguments\": {" - " \"command-line\": \"drive_del drive0\"" + response = qmp("{'execute': 'human-monitor-command'," + " 'arguments': {" + " 'command-line': 'drive_del drive0'" "}}"); g_assert(response); response_return = qdict_get_try_str(response, "return"); @@ -36,9 +36,9 @@ static void test_drive_without_dev(void) /* Ensure re-adding the drive works - there should be no duplicate ID error * because the old drive must be gone. */ - response = qmp("{\"execute\": \"human-monitor-command\"," - " \"arguments\": {" - " \"command-line\": \"drive_add 0 if=none,id=drive0\"" + response = qmp("{'execute': 'human-monitor-command'," + " 'arguments': {" + " 'command-line': 'drive_add 0 if=none,id=drive0'" "}}"); g_assert(response); response_return = qdict_get_try_str(response, "return"); @@ -59,10 +59,10 @@ static void test_after_failed_device_add(void) /* Make device_add fail. If this leaks the virtio-blk-pci device then a * reference to drive0 will also be held (via qdev properties). */ - response = qmp("{\"execute\": \"device_add\"," - " \"arguments\": {" - " \"driver\": \"virtio-blk-pci\"," - " \"drive\": \"drive0\"" + response = qmp("{'execute': 'device_add'," + " 'arguments': {" + " 'driver': 'virtio-blk-pci'," + " 'drive': 'drive0'" "}}"); g_assert(response); error = qdict_get_qdict(response, "error"); @@ -70,9 +70,9 @@ static void test_after_failed_device_add(void) QDECREF(response); /* Delete the drive */ - response = qmp("{\"execute\": \"human-monitor-command\"," - " \"arguments\": {" - " \"command-line\": \"drive_del drive0\"" + response = qmp("{'execute': 'human-monitor-command'," + " 'arguments': {" + " 'command-line': 'drive_del drive0'" "}}"); g_assert(response); g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, ""); @@ -81,9 +81,9 @@ static void test_after_failed_device_add(void) /* Try to re-add the drive. This fails with duplicate IDs if a leaked * virtio-blk-pci exists that holds a reference to the old drive0. */ - response = qmp("{\"execute\": \"human-monitor-command\"," - " \"arguments\": {" - " \"command-line\": \"drive_add pci-addr=auto if=none,id=drive0\"" + response = qmp("{'execute': 'human-monitor-command'," + " 'arguments': {" + " 'command-line': 'drive_add pci-addr=auto if=none,id=drive0'" "}}"); g_assert(response); g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, "OK\r\n"); -- 1.9.3