- Devel - libvirt List Archives

[libvirt] [PATCH] Fix race condition in abort of stream
by Daniel P. Berrange 17 Aug '11

17 Aug '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> If a stream gets a server initiated abort, the client may still send an abort request before it receives the server side abort. This causes the server to send back another abort for the stream. Since the protocol defines that abort is the last thing to be sent, the client gets confused by this second abort from the server. If the stream is already shutdown, just drop any client requested abort, rather than sending back another message. This fixes the regression from previous versions. Tested as follows In one virsh session virsh # start foo virsh # console foo In other virsh session virsh # destroy foo The first virsh session should be able to continue issues commands without error. Prior to this patch it saw virsh # list error: Failed to list active domains error: An error occurred, but the cause is unknown virsh # list error: Failed to list active domains error: no call waiting for reply with prog 536903814 vers 1 serial 9 * src/rpc/virnetserverprogram.c: Drop abort requests for streams which no longer exist --- src/rpc/virnetserverprogram.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 63a6b6d..ca80ae0 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -257,23 +257,14 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog, * stream packets after we closed down a stream. Just drop & ignore * these. */ - if (msg->header.status == VIR_NET_CONTINUE) { - VIR_INFO("Ignoring unexpected stream data serial=%d proc=%d status=%d", - msg->header.serial, msg->header.proc, msg->header.status); - /* Send a dummy reply to free up 'msg' & unblock client rx */ - memset(msg, 0, sizeof(*msg)); - msg->header.type = VIR_NET_REPLY; - if (virNetServerClientSendMessage(client, msg) < 0) { - ret = -1; - goto cleanup; - } - } else { - VIR_INFO("Unexpected stream control message serial=%d proc=%d status=%d", - msg->header.serial, msg->header.proc, msg->header.status); - virNetError(VIR_ERR_RPC, - _("Unexpected stream control message serial=%d proc=%d status=%d"), - msg->header.serial, msg->header.proc, msg->header.status); - goto error; + VIR_INFO("Ignoring unexpected stream data serial=%d proc=%d status=%d", + msg->header.serial, msg->header.proc, msg->header.status); + /* Send a dummy reply to free up 'msg' & unblock client rx */ + memset(msg, 0, sizeof(*msg)); + msg->header.type = VIR_NET_REPLY; + if (virNetServerClientSendMessage(client, msg) < 0) { + ret = -1; + goto cleanup; } ret = 0; break; -- 1.7.6

2 1

[libvirt] [PATCH 0/4 v3] macvtap: Support for sending port profile message for a SRIOV VF to its PF
by Roopa Prabhu 17 Aug '11

17 Aug '11

This patch tries to fix getPhysFn in macvtap.c to get the physical function(PF) of the direct attach interface, if the interface is a SR-IOV VF. It moves some of the sriov pci device handling code from node_device_driver to src/util/pci.[ch]. This patch series implements the following 01/4 - pci: Move some pci sriov helper code out of node device driver to util/pci 02/4 - pci: Add helper functions for sriov devices 03/4 - interface: Add functions to get sriov PF/VF relationship of a net interface 04/4 - macvtap: Fix getPhysfn to get the PF of a direct attach network interface Changelog: ---------- v1: RFC patch introduced new functions to get PF/VF relationship of SRIOV net devices by comparing PF/VF sysfs device links. Also mentioned the existance of some related code in node_device_driver. The feedback was to move and use the node_device_driver code v2: Moves sriov get_physical_function and get_virtual_functions from node_device_driver to src/util/pci*. And reworks the rest of the patches around the new code. v3: Incorporated Stefan Berger's comments. Fixed indentation errors shown by 'make syntax-check'. Used pciReportError in src/util/pci Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> Signed-off-by: Christian Benvenuti <benve(a)cisco.com> Signed-off-by: David Wang <dwang2(a)cisco.com>

2 10

[libvirt] [PATCH v3] daemon: Add early libvirtd start verbose errors.
by Peter Krempa 17 Aug '11

17 Aug '11

