qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PULL 19/23] blockdev-test: Use single rather than double quotes in QMP
Date: Sat,  4 Oct 2014 21:24:45 +0100	[thread overview]
Message-ID: <1412454289-1789-20-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1412454289-1789-1-git-send-email-stefanha@redhat.com>

From: Markus Armbruster <armbru@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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1412261496-24455-3-git-send-email-armbru@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 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 39c56fc..a5de239 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

  parent reply	other threads:[~2014-10-04 20:25 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-04 20:24 [Qemu-devel] [PULL 00/23] Block patches Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 01/23] snapshot: fix referencing wrong variable in while loop in do_delvm Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 02/23] ssh: Don't crash if either host or path is not specified Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 03/23] block: Drop superfluous conditionals around qemu_opts_del() Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 04/23] vmdk: Fix integer overflow in offset calculation Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 05/23] Modify qemu_opt_rename to realize renaming all items in opts Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 06/23] make check-block: Use default cache modes Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 07/23] qemu-iotests: Fix supported cache modes for 052 Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 08/23] blockdev: Orphaned drive search Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 09/23] blockdev: Allow overriding if_max_dev property Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 10/23] pc/vl: Add units-per-default-bus property Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 11/23] ide: Update ide_drive_get to be HBA agnostic Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 12/23] qtest/bios-tables: Correct Q35 command line Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 13/23] q35/ahci: Pick up -cdrom and -hda options Stefan Hajnoczi
2014-10-17 16:53   ` Peter Maydell
2014-10-17 16:57     ` Michael Tokarev
2014-10-17 17:02       ` Peter Maydell
2014-10-17 17:57         ` Peter Maydell
2014-10-04 20:24 ` [Qemu-devel] [PULL 14/23] util: Emancipate id_wellformed() from QemuOpts Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 15/23] iotests: Use _img_info Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 16/23] qapi: Add corrupt field to ImageInfoSpecificQCow2 Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 17/23] iotests: qemu-img info output for corrupt image Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 18/23] drive_del-test: Merge of qdev-monitor-test, blockdev-test Stefan Hajnoczi
2014-10-04 20:24 ` Stefan Hajnoczi [this message]
2014-10-04 20:24 ` [Qemu-devel] [PULL 20/23] blockdev-test: Clean up bogus drive_add argument Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 21/23] blockdev-test: Simplify by using g_assert_cmpstr() Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 22/23] blockdev-test: Factor out some common code into helpers Stefan Hajnoczi
2014-10-04 20:24 ` [Qemu-devel] [PULL 23/23] blockdev-test: Test device_del after drive_del Stefan Hajnoczi
2014-10-06 11:41 ` [Qemu-devel] [PULL 00/23] Block patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1412454289-1789-20-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).