- Devel - libvirt List Archives

[libvirt] This patch fixes up a previous patch to work in containers
by dwalsh＠redhat.com 22 May '13

22 May '13

It also adds the ability to pass in privileged field into Security Manager so that writing to /run/setrans only attempted on privileged machines [PATCH] libvirt writes an mcs translation file to /run/setrans

2 2

[libvirt] [PATCH] interface: list all interfaces with flags == 0
by Guannan Ren 22 May '13

22 May '13

virConnectListAllInterfaces should support to list all of interfaces when the value of flags is 0. The behaviour is consistent with other virConnectListAll* APIs --- src/conf/interface_conf.h | 4 ++++ src/interface/interface_backend_netcf.c | 27 +++++++++++++-------------- src/interface/interface_backend_udev.c | 23 ++++++++++------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index e636c35..ae93811 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -211,4 +211,8 @@ char *virInterfaceDefFormat(const virInterfaceDefPtr def); void virInterfaceObjLock(virInterfaceObjPtr obj); void virInterfaceObjUnlock(virInterfaceObjPtr obj); +#define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \ + (VIR_CONNECT_LIST_INTERFACES_ACTIVE | \ + VIR_CONNECT_LIST_INTERFACES_INACTIVE) + #endif /* __INTERFACE_CONF_H__ */ diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index cbba4fd..c6e069a 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -260,6 +260,7 @@ static int netcfConnectListDefinedInterfaces(virConnectPtr conn, char **const na } +#define MATCH(FLAG) (flags & (FLAG)) static int netcfConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, @@ -276,8 +277,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, int ret = -1; char **names = NULL; - virCheckFlags(VIR_CONNECT_LIST_INTERFACES_ACTIVE | - VIR_CONNECT_LIST_INTERFACES_INACTIVE, -1); + virCheckFlags(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE, -1); interfaceDriverLock(driver); @@ -293,7 +293,6 @@ netcfConnectListAllInterfaces(virConnectPtr conn, _("failed to get number of host interfaces: %s%s%s"), errmsg, details ? " - " : "", details ? details : ""); - ret = -1; goto cleanup; } @@ -304,7 +303,6 @@ netcfConnectListAllInterfaces(virConnectPtr conn, if (VIR_ALLOC_N(names, count) < 0) { virReportOOMError(); - ret = -1; goto cleanup; } @@ -361,16 +359,17 @@ netcfConnectListAllInterfaces(virConnectPtr conn, /* XXX: Filter the result, need to be splitted once new filter flags * except active|inactive are supported. */ - if (((status & NETCF_IFACE_ACTIVE) && - (flags & VIR_CONNECT_LIST_INTERFACES_ACTIVE)) || - ((status & NETCF_IFACE_INACTIVE) && - (flags & VIR_CONNECT_LIST_INTERFACES_INACTIVE))) { - if (ifaces) { - iface_obj = virGetInterface(conn, ncf_if_name(iface), - ncf_if_mac_string(iface)); - tmp_iface_objs[niface_objs] = iface_obj; - } - niface_objs++; + if (MATCH(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_INTERFACES_ACTIVE) && + (status & NETCF_IFACE_ACTIVE)) || + (MATCH(VIR_CONNECT_LIST_INTERFACES_INACTIVE) && + (status & NETCF_IFACE_INACTIVE)))) + continue; + + if (ifaces) { + iface_obj = virGetInterface(conn, ncf_if_name(iface), + ncf_if_mac_string(iface)); + tmp_iface_objs[niface_objs++] = iface_obj; } ncf_if_free(iface); diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1fd7d46..242fc15 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -282,6 +282,7 @@ udevConnectListDefinedInterfaces(virConnectPtr conn, VIR_UDEV_IFACE_INACTIVE); } +#define MATCH(FLAG) (flags & (FLAG)) static int udevConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, @@ -299,8 +300,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, int status = 0; int ret; - virCheckFlags(VIR_CONNECT_LIST_INTERFACES_ACTIVE | - VIR_CONNECT_LIST_INTERFACES_INACTIVE, -1); + virCheckFlags(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE, -1); /* Grab a udev reference */ udev = udev_ref(driverState->udev); @@ -354,7 +354,6 @@ udevConnectListAllInterfaces(virConnectPtr conn, const char *path; const char *name; const char *macaddr; - int add_to_list = 0; path = udev_list_entry_get_name(dev_entry); dev = udev_device_new_from_syspath(udev, path); @@ -363,18 +362,15 @@ udevConnectListAllInterfaces(virConnectPtr conn, status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); /* Filter the results */ - if (status && (flags & VIR_CONNECT_LIST_INTERFACES_ACTIVE)) - add_to_list = 1; - else if (!status && (flags & VIR_CONNECT_LIST_INTERFACES_INACTIVE)) - add_to_list = 1; + if (MATCH(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_INTERFACES_ACTIVE) && status) || + (MATCH(VIR_CONNECT_LIST_INTERFACES_INACTIVE) && !status))) + continue; /* If we matched a filter, then add it */ - if (add_to_list) { - if (ifaces) { - iface_obj = virGetInterface(conn, name, macaddr); - ifaces_list[count] = iface_obj; - } - count++; + if (ifaces) { + iface_obj = virGetInterface(conn, name, macaddr); + ifaces_list[count++] = iface_obj; } udev_device_unref(dev); } @@ -387,6 +383,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, if (ifaces) { ignore_value(VIR_REALLOC_N(ifaces_list, count + 1)); *ifaces = ifaces_list; + ifaces_list = NULL; } return count; -- 1.8.1.4

4 4

[libvirt] [PATCH] qemu: Don't remove the "return 0"
by Osier Yang 21 May '13

21 May '13

Commit f60a50c7957 intended to remove the warning only, but not with the "return 0" together. --- src/qemu/qemu_cgroup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index ff9a075..fb88802 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -471,6 +471,8 @@ qemuSetupMemoryCgroup(virDomainObjPtr vm) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory cgroup is not available on this host")); return -1; + } else { + return 0; } } -- 1.8.1.4

3 3

[libvirt] [PATCH] udev: should not list bridge devices
by Guannan Ren 21 May '13

21 May '13

