From 13aeba09d56ce44e531cd0aaf531f01fe11acaee Mon Sep 17 00:00:00 2001
From: Liu Xiaodong <xiaodong.liu@intel.com>
Date: Tue, 14 Jan 2020 00:09:52 -0500
Subject: [PATCH] qmp: support command 'chardev-remove'

So that caller can remove hotremove chardev via qmp

Signed-off-by: Liu Xiaodong <xiaodong.liu@intel.com>
---
 qemu/qmp.go      | 11 +++++++++++
 qemu/qmp_test.go | 22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/qemu/qmp.go b/qemu/qmp.go
index 473ce4afaa..a22edba127 100644
--- a/qemu/qmp.go
+++ b/qemu/qmp.go
@@ -946,6 +946,17 @@ func (q *QMP) ExecuteBlockdevDel(ctx context.Context, blockdevID string) error {
 	return q.executeCommand(ctx, "x-blockdev-del", args, nil)
 }
 
+// ExecuteChardevDel deletes a char device by sending a chardev-remove command.
+// chardevID is the id of the char device to be deleted. Typically, this will
+// match the id passed to ExecuteCharDevUnixSocketAdd. It must be a valid QMP id.
+func (q *QMP) ExecuteChardevDel(ctx context.Context, chardevID string) error {
+	args := map[string]interface{}{
+		"id": chardevID,
+	}
+
+	return q.executeCommand(ctx, "chardev-remove", args, nil)
+}
+
 // ExecuteNetdevAdd adds a Net device to a QEMU instance
 // using the netdev_add command. netdevID is the id of the device to add.
 // Must be valid QMP identifier.
diff --git a/qemu/qmp_test.go b/qemu/qmp_test.go
index c5722765ab..8137910a87 100644
--- a/qemu/qmp_test.go
+++ b/qemu/qmp_test.go
@@ -638,6 +638,28 @@ func TestQMPBlockdevDel(t *testing.T) {
 	<-disconnectedCh
 }
 
+// Checks that the chardev-remove command is correctly sent.
+//
+// We start a QMPLoop, send the chardev-remove command and stop the loop.
+//
+// The chardev-remove command should be correctly sent and the QMP loop should
+// exit gracefully.
+func TestQMPChardevDel(t *testing.T) {
+	connectedCh := make(chan *QMPVersion)
+	disconnectedCh := make(chan struct{})
+	buf := newQMPTestCommandBuffer(t)
+	buf.AddCommand("chardev-remove", nil, "return", nil)
+	cfg := QMPConfig{Logger: qmpTestLogger{}}
+	q := startQMPLoop(buf, cfg, connectedCh, disconnectedCh)
+	q.version = checkVersion(t, connectedCh)
+	err := q.ExecuteChardevDel(context.Background(), "chardev-0")
+	if err != nil {
+		t.Fatalf("Unexpected error %v", err)
+	}
+	q.Shutdown()
+	<-disconnectedCh
+}
+
 // Checks that the device_del command is correctly sent.
 //
 // We start a QMPLoop, send the device_del command and wait for it to complete.