OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qdev: kill DeviceState->name 

is redundant with DeviceState->type->name

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2009-05-27 22:54:29 +02:00 committed by Paul Brook
parent 1e9fa73016
commit aca312affb
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/qdev.c
View File

@ -84,7 +84,6 @@ DeviceState *qdev_create(BusState *bus, const char *name)
} }
dev = qemu_mallocz(t->size); dev = qemu_mallocz(t->size);
dev->name = name;
dev->type = t; dev->type = t;
if (!bus) { if (!bus) {
@ -162,7 +161,7 @@ CharDriverState *qdev_init_chardev(DeviceState *dev)
static int next_serial; static int next_serial;
static int next_virtconsole; static int next_virtconsole;
/* FIXME: This is a nasty hack that needs to go away. */ /* 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++]; return virtcon_hds[next_virtconsole++];
} else { } else {
return serial_hds[next_serial++]; return serial_hds[next_serial++];

1
hw/qdev.h
View File

@ -13,7 +13,6 @@ typedef struct BusState BusState;
/* This structure should not be accessed directly. We declare it here /* This structure should not be accessed directly. We declare it here
so that it can be embedded in individual device state structures. */ so that it can be embedded in individual device state structures. */
struct DeviceState { struct DeviceState {
const char *name;
DeviceType *type; DeviceType *type;
BusState *parent_bus; BusState *parent_bus;
DeviceProperty *props; DeviceProperty *props;