diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2021-10-08 15:34:35 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2021-10-15 16:06:35 +0200 |
| commit | 163f384752dd9125ce7eb1b2edf00b23f0a54557 (patch) | |
| tree | 59527155773e38b387748fd2c195618daf25d3ea /include | |
| parent | c34efecedd0552ee8b830402241e19daebb22aec (diff) | |
| download | qemu-163f384752dd9125ce7eb1b2edf00b23f0a54557.zip qemu-163f384752dd9125ce7eb1b2edf00b23f0a54557.tar.gz qemu-163f384752dd9125ce7eb1b2edf00b23f0a54557.tar.bz2 | |
qdev: Make DeviceState.id independent of QemuOpts
DeviceState.id is a pointer to a string that is stored in the QemuOpts
object DeviceState.opts and freed together with it. We want to create
devices without going through QemuOpts in the future, so make this a
separately allocated string.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20211008133442.141332-9-kwolf@redhat.com>
Reviewed-by: Damien Hedde <damien.hedde@greensocs.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/qdev-core.h | 2 | ||||
| -rw-r--r-- | include/monitor/qdev.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 4ff19c7..5a073fc 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -176,7 +176,7 @@ struct DeviceState { Object parent_obj; /*< public >*/ - const char *id; + char *id; char *canonical_path; bool realized; bool pending_deleted_event; diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h index eaa947d..389287e 100644 --- a/include/monitor/qdev.h +++ b/include/monitor/qdev.h @@ -9,6 +9,6 @@ void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp); int qdev_device_help(QemuOpts *opts); DeviceState *qdev_device_add(QemuOpts *opts, Error **errp); -void qdev_set_id(DeviceState *dev, const char *id); +void qdev_set_id(DeviceState *dev, char *id); #endif |