When using udev backend, virsh iface-list outputs bridge devices like: Name State MAC Address -------------------------------------------- em1 active e8:39:35:58:d5:94 lo active 00:00:00:00:00:00 virbr0 active fe:54:00:a5:f6:42 The patch filters out bridge devices. --- src/interface/interface_backend_udev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1fd7d46..92648e8 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -78,6 +78,9 @@ udevGetDevices(struct udev *udev, virUdevStatus status) /* Ignore devices that are part of a bridge */ udev_enumerate_add_nomatch_sysattr(enumerate, "brport/state", NULL); + /* Ignore bridge devices */ + udev_enumerate_add_nomatch_sysattr(enumerate, "bridge/bridge_id", NULL); + /* State of the device */ switch (status) { case VIR_UDEV_IFACE_ACTIVE: -- 1.8.1.4

2 2

[libvirt] [PATCH 0/3] Resolve Coverity found issues
by John Ferlan 21 May '13

21 May '13

Upgraded to Coverity 6.5.3 which uncovered a few code paths with issues. John Ferlan (3): lxc_process: Resolve Coverity NULL_RETURNS error xencapstest: Resolve Coverity CHECKED_RETURN error shunloadtest: Resolve Coverity CHECKED_RETURN error src/lxc/lxc_process.c | 4 ++-- tests/shunloadhelper.c | 12 ++++++++---- tests/shunloadtest.c | 26 +++++++++++++++++--------- tests/xencapstest.c | 3 ++- 4 files changed, 29 insertions(+), 16 deletions(-) -- 1.8.1.4

3 9

[libvirt] [PATCH 0/3 v3]add 'sharePolicy' attribute for qemu vnc sharing policy
by Guannan Ren 21 May '13

21 May '13

v2->v3 rebase work. v1->v2: changed attribute name from 'policy' to 'sharePolicy' renamed caps flag name: QEMU_CAPS_VNC_SHARE_POLICY fixed issues pointed out in v1 review have to keep hard-coded version probe after checking qemu -help and qmp command. As there were some vnc patches recently, I chose do rebase work a little later. These patches try to add a new attribute 'sharePolicy' to element graphics of vnc type. This attribute has three values: allow-exclusive,force-shared and ignore. Guannan Ren(3) [PATCH 1/3 v3] qemu: new vnc display sharing policy caps flag [PATCH 2/3 v3] conf: add 'sharePolicy' attribute to graphics element for [PATCH 3/3 v3] qemu: add ',share=<policy>' to qemu commandline docs/formatdomain.html.in | 13 +++++++++++-- docs/schemas/domaincommon.rng | 9 +++++++++ src/conf/domain_conf.c | 28 ++++++++++++++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 6 +++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 36 ++++++++++++++++++++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + tests/qemuhelptest.c | 9 ++++++--- tests/qemuxml2argvtest.c | 1 + 11 files changed, 111 insertions(+), 6 deletions(-)

2 4

[libvirt] [PATCH] qemu: fix a typo in qemuAddSharedDevice
by Guannan Ren 21 May '13

21 May '13

--- src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 41fe0b9..7266d3b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1184,7 +1184,7 @@ qemuAddSharedDevice(virQEMUDriverPtr driver, if (dev->type == VIR_DOMAIN_DEVICE_DISK) { disk = dev->data.disk; - if (disk->shared || + if (!disk->shared || !disk->src || (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK && !(disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME && -- 1.8.1.4

3 2

[libvirt] [PATCH] docs: formatdomain: fix links in the table of contents
by Ján Tomko 21 May '13

21 May '13

--- Pushed under the trivial rule. docs/formatdomain.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9284534..d9814dd 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2350,7 +2350,7 @@ <h4><a name="elementsHostDev">Host device assignment</a></h4> - <h5><a href="elementsHostDevSubsys">USB / PCI / SCSI devices</a></h5> + <h5><a name="elementsHostDevSubsys">USB / PCI / SCSI devices</a></h5> <p> USB, PCI and SCSI devices attached to the host can be passed through @@ -2526,7 +2526,7 @@ </dl> - <h5><a href="elementsHostDevCaps">Block / character devices</a></h5> + <h5><a name="elementsHostDevCaps">Block / character devices</a></h5> <p> Block / character devices from the host can be passed through -- 1.8.1.5

1 0

[libvirt] [libvirt-perl][PATCH] Fix typo in domain help page
by Zhe Peng 21 May '13

21 May '13

The help page of $dom->set_metadata have a typo,this patch fix it. --- lib/Sys/Virt/Domain.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index a502029..053f127 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -112,7 +112,7 @@ C<$flags> parameter defaults to zero. Sets the metadata element of type C<$type> to hold the value C<$val>. If C<$type> is C<Sys::Virt::Domain::METADATA_ELEMENT> then the C<$key> and C<$uri> elements specify an XML namespace -to use, otherwise they should both be C<nudef>. The optional +to use, otherwise they should both be C<undef>. The optional C<$flags> parameter defaults to zero. =item $dom->is_active() -- 1.7.7.6

3 3

[libvirt] [PATCH] esx: Replace almost all esxVI_String_DeepCopyValue vith VIR_STRDUP
by Matthias Bolte 21 May '13

21 May '13

--- src/esx/esx_driver.c | 8 ++++---- src/esx/esx_network_driver.c | 6 ++---- src/esx/esx_storage_backend_iscsi.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 4 ++-- src/esx/esx_util.c | 11 ++++------- src/esx/esx_vi.c | 24 +++++++++++------------- src/esx/esx_vi_types.c | 4 ++-- 7 files changed, 26 insertions(+), 33 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 85640ce..b55ef45 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -183,7 +183,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) ++tmp; } - if (esxVI_String_DeepCopyValue(&strippedFileName, tmp) < 0) { + if (VIR_STRDUP(strippedFileName, tmp) < 0) { goto cleanup; } @@ -209,7 +209,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) /* Fallback to direct datastore name match */ if (result == NULL && STRPREFIX(fileName, "/vmfs/volumes/")) { - if (esxVI_String_DeepCopyValue(&copyOfFileName, fileName) < 0) { + if (VIR_STRDUP(copyOfFileName, fileName) < 0) { goto cleanup; } @@ -248,7 +248,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) /* If it's an absolute path outside of a datastore just use it as is */ if (result == NULL && *fileName == '/') { /* FIXME: need to deal with Windows paths here too */ - if (esxVI_String_DeepCopyValue(&result, fileName) < 0) { + if (VIR_STRDUP(result, fileName) < 0) { goto cleanup; } } @@ -353,7 +353,7 @@ esxFormatVMXFileName(const char *fileName, void *opaque) result = virBufferContentAndReset(&buffer); } else if (*fileName == '/') { /* FIXME: need to deal with Windows paths here too */ - if (esxVI_String_DeepCopyValue(&result, fileName) < 0) { + if (VIR_STRDUP(result, fileName) < 0) { goto cleanup; } } else { diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index a4842da..9aacffc 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -478,10 +478,8 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) if (esxVI_HostPortGroupSpec_Alloc(&hostPortGroupSpec) < 0 || esxVI_HostNetworkPolicy_Alloc(&hostPortGroupSpec->policy) < 0 || esxVI_Int_Alloc(&hostPortGroupSpec->vlanId) < 0 || - esxVI_String_DeepCopyValue(&hostPortGroupSpec->name, - def->portGroups[i].name) < 0 || - esxVI_String_DeepCopyValue(&hostPortGroupSpec->vswitchName, - def->name) < 0) { + VIR_STRDUP(hostPortGroupSpec->name, def->portGroups[i].name) < 0 || + VIR_STRDUP(hostPortGroupSpec->vswitchName, def->name) < 0) { goto cleanup; } diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index d91d7b0..6e1095e 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -672,7 +672,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, virUUIDFormat(md5, uuid_string); - if (esxVI_String_DeepCopyValue(&def.key, uuid_string) < 0) { + if (VIR_STRDUP(def.key, uuid_string) < 0) { goto cleanup; } diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 3b4d73a..2966109 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -1031,7 +1031,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, } } else { /* Fall back to the path as key */ - if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { + if (VIR_STRDUP(key, datastorePath) < 0) { goto cleanup; } } @@ -1233,7 +1233,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, } } else { /* Fall back to the path as key */ - if (esxVI_String_DeepCopyValue(&key, datastorePath) < 0) { + if (VIR_STRDUP(key, datastorePath) < 0) { goto cleanup; } } diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 001dd99..a4b931d 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -237,7 +237,7 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, return -1; } - if (esxVI_String_DeepCopyValue(&copyOfDatastorePath, datastorePath) < 0) { + if (VIR_STRDUP(copyOfDatastorePath, datastorePath) < 0) { goto cleanup; } @@ -251,8 +251,7 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, } if (datastoreName != NULL && - esxVI_String_DeepCopyValue(datastoreName, - preliminaryDatastoreName) < 0) { + VIR_STRDUP(*datastoreName, preliminaryDatastoreName) < 0) { goto cleanup; } @@ -266,8 +265,7 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, } if (directoryAndFileName != NULL && - esxVI_String_DeepCopyValue(directoryAndFileName, - preliminaryDirectoryAndFileName) < 0) { + VIR_STRDUP(*directoryAndFileName, preliminaryDirectoryAndFileName) < 0) { goto cleanup; } @@ -279,8 +277,7 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, *tmp = '\0'; } - if (esxVI_String_DeepCopyValue(directoryName, - preliminaryDirectoryAndFileName) < 0) { + if (VIR_STRDUP(*directoryName, preliminaryDirectoryAndFileName) < 0) { goto cleanup; } } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index d0df13d..8dc2592 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -801,10 +801,10 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (esxVI_CURL_Alloc(&ctx->curl) < 0 || esxVI_CURL_Connect(ctx->curl, parsedUri) < 0 || - esxVI_String_DeepCopyValue(&ctx->url, url) < 0 || - esxVI_String_DeepCopyValue(&ctx->ipAddress, ipAddress) < 0 || - esxVI_String_DeepCopyValue(&ctx->username, username) < 0 || - esxVI_String_DeepCopyValue(&ctx->password, password) < 0) { + VIR_STRDUP(ctx->url, url) < 0 || + VIR_STRDUP(ctx->ipAddress, ipAddress) < 0 || + VIR_STRDUP(ctx->username, username) < 0 || + VIR_STRDUP(ctx->password, password) < 0) { return -1; } @@ -1779,9 +1779,9 @@ esxVI_BuildSelectSet(esxVI_SelectionSpec **selectSet, } if (esxVI_TraversalSpec_Alloc(&traversalSpec) < 0 || - esxVI_String_DeepCopyValue(&traversalSpec->name, name) < 0 || - esxVI_String_DeepCopyValue(&traversalSpec->type, type) < 0 || - esxVI_String_DeepCopyValue(&traversalSpec->path, path) < 0) { + VIR_STRDUP(traversalSpec->name, name) < 0 || + VIR_STRDUP(traversalSpec->type, type) < 0 || + VIR_STRDUP(traversalSpec->path, path) < 0) { goto failure; } @@ -1792,8 +1792,7 @@ esxVI_BuildSelectSet(esxVI_SelectionSpec **selectSet, while (currentSelectSetName != NULL && *currentSelectSetName != '\0') { if (esxVI_SelectionSpec_Alloc(&selectionSpec) < 0 || - esxVI_String_DeepCopyValue(&selectionSpec->name, - currentSelectSetName) < 0 || + VIR_STRDUP(selectionSpec->name, currentSelectSetName) < 0 || esxVI_SelectionSpec_AppendToList(&traversalSpec->selectSet, selectionSpec) < 0) { goto failure; @@ -3486,7 +3485,7 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, goto cleanup; } - if (esxVI_String_DeepCopyValue(&fileName, directoryAndFileName) < 0) { + if (VIR_STRDUP(fileName, directoryAndFileName) < 0) { goto cleanup; } } else { @@ -3506,8 +3505,7 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, goto cleanup; } - if (esxVI_String_DeepCopyValue(&fileName, - directoryAndFileName + length + 1) < 0) { + if (VIR_STRDUP(fileName, directoryAndFileName + length + 1) < 0) { goto cleanup; } } @@ -3803,7 +3801,7 @@ esxVI_LookupStorageVolumeKeyByDatastorePath(esxVI_Context *ctx, if (*key == NULL) { /* Other files don't have a UUID, fall back to the path as key */ - if (esxVI_String_DeepCopyValue(key, datastorePath) < 0) { + if (VIR_STRDUP(*key, datastorePath) < 0) { goto cleanup; } } diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 4b2b397..1a26556 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -963,8 +963,8 @@ esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src) (*dest)->type = src->type; - if (esxVI_String_DeepCopyValue(&(*dest)->other, src->other) < 0 || - esxVI_String_DeepCopyValue(&(*dest)->value, src->value) < 0) { + if (VIR_STRDUP((*dest)->other, src->other) < 0 || + VIR_STRDUP((*dest)->value, src->value) < 0) { goto failure; } -- 1.7.9.5

2 2

[libvirt] [PATCH] vmware: Restore OOM error reporting in vmwareCopyVMXFileName
by Matthias Bolte 21 May '13

21 May '13

Got lost in commit e6ab10098066dd04794ff2ee5d10bc9b1db93327. --- src/vmware/vmware_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 4b61a9c..6c24187 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -490,6 +490,6 @@ vmwareCopyVMXFileName(const char *datastorePath, void *opaque ATTRIBUTE_UNUSED) { char *path; - ignore_value(VIR_STRDUP_QUIET(path, datastorePath)); + ignore_value(VIR_STRDUP(path, datastorePath)); return path; } -- 1.7.9.5

2 2

[libvirt] [PATCH 0/4] Properly use LGPL
by Eric Blake 21 May '13

21 May '13

The FSF has some recommendations on how to use the LGPL, and we weren't always following them. This series tries to clean things up to avoid any confusion on our intent - our source code is LGPLv2+ (except for vbox which is LGPLv2-only); the resulting binaries might be under a different license based on what they link with (for example, libvirt_parthelper is GPLv3+, and a future patch will make libvirtd GPLv2-only so as to let libvirt.so become LGPLv2+ instead of its current polluted LGPLv2-only when built with vbox). One thing I was unable to figure out: when switching between branches, older branches still create a non-versioned COPYING file; git doesn't like to move to this commit unless you manually remove that file first. Unfortunately, I don't know of any clean way to avoid that problem, unless we _don't_ version-control COPYING and instead copy it out of .gnulib/docs/COPYINGv2 as needed (similar to how configure.ac used to copy it from COPYING.LIB before this series). If having to manually remove COPYING before switching branches proves too annoying, and if you agree that libvirt.git can get away without COPYING (since it is really only tarballs that NEED it), then I can tweak patch 2 to keep populating COPYING at configure time, rather than version-controlling it. Eric Blake (4): maint: use LGPL correctly maint: follow recommended practice for using LGPL maint: refer to correct license file maint: enforce correct copyright usage .gitignore | 1 - COPYING | 339 ++++++++++++++++++++++++++++ COPYING.LIB => COPYING.LESSER | 0 Makefile.am | 17 +- cfg.mk | 12 +- configure.ac | 23 +- daemon/Makefile.am | 15 +- docs/Makefile.am | 17 +- docs/schemas/Makefile.am | 17 +- examples/apparmor/Makefile.am | 17 +- examples/domain-events/events-c/Makefile.am | 17 +- examples/dominfo/Makefile.am | 17 +- examples/domsuspend/Makefile.am | 17 +- examples/hellolibvirt/Makefile.am | 17 +- examples/openauth/Makefile.am | 17 +- examples/python/Makefile.am | 17 +- examples/systemtap/Makefile.am | 17 +- examples/xml/nwfilter/Makefile.am | 17 +- gnulib/lib/Makefile.am | 17 +- gnulib/tests/Makefile.am | 17 +- include/Makefile.am | 17 +- include/libvirt/Makefile.am | 17 +- libvirt.spec.in | 6 +- python/Makefile.am | 15 +- python/tests/Makefile.am | 17 +- src/Makefile.am | 15 +- src/rpc/gendispatch.pl | 16 ++ src/rpc/genprotocol.pl | 16 +- src/vbox/vbox_CAPI_v2_2.h | 2 +- src/vbox/vbox_CAPI_v3_0.h | 2 +- src/vbox/vbox_CAPI_v3_1.h | 2 +- src/vbox/vbox_CAPI_v3_2.h | 2 +- src/vbox/vbox_CAPI_v4_0.h | 2 +- src/vbox/vbox_CAPI_v4_1.h | 2 +- src/vbox/vbox_V2_2.c | 2 +- src/vbox/vbox_V3_0.c | 2 +- src/vbox/vbox_V3_1.c | 2 +- src/vbox/vbox_XPCOMCGlue.c | 2 +- src/vbox/vbox_XPCOMCGlue.h | 2 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_driver.h | 2 +- src/vbox/vbox_tmpl.c | 2 +- src/xen/xend_internal.c | 16 +- src/xen/xend_internal.h | 22 +- tests/Makefile.am | 15 +- tools/Makefile.am | 15 +- 46 files changed, 765 insertions(+), 78 deletions(-) create mode 100644 COPYING rename COPYING.LIB => COPYING.LESSER (100%) -- 1.8.1.4

2 12

[libvirt] [PATCH v3 00/34] Introduce VIR_STRDUP
by Michal Privoznik 21 May '13

21 May '13

Previously this aimed on dropping OOM report from almost everywhere (v1), then just prepare the ground (v2). Now, it just aims on introducing VIR_STRDUP and VIR_STRNDUP which do report OOM error. This will cause rebase conflicts, for sure. Sorry. Patches available at: git://gitorious.org/~zippy2/libvirt/michal-staging.git branch oom4 Michal Privoznik (34): virstring: Introduce VIR_STRDUP and VIR_STRNDUP Adapt to VIR_STRDUP and VIR_STRNDUP in daemon/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/conf/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/cpu/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/esx/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/hyperv/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/libxl/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/locking/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/lxc/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/network/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/node_device/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/interface/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/nwfilter/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/openvz/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/parallels/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/phyp/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/qemu/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/remote/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/rpc/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/secret/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/security/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/storage/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/test/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/uml/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/util/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/vbox/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/vmware/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/vmx/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/xen/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/xenapi/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/xenxs/* Adapt to VIR_STRDUP and VIR_STRNDUP in tests/* Adapt to VIR_STRDUP and VIR_STRNDUP in src/* Introduce syntax-check rule to prefer VIR_STRDUP over strdup HACKING | 11 + cfg.mk | 8 + daemon/libvirtd-config.c | 50 ++-- daemon/libvirtd.c | 29 +-- daemon/remote.c | 161 +++++------- docs/hacking.html.in | 14 + include/libvirt/libvirt.h.in | 10 +- src/conf/capabilities.c | 30 +-- src/conf/cpu_conf.c | 19 +- src/conf/domain_conf.c | 105 +++----- src/conf/domain_event.c | 39 ++- src/conf/node_device_conf.c | 29 +-- src/conf/nwfilter_conf.c | 17 +- src/conf/nwfilter_params.c | 30 +-- src/conf/snapshot_conf.c | 11 +- src/conf/storage_conf.c | 13 +- src/conf/virchrdev.c | 12 +- src/cpu/cpu_generic.c | 8 +- src/cpu/cpu_map.c | 3 +- src/cpu/cpu_powerpc.c | 13 +- src/cpu/cpu_x86.c | 10 +- src/datatypes.c | 76 +++--- src/esx/esx_driver.c | 43 +-- src/esx/esx_interface_driver.c | 7 +- src/esx/esx_network_driver.c | 28 +- src/esx/esx_storage_backend_iscsi.c | 21 +- src/esx/esx_storage_backend_vmfs.c | 16 +- src/esx/esx_util.c | 45 +--- src/esx/esx_vi.c | 79 ++---- src/esx/esx_vi_types.c | 36 +-- src/hyperv/hyperv_driver.c | 50 +--- src/hyperv/hyperv_util.c | 18 +- src/interface/interface_backend_udev.c | 36 +-- src/libvirt.c | 14 +- src/libvirt_private.syms | 2 + src/libxl/libxl_conf.c | 86 ++---- src/libxl/libxl_driver.c | 14 +- src/locking/lock_daemon.c | 30 +-- src/locking/lock_daemon_config.c | 12 +- src/locking/lock_daemon_dispatch.c | 6 +- src/locking/lock_driver_lockd.c | 41 ++- src/locking/lock_driver_sanlock.c | 12 +- src/locking/lock_manager.c | 4 +- src/lxc/lxc_cgroup.c | 3 +- src/lxc/lxc_conf.c | 36 ++- src/lxc/lxc_container.c | 18 +- src/lxc/lxc_controller.c | 20 +- src/lxc/lxc_driver.c | 9 +- src/lxc/lxc_process.c | 7 +- src/network/bridge_driver.c | 34 +-- src/node_device/node_device_driver.c | 33 +-- src/node_device/node_device_hal.c | 13 +- src/node_device/node_device_udev.c | 99 ++----- src/nodeinfo.c | 5 +- src/nwfilter/nwfilter_dhcpsnoop.c | 22 +- src/nwfilter/nwfilter_driver.c | 7 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 5 +- src/nwfilter/nwfilter_learnipaddr.c | 5 +- src/openvz/openvz_conf.c | 45 ++-- src/openvz/openvz_driver.c | 39 ++- src/parallels/parallels_driver.c | 71 +++-- src/parallels/parallels_network.c | 23 +- src/parallels/parallels_storage.c | 62 ++--- src/phyp/phyp_driver.c | 50 +--- src/qemu/qemu_capabilities.c | 79 +++--- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 419 ++++++++++++------------------ src/qemu/qemu_conf.c | 58 ++--- src/qemu/qemu_domain.c | 26 +- src/qemu/qemu_driver.c | 113 +++----- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_migration.c | 20 +- src/qemu/qemu_monitor_json.c | 63 ++--- src/qemu/qemu_monitor_text.c | 15 +- src/qemu/qemu_process.c | 64 ++--- src/remote/remote_driver.c | 116 ++++----- src/rpc/gendispatch.pl | 21 +- src/rpc/virnetclient.c | 16 +- src/rpc/virnetmessage.c | 12 +- src/rpc/virnetsaslcontext.c | 6 +- src/rpc/virnetserver.c | 6 +- src/rpc/virnetserverclient.c | 10 +- src/rpc/virnetservermdns.c | 6 +- src/rpc/virnetsocket.c | 10 +- src/rpc/virnetsshsession.c | 76 +++--- src/rpc/virnettlscontext.c | 26 +- src/secret/secret_driver.c | 5 +- src/security/security_apparmor.c | 20 +- src/security/security_dac.c | 23 +- src/security/security_nop.c | 7 +- src/security/security_selinux.c | 79 ++---- src/security/virt-aa-helper.c | 4 +- src/storage/parthelper.c | 5 +- src/storage/storage_backend.c | 22 +- src/storage/storage_backend_disk.c | 26 +- src/storage/storage_backend_fs.c | 34 +-- src/storage/storage_backend_iscsi.c | 17 +- src/storage/storage_backend_logical.c | 32 +-- src/storage/storage_backend_mpath.c | 5 +- src/storage/storage_backend_rbd.c | 5 +- src/storage/storage_backend_scsi.c | 19 +- src/storage/storage_backend_sheepdog.c | 6 +- src/storage/storage_driver.c | 18 +- src/test/test_driver.c | 144 ++++------ src/uml/uml_conf.c | 10 +- src/uml/uml_driver.c | 8 +- src/util/virauth.c | 17 +- src/util/virauthconfig.c | 8 +- src/util/virbitmap.c | 9 +- src/util/vircgroup.c | 36 ++- src/util/vircommand.c | 33 ++- src/util/virconf.c | 34 +-- src/util/virdnsmasq.c | 22 +- src/util/virebtables.c | 34 +-- src/util/virebtables.h | 2 +- src/util/virerror.c | 19 +- src/util/virhash.c | 5 +- src/util/viridentity.c | 15 +- src/util/virinitctl.c | 4 +- src/util/viriptables.c | 4 +- src/util/virjson.c | 18 +- src/util/virkeyfile.c | 13 +- src/util/virlockspace.c | 25 +- src/util/virlog.c | 25 +- src/util/virnetdevmacvlan.c | 16 +- src/util/virnetdevtap.c | 11 +- src/util/virnetdevvportprofile.c | 4 +- src/util/virobject.c | 16 +- src/util/virpci.c | 14 +- src/util/virsexpr.c | 37 +-- src/util/virsocketaddr.c | 9 +- src/util/virstoragefile.c | 18 +- src/util/virstring.c | 91 ++++++- src/util/virstring.h | 62 +++++ src/util/virsysinfo.c | 290 ++++++++------------- src/util/virtypedparam.c | 14 +- src/util/viruri.c | 58 ++--- src/util/virutil.c | 91 +++---- src/util/virxml.c | 5 +- src/vbox/vbox_XPCOMCGlue.c | 6 +- src/vbox/vbox_tmpl.c | 278 +++++++++----------- src/vmware/vmware_conf.c | 28 +- src/vmware/vmware_driver.c | 11 +- src/vmx/vmx.c | 36 +-- src/xen/block_stats.c | 16 +- src/xen/xen_driver.c | 9 +- src/xen/xen_hypervisor.c | 19 +- src/xen/xen_inotify.c | 15 +- src/xen/xend_internal.c | 78 ++---- src/xen/xm_internal.c | 9 +- src/xen/xs_internal.c | 44 ++-- src/xenapi/xenapi_driver.c | 59 ++--- src/xenapi/xenapi_utils.c | 39 +-- src/xenxs/xen_sxpr.c | 192 ++++++-------- src/xenxs/xen_xm.c | 94 +++---- tests/commandhelper.c | 10 +- tests/commandtest.c | 2 +- tests/openvzutilstest.c | 6 +- tests/qemumonitortestutils.c | 15 +- tests/qemuxml2argvtest.c | 23 +- tests/qemuxmlnstest.c | 4 +- tests/securityselinuxhelper.c | 9 +- tests/securityselinuxlabeltest.c | 3 +- tests/securityselinuxtest.c | 9 +- tests/storagebackendsheepdogtest.c | 6 +- tests/testutils.c | 4 +- tests/testutilsqemu.c | 5 +- tests/vircgrouptest.c | 2 +- tests/virnetmessagetest.c | 21 +- tests/vmx2xmltest.c | 9 +- tests/xml2vmxtest.c | 9 +- 172 files changed, 2204 insertions(+), 3501 deletions(-) -- 1.8.1.5

6 90

[libvirt] [PATCH 0/5] storage_conf: cleanups
by Osier Yang 21 May '13

21 May '13

*** BLURB HERE *** Osier Yang (5): storage_conf: Fix the coding stype in storage_conf.c storage_conf: Fix indentions in storage_conf.c storage_conf: Various fixes or improvements on pool def parsing storage_conf: Left fixes or improvements for storage_conf.c storage_conf: Improve the coding style in storage_conf.h src/conf/storage_conf.c | 611 +++++++++++++++++++++++++----------------------- src/conf/storage_conf.h | 120 +++++----- 2 files changed, 381 insertions(+), 350 deletions(-) -- 1.8.1.4

3 15

[libvirt] [PATCH 1/3] LXC: remove unnecessary check on root filesystem
by Gao feng 21 May '13

21 May '13

After commit c131525bec5af248e3843224bc5ce8d6435760f0 "Auto-add a root <filesystem> element to LXC containers on startup" for libvirt lxc, root must be existent. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 18 +++++++----------- src/lxc/lxc_controller.c | 11 ----------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a1b6aff..b4be4cd 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1940,17 +1940,13 @@ static int lxcContainerChild(void *data) root = virDomainGetRootFilesystem(vmDef); if (argv->nttyPaths) { - if (root) { - const char *tty = argv->ttyPaths[0]; - if (STRPREFIX(tty, "/dev/pts/")) - tty += strlen("/dev/pts/"); - if (virAsprintf(&ttyPath, "%s/%s.devpts/%s", - LXC_STATE_DIR, vmDef->name, tty) < 0) { - virReportOOMError(); - goto cleanup; - } - } else if (VIR_STRDUP(ttyPath, argv->ttyPaths[0]) < 0) { - goto cleanup; + const char *tty = argv->ttyPaths[0]; + if (STRPREFIX(tty, "/dev/pts/")) + tty += strlen("/dev/pts/"); + if (virAsprintf(&ttyPath, "%s/%s.devpts/%s", + LXC_STATE_DIR, vmDef->name, tty) < 0) { + virReportOOMError(); + goto cleanup; } } else if (VIR_STRDUP(ttyPath, "/dev/null") < 0) { goto cleanup; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 730236e..2f01958 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1280,22 +1280,11 @@ cleanup: static int virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) { - virDomainFSDefPtr root = virDomainGetRootFilesystem(ctrl->def); char *mount_options = NULL; char *opts = NULL; char *devpts = NULL; int ret = -1; - if (!root) { - if (ctrl->nconsoles != 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Expected exactly one console, but got %zu"), - ctrl->nconsoles); - return -1; - } - return 0; - } - VIR_DEBUG("Setting up private /dev/pts"); /* -- 1.8.1.4

3 6

[libvirt] [PATCH] qemuDomainChangeEjectableMedia: Unlock domain while waiting for event
by Michal Privoznik 21 May '13

21 May '13

In 84c59ffa I've tried to fix changing ejectable media process. The process should go like this: 1) we need to call 'eject' on the monitor 2) we should wait for 'DEVICE_TRAY_MOVED' event 3) now we can issue 'change' command However, while waiting in step 2) the domain monitor was locked. So even if qemu reported the desired event, the proper callback was not called immediately. The monitor handling code needs to lock the monitor in order to read the event. So that's the first lock we must not hold while waiting. The second one is the domain lock. When monitor handling code reads an event, the appropriate callback is called then. The first thing that each callback does is locking the corresponding domain as a domain or its device is about to change state. So we need to unlock both monitor and VM lock. Well, holding any lock while sleep()-ing is not the best thing to do anyway. --- src/qemu/qemu_hotplug.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 77d9f4f..88c3a6c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -94,15 +94,20 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorEjectMedia(priv->mon, driveAlias, force); + qemuDomainObjExitMonitor(driver, vm); + virObjectRef(vm); /* we don't want to report errors from media tray_open polling */ while (retries--) { if (origdisk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN) break; + virObjectUnlock(vm); VIR_DEBUG("Waiting 500ms for tray to open. Retries left %d", retries); usleep(500 * 1000); /* sleep 500ms */ + virObjectLock(vm); } + virObjectUnref(vm); if (disk->src) { /* deliberately don't depend on 'ret' as 'eject' may have failed for the @@ -115,7 +120,7 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, if (retries <= 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Unable to eject media before changing it")); - goto exit_monitor; + goto audit; } if (disk->type != VIR_DOMAIN_DISK_TYPE_DIR) { @@ -124,13 +129,13 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, else if (origdisk->format > 0) format = virStorageFileFormatTypeToString(origdisk->format); } + qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorChangeMedia(priv->mon, driveAlias, disk->src, format); + qemuDomainObjExitMonitor(driver, vm); } -exit_monitor: - qemuDomainObjExitMonitor(driver, vm); - +audit: virDomainAuditDisk(vm, origdisk->src, disk->src, "update", ret >= 0); if (ret < 0) -- 1.8.2.1

2 1

[libvirt] ANNOUNCE: libvirt 1.0.5.1 maintenance release
by Cole Robinson 21 May '13

21 May '13

libvirt 1.0.5.1 maintenance release is now available. This is libvirt 1.0.5 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.0.5.1.tar.gz Changes in this version: * tests: use portable shell code * qemu: Fix cgroup handling when setting VCPU BW * daemon: fix leak after listing all volumes * Fix iohelper usage with streams opened for read * util: fix virFileOpenAs return value and resulting error logs * iscsi: don't leak portal string when starting a pool * don't mention disk controllers in generic controller errors * conf: don't crash on a tpm device with no backends * tests: files named '.*-invalid.xml' should fail validation * qemu: allocate network connections sooner during domain startup * Make detect_scsi_host_caps a function on all architectures * Fixup rpcgen code on kFreeBSD too * Fix release of resources with lockd plugin * build: avoid non-portable cast of pthread_t * Fix potential use of undefined variable in remote dispatch code * build: fix mingw build of virprocess.c * Fix F_DUPFD_CLOEXEC operation args * spec: proper soft static allocation of qemu uid * build: clean up stray files found by 'make distcheck' * build: always include libvirt_lxc.syms in tarball * qemu: fix stupid typos in VFIO cgroup setup/teardown * build: always include sanitytest in tarball * virInitctlRequest: unbreak make syntax check * virInitctlRequest: unbreak make syntax check * network: fix network driver startup for qemu:///session For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 0.10.2.5 maintenance release
by Cole Robinson 21 May '13

21 May '13

libvirt 0.10.2.5 maintenance release is now available. This is libvirt 0.10.2 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.10.2.5.tar.gz Changes in this version: * Fix TLS tests with gnutls 3 * daemon: fix leak after listing all volumes * spec: proper soft static allocation of qemu uid * spec: Fix minor changelog issues * spec: Avoid using makeinstall relic * audit: properly encode device path in cgroup audit * storage: Fix lvcreate parameter for backingStore. For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCHv3 00/11] Multiple TX queue support
by Michal Privoznik 21 May '13

21 May '13

Fixed version with Laine's comments worked in [1]. Patches 2, 3 and 5 has been ACKed already. BTW, patch 4 is really a different to patch 3. The only thing they share is a commit message body. Kernel and subsequently QEMU learned multiple transmit queues a while ago. The feature has a nice advantage, it allows a single guest to transmit multiple flows of network data using multiple CPUs simultaneously which increase traffic bandwidth. A lot. The documentation how to use this is available at [2] or [3]. 1: https://www.redhat.com/archives/libvir-list/2013-May/msg00943.html 2: https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/tree/Docume… 3: http://git.qemu.org/?p=qemu.git;a=blob;f=qemu-options.hx;hb=HEAD#l1363 Michal Privoznik (11): Introduce /domain/devices/interface/driver/@queues attribute qemu: Move interface cmd line construction into a separate function qemu: Make qemuMonitorAddNetdev to pass multiple FDs qemu: Make qemuMonitorAddHostNetwork to pass multiple FDs qemu: Adapt command line generation to multiqueue net util: Learn virNetDevTapCreate multiqueue network qemu: Allow multiple vhost-net openings qemu: Rework qemuNetworkIfaceConnect qemu: Adapt qemuDomainAttachNetDevice to multiqueue net qemu: Adapt qemuBuildInterfaceCommandLine to to multiqueue net qemu: Enable multiqueue network docs/formatdomain.html.in | 12 +- docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 15 + src/conf/domain_conf.h | 1 + src/network/bridge_driver.c | 2 +- src/qemu/qemu_command.c | 447 +++++++++++++-------- src/qemu/qemu_command.h | 13 +- src/qemu/qemu_hotplug.c | 103 +++-- src/qemu/qemu_monitor.c | 78 ++-- src/qemu/qemu_monitor.h | 8 +- src/uml/uml_conf.c | 5 +- src/util/virnetdevtap.c | 113 +++--- src/util/virnetdevtap.h | 2 + .../qemuxml2argvdata/qemuxml2argv-vhost_queues.xml | 51 +++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 568 insertions(+), 288 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhost_queues.xml -- 1.8.2.1

2 25

[libvirt] [PATCH v2] openvzDomainSetNetwork: use virCommand
by Michal Privoznik 21 May '13

21 May '13

Currently, the openvzDomainSetNetwork function constructs an array of strings representing a command line for VZCTL binary. This is a overkill since our virCommand APIs can cover all the functionality. Moreover, the function is not following our structure where return value is set to -1 initially, and after all operations succeeded then it is set to zero. --- src/openvz/openvz_driver.c | 80 +++++++++++----------------------------------- 1 file changed, 19 insertions(+), 61 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 129e328..d46baab 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -88,15 +88,6 @@ static void openvzDriverUnlock(struct openvz_driver *driver) struct openvz_driver ovz_driver; -static void cmdExecFree(const char *cmdExec[]) -{ - int i=-1; - while (cmdExec[++i]) { - VIR_FREE(cmdExec[i]); - } -} - - static int openvzDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps ATTRIBUTE_UNUSED, @@ -827,22 +818,13 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, virDomainNetDefPtr net, virBufferPtr configBuf) { - int rc = 0, narg; - const char *prog[OPENVZ_MAX_ARG]; + int rc = -1; char macaddr[VIR_MAC_STRING_BUFLEN]; virMacAddr host_mac; char host_macaddr[VIR_MAC_STRING_BUFLEN]; struct openvz_driver *driver = conn->privateData; char *opt = NULL; - -#define ADD_ARG_LIT(thisarg) \ - do { \ - if (narg >= OPENVZ_MAX_ARG) \ - goto no_memory; \ - if ((prog[narg++] = strdup(thisarg)) == NULL) \ - goto no_memory; \ - } while (0) - + virCommandPtr cmd = NULL; if (net == NULL) return 0; @@ -852,18 +834,11 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, return -1; } - for (narg = 0; narg < OPENVZ_MAX_ARG; narg++) - prog[narg] = NULL; + if (net->type != VIR_DOMAIN_NET_TYPE_BRIDGE && + net->type != VIR_DOMAIN_NET_TYPE_ETHERNET) + return 0; - narg = 0; - - if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE || - net->type == VIR_DOMAIN_NET_TYPE_ETHERNET) { - ADD_ARG_LIT(VZCTL); - ADD_ARG_LIT("--quiet"); - ADD_ARG_LIT("set"); - ADD_ARG_LIT(vpsid); - } + cmd = virCommandNewArgList(VZCTL, "--quiet", "set", vpsid, NULL); virMacAddrFormat(&net->mac, macaddr); virDomainNetGenerateMAC(driver->xmlopt, &host_mac); @@ -875,9 +850,6 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, virBuffer buf = VIR_BUFFER_INITIALIZER; int veid = openvzGetVEID(vpsid); - /* --netif_add ifname[,mac,host_ifname,host_mac] */ - ADD_ARG_LIT("--netif_add") ; - /* if user doesn't specify guest interface name, * then we need to generate it */ if (net->data.ethernet.dev == NULL) { @@ -885,8 +857,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, if (net->data.ethernet.dev == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not generate eth name for container")); - rc = -1; - goto exit; + goto cleanup; } } @@ -897,8 +868,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, if (net->ifname == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not generate veth name")); - rc = -1; - goto exit; + goto cleaup; } } @@ -919,40 +889,28 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, } } - if (!(opt = virBufferContentAndReset(&buf))) - goto no_memory; + if (!(opt = virBufferContentAndReset(&buf))) { + virReportOOMError(); + goto cleanup; + } - ADD_ARG_LIT(opt) ; + /* --netif_add ifname[,mac,host_ifname,host_mac] */ + virCommandAddArgList(cmd, "--netif_add", opt, NULL); VIR_FREE(opt); } else if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET && net->data.ethernet.ipaddr != NULL) { /* --ipadd ip */ - ADD_ARG_LIT("--ipadd") ; - ADD_ARG_LIT(net->data.ethernet.ipaddr) ; + virCommandAddArgList(cmd, "--ipadd", net->data.ethernet.ipaddr, NULL); } /* TODO: processing NAT and physical device */ - if (prog[0] != NULL) { - ADD_ARG_LIT("--save"); - if (virRun(prog, NULL) < 0) { - rc = -1; - goto exit; - } - } + virCommandAddArg(cmd, "--save"); + ret = virCommandRun(cmd, NULL); - exit: - cmdExecFree(prog); + cleanup: + virCommandFree(cmd); return rc; - - no_memory: - VIR_FREE(opt); - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not put argument to %s"), VZCTL); - cmdExecFree(prog); - return -1; - -#undef ADD_ARG_LIT } -- 1.8.2.1

3 4

[libvirt] [PATCH 0/2] qemu: Rework CD/DVD changing
by Michal Privoznik 21 May '13

21 May '13

The first patch is bare bug fix (without any bug reported though). The second is again a bug fix, but not so easy to spot. Basically, when we change a media, we should issue 'eject' first, then wait until the tray gets open, after which we can finally issue 'change' command. Even for bare 'eject' we ought to check status, shouldn't we? Michal Privoznik (2): qemu_monitor: Fix tray-open attribute in query-block qemu_hotplug: Rework media changing process src/qemu/qemu_hotplug.c | 51 +++++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_monitor_text.c | 6 +++--- 3 files changed, 52 insertions(+), 7 deletions(-) -- 1.8.0.2

6 22

[libvirt] two nasty races
by Eric Blake 21 May '13

21 May '13

I found root cause on two nasty races today, but ran out of time to write the patches until next week. 1. We have a TOCTTOU race when moving processes between cgroups. virCgroupMoveTask can fail if listing the threads in the parent group picks up multiple threads, then one of those threads exits before we then write to the emulator subgroup to relocate those threads; the chain reaction from this failure is that the domain fails to start. qemu spawns short-lived threads all the time (possibly due to glibc using threads under the hood to implement aio as qemu first probes a disk image); with a 3-second-delay hook script, I was able to hit this race about 5% of the time when repeatedly starting multiple domains in parallel. The fix should be ignoring any ESRCH failures when writing during virCgroupAddTAskStrController, but I plan to test that before posting my patch. Present at least since 0.10.2 (Fedora 18); probably earlier (but I didn't check how far back). 2. We have a (rare) deadlock due to the use of a non-async-signal-safe getpwuid_r in between fork and exec. I was extremely surprised when I hit it in real life while trying to debug the first race; but sure enough, the backtrace confirms that glibc grabs a mutex inside getpwuid_r, and if some other thread in the parent process is interrupted in the middle of getpwuid_r while we are forking a child in our thread, then our child is hung; and since the parent depends on a handshake with the child, the parent's worker thread was also hung. I think the fix to this is to call getpwuid_r prior to fork, and change virSetUIDGID to take the list of supplemental groups as a parameter rather than trying to learn it on the fly. Again, something I plan to test once I have the patch written. Present at least since commit f42cf7cb (Dec 2010) with the introduction of virSetUIDGID, and probably further back. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 4

[libvirt] [PATCH] esx: Implement esxDomainSetMemoryFlags
by Matthias Bolte 21 May '13

21 May '13

--- src/esx/esx_driver.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index b55ef45..3962bf1 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2187,6 +2187,27 @@ esxDomainSetMemory(virDomainPtr domain, unsigned long memory) +static int +esxDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, + unsigned int flags) +{ + if (flags != VIR_DOMAIN_MEM_CURRENT && + flags != VIR_DOMAIN_MEM_LIVE && + flags != (VIR_DOMAIN_MEM_CURRENT | VIR_DOMAIN_MEM_MAXIMUM) && + flags != (VIR_DOMAIN_MEM_LIVE | VIR_DOMAIN_MEM_MAXIMUM)) { + virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags); + return -1; + } + + if (flags & VIR_DOMAIN_MEM_MAXIMUM) { + return esxDomainSetMaxMemory(domain, memory); + } else { + return esxDomainSetMemory(domain, memory); + } +} + + + /* * libvirt exposed virtual CPU usage in absolute time, ESX doesn't provide this * information in this format. It exposes it in 20 seconds slots, but it's hard @@ -5286,6 +5307,7 @@ static virDriver esxDriver = { .domainGetMaxMemory = esxDomainGetMaxMemory, /* 0.7.0 */ .domainSetMaxMemory = esxDomainSetMaxMemory, /* 0.7.0 */ .domainSetMemory = esxDomainSetMemory, /* 0.7.0 */ + .domainSetMemoryFlags = esxDomainSetMemoryFlags, /* 1.0.6 */ .domainSetMemoryParameters = esxDomainSetMemoryParameters, /* 0.8.6 */ .domainGetMemoryParameters = esxDomainGetMemoryParameters, /* 0.8.6 */ .domainGetInfo = esxDomainGetInfo, /* 0.7.0 */ -- 1.7.9.5

2 1

[libvirt] [PATCH] esx: Accept VIR_DOMAIN_AFFECT_CURRENT in addition to VIR_DOMAIN_AFFECT_LIVE
by Matthias Bolte 21 May '13

21 May '13

Basically autotranslate VIR_DOMAIN_AFFECT_CURRENT to VIR_DOMAIN_AFFECT_LIVE. Modification impact is handled lax anyway. There is no distinction between a live and a stored config in the VMware world. A strict modification impact handling would require to check the virtual machine state each time and enforce VIR_DOMAIN_AFFECT_LIVE-only for running and VIR_DOMAIN_AFFECT_CONFIG-only for inactive domains. But that would be useless overhead. --- src/esx/esx_driver.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f53b9c4..85640ce 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2531,7 +2531,7 @@ esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, esxVI_TaskInfoState taskInfoState; char *taskInfoErrorMessage = NULL; - if (flags != VIR_DOMAIN_AFFECT_LIVE) { + if (flags != VIR_DOMAIN_AFFECT_CURRENT && flags != VIR_DOMAIN_AFFECT_LIVE) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags); return -1; } @@ -2615,7 +2615,8 @@ esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) esxVI_ObjectContent *hostSystem = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; - if (flags != (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { + if (flags != (VIR_DOMAIN_AFFECT_CURRENT | VIR_DOMAIN_VCPU_MAXIMUM) && + flags != (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags); return -1; } @@ -5222,7 +5223,7 @@ esxDomainGetMetadata(virDomainPtr domain, int type, esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachine = NULL; - if (flags != VIR_DOMAIN_AFFECT_LIVE) { + if (flags != VIR_DOMAIN_AFFECT_CURRENT && flags != VIR_DOMAIN_AFFECT_LIVE) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags); return NULL; } -- 1.7.9.5

2 1

[libvirt] [PATCH] esx: Implement esxDomainGetMetadata for VIR_DOMAIN_METADATA_DESCRIPTION
by Matthias Bolte 21 May '13

21 May '13

--- src/esx/esx_driver.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index b23e7f6..f53b9c4 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -5211,6 +5211,52 @@ no_memory: #undef MATCH + +static char * +esxDomainGetMetadata(virDomainPtr domain, int type, + const char *uri ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *result = NULL; + esxPrivate *priv = domain->conn->privateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *virtualMachine = NULL; + + if (flags != VIR_DOMAIN_AFFECT_LIVE) { + virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags); + return NULL; + } + + if (type != VIR_DOMAIN_METADATA_DESCRIPTION) { + virReportError(VIR_ERR_NO_DOMAIN_METADATA, "%s", + _("Requested metadata element is not supported")); + return NULL; + } + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (esxVI_String_AppendValueToList(&propertyNameList, + "summary.config.annotation") < 0 || + esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, + propertyNameList, &virtualMachine, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetStringValue(virtualMachine, "summary.config.annotation", + &result, esxVI_Occurrence_RequiredItem) < 0 || + VIR_STRDUP(result, result) < 0) { + goto cleanup; + } + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&virtualMachine); + + return result; +} + + + static virDriver esxDriver = { .no = VIR_DRV_ESX, .name = "ESX", @@ -5288,6 +5334,7 @@ static virDriver esxDriver = { .domainSnapshotHasMetadata = esxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainSnapshotDelete = esxDomainSnapshotDelete, /* 0.8.0 */ .connectIsAlive = esxConnectIsAlive, /* 0.9.8 */ + .domainGetMetadata = esxDomainGetMetadata, /* 1.0.6 */ }; -- 1.7.9.5

2 1

[libvirt] [PATCH] openvzDomainSetNetwork: use virCommand
by Michal Privoznik 21 May '13

21 May '13

Currently, the openvzDomainSetNetwork function constructs an array of strings representing a command line for VZCTL binary. This is a overkill since our virCommand APIs can cover all the functionality. --- src/openvz/openvz_driver.c | 56 ++++++++++------------------------------------ 1 file changed, 12 insertions(+), 44 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 129e328..db41d72 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -88,15 +88,6 @@ static void openvzDriverUnlock(struct openvz_driver *driver) struct openvz_driver ovz_driver; -static void cmdExecFree(const char *cmdExec[]) -{ - int i=-1; - while (cmdExec[++i]) { - VIR_FREE(cmdExec[i]); - } -} - - static int openvzDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps ATTRIBUTE_UNUSED, @@ -827,22 +818,13 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, virDomainNetDefPtr net, virBufferPtr configBuf) { - int rc = 0, narg; - const char *prog[OPENVZ_MAX_ARG]; + int rc = 0; char macaddr[VIR_MAC_STRING_BUFLEN]; virMacAddr host_mac; char host_macaddr[VIR_MAC_STRING_BUFLEN]; struct openvz_driver *driver = conn->privateData; char *opt = NULL; - -#define ADD_ARG_LIT(thisarg) \ - do { \ - if (narg >= OPENVZ_MAX_ARG) \ - goto no_memory; \ - if ((prog[narg++] = strdup(thisarg)) == NULL) \ - goto no_memory; \ - } while (0) - + virCommandPtr cmd = NULL; if (net == NULL) return 0; @@ -852,18 +834,9 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, return -1; } - for (narg = 0; narg < OPENVZ_MAX_ARG; narg++) - prog[narg] = NULL; - - narg = 0; - if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE || - net->type == VIR_DOMAIN_NET_TYPE_ETHERNET) { - ADD_ARG_LIT(VZCTL); - ADD_ARG_LIT("--quiet"); - ADD_ARG_LIT("set"); - ADD_ARG_LIT(vpsid); - } + net->type == VIR_DOMAIN_NET_TYPE_ETHERNET) + cmd = virCommandNewArgList(VZCTL, "--quiet", "set", vpsid, NULL); virMacAddrFormat(&net->mac, macaddr); virDomainNetGenerateMAC(driver->xmlopt, &host_mac); @@ -875,9 +848,6 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, virBuffer buf = VIR_BUFFER_INITIALIZER; int veid = openvzGetVEID(vpsid); - /* --netif_add ifname[,mac,host_ifname,host_mac] */ - ADD_ARG_LIT("--netif_add") ; - /* if user doesn't specify guest interface name, * then we need to generate it */ if (net->data.ethernet.dev == NULL) { @@ -922,37 +892,35 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, if (!(opt = virBufferContentAndReset(&buf))) goto no_memory; - ADD_ARG_LIT(opt) ; + /* --netif_add ifname[,mac,host_ifname,host_mac] */ + virCommandAddArgList(cmd, "--netif_add", opt, NULL); VIR_FREE(opt); } else if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET && net->data.ethernet.ipaddr != NULL) { /* --ipadd ip */ - ADD_ARG_LIT("--ipadd") ; - ADD_ARG_LIT(net->data.ethernet.ipaddr) ; + virCommandAddArgList(cmd, "--ipadd", net->data.ethernet.ipaddr, NULL); } /* TODO: processing NAT and physical device */ - if (prog[0] != NULL) { - ADD_ARG_LIT("--save"); - if (virRun(prog, NULL) < 0) { + if (cmd) { + virCommandAddArg(cmd, "--save"); + if (virCommandRun(cmd, NULL) < 0) { rc = -1; goto exit; } } exit: - cmdExecFree(prog); + virCommandFree(cmd); return rc; no_memory: VIR_FREE(opt); virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not put argument to %s"), VZCTL); - cmdExecFree(prog); + virCommandFree(cmd); return -1; - -#undef ADD_ARG_LIT } -- 1.8.2.1

3 2

[libvirt] [libvirt-perl PATCH] interface: list active and inactive interface by default
by Guannan Ren 20 May '13

20 May '13

flags with 0 can not list interfaces, use flags in libvirt.h by default to list all of active and inactive interfaces VIR_CONNECT_LIST_INTERFACES_INACTIVE = 1 << 0 VIR_CONNECT_LIST_INTERFACES_ACTIVE = 1 << 1 --- Virt.xs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Virt.xs b/Virt.xs index a22cd2f..ea45e34 100644 --- a/Virt.xs +++ b/Virt.xs @@ -1980,7 +1980,8 @@ list_all_domains(con, flags=0) void -list_all_interfaces(con, flags=0) +list_all_interfaces(con, flags=VIR_CONNECT_LIST_INTERFACES_ACTIVE| + VIR_CONNECT_LIST_INTERFACES_INACTIVE) virConnectPtr con; unsigned int flags; PREINIT: -- 1.8.1.4

2 1

[libvirt] [PATCH v4] qemu: Add callback struct for qemuBuildCommandLine
by Osier Yang 20 May '13

20 May '13

Since 0d70656afded, it starts to access the sysfs files to build the qemu command line (by virSCSIDeviceGetSgName, which is to find out the scsi generic device name by adpater:bus:target:unit), there is no way to work around, qemu wants to see the scsi generic device like "/dev/sg6" anyway. And there might be other places which need to access sysfs files when building qemu command line in future. Instead of increasing the arguments of qemuBuildCommandLine, this introduces a new callback for qemuBuildCommandLine, and thus tests can register their own callbacks for sysfs test input files accessing. * src/qemu/qemu_command.h: (New callback struct qemuBuildCommandLineCallbacks; extern buildCommandLineCallbacks) * src/qemu/qemu_command.c: (wire up the callback struct) * src/qemu/qemu_driver.c: (Use the new syntax of qemuBuildCommandLine) * src/qemu/qemu_hotplug.c: Likewise * src/qemu/qemu_process.c: Likewise * tests/qemuxml2argvtest.c: (Helper testSCSIDeviceGetSgName; callback struct testCallbacks; Use the callback struct) * src/tests/qemuxmlnstest.c: (Like above) --- src/qemu/qemu_command.c | 22 ++++++++++++++-------- src/qemu/qemu_command.h | 19 ++++++++++++++++--- src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_hotplug.c | 6 ++++-- src/qemu/qemu_process.c | 3 ++- tests/qemuxml2argvtest.c | 21 ++++++++++++++++++++- tests/qemuxmlnstest.c | 21 ++++++++++++++++++++- 7 files changed, 78 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c268a3a..33a1910 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4757,17 +4757,18 @@ qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev) char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED) + virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, + qemuBuildCommandLineCallbacksPtr callbacks) { virBuffer buf = VIR_BUFFER_INITIALIZER; char *sg = NULL; - if (!(sg = virSCSIDeviceGetSgName(dev->source.subsys.u.scsi.adapter, - dev->source.subsys.u.scsi.bus, - dev->source.subsys.u.scsi.target, - dev->source.subsys.u.scsi.unit))) { + sg = (callbacks->qemuGetSCSIDeviceSgName)(dev->source.subsys.u.scsi.adapter, + dev->source.subsys.u.scsi.bus, + dev->source.subsys.u.scsi.target, + dev->source.subsys.u.scsi.unit); + if (!sg) goto error; - } virBufferAsprintf(&buf, "file=/dev/%s,if=none", sg); virBufferAsprintf(&buf, ",id=%s-%s", @@ -6405,6 +6406,10 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, return 0; } +qemuBuildCommandLineCallbacks buildCommandLineCallbacks = { + .qemuGetSCSIDeviceSgName = virSCSIDeviceGetSgName, +}; + /* * Constructs a argv suitable for launching qemu with config defined * for a given virtual machine. @@ -6422,7 +6427,8 @@ qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop) + enum virNetDevVPortProfileOp vmop, + qemuBuildCommandLineCallbacksPtr callbacks) { virErrorPtr originalError = NULL; int i, j; @@ -8254,7 +8260,7 @@ qemuBuildCommandLine(virConnectPtr conn, char *drvstr; virCommandAddArg(cmd, "-drive"); - if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps))) + if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps, callbacks))) goto error; virCommandAddArg(cmd, drvstr); VIR_FREE(drvstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 36dfa6b..133e0b2 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -51,6 +51,16 @@ # define QEMU_WEBSOCKET_PORT_MIN 5700 # define QEMU_WEBSOCKET_PORT_MAX 65535 +typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; +typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; +struct _qemuBuildCommandLineCallbacks { + char * (*qemuGetSCSIDeviceSgName) (const char *adapter, + unsigned int bus, + unsigned int target, + unsigned int unit); +}; + +extern qemuBuildCommandLineCallbacks buildCommandLineCallbacks; virCommandPtr qemuBuildCommandLine(virConnectPtr conn, virQEMUDriverPtr driver, @@ -61,8 +71,9 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr current_snapshot, - enum virNetDevVPortProfileOp vmop) - ATTRIBUTE_NONNULL(1); + enum virNetDevVPortProfileOp vmop, + qemuBuildCommandLineCallbacksPtr callbacks) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(11); /* Generate string for arch-specific '-device' parameter */ char * @@ -142,7 +153,9 @@ char * qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps); char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps); + virQEMUCapsPtr qemuCaps, + qemuBuildCommandLineCallbacksPtr callbacks) + ATTRIBUTE_NONNULL(3); char * qemuBuildSCSIHostdevDevStr(virDomainDefPtr def, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 203cc6d..0665131 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5362,7 +5362,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (!(cmd = qemuBuildCommandLine(conn, driver, def, &monConfig, monitor_json, qemuCaps, - NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) + NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + &buildCommandLineCallbacks))) goto cleanup; ret = virCommandToString(cmd); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d037c9d..77d9f4f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1226,7 +1226,8 @@ qemuDomainAttachHostScsiDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, 0) < 0) goto cleanup; - if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, priv->qemuCaps))) + if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, priv->qemuCaps, + &buildCommandLineCallbacks))) goto cleanup; if (!(devstr = qemuBuildSCSIHostdevDevStr(vm->def, hostdev, priv->qemuCaps))) @@ -2543,7 +2544,8 @@ qemuDomainDetachHostScsiDevice(virQEMUDriverPtr driver, return -1; } - if (!(drvstr = qemuBuildSCSIHostdevDrvStr(detach, priv->qemuCaps))) + if (!(drvstr = qemuBuildSCSIHostdevDrvStr(detach, priv->qemuCaps, + &buildCommandLineCallbacks))) goto cleanup; if (!(devstr = qemuBuildSCSIHostdevDevStr(vm->def, detach, priv->qemuCaps))) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4a7c612..95e712c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3605,7 +3605,8 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Building emulator command line"); if (!(cmd = qemuBuildCommandLine(conn, driver, vm->def, priv->monConfig, priv->monJSON, priv->qemuCaps, - migrateFrom, stdin_fd, snapshot, vmop))) + migrateFrom, stdin_fd, snapshot, vmop, + &buildCommandLineCallbacks))) goto cleanup; /* now that we know it is about to start call the hook if present */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d853308..e103925 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -82,6 +82,24 @@ typedef enum { FLAG_JSON = 1 << 3, } virQemuXML2ArgvTestFlags; +static char * +testSCSIDeviceGetSgName(const char *adapter ATTRIBUTE_UNUSED, + unsigned int bus ATTRIBUTE_UNUSED, + unsigned int target ATTRIBUTE_UNUSED, + unsigned int unit ATTRIBUTE_UNUSED) +{ + char *sg = NULL; + + if (VIR_STRDUP(sg, "sg0") < 0) + return NULL; + + return sg; +} + +static qemuBuildCommandLineCallbacks testCallbacks = { + .qemuGetSCSIDeviceSgName = testSCSIDeviceGetSgName, +}; + static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline, virQEMUCapsPtr extraFlags, @@ -157,7 +175,8 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr, (flags & FLAG_JSON), extraFlags, migrateFrom, migrateFd, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) { + VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + &testCallbacks))) { if (flags & FLAG_EXPECT_FAILURE) { ret = 0; if (virTestGetDebug() > 1) diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 952b8e2..961405b 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -26,6 +26,24 @@ static const char *abs_top_srcdir; static virQEMUDriver driver; +static char * +testSCSIDeviceGetSgName(const char *adapter ATTRIBUTE_UNUSED, + unsigned int bus ATTRIBUTE_UNUSED, + unsigned int target ATTRIBUTE_UNUSED, + unsigned int unit ATTRIBUTE_UNUSED) +{ + char *sg = NULL; + + if (VIR_STRDUP(sg, "dummy") < 0) + return NULL; + + return sg; +} + +static qemuBuildCommandLineCallbacks testCallbacks = { + .qemuGetSCSIDeviceSgName = testSCSIDeviceGetSgName, +}; + static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline, virQEMUCapsPtr extraFlags, @@ -113,7 +131,8 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr, json, extraFlags, migrateFrom, migrateFd, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) + VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + &testCallbacks))) goto fail; if (!!virGetLastError() != expectError) { -- 1.8.1.4

