- Devel - libvirt List Archives

[libvirt] [PATCH v3 RESEND] vhost-user: add support reconnect for vhost-user ports
by ZhiPeng Lu 30 Sep '17

30 Sep '17

For vhost-user ports, Open vSwitch acts as the server and QEMU the client. When OVS crashes or restarts, the QEMU process should be reconnected to OVS. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- docs/schemas/domaincommon.rng | 26 ++++++++------ src/conf/domain_conf.c | 40 ++++++++++++++++++---- src/conf/domain_conf.h | 10 +++--- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- .../qemuxml2argv-net-vhostuser-multiq.args | 4 +-- .../qemuxml2argv-net-vhostuser-multiq.xml | 8 +++-- 8 files changed, 65 insertions(+), 29 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 76852ab..3f4ed82 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2327,6 +2327,18 @@ </attribute> </optional> </define> + <define name="reconnect"> + <element name="reconnect"> + <attribute name="enabled"> + <ref name="virYesNo"/> + </attribute> + <optional> + <attribute name="timeout"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </element> + </define> <!-- An interface description can either be of type bridge in which case @@ -2388,6 +2400,9 @@ <value>client</value> </choice> </attribute> + <optional> + <ref name="reconnect"/> + </optional> <empty/> </element> <ref name="interface-options"/> @@ -3636,16 +3651,7 @@ </attribute> </optional> <optional> - <element name="reconnect"> - <attribute name="enabled"> - <ref name="virYesNo"/> - </attribute> - <optional> - <attribute name="timeout"> - <ref name="unsignedInt"/> - </attribute> - </optional> - </element> + <ref name="reconnect"/> </optional> <zeroOrMore> <ref name='devSeclabel'/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cc5e79b..b7fc3a5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -83,6 +83,13 @@ struct _virDomainXMLOption { /* Private data for save image stored in snapshot XML */ virSaveCookieCallbacks saveCookie; }; +static int +virDomainDeviceSourceReconnectDefParseXML(virDomainDeviceSourceReconnectDefPtr def, + xmlNodePtr node, + xmlXPathContextPtr ctxt); +static void +virDomainDeviceSourceReconnectDefFormat(virBufferPtr buf, + virDomainDeviceSourceReconnectDefPtr def); #define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS \ (VIR_DOMAIN_DEF_FORMAT_SECURE | \ @@ -10245,6 +10252,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; + virDomainDeviceSourceReconnectDef reconnect = {0}; int rv, val; if (VIR_ALLOC(def) < 0) @@ -10331,6 +10339,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, vhostuser_type = virXMLPropString(cur, "type"); vhostuser_path = virXMLPropString(cur, "path"); vhostuser_mode = virXMLPropString(cur, "mode"); + if (virDomainDeviceSourceReconnectDefParseXML(&reconnect, cur, ctxt) < 0) + goto error; } else if (!def->virtPortProfile && virXMLNodeNameEqual(cur, "virtualport")) { if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -10552,8 +10562,17 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (STREQ(vhostuser_mode, "server")) { def->data.vhostuser->data.nix.listen = true; + if (reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'reconnect' attribute unsupported " + "'server' mode for <interface type='vhostuser'>")); + goto error; + } } else if (STREQ(vhostuser_mode, "client")) { def->data.vhostuser->data.nix.listen = false; + def->data.vhostuser->data.nix.reconnect.enabled = reconnect.enabled; + def->data.vhostuser->data.nix.reconnect.timeout = reconnect.timeout; + reconnect.enabled = VIR_TRISTATE_BOOL_ABSENT; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Wrong <source> 'mode' attribute " @@ -11216,7 +11235,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, } static int -virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, +virDomainDeviceSourceReconnectDefParseXML(virDomainDeviceSourceReconnectDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { @@ -11338,7 +11357,7 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def, VIR_FREE(tmp); } - if (virDomainChrSourceReconnectDefParseXML(&def->data.tcp.reconnect, + if (virDomainDeviceSourceReconnectDefParseXML(&def->data.tcp.reconnect, source, ctxt) < 0) { goto error; @@ -11389,7 +11408,7 @@ virDomainChrSourceDefParseUnix(virDomainChrSourceDefPtr def, def->data.nix.listen = mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND; def->data.nix.path = virXMLPropString(source, "path"); - if (virDomainChrSourceReconnectDefParseXML(&def->data.nix.reconnect, + if (virDomainDeviceSourceReconnectDefParseXML(&def->data.nix.reconnect, source, ctxt) < 0) { return -1; @@ -22984,6 +23003,13 @@ virDomainNetDefFormat(virBufferPtr buf, def->data.vhostuser->data.nix.listen ? "server" : "client"); sourceLines++; + if (def->data.vhostuser->data.nix.reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virBufferAddLit(buf, ">\n"); + sourceLines++; + virBufferAdjustIndent(buf, 2); + virDomainDeviceSourceReconnectDefFormat(buf, &def->data.vhostuser->data.nix.reconnect); + virBufferAdjustIndent(buf, -2); + } } break; @@ -23218,8 +23244,8 @@ virDomainChrAttrsDefFormat(virBufferPtr buf, static void -virDomainChrSourceReconnectDefFormat(virBufferPtr buf, - virDomainChrSourceReconnectDefPtr def) +virDomainDeviceSourceReconnectDefFormat(virBufferPtr buf, + virDomainDeviceSourceReconnectDefPtr def) { if (def->enabled == VIR_TRISTATE_BOOL_ABSENT) return; @@ -23314,7 +23340,7 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virBufferAsprintf(&attrBuf, " tlsFromConfig='%d'", def->data.tcp.tlsFromConfig); - virDomainChrSourceReconnectDefFormat(&childBuf, + virDomainDeviceSourceReconnectDefFormat(&childBuf, &def->data.tcp.reconnect); if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) @@ -23333,7 +23359,7 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virDomainSourceDefFormatSeclabel(&childBuf, def->nseclabels, def->seclabels, flags); - virDomainChrSourceReconnectDefFormat(&childBuf, + virDomainDeviceSourceReconnectDefFormat(&childBuf, &def->data.nix.reconnect); if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bb3b6f0..909f60d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1138,12 +1138,12 @@ typedef enum { } virDomainChrSpicevmcName; -struct _virDomainChrSourceReconnectDef { +struct _virDomainDeviceSourceReconnectDef { virTristateBool enabled; unsigned int timeout; }; -typedef struct _virDomainChrSourceReconnectDef virDomainChrSourceReconnectDef; -typedef virDomainChrSourceReconnectDef *virDomainChrSourceReconnectDefPtr; +typedef struct _virDomainDeviceSourceReconnectDef virDomainDeviceSourceReconnectDef; +typedef virDomainDeviceSourceReconnectDef *virDomainDeviceSourceReconnectDefPtr; /* The host side information for a character device. */ @@ -1168,7 +1168,7 @@ struct _virDomainChrSourceDef { bool tlscreds; int haveTLS; /* enum virTristateBool */ bool tlsFromConfig; - virDomainChrSourceReconnectDef reconnect; + virDomainDeviceSourceReconnectDef reconnect; } tcp; struct { char *bindHost; @@ -1179,7 +1179,7 @@ struct _virDomainChrSourceDef { struct { char *path; bool listen; - virDomainChrSourceReconnectDef reconnect; + virDomainDeviceSourceReconnectDef reconnect; } nix; int spicevmc; struct { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9b3e3fc..4640ce8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5094,7 +5094,7 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logManager, static void qemuBuildChrChardevReconnectStr(virBufferPtr buf, - const virDomainChrSourceReconnectDef *def) + const virDomainDeviceSourceReconnectDef *def) { if (def->enabled == VIR_TRISTATE_BOOL_YES) { virBufferAsprintf(buf, ",reconnect=%u", def->timeout); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 50b536e..4ea0727 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3244,7 +3244,7 @@ qemuDomainNetSupportsCoalesce(virDomainNetType type) static int -qemuDomainChrSourceReconnectDefValidate(const virDomainChrSourceReconnectDef *def) +qemuDomainChrSourceReconnectDefValidate(const virDomainDeviceSourceReconnectDef *def) { if (def->enabled == VIR_TRISTATE_BOOL_YES && def->timeout == 0) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 63b8559..b3d572e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6443,7 +6443,7 @@ int qemuMonitorJSONGetTPMTypes(qemuMonitorPtr mon, static int qemuMonitorJSONBuildChrChardevReconnect(virJSONValuePtr object, - const virDomainChrSourceReconnectDef *def) + const virDomainDeviceSourceReconnectDef *def) { if (def->enabled != VIR_TRISTATE_BOOL_YES) return 0; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index b69ebd8..0b08f44 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -25,14 +25,14 @@ server,nowait \ -netdev vhost-user,chardev=charnet0,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\ addr=0x3 \ --chardev socket,id=charnet1,path=/tmp/vhost1.sock \ +-chardev socket,id=charnet1,path=/tmp/vhost1.sock,reconnect=10 \ -netdev vhost-user,chardev=charnet1,id=hostnet1 \ -device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,\ addr=0x4 \ -netdev socket,listen=:2015,id=hostnet2 \ -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,\ addr=0x5 \ --chardev socket,id=charnet3,path=/tmp/vhost2.sock \ +-chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=0 \ -netdev vhost-user,chardev=charnet3,queues=4,id=hostnet3 \ -device virtio-net-pci,mq=on,vectors=10,netdev=hostnet3,id=net3,\ mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml index d5c42fe..2fadb1c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml @@ -30,7 +30,9 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6c'/> - <source type='unix' path='/tmp/vhost1.sock' mode='client'/> + <source type='unix' path='/tmp/vhost1.sock' mode='client'> + <reconnect enabled='yes' timeout='10'/> + </source> <model type='virtio'/> </interface> <interface type='server'> @@ -40,7 +42,9 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6d'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'> + <reconnect enabled='no'/> + </source> <model type='virtio'/> <driver queues='4'/> </interface> -- 1.8.3.1

1 0

[libvirt] [PATCH 0/2] Clean up the nwfilter mess I created
by John Ferlan 29 Sep '17

29 Sep '17

Silly me - touching the nwfilter code... Turns out the reverted patch in 1/2 doesn't cover it as virNWFilterVarValueCreateSimple actually steals @addr, so freeing it on successful return ends up being a very bad thing as I found out with the nwfilter avocado-vt tests. So revert that and just go with the only free on failure logic in patch2 John Ferlan (2): Revert "nwfilter: Fix possible segfault on sometimes consumed variable" nwfilter: Only free inetaddr on virNWFilterIPAddrMapAddIPAddr failure src/conf/nwfilter_ipaddrmap.c | 9 +-------- src/nwfilter/nwfilter_learnipaddr.c | 5 ++++- 2 files changed, 5 insertions(+), 9 deletions(-) -- 2.13.5

2 6

[libvirt] [PATCH 0/2] Add multiqueue support for virtio-blk
by Lin Ma 29 Sep '17

29 Sep '17

The multiqueue for virtio-blk was introduced since qemu 2.7.0. These patches supported it and update test data for it. Lin Ma (2): qemucapstest: Update test data for 'num-queues' property of virtio-blk qemu: Support multiqueue virtio-blk docs/formatdomain.html.in | 6 +++- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 19 ++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 +++ tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-disk-virtio-drive-queues.args | 24 +++++++++++++++ .../qemuxml2argv-disk-virtio-drive-queues.xml | 34 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../qemuxml2xmlout-disk-virtio-drive-queues.xml | 1 + tests/qemuxml2xmltest.c | 1 + 21 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-drive-queues.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-drive-queues.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-drive-queues.xml -- 2.14.0

2 4

[libvirt] [PATCH] conf: Split out parsing of network disk source XML elements
by Peter Krempa 29 Sep '17

29 Sep '17

virDomainDiskSourceParse got to the point of being an ugly spaghetti mess by adding more and more stuff into it. Split out parsing of network disk information into a separate function so that it stays contained. --- I've had this patch on a branch that makes virDomainDiskSourceParse uglier, but with the recent VxHS patches I've got a merge conflict, thus I'm sending it now. Note: this patch was generated with the "patience" diff algorithm src/conf/domain_conf.c | 183 ++++++++++++++++++++++++++----------------------- 1 file changed, 99 insertions(+), 84 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 87192eb2d..98f5666ef 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8106,18 +8106,109 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node, } -int -virDomainDiskSourceParse(xmlNodePtr node, - xmlXPathContextPtr ctxt, - virStorageSourcePtr src, - unsigned int flags) +static int +virDomainDiskSourceNetworkParse(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virStorageSourcePtr src, + unsigned int flags) { - int ret = -1; char *protocol = NULL; - xmlNodePtr saveNode = ctxt->node; char *haveTLS = NULL; char *tlsCfg = NULL; int tlsCfgVal; + int ret = -1; + + if (!(protocol = virXMLPropString(node, "protocol"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing network source protocol type")); + goto cleanup; + } + + if ((src->protocol = virStorageNetProtocolTypeFromString(protocol)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown protocol type '%s'"), protocol); + goto cleanup; + } + + if (!(src->path = virXMLPropString(node, "name")) && + src->protocol != VIR_STORAGE_NET_PROTOCOL_NBD) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing name for disk source")); + goto cleanup; + } + + /* Check tls=yes|no domain setting for the block device + * At present only VxHS. Other block devices may be added later */ + if (src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS && + (haveTLS = virXMLPropString(node, "tls"))) { + if ((src->haveTLS = + virTristateBoolTypeFromString(haveTLS)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("unknown disk source 'tls' setting '%s'"), + haveTLS); + goto cleanup; + } + } + + if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && + (tlsCfg = virXMLPropString(node, "tlsFromConfig"))) { + if (virStrToLong_i(tlsCfg, NULL, 10, &tlsCfgVal) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid tlsFromConfig value: %s"), + tlsCfg); + goto cleanup; + } + src->tlsFromConfig = !!tlsCfgVal; + } + + /* for historical reasons the volume name for gluster volume is stored + * as a part of the path. This is hard to work with when dealing with + * relative names. Split out the volume into a separate variable */ + if (src->path && src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { + char *tmp; + if (!(tmp = strchr(src->path, '/')) || + tmp == src->path) { + virReportError(VIR_ERR_XML_ERROR, + _("missing volume name or file name in " + "gluster source path '%s'"), src->path); + goto cleanup; + } + + src->volume = src->path; + + if (VIR_STRDUP(src->path, tmp) < 0) + goto cleanup; + + tmp[0] = '\0'; + } + + /* snapshot currently works only for remote disks */ + src->snapshot = virXPathString("string(./snapshot/@name)", ctxt); + + /* config file currently only works with remote disks */ + src->configFile = virXPathString("string(./config/@file)", ctxt); + + if (virDomainStorageNetworkParseHosts(node, &src->hosts, &src->nhosts) < 0) + goto cleanup; + + virStorageSourceNetworkAssignDefaultPorts(src); + + ret = 0; + + cleanup: + VIR_FREE(protocol); + return ret; +} + + +int +virDomainDiskSourceParse(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virStorageSourcePtr src, + unsigned int flags) +{ + int ret = -1; + xmlNodePtr saveNode = ctxt->node; ctxt->node = node; @@ -8132,81 +8223,8 @@ virDomainDiskSourceParse(xmlNodePtr node, src->path = virXMLPropString(node, "dir"); break; case VIR_STORAGE_TYPE_NETWORK: - if (!(protocol = virXMLPropString(node, "protocol"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing network source protocol type")); + if (virDomainDiskSourceNetworkParse(node, ctxt, src, flags) < 0) goto cleanup; - } - - if ((src->protocol = virStorageNetProtocolTypeFromString(protocol)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown protocol type '%s'"), protocol); - goto cleanup; - } - - if (!(src->path = virXMLPropString(node, "name")) && - src->protocol != VIR_STORAGE_NET_PROTOCOL_NBD) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing name for disk source")); - goto cleanup; - } - - /* Check tls=yes|no domain setting for the block device - * At present only VxHS. Other block devices may be added later */ - if (src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS && - (haveTLS = virXMLPropString(node, "tls"))) { - if ((src->haveTLS = - virTristateBoolTypeFromString(haveTLS)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown disk source 'tls' setting '%s'"), - haveTLS); - goto cleanup; - } - } - - if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && - (tlsCfg = virXMLPropString(node, "tlsFromConfig"))) { - if (virStrToLong_i(tlsCfg, NULL, 10, &tlsCfgVal) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid tlsFromConfig value: %s"), - tlsCfg); - goto cleanup; - } - src->tlsFromConfig = !!tlsCfgVal; - } - - /* for historical reasons the volume name for gluster volume is stored - * as a part of the path. This is hard to work with when dealing with - * relative names. Split out the volume into a separate variable */ - if (src->path && src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { - char *tmp; - if (!(tmp = strchr(src->path, '/')) || - tmp == src->path) { - virReportError(VIR_ERR_XML_ERROR, - _("missing volume name or file name in " - "gluster source path '%s'"), src->path); - goto cleanup; - } - - src->volume = src->path; - - if (VIR_STRDUP(src->path, tmp) < 0) - goto cleanup; - - tmp[0] = '\0'; - } - - /* snapshot currently works only for remote disks */ - src->snapshot = virXPathString("string(./snapshot/@name)", ctxt); - - /* config file currently only works with remote disks */ - src->configFile = virXPathString("string(./config/@file)", ctxt); - - if (virDomainStorageNetworkParseHosts(node, &src->hosts, &src->nhosts) < 0) - goto cleanup; - - virStorageSourceNetworkAssignDefaultPorts(src); - break; case VIR_STORAGE_TYPE_VOLUME: if (virDomainDiskSourcePoolDefParse(node, &src->srcpool) < 0) @@ -8229,9 +8247,6 @@ virDomainDiskSourceParse(xmlNodePtr node, ret = 0; cleanup: - VIR_FREE(protocol); - VIR_FREE(haveTLS); - VIR_FREE(tlsCfg); ctxt->node = saveNode; return ret; } -- 2.14.1

3 2

[libvirt] [PATCH] Revert "vhost-user: add support reconnect for vhost-user ports"
by Pavel Hrdina 29 Sep '17

29 Sep '17