Early errors during start of libvirtd didn't have an error reporting mechanism and caused libvirtd to exit silently (only the return value indicated an error). Libvirt logging is initialized very early using enviroment variables and the internal error reporting API is used to report early errors. v2 changes: - print errors unconditionaly before logging starts - fix message to US spelling v2.5 changes: - initialize logging from enviroment - log all early errors using VIR_ERROR v3 changes: - move virSetLogFromEnv() after virInitialize() fixes: https://bugzilla.redhat.com/show_bug.cgi?id=728654 --- On 08/12/2011 12:09 PM, Daniel P. Berrange wrote: > Ok, not quiet that early. virInitialize() must be the first libvirt > call made since it initializes threading which is needed by logging. Uh, sorry. I didn't check for that. Now it should be in the correct place. > > Daniel Peter Krempa daemon/libvirtd.c | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 53f1002..c7382b0 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1293,6 +1293,9 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + /* initialize early logging */ + virLogSetFromEnv(); + while (1) { int optidx = 0; int c; @@ -1328,14 +1331,18 @@ int main(int argc, char **argv) { case 'p': VIR_FREE(pid_file); - if (!(pid_file = strdup(optarg))) + if (!(pid_file = strdup(optarg))) { + VIR_ERROR(_("Can't allocate memory")); exit(EXIT_FAILURE); + } break; case 'f': VIR_FREE(remote_config_file); - if (!(remote_config_file = strdup(optarg))) + if (!(remote_config_file = strdup(optarg))) { + VIR_ERROR(_("Can't allocate memory")); exit(EXIT_FAILURE); + } break; case OPT_VERSION: @@ -1347,27 +1354,33 @@ int main(int argc, char **argv) { return 2; default: - fprintf (stderr, _("%s: internal error: unknown flag: %c\n"), - argv[0], c); + VIR_ERROR(_("%s: internal error: unknown flag: %c"), + argv[0], c); exit (EXIT_FAILURE); } } - if (!(config = daemonConfigNew(privileged))) + if (!(config = daemonConfigNew(privileged))) { + VIR_ERROR(_("Can't create initial configuration")); exit(EXIT_FAILURE); + } /* No explicit config, so try and find a default one */ if (remote_config_file == NULL) { implicit_conf = true; if (daemonConfigFilePath(privileged, - &remote_config_file) < 0) + &remote_config_file) < 0) { + VIR_ERROR(_("Can't determine config path")); exit(EXIT_FAILURE); + } } /* Read the config file if it exists*/ if (remote_config_file && - daemonConfigLoad(config, remote_config_file, implicit_conf) < 0) + daemonConfigLoad(config, remote_config_file, implicit_conf) < 0) { + VIR_ERROR(_("Can't load config file '%s'"), remote_config_file); exit(EXIT_FAILURE); + } if (config->host_uuid && virSetHostUUIDStr(config->host_uuid) < 0) { @@ -1375,19 +1388,25 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } - if (daemonSetupLogging(config, privileged, verbose, godaemon) < 0) + if (daemonSetupLogging(config, privileged, verbose, godaemon) < 0) { + VIR_ERROR(_("Can't initialize logging")); exit(EXIT_FAILURE); + } if (!pid_file && privileged && daemonPidFilePath(privileged, - &pid_file) < 0) + &pid_file) < 0) { + VIR_ERROR(_("Can't determine pid file path.")); exit(EXIT_FAILURE); + } if (daemonUnixSocketPaths(config, privileged, &sock_file, - &sock_file_ro) < 0) + &sock_file_ro) < 0) { + VIR_ERROR(_("Can't determine socket paths")); exit(EXIT_FAILURE); + } if (godaemon) { char ebuf[1024]; -- 1.7.6

2 1

[libvirt] Patch for verbose Disk transfer
by Tom Vijlbrief 17 Aug '11

17 Aug '11

A virsh command like: migrate --live --copy-storage-all Guest qemu+ssh://user@host/system --persistent --verbose shows Migration: [ 0 %] during the storage copy and does not start counting untill the ram transfer starts Patch for including the storage copy: diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 7bf733d..4ac8008 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1183,6 +1183,9 @@ cleanup: #define MIGRATION_TRANSFER_PREFIX "transferred ram: " #define MIGRATION_REMAINING_PREFIX "remaining ram: " #define MIGRATION_TOTAL_PREFIX "total ram: " +#define MIGRATION_DISK_TRANSFER_PREFIX "transferred disk: " +#define MIGRATION_DISK_REMAINING_PREFIX "remaining disk: " +#define MIGRATION_DISK_TOTAL_PREFIX "total disk: " int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon, int *status, @@ -1246,6 +1249,7 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon, goto cleanup; } *remaining *= 1024; + tmp = end; if (!(tmp = strstr(tmp, MIGRATION_TOTAL_PREFIX))) goto done; @@ -1257,7 +1261,53 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon, goto cleanup; } *total *= 1024; + tmp = end; + + /* + * Check for Optional Disk Migration status + */ + + unsigned long long disk_transferred= 0; + unsigned long long disk_remaining= 0; + unsigned long long disk_total= 0; + + if (!(tmp = strstr(tmp, MIGRATION_DISK_TRANSFER_PREFIX))) + goto done; + tmp += strlen(MIGRATION_DISK_TRANSFER_PREFIX); + if (virStrToLong_ull(tmp, &end, 10, &disk_transferred) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse disk migration data transferred statistic %s"), tmp); + goto cleanup; + } + disk_transferred *= 1024; + (*transferred)+= disk_transferred; + tmp = end; + + if (!(tmp = strstr(tmp, MIGRATION_DISK_REMAINING_PREFIX))) + goto done; + tmp += strlen(MIGRATION_DISK_REMAINING_PREFIX); + + if (virStrToLong_ull(tmp, &end, 10, &disk_remaining) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse disk migration data remaining statistic %s"), tmp); + goto cleanup; + } + disk_remaining *= 1024; + (*remaining)+= disk_remaining; + tmp = end; + + if (!(tmp = strstr(tmp, MIGRATION_DISK_TOTAL_PREFIX))) + goto done; + tmp += strlen(MIGRATION_DISK_TOTAL_PREFIX); + + if (virStrToLong_ull(tmp, &end, 10, &disk_total) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse disk migration data total statistic %s"), tmp); + goto cleanup; + } + disk_total *= 1024; + (*total)+= disk_total; } }

2 1

[libvirt] maint: add missing symbols
by Stefan Berger 17 Aug '11

17 Aug '11

Add missing symbols to libvirt_private.syms. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 8 ++++++++ 1 file changed, 8 insertions(+) Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -539,8 +539,11 @@ ifaceGetIndex; ifaceGetMacAddress; ifaceGetIPAddress; ifaceGetNthParent; +ifaceGetPhysicalFunction; +ifaceGetVirtualFunctionIndex; ifaceGetVlanID; ifaceIsUp; +ifaceIsVirtualFunction; ifaceLinkDel; ifaceMacvtapLinkAdd; ifaceMacvtapLinkDump; @@ -841,6 +844,7 @@ pciDettachDevice; pciDeviceFileIterate; pciDeviceGetManaged; pciDeviceIsAssignable; +pciDeviceIsVirtualFunction; pciDeviceListAdd; pciDeviceListCount; pciDeviceListDel; @@ -848,10 +852,14 @@ pciDeviceListFree; pciDeviceListGet; pciDeviceListNew; pciDeviceListSteal; +pciDeviceNetName; pciDeviceReAttachInit; pciDeviceSetManaged; pciFreeDevice; pciGetDevice; +pciGetPhysicalFunction; +pciGetVirtualFunctionIndex; +pciGetVirtualFunctions; pciReAttachDevice; pciResetDevice; pciWaitForDeviceCleanup;

2 1

Re: [libvirt] (no subject)
by jim_marshall＠msn.com 17 Aug '11

17 Aug '11

Visit it! Its cool and fantastic!. http://hosting.nborges.net/com.page.php?gusiteid=65o5

1 0

Re: [libvirt] [Spice-devel] libvirt multifunction problem
by Gerd Hoffmann 17 Aug '11

17 Aug '11

On 08/12/11 16:18, Christophe Fergeau wrote: > On Fri, Aug 12, 2011 at 04:53:04PM +0300, Alon Levy wrote: >> I don't know when libvirt started adding mf=on. > > For what it's worth, this was added in [ adding libvirt list to cc: ] > commit 9f8baf646ea44aa2de47cba5002af39a7ab1ac08 > Author: Wen Congyang<wency(a)cn.fujitsu.com> > Date: Mon May 23 14:42:21 2011 +0800 > > support multifunction PCI device > > If qemu supports multi function PCI device, the format of the PCI address passed > to qemu is "bus=pci.0,multifunction=on,addr=slot.function". > > If qemu does not support multi function PCI device, the format of the PCI address > passed to qemu is "bus=pci.0,addr=slot". Hmm, from a bief scan it looks like that patch adds multifunction=on unconditionally in case qemu supports that. That is wrong IMHO. libvirt should only do that in case the pci slot in question actually has multiple functions. There is another condition which the patch doesn't check for: you always must have a $slot.0 function, you can't have a multifunction device with -- say -- functions 1 and 2 being used. cheers, Gerd

1 0

[libvirt] [PATCH 0/2] about Virsh Command Reference
by Hu Tao 17 Aug '11

17 Aug '11

Hi, We now have libvirt advanced at 0.9.3, but there is almost no progress has been made on Virsh Command Reference. I'm now starting on updating Virsh Command Reference to get it synced with libvirt/virsh, but since I'm not a native-English speaker, there must be grammers, typos, etc. in the documents written by me, so any comments on these are appreciated. Besides, comments on other errors, such as example usages, are also welcome. In this series, docs for two cmmands are updated. I'll post more patches for other commands subsequently. Hu Tao (2): update documentation for command attach-disk update documentation for command detach-disk source/attach-disk.xml | 292 +++++++++++++++++++++++++++++++++++++++++++++++- source/detach-disk.xml | 233 +++++++++++++++++++++++++++++++++++++- 2 files changed, 517 insertions(+), 8 deletions(-) -- 1.7.3.1

4 6

[libvirt] [PATCHv2 1/2] xml: Print file name on parse error
by Peter Krempa 17 Aug '11

17 Aug '11

This patch prints file name of currently parsed document if an parse error occurs. While parsing XML documments from string, user may specify NULL as URL and the original error message (not containing filename information) is printed. Fixes BZ #726771 --- src/util/xml.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/util/xml.c b/src/util/xml.c index 05317ea..48fc3cf 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -647,10 +647,18 @@ catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) if (virGetLastError() == NULL && ctxt->lastError.level == XML_ERR_FATAL && ctxt->lastError.message != NULL) { - virGenericReportError(domcode, VIR_ERR_XML_DETAIL, - _("at line %d: %s"), - ctxt->lastError.line, - ctxt->lastError.message); + if (ctxt->lastError.file) { + virGenericReportError(domcode, VIR_ERR_XML_DETAIL, + _("%s:%d: %s"), + ctxt->lastError.file, + ctxt->lastError.line, + ctxt->lastError.message); + } else { + virGenericReportError(domcode, VIR_ERR_XML_DETAIL, + _("at line %d: %s"), + ctxt->lastError.line, + ctxt->lastError.message); + } } } } -- 1.7.3.4

1 1

[libvirt] [PATCH 1/2] xml: Print file name on parse error
by Peter Krempa 17 Aug '11

17 Aug '11

This patch prints file name of currently parsed document if an parse error occurs. While parsing XML documments from string, user may specify NULL as URL and the original error message (not containing filename information) is printed. Fixes BZ #726771 --- src/util/xml.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/util/xml.c b/src/util/xml.c index 05317ea..0e93d48 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -647,10 +647,18 @@ catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) if (virGetLastError() == NULL && ctxt->lastError.level == XML_ERR_FATAL && ctxt->lastError.message != NULL) { - virGenericReportError(domcode, VIR_ERR_XML_DETAIL, - _("at line %d: %s"), - ctxt->lastError.line, - ctxt->lastError.message); + if (ctxt->lastError.file) { + virGenericReportError(domcode, VIR_ERR_XML_DETAIL, + _("in file \'%s\'at line %d: %s"), + ctxt->lastError.file, + ctxt->lastError.line, + ctxt->lastError.message); + } else { + virGenericReportError(domcode, VIR_ERR_XML_DETAIL, + _("at line %d: %s"), + ctxt->lastError.line, + ctxt->lastError.message); + } } } } -- 1.7.3.4

2 5