2 2

[libvirt] traffic control
by Peter V. Saveliev 20 May '13

20 May '13

… Hello. I would like to start a discussion about network SLA mechs in libvirt. Right now, as I understand, libvirt is managing traffic controls, e.g. bandwitdh limitation, calling external routines (ip/tc). This approach has its own drawbacks, including the need to parse text output of external commands and also some complexity with the current state identification — the queueing discipline can be changed on the interface in runtime outside of libvirt. But I would like to propose another approach — not dropping the previous one, just as an option, maybe. Not so long time ago I started a project [1] that works with netlink directly and can provide standalone daemon, that manages interface properties, including queueing disciplines. Working with netlink events, it is in permanent sync with the current interface statuses w/o any polling. So maybe it would make sense to use this daemon — e.g. with JSON or XML-RPC over SSL/TLS, or with any other RPC that's preferred by libvirt. That approach can provide: * more high-level API, that will keep libvirt off the need to compute rule and filter handlers, hierarchy and so on — we would be able to implement more complex traffic control schemes in more easy way * generally speaking, an RPC API is more easy to use, than the execution of external binary file and parsing text output, and `tc` is not the easiest command to automate. If it sounds reasonably enough, we can discuss the overall scheme, communication and API details that would be more comfortable to libvirt and so on. So, any comments? [1] — https://github.com/svinota/pyroute2 -- Peter V. Saveliev

