- Devel - libvirt List Archives

[libvirt] [PATCH] vbox: Support shared folders
by Matthias Bolte 30 Oct '11

30 Oct '11

Shared folders are handled as filesystems and can also be hotplugged. --- Currently this just maps shared folder to a filesystem element with type mount. The filesystem element has an accessmode attribute that is not useful for VirtualBox. Als the target element only has a dir attribute, but VirtualBox shares doen't support that, you can only give them a name. <filesystem type='mount' accessmode='passthrough'> <source dir='/tmp'/> <target dir='foobar'/> <readonly/> </filesystem> I wonder if we should add a shared folder type like this: <filesystem type='sharedfolder'> <source dir='/tmp'/> <target name='foobar'/> <readonly/> </filesystem> Or is this to specific to VirtualBox? VirtualBox 4.0 added the automount option that automatically mounts a shared folder in the guest. On Windows it is mounted to a free drive letter on Linux it's mounted to /media/<prefix>_<shared-folder-name>. The <prefix> is a global configuration option in VirtualBox. I wonder if and how to expose that in libvirt. Matthias docs/drvvbox.html.in | 5 ++ src/vbox/vbox_tmpl.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) diff --git a/docs/drvvbox.html.in b/docs/drvvbox.html.in index ef55757..1fcafde 100644 --- a/docs/drvvbox.html.in +++ b/docs/drvvbox.html.in @@ -61,6 +61,11 @@ vbox+ssh://user@example.com/session (remote access, SSH tunnelled) <target dev='fda'/> </disk> + <filesystem type='mount'> + <source dir='/home/user/stuff'/> + <target dir='my-shared-folder'/> + </filesystem> +  <interface type='bridge'> <source bridge='eth0'/> diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 2986f5a..13c324f 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -2249,6 +2249,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, int flags) { /* Not supported by libvirt yet */ } else if (device == DeviceType_SharedFolder) { /* Not supported by libvirt yet */ + /* Can VirtualBox really boot from a shared folder? */ } } @@ -2752,6 +2753,67 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, int flags) { #endif /* VBOX_API_VERSION >= 3001 */ + /* shared folders */ + vboxArray sharedFolders = VBOX_ARRAY_INITIALIZER; + + def->nfss = 0; + + vboxArrayGet(&sharedFolders, machine, + machine->vtbl->GetSharedFolders); + + if (sharedFolders.count > 0) { + if (VIR_ALLOC_N(def->fss, sharedFolders.count) < 0) { + virReportOOMError(); + goto sharedFoldersCleanup; + } + + for (i = 0; i < sharedFolders.count; i++) { + ISharedFolder *sharedFolder = sharedFolders.items[i]; + PRUnichar *nameUtf16 = NULL; + char *name = NULL; + PRUnichar *hostPathUtf16 = NULL; + char *hostPath = NULL; + PRBool writable = PR_FALSE; + + if (VIR_ALLOC(def->fss[i]) < 0) { + virReportOOMError(); + goto sharedFoldersCleanup; + } + + def->fss[i]->type = VIR_DOMAIN_FS_TYPE_MOUNT; + + sharedFolder->vtbl->GetHostPath(sharedFolder, &hostPathUtf16); + VBOX_UTF16_TO_UTF8(hostPathUtf16, &hostPath); + def->fss[i]->src = strdup(hostPath); + VBOX_UTF8_FREE(hostPath); + VBOX_UTF16_FREE(hostPathUtf16); + + if (def->fss[i]->src == NULL) { + virReportOOMError(); + goto sharedFoldersCleanup; + } + + sharedFolder->vtbl->GetName(sharedFolder, &nameUtf16); + VBOX_UTF16_TO_UTF8(nameUtf16, &name); + def->fss[i]->dst = strdup(name); + VBOX_UTF8_FREE(name); + VBOX_UTF16_FREE(nameUtf16); + + if (def->fss[i]->dst == NULL) { + virReportOOMError(); + goto sharedFoldersCleanup; + } + + sharedFolder->vtbl->GetWritable(sharedFolder, &writable); + def->fss[i]->readonly = !writable; + + ++def->nfss; + } + } + +sharedFoldersCleanup: + vboxArrayRelease(&sharedFolders); + /* dump network cards if present */ def->nnets = 0; /* Get which network cards are enabled */ @@ -4790,6 +4852,38 @@ vboxAttachUSB(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) } } +static void +vboxAttachSharedFolder(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) +{ + int i; + PRUnichar *nameUtf16; + PRUnichar *hostPathUtf16; + PRBool writable; + + if (def->nfss == 0) + return; + + for (i = 0; i < def->nfss; i++) { + if (def->fss[i]->type != VIR_DOMAIN_FS_TYPE_MOUNT) + continue; + + VBOX_UTF8_TO_UTF16(def->fss[i]->dst, &nameUtf16); + VBOX_UTF8_TO_UTF16(def->fss[i]->src, &hostPathUtf16); + writable = !def->fss[i]->readonly; + +#if VBOX_API_VERSION < 4000 + machine->vtbl->CreateSharedFolder(machine, nameUtf16, hostPathUtf16, + writable); +#else /* VBOX_API_VERSION >= 4000 */ + machine->vtbl->CreateSharedFolder(machine, nameUtf16, hostPathUtf16, + writable, PR_FALSE); +#endif /* VBOX_API_VERSION >= 4000 */ + + VBOX_UTF16_FREE(nameUtf16); + VBOX_UTF16_FREE(hostPathUtf16); + } +} + static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { VBOX_OBJECT_CHECK(conn, virDomainPtr, NULL); IMachine *machine = NULL; @@ -4927,6 +5021,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { vboxAttachVideo(def, machine); vboxAttachDisplay(def, data, machine); vboxAttachUSB(def, data, machine); + vboxAttachSharedFolder(def, data, machine); /* Save the machine settings made till now and close the * session. also free up the mchiid variable used. @@ -5271,6 +5366,34 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, if (dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) { } } + } else if (dev->type == VIR_DOMAIN_DEVICE_FS && + dev->data.fs->type == VIR_DOMAIN_FS_TYPE_MOUNT) { + PRUnichar *nameUtf16; + PRUnichar *hostPathUtf16; + PRBool writable; + + VBOX_UTF8_TO_UTF16(dev->data.fs->dst, &nameUtf16); + VBOX_UTF8_TO_UTF16(dev->data.fs->src, &hostPathUtf16); + writable = !dev->data.fs->readonly; + +#if VBOX_API_VERSION < 4000 + rc = machine->vtbl->CreateSharedFolder(machine, nameUtf16, hostPathUtf16, + writable); +#else /* VBOX_API_VERSION >= 4000 */ + rc = machine->vtbl->CreateSharedFolder(machine, nameUtf16, hostPathUtf16, + writable, PR_FALSE); +#endif /* VBOX_API_VERSION >= 4000 */ + + if (NS_FAILED(rc)) { + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not attach shared folder '%s', rc=%08x"), + dev->data.fs->dst, (unsigned)rc); + } else { + ret = 0; + } + + VBOX_UTF16_FREE(nameUtf16); + VBOX_UTF16_FREE(hostPathUtf16); } machine->vtbl->SaveSettings(machine); VBOX_RELEASE(machine); @@ -5425,6 +5548,23 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { if (dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) { } } + } else if (dev->type == VIR_DOMAIN_DEVICE_FS && + dev->data.fs->type == VIR_DOMAIN_FS_TYPE_MOUNT) { + PRUnichar *nameUtf16; + + VBOX_UTF8_TO_UTF16(dev->data.fs->dst, &nameUtf16); + + rc = machine->vtbl->RemoveSharedFolder(machine, nameUtf16); + + if (NS_FAILED(rc)) { + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not detach shared folder '%s', rc=%08x"), + dev->data.fs->dst, (unsigned)rc); + } else { + ret = 0; + } + + VBOX_UTF16_FREE(nameUtf16); } machine->vtbl->SaveSettings(machine); VBOX_RELEASE(machine); -- 1.7.0.4

