[libvirt] [PATCH] qemu_command: fix double_close vhostfd in qemuBuildHostdevCommandLine
vhostfd passed to cmd->passfd in virCommandPassFD, virCommandFree will always close cmd->passfd when qemuBuildSCSIVHostHostdevDevStr failed. Signed-off-by: Jie Wang <wangjie88@huawei.com> --- src/qemu/qemu_command.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 029780fe86..3fc2dfa2f1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5819,7 +5819,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, qemuCaps, vhostfdName))) { VIR_FREE(vhostfdName); - VIR_FORCE_CLOSE(vhostfd); return -1; } virCommandAddArg(cmd, devstr); -- 2.16.2.windows.1
On 4/30/19 7:24 AM, Jie Wang wrote:
vhostfd passed to cmd->passfd in virCommandPassFD, virCommandFree will always close cmd->passfd when qemuBuildSCSIVHostHostdevDevStr failed.
Signed-off-by: Jie Wang <wangjie88@huawei.com> --- src/qemu/qemu_command.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 029780fe86..3fc2dfa2f1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5819,7 +5819,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, qemuCaps, vhostfdName))) { VIR_FREE(vhostfdName); - VIR_FORCE_CLOSE(vhostfd); return -1; } virCommandAddArg(cmd, devstr);
ACKed and pushed. Nice catch. There are some more I found too, I'll post a patch later. Michal
participants (2)
-
Jie Wang -
Michal Privoznik