3 5

[libvirt] Bug Reports
by Dennis Zou (yunzou) 20 May '13

20 May '13

Hi, When I used function esxListDefinedDomains at esx_driver.c to list defined domains and found that retuned array include some templates. Template just is a master image of a VM that can be used to create a new VM, maybe our function should not return this type of VM. So I changed some code to get config.template property and then discarded the 'true' items. Code changes may look like as following: if (esxVI_String_AppendValueListToList(&propertyNameList, "name\0" "runtime.powerState\0") < 0 || esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, &virtualMachineList) < 0) Change to if (esxVI_String_AppendValueListToList(&propertyNameList, "name\0" "config.template\0" "runtime.powerState\0") < 0 || esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, &virtualMachineList) < 0) After line 2493,insert if (esxVI_DomainIsTemplate(virtualMachine, &isTemplate) < 0) { goto cleanup; } if (isTemplate == esxVI_Boolean_True) { continue; } The function esxVI_DomainIsTemplate looks like this: int esxVI_DomainIsTemplate(esxVI_ObjectContent *virtualMachine, esxVI_Boolean *isTemplate) { esxVI_DynamicProperty *dynamicProperty; for (dynamicProperty = virtualMachine->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, "config.template")) { if (esxVI_AnyType_ExpectType(dynamicProperty->val, esxVI_Type_Boolean) < 0) { return -1; } *isTemplate = dynamicProperty->val->boolean; return 0; } } ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing 'config.template' property")); return -1; } Regards, Dennis

