Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "This patch contains updated Dockerfile to modify SSH Timeout value for the...
[kvmfornfv.git]
/
qemu
/
device-hotplug.c
diff --git
a/qemu/device-hotplug.c
b/qemu/device-hotplug.c
index
68b9496
..
126f73c
100644
(file)
--- a/
qemu/device-hotplug.c
+++ b/
qemu/device-hotplug.c
@@
-22,6
+22,7
@@
* THE SOFTWARE.
*/
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "sysemu/block-backend.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "sysemu/block-backend.h"
@@
-29,6
+30,7
@@
#include "qemu/config-file.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "qemu/config-file.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
+#include "block/block_int.h"
static DriveInfo *add_init_drive(const char *optstr)
{
static DriveInfo *add_init_drive(const char *optstr)
{
@@
-54,6
+56,12
@@
void hmp_drive_add(Monitor *mon, const QDict *qdict)
{
DriveInfo *dinfo = NULL;
const char *opts = qdict_get_str(qdict, "opts");
{
DriveInfo *dinfo = NULL;
const char *opts = qdict_get_str(qdict, "opts");
+ bool node = qdict_get_try_bool(qdict, "node", false);
+
+ if (node) {
+ hmp_drive_add_node(mon, opts);
+ return;
+ }
dinfo = add_init_drive(opts);
if (!dinfo) {
dinfo = add_init_drive(opts);
if (!dinfo) {
@@
-76,6
+84,8
@@
void hmp_drive_add(Monitor *mon, const QDict *qdict)
err:
if (dinfo) {
err:
if (dinfo) {
- blk_unref(blk_by_legacy_dinfo(dinfo));
+ BlockBackend *blk = blk_by_legacy_dinfo(dinfo);
+ monitor_remove_blk(blk);
+ blk_unref(blk);
}
}
}
}