qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 3/7] Revert "qdev: Add help for property value"
Date: Fri, 29 Jan 2010 19:48:58 +0100	[thread overview]
Message-ID: <1264790942-15045-4-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1264790942-15045-1-git-send-email-armbru@redhat.com>

This reverts commit 922910ce42d15bdb7c2347436b1b5798b5401de4.

The commit has four issues:

* When it runs from the monitor, e.g. "device_add e1000,mac=?", it
  prints to stderr instead of the monitor.

* Help looks to callers just like failed device creation.  This makes
  main() exit unsuccessfully on "-device e1000,mac=?".

* It has an undocumented side effect on -global: "-global e1000.mac=?"
  prints help, but only when we actually add an e1000 device.

* It does not work for properties that accept the value "?".

We need to do this differently.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/qdev-properties.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index f5ca05f..8547ad2 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -565,13 +565,8 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value)
         return -1;
     }
     if (prop->info->parse(dev, prop, value) != 0) {
-        if (strcmp(value, "?") != 0) {
-            fprintf(stderr, "property \"%s.%s\": failed to parse \"%s\"\n",
-                    dev->info->name, name, value);
-        } else {
-            fprintf(stderr, "%s.%s=%s\n",
-                    dev->info->name, name, prop->info->name);
-        }
+        fprintf(stderr, "property \"%s.%s\": failed to parse \"%s\"\n",
+                dev->info->name, name, value);
         return -1;
     }
     return 0;
-- 
1.6.6

  parent reply	other threads:[~2010-01-29 18:49 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-29 18:48 [Qemu-devel] [PATCH 0/7] Clean up -device help Markus Armbruster
2010-01-29 18:48 ` [Qemu-devel] [PATCH 1/7] qemu-option: Make qemu_opts_foreach() accumulate return values Markus Armbruster
2010-02-03 18:51   ` Anthony Liguori
2010-01-29 18:48 ` [Qemu-devel] [PATCH 2/7] qdev: Fix exit code for -device ? Markus Armbruster
2010-01-29 18:48 ` Markus Armbruster [this message]
2010-01-29 18:48 ` [Qemu-devel] [PATCH 4/7] Revert "qdev: Add help for device properties" Markus Armbruster
2010-01-29 18:49 ` [Qemu-devel] [PATCH 5/7] qdev: Add help for device properties Markus Armbruster
2010-01-29 18:49 ` [Qemu-devel] [PATCH 6/7] qdev: update help on -device Markus Armbruster
2010-01-29 18:49 ` [Qemu-devel] [PATCH 7/7] qdev: Add rudimentary help for property value Markus Armbruster

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=1264790942-15045-4-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --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).