On 02/09/2018 12:24 PM, Daniel P. Berrangé wrote:
There is a long standing hack to pass a virConnectPtr into the qemuMonitorStartCPUs method, so that when the text monitor prompts for a disk password, we can lookup virSecretPtr objects. This causes us to have to pass a virConnectPtr around through countless methods up the call chain....except some places don't have any virConnectPtr available so have always just passed NULL. We can finally fix this disasterous design by using virGetConnectSecret() to open a connection
disastrous according to my email client's spell checker.
to the secret driver at time of use.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/qemu/qemu_driver.c | 32 +++++++++++++++----------------- src/qemu/qemu_migration.c | 6 +++--- src/qemu/qemu_monitor.c | 10 ++++------ src/qemu/qemu_monitor.h | 11 +---------- src/qemu/qemu_monitor_json.c | 3 +-- src/qemu/qemu_monitor_json.h | 3 +-- src/qemu/qemu_monitor_text.c | 9 +++------ src/qemu/qemu_monitor_text.h | 3 +-- src/qemu/qemu_process.c | 32 +++++++++++++++----------------- src/qemu/qemu_process.h | 4 +--- tests/qemumonitorjsontest.c | 2 +- 11 files changed, 46 insertions(+), 69 deletions(-)
Reviewed-by: John Ferlan <jferlan@redhat.com> John