2 2

[libvirt] [PATCH] xenapi: Improve error reporting in xenapiOpen once again
by Matthias Bolte 30 Oct '11

30 Oct '11

privP->session->error_description is a list and in order to get the complete error message all parts of the list should be concatenated. xenapiSessionErrorHandler does this when its third parameter is NULL. The current code discards all but the first part of the error message resulting in a potentially incomplete error message. This partly reverts 006be75ee214f9b4, that tried to avoid reporting a (null) in the error message. The actual problem is more general in returnErrorFromSession that might return NULL if there is no error. Make sure that returnErrorFromSession return non-NULL always. Also don't skip the last error message part. --- src/xenapi/xenapi_driver.c | 5 +---- src/xenapi/xenapi_utils.c | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 97da1d1..77bf82d 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -193,10 +193,7 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, return VIR_DRV_OPEN_SUCCESS; } - xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, - *privP->session->error_description != NULL ? - *privP->session->error_description : - _("unknown error")); + xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, NULL); error: VIR_FREE(username); diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 342ae5b..79fd946 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -272,12 +272,14 @@ returnErrorFromSession(xen_session *session) { int i; virBuffer buf = VIR_BUFFER_INITIALIZER; - for (i = 0; i < session->error_description_count - 1; i++) { + for (i = 0; i < session->error_description_count; i++) { if (!i) virBufferEscapeString(&buf, "%s", session->error_description[i]); else virBufferEscapeString(&buf, " : %s", session->error_description[i]); } + if (virBufferUse(&buf) < 1) + virBufferAdd(&buf, _("unknown error"), -1); return virBufferContentAndReset(&buf); } -- 1.7.4.1

2 2

[libvirt] [PATCH] util: Fix virUUIDGeneratePseudoRandomBytes
by Ryota Ozaki 29 Oct '11

29 Oct '11

