Commit 7f368aed authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20200309' into staging 



HMP Pull 2020-03-09

Maxim's hmp block move, Thomas's deprecation in hostfwd.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>

# gpg: Signature made Mon 09 Mar 2020 19:43:33 GMT
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-hmp-20200309:
  net: Remove deprecated [hub_id name] tuple of 'hostfwd_add' / 'hostfwd_remove'
  monitor/hmp: Move hmp_drive_add_node to block-hmp-cmds.c
  monitor/hmp: move hmp_info_block* to block-hmp-cmds.c
  monitor/hmp: move remaining hmp_block* functions to block-hmp-cmds.c
  monitor/hmp: move hmp_nbd_server* to block-hmp-cmds.c
  monitor/hmp: move hmp_snapshot_* to block-hmp-cmds.c
  monitor/hmp: move hmp_block_job* to block-hmp-cmds.c
  monitor/hmp: move hmp_drive_mirror and hmp_drive_backup to block-hmp-cmds.c
  monitor/hmp: move hmp_drive_del and hmp_commit to block-hmp-cmds.c
  monitor/hmp: rename device-hotplug.c to block/monitor/block-hmp-cmds.c
  monitor/hmp: inline add_init_drive
  usb/dev-storage: remove unused include

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 373c7068 b4983c57

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1920,6 +1920,7 @@ Block QAPI, monitor, command line 
M: Markus Armbruster <armbru@redhat.com>

S: Supported

F: blockdev.c

F: blockdev-hmp-cmds.c

F: block/qapi.c

F: qapi/block*.json

F: qapi/transaction.json

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ common-obj-y += dump/ 
common-obj-y += job-qmp.o

common-obj-y += monitor/

common-obj-y += net/

common-obj-y += qdev-monitor.o device-hotplug.o

common-obj-y += qdev-monitor.o

common-obj-$(CONFIG_WIN32) += os-win32.o

common-obj-$(CONFIG_POSIX) += os-posix.o

block/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ block-obj-y += crypto.o 
block-obj-y += aio_task.o

block-obj-y += backup-top.o

block-obj-y += filter-compress.o

common-obj-y += monitor/



block-obj-y += stream.o

block/monitor/Makefile.objs

0 → 100644
+1 −0
Original line number Diff line number Diff line 
common-obj-y += block-hmp-cmds.o

block/monitor/block-hmp-cmds.c

0 → 100644
+1015 −0

File added.

Preview size limit exceeded, changes collapsed.