[libvirt] [PATCH] qemu: Build command line for incoming tunneled migration
Command line building for imcoming tunneled migration is missed, as a result, all the tunneled migration will fail with "unknown migration protocol". * src/qemu/qemu_command.c --- src/qemu/qemu_command.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0f86a3..8f681fd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4067,6 +4067,14 @@ qemuBuildCommandLine(virConnectPtr conn, } virCommandAddArg(cmd, migrateFrom); virCommandPreserveFD(cmd, migrateFd); + } else if (STRPREFIX(migrateFrom, "unix")) { + if (!(qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_QEMU_UNIX)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("UNIX migration is not supported " + "with this QEMU binary")); + goto error; + } + virCommandAddArg(cmd, migrateFrom); } else { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unknown migration protocol")); -- 1.7.3.2
This patch is race with: http://www.redhat.com/archives/libvir-list/2011-January/msg00681.html , if patch above works, but it was not pushed yet, will it be pushed? Regards Osier 于 2011年01月30日 15:58, Osier Yang 写道:
Command line building for imcoming tunneled migration is missed, as a result, all the tunneled migration will fail with "unknown migration protocol".
* src/qemu/qemu_command.c --- src/qemu/qemu_command.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0f86a3..8f681fd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4067,6 +4067,14 @@ qemuBuildCommandLine(virConnectPtr conn, } virCommandAddArg(cmd, migrateFrom); virCommandPreserveFD(cmd, migrateFd); + } else if (STRPREFIX(migrateFrom, "unix")) { + if (!(qemuCmdFlags& QEMUD_CMD_FLAG_MIGRATE_QEMU_UNIX)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("UNIX migration is not supported " + "with this QEMU binary")); + goto error; + } + virCommandAddArg(cmd, migrateFrom); } else { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unknown migration protocol")); -- 1.7.3.2
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On 01/30/2011 01:10 AM, Osier Yang wrote:
This patch is race with: http://www.redhat.com/archives/libvir-list/2011-January/msg00681.html
, if patch above works, but it was not pushed yet, will it be pushed?
I've been kind of sitting on that patch - it's an optimization rather than a correctness issue, and Paolo correctly pointed out that we can further optimize by also teaching the outgoing side to pass an fd to the monitor (since the monitor connection is a Unix socket) rather than the current exec: used on the outgoing side. Since I have only written the -incoming side so far, I've deferred pushing until the outgoing side is also written. I'm okay if yours goes in first. Meanwhile, both your patch and my (deferred) patch conflict with Daniel's refactoring into qemu_process and qemu_migration. Fun stuff, merge conflicts :) -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On 01/30/2011 12:58 AM, Osier Yang wrote:
Command line building for imcoming tunneled migration is missed,
s/imcoming/incoming/
as a result, all the tunneled migration will fail with "unknown migration protocol".
* src/qemu/qemu_command.c --- src/qemu/qemu_command.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
ACK - this is a regression that I introduced in commit 1859939a (prior to that point, the code validated tcp, stdio, and exec in one place in the code, then blindly used the string in another without regards to it being a possible fourth value; the rewrite rejected unknown values, which is incorrect). Please apply! -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
于 2011年02月01日 05:14, Eric Blake 写道:
On 01/30/2011 12:58 AM, Osier Yang wrote:
Command line building for imcoming tunneled migration is missed,
s/imcoming/incoming/
as a result, all the tunneled migration will fail with "unknown migration protocol".
* src/qemu/qemu_command.c --- src/qemu/qemu_command.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
ACK - this is a regression that I introduced in commit 1859939a (prior to that point, the code validated tcp, stdio, and exec in one place in the code, then blindly used the string in another without regards to it being a possible fourth value; the rewrite rejected unknown values, which is incorrect).
Please apply!
Thanks, pushed Regards Osier
participants (2)
-
Eric Blake -
Osier Yang