- Devel - libvirt List Archives

[libvirt] [PATCH] libvirt: virsh: Kill all uses of __FUNCTION__ in error messages
by Noella Ashu 04 Apr '15

04 Apr '15

The error output of snapshot-revert should be more friendly. There is no need to show up virDomainRevertToSnapshot to user. virError already includes __FUNCTION__ information in a separate member of the struct, so repeating it in the message is redundant and leads to situations where higher level code ends up reporting the lower level name We correctly converted the error output making it more succinct and user-friendly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1086726 --- src/libvirt-domain-snapshot.c | 30 +++---- src/libvirt-domain.c | 201 ++++++++++++++++++------------------------ 2 files changed, 96 insertions(+), 135 deletions(-) diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index 9feb669..ac858ba 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -222,26 +222,20 @@ virDomainSnapshotCreateXML(virDomainPtr domain, if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT) && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE)) { - virReportInvalidArg(flags, - _("use of 'current' flag in %s requires " - "'redefine' flag"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("use of 'current' flag in requires 'redefine' flag")); goto error; } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { - virReportInvalidArg(flags, - _("'redefine' and 'no metadata' flags in %s are " - "mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("'redefine' and 'no metadata' flags in are mutually exclusive")); goto error; } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { - virReportInvalidArg(flags, - _("'redefine' and 'halt' flags in %s are mutually " - "exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("'redefine' and 'halt' flags are mutually exclusive")); goto error; } @@ -1084,10 +1078,8 @@ virDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if ((flags & VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING) && (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { - virReportInvalidArg(flags, - _("running and paused flags in %s are mutually " - "exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("running and paused flags are mutually exclusive")); goto error; } @@ -1146,10 +1138,8 @@ virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if ((flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN) && (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) { - virReportInvalidArg(flags, - _("children and children_only flags in %s are " - "mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("children and children_only flags are mutually exclusive")); goto error; } diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 8b5f91e..e0be331 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -385,9 +385,7 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virCheckNonNullArgGoto(uuidstr, error); if (virUUIDParse(uuidstr, uuid) < 0) { - virReportInvalidArg(uuidstr, - _("uuidstr in %s must be a valid UUID"), - __FUNCTION__); + virReportInvalidArg(uuidstr, "%s", _("Invalid UUID")); goto error; } @@ -1440,9 +1438,9 @@ virDomainScreenshot(virDomainPtr domain, virCheckReadOnlyGoto(domain->conn->flags, error); if (domain->conn != stream->conn) { - virReportInvalidArg(stream, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, domain->name); + virReportInvalidArg(stream, "%s", + _("stream must match connection of domain '%s'"), + domain->name); goto error; } @@ -2179,10 +2177,8 @@ virDomainGetMemoryParameters(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' are mutually exclusive")); goto error; } conn = domain->conn; @@ -2423,10 +2419,8 @@ virDomainGetBlkioParameters(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' are mutually exclusive")); goto error; } conn = domain->conn; @@ -3343,9 +3337,8 @@ virDomainMigratePeer2PeerFull(virDomainPtr domain, if (!(tempuri = virURIParse(dconnuri))) return -1; if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) { - virReportInvalidArg(dconnuri, - _("unable to parse server from dconnuri in %s"), - __FUNCTION__); + virReportInvalidArg(dconnuri, "%s", + _("unable to parse server from dconnuri")); virURIFree(tempuri); return -1; } @@ -3580,10 +3573,9 @@ virDomainMigrate(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, - _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'shared disk' and 'shared incremental'" + " are mutually exclusive")); goto error; } @@ -3809,10 +3801,9 @@ virDomainMigrate2(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -3989,10 +3980,9 @@ virDomainMigrate3(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } if (flags & VIR_MIGRATE_PEER2PEER) { @@ -4212,10 +4202,9 @@ virDomainMigrateToURI(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4372,10 +4361,9 @@ virDomainMigrateToURI2(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4481,10 +4469,9 @@ virDomainMigrateToURI3(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4791,9 +4778,8 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + virReportInvalidArg(conn, "%s", + _("conn must match stream connection")); goto error; } @@ -4937,9 +4923,8 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + virReportInvalidArg(conn, "%s", + _("conn must match stream connection")); goto error; } @@ -5221,8 +5206,7 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, if (conn != st->conn) { virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + _("conn must match stream connection")); goto error; } @@ -5529,10 +5513,9 @@ virDomainGetSchedulerParametersFlags(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' in " + "are mutually exclusive")); goto error; } conn = domain->conn; @@ -5709,9 +5692,9 @@ virDomainBlockStats(virDomainPtr dom, const char *disk, virCheckNonNullArgGoto(disk, error); virCheckNonNullArgGoto(stats, error); if (size > sizeof(stats2)) { - virReportInvalidArg(size, - _("size in %s must not exceed %zu"), - __FUNCTION__, sizeof(stats2)); + virReportInvalidArg(size, "%s", + _("size must not exceed %zu"), + sizeof(stats2)); goto error; } conn = dom->conn; @@ -5850,9 +5833,9 @@ virDomainInterfaceStats(virDomainPtr dom, const char *path, virCheckNonNullArgGoto(path, error); virCheckNonNullArgGoto(stats, error); if (size > sizeof(stats2)) { - virReportInvalidArg(size, - _("size in %s must not exceed %zu"), - __FUNCTION__, sizeof(stats2)); + virReportInvalidArg(size, "%s", + _("size must not exceed %zu"), + sizeof(stats2)); goto error; } @@ -6297,10 +6280,9 @@ virDomainMemoryPeek(virDomainPtr dom, /* Exactly one of these two flags must be set. */ if (!(flags & VIR_MEMORY_VIRTUAL) == !(flags & VIR_MEMORY_PHYSICAL)) { - virReportInvalidArg(flags, - _("flags in %s must include VIR_MEMORY_VIRTUAL or " - "VIR_MEMORY_PHYSICAL"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags must include VIR_MEMORY_VIRTUAL or " + "VIR_MEMORY_PHYSICAL")); goto error; } @@ -7144,9 +7126,9 @@ virDomainSendKey(virDomainPtr domain, virCheckPositiveArgGoto(nkeycodes, error); if (nkeycodes > VIR_DOMAIN_SEND_KEY_MAX_KEYS) { - virReportInvalidArg(nkeycodes, - _("nkeycodes in %s must be <= %d"), - __FUNCTION__, VIR_DOMAIN_SEND_KEY_MAX_KEYS); + virReportInvalidArg(nkeycodes, "%s", + _("nkeycodes must be <= %d"), + VIR_DOMAIN_SEND_KEY_MAX_KEYS); goto error; } @@ -7344,8 +7326,8 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, flags & VIR_DOMAIN_VCPU_MAXIMUM) { virReportInvalidArg(flags, _("flags 'VIR_DOMAIN_VCPU_MAXIMUM' and " - "'VIR_DOMAIN_VCPU_GUEST' in '%s' are mutually " - "exclusive"), __FUNCTION__); + "'VIR_DOMAIN_VCPU_GUEST' in are mutually " + "exclusive")); goto error; } @@ -7419,10 +7401,9 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -7626,9 +7607,8 @@ virDomainGetVcpuPinInfo(virDomainPtr domain, int ncpumaps, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -7756,9 +7736,8 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned char *cpumap, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } conn = domain->conn; @@ -7925,10 +7904,9 @@ virDomainGetIOThreadInfo(virDomainPtr dom, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -8181,10 +8159,9 @@ virDomainSetMetadata(virDomainPtr domain, switch (type) { case VIR_DOMAIN_METADATA_TITLE: if (metadata && strchr(metadata, '\n')) { - virReportInvalidArg(metadata, - _("metadata title in %s can't contain " - "newlines"), - __FUNCTION__); + virReportInvalidArg(metadata, "%s", + _("metadata title can't contain " + "newlines")); goto error; } /* fallthrough */ @@ -8259,10 +8236,9 @@ virDomainGetMetadata(virDomainPtr domain, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -9199,18 +9175,18 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, if (dom) { virCheckDomainGoto(dom, error); if (dom->conn != conn) { - virReportInvalidArg(dom, - _("domain '%s' in %s must match connection"), - dom->name, __FUNCTION__); + virReportInvalidArg(dom, "%s", + _("domain '%s' must match connection"), + dom->name); goto error; } } virCheckNonNullArgGoto(cb, error); virCheckNonNegativeArgGoto(eventID, error); if (eventID >= VIR_DOMAIN_EVENT_ID_LAST) { - virReportInvalidArg(eventID, - _("eventID in %s must be less than %d"), - __FUNCTION__, VIR_DOMAIN_EVENT_ID_LAST); + virReportInvalidArg(eventID, "%s", + _("eventID must be less than %d"), + VIR_DOMAIN_EVENT_ID_LAST); goto error; } @@ -9311,9 +9287,8 @@ virDomainManagedSave(virDomainPtr dom, unsigned int flags) if ((flags & VIR_DOMAIN_SAVE_RUNNING) && (flags & VIR_DOMAIN_SAVE_PAUSED)) { virReportInvalidArg(flags, - _("running and paused flags in %s are mutually " - "exclusive"), - __FUNCTION__); + _("running and paused flags are mutually " + "exclusive")); goto error; } @@ -9466,9 +9441,9 @@ virDomainOpenConsole(virDomainPtr dom, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(st, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, dom->name); + virReportInvalidArg(st, "%s", + _("stream must match connection of domain '%s'"), + dom->name); goto error; } @@ -9531,8 +9506,8 @@ virDomainOpenChannel(virDomainPtr dom, if (conn != st->conn) { virReportInvalidArg(st, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, dom->name); + _("stream must match connection of domain '%s'"), + dom->name); goto error; } @@ -9955,9 +9930,8 @@ virDomainBlockRebase(virDomainPtr dom, const char *disk, VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | VIR_DOMAIN_BLOCK_REBASE_COPY_RAW | VIR_DOMAIN_BLOCK_REBASE_COPY_DEV)) { - virReportInvalidArg(flags, - _("use of flags in %s requires a copy job"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("use of flags requires a copy job")); goto error; } @@ -10276,9 +10250,9 @@ virDomainOpenGraphics(virDomainPtr dom, } if (!S_ISSOCK(sb.st_mode)) { - virReportInvalidArg(fd, - _("fd %d in %s must be a socket"), - fd, __FUNCTION__); + virReportInvalidArg(fd, "%s", + _("fd %d must be a socket"), + fd); goto error; } @@ -10490,9 +10464,8 @@ virDomainGetBlockIoTune(virDomainPtr dom, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } conn = dom->conn; @@ -10615,8 +10588,7 @@ virDomainGetCPUStats(virDomainPtr domain, if (start_cpu == -1) { if (ncpus != 1) { virReportInvalidArg(start_cpu, - _("ncpus in %s must be 1 when start_cpu is -1"), - __FUNCTION__); + _("ncpus must be 1 when start_cpu is -1")); goto error; } } else { @@ -11284,9 +11256,8 @@ virDomainListGetStats(virDomainPtr *doms, virCheckNonNullArgGoto(retStats, cleanup); if (!*doms) { - virReportError(VIR_ERR_INVALID_ARG, - _("doms array must contain at least one domain in %s"), - __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("doms array must contain at least one domain")); goto cleanup; } @@ -11304,9 +11275,9 @@ virDomainListGetStats(virDomainPtr *doms, virCheckDomainGoto(dom, cleanup); if (dom->conn != conn) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("domains in 'doms' array must belong to a " - "single connection in %s"), __FUNCTION__); + "single connection")); goto cleanup; } -- 2.1.0

2 2

[libvirt] [PATCH V2 0/3] libxl: domain destroy fixes
by Jim Fehlig 04 Apr '15

04 Apr '15

V2 of a small series to fix issues wrt domain destroy https://www.redhat.com/archives/libvir-list/2015-March/msg01337.html Comments from Konrad and Martin are addressed in this version. Jim Fehlig (3): libxl: Move job acquisition in libxlDomainStart to callers libxl: acquire a job when destroying a domain libxl: drop virDomainObj lock when destroying a domain src/libxl/libxl_domain.c | 81 ++++++++++++++++++------------------------------ src/libxl/libxl_domain.h | 4 --- src/libxl/libxl_driver.c | 80 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 91 insertions(+), 74 deletions(-) -- 1.8.4.5

1 4

[libvirt] [PATCH] virsh.pod: Remove redundant --config from attach-interface
by Jiri Denemark 03 Apr '15

03 Apr '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 79d50f9..d642a69 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2458,7 +2458,7 @@ Likewise, I<--shareable> is an alias for I<--mode shareable>. =item B<attach-interface> I<domain> I<type> I<source> [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] -[I<--config>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] +[I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] Attach a new network interface to the domain. I<type> can be I<network> to indicate connection via a libvirt virtual network, or -- 2.3.5

1 0

[libvirt] [PATCH] Fix xlconfigtest with older libxl
by Ján Tomko 03 Apr '15

03 Apr '15

Commit cd5dc30 added this test, but it fails if LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST is not defined: 6) Xen XM-2-XML Format fullvirt-multiusb ... libvirt: error : unsupported configuration: multiple USB devices not supported FAILED --- tests/xlconfigtest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 6d4aa6d..c992548 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -215,7 +215,10 @@ mymain(void) DO_TEST("new-disk", 3); DO_TEST("spice", 3); + +#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST DO_TEST("fullvirt-multiusb", 3); +#endif virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.0.5

2 2

[libvirt] Entering freeze for libvirt-1.2.14
by Daniel Veillard 03 Apr '15

03 Apr '15

I have tagged a release candidate 1 in git and generated signed tarballs and rpms at the usual place: ftp://libvirt.org/libvirt/ This seems to work normally in my limited testing but others need to give it a serious try ! I think I will do an RC2 on Monday, and if everything look file the final release will be on April 1st. Thanks in advance for reports about it ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 5

[libvirt] [PATCH] libvirt: virsh: Kill all uses of __FUNCTION__ in error messages
by Noella Ashu 03 Apr '15

03 Apr '15

The error output of snapshot-revert should be more friendly. There is no need to show up virDomainRevertToSnapshot to user. virError already includes __FUNCTION__ information in a separate member of the struct, so repeating it in the message is redundant and leads to situations where higher level code ends up reporting the lower level name We correctly converted the error output making it more succinct and user-friendly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1086726 --- src/libvirt-domain-snapshot.c | 30 +++---- src/libvirt-domain.c | 201 ++++++++++++++++++------------------------ 2 files changed, 96 insertions(+), 135 deletions(-) diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index 9feb669..ac858ba 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -222,26 +222,20 @@ virDomainSnapshotCreateXML(virDomainPtr domain, if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT) && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE)) { - virReportInvalidArg(flags, - _("use of 'current' flag in %s requires " - "'redefine' flag"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("use of 'current' flag in requires 'redefine' flag")); goto error; } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { - virReportInvalidArg(flags, - _("'redefine' and 'no metadata' flags in %s are " - "mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("'redefine' and 'no metadata' flags in are mutually exclusive")); goto error; } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { - virReportInvalidArg(flags, - _("'redefine' and 'halt' flags in %s are mutually " - "exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("'redefine' and 'halt' flags are mutually exclusive")); goto error; } @@ -1084,10 +1078,8 @@ virDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if ((flags & VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING) && (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { - virReportInvalidArg(flags, - _("running and paused flags in %s are mutually " - "exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("running and paused flags are mutually exclusive")); goto error; } @@ -1146,10 +1138,8 @@ virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if ((flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN) && (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) { - virReportInvalidArg(flags, - _("children and children_only flags in %s are " - "mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("children and children_only flags are mutually exclusive")); goto error; } diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4a45b9e..78b7a93 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -385,9 +385,7 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virCheckNonNullArgGoto(uuidstr, error); if (virUUIDParse(uuidstr, uuid) < 0) { - virReportInvalidArg(uuidstr, - _("uuidstr in %s must be a valid UUID"), - __FUNCTION__); + virReportInvalidArg(uuidstr, "%s", _("Invalid UUID")); goto error; } @@ -1440,9 +1438,9 @@ virDomainScreenshot(virDomainPtr domain, virCheckReadOnlyGoto(domain->conn->flags, error); if (domain->conn != stream->conn) { - virReportInvalidArg(stream, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, domain->name); + virReportInvalidArg(stream, "%s", + _("stream must match connection of domain '%s'"), + domain->name); goto error; } @@ -2179,10 +2177,8 @@ virDomainGetMemoryParameters(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' are mutually exclusive")); goto error; } conn = domain->conn; @@ -2423,10 +2419,8 @@ virDomainGetBlkioParameters(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' are mutually exclusive")); goto error; } conn = domain->conn; @@ -3343,9 +3337,8 @@ virDomainMigratePeer2PeerFull(virDomainPtr domain, if (!(tempuri = virURIParse(dconnuri))) return -1; if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) { - virReportInvalidArg(dconnuri, - _("unable to parse server from dconnuri in %s"), - __FUNCTION__); + virReportInvalidArg(dconnuri, "%s", + _("unable to parse server from dconnuri")); virURIFree(tempuri); return -1; } @@ -3580,10 +3573,9 @@ virDomainMigrate(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, - _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'shared disk' and 'shared incremental'" + " are mutually exclusive")); goto error; } @@ -3809,10 +3801,9 @@ virDomainMigrate2(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -3989,10 +3980,9 @@ virDomainMigrate3(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } if (flags & VIR_MIGRATE_PEER2PEER) { @@ -4212,10 +4202,9 @@ virDomainMigrateToURI(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4372,10 +4361,9 @@ virDomainMigrateToURI2(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4481,10 +4469,9 @@ virDomainMigrateToURI3(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4791,9 +4778,8 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + virReportInvalidArg(conn, "%s", + _("conn must match stream connection")); goto error; } @@ -4937,9 +4923,8 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + virReportInvalidArg(conn, "%s", + _("conn must match stream connection")); goto error; } @@ -5221,8 +5206,7 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, if (conn != st->conn) { virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + _("conn must match stream connection")); goto error; } @@ -5529,10 +5513,9 @@ virDomainGetSchedulerParametersFlags(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' in " + "are mutually exclusive")); goto error; } conn = domain->conn; @@ -5709,9 +5692,9 @@ virDomainBlockStats(virDomainPtr dom, const char *disk, virCheckNonNullArgGoto(disk, error); virCheckNonNullArgGoto(stats, error); if (size > sizeof(stats2)) { - virReportInvalidArg(size, - _("size in %s must not exceed %zu"), - __FUNCTION__, sizeof(stats2)); + virReportInvalidArg(size, "%s", + _("size must not exceed %zu"), + sizeof(stats2)); goto error; } conn = dom->conn; @@ -5850,9 +5833,9 @@ virDomainInterfaceStats(virDomainPtr dom, const char *path, virCheckNonNullArgGoto(path, error); virCheckNonNullArgGoto(stats, error); if (size > sizeof(stats2)) { - virReportInvalidArg(size, - _("size in %s must not exceed %zu"), - __FUNCTION__, sizeof(stats2)); + virReportInvalidArg(size, "%s", + _("size must not exceed %zu"), + sizeof(stats2)); goto error; } @@ -6297,10 +6280,9 @@ virDomainMemoryPeek(virDomainPtr dom, /* Exactly one of these two flags must be set. */ if (!(flags & VIR_MEMORY_VIRTUAL) == !(flags & VIR_MEMORY_PHYSICAL)) { - virReportInvalidArg(flags, - _("flags in %s must include VIR_MEMORY_VIRTUAL or " - "VIR_MEMORY_PHYSICAL"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags must include VIR_MEMORY_VIRTUAL or " + "VIR_MEMORY_PHYSICAL")); goto error; } @@ -7144,9 +7126,9 @@ virDomainSendKey(virDomainPtr domain, virCheckPositiveArgGoto(nkeycodes, error); if (nkeycodes > VIR_DOMAIN_SEND_KEY_MAX_KEYS) { - virReportInvalidArg(nkeycodes, - _("nkeycodes in %s must be <= %d"), - __FUNCTION__, VIR_DOMAIN_SEND_KEY_MAX_KEYS); + virReportInvalidArg(nkeycodes, "%s", + _("nkeycodes must be <= %d"), + VIR_DOMAIN_SEND_KEY_MAX_KEYS); goto error; } @@ -7344,8 +7326,8 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, flags & VIR_DOMAIN_VCPU_MAXIMUM) { virReportInvalidArg(flags, _("flags 'VIR_DOMAIN_VCPU_MAXIMUM' and " - "'VIR_DOMAIN_VCPU_GUEST' in '%s' are mutually " - "exclusive"), __FUNCTION__); + "'VIR_DOMAIN_VCPU_GUEST' in are mutually " + "exclusive")); goto error; } @@ -7419,10 +7401,9 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -7626,9 +7607,8 @@ virDomainGetVcpuPinInfo(virDomainPtr domain, int ncpumaps, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -7756,9 +7736,8 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned char *cpumap, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } conn = domain->conn; @@ -7925,10 +7904,9 @@ virDomainGetIOThreadInfo(virDomainPtr dom, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -8181,10 +8159,9 @@ virDomainSetMetadata(virDomainPtr domain, switch (type) { case VIR_DOMAIN_METADATA_TITLE: if (metadata && strchr(metadata, '\n')) { - virReportInvalidArg(metadata, - _("metadata title in %s can't contain " - "newlines"), - __FUNCTION__); + virReportInvalidArg(metadata, "%s", + _("metadata title can't contain " + "newlines")); goto error; } /* fallthrough */ @@ -8259,10 +8236,9 @@ virDomainGetMetadata(virDomainPtr domain, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -9199,18 +9175,18 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, if (dom) { virCheckDomainGoto(dom, error); if (dom->conn != conn) { - virReportInvalidArg(dom, - _("domain '%s' in %s must match connection"), - dom->name, __FUNCTION__); + virReportInvalidArg(dom, "%s", + _("domain '%s' must match connection"), + dom->name); goto error; } } virCheckNonNullArgGoto(cb, error); virCheckNonNegativeArgGoto(eventID, error); if (eventID >= VIR_DOMAIN_EVENT_ID_LAST) { - virReportInvalidArg(eventID, - _("eventID in %s must be less than %d"), - __FUNCTION__, VIR_DOMAIN_EVENT_ID_LAST); + virReportInvalidArg(eventID, "%s", + _("eventID must be less than %d"), + VIR_DOMAIN_EVENT_ID_LAST); goto error; } @@ -9311,9 +9287,8 @@ virDomainManagedSave(virDomainPtr dom, unsigned int flags) if ((flags & VIR_DOMAIN_SAVE_RUNNING) && (flags & VIR_DOMAIN_SAVE_PAUSED)) { virReportInvalidArg(flags, - _("running and paused flags in %s are mutually " - "exclusive"), - __FUNCTION__); + _("running and paused flags are mutually " + "exclusive")); goto error; } @@ -9466,9 +9441,9 @@ virDomainOpenConsole(virDomainPtr dom, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(st, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, dom->name); + virReportInvalidArg(st, "%s", + _("stream must match connection of domain '%s'"), + dom->name); goto error; } @@ -9531,8 +9506,8 @@ virDomainOpenChannel(virDomainPtr dom, if (conn != st->conn) { virReportInvalidArg(st, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, dom->name); + _("stream must match connection of domain '%s'"), + dom->name); goto error; } @@ -9955,9 +9930,8 @@ virDomainBlockRebase(virDomainPtr dom, const char *disk, VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | VIR_DOMAIN_BLOCK_REBASE_COPY_RAW | VIR_DOMAIN_BLOCK_REBASE_COPY_DEV)) { - virReportInvalidArg(flags, - _("use of flags in %s requires a copy job"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("use of flags requires a copy job")); goto error; } @@ -10276,9 +10250,9 @@ virDomainOpenGraphics(virDomainPtr dom, } if (!S_ISSOCK(sb.st_mode)) { - virReportInvalidArg(fd, - _("fd %d in %s must be a socket"), - fd, __FUNCTION__); + virReportInvalidArg(fd, "%s", + _("fd %d must be a socket"), + fd); goto error; } @@ -10490,9 +10464,8 @@ virDomainGetBlockIoTune(virDomainPtr dom, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } conn = dom->conn; @@ -10615,8 +10588,7 @@ virDomainGetCPUStats(virDomainPtr domain, if (start_cpu == -1) { if (ncpus != 1) { virReportInvalidArg(start_cpu, - _("ncpus in %s must be 1 when start_cpu is -1"), - __FUNCTION__); + _("ncpus must be 1 when start_cpu is -1")); goto error; } } else { @@ -11284,9 +11256,8 @@ virDomainListGetStats(virDomainPtr *doms, virCheckNonNullArgGoto(retStats, cleanup); if (!*doms) { - virReportError(VIR_ERR_INVALID_ARG, - _("doms array must contain at least one domain in %s"), - __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("doms array must contain at least one domain")); goto cleanup; } @@ -11304,9 +11275,9 @@ virDomainListGetStats(virDomainPtr *doms, virCheckDomainGoto(dom, cleanup); if (dom->conn != conn) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("domains in 'doms' array must belong to a " - "single connection in %s"), __FUNCTION__); + "single connection")); goto cleanup; } -- 2.1.0

2 3

[libvirt] [PATCH] virsh: fix domifaddr no output in quiet mode
by Luyao Huang 03 Apr '15

03 Apr '15

All of print function use vshPrintExtra in cmdDomIfAddr, this will make domifaddr no output in quiet mode, after this patch, quiet mode output will be: # virsh -q domifaddr test3 --source agent lo 00:00:00:00:00:00 ipv4 127.0.0.1/8 - - ipv6 ::1/128 ens8 52:54:00:1a:cb:3f ipv6 fe80::5054:ff:fe1a:cb3f/64 virbr0 52:54:00:db:51:e7 ipv4 192.168.122.1/24 virbr0-nic 52:54:00:db:51:e7 N/A N/A Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain-monitor.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 6951db2..9686531 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2278,9 +2278,9 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) /* When the interface has no IP address */ if (!iface->naddrs) { - vshPrintExtra(ctl, " %-10s %-17s %-12s %s\n", - iface->name, - iface->hwaddr ? iface->hwaddr : "N/A", "N/A", "N/A"); + vshPrint(ctl, " %-10s %-17s %-12s %s\n", + iface->name, + iface->hwaddr ? iface->hwaddr : "N/A", "N/A", "N/A"); continue; } @@ -2313,12 +2313,12 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) /* Don't repeat interface name */ if (full || !j) - vshPrintExtra(ctl, " %-10s %-17s %s\n", - iface->name, - iface->hwaddr ? iface->hwaddr : "", ip_addr_str); + vshPrint(ctl, " %-10s %-17s %s\n", + iface->name, + iface->hwaddr ? iface->hwaddr : "", ip_addr_str); else - vshPrintExtra(ctl, " %-10s %-17s %s\n", - "-", "-", ip_addr_str); + vshPrint(ctl, " %-10s %-17s %s\n", + "-", "-", ip_addr_str); virBufferFreeAndReset(&buf); VIR_FREE(ip_addr_str); -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] esx: Make esxNodeGetFreeMemory always use ESX host.
by Dawid Zamirski 03 Apr '15

03 Apr '15

This patch is intended to make ESX driver behave more consistently. When calling virNodeGetFreeMemory, it would return the free bytes from a cluster when using vpx connection or ESX host when using esx connection. However, virGetNodeInfo always returns info from ESX host (specifying ESX host is mandatory, even for vpx connections) so to make this consitent, these patches make virNodeGetFreeMemory always return info from the ESX host. Dawid Zamirski (2): esx: add esxVI_GetInt esx: esxNodeGetFreeMemory return info from host. src/esx/esx_driver.c | 53 ++++++++++++++++++-------------------------------- src/esx/esx_vi.c | 32 ++++++++++++++++++++++++++++++ src/esx/esx_vi.h | 3 +++ src/esx/esx_vi_types.c | 3 +++ src/esx/esx_vi_types.h | 1 + 5 files changed, 58 insertions(+), 34 deletions(-) -- 2.1.0

2 3

[libvirt] qemu: migration: continuously sending and receiving ARP packets guest mistakenly thinks there's another guest with the same IP.
by zhang bo 03 Apr '15

03 Apr '15

Problem Description: Live-migrate a guest, which has a tap device and continuously sends and receives ARP packets, it would mistakenly think there's another guest with the same IP, immedially after migration. The steps to reproduce the problem: 1 define and start a domain with its network configured as: <interface type='bridge'> <mac address='52:54:00:7d:b0:af'/> <source bridge='br0'/> <virtualport type='openvswitch'> <parameters interfaceid='e4ad3dbb-7808-4175-83ee-ee0cba1c5456'/> </virtualport> <model type='virtio'/> <driver name='vhost' queues='4'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> 2 The guest sends ARP packets continuously: arping -I ethX xx.xx.xx.xx(self_ip) 3 Meanwhile, the guest also receives ARP packets continuously: tcpdump -i ethX arp host xx.xx.xx.xx(self_ip) -entttt 4 After migrateion, at the dest side, the guest gets a lot of ARP packets which came from the source-side guest(which was stored while it's suspended.). For example: 2015-03-27 16:45:56.695166 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695197 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695205 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695214 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695244 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695256 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695264 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695291 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695324 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695337 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695344 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695364 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 5 These packets will confuse my process. It may think that there is another VM has the same IP with itself. Reasons for the problem: The tap device will get up as soon as it's created(in virNetDevTapCreateInBridgePort), before the cpus got un-paused. So, it kept receiving data before the guest starts to run, please note that the data are sent from the source side. As soon as the guest get running, it parses the data stored before, and thinks they were from other guest with the same IP, which is in fact the guest from the source side. There was a patch "network: Bring netdevs online later", it move the virNetDevSetOnline() of network device just before start VM's vcpu. But in the Laine Stump replay mail say "It turns out, though, that regular tap devices which will be connected to a bridge should be ifup'ed and attached to the bridge as soon as possible, so that the forwarding delay timer of the bridge can start to count down." I agree with Laine Stump's idea that it's not a perfect solution to start the tap device right before running vcpu. so, here comes the question: what can we do to insure our guests not receive itself's ARP packets from src side during migrateion?

1 0

[libvirt] [PATCH] conf: Change virStoragePoolSaveConfig prototype s/configDir/configFile
by Erik Skultety 03 Apr '15

03 Apr '15

Just a minor change which might be a little confusing for someone looking only at the API. --- Pushed as trivial. src/conf/storage_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index edcdaed..da378b7 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -373,7 +373,7 @@ virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, int virStoragePoolSaveState(const char *stateFile, virStoragePoolDefPtr def); -int virStoragePoolSaveConfig(const char *configDir, +int virStoragePoolSaveConfig(const char *configFile, virStoragePoolDefPtr def); int virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, virStoragePoolObjPtr pool, -- 1.9.3

1 0