This reverts commit edaf4ebe95a5995585c8ab7bc5b92887286d4431. This uses "reconnect" as attribute for <source> element, but we already have a <reconnect> element for <source> element for chardev devices. Since this is the same feature for different device it should be presented in XML the same way. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/formatdomain.html.in | 5 +--- docs/schemas/domaincommon.rng | 5 ---- src/conf/domain_conf.c | 28 ++-------------------- .../qemuxml2argv-net-vhostuser-multiq.args | 2 +- .../qemuxml2argv-net-vhostuser-multiq.xml | 2 +- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1602ed3e95..9ce4620c65 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5673,7 +5673,7 @@ qemu-kvm -net nic,model=? /dev/null </interface> <interface type='vhostuser'> <mac address='52:54:00:3b:83:1b'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client' reconnect='10'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'/> <model type='virtio'/> <driver queues='5'/> </interface> @@ -5689,9 +5689,6 @@ qemu-kvm -net nic,model=? /dev/null are supported. vhost-user requires the virtio model type, thus the <code><model></code> element is mandatory. - <span class="since">Since 3.7.0</span> the element has an optional - attribute <code>reconnect</code> which configures reconnect timeout - (in seconds) if the connection is lost. </p> <h5><a id="elementNwfilter">Traffic filtering with NWFilter</a></h5> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 36e2966f21..76852abb3c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2388,11 +2388,6 @@ <value>client</value> </choice> </attribute> - <optional> - <attribute name="reconnect"> - <ref name='positiveInteger'/> - </attribute> - </optional> <empty/> </element> <ref name="interface-options"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3b4dd33da..cc5e79b70b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10240,7 +10240,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *vhostuser_mode = NULL; char *vhostuser_path = NULL; char *vhostuser_type = NULL; - char *vhostuser_reconnect = NULL; char *trustGuestRxFilters = NULL; char *vhost_path = NULL; virNWFilterHashTablePtr filterparams = NULL; @@ -10327,12 +10326,11 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } } else if (!vhostuser_path && !vhostuser_mode && !vhostuser_type - && !vhostuser_reconnect && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER - && virXMLNodeNameEqual(cur, "source")) { + && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && + virXMLNodeNameEqual(cur, "source")) { vhostuser_type = virXMLPropString(cur, "type"); vhostuser_path = virXMLPropString(cur, "path"); vhostuser_mode = virXMLPropString(cur, "mode"); - vhostuser_reconnect = virXMLPropString(cur, "reconnect"); } else if (!def->virtPortProfile && virXMLNodeNameEqual(cur, "virtualport")) { if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -10554,24 +10552,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (STREQ(vhostuser_mode, "server")) { def->data.vhostuser->data.nix.listen = true; - if (vhostuser_reconnect) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("'reconnect' attribute unsupported " - "'server' mode for <interface type='vhostuser'>")); - goto error; - } } else if (STREQ(vhostuser_mode, "client")) { def->data.vhostuser->data.nix.listen = false; - if (vhostuser_reconnect) { - def->data.vhostuser->data.nix.reconnect.enabled = true; - if (virStrToLong_ui(vhostuser_reconnect, NULL, 10, - &def->data.vhostuser->data.nix.reconnect.timeout) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid vhostuser reconnect value %s"), - vhostuser_reconnect); - goto error; - } - } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Wrong <source> 'mode' attribute " @@ -11016,7 +10998,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(portgroup); VIR_FREE(address); VIR_FREE(port); - VIR_FREE(vhostuser_reconnect); VIR_FREE(vhostuser_type); VIR_FREE(vhostuser_path); VIR_FREE(vhostuser_mode); @@ -23002,11 +22983,6 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " mode='%s'", def->data.vhostuser->data.nix.listen ? "server" : "client"); - if (def->data.vhostuser->data.nix.reconnect.enabled == true) { - virBufferAsprintf(buf, " reconnect='%u'", - def->data.vhostuser->data.nix.reconnect.timeout); - } - sourceLines++; } break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index 996828f7d8..b69ebd8bad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -32,7 +32,7 @@ addr=0x4 \ -netdev socket,listen=:2015,id=hostnet2 \ -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,\ addr=0x5 \ --chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=10 \ +-chardev socket,id=charnet3,path=/tmp/vhost2.sock \ -netdev vhost-user,chardev=charnet3,queues=4,id=hostnet3 \ -device virtio-net-pci,mq=on,vectors=10,netdev=hostnet3,id=net3,\ mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml index 7eb6fa0bbf..d5c42fe62c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml @@ -40,7 +40,7 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6d'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client' reconnect='10'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'/> <model type='virtio'/> <driver queues='4'/> </interface> -- 2.13.5

3 3

[libvirt] [PATCH python] Unify whitespace around *_ALLOW_THREADS macros
by Nir Soffer 29 Sep '17

29 Sep '17

Most of the code treats libvirt API calls as separate block, keeping one blank line before the LIBVIRT_BEGIN_ALLOW_THREAD, and one blank line after LIBVIRT_END_ALLOW_THREADS. Unify the whitespace so all calls wrapped with these macros are treated as a separate block. --- libvirt-override.c | 115 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 87 insertions(+), 28 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index f5ff605..d746350 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -441,6 +441,7 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetSchedulerType(domain, &nparams); LIBVIRT_END_ALLOW_THREADS; + if (c_retval == NULL) return VIR_PY_NONE; @@ -1221,6 +1222,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetInfo(domain, &dominfo); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) return VIR_PY_NONE; @@ -1239,6 +1241,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, cpuinfo, dominfo.nrVirtCpu, cpumap, cpumaplen); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { error = VIR_PY_NONE; goto cleanup; @@ -1402,6 +1405,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetInfo(domain, &dominfo); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) return VIR_PY_NONE; @@ -1522,6 +1526,7 @@ libvirt_virDomainGetEmulatorPinInfo(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; ret = virDomainGetEmulatorPinInfo(domain, cpumap, cpumaplen, flags); LIBVIRT_END_ALLOW_THREADS; + if (ret < 0) { VIR_FREE(cpumap); return VIR_PY_NONE; @@ -1660,6 +1665,7 @@ libvirt_virDomainPinIOThread(PyObject *self ATTRIBUTE_UNUSED, i_retval = virDomainPinIOThread(domain, iothread_val, cpumap, cpumaplen, flags); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { ret = VIR_PY_INT_FAIL; goto cleanup; @@ -1728,6 +1734,7 @@ libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; err = virConnGetLastError(conn); LIBVIRT_END_ALLOW_THREADS; + if (err == NULL) return VIR_PY_NONE; @@ -1970,9 +1977,9 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, auth.cbdata = pyauth; LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virConnectOpenAuth(name, &auth, flags); LIBVIRT_END_ALLOW_THREADS; + VIR_FREE(auth.credtype); py_retval = libvirt_virConnectPtrWrap((virConnectPtr) c_retval); return py_retval; @@ -1997,12 +2004,10 @@ libvirt_virGetVersion(PyObject *self ATTRIBUTE_UNUSED, return NULL; LIBVIRT_BEGIN_ALLOW_THREADS; - if (type == NULL) c_retval = virGetVersion(&libVer, NULL, NULL); else c_retval = virGetVersion(&libVer, type, &typeVer); - LIBVIRT_END_ALLOW_THREADS; if (c_retval == -1) @@ -2029,9 +2034,7 @@ libvirt_virConnectGetVersion(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virConnectGetVersion(conn, &hvVersion); - LIBVIRT_END_ALLOW_THREADS; if (c_retval == -1) @@ -2059,9 +2062,7 @@ libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virConnectGetCPUModelNames(conn, arch, &models, flags); - LIBVIRT_END_ALLOW_THREADS; if (c_retval == -1) @@ -2103,9 +2104,7 @@ libvirt_virConnectGetLibVersion(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virConnectGetLibVersion(conn, &libVer); - LIBVIRT_END_ALLOW_THREADS; if (c_retval == -1) @@ -2132,6 +2131,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfDomains(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2142,6 +2142,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDomains(conn, ids, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -2186,6 +2187,7 @@ libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListAllDomains(conn, &doms, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2231,15 +2233,18 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfDefinedDomains(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedDomains(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -2287,15 +2292,18 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainSnapshotNum(dom, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainSnapshotListNames(dom, names, c_retval, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -2341,6 +2349,7 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainListAllSnapshots(dom, &snaps, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2386,16 +2395,19 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainSnapshotNumChildren(snap, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainSnapshotListChildrenNames(snap, names, c_retval, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -2441,6 +2453,7 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainSnapshotListAllChildren(parent, &snaps, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2484,6 +2497,7 @@ libvirt_virDomainRevertToSnapshot(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainRevertToSnapshot(snap, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_INT_FAIL; @@ -2507,6 +2521,7 @@ libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetInfo(domain, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2549,6 +2564,7 @@ libvirt_virDomainGetState(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetState(domain, &state, &reason, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2584,6 +2600,7 @@ libvirt_virDomainGetControlInfo(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetControlInfo(domain, &info, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2622,6 +2639,7 @@ libvirt_virDomainGetBlockInfo(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetBlockInfo(domain, path, &info, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2659,6 +2677,7 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetInfo(conn, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2701,6 +2720,7 @@ libvirt_virNodeGetSecurityModel(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetSecurityModel(conn, &model); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2737,6 +2757,7 @@ libvirt_virDomainGetSecurityLabel(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetSecurityLabel(dom, &label); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -2823,6 +2844,7 @@ libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, if (domain == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetUUID(domain, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -2849,6 +2871,7 @@ libvirt_virDomainGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, if (dom == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetUUIDString(dom, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -2905,15 +2928,18 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfNetworks(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListNetworks(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -2961,15 +2987,18 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfDefinedNetworks(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedNetworks(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -3016,6 +3045,7 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListAllNetworks(conn, &nets, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3057,6 +3087,7 @@ libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, if (domain == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNetworkGetUUID(domain, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -3083,6 +3114,7 @@ libvirt_virNetworkGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, if (net == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNetworkGetUUIDString(net, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -3238,6 +3270,7 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3248,6 +3281,7 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetCPUStats(conn, cpuNum, stats, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { VIR_FREE(stats); return VIR_PY_NONE; @@ -3296,6 +3330,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3306,6 +3341,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, stats, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { VIR_FREE(stats); return VIR_PY_NONE; @@ -3350,15 +3386,18 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfStoragePools(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListStoragePools(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -3404,15 +3443,18 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfDefinedStoragePools(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedStoragePools(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -3461,6 +3503,7 @@ libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListAllStoragePools(conn, &pools, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3506,6 +3549,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStoragePoolNumOfVolumes(pool); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3516,6 +3560,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStoragePoolListVolumes(pool, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -3564,6 +3609,7 @@ libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStoragePoolListAllVolumes(pool, &vols, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3632,6 +3678,7 @@ libvirt_virStoragePoolGetInfo(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStoragePoolGetInfo(pool, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3672,6 +3719,7 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStorageVolGetInfo(pool, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3711,6 +3759,7 @@ libvirt_virStorageVolGetInfoFlags(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStorageVolGetInfoFlags(pool, &info, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3747,6 +3796,7 @@ libvirt_virStoragePoolGetUUID(PyObject *self ATTRIBUTE_UNUSED, if (pool == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStoragePoolGetUUID(pool, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -3773,6 +3823,7 @@ libvirt_virStoragePoolGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, if (pool == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStoragePoolGetUUIDString(pool, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -3829,6 +3880,7 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeNumOfDevices(conn, cap, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3887,6 +3939,7 @@ libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListAllNodeDevices(conn, &devices, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -3931,15 +3984,18 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeDeviceNumOfCaps(dev); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeDeviceListCaps(dev, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -3981,6 +4037,7 @@ libvirt_virSecretGetUUID(PyObject *self ATTRIBUTE_UNUSED, if (secret == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virSecretGetUUID(secret, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -4007,6 +4064,7 @@ libvirt_virSecretGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, if (dom == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virSecretGetUUIDString(dom, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -4061,15 +4119,18 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfSecrets(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; if (c_retval) { if (VIR_ALLOC_N(uuids, c_retval) < 0) return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListSecrets(conn, uuids, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -4118,6 +4179,7 @@ libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListAllSecrets(conn, &secrets, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -4213,6 +4275,7 @@ libvirt_virNWFilterGetUUID(PyObject *self ATTRIBUTE_UNUSED, if (nwfilter == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNWFilterGetUUID(nwfilter, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; @@ -4239,6 +4302,7 @@ libvirt_virNWFilterGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, if (nwfilter == NULL) return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNWFilterGetUUIDString(nwfilter, &uuidstr[0]); LIBVIRT_END_ALLOW_THREADS; @@ -4294,6 +4358,7 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfNWFilters(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -4304,6 +4369,7 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListNWFilters(conn, uuids, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -4351,6 +4417,7 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListAllNWFilters(conn, &filters, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -4397,6 +4464,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfInterfaces(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -4407,6 +4475,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListInterfaces(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -4454,6 +4523,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectNumOfDefinedInterfaces(conn); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -4464,6 +4534,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedInterfaces(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { py_retval = VIR_PY_NONE; goto cleanup; @@ -4513,6 +4584,7 @@ libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListAllInterfaces(conn, &ifaces, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -4610,6 +4682,7 @@ libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetJobInfo(domain, &info); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) return VIR_PY_NONE; @@ -4670,6 +4743,7 @@ libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; rc = virDomainGetJobStats(domain, &type, &params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (rc < 0) return VIR_PY_NONE; @@ -5147,11 +5221,9 @@ libvirt_virConnectDomainEventRegister(ATTRIBUTE_UNUSED PyObject *self, Py_INCREF(pyobj_conn_inst); LIBVIRT_BEGIN_ALLOW_THREADS; - ret = virConnectDomainEventRegister(conn, libvirt_virConnectDomainEventCallback, pyobj_conn_inst, NULL); - LIBVIRT_END_ALLOW_THREADS; return libvirt_intWrap(ret); @@ -5176,9 +5248,7 @@ libvirt_virConnectDomainEventDeregister(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - ret = virConnectDomainEventDeregister(conn, libvirt_virConnectDomainEventCallback); - LIBVIRT_END_ALLOW_THREADS; Py_DECREF(pyobj_conn_inst); @@ -5464,18 +5534,16 @@ libvirt_virEventRegisterImpl(PyObject *self ATTRIBUTE_UNUSED, Py_INCREF(updateTimeoutObj); Py_INCREF(removeTimeoutObj); - LIBVIRT_BEGIN_ALLOW_THREADS; - /* Now register our C EventImpl, which will dispatch * to the Python callbacks passed in as args. */ + LIBVIRT_BEGIN_ALLOW_THREADS; virEventRegisterImpl(libvirt_virEventAddHandleFunc, libvirt_virEventUpdateHandleFunc, libvirt_virEventRemoveHandleFunc, libvirt_virEventAddTimeoutFunc, libvirt_virEventUpdateTimeoutFunc, libvirt_virEventRemoveTimeoutFunc); - LIBVIRT_END_ALLOW_THREADS; return VIR_PY_INT_SUCCESS; @@ -7155,9 +7223,7 @@ libvirt_virConnectDomainEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - ret = virConnectDomainEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; return libvirt_intWrap(ret); @@ -7299,9 +7365,7 @@ libvirt_virConnectNetworkEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - ret = virConnectNetworkEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; return libvirt_intWrap(ret); @@ -7397,10 +7461,8 @@ libvirt_virConnectUnregisterCloseCallback(PyObject * self ATTRIBUTE_UNUSED, conn = PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - ret = virConnectUnregisterCloseCallback(conn, libvirt_virConnectCloseCallbackDispatch); - LIBVIRT_END_ALLOW_THREADS; return libvirt_intWrap(ret); @@ -8036,6 +8098,7 @@ libvirt_virDomainCreateWithFiles(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainCreateWithFiles(domain, nfiles, files, flags); LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap((int) c_retval); cleanup: @@ -8084,6 +8147,7 @@ libvirt_virDomainCreateXMLWithFiles(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainCreateXMLWithFiles(conn, xmlDesc, nfiles, files, flags); LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_virDomainPtrWrap((virDomainPtr) c_retval); cleanup: @@ -8772,6 +8836,7 @@ libvirt_virDomainGetPerfEvents(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; rc = virDomainGetPerfEvents(domain, &params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (rc < 0) return VIR_PY_NONE; @@ -9040,9 +9105,7 @@ libvirt_virConnectStoragePoolEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - ret = virConnectStoragePoolEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; return libvirt_intWrap(ret); @@ -9275,9 +9338,7 @@ libvirt_virConnectNodeDeviceEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - ret = virConnectNodeDeviceEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; return libvirt_intWrap(ret); @@ -9475,9 +9536,7 @@ libvirt_virConnectSecretEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - ret = virConnectSecretEventDeregisterAny(conn, callbackID); - LIBVIRT_END_ALLOW_THREADS; return libvirt_intWrap(ret); -- 2.9.5

2 1

[libvirt] libvirt-python can't be installed in wondows
by Zhu, Fei (NSB - CN/Nanjing) 29 Sep '17

29 Sep '17

Hi, all I'm interesting in libvirt-python and ready to install this package. It seems it only can be installed in Linux and can't be installed in Windows. Is it true? thanks

1 0

[libvirt] RFC: Detaching interface from guest fails with improper error message if no mac given in xml
by Madhu Pavan 29 Sep '17

29 Sep '17

This RFC is regarding https://bugzilla.redhat.com/show_bug.cgi?id=1497054 Let's say we have a network interface <interface type='network'> <mac address='52:54:00:fe:10:57'/> <source network='vfnetwork'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> </interface> and we are trying to detach the above interface with the following xml(vfpool.xml): <interface type='network'> <source network='vfnetwork'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> </interface> Detaching the interface returns error: # virsh detach-device vffuest vfpool.xml error: Failed to detach device from vfpool.xml error: operation failed: no device matching mac address 52:54:00:54:f6:61 found Here the mac address is auto-generated as we haven't given in the vfpool.xml. And virDomainNetFindIdx will try to match the auto-generated mac address with the domain xml. It fails as there will be no match and the error message says "no device matching mac address 52:54:00:54:f6:61 found". Here in this scenario I see two possible improvements. 1. As virDomainNetFindIdx search according to mac address and guest side PCI address (if specified), we can search for PCI address and avoid mac address search if mac is not given in the xml. As the PCI address is unique we don't compromise in performance. 2. Improve error message by saying mac address is missing in the device xml.

3 4

[libvirt] [PATCH go-xml] Add support for memory device element
by zhenwei.pi 29 Sep '17

29 Sep '17

Support model, access and target. Add Marshal/Unmarshal mothed for memory device. Add test code for device list in full domain. Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 29 +++++++++++++++++++++++++++++ domain_test.go | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/domain.go b/domain.go index 8c2cc1b..bacab11 100644 --- a/domain.go +++ b/domain.go @@ -436,6 +436,22 @@ type DomainHostdev struct { Address *DomainAddress `xml:"address"` } +type DomainMemorydevTargetNode struct { + Value uint `xml:",chardata"` +} + +type DomainMemorydevTarget struct { + Size *DomainMemory `xml:"size"` + Node *DomainMemorydevTargetNode `xml:"node"` +} + +type DomainMemorydev struct { + XMLName xml.Name `xml:"memory"` + Model string `xml:"model,attr"` + Access string `xml:"access,attr"` + Target *DomainMemorydevTarget `xml:"target"` +} + type DomainDeviceList struct { Emulator string `xml:"emulator,omitempty"` Controllers []DomainController `xml:"controller"` @@ -452,6 +468,7 @@ type DomainDeviceList struct { Sounds []DomainSound `xml:"sound"` RNGs []DomainRNG `xml:"rng"` Hostdevs []DomainHostdev `xml:"hostdev"` + Memorydevs []DomainMemorydev `xml:"memory"` } type DomainMemory struct { @@ -915,6 +932,18 @@ func (d *DomainHostdev) Marshal() (string, error) { return string(doc), nil } +func (d *DomainMemorydev) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), d) +} + +func (d *DomainMemorydev) Marshal() (string, error) { + doc, err := xml.MarshalIndent(d, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} + type HexUint uint func (h *HexUint) UnmarshalXMLAttr(attr xml.Attr) error { diff --git a/domain_test.go b/domain_test.go index 4fe6bfe..dbebe42 100644 --- a/domain_test.go +++ b/domain_test.go @@ -372,6 +372,21 @@ var domainTestData = []struct { }, }, }, + Memorydevs: []DomainMemorydev{ + DomainMemorydev{ + Model: "dimm", + Access: "private", + Target: &DomainMemorydevTarget{ + Size: &DomainMemory{ + Value: 1, + Unit: "GiB", + }, + Node: &DomainMemorydevTargetNode{ + Value: 0, + }, + }, + }, + }, }, }, Expected: []string{ @@ -414,6 +429,12 @@ var domainTestData = []struct { ` <source mode="connect" service="1234" host="1.2.3.4"></source>`, ` </backend>`, ` </rng>`, + ` <memory model="dimm" access="private">`, + ` <target>`, + ` <size unit="GiB">1</size>`, + ` <node>0</node>`, + ` </target>`, + ` </memory>`, ` </devices>`, `</domain>`, }, @@ -1630,6 +1651,30 @@ var domainTestData = []struct { `</hostdev>`, }, }, + { + Object: &DomainMemorydev{ + Model: "dimm", + Access: "private", + Target: &DomainMemorydevTarget{ + Size: &DomainMemory{ + Value: 1, + Unit: "GiB", + }, + Node: &DomainMemorydevTargetNode{ + Value: 0, + }, + }, + }, + + Expected: []string{ + `<memory model="dimm" access="private">`, + ` <target>`, + ` <size unit="GiB">1</size>`, + ` <node>0</node>`, + ` </target>`, + `</memory>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.7.4

1 0

[libvirt] Plans for next release
by Daniel Veillard 28 Sep '17

28 Sep '17

I'm a bit late, again ... I think we should enter freeze late today, then I can make an rc2 this week end and shoot for a release on the 3rd I hope there is no issue with this, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH] Fix vxhs test to have stable certificate dir
by Daniel P. Berrange 28 Sep '17

28 Sep '17

The test suite has hardcoded /etc/pki/qemu as the cert dir, but this only works if configure has --sysconfdir=/etc passed. We must set the vxhs cert dir to a stable path in the test suite. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix .../qemuxml2argv-disk-drive-network-tlsx509-vxhs.args | 4 ++-- tests/qemuxml2argvtest.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args index 572c9f36c..a75272454 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args @@ -20,7 +20,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --object tls-creds-x509,id=objvirtio-disk0_tls0,dir=/etc/pki/qemu,\ +-object tls-creds-x509,id=objvirtio-disk0_tls0,dir=/etc/pki/libvirt-vxhs,\ endpoint=client,verify-peer=yes \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,file.server.type=tcp,\ @@ -28,7 +28,7 @@ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ id=drive-virtio-disk0,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/qemu,\ +-object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs,\ endpoint=client,verify-peer=yes \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,file.server.type=tcp,\ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1958ad428..7271ea07e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -599,6 +599,9 @@ mymain(void) VIR_FREE(driver.config->chardevTLSx509certdir); if (VIR_STRDUP_QUIET(driver.config->chardevTLSx509certdir, "/etc/pki/libvirt-chardev") < 0) return EXIT_FAILURE; + VIR_FREE(driver.config->vxhsTLSx509certdir); + if (VIR_STRDUP_QUIET(driver.config->vxhsTLSx509certdir, "/etc/pki/libvirt-vxhs") < 0) + return EXIT_FAILURE; VIR_FREE(driver.config->hugetlbfs); if (VIR_ALLOC_N(driver.config->hugetlbfs, 2) < 0) -- 2.13.5

1 0

[libvirt] [PATCH v10 0/5] Add support for Veritas HyperScale (VxHS) block device protocol
by John Ferlan 28 Sep '17

28 Sep '17

v9: https://www.redhat.com/archives/libvir-list/2017-September/msg00641.html Differences to v9: * Patch 1: - Clean up the wording from code review * Patch 2: (NEW) - Split out the formatting change for source/prototcol * Patch 3: - Add the parsing of the tlsFromConfig for storage source - this just follows what chardev has done. * Patch 4: - Remove the src->tlsListen * Patch 5: - Remove the validation (from code review) - Remove the comments in qemuDomainAddDiskSrcTLSObject - Merge the -multi- test into the existing test - it was easier than removing the existing and the using -multi- Ashish Mittal (3): conf: Introduce TLS options for VxHS block device clients util: Add TLS attributes to virStorageSource qemu: Add TLS support for Veritas HyperScale (VxHS) John Ferlan (2): docs: Clean up the description for network disk protocol options qemu: Introduce qemuDomainPrepareDiskSource docs/formatdomain.html.in | 40 +++++++++--- docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 64 +++++++++++++++---- src/conf/domain_conf.h | 3 +- src/conf/snapshot_conf.c | 7 ++- src/qemu/libvirtd_qemu.aug | 4 ++ src/qemu/qemu.conf | 34 ++++++++++ src/qemu/qemu_block.c | 2 + src/qemu/qemu_command.c | 33 ++++++++++ src/qemu/qemu_conf.c | 16 +++++ src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 73 ++++++++++++++++++++++ src/qemu/qemu_domain.h | 11 ++++ src/qemu/qemu_hotplug.c | 73 ++++++++++++++++++++++ src/qemu/qemu_process.c | 4 ++ src/qemu/test_libvirtd_qemu.aug.in | 2 + src/util/virstoragefile.c | 10 ++- src/util/virstoragefile.h | 14 +++++ ...muxml2argv-disk-drive-network-tlsx509-vxhs.args | 43 +++++++++++++ ...emuxml2argv-disk-drive-network-tlsx509-vxhs.xml | 50 +++++++++++++++ tests/qemuxml2argvtest.c | 5 ++ ...uxml2xmlout-disk-drive-network-tlsx509-vxhs.xml | 52 +++++++++++++++ tests/qemuxml2xmltest.c | 1 + 23 files changed, 523 insertions(+), 26 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-tlsx509-vxhs.xml -- 2.13.5

3 13

Re: [libvirt] [Qemu-devel] [PATCH 1/2] vl: Eliminate defconfig variable
by Eduardo Habkost 28 Sep '17

28 Sep '17

(CCing libvir-list) On Thu, Sep 28, 2017 at 12:42:02PM +0100, Daniel P. Berrange wrote: > On Wed, Sep 27, 2017 at 05:32:24PM -0300, Eduardo Habkost wrote: > > Both -nodefconfig and -no-user-config options do the same thing > > today, we only need one variable to keep track of them. > > What reason for picking -nodefconfig instead of -no-user-config to > deprecate ? -nodefconfig predates -no-user-config by a few years, > and is what libvirt has historically used. So from libvirt POV > we'd have a slight preference to deprecate -no-user-config instead > and keep -nodefconfig, simply to avoid need to add conditional > logic to libvirt to pick which to use. libvirt already prefers -no-user-config, which is the right thing for libvirt because it needs a mechanism to disable user-provided configuration only, not QEMU-provided data files (in case they exist). In other words, we have an important use case for the -no-user-config semantics in libvirt, and I am not aware of any existing user of the -nodefconfig semantics. (For the record, I think the existing documented -nodefconfig semantics is awful and useless, but that's the one we got. Old discussions about this can be seen at: https://www.mail-archive.com/libvir-list@redhat.com/msg53083.html ) > > > > > Suggested-by: Markus Armbruster <armbru(a)redhat.com> > > Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> > > --- > > vl.c | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/vl.c b/vl.c > > index 4fd01fda91..b347a97a5b 100644 > > --- a/vl.c > > +++ b/vl.c > > @@ -3093,7 +3093,6 @@ int main(int argc, char **argv, char **envp) > > const char *qtest_log = NULL; > > const char *pid_file = NULL; > > const char *incoming = NULL; > > - bool defconfig = true; > > bool userconfig = true; > > bool nographic = false; > > DisplayType display_type = DT_DEFAULT; > > @@ -3194,8 +3193,6 @@ int main(int argc, char **argv, char **envp) > > popt = lookup_opt(argc, argv, &optarg, &optind); > > switch (popt->index) { > > case QEMU_OPTION_nodefconfig: > > - defconfig = false; > > - break; > > case QEMU_OPTION_nouserconfig: > > userconfig = false; > > break; > > @@ -3203,7 +3200,7 @@ int main(int argc, char **argv, char **envp) > > } > > } > > > > - if (defconfig && userconfig) { > > + if (userconfig) { > > if (qemu_read_default_config_file() < 0) { > > exit(1); > > } > > -- > > 2.13.5 > > > > > > Regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| -- Eduardo

1 0

[libvirt] [PATCH] nwfilter: Fix possible segfault on sometimes consumed variable
by John Ferlan 28 Sep '17

28 Sep '17

The virNWFilterIPAddrMapAddIPAddr code can consume the @addr parameter on success when the @ifname is found in the ipAddressMap->hashTable hash table in the call to virNWFilterVarValueAddValue; however, if not found in the hash table, then @addr is formatted into a @val which is stored in the table and on return the caller would be expected to free @addr. Thus, the caller has no way to determine on success whether @addr was consumed, so in order to fix this create a @tmp variable which will be stored/consumed when virNWFilterVarValueAddValue succeeds. That way the caller can free @addr whether the function returns success or failure. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/conf/nwfilter_ipaddrmap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index 9c8584ce2..5668f366d 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -26,7 +26,9 @@ #include "internal.h" +#include "viralloc.h" #include "virerror.h" +#include "virstring.h" #include "datatypes.h" #include "nwfilter_params.h" #include "nwfilter_ipaddrmap.h" @@ -52,6 +54,7 @@ virNWFilterIPAddrMapAddIPAddr(const char *ifname, char *addr) { int ret = -1; virNWFilterVarValuePtr val; + char *tmp = NULL; virMutexLock(&ipAddressMapLock); @@ -65,14 +68,18 @@ virNWFilterIPAddrMapAddIPAddr(const char *ifname, char *addr) virNWFilterVarValueFree(val); goto cleanup; } else { - if (virNWFilterVarValueAddValue(val, addr) < 0) + if (VIR_STRDUP(tmp, addr) < 0) goto cleanup; + if (virNWFilterVarValueAddValue(val, tmp) < 0) + goto cleanup; + tmp = NULL; } ret = 0; cleanup: virMutexUnlock(&ipAddressMapLock); + VIR_FREE(tmp); return ret; } -- 2.13.5

2 1

[libvirt] [PATCH] qemu: add the print of page size in cmd domjobinfo
by Chao Fan 28 Sep '17

28 Sep '17

The command "info migrate" of qemu outputs the dirty-pages-rate during migration, but page size is different in different architectures. So page size should be output to calculate dirty pages in bytes. Page size is already implemented with commit 030ce1f8612215fcbe9d353dfeaeb2937f8e3f94 in qemu. Now Implement the counter-part in libvirt. Signed-off-by: Chao Fan <fanc.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt-domain.h | 10 +++++++++- src/qemu/qemu_domain.c | 5 +++++ src/qemu/qemu_migration_cookie.c | 7 +++++++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 2 ++ tools/virsh-domain.c | 8 ++++++++ 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 030a62c43..b05c9d762 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -3327,7 +3327,8 @@ typedef enum { */ # define VIR_DOMAIN_JOB_MEMORY_BPS "memory_bps" -/** VIR_DOMAIN_JOB_MEMORY_DIRTY_RATE: +/** + * VIR_DOMAIN_JOB_MEMORY_DIRTY_RATE: * * virDomainGetJobStats field: number of memory pages dirtied by the guest * per second, as VIR_TYPED_PARAM_ULLONG. This statistics makes sense only @@ -3336,6 +3337,13 @@ typedef enum { # define VIR_DOMAIN_JOB_MEMORY_DIRTY_RATE "memory_dirty_rate" /** + * VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE: + * + * virDomainGetJobStats field: page size of the memory in this domian + */ +# define VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE "page_size" + +/** * VIR_DOMAIN_JOB_MEMORY_ITERATION: * * virDomainGetJobStats field: current iteration over domain's memory diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cb371f1e8..9194e70f8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -571,6 +571,11 @@ qemuDomainJobInfoToParams(qemuDomainJobInfoPtr jobInfo, goto error; if (virTypedParamsAddULLong(&par, &npar, &maxpar, + VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE, + stats->ram_page_size) < 0) + goto error; + + if (virTypedParamsAddULLong(&par, &npar, &maxpar, VIR_DOMAIN_JOB_DISK_TOTAL, stats->disk_total + mirrorStats->total) < 0 || diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index eef40a6cd..bc6a8dc55 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -654,6 +654,10 @@ qemuMigrationCookieStatisticsXMLFormat(virBufferPtr buf, stats->ram_iteration); virBufferAsprintf(buf, "<%1$s>%2$llu</%1$s>\n", + VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE, + stats->ram_page_size); + + virBufferAsprintf(buf, "<%1$s>%2$llu</%1$s>\n", VIR_DOMAIN_JOB_DISK_TOTAL, stats->disk_total); virBufferAsprintf(buf, "<%1$s>%2$llu</%1$s>\n", @@ -1014,6 +1018,9 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) virXPathULongLong("string(./" VIR_DOMAIN_JOB_MEMORY_ITERATION "[1])", ctxt, &stats->ram_iteration); + virXPathULongLong("string(./" VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE "[1])", + ctxt, &stats->ram_page_size); + virXPathULongLong("string(./" VIR_DOMAIN_JOB_DISK_TOTAL "[1])", ctxt, &stats->disk_total); virXPathULongLong("string(./" VIR_DOMAIN_JOB_DISK_PROCESSED "[1])", diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 6414d2483..1e3322433 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -677,6 +677,7 @@ struct _qemuMonitorMigrationStats { unsigned long long ram_normal; unsigned long long ram_normal_bytes; unsigned long long ram_dirty_rate; + unsigned long long ram_page_size; unsigned long long ram_iteration; unsigned long long disk_transferred; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 63b855920..625cbc134 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2892,6 +2892,8 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, &stats->ram_normal_bytes)); ignore_value(virJSONValueObjectGetNumberUlong(ram, "dirty-pages-rate", &stats->ram_dirty_rate)); + ignore_value(virJSONValueObjectGetNumberUlong(ram, "page-size", + &stats->ram_page_size)); ignore_value(virJSONValueObjectGetNumberUlong(ram, "dirty-sync-count", &stats->ram_iteration)); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a3f3b7c7b..a50713d6e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6021,6 +6021,14 @@ cmdDomjobinfo(vshControl *ctl, const vshCmd *cmd) } if ((rc = virTypedParamsGetULLong(params, nparams, + VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE, + &value)) < 0) { + goto save_error; + } else if (rc) { + vshPrint(ctl, "%-17s %-12llu bytes\n", _("Page size:"), value); + } + + if ((rc = virTypedParamsGetULLong(params, nparams, VIR_DOMAIN_JOB_MEMORY_ITERATION, &value)) < 0) { goto save_error; -- 2.13.5

2 2

[libvirt] [PATCH] rpc: for messages with FDs always decode count of FDs from the message
by Pavel Hrdina 27 Sep '17

27 Sep '17

The packet with passed FD has the following format: -------------------------- | len | header | payload | -------------------------- where "payload" has an additional count of FDs before the actual data: ------------------ | nfds | payload | ------------------ When the packet is received we parse the "header", which as a side effect updates msg->bufferOffset to point to the beginning of "payload". If the message call contains FDs, we need to also parse the count of FDs, which also updates the msg->bufferOffset. The issue here is that when we attempt to read the FDs data from the socket and we receive EAGAIN we finish the reading and call poll() to wait for the data the we need. When the data arrives we already have the packet in our buffer so we read the "header" again but this time we don't read the count of FDs because we already have it stored. That means that the msg->bufferOffset is not updated to point to the actual beginning of the payload data, but it points to the count of FDs. After all FDs are processed we dispatch the message to process it and decode the payload. Since the msg->bufferOffset points to wrong data, we decode the wrong payload and the API call fails with error messages: Domain not found: no domain with matching uuid '67656e65-7269-6300-0c87-5003ca6941f2' () Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/rpc/virnetclient.c | 3 +-- src/rpc/virnetmessage.c | 12 +++++++----- src/rpc/virnetserverclient.c | 3 +-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 95cd9a6c7e..eb46e34301 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1428,8 +1428,7 @@ virNetClientIOHandleInput(virNetClientPtr client) if (client->msg.header.type == VIR_NET_REPLY_WITH_FDS) { size_t i; - if (client->msg.nfds == 0 && - virNetMessageDecodeNumFDs(&client->msg) < 0) + if (virNetMessageDecodeNumFDs(&client->msg) < 0) return -1; for (i = client->msg.donefds; i < client->msg.nfds; i++) { diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 5908b074a8..94c4c89e4f 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -327,11 +327,13 @@ int virNetMessageDecodeNumFDs(virNetMessagePtr msg) goto cleanup; } - msg->nfds = numFDs; - if (VIR_ALLOC_N(msg->fds, msg->nfds) < 0) - goto cleanup; - for (i = 0; i < msg->nfds; i++) - msg->fds[i] = -1; + if (msg->nfds == 0) { + msg->nfds = numFDs; + if (VIR_ALLOC_N(msg->fds, msg->nfds) < 0) + goto cleanup; + for (i = 0; i < msg->nfds; i++) + msg->fds[i] = -1; + } VIR_DEBUG("Got %zu FDs from peer", msg->nfds); diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index fa4e5daabb..6e086b7b4e 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1189,8 +1189,7 @@ static void virNetServerClientDispatchRead(virNetServerClientPtr client) /* Now figure out if we need to read more data to get some * file descriptors */ if (msg->header.type == VIR_NET_CALL_WITH_FDS) { - if (msg->nfds == 0 && - virNetMessageDecodeNumFDs(msg) < 0) { + if (virNetMessageDecodeNumFDs(msg) < 0) { virNetMessageQueueServe(&client->rx); virNetMessageFree(msg); client->wantClose = true; -- 2.13.5

2 2

[libvirt] [PATCH] virsh: Add/allow secret-uuid for pool-{define|create}-as
by John Ferlan 27 Sep '17

27 Sep '17

https://bugzilla.redhat.com/show_bug.cgi?id=1476775 For the virsh pool-{define|create}-as command, let's allow using --secret-uuid on the command line as an alternative to --secret-usage, but ensure that they are mutually exclusive. Not sure why I neglected to add it for commit id '8932580' Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh-pool.c | 16 +++++++++++++--- tools/virsh.pod | 9 ++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index ba9281f..03eae94 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -109,6 +109,10 @@ .type = VSH_OT_STRING, \ .help = N_("auth secret usage to be used for underlying storage") \ }, \ + {.name = "secret-uuid", \ + .type = VSH_OT_STRING, \ + .help = N_("auth secret UUID to be used for underlying storage") \ + }, \ {.name = "adapter-name", \ .type = VSH_OT_STRING, \ .help = N_("adapter name to be used for underlying storage") \ @@ -302,9 +306,11 @@ virshBuildPoolXML(vshControl *ctl, *srcDev = NULL, *srcName = NULL, *srcFormat = NULL, *target = NULL, *authType = NULL, *authUsername = NULL, *secretUsage = NULL, *adapterName = NULL, *adapterParent = NULL, - *adapterWwnn = NULL, *adapterWwpn = NULL; + *adapterWwnn = NULL, *adapterWwpn = NULL, *secretUUID = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + VSH_EXCLUSIVE_OPTIONS("secret-usage", "secret-uuid"); + if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) goto cleanup; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) @@ -319,6 +325,7 @@ virshBuildPoolXML(vshControl *ctl, vshCommandOptStringReq(ctl, cmd, "auth-type", &authType) < 0 || vshCommandOptStringReq(ctl, cmd, "auth-username", &authUsername) < 0 || vshCommandOptStringReq(ctl, cmd, "secret-usage", &secretUsage) < 0 || + vshCommandOptStringReq(ctl, cmd, "secret-uuid", &secretUUID) < 0 || vshCommandOptStringReq(ctl, cmd, "adapter-name", &adapterName) < 0 || vshCommandOptStringReq(ctl, cmd, "adapter-wwnn", &adapterWwnn) < 0 || vshCommandOptStringReq(ctl, cmd, "adapter-wwpn", &adapterWwpn) < 0 || @@ -349,11 +356,14 @@ virshBuildPoolXML(vshControl *ctl, virBufferAsprintf(&buf, "<adapter type='scsi_host' name='%s'/>\n", adapterName); } - if (authType && authUsername && secretUsage) { + if (authType && authUsername && (secretUsage || secretUUID)) { virBufferAsprintf(&buf, "<auth type='%s' username='%s'>\n", authType, authUsername); virBufferAdjustIndent(&buf, 2); - virBufferAsprintf(&buf, "<secret usage='%s'/>\n", secretUsage); + if (secretUsage) + virBufferAsprintf(&buf, "<secret usage='%s'/>\n", secretUsage); + else + virBufferAsprintf(&buf, "<secret uuid='%s'/>\n", secretUUID); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</auth>\n"); } diff --git a/tools/virsh.pod b/tools/virsh.pod index c13f96f..bf5a124 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3673,7 +3673,8 @@ just I<--build> is provided, then B<pool-build> is called with no flags. =item B<pool-create-as> I<name> I<type> [I<--source-host hostname>] [I<--source-path path>] [I<--source-dev path>] [I<--source-name name>] [I<--target path>] [I<--source-format format>] -[I<--auth-type authtype> I<--auth-username username> I<--secret-usage usage>] +[I<--auth-type authtype> I<--auth-username username> +[I<--secret-usage usage> | I<--secret-uuid uuid>]] [[I<--adapter-name name>] | [I<--adapter-wwnn> I<--adapter-wwpn>] [I<--adapter-parent parent>]] [I<--build>] [[I<--overwrite>] | [I<--no-overwrite>]] [I<--print-xml>] @@ -3707,10 +3708,12 @@ the host file system. [I<--source-format format>] provides information about the format of the pool (pool types fs, netfs, disk, logical). -[I<--auth-type authtype> I<--auth-username username> I<--secret-usage usage>] +[I<--auth-type authtype> I<--auth-username username> +[I<--secret-usage usage> | I<--secret-uuid uuid>]] provides the elements required to generate authentication credentials for the storage pool. The I<authtype> is either chap for iscsi I<type> pools or -ceph for rbd I<type> pools. +ceph for rbd I<type> pools. Either the secret I<usage> or I<uuid> value may +be provided, but not both. [I<--adapter-name name>] defines the scsi_hostN adapter name to be used for the scsi_host adapter type pool. -- 2.9.5

2 3

[libvirt] [PATCH v9 0/4] Add support for Veritas HyperScale (VxHS) block device protocol
by John Ferlan 27 Sep '17

27 Sep '17

v8: https://www.redhat.com/archives/libvir-list/2017-September/msg00375.html Changes since v8 * Patches 1-6 patches, everything else deals with TLS. * Patches 7-8 - no change, now patch 1-2. Didn't push since they're related to these changes * Patch 9 - Old patch Was ACK'd, new patch is 3. Old patch11 review caused me to add more fields to _virStorageSource to pepare "tlsCertdir", "tlsListen", and "tlsVerify" using the cfg field for certdir, but direct sets for listen and verify. * Patch 10 - dropped * Patch 11 - now patch 4. Alter the qemu_command.c and qemu_hotplug.c code to use the virStorageSource fields rather than from disk or cfg. Code makes more use of whether the "src->haveTLS == VIR_TRISTATE_BOOL_YES" is true rather then src->tlsAlias. Added qemuDomainDelDiskSrcTLSObject. Renamed/reworked the qemuDomainAddDiskSrcTLSObject. Looks cleaner to me... Ashish will post a patch separately to fix an issue found in qemuDomainGetTLSObjects when secAlias == NULL and the deref of *secAlias. Ashish Mittal (3): conf: Introduce TLS options for VxHS block device clients util: Add TLS attributes to virStorageSource qemu: Add TLS support for Veritas HyperScale (VxHS) John Ferlan (1): qemu: Introduce qemuDomainPrepareDiskSource docs/formatdomain.html.in | 40 ++++++++--- docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 29 +++++++- src/qemu/libvirtd_qemu.aug | 4 ++ src/qemu/qemu.conf | 34 ++++++++++ src/qemu/qemu_block.c | 8 +++ src/qemu/qemu_command.c | 33 +++++++++ src/qemu/qemu_conf.c | 16 +++++ src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 73 ++++++++++++++++++++ src/qemu/qemu_domain.h | 11 +++ src/qemu/qemu_hotplug.c | 79 ++++++++++++++++++++++ src/qemu/qemu_process.c | 4 ++ src/qemu/test_libvirtd_qemu.aug.in | 2 + src/util/virstoragefile.c | 11 ++- src/util/virstoragefile.h | 15 ++++ ...-disk-drive-network-tlsx509-multidisk-vxhs.args | 43 ++++++++++++ ...v-disk-drive-network-tlsx509-multidisk-vxhs.xml | 50 ++++++++++++++ ...muxml2argv-disk-drive-network-tlsx509-vxhs.args | 30 ++++++++ ...emuxml2argv-disk-drive-network-tlsx509-vxhs.xml | 32 +++++++++ tests/qemuxml2argvtest.c | 7 ++ ...uxml2xmlout-disk-drive-network-tlsx509-vxhs.xml | 34 ++++++++++ tests/qemuxml2xmltest.c | 1 + 23 files changed, 551 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-multidisk-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-multidisk-vxhs.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-tlsx509-vxhs.xml -- 2.13.5

3 18

[libvirt] [PATCH] qemu: domain: Extract common clearing of VM private data
by Peter Krempa 27 Sep '17

27 Sep '17

VM private data is cleared when the VM is turned off and also when the VM object is being freed. Some of the clearing code was duplicated. Extract it to a separate function. This also removes the now unnecessary function qemuDomainClearPrivatePaths. --- src/qemu/qemu_domain.c | 76 +++++++++++++++++++++++++++++++++---------------- src/qemu/qemu_domain.h | 4 +-- src/qemu/qemu_process.c | 36 ++--------------------- 3 files changed, 55 insertions(+), 61 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cb371f1e8..7cb2bfce1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1684,16 +1684,6 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, } -void -qemuDomainClearPrivatePaths(virDomainObjPtr vm) -{ - qemuDomainObjPrivatePtr priv = vm->privateData; - - VIR_FREE(priv->libDir); - VIR_FREE(priv->channelTargetDir); -} - - static void * qemuDomainObjPrivateAlloc(void *opaque) { @@ -1721,24 +1711,69 @@ qemuDomainObjPrivateAlloc(void *opaque) return NULL; } -static void -qemuDomainObjPrivateFree(void *data) +/** + * qemuDomainObjPrivateDataClear: + * @priv: domain private data + * + * Clears private data entries, which are not necessary or stale if the VM is + * not running. + */ +void +qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr priv) { - qemuDomainObjPrivatePtr priv = data; + virStringListFree(priv->qemuDevices); + priv->qemuDevices = NULL; + + virCgroupFree(&priv->cgroup); + + virPerfFree(priv->perf); + priv->perf = NULL; + + VIR_FREE(priv->machineName); virObjectUnref(priv->qemuCaps); + priv->qemuCaps = NULL; - virBitmapFree(priv->namespaces); + VIR_FREE(priv->pidfile); - virCgroupFree(&priv->cgroup); + VIR_FREE(priv->libDir); + VIR_FREE(priv->channelTargetDir); + + /* remove automatic pinning data */ + virBitmapFree(priv->autoNodeset); + priv->autoNodeset = NULL; + virBitmapFree(priv->autoCpuset); + priv->autoCpuset = NULL; + + /* remove address data */ virDomainPCIAddressSetFree(priv->pciaddrs); + priv->pciaddrs = NULL; virDomainUSBAddressSetFree(priv->usbaddrs); + priv->usbaddrs = NULL; + + /* clean up migration data */ + VIR_FREE(priv->migTLSAlias); + virCPUDefFree(priv->origCPU); + priv->origCPU = NULL; + + /* clear previously used namespaces */ + virBitmapFree(priv->namespaces); + priv->namespaces = NULL; +} + + +static void +qemuDomainObjPrivateFree(void *data) +{ + qemuDomainObjPrivatePtr priv = data; + + qemuDomainObjPrivateDataClear(priv); + virDomainChrSourceDefFree(priv->monConfig); qemuDomainObjFreeJob(priv); VIR_FREE(priv->lockState); VIR_FREE(priv->origname); - virStringListFree(priv->qemuDevices); virChrdevFree(priv->devs); /* This should never be non-NULL if we get here, but just in case... */ @@ -1751,19 +1786,10 @@ qemuDomainObjPrivateFree(void *data) qemuAgentClose(priv->agent); } VIR_FREE(priv->cleanupCallbacks); - virBitmapFree(priv->autoNodeset); - virBitmapFree(priv->autoCpuset); - - VIR_FREE(priv->machineName); - VIR_FREE(priv->libDir); - VIR_FREE(priv->channelTargetDir); qemuDomainSecretInfoFree(&priv->migSecinfo); - VIR_FREE(priv->migTLSAlias); qemuDomainMasterKeyFree(priv); - virCPUDefFree(priv->origCPU); - VIR_FREE(priv); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 09201b1a4..cdf94b2f6 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -676,6 +676,8 @@ void qemuDomainCleanupRemove(virDomainObjPtr vm, void qemuDomainCleanupRun(virQEMUDriverPtr driver, virDomainObjPtr vm); +void qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr priv); + extern virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks; extern virDomainXMLNamespace virQEMUDriverDomainXMLNamespace; extern virDomainDefParserConfig virQEMUDriverDomainDefParserConfig; @@ -783,8 +785,6 @@ int qemuDomainNetVLAN(virDomainNetDefPtr def); int qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, virDomainObjPtr vm); -void qemuDomainClearPrivatePaths(virDomainObjPtr vm); - virDomainDiskDefPtr qemuDomainDiskByName(virDomainDefPtr def, const char *name); char *qemuDomainGetMasterKeyFilePath(const char *libDir); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c104985aa..0a2493770 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6196,8 +6196,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, virFileDeleteTree(priv->libDir); virFileDeleteTree(priv->channelTargetDir); - qemuDomainClearPrivatePaths(vm); - ignore_value(virDomainChrDefForeach(vm->def, false, qemuProcessCleanupChardevDevice, @@ -6248,9 +6246,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, VIR_FREE(vm->def->seclabels[i]->imagelabel); } - virStringListFree(priv->qemuDevices); - priv->qemuDevices = NULL; - qemuHostdevReAttachDomainDevices(driver, vm->def); def = vm->def; @@ -6319,10 +6314,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, VIR_WARN("Failed to remove cgroup for %s", vm->def->name); } - virCgroupFree(&priv->cgroup); - - virPerfFree(priv->perf); - priv->perf = NULL; qemuProcessRemoveDomainStatus(driver, vm); @@ -6376,37 +6367,14 @@ void qemuProcessStop(virQEMUDriverPtr driver, } } - VIR_FREE(priv->machineName); - vm->taint = 0; vm->pid = -1; virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason); for (i = 0; i < vm->def->niothreadids; i++) vm->def->iothreadids[i]->thread_id = 0; - virObjectUnref(priv->qemuCaps); - priv->qemuCaps = NULL; - VIR_FREE(priv->pidfile); - /* remove automatic pinning data */ - virBitmapFree(priv->autoNodeset); - priv->autoNodeset = NULL; - virBitmapFree(priv->autoCpuset); - priv->autoCpuset = NULL; - - /* remove address data */ - virDomainPCIAddressSetFree(priv->pciaddrs); - priv->pciaddrs = NULL; - virDomainUSBAddressSetFree(priv->usbaddrs); - priv->usbaddrs = NULL; - - /* clean up migration data */ - VIR_FREE(priv->migTLSAlias); - virCPUDefFree(priv->origCPU); - priv->origCPU = NULL; - - /* clear previously used namespaces */ - virBitmapFree(priv->namespaces); - priv->namespaces = NULL; + /* clear all private data entries which are no longer needed */ + qemuDomainObjPrivateDataClear(priv); /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { -- 2.14.1

2 1

[libvirt] [PATCH python] Release the GIL during virDomainGetMemoryStats
by Nir Soffer 27 Sep '17

27 Sep '17

We discovered that the entire python process get stuck for about 30 seconds when calling virDomain.getMemoryStats() if libvirt is stuck in virConnect.getAllDomainStats() on inaccessible storage. This blocking cause a horrible mess in oVirt. This patches adds the standard *_ALLOW_THREADS around the call to avoid this unwanted blocking. Signed-off-by: Nir Soffer <nirsof(a)gmail.com> --- libvirt-override.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt-override.c b/libvirt-override.c index 9eba4ed..0e33afb 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -363,8 +363,11 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + LIBVIRT_BEGIN_ALLOW_THREADS; nr_stats = virDomainMemoryStats(domain, stats, VIR_DOMAIN_MEMORY_STAT_NR, 0); + LIBVIRT_END_ALLOW_THREADS; + if (nr_stats == -1) return VIR_PY_NONE; -- 2.9.5

2 2

[libvirt] [PATCH v3] nwfilter: Don't leak @inetaddr
by ZhiPeng Lu 27 Sep '17

27 Sep '17

In learnIPAddressThread()the @inetaddr may be leaked. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- src/nwfilter/nwfilter_learnipaddr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index cfd92d9..0cadf73 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -605,6 +605,7 @@ learnIPAddressThread(void *arg) if (req->status == 0) { int ret; + int mapipret = -1; virSocketAddr sa; sa.len = sizeof(sa.data.inet4); sa.data.inet4.sin_family = AF_INET; @@ -622,7 +623,7 @@ learnIPAddressThread(void *arg) virNWFilterUnlockIface(req->ifname); if ((inetaddr = virSocketAddrFormat(&sa)) != NULL) { - if (virNWFilterIPAddrMapAddIPAddr(req->ifname, inetaddr) < 0) { + if ((mapipret = virNWFilterIPAddrMapAddIPAddr(req->ifname, inetaddr)) < 0) { VIR_ERROR(_("Failed to add IP address %s to IP address " "cache for interface %s"), inetaddr, req->ifname); } @@ -637,6 +638,9 @@ learnIPAddressThread(void *arg) req->filterparams); VIR_DEBUG("Result from applying firewall rules on " "%s with IP addr %s : %d", req->ifname, inetaddr, ret); + if (mapipret < 0) + VIR_FREE(inetaddr); + } } else { if (showError) -- 1.8.3.1

3 3

[libvirt] [PATCH v2] nwfilter: Don't leak @inetaddr
by ZhiPeng Lu 27 Sep '17

27 Sep '17

In learnIPAddressThread()the @inetaddr may be leaked. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- src/nwfilter/nwfilter_learnipaddr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index cfd92d9..5dc212e 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -625,6 +625,7 @@ learnIPAddressThread(void *arg) if (virNWFilterIPAddrMapAddIPAddr(req->ifname, inetaddr) < 0) { VIR_ERROR(_("Failed to add IP address %s to IP address " "cache for interface %s"), inetaddr, req->ifname); + VIR_FREE(inetaddr); } ret = virNWFilterInstantiateFilterLate(req->driver, @@ -636,7 +637,8 @@ learnIPAddressThread(void *arg) req->filtername, req->filterparams); VIR_DEBUG("Result from applying firewall rules on " - "%s with IP addr %s : %d", req->ifname, inetaddr, ret); + "%s with IP addr %s : %d", req->ifname, NULLSTR(inetaddr), ret); + } } else { if (showError) -- 1.8.3.1

3 2

[libvirt] [PATCH] docs: Add the closing </address> tag for mdev example
by Erik Skultety 27 Sep '17

27 Sep '17

Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as trivial. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9ce4620c6..fce1f3b03 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4020,7 +4020,7 @@ <devices> <hostdev mode='subsystem' type='mdev' model='vfio-pci'> <source> - <address uuid='c2177883-f1bb-47f0-914d-32a22e3a8804'> + <address uuid='c2177883-f1bb-47f0-914d-32a22e3a8804'/> </source> </hostdev> </devices> -- 2.13.5

1 0

[libvirt] [PATCH 0/3] allocation fixes for virStorageFileResize
by Ján Tomko 27 Sep '17

27 Sep '17

This fixes the bug of treating volume allocation as an offset from the start of the file instead of a total of allocated bytes. The mysterious error message: "invalid argument: can't shrink capacity below existing allocation" is not addressed by this series Ján Tomko (3): use virFileAllocate in virStorageFileResize virStorageFileResize: fallocate the whole capacity Shrink volume even with ALLOCATE flag src/storage/storage_util.c | 3 +-- src/util/virfile.c | 11 +++++++++++ src/util/virfile.h | 2 ++ src/util/virstoragefile.c | 33 ++++++++++++++++----------------- src/util/virstoragefile.h | 1 - 5 files changed, 30 insertions(+), 20 deletions(-) -- 2.13.0

2 7

[libvirt] [PATCH go-xml] Add qemu udp unicast tunneling support
by Jeroen Simonetti 27 Sep '17

27 Sep '17

Signed-off-by: Jeroen Simonetti <jeroen(a)simonetti.nl> --- domain.go | 22 ++++++++++++++-------- domain_test.go | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 8 deletions(-) diff --git a/domain.go b/domain.go index 3ab54a1..805909f 100644 --- a/domain.go +++ b/domain.go @@ -178,16 +178,22 @@ type DomainInterfaceModel struct { } type DomainInterfaceSource struct { - Bridge string `xml:"bridge,attr,omitempty"` - Dev string `xml:"dev,attr,omitempty"` - Network string `xml:"network,attr,omitempty"` + Bridge string `xml:"bridge,attr,omitempty"` + Dev string `xml:"dev,attr,omitempty"` + Network string `xml:"network,attr,omitempty"` + Address string `xml:"address,attr,omitempty"` + Type string `xml:"type,attr,omitempty"` + Path string `xml:"path,attr,omitempty"` + Mode string `xml:"mode,attr,omitempty"` + Port uint `xml:"port,attr,omitempty"` + Service string `xml:"service,attr,omitempty"` + Host string `xml:"host,attr,omitempty"` + Local *DomainInterfaceSourceLocal `xml:"local"` +} + +type DomainInterfaceSourceLocal struct { Address string `xml:"address,attr,omitempty"` - Type string `xml:"type,attr,omitempty"` - Path string `xml:"path,attr,omitempty"` - Mode string `xml:"mode,attr,omitempty"` Port uint `xml:"port,attr,omitempty"` - Service string `xml:"service,attr,omitempty"` - Host string `xml:"host,attr,omitempty"` } type DomainInterfaceTarget struct { diff --git a/domain_test.go b/domain_test.go index 0ae9594..163661f 100644 --- a/domain_test.go +++ b/domain_test.go @@ -867,6 +867,47 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + Devices: &DomainDeviceList{ + Interfaces: []DomainInterface{ + DomainInterface{ + Type: "udp", + MAC: &DomainInterfaceMAC{ + Address: "52:54:00:39:97:ac", + }, + Model: &DomainInterfaceModel{ + Type: "virtio", + }, + Source: &DomainInterfaceSource{ + Address: "127.0.0.1", + Port: 1234, + Local: &DomainInterfaceSourceLocal{ + Address: "127.0.0.1", + Port: 1235, + }, + }, + }, + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <devices>`, + ` <interface type="udp">`, + ` <mac address="52:54:00:39:97:ac"></mac>`, + ` <model type="virtio"></model>`, + ` <source address="127.0.0.1" port="1234">`, + ` <local address="127.0.0.1" port="1235"></local>`, + ` </source>`, + ` </interface>`, + ` </devices>`, + `</domain>`, + }, + }, { Object: &Domain{ Type: "kvm", -- 2.14.1

2 1

[libvirt] [PATCH go-xml] 1, add memoryBacking for domain. 2, add hugepages, nosharepages, locked, source, access and allocation for memoryBacking. 3, add test case for memoryBacking.
by zhenwei.pi 27 Sep '17

27 Sep '17

Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 76 +++++++++++++++++++++++++++++++++++++++++++--------------- domain_test.go | 38 +++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 19 deletions(-) diff --git a/domain.go b/domain.go index d81ac2a..773a83e 100644 --- a/domain.go +++ b/domain.go @@ -459,6 +459,43 @@ type DomainMaxMemory struct { Slots uint `xml:"slots,attr,omitempty"` } +type DomainMemoryHugepage struct { + Size uint `xml:"size,attr"` + Unit string `xml:"unit,attr,omitempty"` + Nodeset string `xml:"nodeset,attr,omitempty"` +} + +type DomainMemoryHugepages struct { + Hugepages []DomainMemoryHugepage `xml:"page"` +} + +type DomainMemoryNosharepages struct { +} + +type DomainMemoryLocked struct { +} + +type DomainMemorySource struct { + Type string `xml:"type,attr,omitempty"` +} + +type DomainMemoryAccess struct { + Mode string `xml:"mode,attr,omitempty"` +} + +type DomainMemoryAllocation struct { + Mode string `xml:"mode,attr,omitempty"` +} + +type DomainMemoryBacking struct { + MemoryHugePages *DomainMemoryHugepages `xml:"hugepages"` + MemoryNosharepages *DomainMemoryNosharepages `xml:"nosharepages"` + MemoryLocked *DomainMemoryLocked `xml:"locked"` + MemorySource *DomainMemorySource `xml:"source"` + MemoryAccess *DomainMemoryAccess `xml:"access"` + MemoryAllocation *DomainMemoryAllocation `xml:"allocation"` +} + type DomainOSType struct { Arch string `xml:"arch,attr,omitempty"` Machine string `xml:"machine,attr,omitempty"` @@ -681,25 +718,26 @@ type DomainQEMUCommandline struct { // matching the order of XML elements that libvirt // will generate when dumping XML. type Domain struct { - XMLName xml.Name `xml:"domain"` - Type string `xml:"type,attr,omitempty"` - Name string `xml:"name"` - UUID string `xml:"uuid,omitempty"` - Memory *DomainMemory `xml:"memory"` - CurrentMemory *DomainMemory `xml:"currentMemory"` - MaximumMemory *DomainMaxMemory `xml:"maxMemory"` - VCPU *DomainVCPU `xml:"vcpu"` - VCPUs *DomainVCPUs `xml:"vcpus"` - Resource *DomainResource `xml:"resource"` - SysInfo *DomainSysInfo `xml:"sysinfo"` - OS *DomainOS `xml:"os"` - Features *DomainFeatureList `xml:"features"` - CPU *DomainCPU `xml:"cpu"` - Clock *DomainClock `xml:"clock,omitempty"` - OnPoweroff string `xml:"on_poweroff,omitempty"` - OnReboot string `xml:"on_reboot,omitempty"` - OnCrash string `xml:"on_crash,omitempty"` - Devices *DomainDeviceList `xml:"devices"` + XMLName xml.Name `xml:"domain"` + Type string `xml:"type,attr,omitempty"` + Name string `xml:"name"` + UUID string `xml:"uuid,omitempty"` + Memory *DomainMemory `xml:"memory"` + CurrentMemory *DomainMemory `xml:"currentMemory"` + MaximumMemory *DomainMaxMemory `xml:"maxMemory"` + MemoryBacking *DomainMemoryBacking `xml:"memoryBacking"` + VCPU *DomainVCPU `xml:"vcpu"` + VCPUs *DomainVCPUs `xml:"vcpus"` + Resource *DomainResource `xml:"resource"` + SysInfo *DomainSysInfo `xml:"sysinfo"` + OS *DomainOS `xml:"os"` + Features *DomainFeatureList `xml:"features"` + CPU *DomainCPU `xml:"cpu"` + Clock *DomainClock `xml:"clock,omitempty"` + OnPoweroff string `xml:"on_poweroff,omitempty"` + OnReboot string `xml:"on_reboot,omitempty"` + OnCrash string `xml:"on_crash,omitempty"` + Devices *DomainDeviceList `xml:"devices"` QEMUCommandline *DomainQEMUCommandline } diff --git a/domain_test.go b/domain_test.go index 3ff1dc1..51d413b 100644 --- a/domain_test.go +++ b/domain_test.go @@ -435,6 +435,33 @@ var domainTestData = []struct { Value: 16384, Slots: 2, }, + MemoryBacking: &DomainMemoryBacking{ + MemoryHugePages: &DomainMemoryHugepages{ + Hugepages: []DomainMemoryHugepage{ + { + Size: 1, + Unit: "G", + Nodeset: "0-3,5", + }, + { + Size: 2, + Unit: "M", + Nodeset: "4", + }, + }, + }, + MemoryNosharepages: &DomainMemoryNosharepages{}, + MemoryLocked: &DomainMemoryLocked{}, + MemorySource: &DomainMemorySource{ + Type: "file|anonymous", + }, + MemoryAccess: &DomainMemoryAccess{ + Mode: "shared|private", + }, + MemoryAllocation: &DomainMemoryAllocation{ + Mode: "immediate|ondemand", + }, + }, OS: &DomainOS{ Type: &DomainOSType{ Arch: "x86_64", @@ -532,6 +559,17 @@ var domainTestData = []struct { ` <memory unit="KiB">8192</memory>`, ` <currentMemory unit="KiB">4096</currentMemory>`, ` <maxMemory unit="KiB" slots="2">16384</maxMemory>`, + ` <memoryBacking>`, + ` <hugepages>`, + ` <page size="1" unit="G" nodeset="0-3,5"></page>`, + ` <page size="2" unit="M" nodeset="4"></page>`, + ` </hugepages>`, + ` <nosharepages></nosharepages>`, + ` <locked></locked>`, + ` <source type="file|anonymous"></source>`, + ` <access mode="shared|private"></access>`, + ` <allocation mode="immediate|ondemand"></allocation>`, + ` </memoryBacking>`, ` <sysinfo type="smbios">`, ` <system>`, ` <entry name="manufacturer">manufacturer</entry>`, -- 2.7.4

3 2

[libvirt] [PATCH] nwfilter: Don't leak @val
by ZhiPeng Lu 27 Sep '17

27 Sep '17

In virNWFilterIPAddrMapAddIPAddr the @val may be leaked. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- src/conf/nwfilter_ipaddrmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index 446f3de..5242f05 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -61,7 +61,10 @@ virNWFilterIPAddrMapAddIPAddr(const char *ifname, char *addr) if (!val) goto cleanup; ret = virNWFilterHashTablePut(ipAddressMap, ifname, val); - goto cleanup; + if (ret < 0) { + virNWFilterVarValueFree(val); + goto cleanup; + } } else { if (virNWFilterVarValueAddValue(val, addr) < 0) goto cleanup; -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: process: Refresh data from qemu monitor after migration
by Peter Krempa 27 Sep '17

27 Sep '17

Some values we read from the qemu monitor may be changed with the actual state by the incomming migration. This means that we should refresh certain things only after the migration has finished. This is mostly visible in the cdrom tray state, which is by default closed but may be opened by the guest OS. This would be refreshed before qemu transferred the actual state and thus libvirt would think that the tray is closed. Note that this patch moves only a few obvious query commands. Other may be moved later after individual assesment. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1463168 --- src/qemu/qemu_process.c | 59 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c104985aa..2be82e958 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5787,14 +5787,6 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessSetLinkStates(driver, vm, asyncJob) < 0) goto cleanup; - VIR_DEBUG("Fetching list of active devices"); - if (qemuDomainUpdateDeviceList(driver, vm, asyncJob) < 0) - goto cleanup; - - VIR_DEBUG("Updating info of memory devices"); - if (qemuDomainUpdateMemoryDeviceInfo(driver, vm, asyncJob) < 0) - goto cleanup; - VIR_DEBUG("Setting initial memory amount"); if (qemuProcessSetupBalloon(driver, vm, asyncJob) < 0) goto cleanup; @@ -5806,14 +5798,6 @@ qemuProcessLaunch(virConnectPtr conn, qemuProcessRefreshBalloonState(driver, vm, asyncJob) < 0) goto cleanup; - VIR_DEBUG("Detecting actual memory size for video device"); - if (qemuProcessUpdateVideoRamSize(driver, vm, asyncJob) < 0) - goto cleanup; - - VIR_DEBUG("Updating disk data"); - if (qemuProcessRefreshDisks(driver, vm, asyncJob) < 0) - goto cleanup; - if (flags & VIR_QEMU_PROCESS_START_AUTODESTROY && qemuProcessAutoDestroyAdd(driver, vm, conn) < 0) goto cleanup; @@ -5831,6 +5815,46 @@ qemuProcessLaunch(virConnectPtr conn, } +/** + * qemuProcessRefreshState: + * @driver: qemu driver data + * @vm: domain to refresh + * @asyncJob: async job type + * + * This function gathers calls to refresh qemu state after startup. This + * function is called after a deferred migration finishes so that we can update + * state influenced by the migration stream. + */ +static int +qemuProcessRefreshState(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob) +{ + int ret = -1; + + VIR_DEBUG("Fetching list of active devices"); + if (qemuDomainUpdateDeviceList(driver, vm, asyncJob) < 0) + goto cleanup; + + VIR_DEBUG("Updating info of memory devices"); + if (qemuDomainUpdateMemoryDeviceInfo(driver, vm, asyncJob) < 0) + goto cleanup; + + VIR_DEBUG("Detecting actual memory size for video device"); + if (qemuProcessUpdateVideoRamSize(driver, vm, asyncJob) < 0) + goto cleanup; + + VIR_DEBUG("Updating disk data"); + if (qemuProcessRefreshDisks(driver, vm, asyncJob) < 0) + goto cleanup; + + ret = 0; + + cleanup: + return ret; +} + + /** * qemuProcessFinishStartup: * @@ -5847,6 +5871,9 @@ qemuProcessFinishStartup(virConnectPtr conn, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; + if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) + goto cleanup; + if (startCPUs) { VIR_DEBUG("Starting domain CPUs"); if (qemuProcessStartCPUs(driver, vm, conn, -- 2.14.1

2 2

[libvirt] [PATCH v2 0/3] qemu: Watchdog plug/unplug
by Michal Privoznik 27 Sep '17

27 Sep '17

v2 of: https://www.redhat.com/archives/libvir-list/2017-September/msg00078.html diff to v1: - John's review worked in (mostly). - Added auditing (patch 1/3) Michal Privoznik (3): audit: Audit information about watchdog devices qemu: hot-plug of watchdog qemu: hot-unplug of watchdog src/conf/domain_audit.c | 46 ++++++++ src/conf/domain_audit.h | 5 + src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 13 ++- src/qemu/qemu_alias.h | 2 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 4 +- src/qemu/qemu_driver.c | 14 ++- src/qemu/qemu_hotplug.c | 129 +++++++++++++++++++++ src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_monitor.c | 12 ++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 27 +++++ src/qemu/qemu_monitor_json.h | 3 + tests/qemuhotplugtest.c | 14 ++- .../qemuhotplug-watchdog-full.xml | 3 + .../qemuhotplug-watchdog.xml | 1 + .../qemuhotplug-base-live+watchdog.xml | 55 +++++++++ 18 files changed, 333 insertions(+), 6 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-watchdog-full.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-watchdog.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml -- 2.13.5

2 8

Re: [libvirt] [PATCH v9 4/4] qemu: Add TLS support for Veritas HyperScale (VxHS)
by ashish mittal 27 Sep '17

27 Sep '17

Hi, I have done TLS testing with this patch series and the tests passed fine with the secAlias fix in place. (1) Applied all the v9 patches. (2) make install. Reload and restart the libvirtd daemon. (3) Make sure able to start guest with TLS enabled VxHS disk in the domain XML. (4) Try to hot-plug another TLS disk. libvirtd crashes. [root@audi libvirt] 2017-09-20 15:59:25# virsh attach-device myfc24 ../../hotplug_disk_1.xml error: Disconnected from qemu:///system due to end of file error: Failed to attach device from ../../hotplug_disk_1.xml error: End of file while reading data: Input/output error (5) Now add the secAlias patch [amittal2@audi libvirt] 2017-09-20 16:08:37$ git apply ~/20Sep2017_1/0001-Avoid-a-possible-NULL-pointer-dereference-in-qemuDom.patch [amittal2@audi libvirt] 2017-09-20 16:09:07$ git diff diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7751a60..bd96272 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1719,7 +1719,8 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps, } if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify, - *secAlias, qemuCaps, tlsProps) < 0) + secAlias ? *secAlias : NULL, qemuCaps, + tlsProps) < 0) return -1; if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(srcAlias))) [amittal2@audi libvirt] 2017-09-20 16:09:15$ (6) Run the new libvirtd [root@audi libvirt] 2017-09-20 16:13:04# make install ... [root@audi libvirt] 2017-09-20 16:14:05# systemctl daemon-reload [root@audi libvirt] 2017-09-20 16:14:11# systemctl restart libvirtd.service [root@audi libvirt] 2017-09-20 16:14:13# (7) Attached and detached two TLS enabled VxHS disks several times. All were successful. [root@audi libvirt] 2017-09-20 16:14:14# virsh attach-device myfc24 ../../hotplug_disk_1.xml Device attached successfully [root@audi libvirt] 2017-09-20 16:14:24# virsh attach-device myfc24 ../../hotplug_disk_2.xml Device attached successfully [root@audi libvirt] 2017-09-20 16:14:57# virsh detach-device myfc24 ../../hotplug_disk_1.xml Device detached successfully [root@audi libvirt] 2017-09-20 16:15:11# virsh detach-device myfc24 ../../hotplug_disk_2.xml Device detached successfully [root@audi libvirt] 2017-09-20 16:15:16# virsh attach-device myfc24 ../../hotplug_disk_2.xml Device attached successfully [root@audi libvirt] 2017-09-20 16:15:19# virsh attach-device myfc24 ../../hotplug_disk_1.xml Device attached successfully [root@audi libvirt] 2017-09-20 16:15:22# virsh attach-device myfc24 ../../hotplug_disk_1.xml error: Failed to attach device from ../../hotplug_disk_1.xml error: XML error: target 'vdb' duplicated for disk sources '/tmp/test_vxhs_disk_2' and '/tmp/test_vxhs_disk_2' [root@audi libvirt] 2017-09-20 16:15:28# virsh detach-device myfc24 ../../hotplug_disk_2.xml Device detached successfully [root@audi libvirt] 2017-09-20 16:15:51# virsh detach-device myfc24 ../../hotplug_disk_1.xml Device detached successfully [root@audi libvirt] 2017-09-20 16:15:55# [root@audi libvirt] 2017-09-20 16:28:23# cat ../../hotplug_disk_1.xml <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source protocol='vxhs' name='/tmp/test_vxhs_disk_2' tls='yes'> <host name='127.0.0.1' port='9999'/> </source> <target dev='vdb' bus='virtio'/> <serial>eb90327c-8302-4725-9e1b-4e85ed4dc252</serial> </disk> [root@audi libvirt] 2017-09-20 16:28:36# cat ../../hotplug_disk_2.xml <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source protocol='vxhs' name='/tmp/test_vxhs_disk_3' tls='yes'> <host name='127.0.0.1' port='9999'/> </source> <target dev='vda' bus='virtio'/> <serial>eb90327c-8302-4725-9e1b-4e85ed4dc253</serial> </disk> IMHO, the patches are good to go :) Thanks, Ashish On Tue, Sep 19, 2017 at 6:32 PM, John Ferlan <jferlan(a)redhat.com> wrote: > From: Ashish Mittal <Ashish.Mittal(a)veritas.com> > > Alter qemu command line generation in order to possibly add TLS for > a suitably configured domain. > > Sample TLS args generated by libvirt - > > -object tls-creds-x509,id=objvirtio-disk0_tls0,dir=/etc/pki/qemu,\ > endpoint=client,verify-peer=yes \ > -drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ > file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ > file.server.type=tcp,file.server.host=192.168.0.1,\ > file.server.port=9999,format=raw,if=none,\ > id=drive-virtio-disk0,cache=none \ > -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ > id=virtio-disk0 > > Update the qemuxml2argvtest with a couple of examples. One for a > simple case and the other a bit more complex where multiple VxHS disks > are added where at least one uses a VxHS that doesn't require TLS > credentials and thus sets the domain disk source attribute "tls = 'no'". > > Update the hotplug to be able to handle processing the tlsAlias whether > it's to add the TLS object when hotplugging a disk or to remove the TLS > object when hot unplugging a disk. The hot plug/unplug code is largely > generic, but the addition code does make the VXHS specific checks only > because it needs to grab the correct config directory and generate the > object as the command line would do. > > Signed-off-by: Ashish Mittal <Ashish.Mittal(a)veritas.com> > Signed-off-by: John Ferlan <jferlan(a)redhat.com> > --- > src/qemu/qemu_block.c | 8 +++ > src/qemu/qemu_command.c | 33 +++++++++ > src/qemu/qemu_hotplug.c | 79 > ++++++++++++++++++++++ > ...-disk-drive-network-tlsx509-multidisk-vxhs.args | 43 ++++++++++++ > ...v-disk-drive-network-tlsx509-multidisk-vxhs.xml | 50 ++++++++++++++ > ...muxml2argv-disk-drive-network-tlsx509-vxhs.args | 30 ++++++++ > tests/qemuxml2argvtest.c | 7 ++ > 7 files changed, 250 insertions(+) > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive- > network-tlsx509-multidisk-vxhs.args > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive- > network-tlsx509-multidisk-vxhs.xml > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive- > network-tlsx509-vxhs.args > > diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c > index 3437302dd..77ffc6c51 100644 > --- a/src/qemu/qemu_block.c > +++ b/src/qemu/qemu_block.c > @@ -529,16 +529,24 @@ qemuBlockStorageSourceGetVxHSProps(virStorageSourcePtr > src) > return NULL; > } > > + if (src->haveTLS == VIR_TRISTATE_BOOL_YES && !src->tlsAlias) { > + virReportError(VIR_ERR_INVALID_ARG, "%s", > + _("VxHS disk does not have TLS alias set")); > + return NULL; > + } > + > if (!(server = qemuBlockStorageSourceBuildJSONSocketAddress(src->hosts, > true))) > return NULL; > > /* VxHS disk specification example: > * { driver:"vxhs", > + * tls-creds:"objvirtio-disk0_tls0", > * vdisk-id:"eb90327c-8302-4725-4e85ed4dc251", > * server:{type:"tcp", host:"1.2.3.4", port:9999}} > */ > if (virJSONValueObjectCreate(&ret, > "s:driver", protocol, > + "S:tls-creds", src->tlsAlias, > "s:vdisk-id", src->path, > "a:server", server, NULL) < 0) > virJSONValueFree(server); > diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c > index 9b3e3fc04..756bf3836 100644 > --- a/src/qemu/qemu_command.c > +++ b/src/qemu/qemu_command.c > @@ -794,6 +794,35 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, > } > > > +/* qemuBuildDiskSrcTLSx509CommandLine: > + * > + * Add TLS object if the disk src uses a secure communication channel > + * > + * Returns 0 on success, -1 w/ error on some sort of failure. > + */ > +static int > +qemuBuildDiskSrcTLSx509CommandLine(virCommandPtr cmd, > + virStorageSourcePtr src, > + const char *srcalias, > + virQEMUCapsPtr qemuCaps) > +{ > + > + > + /* other protocols may be added later */ > + if (src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS && > + src->haveTLS == VIR_TRISTATE_BOOL_YES) { > + if (!(src->tlsAlias = qemuAliasTLSObjFromSrcAlias(srcalias))) > + return -1; > + > + return qemuBuildTLSx509CommandLine(cmd, src->tlsCertdir, > + src->tlsListen, src->tlsVerify, > + false, srcalias, qemuCaps); > + } > + > + return 0; > +} > + > + > static char * > qemuBuildNetworkDriveURI(virStorageSourcePtr src, > qemuDomainSecretInfoPtr secinfo) > @@ -2221,6 +2250,10 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, > if (qemuBuildDiskSecinfoCommandLine(cmd, encinfo) < 0) > return -1; > > + if (qemuBuildDiskSrcTLSx509CommandLine(cmd, disk->src, > disk->info.alias, > + qemuCaps) < 0) > + return -1; > + > virCommandAddArg(cmd, "-drive"); > > if (!(optstr = qemuBuildDriveStr(disk, cfg, driveBoot, qemuCaps))) > diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c > index 7dd6e5fd9..7751a608d 100644 > --- a/src/qemu/qemu_hotplug.c > +++ b/src/qemu/qemu_hotplug.c > @@ -156,6 +156,52 @@ qemuDomainPrepareDisk(virQEMUDriverPtr driver, > > > static int > +qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver, > + virDomainObjPtr vm, > + virStorageSourcePtr src, > + const char *srcalias) > +{ > + int ret = -1; > + qemuDomainObjPrivatePtr priv = vm->privateData; > + virJSONValuePtr tlsProps = NULL; > + > + /* NB: Initial implementation doesn't require/use a secret to decrypt > + * a server certificate, so there's no need to manage a tlsSecAlias > + * and tlsSecProps. See qemuDomainAddChardevTLSObjects for the > + * methodology required to add a secret object. */ > + > + /* Create the TLS object using the source tls* settings */ > + if (qemuDomainGetTLSObjects(priv->qemuCaps, NULL, > + src->tlsCertdir, > + src->tlsListen, > + src->tlsVerify, > + srcalias, &tlsProps, &src->tlsAlias, > + NULL, NULL) < 0) > + goto cleanup; > + > + if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, > + NULL, NULL, src->tlsAlias, &tlsProps) < 0) > + goto cleanup; > + > + ret = 0; > + > + cleanup: > + virJSONValueFree(tlsProps); > + > + return ret; > +} > + > + > +static void > +qemuDomainDelDiskSrcTLSObject(virQEMUDriverPtr driver, > + virDomainObjPtr vm, > + virStorageSourcePtr src) > +{ > + qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, NULL, > src->tlsAlias); > +} > + > + > +static int > qemuHotplugWaitForTrayEject(virQEMUDriverPtr driver, > virDomainObjPtr vm, > virDomainDiskDefPtr disk, > @@ -376,6 +422,14 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, > if (encinfo && qemuBuildSecretInfoProps(encinfo, &encobjProps) < 0) > goto error; > > + if (qemuDomainPrepareDiskSourceTLS(disk->src, disk->info.alias, cfg) > < 0) > + goto error; > + > + if (disk->src->haveTLS && > + qemuDomainAddDiskSrcTLSObject(driver, vm, disk->src, > + disk->info.alias) < 0) > + goto error; > + > if (!(drivestr = qemuBuildDriveStr(disk, cfg, false, priv->qemuCaps))) > goto error; > > @@ -453,6 +507,8 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, > virDomainAuditDisk(vm, NULL, disk->src, "attach", false); > > error: > + qemuDomainDelDiskSrcTLSObject(driver, vm, disk->src); > + > if (releaseaddr) > qemuDomainReleaseDeviceAddress(vm, &disk->info, src); > > @@ -667,6 +723,14 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn, > if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, > priv->qemuCaps))) > goto error; > > + if (qemuDomainPrepareDiskSourceTLS(disk->src, disk->info.alias, cfg) > < 0) > + goto error; > + > + if (disk->src->haveTLS && > + qemuDomainAddDiskSrcTLSObject(driver, vm, disk->src, > + disk->info.alias) < 0) > + goto error; > + > if (!(drivestr = qemuBuildDriveStr(disk, cfg, false, priv->qemuCaps))) > goto error; > > @@ -737,6 +801,8 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn, > virDomainAuditDisk(vm, NULL, disk->src, "attach", false); > > error: > + qemuDomainDelDiskSrcTLSObject(driver, vm, disk->src); > + > ignore_value(qemuDomainPrepareDisk(driver, vm, disk, NULL, true)); > goto cleanup; > } > @@ -777,6 +843,14 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr > driver, > if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0) > goto error; > > + if (qemuDomainPrepareDiskSourceTLS(disk->src, disk->info.alias, cfg) > < 0) > + goto error; > + > + if (disk->src->haveTLS && > + qemuDomainAddDiskSrcTLSObject(driver, vm, disk->src, > + disk->info.alias) < 0) > + goto error; > + > if (!(drivestr = qemuBuildDriveStr(disk, cfg, false, priv->qemuCaps))) > goto error; > > @@ -827,6 +901,8 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr > driver, > virDomainAuditDisk(vm, NULL, disk->src, "attach", false); > > error: > + qemuDomainDelDiskSrcTLSObject(driver, vm, disk->src); > + > ignore_value(qemuDomainPrepareDisk(driver, vm, disk, NULL, true)); > goto cleanup; > } > @@ -3677,6 +3753,9 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, > ignore_value(qemuMonitorDelObject(priv->mon, encAlias)); > VIR_FREE(encAlias); > > + if (disk->src->haveTLS) > + ignore_value(qemuMonitorDelObject(priv->mon, > disk->src->tlsAlias)); > + > if (qemuDomainObjExitMonitor(driver, vm) < 0) > return -1; > > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive- > network-tlsx509-multidisk-vxhs.args b/tests/qemuxml2argvdata/ > qemuxml2argv-disk-drive-network-tlsx509-multidisk-vxhs.args > new file mode 100644 > index 000000000..572c9f36c > --- /dev/null > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive- > network-tlsx509-multidisk-vxhs.args > @@ -0,0 +1,43 @@ > +LC_ALL=C \ > +PATH=/bin \ > +HOME=/home/test \ > +USER=test \ > +LOGNAME=test \ > +QEMU_AUDIO_DRV=none \ > +/usr/bin/qemu-system-x86_64 \ > +-name QEMUGuest1 \ > +-S \ > +-M pc \ > +-cpu qemu32 \ > +-m 214 \ > +-smp 1,sockets=1,cores=1,threads=1 \ > +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ > +-nographic \ > +-nodefaults \ > +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/ > monitor.sock,\ > +server,nowait \ > +-mon chardev=charmonitor,id=monitor,mode=readline \ > +-no-acpi \ > +-boot c \ > +-usb \ > +-object tls-creds-x509,id=objvirtio-disk0_tls0,dir=/etc/pki/qemu,\ > +endpoint=client,verify-peer=yes \ > +-drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ > +file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,file.server.type=tcp,\ > +file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ > +id=drive-virtio-disk0,cache=none \ > +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ > +id=virtio-disk0 \ > +-object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/qemu,\ > +endpoint=client,verify-peer=yes \ > +-drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\ > +file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,file.server.type=tcp,\ > +file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\ > +id=drive-virtio-disk1,cache=none \ > +-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ > +id=virtio-disk1 \ > +-drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b- > 4e85ed4dc253,\ > +file.server.type=tcp,file.server.host=192.168.0.3,file.server.port=9999,\ > +format=raw,if=none,id=drive-virtio-disk2,cache=none \ > +-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ > +id=virtio-disk2 > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive- > network-tlsx509-multidisk-vxhs.xml b/tests/qemuxml2argvdata/ > qemuxml2argv-disk-drive-network-tlsx509-multidisk-vxhs.xml > new file mode 100644 > index 000000000..a66e81f06 > --- /dev/null > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive- > network-tlsx509-multidisk-vxhs.xml > @@ -0,0 +1,50 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219136</memory> > + <currentMemory unit='KiB'>219136</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='i686' machine='pc'>hvm</type> > + <boot dev='hd'/> > + </os> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + <disk type='network' device='disk'> > + <driver name='qemu' type='raw' cache='none'/> > + <source protocol='vxhs' name='eb90327c-8302-4725-9e1b- > 4e85ed4dc251'> > + <host name='192.168.0.1' port='9999'/> > + </source> > + <target dev='vda' bus='virtio'/> > + <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' > function='0x0'/> > + </disk> > + <disk type='network' device='disk'> > + <driver name='qemu' type='raw' cache='none'/> > + <source protocol='vxhs' name='eb90327c-8302-4725-9e1b- > 4e85ed4dc252'> > + <host name='192.168.0.2' port='9999'/> > + </source> > + <target dev='vdb' bus='virtio'/> > + <serial>eb90327c-8302-4725-9e1b-4e85ed4dc252</serial> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' > function='0x0'/> > + </disk> > + <disk type='network' device='disk'> > + <driver name='qemu' type='raw' cache='none'/> > + <source protocol='vxhs' name='eb90327c-8302-4725-9e1b-4e85ed4dc253' > tls='no'> > + <host name='192.168.0.3' port='9999'/> > + </source> > + <target dev='vdc' bus='virtio'/> > + <serial>eb90327c-8302-4725-9e1b-4e85ed4dc252</serial> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' > function='0x0'/> > + </disk> > + <controller type='usb' index='0'/> > + <controller type='pci' index='0' model='pci-root'/> > + <input type='mouse' bus='ps2'/> > + <input type='keyboard' bus='ps2'/> > + <memballoon model='none'/> > + </devices> > +</domain> > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args > b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args > new file mode 100644 > index 000000000..aaf88635b > --- /dev/null > +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive- > network-tlsx509-vxhs.args > @@ -0,0 +1,30 @@ > +LC_ALL=C \ > +PATH=/bin \ > +HOME=/home/test \ > +USER=test \ > +LOGNAME=test \ > +QEMU_AUDIO_DRV=none \ > +/usr/bin/qemu-system-x86_64 \ > +-name QEMUGuest1 \ > +-S \ > +-M pc \ > +-cpu qemu32 \ > +-m 214 \ > +-smp 1,sockets=1,cores=1,threads=1 \ > +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ > +-nographic \ > +-nodefaults \ > +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/ > monitor.sock,\ > +server,nowait \ > +-mon chardev=charmonitor,id=monitor,mode=readline \ > +-no-acpi \ > +-boot c \ > +-usb \ > +-object tls-creds-x509,id=objvirtio-disk0_tls0,dir=/etc/pki/qemu,\ > +endpoint=client,verify-peer=yes \ > +-drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ > +file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,file.server.type=tcp,\ > +file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ > +id=drive-virtio-disk0,cache=none \ > +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ > +id=virtio-disk0 > diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c > index bf43beb10..21f057460 100644 > --- a/tests/qemuxml2argvtest.c > +++ b/tests/qemuxml2argvtest.c > @@ -934,6 +934,13 @@ mymain(void) > DO_TEST("disk-drive-network-rbd-ipv6", NONE); > DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE); > DO_TEST("disk-drive-network-vxhs", QEMU_CAPS_VXHS); > + driver.config->vxhsTLS = 1; > + DO_TEST("disk-drive-network-tlsx509-vxhs", QEMU_CAPS_VXHS, > + QEMU_CAPS_OBJECT_TLS_CREDS_X509); > + DO_TEST("disk-drive-network-tlsx509-multidisk-vxhs", QEMU_CAPS_VXHS, > + QEMU_CAPS_OBJECT_TLS_CREDS_X509); > + driver.config->vxhsTLS = 0; > + VIR_FREE(driver.config->vxhsTLSx509certdir); > DO_TEST("disk-drive-no-boot", > QEMU_CAPS_BOOTINDEX); > DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", > -- > 2.13.5 > >

2 4

[libvirt] [PATCH] qemu: hotplug: Ignore cgroup errors when hot-unplugging vcpus
by Peter Krempa 26 Sep '17

26 Sep '17

When the vcpu is successfully removed libvirt would remove the cgroup. In cases when removal of the cgroup fails libvirt would report an error. This does not make much sense, since the vcpu was removed and we can't really do anything with the cgroup. This patch silences the errors from cgroup removal. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1462092 --- src/qemu/qemu_hotplug.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7592049ea..4913e18e6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5322,6 +5322,7 @@ qemuDomainRemoveVcpu(virQEMUDriverPtr driver, qemuDomainVcpuPrivatePtr vcpupriv = QEMU_DOMAIN_VCPU_PRIVATE(vcpuinfo); int oldvcpus = virDomainDefGetVcpus(vm->def); unsigned int nvcpus = vcpupriv->vcpus; + virErrorPtr save_error = NULL; size_t i; if (qemuDomainRefreshVcpuInfo(driver, vm, QEMU_ASYNC_JOB_NONE, false) < 0) @@ -5346,11 +5347,12 @@ qemuDomainRemoveVcpu(virQEMUDriverPtr driver, virDomainAuditVcpu(vm, oldvcpus, oldvcpus - nvcpus, "update", true); - for (i = vcpu; i < vcpu + nvcpus; i++) { - vcpuinfo = virDomainDefGetVcpu(vm->def, i); - if (virCgroupDelThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, i) < 0) - return -1; - } + virErrorPreserveLast(&save_error); + + for (i = vcpu; i < vcpu + nvcpus; i++) + ignore_value(virCgroupDelThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, i)); + + virErrorRestore(&save_error); return 0; } -- 2.14.1

2 1

[libvirt] [PATCH] nwfilter: Don't leak @inetaddr
by ZhiPeng Lu 26 Sep '17

26 Sep '17

In learnIPAddressThread()the @inetaddr may be leaked. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- src/nwfilter/nwfilter_learnipaddr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index cfd92d9..018f20f 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -627,6 +627,7 @@ learnIPAddressThread(void *arg) "cache for interface %s"), inetaddr, req->ifname); } + inetaddr = NULL; ret = virNWFilterInstantiateFilterLate(req->driver, NULL, req->ifname, @@ -636,7 +637,8 @@ learnIPAddressThread(void *arg) req->filtername, req->filterparams); VIR_DEBUG("Result from applying firewall rules on " - "%s with IP addr %s : %d", req->ifname, inetaddr, ret); + "%s with IP addr %s : %d", req->ifname, NULLSTR(inetaddr), ret); + VIR_FREE(inetaddr); } } else { if (showError) -- 1.8.3.1

1 0

[libvirt] [PATCH v3 00/14] Use secret objects to pass iSCSI passwords
by John Ferlan 26 Sep '17

26 Sep '17

v2: https://www.redhat.com/archives/libvir-list/2017-September/msg00466.html Changes since v2: * Former Patch 1 & 2 were pushed * New Patch 1 is former Patches 3 and parts of 4 combined appropriately -> Allow <auth> under <disk> or <source> - keep track of where it was found so that format prints in the right place -> Cleaned up the tests and new xml/args files * Patch 2 is part of the former patch 6 - just the new _virStorageSource * Patch 3 is new - to introduced an allocator for domain_conf to create a _virStorageSource * Patch 4 is new - as stated found that the @diskPriv->encinfo wasn't cleaned up properly * Patch 5 is the rest of the former patch 6 * Patch 6 is the former patch 7 with some minor adjustments to allow <encryption> to follow <auth> and be both child of <disk> and <source> * Patch 7 is the former patch 10 with minor change to perform free of encinfo properly (e.g. from patch 4) * Patch 8 is former patch 5 and 9 combined * Patch 9 is new - to use the virStorageSource for iscsisrc instead of just three fields we wanted * Patch 10 is new to alter the existing hostdevPriv to use diskSrcPriv * Patch 11 is new to remove the hostdevPriv as it's no longer necesary * Patch 12 is new to split up a change in qemuBuildSCSIiSCSIHostdevDrvStr from the last patch * Patch 13 is the former patch 13 * Patch 14 is altered to accomodate the hostdev usage if virStorageSource for iscsisrc->src instead of that hack that was there before. NB: Parts for former Patches 4 and 8 are dropped as is all of Patch 11 John Ferlan (14): conf: Add/Allow parsing the auth in the disk source qemu: Introduce privateData for _virStorageSource conf: Introduce virDomainDiskStorageSourceNew qemu: Add missing encinfo cleanup qemu: Relocate qemuDomainSecretInfoPtr from disk private conf: Add/Allow parsing the encryption in the disk source qemu: Move encinfo from private disk to private disk src docs: Add news article regarding auth/encryption placement conf,qemu: Replace iscsisrc fields with virStorageSourcePtr qemu: Use private disksrc for iscsi instead of private hostdev qemu: Remove private hostdev qemu: Refactor qemuBuildSCSIiSCSIHostdevDrvStr slightly qemu: Get capabilities to use iscsi password-secret argument qemu: Use secret objects to pass iSCSI passwords docs/formatdomain.html.in | 82 ++++--- docs/news.xml | 13 ++ docs/schemas/domaincommon.rng | 48 +++- src/conf/domain_conf.c | 255 ++++++++++++++++----- src/conf/domain_conf.h | 10 +- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_block.c | 64 +++++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 84 +++++-- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 95 ++++---- src/qemu/qemu_domain.h | 33 ++- src/qemu/qemu_hotplug.c | 71 +++++- src/qemu/qemu_parse_command.c | 4 +- src/util/virstoragefile.c | 2 + src/util/virstoragefile.h | 5 + src/vbox/vbox_common.c | 2 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 6 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...xml2argv-disk-drive-network-iscsi-auth-AES.args | 41 ++++ ...uxml2argv-disk-drive-network-iscsi-auth-AES.xml | 43 ++++ ...ml2argv-disk-drive-network-source-auth-both.xml | 51 +++++ ...emuxml2argv-disk-drive-network-source-auth.args | 32 +++ ...qemuxml2argv-disk-drive-network-source-auth.xml | 45 ++++ ...ml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args | 45 ++++ ...xml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml | 48 ++++ .../qemuxml2argv-luks-disks-source-both.xml | 40 ++++ .../qemuxml2argv-luks-disks-source.args | 62 +++++ .../qemuxml2argv-luks-disks-source.xml | 81 +++++++ tests/qemuxml2argvtest.c | 14 ++ ...muxml2xmlout-disk-drive-network-source-auth.xml | 49 ++++ .../qemuxml2xmlout-luks-disks-source.xml | 84 +++++++ .../qemuxml2xmlout-luks-disks.xml | 46 +++- tests/qemuxml2xmltest.c | 2 + tests/virhostdevtest.c | 2 +- tests/virstoragetest.c | 6 + 44 files changed, 1270 insertions(+), 214 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth-both.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source-both.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-source-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks-source.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml -- 2.13.5

1 18

[libvirt] [PATCH v3] vhost-user: add support reconnect for vhost-user ports
by ZhiPeng Lu 26 Sep '17

26 Sep '17

For vhost-user ports, Open vSwitch acts as the server and QEMU the client. When OVS crashes or restarts, the QEMU process should be reconnected to OVS. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- docs/schemas/domaincommon.rng | 26 ++++++++------ src/conf/domain_conf.c | 40 ++++++++++++++++++---- src/conf/domain_conf.h | 10 +++--- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- .../qemuxml2argv-net-vhostuser-multiq.args | 4 +-- .../qemuxml2argv-net-vhostuser-multiq.xml | 8 +++-- 8 files changed, 65 insertions(+), 29 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 76852ab..3f4ed82 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2327,6 +2327,18 @@ </attribute> </optional> </define> + <define name="reconnect"> + <element name="reconnect"> + <attribute name="enabled"> + <ref name="virYesNo"/> + </attribute> + <optional> + <attribute name="timeout"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </element> + </define> <!-- An interface description can either be of type bridge in which case @@ -2388,6 +2400,9 @@ <value>client</value> </choice> </attribute> + <optional> + <ref name="reconnect"/> + </optional> <empty/> </element> <ref name="interface-options"/> @@ -3636,16 +3651,7 @@ </attribute> </optional> <optional> - <element name="reconnect"> - <attribute name="enabled"> - <ref name="virYesNo"/> - </attribute> - <optional> - <attribute name="timeout"> - <ref name="unsignedInt"/> - </attribute> - </optional> - </element> + <ref name="reconnect"/> </optional> <zeroOrMore> <ref name='devSeclabel'/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cc5e79b..b7fc3a5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -83,6 +83,13 @@ struct _virDomainXMLOption { /* Private data for save image stored in snapshot XML */ virSaveCookieCallbacks saveCookie; }; +static int +virDomainDeviceSourceReconnectDefParseXML(virDomainDeviceSourceReconnectDefPtr def, + xmlNodePtr node, + xmlXPathContextPtr ctxt); +static void +virDomainDeviceSourceReconnectDefFormat(virBufferPtr buf, + virDomainDeviceSourceReconnectDefPtr def); #define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS \ (VIR_DOMAIN_DEF_FORMAT_SECURE | \ @@ -10245,6 +10252,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; + virDomainDeviceSourceReconnectDef reconnect = {0}; int rv, val; if (VIR_ALLOC(def) < 0) @@ -10331,6 +10339,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, vhostuser_type = virXMLPropString(cur, "type"); vhostuser_path = virXMLPropString(cur, "path"); vhostuser_mode = virXMLPropString(cur, "mode"); + if (virDomainDeviceSourceReconnectDefParseXML(&reconnect, cur, ctxt) < 0) + goto error; } else if (!def->virtPortProfile && virXMLNodeNameEqual(cur, "virtualport")) { if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -10552,8 +10562,17 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (STREQ(vhostuser_mode, "server")) { def->data.vhostuser->data.nix.listen = true; + if (reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'reconnect' attribute unsupported " + "'server' mode for <interface type='vhostuser'>")); + goto error; + } } else if (STREQ(vhostuser_mode, "client")) { def->data.vhostuser->data.nix.listen = false; + def->data.vhostuser->data.nix.reconnect.enabled = reconnect.enabled; + def->data.vhostuser->data.nix.reconnect.timeout = reconnect.timeout; + reconnect.enabled = VIR_TRISTATE_BOOL_ABSENT; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Wrong <source> 'mode' attribute " @@ -11216,7 +11235,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, } static int -virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, +virDomainDeviceSourceReconnectDefParseXML(virDomainDeviceSourceReconnectDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { @@ -11338,7 +11357,7 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def, VIR_FREE(tmp); } - if (virDomainChrSourceReconnectDefParseXML(&def->data.tcp.reconnect, + if (virDomainDeviceSourceReconnectDefParseXML(&def->data.tcp.reconnect, source, ctxt) < 0) { goto error; @@ -11389,7 +11408,7 @@ virDomainChrSourceDefParseUnix(virDomainChrSourceDefPtr def, def->data.nix.listen = mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND; def->data.nix.path = virXMLPropString(source, "path"); - if (virDomainChrSourceReconnectDefParseXML(&def->data.nix.reconnect, + if (virDomainDeviceSourceReconnectDefParseXML(&def->data.nix.reconnect, source, ctxt) < 0) { return -1; @@ -22984,6 +23003,13 @@ virDomainNetDefFormat(virBufferPtr buf, def->data.vhostuser->data.nix.listen ? "server" : "client"); sourceLines++; + if (def->data.vhostuser->data.nix.reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virBufferAddLit(buf, ">\n"); + sourceLines++; + virBufferAdjustIndent(buf, 2); + virDomainDeviceSourceReconnectDefFormat(buf, &def->data.vhostuser->data.nix.reconnect); + virBufferAdjustIndent(buf, -2); + } } break; @@ -23218,8 +23244,8 @@ virDomainChrAttrsDefFormat(virBufferPtr buf, static void -virDomainChrSourceReconnectDefFormat(virBufferPtr buf, - virDomainChrSourceReconnectDefPtr def) +virDomainDeviceSourceReconnectDefFormat(virBufferPtr buf, + virDomainDeviceSourceReconnectDefPtr def) { if (def->enabled == VIR_TRISTATE_BOOL_ABSENT) return; @@ -23314,7 +23340,7 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virBufferAsprintf(&attrBuf, " tlsFromConfig='%d'", def->data.tcp.tlsFromConfig); - virDomainChrSourceReconnectDefFormat(&childBuf, + virDomainDeviceSourceReconnectDefFormat(&childBuf, &def->data.tcp.reconnect); if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) @@ -23333,7 +23359,7 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virDomainSourceDefFormatSeclabel(&childBuf, def->nseclabels, def->seclabels, flags); - virDomainChrSourceReconnectDefFormat(&childBuf, + virDomainDeviceSourceReconnectDefFormat(&childBuf, &def->data.nix.reconnect); if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bb3b6f0..909f60d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1138,12 +1138,12 @@ typedef enum { } virDomainChrSpicevmcName; -struct _virDomainChrSourceReconnectDef { +struct _virDomainDeviceSourceReconnectDef { virTristateBool enabled; unsigned int timeout; }; -typedef struct _virDomainChrSourceReconnectDef virDomainChrSourceReconnectDef; -typedef virDomainChrSourceReconnectDef *virDomainChrSourceReconnectDefPtr; +typedef struct _virDomainDeviceSourceReconnectDef virDomainDeviceSourceReconnectDef; +typedef virDomainDeviceSourceReconnectDef *virDomainDeviceSourceReconnectDefPtr; /* The host side information for a character device. */ @@ -1168,7 +1168,7 @@ struct _virDomainChrSourceDef { bool tlscreds; int haveTLS; /* enum virTristateBool */ bool tlsFromConfig; - virDomainChrSourceReconnectDef reconnect; + virDomainDeviceSourceReconnectDef reconnect; } tcp; struct { char *bindHost; @@ -1179,7 +1179,7 @@ struct _virDomainChrSourceDef { struct { char *path; bool listen; - virDomainChrSourceReconnectDef reconnect; + virDomainDeviceSourceReconnectDef reconnect; } nix; int spicevmc; struct { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9b3e3fc..4640ce8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5094,7 +5094,7 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logManager, static void qemuBuildChrChardevReconnectStr(virBufferPtr buf, - const virDomainChrSourceReconnectDef *def) + const virDomainDeviceSourceReconnectDef *def) { if (def->enabled == VIR_TRISTATE_BOOL_YES) { virBufferAsprintf(buf, ",reconnect=%u", def->timeout); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 50b536e..4ea0727 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3244,7 +3244,7 @@ qemuDomainNetSupportsCoalesce(virDomainNetType type) static int -qemuDomainChrSourceReconnectDefValidate(const virDomainChrSourceReconnectDef *def) +qemuDomainChrSourceReconnectDefValidate(const virDomainDeviceSourceReconnectDef *def) { if (def->enabled == VIR_TRISTATE_BOOL_YES && def->timeout == 0) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 63b8559..b3d572e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6443,7 +6443,7 @@ int qemuMonitorJSONGetTPMTypes(qemuMonitorPtr mon, static int qemuMonitorJSONBuildChrChardevReconnect(virJSONValuePtr object, - const virDomainChrSourceReconnectDef *def) + const virDomainDeviceSourceReconnectDef *def) { if (def->enabled != VIR_TRISTATE_BOOL_YES) return 0; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index b69ebd8..0b08f44 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -25,14 +25,14 @@ server,nowait \ -netdev vhost-user,chardev=charnet0,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\ addr=0x3 \ --chardev socket,id=charnet1,path=/tmp/vhost1.sock \ +-chardev socket,id=charnet1,path=/tmp/vhost1.sock,reconnect=10 \ -netdev vhost-user,chardev=charnet1,id=hostnet1 \ -device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,\ addr=0x4 \ -netdev socket,listen=:2015,id=hostnet2 \ -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,\ addr=0x5 \ --chardev socket,id=charnet3,path=/tmp/vhost2.sock \ +-chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=0 \ -netdev vhost-user,chardev=charnet3,queues=4,id=hostnet3 \ -device virtio-net-pci,mq=on,vectors=10,netdev=hostnet3,id=net3,\ mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml index d5c42fe..2fadb1c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml @@ -30,7 +30,9 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6c'/> - <source type='unix' path='/tmp/vhost1.sock' mode='client'/> + <source type='unix' path='/tmp/vhost1.sock' mode='client'> + <reconnect enabled='yes' timeout='10'/> + </source> <model type='virtio'/> </interface> <interface type='server'> @@ -40,7 +42,9 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6d'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'> + <reconnect enabled='no'/> + </source> <model type='virtio'/> <driver queues='4'/> </interface> -- 1.8.3.1

1 0

[libvirt] [PATCH 0/2] udp chardev fixes
by Ján Tomko 26 Sep '17

26 Sep '17

Ján Tomko (2): conf: fix formatting of udp chardev attributes qemu: fix hotplug of udp device with no connect host src/conf/domain_conf.c | 12 ++++-------- src/qemu/qemu_monitor_json.c | 5 ++++- tests/genericxml2xmloutdata/generic-chardev-udp.xml | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) -- 2.13.0

2 4

[libvirt] [PATCH] qemu: adjust indentation of qemuDomainObjPrivateXMLFormatAutomaticPlacement
by Ján Tomko 26 Sep '17

26 Sep '17

Commit 6801da94 fixed the typo in the function name, but forgot to adjust the indentation level of the next line. --- Pushed as trivial. src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a095d6e98..0b094a15e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1797,7 +1797,7 @@ qemuDomainObjPrivateXMLFormatVcpus(virBufferPtr buf, static int qemuDomainObjPrivateXMLFormatAutomaticPlacement(virBufferPtr buf, - qemuDomainObjPrivatePtr priv) + qemuDomainObjPrivatePtr priv) { char *nodeset = NULL; char *cpuset = NULL; -- 2.13.0

1 0

[libvirt] [PATCH] qemu: domain: Fix typo in qemuDomainObjPtrivateXMLFormatAutomaticPlacement
by Peter Krempa 26 Sep '17

26 Sep '17

--- Pushed as trivial. src/qemu/qemu_domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cb371f1e8..a095d6e98 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1796,7 +1796,7 @@ qemuDomainObjPrivateXMLFormatVcpus(virBufferPtr buf, static int -qemuDomainObjPtrivateXMLFormatAutomaticPlacement(virBufferPtr buf, +qemuDomainObjPrivateXMLFormatAutomaticPlacement(virBufferPtr buf, qemuDomainObjPrivatePtr priv) { char *nodeset = NULL; @@ -1937,7 +1937,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, virBufferAddLit(buf, "</devices>\n"); } - if (qemuDomainObjPtrivateXMLFormatAutomaticPlacement(buf, priv) < 0) + if (qemuDomainObjPrivateXMLFormatAutomaticPlacement(buf, priv) < 0) return -1; /* Various per-domain paths */ -- 2.14.1

2 1

[libvirt] [PATCH] conf: fix formatting of udp chardev attributes
by Ján Tomko 26 Sep '17

26 Sep '17

It is possible (although possibly not very useful) to leave out the service attribute when using <source mode='bind'/> Fix the formatter bug introduced by commit 4a0da34 and format the host when its present (checked for non-NULL inside virBufferEscapeString) instead of basing it on the presence of the service attribute. https://bugzilla.redhat.com/show_bug.cgi?id=1455825 --- src/conf/domain_conf.c | 12 ++++-------- tests/genericxml2xmloutdata/generic-chardev-udp.xml | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 44cfb52b4..3c3db7291 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23307,19 +23307,15 @@ virDomainChrSourceDefFormat(virBufferPtr buf, case VIR_DOMAIN_CHR_TYPE_UDP: if (def->data.udp.bindService || def->data.udp.bindHost) { virBufferAddLit(buf, "<source mode='bind'"); - if (def->data.udp.bindService) - virBufferEscapeString(buf, " host='%s'", def->data.udp.bindHost); - if (def->data.udp.bindService) - virBufferEscapeString(buf, " service='%s'", def->data.udp.bindService); + virBufferEscapeString(buf, " host='%s'", def->data.udp.bindHost); + virBufferEscapeString(buf, " service='%s'", def->data.udp.bindService); virBufferAddLit(buf, "/>\n"); } if (def->data.udp.connectService || def->data.udp.connectHost) { virBufferAddLit(buf, "<source mode='connect'"); - if (def->data.udp.connectService) - virBufferEscapeString(buf, " host='%s'", def->data.udp.connectHost); - if (def->data.udp.connectService) - virBufferEscapeString(buf, " service='%s'", def->data.udp.connectService); + virBufferEscapeString(buf, " host='%s'", def->data.udp.connectHost); + virBufferEscapeString(buf, " service='%s'", def->data.udp.connectService); virBufferAddLit(buf, "/>\n"); } break; diff --git a/tests/genericxml2xmloutdata/generic-chardev-udp.xml b/tests/genericxml2xmloutdata/generic-chardev-udp.xml index c4a719f2f..c9b3e5550 100644 --- a/tests/genericxml2xmloutdata/generic-chardev-udp.xml +++ b/tests/genericxml2xmloutdata/generic-chardev-udp.xml @@ -29,7 +29,7 @@ <target type='virtio' name='test3'/> </channel> <channel type='udp'> - <source mode='bind'/> + <source mode='bind' host='localhost'/> <source mode='connect' service='5678'/> <target type='virtio' name='test4'/> </channel> -- 2.13.0

2 1

[libvirt] [PATCH] vhost-user: add support reconnect for vhost-user ports
by ZhiPeng Lu 26 Sep '17

26 Sep '17

For vhost-user ports, Open vSwitch acts as the server and QEMU the client. When OVS crashed or restart, QEMU shoule be reconnect to OVS. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- v1->v2: - modify xml format --- --- docs/schemas/domaincommon.rng | 12 ++++++++++ src/conf/domain_conf.c | 26 ++++++++++++++++++++++ .../qemuxml2argv-net-vhostuser-multiq.args | 4 ++-- .../qemuxml2argv-net-vhostuser-multiq.xml | 8 +++++-- 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 76852ab..bf015ca 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2388,6 +2388,18 @@ <value>client</value> </choice> </attribute> + <optional> + <element name="reconnect"> + <attribute name="enabled"> + <ref name="virYesNo"/> + </attribute> + <optional> + <attribute name="timeout"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </element> + </optional> <empty/> </element> <ref name="interface-options"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cc5e79b..d121a9e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -83,6 +83,13 @@ struct _virDomainXMLOption { /* Private data for save image stored in snapshot XML */ virSaveCookieCallbacks saveCookie; }; +static int +virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, + xmlNodePtr node, + xmlXPathContextPtr ctxt); +static void +virDomainChrSourceReconnectDefFormat(virBufferPtr buf, + virDomainChrSourceReconnectDefPtr def); #define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS \ (VIR_DOMAIN_DEF_FORMAT_SECURE | \ @@ -10245,6 +10252,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; + virDomainChrSourceReconnectDef reconnect = {0}; int rv, val; if (VIR_ALLOC(def) < 0) @@ -10331,6 +10339,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, vhostuser_type = virXMLPropString(cur, "type"); vhostuser_path = virXMLPropString(cur, "path"); vhostuser_mode = virXMLPropString(cur, "mode"); + if (virDomainChrSourceReconnectDefParseXML(&reconnect, cur, ctxt) < 0) + goto error; } else if (!def->virtPortProfile && virXMLNodeNameEqual(cur, "virtualport")) { if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -10552,8 +10562,17 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (STREQ(vhostuser_mode, "server")) { def->data.vhostuser->data.nix.listen = true; + if (reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'reconnect' attribute unsupported " + "'server' mode for <interface type='vhostuser'>")); + goto error; + } } else if (STREQ(vhostuser_mode, "client")) { def->data.vhostuser->data.nix.listen = false; + def->data.vhostuser->data.nix.reconnect.enabled = reconnect.enabled; + def->data.vhostuser->data.nix.reconnect.timeout = reconnect.timeout; + reconnect.enabled = VIR_TRISTATE_BOOL_ABSENT; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Wrong <source> 'mode' attribute " @@ -22984,6 +23003,13 @@ virDomainNetDefFormat(virBufferPtr buf, def->data.vhostuser->data.nix.listen ? "server" : "client"); sourceLines++; + if (def->data.vhostuser->data.nix.reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virBufferAddLit(buf, ">\n"); + sourceLines++; + virBufferAdjustIndent(buf, 2); + virDomainChrSourceReconnectDefFormat(buf, &def->data.vhostuser->data.nix.reconnect); + virBufferAdjustIndent(buf, -2); + } } break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index b69ebd8..0b08f44 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -25,14 +25,14 @@ server,nowait \ -netdev vhost-user,chardev=charnet0,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\ addr=0x3 \ --chardev socket,id=charnet1,path=/tmp/vhost1.sock \ +-chardev socket,id=charnet1,path=/tmp/vhost1.sock,reconnect=10 \ -netdev vhost-user,chardev=charnet1,id=hostnet1 \ -device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,\ addr=0x4 \ -netdev socket,listen=:2015,id=hostnet2 \ -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,\ addr=0x5 \ --chardev socket,id=charnet3,path=/tmp/vhost2.sock \ +-chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=0 \ -netdev vhost-user,chardev=charnet3,queues=4,id=hostnet3 \ -device virtio-net-pci,mq=on,vectors=10,netdev=hostnet3,id=net3,\ mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml index d5c42fe..2fadb1c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml @@ -30,7 +30,9 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6c'/> - <source type='unix' path='/tmp/vhost1.sock' mode='client'/> + <source type='unix' path='/tmp/vhost1.sock' mode='client'> + <reconnect enabled='yes' timeout='10'/> + </source> <model type='virtio'/> </interface> <interface type='server'> @@ -40,7 +42,9 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6d'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'> + <reconnect enabled='no'/> + </source> <model type='virtio'/> <driver queues='4'/> </interface> -- 1.8.3.1

3 2

[libvirt] [PATCH 0/4] qemu: Watchdog plug/unplug
by Michal Privoznik 26 Sep '17

26 Sep '17

For the hotplug case we need this qemu patch too: http://lists.nongnu.org/archive/html/qemu-devel/2017-09/msg00856.html so that we can actually set the action that watchdog is supposed to take when it hits the timeout. But apart from that, nothing special is going on. Michal Privoznik (4): qemu: cold-plug of watchdog qemu: cold-unplug of watchdog qemu: hot-plug of watchdog qemu: hot-unplug of watchdog src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 15 ++- src/qemu/qemu_alias.h | 2 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 3 + src/qemu/qemu_driver.c | 38 ++++++- src/qemu/qemu_hotplug.c | 125 +++++++++++++++++++++ src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_monitor.c | 12 ++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 28 +++++ src/qemu/qemu_monitor_json.h | 3 + tests/qemuhotplugtest.c | 14 ++- .../qemuhotplug-watchdog-full.xml | 3 + .../qemuhotplug-watchdog.xml | 1 + .../qemuhotplug-base-live+watchdog.xml | 55 +++++++++ 16 files changed, 303 insertions(+), 7 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-watchdog-full.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-watchdog.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml -- 2.13.5

4 18

[libvirt] [PATCH python] Fix comparisons between signed & unsigned integers
by Daniel P. Berrange 26 Sep '17

26 Sep '17

When python3 builds C modules, it adds the -Wsign-compare flag to GCC. This creates lots of warnings where we compare a 'size_t' value against an 'int' value due to signed/unsigned difference. Change all the size_t types to ssize_t to address this. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-lxc-override.c | 2 +- libvirt-override.c | 108 ++++++++++++++++++++++++------------------------- libvirt-utils.c | 8 ++-- typewrappers.c | 2 +- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index 316a500..60c2e48 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -63,7 +63,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, unsigned int flags; int c_retval; int *fdlist = NULL; - size_t i; + ssize_t i; if (!PyArg_ParseTuple(args, (char *)"OI:virDomainLxcOpenNamespace", &pyobj_domain, &flags)) diff --git a/libvirt-override.c b/libvirt-override.c index 9eba4ed..bde7f4b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -187,7 +187,7 @@ libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *error = NULL; int ncpus = -1, start_cpu = 0; int sumparams = 0, nparams = -1; - size_t i; + ssize_t i; int i_retval; unsigned int flags; bool totalflag; @@ -354,7 +354,7 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, virDomainPtr domain; PyObject *pyobj_domain; unsigned int nr_stats; - size_t i; + ssize_t i; virDomainMemoryStatStruct stats[VIR_DOMAIN_MEMORY_STAT_NR]; PyObject *info; PyObject *key = NULL, *val = NULL; @@ -365,7 +365,7 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, nr_stats = virDomainMemoryStats(domain, stats, VIR_DOMAIN_MEMORY_STAT_NR, 0); - if (nr_stats == -1) + if (nr_stats == (unsigned int)-1) return VIR_PY_NONE; /* convert to a Python dictionary */ @@ -1204,7 +1204,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, virDomainInfo dominfo; virVcpuInfoPtr cpuinfo = NULL; unsigned char *cpumap = NULL; - size_t cpumaplen, i; + ssize_t cpumaplen, i; int i_retval, cpunum; if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetVcpus", @@ -1274,7 +1274,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, } for (i = 0; i < dominfo.nrVirtCpu; i++) { PyObject *info = PyTuple_New(cpunum); - size_t j; + ssize_t j; if (info == NULL) goto cleanup; @@ -1384,7 +1384,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *pyobj_domain, *pycpumaps = NULL, *error = NULL; virDomainInfo dominfo; unsigned char *cpumaps = NULL; - size_t cpumaplen, vcpu, pcpu; + ssize_t cpumaplen, vcpu, pcpu; unsigned int flags; int i_retval, cpunum; @@ -1496,8 +1496,8 @@ libvirt_virDomainGetEmulatorPinInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *pyobj_domain; PyObject *pycpumap; unsigned char *cpumap; - size_t cpumaplen; - size_t pcpu; + ssize_t cpumaplen; + ssize_t pcpu; unsigned int flags; int ret; int cpunum; @@ -1560,7 +1560,7 @@ libvirt_virDomainGetIOThreadInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_iothrinfo = NULL; virDomainIOThreadInfoPtr *iothrinfo = NULL; unsigned int flags; - size_t pcpu, i; + ssize_t pcpu, i; int niothreads, cpunum; if (!PyArg_ParseTuple(args, (char *)"OI:virDomainGetIOThreadInfo", @@ -1846,7 +1846,7 @@ virConnectCredCallbackWrapper(virConnectCredentialPtr cred, PyObject *pycb; PyObject *pyret = NULL; int ret = -1; - size_t i; + ssize_t i; LIBVIRT_ENSURE_THREAD_STATE; @@ -1953,7 +1953,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, auth.ncredtype = PyList_Size(pycredtype); if (auth.ncredtype) { - size_t i; + ssize_t i; if (VIR_ALLOC_N(auth.credtype, auth.ncredtype) < 0) return PyErr_NoMemory(); for (i = 0; i < auth.ncredtype; i++) { @@ -2046,7 +2046,7 @@ libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; PyObject *rv = NULL, *pyobj_conn; char **models = NULL; - size_t i; + ssize_t i; unsigned int flags = 0; const char *arch = NULL; @@ -2117,7 +2117,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, { PyObject *py_retval; int *ids = NULL, c_retval; - size_t i; + ssize_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -2172,7 +2172,7 @@ libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virDomainPtr *doms = NULL; int c_retval = 0; - size_t i; + ssize_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllDomains", @@ -2215,7 +2215,7 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -2271,7 +2271,7 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virDomainPtr dom; PyObject *pyobj_dom; unsigned int flags; @@ -2325,7 +2325,7 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval = NULL; virDomainSnapshotPtr *snaps = NULL; int c_retval; - size_t i; + ssize_t i; virDomainPtr dom; PyObject *pyobj_dom; unsigned int flags; @@ -2370,7 +2370,7 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virDomainSnapshotPtr snap; PyObject *pyobj_snap; unsigned int flags; @@ -2425,7 +2425,7 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval = NULL; virDomainSnapshotPtr *snaps = NULL; int c_retval; - size_t i; + ssize_t i; virDomainSnapshotPtr parent; PyObject *pyobj_parent; unsigned int flags; @@ -2762,7 +2762,7 @@ libvirt_virDomainGetSecurityLabelList(PyObject *self ATTRIBUTE_UNUSED, virDomainPtr dom; PyObject *pyobj_dom; virSecurityLabel *labels = NULL; - size_t i; + ssize_t i; if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetSecurityLabelList", &pyobj_dom)) @@ -2889,7 +2889,7 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -2945,7 +2945,7 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -3002,7 +3002,7 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virNetworkPtr *nets = NULL; int c_retval = 0; - size_t i; + ssize_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllNetworks", @@ -3172,7 +3172,7 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; PyObject *pyobj_conn; int startCell, maxCells, c_retval; - size_t i; + ssize_t i; virConnectPtr conn; unsigned long long *freeMems; @@ -3223,7 +3223,7 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; unsigned int flags; int cpuNum, c_retval; - size_t i; + ssize_t i; int nparams = 0; virNodeCPUStatsPtr stats = NULL; @@ -3281,7 +3281,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; unsigned int flags; int cellNum, c_retval; - size_t i; + ssize_t i; int nparams = 0; virNodeMemoryStatsPtr stats = NULL; @@ -3335,7 +3335,7 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -3389,7 +3389,7 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -3447,7 +3447,7 @@ libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virStoragePoolPtr *pools = NULL; int c_retval = 0; - size_t i; + ssize_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllStoragePools", @@ -3491,7 +3491,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virStoragePoolPtr pool; PyObject *pyobj_pool; @@ -3548,7 +3548,7 @@ libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED, virStoragePoolPtr pool; virStorageVolPtr *vols = NULL; int c_retval = 0; - size_t i; + ssize_t i; unsigned int flags; PyObject *pyobj_pool; @@ -3812,7 +3812,7 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virConnectPtr conn; PyObject *pyobj_conn; char *cap; @@ -3873,7 +3873,7 @@ libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virNodeDevicePtr *devices = NULL; int c_retval = 0; - size_t i; + ssize_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllNodeDevices", @@ -3917,7 +3917,7 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virNodeDevicePtr dev; PyObject *pyobj_dev; @@ -4048,7 +4048,7 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED, char **uuids = NULL; virConnectPtr conn; int c_retval; - size_t i; + ssize_t i; PyObject *pyobj_conn; if (!PyArg_ParseTuple(args, (char *)"O:virConnectListSecrets", &pyobj_conn)) @@ -4104,7 +4104,7 @@ libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virSecretPtr *secrets = NULL; int c_retval = 0; - size_t i; + ssize_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllSecrets", @@ -4280,7 +4280,7 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED, char **uuids = NULL; virConnectPtr conn; int c_retval; - size_t i; + ssize_t i; PyObject *pyobj_conn; if (!PyArg_ParseTuple(args, (char *)"O:virConnectListNWFilters", @@ -4337,7 +4337,7 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virNWFilterPtr *filters = NULL; int c_retval = 0; - size_t i; + ssize_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllNWFilters", @@ -4381,7 +4381,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -4438,7 +4438,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **names = NULL; int c_retval; - size_t i; + ssize_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -4499,7 +4499,7 @@ libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virInterfacePtr *ifaces = NULL; int c_retval = 0; - size_t i; + ssize_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"OI:virConnectListAllInterfaces", @@ -4548,7 +4548,7 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, int ncpus = 0; char *base_cpu; PyObject *pybase_cpu; - size_t i, j; + ssize_t i, j; if (!PyArg_ParseTuple(args, (char *)"OOI:virConnectBaselineCPU", &pyobj_conn, &list, &flags)) @@ -4864,7 +4864,7 @@ libvirt_virDomainGetDiskErrors(PyObject *self ATTRIBUTE_UNUSED, virDomainDiskErrorPtr disks = NULL; unsigned int ndisks; int count; - size_t i; + ssize_t i; if (!PyArg_ParseTuple(args, (char *) "OI:virDomainGetDiskErrors", &pyobj_domain, &flags)) @@ -4925,7 +4925,7 @@ libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, unsigned int source; unsigned int flags; int ifaces_count = 0; - size_t i, j; + ssize_t i, j; if (!PyArg_ParseTuple(args, (char *) "OII:virDomainInterfaceAddresses", &pyobj_domain, &source, &flags)) @@ -6020,7 +6020,7 @@ libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSE PyObject *pyobj_remote = NULL; PyObject *pyobj_subject = NULL; int ret = -1; - size_t i; + ssize_t i; LIBVIRT_ENSURE_THREAD_STATE; @@ -7551,7 +7551,7 @@ libvirt_virDomainSendKey(PyObject *self ATTRIBUTE_UNUSED, int holdtime; unsigned int flags; int ret; - size_t i; + ssize_t i; unsigned int keycodes[VIR_DOMAIN_SEND_KEY_MAX_KEYS]; unsigned int nkeycodes; @@ -7945,7 +7945,7 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, unsigned char *cpumap = NULL; unsigned int online = 0; unsigned int flags; - size_t i; + ssize_t i; if (!PyArg_ParseTuple(args, (char *)"OI:virNodeGetCPUMap", &pyobj_conn, &flags)) @@ -8002,7 +8002,7 @@ libvirt_virDomainCreateWithFiles(PyObject *self ATTRIBUTE_UNUSED, unsigned int flags; unsigned int nfiles; int *files = NULL; - size_t i; + ssize_t i; if (!PyArg_ParseTuple(args, (char *)"OOI:virDomainCreateWithFiles", &pyobj_domain, &pyobj_files, &flags)) @@ -8050,7 +8050,7 @@ libvirt_virDomainCreateXMLWithFiles(PyObject *self ATTRIBUTE_UNUSED, unsigned int flags; unsigned int nfiles; int *files = NULL; - size_t i; + ssize_t i; if (!PyArg_ParseTuple(args, (char *)"OzOI:virDomainCreateXMLWithFiles", &pyobj_conn, &xmlDesc, &pyobj_files, &flags)) @@ -8099,7 +8099,7 @@ libvirt_virDomainFSFreeze(PyObject *self ATTRIBUTE_UNUSED, unsigned int flags; unsigned int nmountpoints = 0; char **mountpoints = NULL; - size_t i = 0, j; + ssize_t i = 0, j; if (!PyArg_ParseTuple(args, (char *)"OOI:virDomainFSFreeze", &pyobj_domain, &pyobj_list, &flags)) @@ -8147,7 +8147,7 @@ libvirt_virDomainFSThaw(PyObject *self ATTRIBUTE_UNUSED, unsigned int flags; unsigned int nmountpoints = 0; char **mountpoints = NULL; - size_t i = 0, j; + ssize_t i = 0, j; if (!PyArg_ParseTuple(args, (char *)"OOI:virDomainFSThaw", &pyobj_domain, &pyobj_list, &flags)) @@ -8380,7 +8380,7 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, virNetworkDHCPLeasePtr *leases = NULL; int leases_count; char *mac = NULL; - size_t i; + ssize_t i; if (!PyArg_ParseTuple(args, (char *) "OzI:virNetworkGetDHCPLeases", &pyobj_network, &mac, &flags)) @@ -8453,7 +8453,7 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, PyObject *py_record; PyObject *py_record_stats = NULL; virDomainPtr dom = NULL; - size_t i; + ssize_t i; if (!(py_retval = PyList_New(nrecords))) return NULL; @@ -8531,7 +8531,7 @@ libvirt_virDomainListGetStats(PyObject *self ATTRIBUTE_UNUSED, virDomainPtr *doms = NULL; int nrecords; int ndoms; - size_t i; + ssize_t i; unsigned int flags; unsigned int stats; diff --git a/libvirt-utils.c b/libvirt-utils.c index 727397d..b8ac5e9 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -221,7 +221,7 @@ getPyVirTypedParameter(const virTypedParameter *params, int nparams) { PyObject *key, *val, *info; - size_t i; + ssize_t i; if ((info = PyDict_New()) == NULL) return NULL; @@ -295,7 +295,7 @@ setPyVirTypedParameter(PyObject *info, #endif virTypedParameterPtr temp = NULL, ret = NULL; Py_ssize_t size; - size_t i; + ssize_t i; if ((size = PyDict_Size(info)) < 0) return NULL; @@ -412,7 +412,7 @@ virPyDictToTypedParamOne(virTypedParameterPtr *params, PyObject *value) { int rv = -1, type = -1; - size_t i; + ssize_t i; for (i = 0; i < nhints; i++) { if (STREQ(hints[i].name, keystr)) { @@ -605,7 +605,7 @@ virPyCpumapConvert(int cpunum, int *cpumaplen) { int tuple_size; - size_t i; + ssize_t i; *cpumapptr = NULL; if (!PyTuple_Check(pycpumap)) { diff --git a/typewrappers.c b/typewrappers.c index a9561dd..01ee310 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -319,7 +319,7 @@ libvirt_ulonglongUnwrap(PyObject *obj, PyErr_SetString(PyExc_TypeError, "an integer is required"); } - if ((ullong_val == -1) && PyErr_Occurred()) + if ((ullong_val == (unsigned long long)-1) && PyErr_Occurred()) return -1; *val = ullong_val; -- 2.13.5

2 2

[libvirt] [PATCH] qemu: monitor: fix graceful shutdown corner cases
by Nikolay Shirokovskiy 26 Sep '17

26 Sep '17

Patch aeda1b8c needs some enhancement. 1. Shutdown event is delivired on reboot too and we don't want to set willhangup flag is this case. 2. There is a next race condition. - EOF is delivered in event loop thread - qemuMonitorSend is called on client behalf and waits for notification on message response or monitor close - EOF handler tries to accquire job condition and fail on timeout as it is grabbed by the request above Now qemuMonitorSend hangs. Previously if qemuMonitorSend is called after EOF then it failed immediately due to lastError is set. Now we need to check willhangup too. --- Race is easy to trigger with patch [1]. One need to query domain frequently enough in a loop and do a shutdown. [1] Patch to trigger race condition. diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b782451..4445f88 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4742,6 +4742,9 @@ static void qemuProcessEventHandler(void *data, void *opaque) VIR_DEBUG("vm=%p, event=%d", vm, processEvent->eventType); + if (processEvent->eventType == QEMU_PROCESS_EVENT_MONITOR_EOF) + sleep(3); + virObjectLock(vm); switch (processEvent->eventType) { src/qemu/qemu_monitor.c | 16 +++++++++++++++- src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_process.c | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 19082d8..6270191 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -315,6 +315,15 @@ qemuMonitorEscapeNonPrintable(const char *text) #endif +void +qemuMonitorShutdown(qemuMonitorPtr mon) +{ + virObjectLock(mon); + mon->willhangup = 1; + virObjectUnlock(mon); +} + + static void qemuMonitorDispose(void *obj) { @@ -1055,6 +1064,12 @@ qemuMonitorSend(qemuMonitorPtr mon, return -1; } + if (mon->willhangup) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is shutting down.")); + return -1; + } + mon->msg = msg; qemuMonitorUpdateWatch(mon); @@ -1336,7 +1351,6 @@ qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest) { int ret = -1; VIR_DEBUG("mon=%p guest=%u", mon, guest); - mon->willhangup = 1; QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); return ret; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 9805a33..30533ef 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -303,6 +303,8 @@ void qemuMonitorUnregister(qemuMonitorPtr mon) ATTRIBUTE_NONNULL(1); void qemuMonitorClose(qemuMonitorPtr mon); +void qemuMonitorShutdown(qemuMonitorPtr mon); + virErrorPtr qemuMonitorLastError(qemuMonitorPtr mon); int qemuMonitorSetCapabilities(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab81d65..824be86 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -618,6 +618,7 @@ qemuProcessShutdownOrReboot(virQEMUDriverPtr driver, virObjectUnref(vm); } } else { + qemuMonitorShutdown(priv->mon); ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_NOWAIT)); } } -- 1.8.3.1

1 2

[libvirt] [PATCH python] Avoid implicit treatment of an arithmetic result as a boolean
by Daniel P. Berrange 26 Sep '17

26 Sep '17

Latest GCC versions are unhappy with us treating an integer arithmetic result as a boolean: libvirt-utils.c: In function ‘virReallocN’: libvirt-utils.c:111:23: warning: ‘*’ in boolean context, suggest ‘&&’ instead [-Wint-in-bool-context] if (!tmp && (size * count)) { ~~~~~~^~~~~~~~ Add an explicit comparison '!= 0' to keep it happy, since its suggestion to use '&&' is nonsense. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-utils.c b/libvirt-utils.c index b8ac5e9..f7b4478 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -108,7 +108,7 @@ virReallocN(void *ptrptr, return -1; } tmp = realloc(*(void**)ptrptr, size * count); - if (!tmp && (size * count)) { + if (!tmp && ((size * count) != 0)) { return -1; } *(void**)ptrptr = tmp; -- 2.13.5

2 1

[libvirt] [PATCH v2 0/6] libvirt-python/libvirtaio patches for 3.8.0
by Wojtek Porczyk 26 Sep '17

26 Sep '17

Hi libvirt-list, I'd like to submit a second iteration of libvirtaio series for 3.8.0. There are some improvements to have better control over closing connections, which are important in test suites which repeatedly open and close connections. Also there are some minor bugfixes and better logging. Since v1 (31.08.2017) there are changes: - dropped implementation re-registering - added current implementation getter instead - added unrelated bugfixes Wojtek Porczyk (6): libvirtaio: add more debug logging libvirtaio: cache the list of callbacks when calling libvirtaio: do not double-add callbacks libvirtaio: fix closing of the objects libvirtaio: keep track of the current implementation libvirtaio: add .drain() coroutine libvirtaio.py | 101 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 78 insertions(+), 23 deletions(-) -- 2.9.4

2 17

[libvirt] [PATCH V3] apparmor: support ptrace checks
by Jim Fehlig 25 Sep '17

25 Sep '17

Kernel 4.13 introduced finer-grained ptrace checks https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/com… With kernel 4.13 and apparmor 2.11, simply starting libvirtd results in the following apparmor denial type=AVC msg=audit(1506112085.645:954): apparmor="DENIED" operation="ptrace" profile="/usr/sbin/libvirtd" pid=6984 comm="libvirtd" requested_mask="trace" denied_mask="trace" peer="unconfined" Attempting to start an unconfined domain results in type=AVC msg=audit(1506112301.227:1112): apparmor="DENIED" operation="ptrace" profile="/usr/sbin/libvirtd" pid=7498 comm="libvirtd" requested_mask="trace" denied_mask="trace" peer="/usr/sbin/libvirtd" And attempting to start a confined domain results in type=AVC msg=audit(1506112631.408:1312): apparmor="DENIED" operation="open" profile="virt-aa-helper" name="/etc/libnl/classid" pid=8283 comm="virt-aa-helper" requested_mask="r" denied_mask="r" fsuid=0 ouid=0 type=AVC msg=audit(1506112631.530:1319): apparmor="DENIED" operation="open" profile="virt-aa-helper" name="/etc/libnl/classid" pid=8289 comm="virt-aa-helper" requested_mask="r" denied_mask="r" fsuid=0 ouid=0 type=AVC msg=audit(1506112632.186:1324): apparmor="DENIED" operation="ptrace" profile="/usr/sbin/libvirtd" pid=8342 comm="libvirtd" requested_mask="trace" denied_mask="trace" peer="libvirt-66154842-e926-4f92-92f0-1c1bf61dd1ff" Add ptrace rules to allow the trace operations. Resolves: https://bugzilla.suse.com/show_bug.cgi?id=1058847 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V3: fix ptrace rule for per-domain profiles V2: restrict ptrace permissions drop support for dbus, signal, and unix examples/apparmor/usr.sbin.libvirtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index acb59e071..fa4ebb355 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -37,6 +37,10 @@ network packet dgram, network packet raw, + ptrace (trace) peer=unconfined, + ptrace (trace) peer=/usr/sbin/libvirtd, + ptrace (trace) peer=libvirt-*, + # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. / r, -- 2.14.1

3 3

[libvirt] [PATCH] Print hex values with '0x' prefix and octal with '0' in debug messages
by Daniel P. Berrange 25 Sep '17

25 Sep '17

Seeing a log message saying 'flags=93' is ambiguous & confusing unless you happen to know that libvirt always prints flags as hex. Change our debug messages so that they always add a '0x' prefix when printing flags, and '0' prefix when printing mode. A few other misc places gain a '0x' prefix in error messages too. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- cfg.mk | 8 +- po/af.po | 4 +- po/am.po | 4 +- po/anp.po | 4 +- po/ar.po | 4 +- po/as.po | 12 +- po/ast.po | 4 +- po/bal.po | 4 +- po/be.po | 4 +- po/bg.po | 4 +- po/bn.po | 4 +- po/bn_IN.po | 12 +- po/bo.po | 4 +- po/br.po | 4 +- po/brx.po | 4 +- po/bs.po | 4 +- po/ca.po | 12 +- po/cs.po | 4 +- po/cy.po | 4 +- po/da.po | 4 +- po/de.po | 12 +- po/de_CH.po | 4 +- po/el.po | 4 +- po/en_GB.po | 4 +- po/eo.po | 4 +- po/es.po | 12 +- po/et.po | 4 +- po/eu.po | 4 +- po/fa.po | 4 +- po/fi.po | 4 +- po/fr.po | 4 +- po/gl.po | 4 +- po/gu.po | 12 +- po/he.po | 4 +- po/hi.po | 12 +- po/hr.po | 4 +- po/hu.po | 4 +- po/ia.po | 4 +- po/id.po | 4 +- po/ilo.po | 4 +- po/is.po | 4 +- po/it.po | 12 +- po/ja.po | 12 +- po/ka.po | 4 +- po/kk.po | 4 +- po/km.po | 4 +- po/kn.po | 12 +- po/ko.po | 12 +- po/kw.po | 4 +- po/kw(a)kkcor.po | 4 +- po/kw(a)uccor.po | 4 +- po/kw_GB.po | 4 +- po/ky.po | 4 +- po/libvirt.pot | 4 +- po/lt.po | 4 +- po/lv.po | 4 +- po/mai.po | 4 +- po/mk.po | 4 +- po/ml.po | 12 +- po/mn.po | 4 +- po/mr.po | 4 +- po/ms.po | 4 +- po/nb.po | 4 +- po/nds.po | 4 +- po/ne.po | 4 +- po/nl.po | 12 +- po/nn.po | 4 +- po/nso.po | 4 +- po/or.po | 4 +- po/pa.po | 12 +- po/pl.po | 12 +- po/pt.po | 4 +- po/pt_BR.po | 12 +- po/ro.po | 4 +- po/ru.po | 8 +- po/si.po | 4 +- po/sk.po | 4 +- po/sl.po | 4 +- po/sq.po | 4 +- po/sr.po | 4 +- po/sr(a)latin.po | 4 +- po/sv.po | 12 +- po/ta.po | 4 +- po/te.po | 12 +- po/tg.po | 4 +- po/th.po | 4 +- po/tr.po | 4 +- po/tw.po | 4 +- po/uk.po | 4 +- po/ur.po | 4 +- po/vi.po | 4 +- po/wba.po | 4 +- po/yo.po | 4 +- po/zh_CN.po | 4 +- po/zh_HK.po | 4 +- po/zh_TW.po | 4 +- po/zu.po | 4 +- src/libvirt-admin.c | 30 ++--- src/libvirt-domain-snapshot.c | 32 ++--- src/libvirt-domain.c | 266 +++++++++++++++++++------------------- src/libvirt-host.c | 22 ++-- src/libvirt-interface.c | 16 +-- src/libvirt-lxc.c | 8 +- src/libvirt-network.c | 6 +- src/libvirt-nodedev.c | 14 +- src/libvirt-nwfilter.c | 4 +- src/libvirt-qemu.c | 8 +- src/libvirt-secret.c | 10 +- src/libvirt-storage.c | 40 +++--- src/libvirt-stream.c | 8 +- src/libvirt.c | 2 +- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_driver_nop.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/locking/lock_manager.c | 12 +- src/lxc/lxc_container.c | 6 +- src/lxc/lxc_controller.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 24 ++-- src/qemu/qemu_monitor.c | 8 +- src/qemu/qemu_process.c | 4 +- src/remote/remote_driver.c | 6 +- src/rpc/virnetclientprogram.c | 10 +- src/rpc/virnetclientstream.c | 2 +- src/rpc/virnetserverclient.c | 2 +- src/security/security_manager.c | 2 +- src/util/virfdstream.c | 2 +- src/util/virfile.c | 4 +- src/util/virfirewall.c | 2 +- src/util/virlockspace.c | 2 +- src/util/virrotatingfile.c | 2 +- 131 files changed, 552 insertions(+), 552 deletions(-) diff --git a/cfg.mk b/cfg.mk index f2a053f4b..0f4065b98 100644 --- a/cfg.mk +++ b/cfg.mk @@ -284,11 +284,11 @@ sc_avoid_write: # In debug statements, print flags as bitmask and mode_t as octal. sc_flags_debug: - @prohibit='\<mode=%[0-9.]*[diux]' \ - halt='use %o to debug mode_t values' \ + @prohibit='\<mode=%[0-9.]*[diuxo]' \ + halt='use \"0%o\" to debug mode_t values' \ $(_sc_search_regexp) - @prohibit='[Ff]lags=%[0-9.]*l*[diou]' \ - halt='use %x to debug flag values' \ + @prohibit='[Ff]lags=%[0-9.]*l*[dioux]' \ + halt='use \"0x%x\" to debug flag values' \ $(_sc_search_regexp) # Prefer 'unsigned int flags', along with checks for unknown flags. diff --git a/po/af.po b/po/af.po index fd28e3aeb..9b473cb3b 100644 --- a/po/af.po +++ b/po/af.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/am.po b/po/am.po index 8fb04a4fd..09e98ca69 100644 --- a/po/am.po +++ b/po/am.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/anp.po b/po/anp.po index e50673596..48ff7be3d 100644 --- a/po/anp.po +++ b/po/anp.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/ar.po b/po/ar.po index b1d5c294f..e758f06e8 100644 --- a/po/ar.po +++ b/po/ar.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/as.po b/po/as.po index eefb88d8b..2160dbc46 100644 --- a/po/as.po +++ b/po/as.po @@ -13546,14 +13546,14 @@ msgid "Failed to make mount %s readonly" msgstr "মাউণ্ট %s কেৱল-পঢ়িব পৰা কৰিবলৈ ব্যৰ্থ" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s ধৰণ %s ত %s মাউণ্ট কৰিবলে ব্যৰ্থ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s ধৰণ %s ত %s মাউণ্ট কৰিবলে ব্যৰ্থ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ast.po b/po/ast.po index 0c2cad206..2661eca2e 100644 --- a/po/ast.po +++ b/po/ast.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/bal.po b/po/bal.po index b1c32b83c..4587a9a3f 100644 --- a/po/bal.po +++ b/po/bal.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/be.po b/po/be.po index 0fb3b5416..d371cc537 100644 --- a/po/be.po +++ b/po/be.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/bg.po b/po/bg.po index 383213a5d..2e248f4b0 100644 --- a/po/bg.po +++ b/po/bg.po @@ -13347,12 +13347,12 @@ msgstr "Неуспешно записване на домейн %s в %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Неуспешно записване на домейн %s в %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Неуспешно записване на домейн %s в %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/bn.po b/po/bn.po index 5a2e45c3f..47b27b4a6 100644 --- a/po/bn.po +++ b/po/bn.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/bn_IN.po b/po/bn_IN.po index aaf397692..e3951de15 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -13480,14 +13480,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s-কে devpts-এ মাউন্ট করতে ব্যর্থ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s-কে devpts-এ মাউন্ট করতে ব্যর্থ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/bo.po b/po/bo.po index 3f251f770..ed99933f4 100644 --- a/po/bo.po +++ b/po/bo.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/br.po b/po/br.po index 42c39b37d..e813afd21 100644 --- a/po/br.po +++ b/po/br.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/brx.po b/po/brx.po index 44d27d4a9..20c3c078c 100644 --- a/po/brx.po +++ b/po/brx.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/bs.po b/po/bs.po index b8e52d93b..185bf54bf 100644 --- a/po/bs.po +++ b/po/bs.po @@ -13344,12 +13344,12 @@ msgstr "Spremanje domene %s na lokaciju %s nije uspjelo" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Spremanje domene %s na lokaciju %s nije uspjelo" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Spremanje domene %s na lokaciju %s nije uspjelo" #: src/lxc/lxc_container.c:1035 diff --git a/po/ca.po b/po/ca.po index a6cd73311..30cf7d260 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13335,14 +13335,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "No s'ha pogut desar el domini %s a %s" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "No es pot obtenir informació de disc" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/cs.po b/po/cs.po index 047674f2a..43291c11c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13368,12 +13368,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Nepodařilo se uložit doménu %s do %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Nepodařilo se uložit paměť domény %s do %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/cy.po b/po/cy.po index a33943a78..7e49c1df4 100644 --- a/po/cy.po +++ b/po/cy.po @@ -13353,12 +13353,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/da.po b/po/da.po index 8daa31c12..420c9211d 100644 --- a/po/da.po +++ b/po/da.po @@ -13347,12 +13347,12 @@ msgstr "Kunne ikke gemme domæne %s til %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Kunne ikke gemme domæne %s til %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Kunne ikke gemme domæne %s til %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/de.po b/po/de.po index b98f05340..974342073 100644 --- a/po/de.po +++ b/po/de.po @@ -13761,14 +13761,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Anschließen von %s in %s Typ %s fehlgeschlagen" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Anschließen von %s in %s Typ %s fehlgeschlagen" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/de_CH.po b/po/de_CH.po index 28361783a..e7789bffc 100644 --- a/po/de_CH.po +++ b/po/de_CH.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/el.po b/po/el.po index 31697049c..9fe6178ef 100644 --- a/po/el.po +++ b/po/el.po @@ -13516,12 +13516,12 @@ msgstr "Αποτυχία fork ως δαίμονα: %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Αποτυχία fork ως δαίμονα: %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Αποτυχία fork ως δαίμονα: %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/en_GB.po b/po/en_GB.po index 6b64f13db..7cbaa4353 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -13695,12 +13695,12 @@ msgstr "Failed to make mount %s readonly" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to mount %s on %s type %s flags=%x opts=%s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to mount %s on %s type %s flags=%x opts=%s" #: src/lxc/lxc_container.c:1035 diff --git a/po/eo.po b/po/eo.po index ed468c1b8..aa993b8c7 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/es.po b/po/es.po index 79195945a..811c52abd 100644 --- a/po/es.po +++ b/po/es.po @@ -13828,14 +13828,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "No se pudo montar %s en %s tipo %s" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "No se pudo montar %s en %s tipo %s" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/et.po b/po/et.po index 1048f9d0b..bd91d0d5d 100644 --- a/po/et.po +++ b/po/et.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/eu.po b/po/eu.po index da2cd8682..0fc2ad34a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/fa.po b/po/fa.po index e4354784e..b7099806c 100644 --- a/po/fa.po +++ b/po/fa.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/fi.po b/po/fi.po index da72a683b..4aaa80407 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13350,12 +13350,12 @@ msgstr "Toimialueen %s tallentaminen tiedostoon %s epäonnistui" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Toimialueen %s tallentaminen tiedostoon %s epäonnistui" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Toimialueen %s tallentaminen tiedostoon %s epäonnistui" #: src/lxc/lxc_container.c:1035 diff --git a/po/fr.po b/po/fr.po index 9896140e6..7959ae1c7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13507,12 +13507,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Impossible d'enregistrer le domaine %s dans %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Impossible de vider l'espace mémoire du domaine %s dans %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/gl.po b/po/gl.po index 12d535d92..f44eae8f1 100644 --- a/po/gl.po +++ b/po/gl.po @@ -13352,12 +13352,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/gu.po b/po/gu.po index 7f580ffe7..3cbee0e64 100644 --- a/po/gu.po +++ b/po/gu.po @@ -13510,14 +13510,14 @@ msgid "Failed to make mount %s readonly" msgstr "ફક્ત વાંચી શકાય તેવી માઉન્ટ %s ને બનાવવામાં નિષ્ફળતા" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s પ્રકાર %s પર %s ને માઉન્ટ કરવામાં નિષ્ફળ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s પ્રકાર %s પર %s ને માઉન્ટ કરવામાં નિષ્ફળ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/he.po b/po/he.po index 354240586..dbcdd4ced 100644 --- a/po/he.po +++ b/po/he.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/hi.po b/po/hi.po index e015534f2..a742fa29f 100644 --- a/po/hi.po +++ b/po/hi.po @@ -13537,14 +13537,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s प्रकार %s पर %s को माउंट करने में विफल " #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s प्रकार %s पर %s को माउंट करने में विफल " #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/hr.po b/po/hr.po index 7aacfc227..190dc3aff 100644 --- a/po/hr.po +++ b/po/hr.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/hu.po b/po/hu.po index 63d0cc224..e0a5976a9 100644 --- a/po/hu.po +++ b/po/hu.po @@ -13346,12 +13346,12 @@ msgstr "Nem sikerült menteni a(z) %s tartományt ide: %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Nem sikerült menteni a(z) %s tartományt ide: %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Nem sikerült menteni a(z) %s tartományt ide: %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/ia.po b/po/ia.po index 64788aa05..a5f669b42 100644 --- a/po/ia.po +++ b/po/ia.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/id.po b/po/id.po index 58c46d8da..76fb5e8cb 100644 --- a/po/id.po +++ b/po/id.po @@ -13340,12 +13340,12 @@ msgstr "Gagal menyimpan domain %s ke %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Gagal menyimpan domain %s ke %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Gagal menyimpan domain %s ke %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/ilo.po b/po/ilo.po index b8727c125..f7bc8f816 100644 --- a/po/ilo.po +++ b/po/ilo.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/is.po b/po/is.po index 2ca1c525f..e7181b146 100644 --- a/po/is.po +++ b/po/is.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/it.po b/po/it.po index b3c5ad28e..445305271 100644 --- a/po/it.po +++ b/po/it.po @@ -13427,14 +13427,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Impossibile montare devpts su %s" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Impossibile montare devpts su %s" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ja.po b/po/ja.po index cba215238..50a2ac2e6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -13758,14 +13758,14 @@ msgid "Failed to make mount %s readonly" msgstr "%s の読み取り専用マウントに失敗しました" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s を %s に %s 形式でマウントできませんでした" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s を %s に %s 形式でマウントできませんでした" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ka.po b/po/ka.po index 7e2c6772a..e79e9d741 100644 --- a/po/ka.po +++ b/po/ka.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/kk.po b/po/kk.po index fce538b1e..c6f19d544 100644 --- a/po/kk.po +++ b/po/kk.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/km.po b/po/km.po index c2b233a7b..3e619262a 100644 --- a/po/km.po +++ b/po/km.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/kn.po b/po/kn.po index 0b507f598..a23e0ffa3 100644 --- a/po/kn.po +++ b/po/kn.po @@ -13668,14 +13668,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s ಅನ್ನು, %s ನಲ್ಲಿ (ಬಗೆ %s) ಏರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s ಅನ್ನು, %s ನಲ್ಲಿ (ಬಗೆ %s) ಏರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ko.po b/po/ko.po index cd1c526ec..16391eefe 100644 --- a/po/ko.po +++ b/po/ko.po @@ -13525,14 +13525,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s 유형 %s (%s)에 devfs를 마운트 실패했습니다 " #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "장치 %s를 %s로 %s에 마운트하는데 실패했습니다 " #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/kw.po b/po/kw.po index d62bc7850..61d7e02c4 100644 --- a/po/kw.po +++ b/po/kw.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/kw(a)kkcor.po b/po/kw(a)kkcor.po index c01c32ef4..b46e847b6 100644 --- a/po/kw(a)kkcor.po +++ b/po/kw(a)kkcor.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/kw(a)uccor.po b/po/kw(a)uccor.po index 295d0b31a..536093b38 100644 --- a/po/kw(a)uccor.po +++ b/po/kw(a)uccor.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/kw_GB.po b/po/kw_GB.po index c55619847..09d894b6d 100644 --- a/po/kw_GB.po +++ b/po/kw_GB.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/ky.po b/po/ky.po index 49a5343a6..f36ad41dc 100644 --- a/po/ky.po +++ b/po/ky.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/libvirt.pot b/po/libvirt.pot index 00c9d87a6..57155c1ed 100644 --- a/po/libvirt.pot +++ b/po/libvirt.pot @@ -13254,12 +13254,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/lt.po b/po/lt.po index 70928e7ac..1f493b902 100644 --- a/po/lt.po +++ b/po/lt.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/lv.po b/po/lv.po index 52aa43b14..bd694f376 100644 --- a/po/lv.po +++ b/po/lv.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/mai.po b/po/mai.po index 89bc7dd30..979b87136 100644 --- a/po/mai.po +++ b/po/mai.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/mk.po b/po/mk.po index 01e39b828..de4c4de28 100644 --- a/po/mk.po +++ b/po/mk.po @@ -13347,12 +13347,12 @@ msgstr "Не успеав да го зачувам доменот %s во %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Не успеав да го зачувам доменот %s во %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Не успеав да го зачувам доменот %s во %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/ml.po b/po/ml.po index 4e8755889..fbf824789 100644 --- a/po/ml.po +++ b/po/ml.po @@ -13583,14 +13583,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s, %s-ല്‍ (തരം %s) മൌണ്ട് ചെയ്യുന്നതില്‍ പരാജയം" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s, %s-ല്‍ (തരം %s) മൌണ്ട് ചെയ്യുന്നതില്‍ പരാജയം" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/mn.po b/po/mn.po index c2e2d4e22..96b3d7c76 100644 --- a/po/mn.po +++ b/po/mn.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/mr.po b/po/mr.po index 990e939c9..f88b7d504 100644 --- a/po/mr.po +++ b/po/mr.po @@ -13533,12 +13533,12 @@ msgstr "माउंट %s फक्तवाचनीय करण्यास #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "%s ला, %s प्रकार %s flags=%x वरील माउंट करण्यास अपयशी" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "%s ला %s flags=%x वरील पुन्हा माउंट करण्यास अपयशी" #: src/lxc/lxc_container.c:1035 diff --git a/po/ms.po b/po/ms.po index 63a217c81..a651c12f9 100644 --- a/po/ms.po +++ b/po/ms.po @@ -13298,12 +13298,12 @@ msgstr "gagal untuk mendapatkan domain '%s'" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "gagal untuk mendapatkan domain '%s'" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "gagal untuk mendapatkan domain '%s'" #: src/lxc/lxc_container.c:1035 diff --git a/po/nb.po b/po/nb.po index aa3ee8655..332b6d6db 100644 --- a/po/nb.po +++ b/po/nb.po @@ -13335,12 +13335,12 @@ msgstr "Kunne ikke lagre domenet %s til %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Kunne ikke lagre domenet %s til %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Kunne ikke lagre domenet %s til %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/nds.po b/po/nds.po index d3a8e5b54..0b8a99733 100644 --- a/po/nds.po +++ b/po/nds.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/ne.po b/po/ne.po index 9e030bab9..36e2e94a4 100644 --- a/po/ne.po +++ b/po/ne.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/nl.po b/po/nl.po index 63e336b8e..34161dc51 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13471,14 +13471,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "devpts aankoppelen op %s mislukte" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "devpts aankoppelen op %s mislukte" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/nn.po b/po/nn.po index c40c21163..2311b3b07 100644 --- a/po/nn.po +++ b/po/nn.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/nso.po b/po/nso.po index c437147c0..dc5f113d2 100644 --- a/po/nso.po +++ b/po/nso.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/or.po b/po/or.po index 202b9f785..4ae1bfa57 100644 --- a/po/or.po +++ b/po/or.po @@ -13466,12 +13466,12 @@ msgstr "%s କୁ କେବଳ ପଠନୀୟ ଭାବରେ ସ୍ଥାପ #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "%s କୁ %s ଉପରେ %s ପ୍ରକାର ପତାକାକୁ ସ୍ଥାପନ କରିବାରେ ବିଫଳ=%x" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "%s କୁ %s ଫ୍ଲାଗଗୁଡ଼ିକ ଉପରେ ପୁନଃସ୍ଥାପନ କରିବାରେ ବିଫଳ=%x" #: src/lxc/lxc_container.c:1035 diff --git a/po/pa.po b/po/pa.po index 84caff348..d763d54a6 100644 --- a/po/pa.po +++ b/po/pa.po @@ -13478,14 +13478,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s ਨੂੰ %s ਉੱਪਰ ਕਿਸਮ %s ਮਾਊਂਟ ਕਰਨ ਵਿੱਚ ਫੇਲ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s ਨੂੰ %s ਉੱਪਰ ਕਿਸਮ %s ਮਾਊਂਟ ਕਰਨ ਵਿੱਚ ਫੇਲ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/pl.po b/po/pl.po index 8274723a1..cff867f5b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -13478,14 +13478,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Zamontowanie devpts w %s się nie powiodło" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Zamontowanie devpts w %s się nie powiodło" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/pt.po b/po/pt.po index b4c7cb12f..fb106f93e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -13309,12 +13309,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Não foi possível gravar o domínio %s em %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Não foi possível gravar o 'core' do domínio %s em %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/pt_BR.po b/po/pt_BR.po index 6d5f33e7f..3f0c90979 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13738,14 +13738,14 @@ msgid "Failed to make mount %s readonly" msgstr "Incapaz de transformar o volume %s em somente leitura" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Falha ao montar %s no %s tipo %s " #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Falha ao montar %s no %s tipo %s " #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ro.po b/po/ro.po index 5f0ea4cc8..c0bd8a047 100644 --- a/po/ro.po +++ b/po/ro.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/ru.po b/po/ru.po index 0638f22d6..1209d6f0a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13717,13 +13717,13 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Не удалось смонтировать %s в %s (тип %s, флаги=%x, параметры)" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Не удалось смонтировать %s в %s (тип %s, флаги=%x, параметры)" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/si.po b/po/si.po index 095bf1c88..e7f1f4238 100644 --- a/po/si.po +++ b/po/si.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sk.po b/po/sk.po index 596df133e..964c2c04b 100644 --- a/po/sk.po +++ b/po/sk.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sl.po b/po/sl.po index 3aa71602a..23e7a94e4 100644 --- a/po/sl.po +++ b/po/sl.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sq.po b/po/sq.po index a675a7a45..a45255369 100644 --- a/po/sq.po +++ b/po/sq.po @@ -13259,12 +13259,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/sr.po b/po/sr.po index 40c677ee6..ada521b7d 100644 --- a/po/sr.po +++ b/po/sr.po @@ -13440,12 +13440,12 @@ msgstr "Неуспело креирање уверења ауторизациј #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Неуспело чување домена %s у %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Неуспело чување домена %s у %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index bde06e953..aca46f3fa 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -13440,12 +13440,12 @@ msgstr "Neuspelo kreiranje uverenja autorizacije" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Neuspelo čuvanje domena %s u %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Neuspelo čuvanje domena %s u %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sv.po b/po/sv.po index ee1482a3d..33d1985c1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -13402,14 +13402,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Misslyckades att spara domän %s till %s" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Misslyckades att få diskinformation" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ta.po b/po/ta.po index aeba75ecc..63e38da48 100644 --- a/po/ta.po +++ b/po/ta.po @@ -13724,12 +13724,12 @@ msgstr "%s ஐ வாசிக்க மட்டுமானதாக மாற #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "வகை %3$s flags=%4$x %2$s இல் %1$s ஐ மவுன்ட் செய்தல் தோல்வியடைந்தது" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "%2$s flags=%3$x இல் %1$s ஐ மவுன்ட் செய்தல் தோல்வியடைந்தது" #: src/lxc/lxc_container.c:1035 diff --git a/po/te.po b/po/te.po index b8293bcee..ba679bff7 100644 --- a/po/te.po +++ b/po/te.po @@ -13438,14 +13438,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s ను %s రకం %s పైన మౌంట్ చేయుటకు విఫలమైంది" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s ను %s రకం %s పైన మౌంట్ చేయుటకు విఫలమైంది" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/tg.po b/po/tg.po index 99efec221..40173af37 100644 --- a/po/tg.po +++ b/po/tg.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/th.po b/po/th.po index 49b3a7b27..0f2614fac 100644 --- a/po/th.po +++ b/po/th.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/tr.po b/po/tr.po index b2e51ec2e..09c678377 100644 --- a/po/tr.po +++ b/po/tr.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/tw.po b/po/tw.po index 48f633957..067f56edc 100644 --- a/po/tw.po +++ b/po/tw.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/uk.po b/po/uk.po index 1258eec73..10f257a81 100644 --- a/po/uk.po +++ b/po/uk.po @@ -14194,12 +14194,12 @@ msgstr "Не вдалося зробити змонтований %s прида #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Не вдалося змонтувати %s до %s, тип %s, прапорці=%x" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Не вдалося повторно змонтувати %s до %s, прапорці=%x" #: src/lxc/lxc_container.c:1035 diff --git a/po/ur.po b/po/ur.po index 4300a5708..c5eee9100 100644 --- a/po/ur.po +++ b/po/ur.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/vi.po b/po/vi.po index 20ead9937..aa6a7df72 100644 --- a/po/vi.po +++ b/po/vi.po @@ -13504,12 +13504,12 @@ msgstr "Thất bại khi tạo ủy nhiệm xác thực" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Thất bại khi lắp devpts trên %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Thất bại khi lắp devpts trên %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/wba.po b/po/wba.po index 7724a2cb3..f3c7af4b6 100644 --- a/po/wba.po +++ b/po/wba.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/yo.po b/po/yo.po index 93093dc9f..512df25dc 100644 --- a/po/yo.po +++ b/po/yo.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/zh_CN.po b/po/zh_CN.po index 14596afe6..714ea70dd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13438,12 +13438,12 @@ msgstr "让挂载 %s 成为只读失败" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "在 %s 类型 %s flags=%x 中挂载 %s 失败" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "在%s flags=%x 中重新挂载 %s 失败" #: src/lxc/lxc_container.c:1035 diff --git a/po/zh_HK.po b/po/zh_HK.po index 2a5640e2d..937d9d501 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/zh_TW.po b/po/zh_TW.po index 6045d2872..e8d953974 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -13360,12 +13360,12 @@ msgstr "無法將區域 %s 存至 %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "無法將區域 %s 存至 %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "無法將區域 %s 存至 %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/zu.po b/po/zu.po index 2959d76fe..f4e850eb0 100644 --- a/po/zu.po +++ b/po/zu.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 67d9b6beb..593248f04 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -214,7 +214,7 @@ virAdmConnectOpen(const char *name, unsigned int flags) if (virAdmInitialize() < 0) goto error; - VIR_DEBUG("flags=%x", flags); + VIR_DEBUG("flags=0x%x", flags); virResetLastError(); if (!(conn = virAdmConnectNew())) @@ -711,7 +711,7 @@ virAdmConnectListServers(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, servers=%p, flags=%x", conn, servers, flags); + VIR_DEBUG("conn=%p, servers=%p, flags=0x%x", conn, servers, flags); virResetLastError(); @@ -749,7 +749,7 @@ virAdmConnectLookupServer(virAdmConnectPtr conn, { virAdmServerPtr ret = NULL; - VIR_DEBUG("conn=%p, name=%s, flags=%x", conn, NULLSTR(name), flags); + VIR_DEBUG("conn=%p, name=%s, flags=0x%x", conn, NULLSTR(name), flags); virResetLastError(); virCheckAdmConnectGoto(conn, cleanup); @@ -791,7 +791,7 @@ virAdmServerGetThreadPoolParameters(virAdmServerPtr srv, { int ret = -1; - VIR_DEBUG("srv=%p, params=%p, nparams=%p, flags=%x", + VIR_DEBUG("srv=%p, params=%p, nparams=%p, flags=0x%x", srv, params, nparams, flags); virResetLastError(); @@ -828,7 +828,7 @@ virAdmServerSetThreadPoolParameters(virAdmServerPtr srv, int nparams, unsigned int flags) { - VIR_DEBUG("srv=%p, params=%p, nparams=%x, flags=%x", + VIR_DEBUG("srv=%p, params=%p, nparams=%x, flags=0x%x", srv, params, nparams, flags); virResetLastError(); @@ -870,7 +870,7 @@ virAdmServerListClients(virAdmServerPtr srv, { int ret = -1; - VIR_DEBUG("srv=%p, clients=%p, flags=%x", srv, clients, flags); + VIR_DEBUG("srv=%p, clients=%p, flags=0x%x", srv, clients, flags); virResetLastError(); @@ -908,7 +908,7 @@ virAdmServerLookupClient(virAdmServerPtr srv, { virAdmClientPtr ret = NULL; - VIR_DEBUG("srv=%p, id=%llu, flags=%x", srv, id, flags); + VIR_DEBUG("srv=%p, id=%llu, flags=0x%x", srv, id, flags); virResetLastError(); virCheckAdmServerGoto(srv, error); @@ -955,7 +955,7 @@ virAdmClientGetInfo(virAdmClientPtr client, { int ret = -1; - VIR_DEBUG("client=%p, params=%p, nparams=%p, flags=%x", + VIR_DEBUG("client=%p, params=%p, nparams=%p, flags=0x%x", client, params, nparams, flags); virResetLastError(); @@ -986,7 +986,7 @@ int virAdmClientClose(virAdmClientPtr client, { int ret = -1; - VIR_DEBUG("client=%p, flags=%x", client, flags); + VIR_DEBUG("client=%p, flags=0x%x", client, flags); virResetLastError(); virCheckAdmClientGoto(client, error); @@ -1026,7 +1026,7 @@ virAdmServerGetClientLimits(virAdmServerPtr srv, { int ret = -1; - VIR_DEBUG("srv=%p, flags=%x", srv, flags); + VIR_DEBUG("srv=%p, flags=0x%x", srv, flags); virResetLastError(); virCheckAdmServerGoto(srv, error); @@ -1065,7 +1065,7 @@ virAdmServerSetClientLimits(virAdmServerPtr srv, { int ret = -1; - VIR_DEBUG("srv=%p, params=%p, nparams=%d, flags=%x", srv, params, nparams, + VIR_DEBUG("srv=%p, params=%p, nparams=%d, flags=0x%x", srv, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -1110,7 +1110,7 @@ virAdmConnectGetLoggingOutputs(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); @@ -1151,7 +1151,7 @@ virAdmConnectGetLoggingFilters(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); @@ -1190,7 +1190,7 @@ virAdmConnectSetLoggingOutputs(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, outputs=%s, flags=%x", conn, outputs, flags); + VIR_DEBUG("conn=%p, outputs=%s, flags=0x%x", conn, outputs, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); @@ -1228,7 +1228,7 @@ virAdmConnectSetLoggingFilters(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index 953a586e5..e44a1d1f3 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -205,7 +205,7 @@ virDomainSnapshotCreateXML(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "xmlDesc=%s, flags=%x", xmlDesc, flags); + VIR_DOMAIN_DEBUG(domain, "xmlDesc=%s, flags=0x%x", xmlDesc, flags); virResetLastError(); @@ -261,7 +261,7 @@ virDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -335,7 +335,7 @@ virDomainSnapshotNum(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -417,7 +417,7 @@ virDomainSnapshotListNames(virDomainPtr domain, char **names, int nameslen, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "names=%p, nameslen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "names=%p, nameslen=%d, flags=0x%x", names, nameslen, flags); virResetLastError(); @@ -500,7 +500,7 @@ virDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "snaps=%p, flags=%x", snaps, flags); + VIR_DOMAIN_DEBUG(domain, "snaps=%p, flags=0x%x", snaps, flags); virResetLastError(); @@ -570,7 +570,7 @@ virDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -655,7 +655,7 @@ virDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, names=%p, nameslen=%d, flags=%x", + VIR_DEBUG("snapshot=%p, names=%p, nameslen=%d, flags=0x%x", snapshot, names, nameslen, flags); virResetLastError(); @@ -741,7 +741,7 @@ virDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, snaps=%p, flags=%x", snapshot, snaps, flags); + VIR_DEBUG("snapshot=%p, snaps=%p, flags=0x%x", snapshot, snaps, flags); virResetLastError(); @@ -785,7 +785,7 @@ virDomainSnapshotLookupByName(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "name=%s, flags=%x", name, flags); + VIR_DOMAIN_DEBUG(domain, "name=%s, flags=0x%x", name, flags); virResetLastError(); @@ -823,7 +823,7 @@ virDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -864,7 +864,7 @@ virDomainSnapshotCurrent(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -906,7 +906,7 @@ virDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -944,7 +944,7 @@ virDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -983,7 +983,7 @@ virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -1054,7 +1054,7 @@ virDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -1111,7 +1111,7 @@ virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index ca5a1536a..9c07991e6 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -163,7 +163,7 @@ virDomainPtr virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=0x%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -230,7 +230,7 @@ virDomainCreateXMLWithFiles(virConnectPtr conn, const char *xmlDesc, int *files, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, nfiles=%u, files=%p, flags=%x", + VIR_DEBUG("conn=%p, xmlDesc=%s, nfiles=%u, files=%p, flags=0x%x", conn, NULLSTR(xmlDesc), nfiles, files, flags); virResetLastError(); @@ -521,7 +521,7 @@ virDomainDestroyFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -720,7 +720,7 @@ virDomainPMSuspendForDuration(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "target=%u duration=%llu flags=%x", + VIR_DOMAIN_DEBUG(dom, "target=%u duration=%llu flags=0x%x", target, duration, flags); virResetLastError(); @@ -765,7 +765,7 @@ virDomainPMWakeup(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -894,7 +894,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "to=%s, dxml=%s, flags=%x", + VIR_DOMAIN_DEBUG(domain, "to=%s, dxml=%s, flags=0x%x", to, NULLSTR(dxml), flags); virResetLastError(); @@ -1020,7 +1020,7 @@ int virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, unsigned int flags) { - VIR_DEBUG("conn=%p, from=%s, dxml=%s, flags=%x", + VIR_DEBUG("conn=%p, from=%s, dxml=%s, flags=0x%x", conn, NULLSTR(from), NULLSTR(dxml), flags); virResetLastError(); @@ -1084,7 +1084,7 @@ char * virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, unsigned int flags) { - VIR_DEBUG("conn=%p, file=%s, flags=%x", + VIR_DEBUG("conn=%p, file=%s, flags=0x%x", conn, NULLSTR(file), flags); virResetLastError(); @@ -1157,7 +1157,7 @@ int virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, const char *dxml, unsigned int flags) { - VIR_DEBUG("conn=%p, file=%s, dxml=%s, flags=%x", + VIR_DEBUG("conn=%p, file=%s, dxml=%s, flags=0x%x", conn, NULLSTR(file), NULLSTR(dxml), flags); virResetLastError(); @@ -1232,7 +1232,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "to=%s, flags=%x", to, flags); + VIR_DOMAIN_DEBUG(domain, "to=%s, flags=0x%x", to, flags); virResetLastError(); @@ -1309,7 +1309,7 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "to=%s, dumpformat=%u, flags=%x", + VIR_DOMAIN_DEBUG(domain, "to=%s, dumpformat=%u, flags=0x%x", to, dumpformat, flags); virResetLastError(); @@ -1388,7 +1388,7 @@ virDomainScreenshot(virDomainPtr domain, unsigned int screen, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "stream=%p, flags=%x", stream, flags); + VIR_DOMAIN_DEBUG(domain, "stream=%p, flags=0x%x", stream, flags); virResetLastError(); @@ -1506,7 +1506,7 @@ virDomainShutdownFlags(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -1564,7 +1564,7 @@ virDomainReboot(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -1608,7 +1608,7 @@ virDomainReset(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -1952,7 +1952,7 @@ virDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "memory=%lu, flags=%x", memory, flags); + VIR_DOMAIN_DEBUG(domain, "memory=%lu, flags=0x%x", memory, flags); virResetLastError(); @@ -2012,7 +2012,7 @@ virDomainSetMemoryStatsPeriod(virDomainPtr domain, int period, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "period=%d, flags=%x", period, flags); + VIR_DOMAIN_DEBUG(domain, "period=%d, flags=0x%x", period, flags); virResetLastError(); @@ -2063,7 +2063,7 @@ virDomainSetMemoryParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -2137,7 +2137,7 @@ virDomainGetMemoryParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -2193,7 +2193,7 @@ virDomainSetNumaParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -2258,7 +2258,7 @@ virDomainGetNumaParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -2311,7 +2311,7 @@ virDomainSetBlkioParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -2376,7 +2376,7 @@ virDomainGetBlkioParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -2477,7 +2477,7 @@ virDomainGetState(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "state=%p, reason=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "state=%p, reason=%p, flags=0x%x", state, reason, flags); virResetLastError(); @@ -2519,7 +2519,7 @@ virDomainGetControlInfo(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "info=%p, flags=%x", info, flags); + VIR_DOMAIN_DEBUG(domain, "info=%p, flags=0x%x", info, flags); virResetLastError(); @@ -2569,7 +2569,7 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -2619,7 +2619,7 @@ virConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeConfig, unsigned int flags) { - VIR_DEBUG("conn=%p, format=%s, config=%s, flags=%x", + VIR_DEBUG("conn=%p, format=%s, config=%s, flags=0x%x", conn, NULLSTR(nativeFormat), NULLSTR(nativeConfig), flags); virResetLastError(); @@ -2669,7 +2669,7 @@ virConnectDomainXMLToNative(virConnectPtr conn, const char *domainXml, unsigned int flags) { - VIR_DEBUG("conn=%p, format=%s, xml=%s, flags=%x", + VIR_DEBUG("conn=%p, format=%s, xml=%s, flags=0x%x", conn, NULLSTR(nativeFormat), NULLSTR(domainXml), flags); virResetLastError(); @@ -2731,7 +2731,7 @@ virDomainMigrateVersion1(virDomainPtr domain, unsigned int destflags; VIR_DOMAIN_DEBUG(domain, - "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); ret = virDomainGetInfo(domain, &info); @@ -2830,7 +2830,7 @@ virDomainMigrateVersion2(virDomainPtr domain, unsigned long destflags; VIR_DOMAIN_DEBUG(domain, - "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); /* Prepare the migration. @@ -2872,7 +2872,7 @@ virDomainMigrateVersion2(virDomainPtr domain, destflags = flags & ~(VIR_MIGRATE_ABORT_ON_ERROR | VIR_MIGRATE_AUTO_CONVERGE); - VIR_DEBUG("Prepare2 %p flags=%lx", dconn, destflags); + VIR_DEBUG("Prepare2 %p flags=0x%lx", dconn, destflags); ret = dconn->driver->domainMigratePrepare2 (dconn, &cookie, &cookielen, uri, &uri_out, destflags, dname, bandwidth, dom_xml); @@ -2989,7 +2989,7 @@ virDomainMigrateVersion3Full(virDomainPtr domain, VIR_DOMAIN_DEBUG(domain, "dconn=%p, xmlin=%s, dname=%s, uri=%s, bandwidth=%llu, " - "params=%p, nparams=%d, useParams=%d, flags=%x", + "params=%p, nparams=%d, useParams=%d, flags=0x%x", dconn, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), bandwidth, params, nparams, useParams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -3045,7 +3045,7 @@ virDomainMigrateVersion3Full(virDomainPtr domain, destflags = flags & ~(VIR_MIGRATE_ABORT_ON_ERROR | VIR_MIGRATE_AUTO_CONVERGE); - VIR_DEBUG("Prepare3 %p flags=%x", dconn, destflags); + VIR_DEBUG("Prepare3 %p flags=0x%x", dconn, destflags); cookiein = cookieout; cookieinlen = cookieoutlen; cookieout = NULL; @@ -3423,7 +3423,7 @@ virDomainMigrateUnmanagedParams(virDomainPtr domain, int nparams, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparams=%d, flags=0x%x", NULLSTR(dconnuri), params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -3537,7 +3537,7 @@ virDomainMigrate(virDomainPtr domain, virDomainPtr ddomain = NULL; VIR_DOMAIN_DEBUG(domain, - "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); virResetLastError(); @@ -3692,7 +3692,7 @@ virDomainMigrate2(virDomainPtr domain, virDomainPtr ddomain = NULL; VIR_DOMAIN_DEBUG(domain, - "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); virResetLastError(); @@ -3865,7 +3865,7 @@ virDomainMigrate3(virDomainPtr domain, const char *dxml = NULL; unsigned long long bandwidth = 0; - VIR_DOMAIN_DEBUG(domain, "dconn=%p, params=%p, nparms=%u flags=%x", + VIR_DOMAIN_DEBUG(domain, "dconn=%p, params=%p, nparms=%u flags=0x%x", dconn, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4085,7 +4085,7 @@ virDomainMigrateToURI(virDomainPtr domain, const char *dconnuri = NULL; const char *miguri = NULL; - VIR_DOMAIN_DEBUG(domain, "duri=%p, flags=%lx, dname=%s, bandwidth=%lu", + VIR_DOMAIN_DEBUG(domain, "duri=%p, flags=0x%lx, dname=%s, bandwidth=%lu", NULLSTR(duri), flags, NULLSTR(dname), bandwidth); virResetLastError(); @@ -4157,7 +4157,7 @@ virDomainMigrateToURI2(virDomainPtr domain, unsigned long bandwidth) { VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, miguri=%s, dxml=%s, " - "flags=%lx, dname=%s, bandwidth=%lu", + "flags=0x%lx, dname=%s, bandwidth=%lu", NULLSTR(dconnuri), NULLSTR(miguri), NULLSTR(dxml), flags, NULLSTR(dname), bandwidth); @@ -4230,7 +4230,7 @@ virDomainMigrateToURI3(virDomainPtr domain, unsigned int nparams, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparms=%u flags=%x", + VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparms=%u flags=0x%x", NULLSTR(dconnuri), params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4275,7 +4275,7 @@ virDomainMigratePrepare(virConnectPtr dconn, unsigned long bandwidth) { VIR_DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p, " - "flags=%lx, dname=%s, bandwidth=%lu", dconn, cookie, cookielen, + "flags=0x%lx, dname=%s, bandwidth=%lu", dconn, cookie, cookielen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth); virResetLastError(); @@ -4316,7 +4316,7 @@ virDomainMigratePerform(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cookie=%p, cookielen=%d, uri=%s, flags=%lx, " + VIR_DOMAIN_DEBUG(domain, "cookie=%p, cookielen=%d, uri=%s, flags=0x%lx, " "dname=%s, bandwidth=%lu", cookie, cookielen, uri, flags, NULLSTR(dname), bandwidth); @@ -4358,7 +4358,7 @@ virDomainMigrateFinish(virConnectPtr dconn, unsigned long flags) { VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, " - "flags=%lx", dconn, NULLSTR(dname), cookie, cookielen, + "flags=0x%lx", dconn, NULLSTR(dname), cookie, cookielen, NULLSTR(uri), flags); virResetLastError(); @@ -4400,7 +4400,7 @@ virDomainMigratePrepare2(virConnectPtr dconn, const char *dom_xml) { VIR_DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p," - "flags=%lx, dname=%s, bandwidth=%lu, dom_xml=%s", dconn, + "flags=0x%lx, dname=%s, bandwidth=%lu, dom_xml=%s", dconn, cookie, cookielen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); @@ -4442,7 +4442,7 @@ virDomainMigrateFinish2(virConnectPtr dconn, int retcode) { VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, " - "flags=%lx, retcode=%d", dconn, NULLSTR(dname), cookie, + "flags=0x%lx, retcode=%d", dconn, NULLSTR(dname), cookie, cookielen, NULLSTR(uri), flags, retcode); virResetLastError(); @@ -4481,7 +4481,7 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, unsigned long bandwidth, const char *dom_xml) { - VIR_DEBUG("conn=%p, stream=%p, flags=%lx, dname=%s, " + VIR_DEBUG("conn=%p, stream=%p, flags=0x%lx, dname=%s, " "bandwidth=%lu, dom_xml=%s", conn, st, flags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); @@ -4529,7 +4529,7 @@ virDomainMigrateBegin3(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "xmlin=%s cookieout=%p, cookieoutlen=%p, " - "flags=%lx, dname=%s, bandwidth=%lu", + "flags=0x%lx, dname=%s, bandwidth=%lu", NULLSTR(xmlin), cookieout, cookieoutlen, flags, NULLSTR(dname), bandwidth); @@ -4577,7 +4577,7 @@ virDomainMigratePrepare3(virConnectPtr dconn, const char *dom_xml) { VIR_DEBUG("dconn=%p, cookiein=%p, cookieinlen=%d, cookieout=%p, " - "cookieoutlen=%p, uri_in=%s, uri_out=%p, flags=%lx, dname=%s, " + "cookieoutlen=%p, uri_in=%s, uri_out=%p, flags=0x%lx, dname=%s, " "bandwidth=%lu, dom_xml=%s", dconn, cookiein, cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); @@ -4625,7 +4625,7 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, const char *dom_xml) { VIR_DEBUG("conn=%p, stream=%p, cookiein=%p, cookieinlen=%d, cookieout=%p, " - "cookieoutlen=%p, flags=%lx, dname=%s, bandwidth=%lu, " + "cookieoutlen=%p, flags=0x%lx, dname=%s, bandwidth=%lu, " "dom_xml=%s", conn, st, cookiein, cookieinlen, cookieout, cookieoutlen, flags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); @@ -4681,7 +4681,7 @@ virDomainMigratePerform3(virDomainPtr domain, VIR_DOMAIN_DEBUG(domain, "xmlin=%s cookiein=%p, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, dconnuri=%s, " - "uri=%s, flags=%lx, dname=%s, bandwidth=%lu", + "uri=%s, flags=0x%lx, dname=%s, bandwidth=%lu", NULLSTR(xmlin), cookiein, cookieinlen, cookieout, cookieoutlen, NULLSTR(dconnuri), NULLSTR(uri), flags, NULLSTR(dname), bandwidth); @@ -4730,7 +4730,7 @@ virDomainMigrateFinish3(virConnectPtr dconn, int cancelled) { VIR_DEBUG("dconn=%p, dname=%s, cookiein=%p, cookieinlen=%d, cookieout=%p," - "cookieoutlen=%p, dconnuri=%s, uri=%s, flags=%lx, retcode=%d", + "cookieoutlen=%p, dconnuri=%s, uri=%s, flags=0x%lx, retcode=%d", dconn, NULLSTR(dname), cookiein, cookieinlen, cookieout, cookieoutlen, NULLSTR(dconnuri), NULLSTR(uri), flags, cancelled); @@ -4773,7 +4773,7 @@ virDomainMigrateConfirm3(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, - "cookiein=%p, cookieinlen=%d, flags=%lx, cancelled=%d", + "cookiein=%p, cookieinlen=%d, flags=0x%lx, cancelled=%d", cookiein, cookieinlen, flags, cancelled); virResetLastError(); @@ -4816,7 +4816,7 @@ virDomainMigrateBegin3Params(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%x", + "cookieout=%p, cookieoutlen=%p, flags=0x%x", params, nparams, cookieout, cookieoutlen, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4862,7 +4862,7 @@ virDomainMigratePrepare3Params(virConnectPtr dconn, unsigned int flags) { VIR_DEBUG("dconn=%p, params=%p, nparams=%d, cookiein=%p, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, uri_out=%p, flags=%x", + "cookieout=%p, cookieoutlen=%p, uri_out=%p, flags=0x%x", dconn, params, nparams, cookiein, cookieinlen, cookieout, cookieoutlen, uri_out, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4907,7 +4907,7 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, stream=%p, params=%p, nparams=%d, cookiein=%p, " - "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=%x", + "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=0x%x", conn, st, params, nparams, cookiein, cookieinlen, cookieout, cookieoutlen, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4959,7 +4959,7 @@ virDomainMigratePerform3Params(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparams=%d, cookiein=%p, " - "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=%x", + "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=0x%x", NULLSTR(dconnuri), params, nparams, cookiein, cookieinlen, cookieout, cookieoutlen, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5005,7 +5005,7 @@ virDomainMigrateFinish3Params(virConnectPtr dconn, int cancelled) { VIR_DEBUG("dconn=%p, params=%p, nparams=%d, cookiein=%p, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%x, cancelled=%d", + "cookieout=%p, cookieoutlen=%p, flags=0x%x, cancelled=%d", dconn, params, nparams, cookiein, cookieinlen, cookieout, cookieoutlen, flags, cancelled); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5049,7 +5049,7 @@ virDomainMigrateConfirm3Params(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, cookiein=%p, " - "cookieinlen=%d, flags=%x, cancelled=%d", + "cookieinlen=%d, flags=0x%x, cancelled=%d", params, nparams, cookiein, cookieinlen, flags, cancelled); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5208,7 +5208,7 @@ virDomainGetSchedulerParametersFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p, flags=0x%x", params, nparams, flags); virResetLastError(); @@ -5323,7 +5323,7 @@ virDomainSetSchedulerParametersFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5472,7 +5472,7 @@ virDomainBlockStatsFlags(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=0x%x", disk, params, nparams ? *nparams : -1, flags); virResetLastError(); @@ -5593,7 +5593,7 @@ virDomainSetInterfaceParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "device=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "device=%s, params=%p, nparams=%d, flags=0x%x", device, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5661,7 +5661,7 @@ virDomainGetInterfaceParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "device=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "device=%s, params=%p, nparams=%d, flags=0x%x", device, params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -5739,7 +5739,7 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats, virConnectPtr conn; unsigned long nr_stats_ret = 0; - VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u, flags=%x", + VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u, flags=0x%x", stats, nr_stats, flags); virResetLastError(); @@ -5823,7 +5823,7 @@ virDomainBlockPeek(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, offset=%lld, size=%zi, buffer=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, offset=%lld, size=%zi, buffer=%p, flags=0x%x", disk, offset, size, buffer, flags); virResetLastError(); @@ -5890,7 +5890,7 @@ virDomainBlockResize(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, size=%llu, flags=%x", disk, size, flags); + VIR_DOMAIN_DEBUG(dom, "disk=%s, size=%llu, flags=0x%x", disk, size, flags); virResetLastError(); @@ -5959,7 +5959,7 @@ virDomainMemoryPeek(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "start=%lld, size=%zi, buffer=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "start=%lld, size=%zi, buffer=%p, flags=0x%x", start, size, buffer, flags); virResetLastError(); @@ -6092,7 +6092,7 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "info=%p, flags=%x", info, flags); + VIR_DOMAIN_DEBUG(domain, "info=%p, flags=0x%x", info, flags); virResetLastError(); @@ -6192,7 +6192,7 @@ virDomainDefineXML(virConnectPtr conn, const char *xml) virDomainPtr virDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s flags=%x", conn, NULLSTR(xml), flags); + VIR_DEBUG("conn=%p, xml=%s flags=0x%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -6295,7 +6295,7 @@ virDomainUndefineFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -6473,7 +6473,7 @@ virConnectListAllDomains(virConnectPtr conn, virDomainPtr **domains, unsigned int flags) { - VIR_DEBUG("conn=%p, domains=%p, flags=%x", conn, domains, flags); + VIR_DEBUG("conn=%p, domains=%p, flags=0x%x", conn, domains, flags); virResetLastError(); @@ -6577,7 +6577,7 @@ virDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -6650,7 +6650,7 @@ virDomainCreateWithFiles(virDomainPtr domain, unsigned int nfiles, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "nfiles=%u, files=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "nfiles=%u, files=%p, flags=0x%x", nfiles, files, flags); virResetLastError(); @@ -6774,7 +6774,7 @@ int virDomainInjectNMI(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -6821,7 +6821,7 @@ virDomainSendKey(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "codeset=%u, holdtime=%u, nkeycodes=%u, flags=%x", + VIR_DOMAIN_DEBUG(domain, "codeset=%u, holdtime=%u, nkeycodes=%u, flags=0x%x", codeset, holdtime, nkeycodes, flags); virResetLastError(); @@ -6897,7 +6897,7 @@ virDomainSendProcessSignal(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "pid=%lld, signum=%u flags=%x", + VIR_DOMAIN_DEBUG(domain, "pid=%lld, signum=%u flags=0x%x", pid_value, signum, flags); virResetLastError(); @@ -7024,7 +7024,7 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "nvcpus=%u, flags=%x", nvcpus, flags); + VIR_DOMAIN_DEBUG(domain, "nvcpus=%u, flags=0x%x", nvcpus, flags); virResetLastError(); @@ -7092,7 +7092,7 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -7216,7 +7216,7 @@ virDomainPinVcpuFlags(virDomainPtr domain, unsigned int vcpu, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "vcpu=%u, cpumap=%p, maplen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "vcpu=%u, cpumap=%p, maplen=%d, flags=0x%x", vcpu, cpumap, maplen, flags); virResetLastError(); @@ -7274,7 +7274,7 @@ virDomainGetVcpuPinInfo(virDomainPtr domain, int ncpumaps, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "ncpumaps=%d, cpumaps=%p, maplen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "ncpumaps=%d, cpumaps=%p, maplen=%d, flags=0x%x", ncpumaps, cpumaps, maplen, flags); virResetLastError(); @@ -7351,7 +7351,7 @@ virDomainPinEmulator(virDomainPtr domain, unsigned char *cpumap, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=0x%x", cpumap, maplen, flags); virResetLastError(); @@ -7406,7 +7406,7 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned char *cpumap, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=0x%x", cpumap, maplen, flags); virResetLastError(); @@ -7573,7 +7573,7 @@ virDomainGetIOThreadInfo(virDomainPtr dom, virDomainIOThreadInfoPtr **info, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "info=%p flags=%x", info, flags); + VIR_DOMAIN_DEBUG(dom, "info=%p flags=0x%x", info, flags); virResetLastError(); @@ -7721,7 +7721,7 @@ virDomainAddIOThread(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "iothread_id=%u, flags=%x", + VIR_DOMAIN_DEBUG(domain, "iothread_id=%u, flags=0x%x", iothread_id, flags); virResetLastError(); @@ -7780,7 +7780,7 @@ virDomainDelIOThread(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "iothread_id=%u, flags=%x", iothread_id, flags); + VIR_DOMAIN_DEBUG(domain, "iothread_id=%u, flags=0x%x", iothread_id, flags); virResetLastError(); @@ -7932,7 +7932,7 @@ virDomainSetMetadata(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, - "type=%d, metadata='%s', key='%s', uri='%s', flags=%x", + "type=%d, metadata='%s', key='%s', uri='%s', flags=0x%x", type, NULLSTR(metadata), NULLSTR(key), NULLSTR(uri), flags); @@ -8014,7 +8014,7 @@ virDomainGetMetadata(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "type=%d, uri='%s', flags=%x", + VIR_DOMAIN_DEBUG(domain, "type=%d, uri='%s', flags=0x%x", type, NULLSTR(uri), flags); virResetLastError(); @@ -8138,7 +8138,7 @@ virDomainAttachDeviceFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=%x", xml, flags); + VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=0x%x", xml, flags); virResetLastError(); @@ -8264,7 +8264,7 @@ virDomainDetachDeviceFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=%x", xml, flags); + VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=0x%x", xml, flags); virResetLastError(); @@ -8320,7 +8320,7 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=%x", xml, flags); + VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=0x%x", xml, flags); virResetLastError(); @@ -8665,7 +8665,7 @@ virDomainGetJobStats(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "type=%p, params=%p, nparams=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "type=%p, params=%p, nparams=%p, flags=0x%x", type, params, nparams, flags); virResetLastError(); @@ -8754,7 +8754,7 @@ virDomainMigrateSetMaxDowntime(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "downtime=%llu, flags=%x", downtime, flags); + VIR_DOMAIN_DEBUG(domain, "downtime=%llu, flags=0x%x", downtime, flags); virResetLastError(); @@ -8795,7 +8795,7 @@ virDomainMigrateGetMaxDowntime(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "downtime = %p, flags=%x", downtime, flags); + VIR_DOMAIN_DEBUG(domain, "downtime = %p, flags=0x%x", downtime, flags); virResetLastError(); @@ -8835,7 +8835,7 @@ virDomainMigrateGetCompressionCache(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cacheSize=%p, flags=%x", cacheSize, flags); + VIR_DOMAIN_DEBUG(domain, "cacheSize=%p, flags=0x%x", cacheSize, flags); virResetLastError(); @@ -8879,7 +8879,7 @@ virDomainMigrateSetCompressionCache(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cacheSize=%llu, flags=%x", cacheSize, flags); + VIR_DOMAIN_DEBUG(domain, "cacheSize=%llu, flags=0x%x", cacheSize, flags); virResetLastError(); @@ -8921,7 +8921,7 @@ virDomainMigrateSetMaxSpeed(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "bandwidth=%lu, flags=%x", bandwidth, flags); + VIR_DOMAIN_DEBUG(domain, "bandwidth=%lu, flags=0x%x", bandwidth, flags); virResetLastError(); @@ -8961,7 +8961,7 @@ virDomainMigrateGetMaxSpeed(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "bandwidth = %p, flags=%x", bandwidth, flags); + VIR_DOMAIN_DEBUG(domain, "bandwidth = %p, flags=0x%x", bandwidth, flags); virResetLastError(); @@ -9228,7 +9228,7 @@ virDomainManagedSave(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -9275,7 +9275,7 @@ virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -9313,7 +9313,7 @@ virDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -9360,7 +9360,7 @@ virDomainManagedSaveGetXMLDesc(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -9418,7 +9418,7 @@ virDomainManagedSaveDefineXML(virDomainPtr domain, const char *dxml, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -9484,7 +9484,7 @@ virDomainOpenConsole(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "dev_name=%s, st=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "dev_name=%s, st=%p, flags=0x%x", NULLSTR(dev_name), st, flags); virResetLastError(); @@ -9548,7 +9548,7 @@ virDomainOpenChannel(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "name=%s, st=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "name=%s, st=%p, flags=0x%x", NULLSTR(name), st, flags); virResetLastError(); @@ -9604,7 +9604,7 @@ int virDomainGetPerfEvents(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p flags=0x%x", params, nparams, flags); virResetLastError(); @@ -9654,7 +9654,7 @@ int virDomainSetPerfEvents(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -9736,7 +9736,7 @@ virDomainBlockJobAbort(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, flags=%x", disk, flags); + VIR_DOMAIN_DEBUG(dom, "disk=%s, flags=0x%x", disk, flags); virResetLastError(); @@ -9798,7 +9798,7 @@ virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, info=%p, flags=%x", disk, info, flags); + VIR_DOMAIN_DEBUG(dom, "disk=%s, info=%p, flags=0x%x", disk, info, flags); virResetLastError(); @@ -9861,7 +9861,7 @@ virDomainBlockJobSetSpeed(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, bandwidth=%lu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, bandwidth=%lu, flags=0x%x", disk, bandwidth, flags); virResetLastError(); @@ -9935,7 +9935,7 @@ virDomainBlockPull(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, bandwidth=%lu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, bandwidth=%lu, flags=0x%x", disk, bandwidth, flags); virResetLastError(); @@ -10080,7 +10080,7 @@ virDomainBlockRebase(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, base=%s, bandwidth=%lu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, base=%s, bandwidth=%lu, flags=0x%x", disk, NULLSTR(base), bandwidth, flags); virResetLastError(); @@ -10204,7 +10204,7 @@ virDomainBlockCopy(virDomainPtr dom, const char *disk, virConnectPtr conn; VIR_DOMAIN_DEBUG(dom, - "disk=%s, destxml=%s, params=%p, nparams=%d, flags=%x", + "disk=%s, destxml=%s, params=%p, nparams=%d, flags=0x%x", disk, destxml, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -10347,7 +10347,7 @@ virDomainBlockCommit(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, base=%s, top=%s, bandwidth=%lu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, base=%s, top=%s, bandwidth=%lu, flags=0x%x", disk, NULLSTR(base), NULLSTR(top), bandwidth, flags); virResetLastError(); @@ -10406,7 +10406,7 @@ virDomainOpenGraphics(virDomainPtr dom, unsigned int flags) { struct stat sb; - VIR_DOMAIN_DEBUG(dom, "idx=%u, fd=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "idx=%u, fd=%d, flags=0x%x", idx, fd, flags); virResetLastError(); @@ -10478,7 +10478,7 @@ virDomainOpenGraphicsFD(virDomainPtr dom, unsigned int idx, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "idx=%u, flags=%x", idx, flags); + VIR_DOMAIN_DEBUG(dom, "idx=%u, flags=0x%x", idx, flags); virResetLastError(); @@ -10538,7 +10538,7 @@ virDomainSetBlockIoTune(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=0x%x", disk, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -10613,7 +10613,7 @@ virDomainGetBlockIoTune(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=0x%x", NULLSTR(disk), params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -10740,7 +10740,7 @@ virDomainGetCPUStats(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, - "params=%p, nparams=%d, start_cpu=%d, ncpus=%u, flags=%x", + "params=%p, nparams=%d, start_cpu=%d, ncpus=%u, flags=0x%x", params, nparams, start_cpu, ncpus, flags); virResetLastError(); @@ -10831,7 +10831,7 @@ virDomainGetDiskErrors(virDomainPtr dom, unsigned int maxerrors, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "errors=%p, maxerrors=%u, flags=%x", + VIR_DOMAIN_DEBUG(dom, "errors=%p, maxerrors=%u, flags=0x%x", errors, maxerrors, flags); virResetLastError(); @@ -10877,7 +10877,7 @@ virDomainGetHostname(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -10925,7 +10925,7 @@ virDomainFSTrim(virDomainPtr dom, unsigned long long minimum, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "mountPoint=%s, minimum=%llu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "mountPoint=%s, minimum=%llu, flags=0x%x", mountPoint, minimum, flags); virResetLastError(); @@ -10969,7 +10969,7 @@ virDomainFSFreeze(virDomainPtr dom, unsigned int nmountpoints, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "mountpoints=%p, nmountpoints=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "mountpoints=%p, nmountpoints=%d, flags=0x%x", mountpoints, nmountpoints, flags); virResetLastError(); @@ -11015,7 +11015,7 @@ virDomainFSThaw(virDomainPtr dom, unsigned int nmountpoints, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -11063,7 +11063,7 @@ virDomainGetTime(virDomainPtr dom, unsigned int *nseconds, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "seconds=%p, nseconds=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "seconds=%p, nseconds=%p, flags=0x%x", seconds, nseconds, flags); virResetLastError(); @@ -11113,7 +11113,7 @@ virDomainSetTime(virDomainPtr dom, unsigned int nseconds, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "seconds=%lld, nseconds=%u, flags=%x", + VIR_DOMAIN_DEBUG(dom, "seconds=%lld, nseconds=%u, flags=0x%x", seconds, nseconds, flags); virResetLastError(); @@ -11159,7 +11159,7 @@ virDomainSetUserPassword(virDomainPtr dom, const char *password, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "user=%s, password=%s, flags=%x", + VIR_DOMAIN_DEBUG(dom, "user=%s, password=%s, flags=0x%x", NULLSTR(user), NULLSTR(password), flags); virResetLastError(); @@ -11212,7 +11212,7 @@ virConnectGetDomainCapabilities(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, emulatorbin=%s, arch=%s, " - "machine=%s, virttype=%s, flags=%x", + "machine=%s, virttype=%s, flags=0x%x", conn, NULLSTR(emulatorbin), NULLSTR(arch), NULLSTR(machine), NULLSTR(virttype), flags); @@ -11643,7 +11643,7 @@ virDomainGetFSInfo(virDomainPtr dom, virDomainFSInfoPtr **info, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "info=%p, flags=%x", info, flags); + VIR_DOMAIN_DEBUG(dom, "info=%p, flags=0x%x", info, flags); virResetLastError(); @@ -11761,7 +11761,7 @@ virDomainInterfaceAddresses(virDomainPtr dom, unsigned int source, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "ifaces=%p, source=%d, flags=%x", ifaces, source, flags); + VIR_DOMAIN_DEBUG(dom, "ifaces=%p, source=%d, flags=0x%x", ifaces, source, flags); virResetLastError(); @@ -11845,7 +11845,7 @@ virDomainGetGuestVcpus(virDomainPtr domain, unsigned int *nparams, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p, flags=0x%x", params, nparams, flags); virResetLastError(); @@ -11903,7 +11903,7 @@ virDomainSetGuestVcpus(virDomainPtr domain, int state, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "cpumap='%s' state=%x flags=%x", + VIR_DOMAIN_DEBUG(domain, "cpumap='%s' state=%x flags=0x%x", NULLSTR(cpumap), state, flags); virResetLastError(); @@ -11952,7 +11952,7 @@ virDomainSetVcpu(virDomainPtr domain, int state, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "vcpumap='%s' state=%i flags=%x", + VIR_DOMAIN_DEBUG(domain, "vcpumap='%s' state=%i flags=0x%x", NULLSTR(vcpumap), state, flags); virResetLastError(); @@ -12007,7 +12007,7 @@ virDomainSetBlockThreshold(virDomainPtr domain, unsigned long long threshold, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "dev='%s' threshold=%llu flags=%x", + VIR_DOMAIN_DEBUG(domain, "dev='%s' threshold=%llu flags=0x%x", NULLSTR(dev), threshold, flags); virResetLastError(); diff --git a/src/libvirt-host.c b/src/libvirt-host.c index 335798abf..0d8a2d1e8 100644 --- a/src/libvirt-host.c +++ b/src/libvirt-host.c @@ -285,7 +285,7 @@ virConnectGetURI(virConnectPtr conn) char * virConnectGetSysinfo(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); @@ -475,7 +475,7 @@ virNodeGetCPUStats(virConnectPtr conn, virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { - VIR_DEBUG("conn=%p, cpuNum=%d, params=%p, nparams=%d, flags=%x", + VIR_DEBUG("conn=%p, cpuNum=%d, params=%p, nparams=%d, flags=0x%x", conn, cpuNum, params, nparams ? *nparams : -1, flags); virResetLastError(); @@ -562,7 +562,7 @@ virNodeGetMemoryStats(virConnectPtr conn, virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { - VIR_DEBUG("conn=%p, cellNum=%d, params=%p, nparams=%d, flags=%x", + VIR_DEBUG("conn=%p, cellNum=%d, params=%p, nparams=%d, flags=0x%x", conn, cellNum, params, nparams ? *nparams : -1, flags); virResetLastError(); @@ -655,7 +655,7 @@ virNodeSuspendForDuration(virConnectPtr conn, unsigned long long duration, unsigned int flags) { - VIR_DEBUG("conn=%p, target=%d, duration=%lld, flags=%x", + VIR_DEBUG("conn=%p, target=%d, duration=%lld, flags=0x%x", conn, target, duration, flags); virResetLastError(); @@ -708,7 +708,7 @@ virNodeGetMemoryParameters(virConnectPtr conn, int *nparams, unsigned int flags) { - VIR_DEBUG("conn=%p, params=%p, nparams=%p, flags=%x", + VIR_DEBUG("conn=%p, params=%p, nparams=%p, flags=0x%x", conn, params, nparams, flags); virResetLastError(); @@ -767,7 +767,7 @@ virNodeSetMemoryParameters(virConnectPtr conn, int nparams, unsigned int flags) { - VIR_DEBUG("conn=%p, params=%p, nparams=%d, flags=%x", + VIR_DEBUG("conn=%p, params=%p, nparams=%d, flags=0x%x", conn, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -968,7 +968,7 @@ virConnectCompareCPU(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=0x%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -1012,7 +1012,7 @@ int virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models, unsigned int flags) { - VIR_DEBUG("conn=%p, arch=%s, models=%p, flags=%x", + VIR_DEBUG("conn=%p, arch=%s, models=%p, flags=0x%x", conn, NULLSTR(arch), models, flags); virResetLastError(); @@ -1069,7 +1069,7 @@ virConnectBaselineCPU(virConnectPtr conn, { size_t i; - VIR_DEBUG("conn=%p, xmlCPUs=%p, ncpus=%u, flags=%x", + VIR_DEBUG("conn=%p, xmlCPUs=%p, ncpus=%u, flags=0x%x", conn, xmlCPUs, ncpus, flags); if (xmlCPUs) { for (i = 0; i < ncpus; i++) @@ -1294,7 +1294,7 @@ virNodeGetCPUMap(virConnectPtr conn, unsigned int *online, unsigned int flags) { - VIR_DEBUG("conn=%p, cpumap=%p, online=%p, flags=%x", + VIR_DEBUG("conn=%p, cpumap=%p, online=%p, flags=0x%x", conn, cpumap, online, flags); virResetLastError(); @@ -1384,7 +1384,7 @@ virNodeGetFreePages(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, npages=%u, pages=%p, startCell=%u, " - "cellCount=%u, counts=%p, flags=%x", + "cellCount=%u, counts=%p, flags=0x%x", conn, npages, pages, startCell, cellCount, counts, flags); virResetLastError(); diff --git a/src/libvirt-interface.c b/src/libvirt-interface.c index 7c8996c58..bb79101ab 100644 --- a/src/libvirt-interface.c +++ b/src/libvirt-interface.c @@ -82,7 +82,7 @@ virConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, unsigned int flags) { - VIR_DEBUG("conn=%p, ifaces=%p, flags=%x", conn, ifaces, flags); + VIR_DEBUG("conn=%p, ifaces=%p, flags=0x%x", conn, ifaces, flags); virResetLastError(); @@ -410,7 +410,7 @@ char * virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("iface=%p, flags=%x", iface, flags); + VIR_DEBUG("iface=%p, flags=0x%x", iface, flags); virResetLastError(); @@ -460,7 +460,7 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) virInterfacePtr virInterfaceDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); + VIR_DEBUG("conn=%p, xml=%s, flags=0x%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -550,7 +550,7 @@ int virInterfaceCreate(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("iface=%p, flags=%x", iface, flags); + VIR_DEBUG("iface=%p, flags=0x%x", iface, flags); virResetLastError(); @@ -597,7 +597,7 @@ int virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("iface=%p, flags=%x", iface, flags); + VIR_DEBUG("iface=%p, flags=0x%x", iface, flags); virResetLastError(); @@ -696,7 +696,7 @@ virInterfaceFree(virInterfacePtr iface) int virInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); @@ -736,7 +736,7 @@ virInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) int virInterfaceChangeCommit(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); @@ -776,7 +776,7 @@ virInterfaceChangeCommit(virConnectPtr conn, unsigned int flags) int virInterfaceChangeRollback(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index c487eceba..c9f214648 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -68,7 +68,7 @@ virDomainLxcOpenNamespace(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "fdlist=%p flags=%x", fdlist, flags); + VIR_DOMAIN_DEBUG(domain, "fdlist=%p flags=0x%x", fdlist, flags); virResetLastError(); @@ -128,7 +128,7 @@ virDomainLxcEnterNamespace(virDomainPtr domain, size_t i; VIR_DOMAIN_DEBUG(domain, "nfdlist=%d, fdlist=%p, " - "noldfdlist=%p, oldfdlist=%p, flags=%x", + "noldfdlist=%p, oldfdlist=%p, flags=0x%x", nfdlist, fdlist, noldfdlist, oldfdlist, flags); virResetLastError(); @@ -190,7 +190,7 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model, virSecurityLabelPtr oldlabel, unsigned int flags) { - VIR_DEBUG("model=%p, label=%p, oldlabel=%p, flags=%x", + VIR_DEBUG("model=%p, label=%p, oldlabel=%p, flags=0x%x", model, label, oldlabel, flags); virResetLastError(); @@ -293,7 +293,7 @@ int virDomainLxcEnterCGroup(virDomainPtr domain, virConnectPtr conn; virCgroupPtr cgroup = NULL; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 5c5a0ee22..da3354300 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -91,7 +91,7 @@ virConnectListAllNetworks(virConnectPtr conn, virNetworkPtr **nets, unsigned int flags) { - VIR_DEBUG("conn=%p, nets=%p, flags=%x", conn, nets, flags); + VIR_DEBUG("conn=%p, nets=%p, flags=0x%x", conn, nets, flags); virResetLastError(); @@ -790,7 +790,7 @@ char * virNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("network=%p, flags=%x", network, flags); + VIR_DEBUG("network=%p, flags=0x%x", network, flags); virResetLastError(); @@ -1199,7 +1199,7 @@ virNetworkGetDHCPLeases(virNetworkPtr network, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("network=%p, mac='%s' leases=%p, flags=%x", + VIR_DEBUG("network=%p, mac='%s' leases=%p, flags=0x%x", network, NULLSTR(mac), leases, flags); virResetLastError(); diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index f85c16bbc..493b21f56 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -44,7 +44,7 @@ VIR_LOG_INIT("libvirt.nodedev"); int virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) { - VIR_DEBUG("conn=%p, cap=%s, flags=%x", conn, NULLSTR(cap), flags); + VIR_DEBUG("conn=%p, cap=%s, flags=0x%x", conn, NULLSTR(cap), flags); virResetLastError(); @@ -114,7 +114,7 @@ virConnectListAllNodeDevices(virConnectPtr conn, virNodeDevicePtr **devices, unsigned int flags) { - VIR_DEBUG("conn=%p, devices=%p, flags=%x", conn, devices, flags); + VIR_DEBUG("conn=%p, devices=%p, flags=0x%x", conn, devices, flags); virResetLastError(); @@ -163,7 +163,7 @@ virNodeListDevices(virConnectPtr conn, char **const names, int maxnames, unsigned int flags) { - VIR_DEBUG("conn=%p, cap=%s, names=%p, maxnames=%d, flags=%x", + VIR_DEBUG("conn=%p, cap=%s, names=%p, maxnames=%d, flags=0x%x", conn, NULLSTR(cap), names, maxnames, flags); virResetLastError(); @@ -246,7 +246,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, const char *wwpn, unsigned int flags) { - VIR_DEBUG("conn=%p, wwnn=%s, wwpn=%s, flags=%x", conn, NULLSTR(wwnn), NULLSTR(wwpn), flags); + VIR_DEBUG("conn=%p, wwnn=%s, wwpn=%s, flags=0x%x", conn, NULLSTR(wwnn), NULLSTR(wwpn), flags); virResetLastError(); @@ -285,7 +285,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, char * virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) { - VIR_DEBUG("dev=%p, conn=%p, flags=%x", dev, dev ? dev->conn : NULL, flags); + VIR_DEBUG("dev=%p, conn=%p, flags=0x%x", dev, dev ? dev->conn : NULL, flags); virResetLastError(); @@ -570,7 +570,7 @@ virNodeDeviceDetachFlags(virNodeDevicePtr dev, const char *driverName, unsigned int flags) { - VIR_DEBUG("dev=%p, conn=%p driverName=%s flags=%x", + VIR_DEBUG("dev=%p, conn=%p driverName=%s flags=0x%x", dev, dev ? dev->conn : NULL, driverName ? driverName : "(default)", flags); @@ -698,7 +698,7 @@ virNodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=0x%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); diff --git a/src/libvirt-nwfilter.c b/src/libvirt-nwfilter.c index 30c7c1040..43e2b164e 100644 --- a/src/libvirt-nwfilter.c +++ b/src/libvirt-nwfilter.c @@ -83,7 +83,7 @@ virConnectListAllNWFilters(virConnectPtr conn, virNWFilterPtr **filters, unsigned int flags) { - VIR_DEBUG("conn=%p, filters=%p, flags=%x", conn, filters, flags); + VIR_DEBUG("conn=%p, filters=%p, flags=0x%x", conn, filters, flags); virResetLastError(); @@ -460,7 +460,7 @@ char * virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("nwfilter=%p, flags=%x", nwfilter, flags); + VIR_DEBUG("nwfilter=%p, flags=0x%x", nwfilter, flags); virResetLastError(); diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index fed08fc38..43f63839e 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -70,7 +70,7 @@ virDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cmd=%s, result=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "cmd=%s, result=%p, flags=0x%x", cmd, result, flags); virResetLastError(); @@ -134,7 +134,7 @@ virDomainQemuAttach(virConnectPtr conn, unsigned int flags) { pid_t pid = pid_value; - VIR_DEBUG("conn=%p, pid=%u, flags=%x", conn, pid_value, flags); + VIR_DEBUG("conn=%p, pid=%u, flags=0x%x", conn, pid_value, flags); virResetLastError(); @@ -193,7 +193,7 @@ virDomainQemuAgentCommand(virDomainPtr domain, virConnectPtr conn; char *ret; - VIR_DOMAIN_DEBUG(domain, "cmd=%s, timeout=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "cmd=%s, timeout=%d, flags=0x%x", cmd, timeout, flags); virResetLastError(); @@ -272,7 +272,7 @@ virConnectDomainQemuMonitorEventRegister(virConnectPtr conn, unsigned int flags) { VIR_DOMAIN_DEBUG(dom, - "conn=%p, event=%s, cb=%p, opaque=%p, freecb=%p, flags=%x", + "conn=%p, event=%s, cb=%p, opaque=%p, freecb=%p, flags=0x%x", conn, NULLSTR(event), cb, opaque, freecb, flags); virResetLastError(); diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index d9244c252..447d93f33 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -122,7 +122,7 @@ virConnectListAllSecrets(virConnectPtr conn, virSecretPtr **secrets, unsigned int flags) { - VIR_DEBUG("conn=%p, secrets=%p, flags=%x", conn, secrets, flags); + VIR_DEBUG("conn=%p, secrets=%p, flags=0x%x", conn, secrets, flags); virResetLastError(); @@ -333,7 +333,7 @@ virSecretLookupByUsage(virConnectPtr conn, virSecretPtr virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); + VIR_DEBUG("conn=%p, xml=%s, flags=0x%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -487,7 +487,7 @@ virSecretGetXMLDesc(virSecretPtr secret, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("secret=%p, flags=%x", secret, flags); + VIR_DEBUG("secret=%p, flags=0x%x", secret, flags); virResetLastError(); @@ -528,7 +528,7 @@ virSecretSetValue(virSecretPtr secret, const unsigned char *value, { virConnectPtr conn; - VIR_DEBUG("secret=%p, value=%p, value_size=%zu, flags=%x", secret, value, + VIR_DEBUG("secret=%p, value=%p, value_size=%zu, flags=0x%x", secret, value, value_size, flags); virResetLastError(); @@ -572,7 +572,7 @@ virSecretGetValue(virSecretPtr secret, size_t *value_size, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("secret=%p, value_size=%p, flags=%x", secret, value_size, flags); + VIR_DEBUG("secret=%p, value_size=%p, flags=0x%x", secret, value_size, flags); virResetLastError(); diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 2cefc3c91..9ab0fe28e 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -106,7 +106,7 @@ virConnectListAllStoragePools(virConnectPtr conn, virStoragePoolPtr **pools, unsigned int flags) { - VIR_DEBUG("conn=%p, pools=%p, flags=%x", conn, pools, flags); + VIR_DEBUG("conn=%p, pools=%p, flags=0x%x", conn, pools, flags); virResetLastError(); @@ -319,7 +319,7 @@ virConnectFindStoragePoolSources(virConnectPtr conn, const char *srcSpec, unsigned int flags) { - VIR_DEBUG("conn=%p, type=%s, src=%s, flags=%x", + VIR_DEBUG("conn=%p, type=%s, src=%s, flags=0x%x", conn, NULLSTR(type), NULLSTR(srcSpec), flags); virResetLastError(); @@ -517,7 +517,7 @@ virStoragePoolCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=0x%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -560,7 +560,7 @@ virStoragePoolDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); + VIR_DEBUG("conn=%p, xml=%s, flags=0x%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -601,7 +601,7 @@ virStoragePoolBuild(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -677,7 +677,7 @@ virStoragePoolCreate(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -759,7 +759,7 @@ virStoragePoolDelete(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -855,7 +855,7 @@ virStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -1019,7 +1019,7 @@ virStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -1144,7 +1144,7 @@ virStoragePoolListAllVolumes(virStoragePoolPtr pool, virStorageVolPtr **vols, unsigned int flags) { - VIR_DEBUG("pool=%p, vols=%p, flags=%x", pool, vols, flags); + VIR_DEBUG("pool=%p, vols=%p, flags=0x%x", pool, vols, flags); virResetLastError(); @@ -1455,7 +1455,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("pool=%p, xmlDesc=%s, flags=%x", pool, NULLSTR(xmlDesc), flags); + VIR_DEBUG("pool=%p, xmlDesc=%s, flags=0x%x", pool, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -1507,7 +1507,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, virStorageVolPtr clonevol, unsigned int flags) { - VIR_DEBUG("pool=%p, xmlDesc=%s, clonevol=%p, flags=%x", + VIR_DEBUG("pool=%p, xmlDesc=%s, clonevol=%p, flags=0x%x", pool, NULLSTR(xmlDesc), clonevol, flags); virResetLastError(); @@ -1569,7 +1569,7 @@ virStorageVolDownload(virStorageVolPtr vol, unsigned long long length, unsigned int flags) { - VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=%x", + VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=0x%x", vol, stream, offset, length, flags); virResetLastError(); @@ -1648,7 +1648,7 @@ virStorageVolUpload(virStorageVolPtr vol, unsigned long long length, unsigned int flags) { - VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=%x", + VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=0x%x", vol, stream, offset, length, flags); virResetLastError(); @@ -1699,7 +1699,7 @@ virStorageVolDelete(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, flags=%x", vol, flags); + VIR_DEBUG("vol=%p, flags=0x%x", vol, flags); virResetLastError(); @@ -1748,7 +1748,7 @@ virStorageVolWipe(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, flags=%x", vol, flags); + VIR_DEBUG("vol=%p, flags=0x%x", vol, flags); virResetLastError(); @@ -1795,7 +1795,7 @@ virStorageVolWipePattern(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, algorithm=%u, flags=%x", vol, algorithm, flags); + VIR_DEBUG("vol=%p, algorithm=%u, flags=0x%x", vol, algorithm, flags); virResetLastError(); @@ -1940,7 +1940,7 @@ virStorageVolGetInfoFlags(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, info=%p, flags=%x", vol, info, flags); + VIR_DEBUG("vol=%p, info=%p, flags=0x%x", vol, info, flags); virResetLastError(); @@ -1983,7 +1983,7 @@ virStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, flags=%x", vol, flags); + VIR_DEBUG("vol=%p, flags=0x%x", vol, flags); virResetLastError(); @@ -2086,7 +2086,7 @@ virStorageVolResize(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p capacity=%llu flags=%x", vol, capacity, flags); + VIR_DEBUG("vol=%p capacity=%llu flags=0x%x", vol, capacity, flags); virResetLastError(); diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index 83f2d201a..3204b7b17 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -55,7 +55,7 @@ virStreamNew(virConnectPtr conn, { virStreamPtr st; - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); @@ -349,7 +349,7 @@ virStreamRecvFlags(virStreamPtr stream, size_t nbytes, unsigned int flags) { - VIR_DEBUG("stream=%p, data=%p, nbytes=%zu flags=%x", + VIR_DEBUG("stream=%p, data=%p, nbytes=%zu flags=0x%x", stream, data, nbytes, flags); virResetLastError(); @@ -415,7 +415,7 @@ virStreamSendHole(virStreamPtr stream, long long length, unsigned int flags) { - VIR_DEBUG("stream=%p, length=%lld flags=%x", + VIR_DEBUG("stream=%p, length=%lld flags=0x%x", stream, length, flags); virResetLastError(); @@ -458,7 +458,7 @@ virStreamRecvHole(virStreamPtr stream, long long *length, unsigned int flags) { - VIR_DEBUG("stream=%p, length=%p flags=%x", + VIR_DEBUG("stream=%p, length=%p flags=0x%x", stream, length, flags); virResetLastError(); diff --git a/src/libvirt.c b/src/libvirt.c index 52462e3ab..6d66fa43e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1242,7 +1242,7 @@ virConnectOpenAuth(const char *name, if (virInitialize() < 0) goto error; - VIR_DEBUG("name=%s, auth=%p, flags=%x", NULLSTR(name), auth, flags); + VIR_DEBUG("name=%s, auth=%p, flags=0x%x", NULLSTR(name), auth, flags); virResetLastError(); ret = virConnectOpenInternal(name, auth, flags); if (!ret) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 41e7bcb7c..c3fc18a8a 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -328,7 +328,7 @@ static int virLockManagerLockDaemonInit(unsigned int version, const char *configFile, unsigned int flags) { - VIR_DEBUG("version=%u configFile=%s flags=%x", version, NULLSTR(configFile), flags); + VIR_DEBUG("version=%u configFile=%s flags=0x%x", version, NULLSTR(configFile), flags); virCheckFlags(0, -1); diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index 93a988ef7..b5eb2952e 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -33,7 +33,7 @@ static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED, const char *configFile ATTRIBUTE_UNUSED, unsigned int flags_unused ATTRIBUTE_UNUSED) { - VIR_DEBUG("version=%u configFile=%s flags=%x", + VIR_DEBUG("version=%u configFile=%s flags=0x%x", version, NULLSTR(configFile), flags_unused); return 0; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 7513df4d7..345cf0a77 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -427,7 +427,7 @@ static int virLockManagerSanlockInit(unsigned int version, { virLockManagerSanlockDriverPtr driver; - VIR_DEBUG("version=%u configFile=%s flags=%x", + VIR_DEBUG("version=%u configFile=%s flags=0x%x", version, NULLSTR(configFile), flags); virCheckFlags(0, -1); diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index a002ea836..6efaea9cd 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -129,7 +129,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, char *modfile = NULL; char *configFile = NULL; - VIR_DEBUG("name=%s driverName=%s configDir=%s flags=%x", + VIR_DEBUG("name=%s driverName=%s configDir=%s flags=0x%x", name, driverName, configDir, flags); if (virAsprintf(&configFile, "%s/%s-%s.conf", @@ -301,7 +301,7 @@ virLockManagerPtr virLockManagerNew(virLockDriverPtr driver, unsigned int flags) { virLockManagerPtr lock; - VIR_DEBUG("driver=%p type=%u nparams=%zu params=%p flags=%x", + VIR_DEBUG("driver=%p type=%u nparams=%zu params=%p flags=0x%x", driver, type, nparams, params, flags); virLockManagerLogParams(nparams, params); @@ -328,7 +328,7 @@ int virLockManagerAddResource(virLockManagerPtr lock, virLockManagerParamPtr params, unsigned int flags) { - VIR_DEBUG("lock=%p type=%u name=%s nparams=%zu params=%p flags=%x", + VIR_DEBUG("lock=%p type=%u name=%s nparams=%zu params=%p flags=0x%x", lock, type, name, nparams, params, flags); virLockManagerLogParams(nparams, params); @@ -346,7 +346,7 @@ int virLockManagerAcquire(virLockManagerPtr lock, virDomainLockFailureAction action, int *fd) { - VIR_DEBUG("lock=%p state='%s' flags=%x action=%d fd=%p", + VIR_DEBUG("lock=%p state='%s' flags=0x%x action=%d fd=%p", lock, NULLSTR(state), flags, action, fd); CHECK_MANAGER(drvAcquire, -1); @@ -362,7 +362,7 @@ int virLockManagerRelease(virLockManagerPtr lock, char **state, unsigned int flags) { - VIR_DEBUG("lock=%p state=%p flags=%x", lock, state, flags); + VIR_DEBUG("lock=%p state=%p flags=0x%x", lock, state, flags); CHECK_MANAGER(drvRelease, -1); @@ -374,7 +374,7 @@ int virLockManagerInquire(virLockManagerPtr lock, char **state, unsigned int flags) { - VIR_DEBUG("lock=%p state=%p flags=%x", lock, state, flags); + VIR_DEBUG("lock=%p state=%p flags=0x%x", lock, state, flags); CHECK_MANAGER(drvInquire, -1); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 6309abe4b..ec6d6a86b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -983,11 +983,11 @@ static int lxcContainerMountBasicFS(bool userns_enabled, */ bindOverReadonly = !!(mnt_mflags & MS_RDONLY); - VIR_DEBUG("Mount %s on %s type=%s flags=%x", + VIR_DEBUG("Mount %s on %s type=%s flags=0x%x", mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY); if (mount(mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { virReportSystemError(errno, - _("Failed to mount %s on %s type %s flags=%x"), + _("Failed to mount %s on %s type %s flags=0x%x"), mnt_src, mnt->dst, NULLSTR(mnt->type), mnt_mflags & ~MS_RDONLY); goto cleanup; @@ -997,7 +997,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled, mount(mnt_src, mnt->dst, NULL, MS_BIND|MS_REMOUNT|mnt_mflags|MS_RDONLY, NULL) < 0) { virReportSystemError(errno, - _("Failed to re-mount %s on %s flags=%x"), + _("Failed to re-mount %s on %s flags=0x%x"), mnt_src, mnt->dst, MS_BIND|MS_REMOUNT|MS_RDONLY); goto cleanup; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 1b9d21521..c5e67df93 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2143,7 +2143,7 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) ptsgid, (mount_options ? mount_options : "")) < 0) goto cleanup; - VIR_DEBUG("Mount devpts on %s type=tmpfs flags=%x, opts=%s", + VIR_DEBUG("Mount devpts on %s type=tmpfs flags=0x%x, opts=%s", devpts, MS_NOSUID, opts); if (mount("devpts", devpts, "devpts", MS_NOSUID, opts) < 0) { virReportSystemError(errno, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b9f761d53..4855c9047 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10938,7 +10938,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, int nstats; int ret = -1; - VIR_DEBUG("params=%p, flags=%x", params, flags); + VIR_DEBUG("params=%p, flags=0x%x", params, flags); virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 492815b60..32904b7b9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1917,7 +1917,7 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, vm=%p, xmlin=%s, dname=%s," " cookieout=%p, cookieoutlen=%p," - " nmigrate_disks=%zu, migrate_disks=%p, flags=%lx", + " nmigrate_disks=%zu, migrate_disks=%p, flags=0x%lx", driver, vm, NULLSTR(xmlin), NULLSTR(dname), cookieout, cookieoutlen, nmigrate_disks, migrate_disks, flags); @@ -2887,7 +2887,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, st=%p, def=%p, " - "origname=%s, flags=%lx", + "origname=%s, flags=0x%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, st, *def, origname, flags); @@ -2961,7 +2961,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " "def=%p, origname=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, flags=%lx", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, flags=0x%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, *def, origname, NULLSTR(listenAddress), @@ -3144,7 +3144,7 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver, qemuDomainJobInfoPtr jobInfo = NULL; VIR_DEBUG("driver=%p, conn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " - "flags=%x, retcode=%d", + "flags=0x%x, retcode=%d", driver, conn, vm, NULLSTR(cookiein), cookieinlen, flags, retcode); @@ -3601,7 +3601,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, int rc; VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " + "cookieout=%p, cookieoutlen=%p, flags=0x%lx, resource=%lu, " "spec=%p (dest=%d, fwd=%d), dconn=%p, graphicsuri=%s, " "nmigrate_disks=%zu, migrate_disks=%p", driver, vm, NULLSTR(cookiein), cookieinlen, @@ -3955,7 +3955,7 @@ static int doNativeMigrate(virQEMUDriverPtr driver, qemuMigrationSpec spec; VIR_DEBUG("driver=%p, vm=%p, uri=%s, cookiein=%s, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " + "cookieout=%p, cookieoutlen=%p, flags=0x%lx, resource=%lu, " "graphicsuri=%s, nmigrate_disks=%zu migrate_disks=%p", driver, vm, uri, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, @@ -4033,7 +4033,7 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, int fds[2] = { -1, -1 }; VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " + "cookieout=%p, cookieoutlen=%p, flags=0x%lx, resource=%lu, " "graphicsuri=%s, nmigrate_disks=%zu, migrate_disks=%p", driver, vm, st, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, @@ -4099,7 +4099,7 @@ static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, qemuMonitorMigrationParams migParams = { 0 }; VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, vm=%p, dconnuri=%s, " - "flags=%lx, dname=%s, resource=%lu", + "flags=0x%lx, dname=%s, resource=%lu", driver, sconn, dconn, vm, NULLSTR(dconnuri), flags, NULLSTR(dname), resource); @@ -4273,7 +4273,7 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, dconnuri=%s, vm=%p, xmlin=%s, " "dname=%s, uri=%s, graphicsuri=%s, listenAddress=%s, " "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " - "bandwidth=%llu, useParams=%d, flags=%lx", + "bandwidth=%llu, useParams=%d, flags=0x%lx", driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort, @@ -4622,7 +4622,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, uri=%s, " "graphicsuri=%s, listenAddress=%s, nmigrate_disks=%zu, " - "migrate_disks=%p, nbdPort=%d, flags=%lx, dname=%s, " + "migrate_disks=%p, nbdPort=%d, flags=0x%lx, dname=%s, " "resource=%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), @@ -4972,7 +4972,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, "uri=%s, graphicsuri=%s, listenAddress=%s, " "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " "cookiein=%s, cookieinlen=%d, cookieout=%p, cookieoutlen=%p, " - "flags=%lx, dname=%s, resource=%lu, v3proto=%d", + "flags=0x%lx, dname=%s, resource=%lu, v3proto=%d", driver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort, @@ -5150,7 +5150,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, bool doKill = true; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", + "cookieout=%p, cookieoutlen=%p, flags=0x%lx, retcode=%d", driver, dconn, vm, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, retcode); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 69f14d028..363ad76cf 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2649,7 +2649,7 @@ qemuMonitorMigrateToFd(qemuMonitorPtr mon, int fd) { int ret; - VIR_DEBUG("fd=%d flags=%x", fd, flags); + VIR_DEBUG("fd=%d flags=0x%x", fd, flags); QEMU_CHECK_MONITOR(mon); @@ -2679,7 +2679,7 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, { int ret; char *uri = NULL; - VIR_DEBUG("hostname=%s port=%d flags=%x", hostname, port, flags); + VIR_DEBUG("hostname=%s port=%d flags=0x%x", hostname, port, flags); QEMU_CHECK_MONITOR(mon); @@ -2708,7 +2708,7 @@ qemuMonitorMigrateToCommand(qemuMonitorPtr mon, char *argstr; char *dest = NULL; int ret = -1; - VIR_DEBUG("argv=%p flags=%x", argv, flags); + VIR_DEBUG("argv=%p flags=0x%x", argv, flags); QEMU_CHECK_MONITOR(mon); @@ -3330,7 +3330,7 @@ qemuMonitorDriveMirror(qemuMonitorPtr mon, unsigned int flags) { VIR_DEBUG("device=%s, file=%s, format=%s, bandwidth=%lld, " - "granularity=%#x, buf_size=%lld, flags=%x", + "granularity=%#x, buf_size=%lld, flags=0x%x", device, file, NULLSTR(format), bandwidth, granularity, buf_size, flags); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e6cc41e13..c104985aa 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6028,7 +6028,7 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) { int ret; - VIR_DEBUG("vm=%p name=%s pid=%lld flags=%x", + VIR_DEBUG("vm=%p name=%s pid=%lld flags=0x%x", vm, vm->def->name, (long long) vm->pid, flags); @@ -6109,7 +6109,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); VIR_DEBUG("Shutting down vm=%p name=%s id=%d pid=%lld, " - "reason=%s, asyncJob=%s, flags=%x", + "reason=%s, asyncJob=%s, flags=0x%x", vm, vm->def->name, vm->def->id, (long long) vm->pid, virDomainShutoffReasonTypeToString(reason), diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7f814cd4f..00e8086d5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5646,7 +5646,7 @@ remoteStreamRecvFlags(virStreamPtr st, size_t nbytes, unsigned int flags) { - VIR_DEBUG("st=%p data=%p nbytes=%zu flags=%x", + VIR_DEBUG("st=%p data=%p nbytes=%zu flags=0x%x", st, data, nbytes, flags); struct private_data *priv = st->conn->privateData; virNetClientStreamPtr privst = st->privateData; @@ -5690,7 +5690,7 @@ remoteStreamSendHole(virStreamPtr st, long long length, unsigned int flags) { - VIR_DEBUG("st=%p length=%lld flags=%x", + VIR_DEBUG("st=%p length=%lld flags=0x%x", st, length, flags); struct private_data *priv = st->conn->privateData; virNetClientStreamPtr privst = st->privateData; @@ -5724,7 +5724,7 @@ remoteStreamRecvHole(virStreamPtr st, virNetClientStreamPtr privst = st->privateData; int rv; - VIR_DEBUG("st=%p length=%p flags=%x", + VIR_DEBUG("st=%p length=%p flags=0x%x", st, length, flags); virCheckFlags(0, -1); diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index c9d57ec6b..d81a05542 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -221,25 +221,25 @@ int virNetClientProgramDispatch(virNetClientProgramPtr prog, /* Check version, etc. */ if (msg->header.prog != prog->program) { - VIR_ERROR(_("program mismatch in event (actual %x, expected %x)"), + VIR_ERROR(_("program mismatch in event (actual 0x%x, expected 0x%x)"), msg->header.prog, prog->program); return -1; } if (msg->header.vers != prog->version) { - VIR_ERROR(_("version mismatch in event (actual %x, expected %x)"), + VIR_ERROR(_("version mismatch in event (actual 0x%x, expected 0x%x)"), msg->header.vers, prog->version); return -1; } if (msg->header.status != VIR_NET_OK) { - VIR_ERROR(_("status mismatch in event (actual %x, expected %x)"), + VIR_ERROR(_("status mismatch in event (actual 0x%x, expected 0x%x)"), msg->header.status, VIR_NET_OK); return -1; } if (msg->header.type != VIR_NET_MESSAGE) { - VIR_ERROR(_("type mismatch in event (actual %x, expected %x)"), + VIR_ERROR(_("type mismatch in event (actual 0x%x, expected 0x%x)"), msg->header.type, VIR_NET_MESSAGE); return -1; } @@ -247,7 +247,7 @@ int virNetClientProgramDispatch(virNetClientProgramPtr prog, event = virNetClientProgramGetEvent(prog, msg->header.proc); if (!event) { - VIR_ERROR(_("No event expected with procedure %x"), + VIR_ERROR(_("No event expected with procedure 0x%x"), msg->header.proc); return -1; } diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 54729c84f..2f037db0d 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -475,7 +475,7 @@ int virNetClientStreamRecvPacket(virNetClientStreamPtr st, int rv = -1; size_t want; - VIR_DEBUG("st=%p client=%p data=%p nbytes=%zu nonblock=%d flags=%x", + VIR_DEBUG("st=%p client=%p data=%p nbytes=%zu nonblock=%d flags=0x%x", st, client, data, nbytes, nonblock, flags); virCheckFlags(VIR_STREAM_RECV_STOP_AT_HOLE, -1); diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 85857bc3e..fa4e5daab 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -198,7 +198,7 @@ virNetServerClientCalculateHandleMode(virNetServerClientPtr client) #if WITH_GNUTLS } #endif - VIR_DEBUG("mode=%o", mode); + VIR_DEBUG("mode=0%o", mode); return mode; } diff --git a/src/security/security_manager.c b/src/security/security_manager.c index e43c99d4f..60cfc92e7 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -82,7 +82,7 @@ virSecurityManagerNewDriver(virSecurityDriverPtr drv, if (virSecurityManagerInitialize() < 0) return NULL; - VIR_DEBUG("drv=%p (%s) virtDriver=%s flags=%x", + VIR_DEBUG("drv=%p (%s) virtDriver=%s flags=0x%x", drv, drv->name, virtDriver, flags); virCheckFlags(VIR_SECURITY_MANAGER_NEW_MASK, NULL); diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index f54ba15ae..be40379a9 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -1227,7 +1227,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, struct stat sb; virFDStreamThreadDataPtr threadData = NULL; - VIR_DEBUG("st=%p path=%s oflags=%x offset=%llu length=%llu mode=%o", + VIR_DEBUG("st=%p path=%s oflags=0x%x offset=%llu length=%llu mode=0%o", st, path, oflags, offset, length, mode); oflags |= O_NOCTTY | O_BINARY; diff --git a/src/util/virfile.c b/src/util/virfile.c index e746d871b..a03a23fab 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -244,7 +244,7 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) } else if ((mode & O_ACCMODE) == O_WRONLY) { output = true; } else if ((mode & O_ACCMODE) != O_RDONLY) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected mode %x for %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected mode 0x%x for %s"), mode & O_ACCMODE, name); goto error; } @@ -3593,7 +3593,7 @@ virFileSetupDev(const char *path, goto cleanup; } - VIR_DEBUG("Mount devfs on %s type=tmpfs flags=%lx, opts=%s", + VIR_DEBUG("Mount devfs on %s type=tmpfs flags=0x%lx, opts=%s", path, mount_flags, mount_options); if (mount("devfs", path, mount_fs, mount_flags, mount_options) < 0) { virReportSystemError(errno, diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 4de38d592..66d1c72c9 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -868,7 +868,7 @@ virFirewallApplyGroup(virFirewallPtr firewall, bool ignoreErrors = (group->actionFlags & VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS); size_t i; - VIR_INFO("Starting transaction for firewall=%p group=%p flags=%x", + VIR_INFO("Starting transaction for firewall=%p group=%p flags=0x%x", firewall, group, group->actionFlags); firewall->currentGroup = idx; group->addingRollback = false; diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 7aa0f1dc3..41af0cdb6 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -617,7 +617,7 @@ int virLockSpaceAcquireResource(virLockSpacePtr lockspace, int ret = -1; virLockSpaceResourcePtr res; - VIR_DEBUG("lockspace=%p resname=%s flags=%x owner=%lld", + VIR_DEBUG("lockspace=%p resname=%s flags=0x%x owner=%lld", lockspace, resname, flags, (unsigned long long)owner); virCheckFlags(VIR_LOCK_SPACE_ACQUIRE_SHARED | diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 83a695f6f..ca62a8e02 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -103,7 +103,7 @@ virRotatingFileWriterEntryNew(const char *path, virRotatingFileWriterEntryPtr entry; struct stat sb; - VIR_DEBUG("Opening %s mode=%02o", path, mode); + VIR_DEBUG("Opening %s mode=0%02o", path, mode); if (VIR_ALLOC(entry) < 0) return NULL; -- 2.13.5

4 6

[libvirt] [PATCH 0/2] qemu: block: Unbreak node name detection
by Peter Krempa 25 Sep '17

25 Sep '17

I've messed up a refactor. See 2/2 for details. Peter Krempa (2): qemu: block: Don't lookup node names if they are already known qemu: block: Use correct alias when extracting disk node names src/qemu/qemu_block.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) -- 2.14.1

3 4

[libvirt] [PATCH go-xml] add VCPUs support in Domain
by zhenwei.pi 25 Sep '17

25 Sep '17

Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 12 ++++++++++++ domain_test.go | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/domain.go b/domain.go index 3ab54a1..d81ac2a 100644 --- a/domain.go +++ b/domain.go @@ -533,6 +533,17 @@ type DomainVCPU struct { Value int `xml:",chardata"` } +type DomainVCPUsVCPU struct { + Id *uint `xml:"id,attr,omitempty"` + Enabled string `xml:"enabled,attr,omitempty"` + Hotpluggable string `xml:"hotpluggable,attr,omitempty"` + Order *uint `xml:"order,attr,omitempty"` +} + +type DomainVCPUs struct { + VCPU []DomainVCPUsVCPU `xml:"vcpu"` +} + type DomainCPUModel struct { Fallback string `xml:"fallback,attr,omitempty"` Value string `xml:",chardata"` @@ -678,6 +689,7 @@ type Domain struct { CurrentMemory *DomainMemory `xml:"currentMemory"` MaximumMemory *DomainMaxMemory `xml:"maxMemory"` VCPU *DomainVCPU `xml:"vcpu"` + VCPUs *DomainVCPUs `xml:"vcpus"` Resource *DomainResource `xml:"resource"` SysInfo *DomainSysInfo `xml:"sysinfo"` OS *DomainOS `xml:"os"` diff --git a/domain_test.go b/domain_test.go index 0ae9594..3ff1dc1 100644 --- a/domain_test.go +++ b/domain_test.go @@ -62,6 +62,10 @@ var tabletPort uint = 1 var nicAverage int = 1000 var nicBurst int = 10000 +var vcpuId0 uint = 0 +var vcpuOrder0 uint = 1 +var vcpuId1 uint = 1 + var domainTestData = []struct { Object Document Expected []string @@ -635,6 +639,22 @@ var domainTestData = []struct { Current: "1", Value: 2, }, + VCPUs: &DomainVCPUs{ + VCPU: []DomainVCPUsVCPU{ + DomainVCPUsVCPU{ + Id: &vcpuId0, + Enabled: "yes", + Hotpluggable: "no", + Order: &vcpuOrder0, + }, + DomainVCPUsVCPU{ + Id: &vcpuId1, + Enabled: "no", + Hotpluggable: "yes", + Order: nil, + }, + }, + }, Devices: &DomainDeviceList{ Interfaces: []DomainInterface{ DomainInterface{ @@ -656,6 +676,10 @@ var domainTestData = []struct { `<domain type="kvm">`, ` <name>test</name>`, ` <vcpu placement="static" cpuset="1-4,^3,6" current="1">2</vcpu>`, + ` <vcpus>`, + ` <vcpu id="0" enabled="yes" hotpluggable="no" order="1"></vcpu>`, + ` <vcpu id="1" enabled="no" hotpluggable="yes"></vcpu>`, + ` </vcpus>`, ` <devices>`, ` <interface type="network">`, ` <mac address="00:11:22:33:44:55"></mac>`, -- 2.7.4

2 1

[libvirt] [PATCH libvirt-cim 0/2] Small improvements
by Andrea Bolognani 25 Sep '17

25 Sep '17

The first patch will make it possible to have a nicer CI setup. The second one is just something that I couldn't help fixing while preparing the first one :) Andrea Bolognani (2): maint: Rename autoconfiscate.sh to autogen.sh README: Point to git repository README | 9 ++++++--- autoconfiscate.sh => autogen.sh | 0 2 files changed, 6 insertions(+), 3 deletions(-) rename autoconfiscate.sh => autogen.sh (100%) -- 2.13.5

4 10

[libvirt] [PATCH v2 00/14] Use secret objects to pass iSCSI passwords
by John Ferlan 24 Sep '17

24 Sep '17

v1: https://www.redhat.com/archives/libvir-list/2017-September/msg00100.html Other than patch 1 from v1, everything changed... Don't bother comparing. Highlights - * Two patches of essentially movement of virSecretUsageType because I found (as seen in patch 2) that a previous patch altered the API being used to format the <secret type='%s'.../> field. * The next 8 patches add XML parsing for "auth/secret" and "encryption/ secret" processing as a child of the _virStorageSource and then move the private data from qemuDomainDiskPrivatePtr to a new private data for qemuDomainDiskSrcPrivatePtr. * Patch11 is "somewhat" of an add on and not necessary for this series, but while I was thinking about it and because I believe it'll be useful for some other work - I added a hash lookaside table to be able to map the domain disk source secret objects to the usageType and secret by usage or UUID that was used to generate them. The output in the running XML on my host looks like: <diskSecretObjectAlias> <diskObject alias='hostdev0-secret0'> <secret type='iscsi' usage='libvirtiscsi'/> </diskObject> <diskObject alias='virtio-disk2-secret0'> <secret type='iscsi' usage='libvirtiscsi'/> </diskObject> </diskSecretObjectAlias> My thought was that since the username is included in the object already that it wouldn't have to be saved, but it could be as well. * Patch12 is the capabilities change from patch 1 of v1 with the one minor addition to add the capability to the qemu2.10 replies/xml. * Patch13 is the adjust in virstoragefile and virstoragetest to fetch and format the user/password-secret objects similar to how RBD did this. Guess where I tripped across the virSecretUsageTypeToString issue... * Patch14 handles all the magic in order to use AES secrets for both SCSI disk and hostdev including command line and hotplug. Of "possible concern": * I found no "easy way" manage whether the secret information was a child of disk or disk->src, so I moved everything on output to disk->src even if it was read as a child of disk. The concern here for me is migration and save files... If the domain xml changes - an older libvirt could "lose" the secret information since it wouldn't be a child of disk. It is possible to keep the "top-level" as a child of disk and then any backingStore would be able to have their own. But I figured I'd give the move or else a shot first. John Ferlan (14): util: Move virSecretUsageType to virsecret.h util: Fix secret generation in virStorageSourceParseRBDColonString conf: Add/Allow parsing the auth in the disk source conf: Move auth formatting to disk source docs: Add news article regarding auth placement qemu: Introduce privateData for _virStorageSource conf: Add/Allow parsing the encryption in the disk source conf: Move LUKS encryption formatting to disk source docs: Add news article for encryption in disk source qemu: Move encinfo from private disk to private disk src qemu: Add disk secret object hash table to _qemuDomainObjPrivate qemu: Get capabilities to use iscsi password-secret argument util: Add iSCSI auth/password-secret processing qemu: Use secret objects to pass iSCSI passwords docs/formatdomain.html.in | 81 +++-- docs/news.xml | 24 ++ docs/schemas/domaincommon.rng | 50 ++- src/conf/domain_conf.c | 142 ++++++++- src/conf/domain_conf.h | 1 + src/conf/secret_conf.c | 4 +- src/conf/secret_conf.h | 2 - src/qemu/qemu_block.c | 64 +++- src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 85 ++++- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 351 ++++++++++++++++++++- src/qemu/qemu_domain.h | 25 +- src/qemu/qemu_hotplug.c | 97 +++++- src/qemu/qemu_parse_command.c | 2 +- src/storage/storage_driver.c | 1 + src/util/virsecret.c | 2 + src/util/virsecret.h | 3 + src/util/virstoragefile.c | 34 +- src/util/virstoragefile.h | 3 + .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 6 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 6 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...xml2argv-disk-drive-network-iscsi-auth-AES.args | 41 +++ ...uxml2argv-disk-drive-network-iscsi-auth-AES.xml | 43 +++ ...v-disk-drive-network-iscsi-source-auth-both.xml | 36 +++ ...2argv-disk-drive-network-iscsi-source-auth.args | 31 ++ ...l2argv-disk-drive-network-iscsi-source-auth.xml | 43 +++ ...rgv-disk-drive-network-rbd-source-auth-both.xml | 45 +++ ...ml2argv-disk-drive-network-rbd-source-auth.args | 29 ++ ...xml2argv-disk-drive-network-rbd-source-auth.xml | 42 +++ ...ml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args | 45 +++ ...xml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml | 48 +++ .../qemuxml2argv-luks-disks-source-both.xml | 40 +++ .../qemuxml2argv-luks-disks-source.args | 62 ++++ .../qemuxml2argv-luks-disks-source.xml | 81 +++++ tests/qemuxml2argvtest.c | 16 + .../qemuxml2xmlout-disk-backing-chains-active.xml | 6 +- ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 6 +- ...emuxml2xmlout-disk-drive-network-iscsi-auth.xml | 12 +- ...xmlout-disk-drive-network-iscsi-source-auth.xml | 47 +++ .../qemuxml2xmlout-disk-drive-network-rbd-auth.xml | 6 +- ...l2xmlout-disk-drive-network-rbd-source-auth.xml | 47 +++ .../qemuxml2xmlout-disk-source-pool-mode.xml | 3 - .../qemuxml2xmlout-luks-disks-source.xml | 84 +++++ .../qemuxml2xmlout-luks-disks.xml | 48 ++- tests/qemuxml2xmltest.c | 3 + tests/virstoragetest.c | 21 ++ tools/virsh-secret.c | 2 +- 53 files changed, 1756 insertions(+), 128 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-source-auth-both.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-source-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-source-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-source-auth-both.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-source-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-source-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source-both.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-source-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-source-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks-source.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml -- 2.13.5

2 30