From 4692f6b965d2c8777104dfcb7283d95aacfdb730 Mon Sep 17 00:00:00 2001
From: Nitesh Konkar <niteshkonkar@in.ibm.com>
Date: Mon, 28 Jan 2019 18:48:53 +0530
Subject: [PATCH] qmp: Conditionally pass threadID and socketID when CPU device
 add

For vCPU hotplug to work on ppc64le, we need not
pass threadID and socketID. So conditionally pass
arguments when executing CPU device add.

Fixes: #83

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
---
 qemu/qmp.go | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/qemu/qmp.go b/qemu/qmp.go
index 74431c12d4..9b21d96480 100644
--- a/qemu/qmp.go
+++ b/qemu/qmp.go
@@ -1144,14 +1144,21 @@ func (q *QMP) ExecutePCIVFIOMediatedDeviceAdd(ctx context.Context, devID, sysfsd
 // ExecuteCPUDeviceAdd adds a CPU to a QEMU instance using the device_add command.
 // driver is the CPU model, cpuID must be a unique ID to identify the CPU, socketID is the socket number within
 // node/board the CPU belongs to, coreID is the core number within socket the CPU belongs to, threadID is the
-// thread number within core the CPU belongs to.
+// thread number within core the CPU belongs to. Note that socketID and threadID are not a requirement for
+// architecures like ppc64le.
 func (q *QMP) ExecuteCPUDeviceAdd(ctx context.Context, driver, cpuID, socketID, coreID, threadID, romfile string) error {
 	args := map[string]interface{}{
-		"driver":    driver,
-		"id":        cpuID,
-		"socket-id": socketID,
-		"core-id":   coreID,
-		"thread-id": threadID,
+		"driver":  driver,
+		"id":      cpuID,
+		"core-id": coreID,
+	}
+
+	if socketID != "" {
+		args["socket-id"] = socketID
+	}
+
+	if threadID != "" {
+		args["thread-id"] = threadID
 	}
 
 	if isVirtioPCI[DeviceDriver(driver)] {