1 0

[libvirt] [PATCH] Remove bash-ism from tests/schematestutils.sh
by Chris Dunlop 18 May '13

18 May '13

Remove bash-ism from tests/schematestutils.sh Fix a bash-ism in an sh script, introduced by commit a3f71eb Signed-off-by: Chris Dunlop <chris(a)onthe.net.au> diff --git a/tests/schematestutils.sh b/tests/schematestutils.sh index e739b99..c34364f 100644 --- a/tests/schematestutils.sh +++ b/tests/schematestutils.sh @@ -20,7 +20,7 @@ do result=`$cmd 2>&1` ret=$? - grep -- '-invalid.xml$' <<< "$xml" 2>&1 >/dev/null + echo "$xml" | grep -- '-invalid.xml$' 2>&1 >/dev/null invalid=$? # per xmllint man page, the return codes for validation error

2 1

[libvirt] [PATCH] qemu: Increase RLIMIT_MEMLOCK when memoryBacking/locked is used
by Jiri Denemark 18 May '13

18 May '13

If a domain is configured to have all its memory locked, we need to increase RLIMIT_MEMLOCK so that QEMU is actually allowed to lock the memory. --- src/qemu/qemu_command.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c268a3a..8e2de09 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6440,6 +6440,7 @@ qemuBuildCommandLine(virConnectPtr conn, int spice = 0; int usbcontroller = 0; bool usblegacy = false; + bool mlock; int contOrder[] = { /* We don't add an explicit IDE or FD controller because the * provided PIIX4 device already includes one. It isn't possible to @@ -6551,6 +6552,7 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgFormat(cmd, "mlock=%s", def->mem.locked ? "on" : "off"); } + mlock = def->mem.locked; virCommandAddArg(cmd, "-smp"); if (!(smp = qemuBuildSmpArgStr(def, qemuCaps))) @@ -8191,22 +8193,13 @@ qemuBuildCommandLine(virConnectPtr conn, if (hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { - unsigned long long memKB; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("VFIO PCI device assignment is not " "supported by this version of qemu")); goto error; } - /* VFIO requires all of the guest's memory to be - * locked resident, plus some amount for IO - * space. Alex Williamson suggested adding 1GiB for IO - * space just to be safe (some finer tuning might be - * nice, though). - */ - memKB = def->mem.max_balloon + (1024 * 1024); - virCommandSetMaxMemLock(cmd, memKB * 1024); + mlock = true; } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { @@ -8425,6 +8418,24 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; } + if (mlock) { + unsigned long long memKB; + /* VFIO requires all of the guest's memory to be locked resident, + * plus some amount for IO space. Alex Williamson suggested + * adding 1GiB for IO space just to be safe (some finer tuning + * might be nice, though). + * + * If memory hard_limit is configured, we can use it directly as + * there is no sense to set MEMLOCK limit beyond it. Also we can + * safely use it instead of any magically computed value. + */ + if (def->mem.hard_limit) + memKB = def->mem.hard_limit; + else + memKB = def->mem.max_balloon + (1024 * 1024); + virCommandSetMaxMemLock(cmd, memKB * 1024); + } + virObjectUnref(cfg); return cmd; -- 1.8.2.1

3 3

[libvirt] [PATCH 0/2] libxl: a few fixes related to event handling
by Jim Fehlig 18 May '13

18 May '13

Xen upstream commit 5fb11a07 fixed the signature of the event handler, causing build failures of the libxl driver on xen-unstable / Xen 4.3. While at it, plug leaking of libxl_event objects in the event handler. Jim Fehlig (2): libxl: fix build with Xen4.3 libxl: fix leaking libxl events src/libxl/libxl_driver.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) -- 1.7.7

