blockdev.c (668f62ec621e4e2919fb7d4caa5d805764c5852d) blockdev.c (af175e85f92c870386ad74f466e29537b79611d3)
1/*
2 * QEMU host block devices
3 *
4 * Copyright (c) 2003-2008 Fabrice Bellard
5 *
6 * This work is licensed under the terms of the GNU GPL, version 2 or
7 * later. See the COPYING file in the top-level directory.
8 *

--- 849 unchanged lines hidden (view full) ---

858 }
859
860 /* Get a QDict for processing the options */
861 bs_opts = qdict_new();
862 qemu_opts_to_qdict(all_opts, bs_opts);
863
864 legacy_opts = qemu_opts_create(&qemu_legacy_drive_opts, NULL, 0,
865 &error_abort);
1/*
2 * QEMU host block devices
3 *
4 * Copyright (c) 2003-2008 Fabrice Bellard
5 *
6 * This work is licensed under the terms of the GNU GPL, version 2 or
7 * later. See the COPYING file in the top-level directory.
8 *

--- 849 unchanged lines hidden (view full) ---

858 }
859
860 /* Get a QDict for processing the options */
861 bs_opts = qdict_new();
862 qemu_opts_to_qdict(all_opts, bs_opts);
863
864 legacy_opts = qemu_opts_create(&qemu_legacy_drive_opts, NULL, 0,
865 &error_abort);
866 if (!qemu_opts_absorb_qdict(legacy_opts, bs_opts, &local_err)) {
867 error_propagate(errp, local_err);
866 if (!qemu_opts_absorb_qdict(legacy_opts, bs_opts, errp)) {
868 goto fail;
869 }
870
871 /* Media type */
872 value = qemu_opt_get(legacy_opts, "media");
873 if (value) {
874 if (!strcmp(value, "disk")) {
875 media = MEDIA_DISK;

--- 2878 unchanged lines hidden --- 		867 goto fail;
868 }
869
870 /* Media type */
871 value = qemu_opt_get(legacy_opts, "media");
872 if (value) {
873 if (!strcmp(value, "disk")) {
874 media = MEDIA_DISK;

--- 2878 unchanged lines hidden ---