| commit | 31376776d045c7ee0a1570c139ef30b6cb8f5b01 | |
| author | Markus Armbruster <armbru@redhat.com> | |
| Fri, 12 Sep 2014 19:24:34 +0000 (12 21:24 +0200) | ||
| committer | Gerd Hoffmann <kraxel@redhat.com> | |
| Mon, 22 Sep 2014 07:55:55 +0000 (22 09:55 +0200) | ||
| tree | a71068ddd503ff53f16ad1ff8b779d0d1b76d18a | treesnapshot (tar.gz zip) |
| parent | 07e2863d0271ac6c05206d8ce9e4f4c39b25d3ea | commitdiff |
usb-storage: Fix how legacy init handles option ID clash
usb_msd_init() calls qemu_opts_create() with a made-up ID and false
fail_if_exists. If the ID already exists, it happily messes up those
options, then fails drive_new(), because the BlockDriverState with
that ID already exists, too.
Reproducer: -drive if=none,id=usb0,format=raw -usbdevice disk:tmp.qcow2
Pass true fail_if_exists to qemu_opts_create(), and if it fails, try
the next made-up ID.
The reproducer now succeeds, and creates an usb-storage device with ID
usb1.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
usb_msd_init() calls qemu_opts_create() with a made-up ID and false
fail_if_exists. If the ID already exists, it happily messes up those
options, then fails drive_new(), because the BlockDriverState with
that ID already exists, too.
Reproducer: -drive if=none,id=usb0,format=raw -usbdevice disk:tmp.qcow2
Pass true fail_if_exists to qemu_opts_create(), and if it fails, try
the next made-up ID.
The reproducer now succeeds, and creates an usb-storage device with ID
usb1.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| hw/usb/dev-storage.c | diffblobblamehistory |