2 5

[libvirt] [PATCH] esx: Fix error reporting in esxVI_LookupManagedObjectHelper
by Matthias Bolte 18 May '13

18 May '13

As the name parameter can be NULL the error message can only contain it conditionally. --- src/esx/esx_vi.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 5fd0693..d0df13d 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -5140,8 +5140,14 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, if (candidate == NULL) { if (occurrence != esxVI_Occurrence_OptionalItem) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find %s with name '%s'"), type, name); + if (name != NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find %s with name '%s'"), type, name); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find %s"), type); + } + goto cleanup; } -- 1.7.9.5

2 2

[libvirt] [PATCH] Avoid PRIuMAX constant in domain events example
by Daniel P. Berrange 18 May '13

18 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The domain events example program uses asprintf() to avoid portability problems with %llu in one place, but not in another place. Make all places use asprintf() instead and thus avoid need to use PRIuMAX Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- examples/domain-events/events-c/event-test.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 301caad..901d41d 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -271,8 +271,15 @@ static int myDomainEventBalloonChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSE unsigned long long actual, void *opaque ATTRIBUTE_UNUSED) { - printf("%s EVENT: Domain %s(%d) balloon change %" PRIuMAX "KB\n", - __func__, virDomainGetName(dom), virDomainGetID(dom), (uintmax_t)actual); + char *str = NULL; + /* HACK: use asprintf since we have gnulib's wrapper for %lld on Win32 + * but don't have a printf() replacement with %lld */ + if (asprintf(&str, "%s EVENT: Domain %s(%d) balloon change %lluKB\n", + __func__, virDomainGetName(dom), virDomainGetID(dom), actual) < 0) + return 0; + + printf("%s", str); + free(str); return 0; } -- 1.8.2.1

2 1

[libvirt] New application
by Maciej Nabożny 17 May '13

17 May '13

Hello, I'm developer of CC1 project in Institute of Nuclear Physics in Cracow. We are creating cloud computing system based on Libvirt. Is it possible to add link to our project at yours website in applications section? Title: CC1 Project (http://cc1.ifj.edu.pl) Description: The Cloud Computing for Science and Economy project At this time we are using version 0.8.3, but as soon as debian 7 will we stable, we are going to migrate to newer version of Libvirt. Regards, Maciej Nabożny