It forgets to move a pointer to a buffer for UUID and as a result fills only the first byte of the buffer. --- src/util/uuid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/uuid.c b/src/util/uuid.c index 0df3ebc..823a2b9 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -80,7 +80,7 @@ virUUIDGeneratePseudoRandomBytes(unsigned char *buf, int buflen) { while (buflen > 0) { - *buf = virRandom(256); + *buf++ = virRandom(256); buflen--; } -- 1.7.4.1

2 2

[libvirt] [PATCH] macvtap: Fix error return value convention/inconsistencies
by Roopa Prabhu 29 Oct '11

29 Oct '11

From: Roopa Prabhu <roprabhu(a)cisco.com> - changed some return 1's to return -1 - changed if (rc) error checks to if (rc < 0) - fixed some other minor convention violations I might have missed some. Can fix in another patch or can respin Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> Reported-by: Eric Blake <eblake(a)redhat.com> Reported-by: Laine Stump <laine(a)laine.org> --- src/util/interface.c | 8 +++--- src/util/macvtap.c | 64 +++++++++++++++++++++++++++----------------------- src/util/pci.c | 6 ++--- 3 files changed, 41 insertions(+), 37 deletions(-) diff --git a/src/util/interface.c b/src/util/interface.c index 5d473b7..4ab74b5 100644 --- a/src/util/interface.c +++ b/src/util/interface.c @@ -1244,7 +1244,7 @@ ifaceIsVirtualFunction(const char *ifname) char *if_sysfs_device_link = NULL; int ret = -1; - if (ifaceSysfsFile(&if_sysfs_device_link, ifname, "device")) + if (ifaceSysfsFile(&if_sysfs_device_link, ifname, "device") < 0) return ret; ret = pciDeviceIsVirtualFunction(if_sysfs_device_link); @@ -1272,10 +1272,10 @@ ifaceGetVirtualFunctionIndex(const char *pfname, const char *vfname, char *pf_sysfs_device_link = NULL, *vf_sysfs_device_link = NULL; int ret = -1; - if (ifaceSysfsFile(&pf_sysfs_device_link, pfname, "device")) + if (ifaceSysfsFile(&pf_sysfs_device_link, pfname, "device") < 0) return ret; - if (ifaceSysfsFile(&vf_sysfs_device_link, vfname, "device")) { + if (ifaceSysfsFile(&vf_sysfs_device_link, vfname, "device") < 0) { VIR_FREE(pf_sysfs_device_link); return ret; } @@ -1306,7 +1306,7 @@ ifaceGetPhysicalFunction(const char *ifname, char **pfname) char *physfn_sysfs_path = NULL; int ret = -1; - if (ifaceSysfsDeviceFile(&physfn_sysfs_path, ifname, "physfn")) + if (ifaceSysfsDeviceFile(&physfn_sysfs_path, ifname, "physfn") < 0) return ret; ret = pciDeviceNetName(physfn_sysfs_path, pfname); diff --git a/src/util/macvtap.c b/src/util/macvtap.c index f8b9d55..78e30f8 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -210,8 +210,11 @@ configMacvtapTap(int tapfd, int vnet_hdr) rc_on_fail = -1; errmsg = _("cannot clean IFF_VNET_HDR flag on macvtap tap"); } else if ((ifreq.ifr_flags & IFF_VNET_HDR) == 0 && vnet_hdr) { - if (ioctl(tapfd, TUNGETFEATURES, &features) != 0) - return errno; + if (ioctl(tapfd, TUNGETFEATURES, &features) < 0) { + virReportSystemError(errno, "%s", + _("cannot get feature flags on macvtap tap")); + return -1; + } if ((features & IFF_VNET_HDR)) { new_flags = ifreq.ifr_flags | IFF_VNET_HDR; errmsg = _("cannot set IFF_VNET_HDR flag on macvtap tap"); @@ -335,7 +338,7 @@ create_name: macaddress, linkdev, virtPortProfile, - vmuuid, vmOp) != 0) { + vmuuid, vmOp) < 0) { rc = -1; goto link_del_exit; } @@ -352,7 +355,6 @@ create_name: } rc = openTap(cr_ifname, 10); - if (rc >= 0) { if (configMacvtapTap(rc, vnet_hdr) < 0) { VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ @@ -552,6 +554,8 @@ getPortProfileStatus(struct nlattr **tb, int32_t vf, } } + return rc; + err_exit: if (msg) macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", msg); @@ -572,7 +576,7 @@ doPortProfileOpSetLink(bool nltarget_kernel, int32_t vf, uint8_t op) { - int rc = 0; + int rc = -1; struct nlmsghdr *resp; struct nlmsgerr *err; struct ifinfomsg ifinfo = { @@ -588,7 +592,7 @@ doPortProfileOpSetLink(bool nltarget_kernel, nl_msg = nlmsg_alloc_simple(RTM_SETLINK, NLM_F_REQUEST); if (!nl_msg) { virReportOOMError(); - return -1; + return rc; } if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) @@ -690,16 +694,12 @@ doPortProfileOpSetLink(bool nltarget_kernel, if (!nltarget_kernel) { pid = getLldpadPid(); - if (pid == 0) { - rc = -1; + if (pid == 0) goto err_exit; - } } - if (nlComm(nl_msg, &recvbuf, &recvbuflen, pid) < 0) { - rc = -1; + if (nlComm(nl_msg, &recvbuf, &recvbuflen, pid) < 0) goto err_exit; - } if (recvbuflen < NLMSG_LENGTH(0) || recvbuf == NULL) goto malformed_resp; @@ -716,7 +716,7 @@ doPortProfileOpSetLink(bool nltarget_kernel, virReportSystemError(-err->error, _("error during virtual port configuration of ifindex %d"), ifindex); - rc = -1; + goto err_exit; } break; @@ -727,6 +727,8 @@ doPortProfileOpSetLink(bool nltarget_kernel, goto malformed_resp; } + rc = 0; + err_exit: nlmsg_free(nl_msg); @@ -740,14 +742,14 @@ malformed_resp: macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed netlink response message")); VIR_FREE(recvbuf); - return -1; + return rc; buffer_too_small: nlmsg_free(nl_msg); macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", _("allocated netlink buffer is too small")); - return -1; + return rc; } @@ -780,8 +782,7 @@ doPortProfileOpCommon(bool nltarget_kernel, hostUUID, vf, op); - - if (rc) { + if (rc < 0) { macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", _("sending of PortProfileRequest failed.")); return rc; @@ -790,11 +791,12 @@ doPortProfileOpCommon(bool nltarget_kernel, while (--repeats >= 0) { rc = ifaceMacvtapLinkDump(nltarget_kernel, NULL, ifindex, tb, &recvbuf, getLldpadPid); - if (rc) + if (rc < 0) goto err_exit; + rc = getPortProfileStatus(tb, vf, instanceId, nltarget_kernel, is8021Qbg, &status); - if (rc) + if (rc < 0) goto err_exit; if (status == PORT_PROFILE_RESPONSE_SUCCESS || status == PORT_VDP_RESPONSE_SUCCESS) { @@ -818,7 +820,7 @@ doPortProfileOpCommon(bool nltarget_kernel, if (status == PORT_PROFILE_RESPONSE_INPROGRESS) { macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", _("port-profile setlink timed out")); - rc = -ETIMEDOUT; + rc = -2; } err_exit: @@ -843,7 +845,7 @@ getPhysdevAndVlan(const char *ifname, int *root_ifindex, char *root_ifname, *vlanid = -1; while (1) { if ((ret = ifaceGetNthParent(ifindex, ifname, 1, - root_ifindex, root_ifname, &nth))) + root_ifindex, root_ifname, &nth)) < 0) return ret; if (nth == 0) break; @@ -892,7 +894,7 @@ doPortProfileOp8021Qbg(const char *ifname, int vf = PORT_SELF_VF; if (getPhysdevAndVlan(ifname, &physdev_ifindex, physdev_ifname, - &vlanid) != 0) + &vlanid) < 0) goto err_exit; if (vlanid < 0) @@ -943,10 +945,9 @@ getPhysfnDev(const char *linkdev, int32_t *vf, char **physfndev) { - int rc = 0; - - if (ifaceIsVirtualFunction(linkdev)) { + int rc = -1; + if (ifaceIsVirtualFunction(linkdev) == 1) { /* if linkdev is SR-IOV VF, then set vf = VF index */ /* and set linkdev = PF device */ @@ -963,10 +964,13 @@ getPhysfnDev(const char *linkdev, *physfndev = strdup(linkdev); if (!*physfndev) { virReportOOMError(); - rc = -1; - } + goto err_exit; + } + rc = 0; } +err_exit: + return rc; } # endif /* IFLA_VF_PORT_MAX */ @@ -1000,7 +1004,7 @@ doPortProfileOp8021Qbh(const char *ifname, int vlanid = -1; rc = getPhysfnDev(ifname, &vf, &physfndev); - if (rc) + if (rc < 0) goto err_exit; rc = ifaceGetIndex(true, physfndev, &ifindex); @@ -1011,7 +1015,7 @@ doPortProfileOp8021Qbh(const char *ifname, case PREASSOCIATE_RR: case ASSOCIATE: rc = virGetHostUUID(hostuuid); - if (rc) + if (rc < 0) goto err_exit; rc = doPortProfileOpCommon(nltarget_kernel, NULL, ifindex, @@ -1025,7 +1029,7 @@ doPortProfileOp8021Qbh(const char *ifname, (virtPortOp == PREASSOCIATE_RR) ? PORT_REQUEST_PREASSOCIATE_RR : PORT_REQUEST_ASSOCIATE); - if (rc == -ETIMEDOUT) + if (rc == -2) /* Association timed out, disassociate */ doPortProfileOpCommon(nltarget_kernel, NULL, ifindex, NULL, diff --git a/src/util/pci.c b/src/util/pci.c index 33b4b0e..077f3a2 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1959,11 +1959,11 @@ pciGetVirtualFunctionIndex(const char *pf_sysfs_device_link, struct pci_config_address **virt_fns = NULL; if (pciGetPciConfigAddressFromSysfsDeviceLink(vf_sysfs_device_link, - &vf_bdf)) + &vf_bdf) < 0) return ret; if (pciGetVirtualFunctions(pf_sysfs_device_link, &virt_fns, - &num_virt_fns)) { + &num_virt_fns) < 0) { pciReportError(VIR_ERR_INTERNAL_ERROR, _("Error getting physical function's '%s' " "virtual_functions"), pf_sysfs_device_link); @@ -1971,7 +1971,7 @@ pciGetVirtualFunctionIndex(const char *pf_sysfs_device_link, } for (i = 0; i < num_virt_fns; i++) { - if (pciConfigAddressEqual(vf_bdf, virt_fns[i])) { + if (pciConfigAddressEqual(vf_bdf, virt_fns[i]) == 1) { *vf_index = i; ret = 0; break;

2 1

Re: [libvirt] [RFC PATCH v3 2/4] storage: add auth to virDomainDiskDef
by Daniel P. Berrange 29 Oct '11

29 Oct '11

On Thu, Oct 20, 2011 at 11:01:25AM -0700, Josh Durgin wrote: > Add additional fields to let you specify the how to authenticate with a disk. > The secret to use may be referenced by a usage string or a UUID, i.e.: > > <auth username='myuser'> > <secret type='ceph' usage='secretname'/> > </auth> > > or > > <auth username='myuser'> > <secret type='ceph' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> > </auth> > > Signed-off-by: Josh Durgin <josh.durgin(a)dreamhost.com> > --- > docs/schemas/domaincommon.rng | 29 +++++++++++ > src/Makefile.am | 3 +- > src/conf/domain_conf.c | 105 +++++++++++++++++++++++++++++++++++++--- > src/conf/domain_conf.h | 17 +++++++ > 4 files changed, 145 insertions(+), 9 deletions(-) > > diff --git a/src/Makefile.am b/src/Makefile.am > index 2555f81..7f48981 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -128,7 +128,8 @@ DOMAIN_CONF_SOURCES = \ > conf/capabilities.c conf/capabilities.h \ > conf/domain_conf.c conf/domain_conf.h \ > conf/domain_audit.c conf/domain_audit.h \ > - conf/domain_nwfilter.c conf/domain_nwfilter.h > + conf/domain_nwfilter.c conf/domain_nwfilter.h \ > + conf/secret_conf.c Unless I'm missing something, I don't think your code changes to domain_conf.c actually introduce any dependancy on secret_conf.c You include secret_conf.h, but that is only to get access to one of the enum values. So there's no dep on the secret_conf.c code and you can just drop this hunk > > DOMAIN_EVENT_SOURCES = \ > conf/domain_event.c conf/domain_event.h > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > index 5959593..1de3742 100644 > --- a/src/conf/domain_conf.c > +++ b/src/conf/domain_conf.c > @@ -49,6 +49,7 @@ > #include "virfile.h" > #include "bitmap.h" > #include "count-one-bits.h" > +#include "secret_conf.h" > > #define VIR_FROM_THIS VIR_FROM_DOMAIN > > @@ -185,6 +186,11 @@ VIR_ENUM_IMPL(virDomainDiskProtocol, VIR_DOMAIN_DISK_PROTOCOL_LAST, > "rbd", > "sheepdog") > > +VIR_ENUM_IMPL(virDomainDiskSecretType, VIR_DOMAIN_DISK_SECRET_TYPE_LAST, > + "none", > + "uuid", > + "usage") > + > VIR_ENUM_IMPL(virDomainDiskIo, VIR_DOMAIN_DISK_IO_LAST, > "default", > "native", > @@ -782,6 +788,9 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def) > VIR_FREE(def->dst); > VIR_FREE(def->driverName); > VIR_FREE(def->driverType); > + VIR_FREE(def->auth.username); > + if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE) > + VIR_FREE(def->auth.secret.usage); > virStorageEncryptionFree(def->encryption); > virDomainDeviceInfoClear(&def->info); > > @@ -2298,7 +2307,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, > unsigned int flags) > { > virDomainDiskDefPtr def; > - xmlNodePtr cur, host; > + xmlNodePtr cur, child; > char *type = NULL; > char *device = NULL; > char *snapshot = NULL; > @@ -2319,6 +2328,10 @@ virDomainDiskDefParseXML(virCapsPtr caps, > char *devaddr = NULL; > virStorageEncryptionPtr encryption = NULL; > char *serial = NULL; > + char *authUsername = NULL; > + char *authUsage = NULL; > + char *authUUID = NULL; > + char *usageType = NULL; > > if (VIR_ALLOC(def) < 0) { > virReportOOMError(); > @@ -2374,10 +2387,10 @@ virDomainDiskDefParseXML(virCapsPtr caps, > _("missing name for disk source")); > goto error; > } > - host = cur->children; > - while (host != NULL) { > - if (host->type == XML_ELEMENT_NODE && > - xmlStrEqual(host->name, BAD_CAST "host")) { > + child = cur->children; > + while (child != NULL) { > + if (child->type == XML_ELEMENT_NODE && > + xmlStrEqual(child->name, BAD_CAST "host")) { > if (VIR_REALLOC_N(hosts, nhosts + 1) < 0) { > virReportOOMError(); > goto error; > @@ -2386,20 +2399,20 @@ virDomainDiskDefParseXML(virCapsPtr caps, > hosts[nhosts].port = NULL; > nhosts++; > > - hosts[nhosts - 1].name = virXMLPropString(host, "name"); > + hosts[nhosts - 1].name = virXMLPropString(child, "name"); > if (!hosts[nhosts - 1].name) { > virDomainReportError(VIR_ERR_INTERNAL_ERROR, > "%s", _("missing name for host")); > goto error; > } > - hosts[nhosts - 1].port = virXMLPropString(host, "port"); > + hosts[nhosts - 1].port = virXMLPropString(child, "port"); > if (!hosts[nhosts - 1].port) { > virDomainReportError(VIR_ERR_INTERNAL_ERROR, > "%s", _("missing port for host")); > goto error; > } > } > - host = host->next; > + child = child->next; > } > break; > default: > @@ -2436,6 +2449,58 @@ virDomainDiskDefParseXML(virCapsPtr caps, > iotag = virXMLPropString(cur, "io"); > ioeventfd = virXMLPropString(cur, "ioeventfd"); > event_idx = virXMLPropString(cur, "event_idx"); > + } else if (xmlStrEqual(cur->name, BAD_CAST "auth")) { > + authUsername = virXMLPropString(cur, "username"); > + if (authUsername == NULL) { > + virDomainReportError(VIR_ERR_INTERNAL_ERROR, > + _("missing username for auth")); > + goto error; > + } > + > + def->auth.secretType = VIR_DOMAIN_DISK_SECRET_TYPE_NONE; > + child = cur->children; > + while (child != NULL) { > + if (child->type == XML_ELEMENT_NODE && > + xmlStrEqual(child->name, BAD_CAST "secret")) { > + usageType = virXMLPropString(child, "type"); > + if (usageType == NULL) { > + virDomainReportError(VIR_ERR_XML_ERROR, > + _("missing type for secret")); > + goto error; > + } > + if (virSecretUsageTypeTypeFromString(usageType) != > + VIR_SECRET_USAGE_TYPE_CEPH) { > + virDomainReportError(VIR_ERR_XML_ERROR, > + _("invalid secret type %s"), > + usageType); > + goto error; > + } > + > + authUUID = virXMLPropString(child, "uuid"); > + authUsage = virXMLPropString(child, "usage"); > + > + if (authUUID != NULL && authUsage != NULL) { > + virDomainReportError(VIR_ERR_XML_ERROR, > + _("only one of uuid and usage can be specfied")); > + goto error; > + } > + if (authUUID != NULL) { > + def->auth.secretType = VIR_DOMAIN_DISK_SECRET_TYPE_UUID; > + if (virUUIDParse(authUUID, > + def->auth.secret.uuid) < 0) { > + virDomainReportError(VIR_ERR_XML_ERROR, > + _("malformed uuid %s"), > + authUUID); > + goto error; > + } > + } else if (authUsage != NULL) { > + def->auth.secretType = VIR_DOMAIN_DISK_SECRET_TYPE_USAGE; > + def->auth.secret.usage = authUsage; > + authUsage = NULL; > + } > + } > + child = child->next; > + } > } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { > def->readonly = 1; > } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { > @@ -2654,6 +2719,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, > hosts = NULL; > def->nhosts = nhosts; > nhosts = 0; > + def->auth.username = authUsername; > + authUsername = NULL; > def->driverName = driverName; > driverName = NULL; > def->driverType = driverType; > @@ -2690,6 +2757,10 @@ cleanup: > VIR_FREE(hosts); > VIR_FREE(protocol); > VIR_FREE(device); > + VIR_FREE(authUsername); > + VIR_FREE(usageType); > + VIR_FREE(authUUID); > + VIR_FREE(authUsage); > VIR_FREE(driverType); > VIR_FREE(driverName); > VIR_FREE(cachetag); > @@ -9176,6 +9247,7 @@ virDomainDiskDefFormat(virBufferPtr buf, > const char *iomode = virDomainDiskIoTypeToString(def->iomode); > const char *ioeventfd = virDomainIoEventFdTypeToString(def->ioeventfd); > const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx); > + char uuidstr[VIR_UUID_STRING_BUFLEN]; > > if (!type) { > virDomainReportError(VIR_ERR_INTERNAL_ERROR, > @@ -9234,6 +9306,23 @@ virDomainDiskDefFormat(virBufferPtr buf, > virBufferAsprintf(buf, "/>\n"); > } > > + if (def->auth.username) { > + virBufferAsprintf(buf, " <auth username='%s'>\n", > + def->auth.username); > + if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_UUID) { > + virUUIDFormat(def->auth.secret.uuid, uuidstr); > + virBufferAsprintf(buf, > + " <secret type='passphrase' uuid='%s'/>\n", > + uuidstr); > + } > + if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE) { > + virBufferAsprintf(buf, > + " <secret type='passphrase' usage='%s'/>\n", > + def->auth.secret.usage); > + } > + virBufferAsprintf(buf, " </auth>\n"); > + } > + > if (def->src || def->nhosts > 0) { > switch (def->type) { > case VIR_DOMAIN_DISK_TYPE_FILE: > diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h > index 2119b5a..0d08040 100644 > --- a/src/conf/domain_conf.h > +++ b/src/conf/domain_conf.h > @@ -269,6 +269,14 @@ enum virDomainSnapshotState { > VIR_DOMAIN_DISK_SNAPSHOT = VIR_DOMAIN_LAST, > }; > > +enum virDomainDiskSecretType { > + VIR_DOMAIN_DISK_SECRET_TYPE_NONE, > + VIR_DOMAIN_DISK_SECRET_TYPE_UUID, > + VIR_DOMAIN_DISK_SECRET_TYPE_USAGE, > + > + VIR_DOMAIN_DISK_SECRET_TYPE_LAST > +}; > + > /* Stores the virtual disk configuration */ > typedef struct _virDomainDiskDef virDomainDiskDef; > typedef virDomainDiskDef *virDomainDiskDefPtr; > @@ -281,6 +289,14 @@ struct _virDomainDiskDef { > int protocol; > int nhosts; > virDomainDiskHostDefPtr hosts; > + struct { > + char *username; > + int secretType; > + union { > + unsigned char uuid[VIR_UUID_BUFLEN]; > + char *usage; > + } secret; > + } auth; > char *driverName; > char *driverType; > char *serial; > @@ -1868,6 +1884,7 @@ VIR_ENUM_DECL(virDomainDiskCache) > VIR_ENUM_DECL(virDomainDiskErrorPolicy) > VIR_ENUM_DECL(virDomainDiskProtocol) > VIR_ENUM_DECL(virDomainDiskIo) > +VIR_ENUM_DECL(virDomainDiskSecretType) > VIR_ENUM_DECL(virDomainDiskSnapshot) > VIR_ENUM_DECL(virDomainIoEventFd) > VIR_ENUM_DECL(virDomainVirtioEventIdx) ACK with the Makefile.am hunk dropped Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 2

Re: [libvirt] [RFC PATCH v3 1/4] secret: add Ceph secret type
by Daniel P. Berrange 29 Oct '11

29 Oct '11

On Thu, Oct 20, 2011 at 11:01:24AM -0700, Josh Durgin wrote: > From: Sage Weil <sage(a)newdream.net> > > Add a new secret type to store a Ceph authentication key. The name > is simply an identifier for easy human reference. > > The xml looks like this: > > <secret ephemeral='no' private='no'> > <uuid>0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f</uuid> > <usage type='ceph'> > <name>mycluster_admin</name> > </usage> > </secret> > > Signed-off-by: Sage Weil <sage(a)newdream.net> > Signed-off-by: Josh Durgin <josh.durgin(a)dreamhost.com> > --- > docs/schemas/secret.rng | 10 ++++++++++ > include/libvirt/libvirt.h.in | 3 +++ > src/conf/secret_conf.c | 23 ++++++++++++++++++++++- > src/conf/secret_conf.h | 1 + > src/secret/secret_driver.c | 8 ++++++++ > 5 files changed, 44 insertions(+), 1 deletions(-) ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 5

[libvirt] [PATCH] qemu: plug memory leak
by ajia＠redhat.com 29 Oct '11

29 Oct '11

From: Alex Jia <ajia(a)redhat.com> Deteted by valgrind: ==18462== 1,100 bytes in 1 blocks are definitely lost in loss record 183 of 184 ==18462== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==18462== by 0x4A06167: realloc (vg_replace_malloc.c:525) ==18462== by 0x4AADBB: virReallocN (memory.c:161) ==18462== by 0x4A975E: virBufferGrow (buf.c:117) ==18462== by 0x4A9D92: virBufferVasprintf (buf.c:290) ==18462== by 0x4A9EF7: virBufferAsprintf (buf.c:263) ==18462== by 0x429488: qemuBuildControllerDevStr (qemu_command.c:1993) ==18462== by 0x42C4B6: qemuBuildCommandLine (qemu_command.c:3803) ==18462== by 0x41A604: testCompareXMLToArgvHelper (qemuxml2argvtest.c:124) ==18462== by 0x41BB81: virtTestRun (testutils.c:141) ==18462== by 0x416DFF: mymain (qemuxml2argvtest.c:369) ==18462== by 0x41B277: virtTestMain (testutils.c:696) ==18462== ==18462== LEAK SUMMARY: ==18462== definitely lost: 1,100 bytes in 1 blocks ==18462== indirectly lost: 0 bytes in 0 blocks * src/qemu/qemu_command.c (qemuBuildCommandLine): Clean up on success. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_command.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0c5bfab..9c435de 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3804,6 +3804,7 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); } } else if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && def->controllers[i]->model == -1 && -- 1.7.1

