Re: [libvirt] [PATCH] util: do not take it as wrong if no PortData is found while getting migrateData

On Thu, Feb 12, 2015 at 12:08:54PM +0800, Zhang Bo wrote: >The function virNetDevOpenvswitchGetMigrateData() uses the cmd ovs-vsctl to >get portdata. If no portdata is available, rather than failure in running >the cmd, we think we should just print a warning message here, rather than >taking it as wrong, because PortData is just optional for an ovs interface. >If we take it as wrong anyway, in function qemuMigrationBakeCookie() it will >terminate in the middle, and cookies such as NBD would not be baked, further >more errors would happen, such as nbd ports get overflowed, etc. >Thus, we add an if branch in virNetDevOpenvswitchGetMigrateData() to just warn >if portdata is unavailable. > >Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com&gt; >Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com&gt; >--- >src/util/virnetdevopenvswitch.c | 28 ++++++++++++++++++++++++---- >1 file changed, 24 insertions(+), 4 deletions(-) > In my previous review I mixed what Set/Get functions do, so that's why that made way less sense for me :) Anyway, review v2: >diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c >index e5c87bb..6116377 100644 >--- a/src/util/virnetdevopenvswitch.c >+++ b/src/util/virnetdevopenvswitch.c >@@ -30,9 +30,12 @@ >#include "virerror.h" >#include "virmacaddr.h" >#include "virstring.h" >+#include "virlog.h" > >#define VIR_FROM_THIS VIR_FROM_NONE > >+VIR_LOG_INIT("util.netdevopenvswitch"); >+ >/** > * virNetDevOpenvswitchAddPort: > * @brname: the bridge name >@@ -204,18 +207,29 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch >int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) >{ > virCommandPtr cmd = NULL; >+ char *errbuf = NULL; > int ret = -1; > > cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "get", "Interface", > ifname, "external_ids:PortData", NULL);