3 7

[libvirt] [PATCH v2] qemu: report useful error failling to destroy domain gracefully
by Guannan Ren 17 May '13

17 May '13

Resolves:https://bugzilla.redhat.com/show_bug.cgi?id=927620 #kill -STOP `pidof qemu-kvm` #virsh destroy $guest --graceful error: Failed to destroy domain testVM error: An error occurred, but the cause is unknown With --graceful, SIGTERM always is emitted to kill driver process, but it won't success till burning out waiting time in case of process being stopped. But domain destroy without --graceful can work, SIGKILL will be emitted to the stopped process after 10 secs which always kills a process even one that is currently stopped. So report an error after burning out waiting time in this case. --- src/qemu/qemu_process.c | 2 +- src/util/virprocess.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4a7c612..e5b4679 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3930,7 +3930,7 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) } } - if ((flags & VIR_QEMU_PROCESS_KILL_NOWAIT)) { + if (flags & VIR_QEMU_PROCESS_KILL_NOWAIT) { virProcessKill(vm->pid, (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? SIGKILL : SIGTERM); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 99db003..a569406 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -310,8 +310,9 @@ virProcessKillPainfully(pid_t pid, bool force) usleep(200 * 1000); } - VIR_DEBUG("Timed out waiting after SIGKILL to process %lld", - (long long)pid); + virReportSystemError(EBUSY, + _("Failed to terminate process %lld with SIG%s"), + (long long)pid, signame); cleanup: return ret; -- 1.8.1.4

2 1

[libvirt] [PATCH] Add libvirt-daemon-vbox & libvirt-daemon-driver-vbox RPMs
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Now the VirtualBox driver is a loadable module, it needs to live in its own sub-RPM Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index bd889f3..298d96b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -376,6 +376,9 @@ Requires: libvirt-daemon-driver-uml = %{version}-%{release} %if %{with_xen} Requires: libvirt-daemon-driver-xen = %{version}-%{release} %endif + %if %{with_vbox} +Requires: libvirt-daemon-driver-vbox = %{version}-%{release} + %endif Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} @@ -880,6 +883,19 @@ Xen %endif + %if %{with_vbox} +%package daemon-driver-vbox +Summary: VirtualBox driver plugin for the libvirtd daemon +Group: Development/Libraries +Requires: libvirt-daemon = %{version}-%{release} + +%description daemon-driver-vbox +The vbox driver plugin for the libvirtd daemon, providing +an implementation of the hypervisor driver APIs using +VirtualBox + %endif + + %if %{with_libxl} %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon @@ -1012,6 +1028,30 @@ Requires: xen Server side daemon and driver required to manage the virtualization capabilities of XEN %endif + + %if %{with_vbox} +%package daemon-vbox +Summary: Server side daemon & driver required to run VirtualBoxguests +Group: Development/Libraries + +Requires: libvirt-daemon = %{version}-%{release} + %if %{with_driver_modules} + %if %{with_vbox} +Requires: libvirt-daemon-driver-vbox = %{version}-%{release} + %endif +Requires: libvirt-daemon-driver-interface = %{version}-%{release} +Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-secret = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} + %endif +Requires: vbox + +%description daemon-vbox +Server side daemon and driver required to manage the virtualization +capabilities of VirtualBox + %endif %endif # %{with_libvirtd} %package client @@ -1869,6 +1909,12 @@ fi %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so %endif + + %if %{with_vbox} +%files daemon-driver-vbox +%defattr(-, root, root) +%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so + %endif %endif # %{with_driver_modules} %if %{with_qemu_tcg} @@ -1895,6 +1941,11 @@ fi %files daemon-xen %defattr(-, root, root) %endif + + %if %{with_vbox} +%files daemon-vbox +%defattr(-, root, root) + %endif %endif # %{with_libvirtd} %if %{with_sanlock} -- 1.8.1.4

2 2

[libvirt] [PATCH] Define __USE_MINGW_ANSI_STDIO in config.h
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Latest mingw64 can provide *printf functions which support GNU format specifiers. It won't do that unless you have defined __USE_MINGW_ANSI_STDIO though. GNULIB's 'asprintf' module detected that mingw had the asprintf function, but didn't define the __USE_MINGW_ANSI_STDIO so we got left with the version offering Win32 format specifiers, instead of GNU formats. It could perhaps be argued that gnulib's 'asprintf' could be defining __USE_MINGW_ANSI_STDIO for us ? Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 3f3f11e..fe916d1 100644 --- a/configure.ac +++ b/configure.ac @@ -2123,6 +2123,9 @@ AC_SUBST([VERSION_SCRIPT_FLAGS]) AC_SUBST([MSCOM_LIBS]) +dnl http://sourceforge.net/apps/trac/mingw-w64/wiki/gnu%20printf +AC_DEFINE_UNQUOTED([__USE_MINGW_ANSI_STDIO], 1, [Enable GNU style printf formatters]) + dnl Look for windres to build a Windows icon resource. case "$host" in *-*-mingw* | *-*-cygwin* | *-*-msvc* ) -- 1.8.2.1

2 1

[libvirt] [PATCH] qemu: report useful error failling to destroy domain gracefully
by Guannan Ren 17 May '13

17 May '13

Resolves:https://bugzilla.redhat.com/show_bug.cgi?id=927620 #kill -STOP `pidof qemu-kvm` #virsh destroy $guest --graceful error: Failed to destroy domain testVM error: An error occurred, but the cause is unknown With --graceful, SIGTERM always is emitted to kill driver process, but it won't success till burning out waiting time in case of process being stopped. But domain destroy without --graceful can work, SIGKILL will be emitted to the stopped process after 10 secs which always kills a process even one that is currently stopped. So report an error after burning out waiting time in this case. --- src/qemu/qemu_process.c | 2 +- src/util/virprocess.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4a7c612..e5b4679 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3930,7 +3930,7 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) } } - if ((flags & VIR_QEMU_PROCESS_KILL_NOWAIT)) { + if (flags & VIR_QEMU_PROCESS_KILL_NOWAIT) { virProcessKill(vm->pid, (flags & VIR_QEMU_PROCESS_KILL_FORCE) ? SIGKILL : SIGTERM); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 99db003..a79ed05 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -310,8 +310,9 @@ virProcessKillPainfully(pid_t pid, bool force) usleep(200 * 1000); } - VIR_DEBUG("Timed out waiting after SIGKILL to process %lld", - (long long)pid); + virReportError(VIR_ERR_OPERATION_INVALID, + _("Failed to terminate process %lld with SIG%s"), + (long long)pid, signame); cleanup: return ret; -- 1.8.1.4

3 2

[libvirt] [PATCH] Add missing c-ctype.h to virfile.c
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virfile.c file uses c_isalpha on Win32 platforms, so must include c-ctype.h Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virfile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index eb88c83..4637919 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -59,6 +59,8 @@ #include "virstoragefile.h" #include "virutil.h" +#include "c-ctype.h" + #define VIR_FROM_THIS VIR_FROM_NONE int virFileClose(int *fdptr, virFileCloseFlags flags) -- 1.8.1.4

2 1

[libvirt] [PATCH] Include GNULIB mkdtemp module
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The mkdtemp function is missing on mingw platforms. It is used in various Linux specific places in libvirt, but recently became used in fdstreamtest.c which is cross platform. Thus the GNULIB mkdtemp module should be used to proide mkdtemp. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- bootstrap.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap.conf b/bootstrap.conf index 6e03757..616eee1 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -73,6 +73,7 @@ maintainer-makefile manywarnings mkostemp mkostemps +mkdtemp mktempd net_if netdb -- 1.8.1.4

2 1

[libvirt] [PATCH] Set PKG_CONFIG_LIBDIR in autobuild.sh
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If PKG_CONFIG_LIBDIR is not set when doing mingw32/64 builds, then pkg-config may silently fallback to native versions of libraries, with predictably bad results. Setting PKG_CONFIG_LIBDIR forces it to only consider the mingw32/64 libraries. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- autobuild.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autobuild.sh b/autobuild.sh index a8781b0..7da8cb5 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -69,6 +69,7 @@ fi if test -x /usr/bin/i686-w64-mingw32-gcc ; then make distclean + PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" \ PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ CC="i686-w64-mingw32-gcc" \ ../configure \ @@ -88,6 +89,7 @@ fi if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then make distclean + PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" \ PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ CC="x86_64-w64-mingw32-gcc" \ ../configure \ -- 1.8.1.4

2 1

[libvirt] Second pass with cleanups suggested from Dan.
by dwalsh＠redhat.com 17 May '13

17 May '13

[PATCH 2/2] libvirt patch to write a mcs translation file to

3 6

[libvirt] [PATCH 00/25 v4] Support scsi device passthrough via scsi-generic
by Osier Yang 17 May '13

17 May '13

This adds the support for qemu's scsi-generic device, which can be used to passthrough scsi host device. An example of the XML: <hostdev mode='subsystem' type='scsi' managed='no'> <source> <adapter name='scsi_host7'/> <address bus='0' target='0' unit='0'/> </source> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </hostdev> v3 - v4 (details in each patch): * Rebased on top * Support <shareable> * Support <sgio> * Various preparation patches for <shareable> and <sgio> * Split 1/10 in v3 into 2 patches (<readonly> now is a single patch, for easy reviewing, and <readonly> is a sub-element of "hostdev" in rng schema, because it could be used by other type hostdev in future). * Split 4/10 in v3 into 2 patches (bootindex support now is a single patch, for easy reviewing) v2.5 - v3 (details in each patch): * 1/10 and 2/10 of v2.5 are pushed * 8/10 of v2.5 is splitted * A better way to generate the address for scsi host device instead of the rigid one. * Support all scsi controllers when building the qemu command line. * Figure out the limits of the qemu properties, and do checking * Don't forget DAC and apparmor security backends * Orgnize the patches in a better way. * Fix the make check failure Han Cheng (7): conf: Generic XMLs for scsi hostdev qemu: New cap flags for scsi-generic utils: util functions for scsi hostdev qemu: Build qemu command line for scsi host device qemu: Introduce activeScsiHostdevs list for scsi host devices qemu: Add hotplug support for scsi host device qemu: Allow the scsi-generic device in cgroup Osier Yang (18): rng: Interleave hostdev elements Introduce <readonly> for hostdev qemu: Support bootindex for scsi host device security: Manage the security label for scsi host device qemu: Refactor helpers for USB device attachment conf: Generate address for scsi host device automatically conf: Introduce <shareable> for hostdev utils: Rename scsi->path to scsi->sg_path qemu: Rename qemu_driver->sharedDisks to qemu_driver->sharedDevices utils: Add a helper to get the device name that sg device mapped to qemu: Refactor the helpers to track shared scsi host device qemu: Manage shared device entry for scsi host device Rename virDomainDiskSGIO to virDomainDeviceSGIO conf: Introduce sgio for hostdev qemu: Move qemuSetUnprivSGIO into qemu_conf.c qemu: Refactor qemuSetUnprivSGIO to support scsi host device qemu: Set unpriv_sgio for scsi host device qemu: Check conflicts for shared scsi host device docs/formatdomain.html.in | 49 ++- docs/schemas/domaincommon.rng | 86 +++- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_audit.c | 10 + src/conf/domain_conf.c | 353 +++++++++++++++- src/conf/domain_conf.h | 24 +- src/libvirt_private.syms | 23 ++ src/qemu/qemu_capabilities.c | 21 +- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_cgroup.c | 46 ++- src/qemu/qemu_command.c | 146 ++++++- src/qemu/qemu_command.h | 6 + src/qemu/qemu_conf.c | 372 ++++++++++++----- src/qemu/qemu_conf.h | 38 +- src/qemu/qemu_driver.c | 25 +- src/qemu/qemu_hostdev.c | 235 +++++++++++ src/qemu/qemu_hostdev.h | 10 + src/qemu/qemu_hotplug.c | 210 ++++++++-- src/qemu/qemu_process.c | 64 +-- src/qemu/qemu_process.h | 1 - src/security/security_apparmor.c | 49 ++- src/security/security_dac.c | 76 +++- src/security/security_selinux.c | 72 +++- src/util/virscsi.c | 455 +++++++++++++++++++++ src/util/virscsi.h | 88 ++++ tests/qemuhelpdata/qemu-1.0-device | 10 + tests/qemuhelpdata/qemu-1.1.0-device | 10 + tests/qemuhelpdata/qemu-1.2.0-device | 5 + tests/qemuhelpdata/qemu-kvm-1.2.0-device | 5 + tests/qemuhelptest.c | 19 +- .../qemuxml2argv-hostdev-scsi-boot.args | 9 + .../qemuxml2argv-hostdev-scsi-boot.xml | 34 ++ .../qemuxml2argv-hostdev-scsi-lsi.args | 9 + .../qemuxml2argv-hostdev-scsi-lsi.xml | 35 ++ .../qemuxml2argv-hostdev-scsi-readonly.args | 9 + .../qemuxml2argv-hostdev-scsi-readonly.xml | 36 ++ .../qemuxml2argv-hostdev-scsi-sgio.xml | 35 ++ .../qemuxml2argv-hostdev-scsi-shareable.xml | 36 ++ .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 9 + .../qemuxml2argv-hostdev-scsi-virtio-scsi.xml | 35 ++ tests/qemuxml2argvtest.c | 18 + tests/qemuxml2xmltest.c | 6 + 43 files changed, 2469 insertions(+), 314 deletions(-) create mode 100644 src/util/virscsi.c create mode 100644 src/util/virscsi.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-sgio.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-shareable.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.xml -- 1.8.1.4