3 2

[libvirt] [PATCH] qemu: avoid leaking uninit data from hotplug to dumpxml
by Eric Blake 29 Oct '11

29 Oct '11

Detected by Coverity. The fix in 2c27dfa didn't catch all bad instances of memcpy(). Thankfully, on further analysis, all of the problematic uses are only triggered by old qemu that lacks -device. * src/qemu/qemu_hotplug.c (qemuDomainAttachPciDiskDevice) (qemuDomainAttachNetDevice, qemuDomainAttachHostPciDevice): Init all fields since monitor only populates some of them. --- src/qemu/qemu_hotplug.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 037f4aa..06b21c3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -246,7 +246,7 @@ int qemuDomainAttachPciDiskDevice(struct qemud_driver *driver, } } } else { - virDomainDevicePCIAddress guestAddr; + virDomainDevicePCIAddress guestAddr = disk->info.addr.pci; ret = qemuMonitorAddPCIDisk(priv->mon, disk->src, type, @@ -775,6 +775,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto try_remove; } } else { + guestAddr = net->info.addr.pci; if (qemuMonitorAddPCINetwork(priv->mon, nicstr, &guestAddr) < 0) { qemuDomainObjExitMonitorWithDriver(driver, vm); @@ -929,7 +930,7 @@ int qemuDomainAttachHostPciDevice(struct qemud_driver *driver, configfd, configfd_name); qemuDomainObjExitMonitorWithDriver(driver, vm); } else { - virDomainDevicePCIAddress guestAddr; + virDomainDevicePCIAddress guestAddr = hostdev->info.addr.pci; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorAddPCIHostDevice(priv->mon, -- 1.7.4.4

