diff options
| author | Anthony Liguori | 2013-10-11 18:29:58 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-10-11 18:29:58 +0200 |
| commit | 33c6cae44eccea5e627c2dc5cbf31456db90fc38 (patch) | |
| tree | 26f994c9f78144b2a6f12da686a2235d0df1dd21 /util/qemu-option.c | |
| parent | Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging (diff) | |
| parent | qemu-iotests: Add test for inactive L2 overlap (diff) | |
| download | qemu-33c6cae44eccea5e627c2dc5cbf31456db90fc38.tar.gz qemu-33c6cae44eccea5e627c2dc5cbf31456db90fc38.tar.xz qemu-33c6cae44eccea5e627c2dc5cbf31456db90fc38.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Max Reitz (30) and others
# Via Kevin Wolf
* kwolf/for-anthony: (61 commits)
qemu-iotests: Add test for inactive L2 overlap
qemu-io: Let "open" pass options to block driver
vmdk: Fix vmdk_parse_extents
blockdev: blockdev_init() error conversion
blockdev: Don't disable COR automatically with blockdev-add
blockdev: Remove 'media' parameter from blockdev_init()
qemu-iotests: Check autodel behaviour for device_del
blockdev: Remove IF_* check for read-only blockdev_init
blockdev: Move virtio-blk device creation to drive_init
blockdev: Move bus/unit/index processing to drive_init
blockdev: Move parsing of 'boot' option to drive_init
blockdev: Moving parsing of geometry options to drive_init
blockdev: Move parsing of 'if' option to drive_init
blockdev: Move parsing of 'media' option to drive_init
blockdev: Pass QDict to blockdev_init()
blockdev: Separate ID generation from DriveInfo creation
blockdev: 'blockdev-add' QMP command
blockdev: Introduce DriveInfo.enable_auto_del
qapi-types/visit.py: Inheritance for structs
qapi-types/visit.py: Pass whole expr dict for structs
...
Message-id: 1381503951-27985-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'util/qemu-option.c')
| -rw-r--r-- | util/qemu-option.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util/qemu-option.c b/util/qemu-option.c index e0844a966c..efcb5dcfcb 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -834,6 +834,12 @@ const char *qemu_opts_id(QemuOpts *opts) return opts->id; } +/* The id string will be g_free()d by qemu_opts_del */ +void qemu_opts_set_id(QemuOpts *opts, char *id) +{ + opts->id = id; +} + void qemu_opts_del(QemuOpts *opts) { QemuOpt *opt; |