4 83

[libvirt] [PATCH v3] qemu: Add callback struct for qemuBuildCommandLine
by Osier Yang 17 May '13

17 May '13

Since 0d70656afded, it starts to access the sysfs files to build the qemu command line (by virSCSIDeviceGetSgName, which is to find out the scsi generic device name by adpater:bus:target:unit), there is no way to work around, qemu wants to see the scsi generic device like "/dev/sg6" anyway. And there might be other places which need to access sysfs files when building qemu command line in future. Instead of increasing the arguments of qemuBuildCommandLine, this introduces a new callback for qemuBuildCommandLine, and thus tests can register their own callbacks for sysfs test input files accessing. * src/qemu/qemu_command.h: (New callback struct qemuBuildCommandLineCallbacks; extern buildCommandLineCallbacks) * src/qemu/qemu_command.c: (wire up the callback struct) * src/qemu/qemu_driver.c: (Use the new syntax of qemuBuildCommandLine) * src/qemu/qemu_hotplug.c: Likewise * src/qemu/qemu_process.c: Likewise * tests/qemuxml2argvtest.c: (Helper testSCSIDeviceGetSgName; callback struct testCallbacks; Use the callback struct) * src/tests/qemuxmlnstest.c Use the new syntax of qemuBuildCommandLine) --- src/qemu/qemu_command.c | 28 ++++++++++++++++++++-------- src/qemu/qemu_command.h | 16 ++++++++++++++-- src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_hotplug.c | 6 ++++-- src/qemu/qemu_process.c | 3 ++- tests/qemuxml2argvtest.c | 21 ++++++++++++++++++++- tests/qemuxmlnstest.c | 3 ++- 7 files changed, 64 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5b95c07..e775479 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4757,18 +4757,25 @@ qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev) char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED) + virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, + qemuBuildCommandLineCallbacksPtr callbacks) { virBuffer buf = VIR_BUFFER_INITIALIZER; char *sg = NULL; - if (!(sg = virSCSIDeviceGetSgName(dev->source.subsys.u.scsi.adapter, - dev->source.subsys.u.scsi.bus, - dev->source.subsys.u.scsi.target, - dev->source.subsys.u.scsi.unit))) { - goto error; + if (!callbacks) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("callbacks cannot be NULL")); + return NULL; } + sg = (callbacks->qemuGetSCSIDeviceSgName)(dev->source.subsys.u.scsi.adapter, + dev->source.subsys.u.scsi.bus, + dev->source.subsys.u.scsi.target, + dev->source.subsys.u.scsi.unit); + if (!sg) + goto error; + virBufferAsprintf(&buf, "file=/dev/%s,if=none", sg); virBufferAsprintf(&buf, ",id=%s-%s", virDomainDeviceAddressTypeToString(dev->info->type), @@ -6405,6 +6412,10 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, return 0; } +qemuBuildCommandLineCallbacks buildCommandLineCallbacks = { + .qemuGetSCSIDeviceSgName = virSCSIDeviceGetSgName, +}; + /* * Constructs a argv suitable for launching qemu with config defined * for a given virtual machine. @@ -6422,7 +6433,8 @@ qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop) + enum virNetDevVPortProfileOp vmop, + qemuBuildCommandLineCallbacksPtr callbacks) { virErrorPtr originalError = NULL; int i, j; @@ -8243,7 +8255,7 @@ qemuBuildCommandLine(virConnectPtr conn, char *drvstr; virCommandAddArg(cmd, "-drive"); - if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps))) + if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps, callbacks))) goto error; virCommandAddArg(cmd, drvstr); VIR_FREE(drvstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 36dfa6b..23b6af3 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -51,6 +51,16 @@ # define QEMU_WEBSOCKET_PORT_MIN 5700 # define QEMU_WEBSOCKET_PORT_MAX 65535 +typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; +typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; +struct _qemuBuildCommandLineCallbacks { + char * (*qemuGetSCSIDeviceSgName) (const char *adapter, + unsigned int bus, + unsigned int target, + unsigned int unit); +}; + +extern qemuBuildCommandLineCallbacks buildCommandLineCallbacks; virCommandPtr qemuBuildCommandLine(virConnectPtr conn, virQEMUDriverPtr driver, @@ -61,7 +71,8 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, const char *migrateFrom, int migrateFd, virDomainSnapshotObjPtr current_snapshot, - enum virNetDevVPortProfileOp vmop) + enum virNetDevVPortProfileOp vmop, + qemuBuildCommandLineCallbacksPtr callbacks) ATTRIBUTE_NONNULL(1); /* Generate string for arch-specific '-device' parameter */ @@ -142,7 +153,8 @@ char * qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps); char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps); + virQEMUCapsPtr qemuCaps, + qemuBuildCommandLineCallbacksPtr callbacks); char * qemuBuildSCSIHostdevDevStr(virDomainDefPtr def, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b1630f8..cb46276 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5362,7 +5362,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (!(cmd = qemuBuildCommandLine(conn, driver, def, &monConfig, monitor_json, qemuCaps, - NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) + NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + &buildCommandLineCallbacks))) goto cleanup; ret = virCommandToString(cmd); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d037c9d..77d9f4f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1226,7 +1226,8 @@ qemuDomainAttachHostScsiDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, 0) < 0) goto cleanup; - if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, priv->qemuCaps))) + if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, priv->qemuCaps, + &buildCommandLineCallbacks))) goto cleanup; if (!(devstr = qemuBuildSCSIHostdevDevStr(vm->def, hostdev, priv->qemuCaps))) @@ -2543,7 +2544,8 @@ qemuDomainDetachHostScsiDevice(virQEMUDriverPtr driver, return -1; } - if (!(drvstr = qemuBuildSCSIHostdevDrvStr(detach, priv->qemuCaps))) + if (!(drvstr = qemuBuildSCSIHostdevDrvStr(detach, priv->qemuCaps, + &buildCommandLineCallbacks))) goto cleanup; if (!(devstr = qemuBuildSCSIHostdevDevStr(vm->def, detach, priv->qemuCaps))) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index dbbb7bf..3b247a5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3638,7 +3638,8 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Building emulator command line"); if (!(cmd = qemuBuildCommandLine(conn, driver, vm->def, priv->monConfig, priv->monJSON, priv->qemuCaps, - migrateFrom, stdin_fd, snapshot, vmop))) + migrateFrom, stdin_fd, snapshot, vmop, + &buildCommandLineCallbacks))) goto cleanup; /* now that we know it is about to start call the hook if present */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c751440..7d3e521 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -82,6 +82,24 @@ typedef enum { FLAG_JSON = 1 << 3, } virQemuXML2ArgvTestFlags; +static char * +testSCSIDeviceGetSgName(const char *adapter ATTRIBUTE_UNUSED, + unsigned int bus ATTRIBUTE_UNUSED, + unsigned int target ATTRIBUTE_UNUSED, + unsigned int unit ATTRIBUTE_UNUSED) +{ + char *sg = NULL; + + if (VIR_STRDUP(sg, "sg0") < 0) + return NULL; + + return sg; +} + +static qemuBuildCommandLineCallbacks testCallbacks = { + .qemuGetSCSIDeviceSgName = testSCSIDeviceGetSgName, +}; + static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline, virQEMUCapsPtr extraFlags, @@ -157,7 +175,8 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr, (flags & FLAG_JSON), extraFlags, migrateFrom, migrateFd, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) { + VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + &testCallbacks))) { if (flags & FLAG_EXPECT_FAILURE) { ret = 0; if (virTestGetDebug() > 1) diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 952b8e2..9d3d2a0 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -113,7 +113,8 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr, json, extraFlags, migrateFrom, migrateFd, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) + VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + NULL))) goto fail; if (!!virGetLastError() != expectError) { -- 1.8.1.4

2 4

[libvirt] [PATCH] test: fix VPATH fchosttest failure
by Viktor Mihajlovski 17 May '13

17 May '13

Running make check in a VPATH configured build directory fails in fchosttest as the test data files are searched for relative to the current working directory. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- This may become obsolete with Osier's pending patches, but it helps to get over the build failures for the moment... tests/fchosttest.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/fchosttest.c b/tests/fchosttest.c index 035f721..ccc2df9 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -19,10 +19,13 @@ #include <config.h> +#include "virstring.h" #include "virutil.h" #include "testutils.h" -#define TEST_FC_HOST_PREFIX "./fchostdata/fc_host/" +static char * fchost_prefix; + +#define TEST_FC_HOST_PREFIX fchost_prefix #define TEST_FC_HOST_NUM 5 /* Test virIsCapableFCHost */ @@ -158,6 +161,12 @@ mymain(void) { int ret = 0; + if (virAsprintf(&fchost_prefix,"%s/%s", abs_srcdir, + "fchostdata/fc_host/") < 0) { + ret = -1; + goto cleanup; + } + if (virtTestRun("test1", 1, test1, NULL) < 0) ret = -1; if (virtTestRun("test2", 1, test2, NULL) < 0) @@ -169,6 +178,8 @@ mymain(void) if (virtTestRun("test5", 1, test5, NULL) < 0) ret = -1; +cleanup: + VIR_FREE(fchost_prefix); return ret; } -- 1.7.9.5

2 1

[libvirt] [PATCH] Fix build with VirtualBox
by Jiri Denemark 17 May '13

17 May '13

Commit ba5f3c7c moved vbox driver into libvirtd but forgot to adapt daemon's Makefile.am. --- Pushed as a build breaker. daemon/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index f48dc85..d064ebd 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -155,6 +155,10 @@ if WITH_UML libvirtd_LDADD += ../src/libvirt_driver_uml.la endif +if WITH_VBOX + libvirtd_LDADD += ../src/libvirt_driver_vbox.la +endif + if WITH_STORAGE libvirtd_LDADD += ../src/libvirt_driver_storage.la endif -- 1.8.2.1

3 2

[libvirt] [PATCH] Handle ENOTSUP from setfilecon on FUSE in LXC startup
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The setfilecon method can return ENOTSUP when trying to set the context of the /proc/meminfo FUSE filesystem. We must ignore this error and carry on, to prevent container startup failing entirely Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 48ccc09..9295d80 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -782,10 +782,15 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, ret = setfilecon(meminfo_path, scon); freecon(scon); if (ret < 0) { - virReportSystemError(errno, - _("Failed to set security context of %s for /proc/meminfo mount point"), - meminfo_path); - return ret; + if (errno == ENOTSUP) { + VIR_WARN("Setting security context of %s for /proc/meminfo not supported", + meminfo_path); + } else { + virReportSystemError(errno, + _("Failed to set security context of %s for /proc/meminfo mount point"), + meminfo_path); + return ret; + } } } # endif -- 1.8.2.1

2 2

[libvirt] 2013 Linux Plumbers Virtualization Microconference proposal call for participation
by Alex Williamson 17 May '13

17 May '13

Hey folks, We'd like to hold another virtualization microconference as part of this year's Linux Plumbers Conference. To do so, we need to show that there's enough interest, materials, and people willing to attend. Anthony and Amit have already started a wiki page for the microconference: http://wiki.linuxplumbersconf.org/2013:virtualization Please help to fill it out and add topics you're interested in discussing or presenting, or relevant topics to current development that you'd like others to present. We don't need full abstracts or proposals at this time, just enough to show that we have things to discuss and enough people interested in attending to allocate space in the program. If approved by the program committee we'll give precedence to proposals that address current issues needing attention, help, or resolution. This is also an excellent opportunity for cross-project discussions. We're not sure when the LPC program committee will make a decision, so please don't hesitate to add things to the wiki as soon as possible. There's no commitment at this point though we obviously hope that many of you will follow through with participation if this microconference is approved. Please feel free to forward to anyone I've missed. Thanks, Alex

2 1