2 2

[libvirt] [RFC PATCH 0/8 v2] Summary on block IO throttle
by Lei Li 29 Oct '11

29 Oct '11

Changes since V1 - Implement the support to get the block io throttling for a device as read only connection - QMP/HMP. - Split virDomainBlockIoThrottle into two separate functions virDomainSetBlockIoThrottle - Set block I/O limits for a device - Requires a connection in 'write' mode. - Limits (info) structure passed as an input parameter virDomainGetBlockIoThrottle - Get the current block I/O limits for a device - Works on a read-only connection. - Current limits are written to the output parameter (reply). - And Other fixups suggested by Adam Litke, Daniel P. Berrange. - For dynamically allocate the blkiothrottle struct, I will fix it when implement --current --live --config options support. Today libvirt supports the cgroups blkio-controller, which handles proportional shares and throughput/iops limits on host block devices. blkio-controller does not support network file systems (NFS) or other QEMU remote block drivers (curl, Ceph/rbd, sheepdog) since they are not host block devices. QEMU I/O throttling works with all types of drive and can be applied independently to each drive attached to a guest and supports throughput/iops limits. To help add QEMU I/O throttling support to libvirt, we plan to complete it with add new API virDomainBlockIoThrottle(), new command 'blkiothrottle' and Python bindings. Notes: we are sending this series out now(even though they are not completed yet.)because we want to start the review process. #1)#2) features were implemented by Zhi Yong Wu: 1) Enable the blkio throttling in xml when guest is starting up. Add blkio throttling in xml as follows: <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/kvm-one.img'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> <iotune bps='n'.../> </disk> 2) Enable blkio throttling setting at guest running time. virsh blkiothrottle <domain> <device> [--bps<number>] [--bps_rd<number>] \ [--bps_wr<number>] [--iops<number>] [--iops_rd<number>] [--iops_wr<number>] 3) The support to get the current block i/o throttling for a device - HMP/QMP. virsh blkiothrottle <domain> <device> bps: bps_rd: bps_wr: iops: iops_rd: iops_wr: And I will address feedback and work on the missing features in few days includes: 4) Python binding support for setting blkio throttling. 5) --current --live --config options support to unify the libvirt API. daemon/remote.c | 85 +++++++++++++++++ include/libvirt/libvirt.h.in | 25 +++++ python/generator.py | 2 + python/libvirt-override-api.xml | 16 ++++ python/libvirt-override.c | 43 +++++++++ src/conf/domain_conf.c | 77 ++++++++++++++++ src/conf/domain_conf.h | 11 +++ src/driver.h | 18 ++++ src/libvirt.c | 120 ++++++++++++++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_command.c | 35 +++++++ src/qemu/qemu_driver.c | 108 ++++++++++++++++++++++ src/qemu/qemu_monitor.c | 36 ++++++++ src/qemu/qemu_monitor.h | 10 ++ src/qemu/qemu_monitor_json.c | 191 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 10 ++ src/qemu/qemu_monitor_text.c | 88 ++++++++++++++++++ src/qemu/qemu_monitor_text.h | 10 ++ src/remote/remote_driver.c | 81 +++++++++++++++++ src/remote/remote_protocol.x | 39 ++++++++- src/remote_protocol-structs | 34 +++++++ src/util/xml.h | 3 + tools/virsh.c | 100 ++++++++++++++++++++ tools/virsh.pod | 13 +++ 24 files changed, 1156 insertions(+), 1 deletions(-) -- Lei

3 5

[libvirt] [PATCH 0/8 v3] Allow a client to connect to QEMU's VNC by passing an FD via libvirt
by Daniel P. Berrange 28 Oct '11

28 Oct '11

An update to https://www.redhat.com/archives/libvir-list/2011-October/msg01040.html New in v3: - Add feature probing before using new RPC calls - Set O_CLOSEXEC in various places - Misc typo fixes - Fix RPC protocol tests - Add docs about protocol extension

2 19