2011/5/24 Daniel P. Berrange <berrange@xxxxxxxxxx>:
> * src/libvirt.c: Add further debug lines in helper APIs for
> Âmigration
> * src/qemu/qemu_migration.c: Add debug lines for all internal
> Âmigration API parameters
> ---
> Âsrc/libvirt.c       |  19 ++++++++++++++++-
> Âsrc/qemu/qemu_migration.c | Â 47 ++++++++++++++++++++++++++++++++++++++++++++-
> Â2 files changed, 63 insertions(+), 3 deletions(-)
> @@ -1292,6 +1304,10 @@ static int doNativeMigrate(struct qemud_driver *driver,
> Â Â qemuDomainObjPrivatePtr priv = vm->privateData;
> Â Â unsigned int background_flags = QEMU_MONITOR_MIGRATE_BACKGROUND;
> Â Â qemuMigrationCookiePtr mig = NULL;
> + Â ÂVIR_DEBUG("driver=%p, vm=%p, uri=%s, cookiein=%s, cookieinlen=%d, "
> + Â Â Â Â Â Â Â"cookieout=%p, cookieoutlen=%p, flags=%u, dname=%s, resource=%lu",
> + Â Â Â Â Â Â Âdriver, vm, uri, NULLSTR(cookiein), cookieinlen,
> + Â Â Â Â Â Â Âcookieout, cookieoutlen, flags, dname, resource);
dname can be NULL, needs to be NULLSTR(dname).
> @@ -1685,6 +1705,10 @@ static int doPeer2PeerMigrate2(struct qemud_driver *driver,
> Â Â virErrorPtr orig_err = NULL;
> Â Â int cancelled;
> Â Â virStreamPtr st = NULL;
> + Â ÂVIR_DEBUG("driver=%p, sconn=%p, dconn=%p, vm=%p, dconnuri=%s, "
> + Â Â Â Â Â Â Â"flags=%lu, dname=%s, resource=%lu",
> + Â Â Â Â Â Â Âdriver, sconn, dconn, vm, NULLSTR(dconnuri),
> + Â Â Â Â Â Â Âflags, dname, resource);
dname can be NULL, needs to be NULLSTR(dname).
> @@ -1824,8 +1848,11 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver,
> Â Â virErrorPtr orig_err = NULL;
> Â Â int cancelled;
> Â Â virStreamPtr st = NULL;
> + Â ÂVIR_DEBUG("driver=%p, sconn=%p, dconn=%p, vm=%p, xmlin=%s, "
> + Â Â Â Â Â Â Â"dconnuri=%s, uri=%s, flags=%lu, dname=%s, resource=%lu",
> + Â Â Â Â Â Â Âdriver, sconn, dconn, vm, NULLSTR(xmlin),
> + Â Â Â Â Â Â ÂNULLSTR(dconnuri), NULLSTR(uri), flags, dname, resource);
dname can be NULL, needs to be NULLSTR(dname).
> @@ -1983,6 +2010,10 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver,
> Â Â virConnectPtr dconn = NULL;
> Â Â bool p2p;
> Â Â bool v3;
> + Â ÂVIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, "
> + Â Â Â Â Â Â Â"uri=%s, flags=%lu, dname=%s, resource=%lu",
> + Â Â Â Â Â Â Âdriver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri),
> + Â Â Â Â Â Â ÂNULLSTR(uri), flags, dname, resource);
And again dname.
> @@ -2053,6 +2084,12 @@ int qemuMigrationPerform(struct qemud_driver *driver,
> Â Â int ret = -1;
> Â Â int resume = 0;
> Â Â qemuDomainObjPrivatePtr priv = vm->privateData;
> + Â ÂVIR_DEBUG("driver=%p, conn=%p, vm=%p, xmlin=%s, dconnuri=%s, "
> + Â Â Â Â Â Â Â"uri=%s, cookiein=%s, cookieinlen=%d, cookieout=%p, "
> + Â Â Â Â Â Â Â"cookieoutlen=%p, flags=%lu, dname=%s, resource=%lu, v3proto=%d",
> + Â Â Â Â Â Â Âdriver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri),
> + Â Â Â Â Â Â ÂNULLSTR(uri), NULLSTR(cookiein), cookieinlen,
> + Â Â Â Â Â Â Âcookieout, cookieoutlen, flags, dname, resource, v3proto);
And another dname.
ACK, with this dnames wrapped in NULLSTR.
Matthias
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list