commit aca312affb616a907ae95eb7d9034e85512d6e7c
author Gerd Hoffmann <kraxel@redhat.com> Wed May 27 22:54:29 2009 +0200
committer Paul Brook <paul@codesourcery.com> Thu Jun 04 11:24:42 2009 +0100
tree f005174edba1b76afccc4e2659f5832a06b7d351
parent 1e9fa730163c2a445014ff8324b169cd82a50df1

qdev: kill DeviceState->name

is redundant with DeviceState->type->name

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

hw/qdev.c

diff --git a/hw/qdev.c b/hw/qdev.c
index d945ff9..cedb772 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -84,7 +84,6 @@
     }
 
     dev = qemu_mallocz(t->size);
-    dev->name = name;
     dev->type = t;
 
     if (!bus) {
@@ -162,7 +161,7 @@
     static int next_serial;
     static int next_virtconsole;
     /* FIXME: This is a nasty hack that needs to go away.  */
-    if (strncmp(dev->name, "virtio", 6) == 0) {
+    if (strncmp(dev->type->name, "virtio", 6) == 0) {
         return virtcon_hds[next_virtconsole++];
     } else {
         return serial_hds[next_serial++];

hw/qdev.h

diff --git a/hw/qdev.h b/hw/qdev.h
index 143a1f8..b3cc3ec 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -13,7 +13,6 @@
 /* This structure should not be accessed directly.  We declare it here
    so that it can be embedded in individual device state structures.  */
 struct DeviceState {
-    const char *name;
     DeviceType *type;
     BusState *parent_bus;
     DeviceProperty *props;