From: Marcel Apfelbaum <marcel.a@redhat.com>
Date: Mon, 26 May 2014 12:40:57 +0000 (+0300)
Subject: vl.c: Do not set 'type' property in obj_set_property()
X-Git-Tag: qemu-xen-4.6.0-rc1~424^2~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=13d7adf92a97c8252df6165ec84127798f3096d3;p=qemu-upstream-4.6-testing.git

vl.c: Do not set 'type' property in obj_set_property()

Filter out also 'type' property when setting
object's properties.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/vl.c b/vl.c
index e65d0b373..8a4e58ce5 100644
--- a/vl.c
+++ b/vl.c
@@ -2891,7 +2891,8 @@ static int object_set_property(const char *name, const char *value, void *opaque
     StringInputVisitor *siv;
     Error *local_err = NULL;
 
-    if (strcmp(name, "qom-type") == 0 || strcmp(name, "id") == 0) {
+    if (strcmp(name, "qom-type") == 0 || strcmp(name, "id") == 0 ||
+        strcmp(name, "type") == 0) {
         return 0;
     }