- Devel - libvirt List Archives

[libvirt] [PATCH] storage: Update qemu-img flag checking
by Osier Yang 10 Mar '11

10 Mar '11

For newer qemu-img, the help string for "backing file format" is "[-F backing_fmt]". Fix the wrong logic error by commit e997c268. * src/storage/storage_backend.c --- src/storage/storage_backend.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 0751fde..6d8e8b0 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -595,7 +595,8 @@ static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg) start = strstr(help, " create "); end = strstr(start, "\n"); - if ((tmp = strstr(start, "-F fmt")) && tmp < end) + if (((tmp = strstr(start, "-F fmt")) && tmp < end) || + ((tmp = strstr(start, "-F backing_fmt")) && tmp < end)) ret = QEMU_IMG_BACKING_FORMAT_FLAG; else if ((tmp = strstr(start, "[-o options]")) && tmp < end) ret = QEMU_IMG_BACKING_FORMAT_OPTIONS; @@ -757,7 +758,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, }; if (vol->target.encryption != NULL) { - if (imgformat == QEMU_IMG_BACKING_FORMAT_FLAG) { + if (imgformat == QEMU_IMG_BACKING_FORMAT_OPTIONS) { imgargv[8] = "-o"; imgargv[9] = "encryption=on"; } else { @@ -837,7 +838,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, }; if (vol->target.encryption != NULL) { - if (imgformat == QEMU_IMG_BACKING_FORMAT_FLAG) { + if (imgformat == QEMU_IMG_BACKING_FORMAT_OPTIONS) { imgargv[6] = "-o"; imgargv[7] = "encryption=on"; } else { -- 1.7.4

2 2

[libvirt] [PATCH v2] qemu: Replace deprecated option of qemu-img
by Osier Yang 10 Mar '11

10 Mar '11

qemu-img silently disable "-e", so we can't use it for volume encryption anymore, change it into "-o encryption=on" if qemu supports "-o" option. --- src/storage/storage_backend.c | 47 +++++++++++++++++++++++++++++++++------- 1 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 2eede74..ec122a9 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -637,6 +637,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, int ret = -1; char *size = NULL; char *create_tool; + int imgformat = -1; const char *type = virStorageFileFormatTypeToString(vol->target.format); const char *backingType = vol->backingStore.path ? @@ -741,6 +742,10 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, return -1; } + imgformat = virStorageBackendQEMUImgBackingFormat(create_tool); + if (imgformat < 0) + goto cleanup; + if (inputvol) { const char *imgargv[] = { create_tool, @@ -750,8 +755,19 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, inputPath, vol->target.path, NULL, + NULL, + NULL }; + if (vol->target.encryption != NULL) { + if (imgformat == QEMU_IMG_BACKING_FORMAT_FLAG) { + imgargv[8] = "-o"; + imgargv[9] = "encryption=on"; + } else { + imgargv[8] = "-e"; + } + } + ret = virStorageBackendCreateExecCommand(pool, vol, imgargv); } else if (vol->backingStore.path) { const char *imgargv[] = { @@ -766,11 +782,8 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, NULL, NULL }; - int imgformat = virStorageBackendQEMUImgBackingFormat(create_tool); - char *optflag = NULL; - if (imgformat < 0) - goto cleanup; + char *optflag = NULL; switch (imgformat) { case QEMU_IMG_BACKING_FORMAT_FLAG: imgargv[6] = "-F"; @@ -786,13 +799,21 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, virReportOOMError(); goto cleanup; } + + if (vol->target.encryption != NULL) { + char *tmp = NULL; + if (virAsprintf(&tmp, "%s,%s", optflag, "encryption=on") < 0) { + virReportOOMError(); + goto cleanup; + } + VIR_FREE(optflag); + optflag = tmp; + } + imgargv[6] = "-o"; imgargv[7] = optflag; imgargv[8] = vol->target.path; imgargv[9] = size; - if (vol->target.encryption != NULL) - imgargv[10] = "-e"; - break; default: VIR_INFO("Unable to set backing store format for %s with %s", @@ -814,10 +835,18 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, vol->target.path, size, NULL, + NULL, NULL }; - if (vol->target.encryption != NULL) - imgargv[6] = "-e"; + + if (vol->target.encryption != NULL) { + if (imgformat == QEMU_IMG_BACKING_FORMAT_FLAG) { + imgargv[6] = "-o"; + imgargv[7] = "encryption=on"; + } else { + imgargv[6] = "-e"; + } + } ret = virStorageBackendCreateExecCommand(pool, vol, imgargv); } -- 1.7.4

2 2

[libvirt] [PATCHv2 0/8] another round of audit improvements
by Eric Blake 09 Mar '11

09 Mar '11

This supercedes the unreviewed v1: https://www.redhat.com/archives/libvir-list/2011-March/msg00257.html The more I kept working on this, the more things I found that needed fixing. As it is, it's too late for me tonight, so patch 8 is currently untested, and patch 9/8 is needed to audit the hotplug devices used in 'virsh attach-interface'. But earlier patches are in good shape, so I want to start the review. Perhaps this series should be re-arranged a bit; let me know if you want the final version to see patches in any different order (although due to some of my renames, it will take me longer to do rebasing that shuffles patch order). Eric Blake (8): audit: tweak audit messages to match conventions audit: split cgroup audit types to allow more information audit: also audit cgroup controller path audit: audit use of /dev/vhost-net audit: rename remaining qemu audit functions cgroup: allow fine-tuning of device ACL permissions audit: also audit cgroup ACL permissions qemu: support vhost in attach-interface src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 9 +- src/qemu/qemu_audit.c | 263 ++++++++++++++++++++++++++++++++++----------- src/qemu/qemu_audit.h | 83 +++++++++------ src/qemu/qemu_cgroup.c | 57 +++++----- src/qemu/qemu_command.c | 10 +- src/qemu/qemu_command.h | 5 + src/qemu/qemu_driver.c | 44 ++++---- src/qemu/qemu_hotplug.c | 94 ++++++++++++----- src/qemu/qemu_migration.c | 14 ++-- src/qemu/qemu_process.c | 6 +- src/util/cgroup.c | 63 ++++++++---- src/util/cgroup.h | 31 +++++- 13 files changed, 466 insertions(+), 214 deletions(-) -- 1.7.4

2 21

[libvirt] [PATCH] Access qemu backing_file with relative pool path
by Jesse Cook 09 Mar '11

09 Mar '11

This patch enables the relative backing file path support provided by qemu-img create. If the storage pool is not found with the specified path, check if the file exists relative to the pool where the new image will be created by prepending the storage pool path. --- src/storage/storage_backend.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 2eede74..bb49f22 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -687,10 +687,34 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, return -1; } if (access(vol->backingStore.path, R_OK) != 0) { - virReportSystemError(errno, - _("inaccessible backing store volume %s"), - vol->backingStore.path); - return -1; + /* If the backing store image is not found with the specified path, + * check for the file relative to the pool path. */ + int accessRetCode = -1; + + char *absolutePath = NULL; + + virBuffer absPathBuf = VIR_BUFFER_INITIALIZER; + + virBufferVSprintf(&absPathBuf, + "%s/%s", + pool->def->target.path, + vol->backingStore.path); + + if (virBufferError(&absPathBuf)) { + virBufferFreeAndReset(&absPathBuf); + virReportOOMError(); + return -1; + } + + absolutePath = virBufferContentAndReset(&absPathBuf); + accessRetCode = access(absolutePath, R_OK); + VIR_FREE(absolutePath); + if (accessRetCode != 0) { + virReportSystemError(errno, + _("inaccessible backing store volume %s"), + vol->backingStore.path); + return -1; + } } } -- 1.7.4.1

4 5

[libvirt] [PATCH] Don't overwrite virRun error messages
by Cole Robinson 09 Mar '11

09 Mar '11

virRun gives pretty useful error output, let's not overwrite it unless there is a good reason. Some places were providing more information about what the commands were _attempting_ to do, however that's usually less useful from a debugging POV than what actually happened. --- src/lxc/veth.c | 45 +++------------------------------ src/openvz/openvz_driver.c | 20 -------------- src/qemu/qemu_driver.c | 4 --- src/storage/storage_backend.c | 3 -- src/storage/storage_backend_logical.c | 3 -- src/vmware/vmware_driver.c | 2 - 6 files changed, 4 insertions(+), 73 deletions(-) diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 65ff5d8..0fa76cf 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -94,7 +94,6 @@ int vethCreate(char** veth1, char** veth2) const char *argv[] = { "ip", "link", "add", NULL, "type", "veth", "peer", "name", NULL, NULL }; - int cmdResult = 0; int vethDev = 0; bool veth1_alloc = false; @@ -122,13 +121,7 @@ int vethCreate(char** veth1, char** veth2) argv[8] = *veth2; VIR_DEBUG("veth1: %s veth2: %s", *veth1, *veth2); - rc = virRun(argv, &cmdResult); - - if (rc != 0 || - (WIFEXITED(cmdResult) && WEXITSTATUS(cmdResult) != 0)) { - vethError(VIR_ERR_INTERNAL_ERROR, - _("Failed to create veth device pair '%s', '%s': %d"), - *veth1, *veth2, WEXITSTATUS(cmdResult)); + if (virRun(argv, NULL) < 0) { if (veth1_alloc) VIR_FREE(*veth1); VIR_FREE(*veth2); @@ -233,7 +226,6 @@ int moveInterfaceToNetNs(const char* iface, int pidInNs) const char *argv[] = { "ip", "link", "set", iface, "netns", NULL, NULL }; - int cmdResult = 0; if (virAsprintf(&pid, "%d", pidInNs) == -1) { virReportOOMError(); @@ -241,14 +233,7 @@ int moveInterfaceToNetNs(const char* iface, int pidInNs) } argv[5] = pid; - rc = virRun(argv, &cmdResult); - if (rc != 0 || - (WIFEXITED(cmdResult) && WEXITSTATUS(cmdResult) != 0)) { - vethError(VIR_ERR_INTERNAL_ERROR, - _("Failed to move '%s' into NS(pid=%d) (%d)"), - iface, pidInNs, WEXITSTATUS(cmdResult)); - rc = -1; - } + rc = virRun(argv, NULL); VIR_FREE(pid); return rc; @@ -267,22 +252,11 @@ int moveInterfaceToNetNs(const char* iface, int pidInNs) */ int setMacAddr(const char* iface, const char* macaddr) { - int rc; const char *argv[] = { "ip", "link", "set", iface, "address", macaddr, NULL }; - int cmdResult = 0; - rc = virRun(argv, &cmdResult); - if (rc != 0 || - (WIFEXITED(cmdResult) && WEXITSTATUS(cmdResult) != 0)) { - vethError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set '%s' to '%s' (%d)"), - macaddr, iface, WEXITSTATUS(cmdResult)); - rc = -1; - } - - return rc; + return virRun(argv, NULL); } /** @@ -298,20 +272,9 @@ int setMacAddr(const char* iface, const char* macaddr) */ int setInterfaceName(const char* iface, const char* new) { - int rc; const char *argv[] = { "ip", "link", "set", iface, "name", new, NULL }; - int cmdResult = 0; - rc = virRun(argv, &cmdResult); - if (rc != 0 || - (WIFEXITED(cmdResult) && WEXITSTATUS(cmdResult) != 0)) { - vethError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set '%s' to '%s' (%d)"), - new, iface, WEXITSTATUS(cmdResult)); - rc = -1; - } - - return rc; + return virRun(argv, NULL); } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 00d378a..9ee6de5 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -216,8 +216,6 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) } if (virRun(prog, NULL) < 0) { - openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); goto cleanup; } } @@ -495,8 +493,6 @@ static int openvzDomainSuspend(virDomainPtr dom) { if (vm->state != VIR_DOMAIN_PAUSED) { openvzSetProgramSentinal(prog, vm->def->name); if (virRun(prog, NULL) < 0) { - openvzError(VIR_ERR_OPERATION_FAILED, "%s", - _("Suspend operation failed")); goto cleanup; } vm->state = VIR_DOMAIN_PAUSED; @@ -535,8 +531,6 @@ static int openvzDomainResume(virDomainPtr dom) { if (vm->state == VIR_DOMAIN_PAUSED) { openvzSetProgramSentinal(prog, vm->def->name); if (virRun(prog, NULL) < 0) { - openvzError(VIR_ERR_OPERATION_FAILED, "%s", - _("Resume operation failed")); goto cleanup; } vm->state = VIR_DOMAIN_RUNNING; @@ -775,8 +769,6 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, if (prog[0] != NULL) { ADD_ARG_LIT("--save"); if (virRun(prog, NULL) < 0) { - openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); rc = -1; goto exit; } @@ -982,8 +974,6 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml, openvzSetProgramSentinal(progstart, vm->def->name); if (virRun(progstart, NULL) < 0) { - openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); goto cleanup; } @@ -1039,8 +1029,6 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) openvzSetProgramSentinal(prog, vm->def->name); if (virRun(prog, NULL) < 0) { - openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); goto cleanup; } @@ -1086,8 +1074,6 @@ openvzDomainUndefine(virDomainPtr dom) openvzSetProgramSentinal(prog, vm->def->name); if (virRun(prog, NULL) < 0) { - openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); goto cleanup; } @@ -1124,8 +1110,6 @@ openvzDomainSetAutostart(virDomainPtr dom, int autostart) openvzSetProgramSentinal(prog, vm->def->name); if (virRun(prog, NULL) < 0) { - openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); goto cleanup; } ret = 0; @@ -1216,8 +1200,6 @@ static int openvzDomainSetVcpusInternal(virDomainObjPtr vm, openvzSetProgramSentinal(prog, vm->def->name); if (virRun(prog, NULL) < 0) { - openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); return -1; } @@ -1551,8 +1533,6 @@ openvzDomainSetMemoryInternal(virDomainObjPtr vm, openvzSetProgramSentinal(prog, vm->def->name); if (virRun(prog, NULL) < 0) { - openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0f7cbad..7e58c20 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6056,10 +6056,6 @@ static virDomainSnapshotPtr qemuDomainSnapshotCreateXML(virDomainPtr domain, qemuimgarg[4] = vm->def->disks[i]->src; if (virRun(qemuimgarg, NULL) < 0) { - virReportSystemError(errno, - _("Failed to run '%s' to create snapshot '%s' from disk '%s'"), - qemuimgarg[0], snap->def->name, - vm->def->disks[i]->src); goto cleanup; } } diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 2eede74..dffc73f 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -534,9 +534,6 @@ static int virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, } if (!filecreated) { if (virRun(cmdargv, NULL) < 0) { - virReportSystemError(errno, - _("Cannot run %s to create %s"), - cmdargv[0], vol->target.path); return -1; } if (stat(vol->target.path, &st) < 0) { diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ead35cb..f759abd 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -558,9 +558,6 @@ virStorageBackendLogicalDeletePool(virConnectPtr conn ATTRIBUTE_UNUSED, pvargv[1] = pool->def->source.devices[i].path; if (virRun(pvargv, NULL) < 0) { error = -1; - virReportSystemError(errno, - _("cannot remove PV device '%s'"), - pool->def->source.devices[i].path); break; } } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 22b29d1..2b07b13 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -189,7 +189,6 @@ vmwareStopVM(struct vmware_driver *driver, virDomainObjPtr vm) vmwareSetSentinal(cmd, ((vmwareDomainPtr) vm->privateData)->vmxPath); if (virRun(cmd, NULL) < 0) { - vmwareError(VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VMRUN); return -1; } @@ -222,7 +221,6 @@ vmwareStartVM(struct vmware_driver *driver, virDomainObjPtr vm) vmwareSetSentinal(cmd, NULL); if (virRun(cmd, NULL) < 0) { - vmwareError(VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VMRUN); return -1; } -- 1.7.4

2 2

[libvirt] [PATCH] docs: silence warnings about generated API docs
by Eric Blake 09 Mar '11

09 Mar '11

I noticed these while testing 'make dist'. Parsing ./../src/util/event.c Function comment for virEventRegisterDefaultImpl lacks description of return value Function comment for virEventRunDefaultImpl lacks description of return value Parsing ./../src/util/virterror.c Missing comment for function virSetErrorLogPriorityFunc * src/util/event.c (virEventRegisterDefaultImpl) (virEventRunDefaultImpl): Document return types. * src/util/virterror.c (virSetErrorLogPriorityFunc): Provide docs. --- Enough material that I thought I'd wait for an ack. src/util/event.c | 6 +++++- src/util/virterror.c | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/util/event.c b/src/util/event.c index 0d88b55..bc0129c 100644 --- a/src/util/event.c +++ b/src/util/event.c @@ -1,8 +1,8 @@ /* * event.c: event loop for monitoring file handles * + * Copyright (C) 2007, 2011 Red Hat, Inc. * Copyright (C) 2007 Daniel P. Berrange - * Copyright (C) 2007 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -140,6 +140,8 @@ void virEventRegisterImpl(virEventAddHandleFunc addHandle, * Once registered, the application can invoke * virEventRunDefaultImpl in a loop to process * events + * + * Returns 0 on success, -1 on failure. */ int virEventRegisterDefaultImpl(void) { @@ -178,6 +180,8 @@ int virEventRegisterDefaultImpl(void) * if (virEventRunDefaultImpl() < 0) * ...print error... * } + * + * Returns 0 on success, -1 on failure. */ int virEventRunDefaultImpl(void) { diff --git a/src/util/virterror.c b/src/util/virterror.c index aaa3720..f136054 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1,7 +1,7 @@ /* * virterror.c: implements error handling and reporting code for libvirt * - * Copy: Copyright (C) 2006, 2008-2010 Red Hat, Inc. + * Copy: Copyright (C) 2006, 2008-2011 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -1344,6 +1344,12 @@ void virReportOOMErrorFull(int domcode, virerr, NULL, NULL, -1, -1, virerr, NULL); } +/** + * virSetErrorLogPriorityFunc: + * @func: function to install + * + * Install a function used to filter error logging based on error priority. + */ void virSetErrorLogPriorityFunc(virErrorLogPriorityFunc func) { virErrorLogPriorityFilter = func; -- 1.7.4

2 2

[libvirt] [PATCH] Add XML config switch to enable/disable vhost-net support
by Laine Stump 09 Mar '11

09 Mar '11

This patch is in response to https://bugzilla.redhat.com/show_bug.cgi?id=643050 The existing libvirt support for the vhost-net backend to the virtio network driver happens automatically - if the vhost-net device is available, it is always enabled, otherwise the standard userland virtio backend is used. This patch makes it possible to force whether or not vhost-net is used with a bit of XML. Adding a <driver> element to the interface XML, eg: <interface type="network"> <model type="virtio"/> <driver name="vhost"/> will force use of vhost-net (if it's not available, the domain will fail to start). if driver name="qemu", vhost-net will not be used even if it is available. If there is no <driver name='xxx'/> in the config, libvirt will revert to the pre-existing automatic behavior - use vhost-net if it's available, and userland backend if vhost-net isn't available. --- Note that I don't really like the "name='vhost|qemu'" nomenclature, but am including it here just to get the patches on the list. I could live with it this way, or with any of the following (anyone have a strong opinion?) (note that in all cases, nothing specified means "try to use vhost, but fallback to userland if necessary") vhost='on|off' vhost='required|disabled' mode='vhost|qemu' mode='kernel|user' backend='kernel|user' (So far the strongest opinion has been for the current "name='vhost|qemu'") Oh, and also - sorry Eric, but I didn't have the brain cells left tonight to add this new bit to the documentation, and I really want to get the patch up/in now, so that will have to wait for a followup next week :-) docs/schemas/domain.rng | 13 ++++++++ src/conf/domain_conf.c | 27 +++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_command.c | 71 +++++++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_command.h | 3 -- 5 files changed, 108 insertions(+), 16 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index a524e4b..6d0654d 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1005,6 +1005,19 @@ </element> </optional> <optional> + <element name="driver"> + <optional> + <attribute name="name"> + <choice> + <value>qemu</value> + <value>vhost</value> + </choice> + </attribute> + </optional> + <empty/> + </element> + </optional> + <optional> <ref name="address"/> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b4df38c..04ed502 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -184,6 +184,10 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "internal", "direct") +VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST, + "qemu", + "vhost") + VIR_ENUM_IMPL(virDomainChrChannelTarget, VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST, "guestfwd", @@ -2289,6 +2293,7 @@ virDomainNetDefParseXML(virCapsPtr caps, char *address = NULL; char *port = NULL; char *model = NULL; + char *backend = NULL; char *filter = NULL; char *internal = NULL; char *devaddr = NULL; @@ -2371,6 +2376,8 @@ virDomainNetDefParseXML(virCapsPtr caps, script = virXMLPropString(cur, "path"); } else if (xmlStrEqual (cur->name, BAD_CAST "model")) { model = virXMLPropString(cur, "type"); + } else if (xmlStrEqual (cur->name, BAD_CAST "driver")) { + backend = virXMLPropString(cur, "name"); } else if (xmlStrEqual (cur->name, BAD_CAST "filterref")) { filter = virXMLPropString(cur, "filter"); VIR_FREE(filterparams); @@ -2558,6 +2565,18 @@ virDomainNetDefParseXML(virCapsPtr caps, model = NULL; } + if ((backend != NULL) && + (def->model && STREQ(def->model, "virtio"))) { + int b; + if ((b = virDomainNetBackendTypeFromString(backend)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("Unkown interface <driver name='%s'> has been specified"), + backend); + goto error; + } + def->backend = b; + def->backend_specified = 1; + } if (filter != NULL) { switch (def->type) { case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -2584,6 +2603,7 @@ cleanup: VIR_FREE(script); VIR_FREE(bridge); VIR_FREE(model); + VIR_FREE(backend); VIR_FREE(filter); VIR_FREE(type); VIR_FREE(internal); @@ -6275,9 +6295,14 @@ virDomainNetDefFormat(virBufferPtr buf, if (def->ifname) virBufferEscapeString(buf, " <target dev='%s'/>\n", def->ifname); - if (def->model) + if (def->model) { virBufferEscapeString(buf, " <model type='%s'/>\n", def->model); + if (STREQ(def->model, "virtio") && def->backend_specified) { + virBufferVSprintf(buf, " <driver name='%s'/>\n", + virDomainNetBackendTypeToString(def->backend)); + } + } if (def->filter) { virBufferEscapeString(buf, " <filterref filter='%s'", def->filter); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a459a22..451ccad 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -292,6 +292,13 @@ enum virDomainNetType { VIR_DOMAIN_NET_TYPE_LAST, }; +/* the backend driver used for virtio interfaces */ +enum virDomainNetBackendType { + VIR_DOMAIN_NET_BACKEND_TYPE_QEMU, /* userland */ + VIR_DOMAIN_NET_BACKEND_TYPE_VHOST, /* kernel */ + + VIR_DOMAIN_NET_BACKEND_TYPE_LAST, +}; /* the mode type for macvtap devices */ enum virDomainNetdevMacvtapType { @@ -310,6 +317,8 @@ struct _virDomainNetDef { enum virDomainNetType type; unsigned char mac[VIR_MAC_BUFLEN]; char *model; + enum virDomainNetBackendType backend; + int backend_specified : 1; union { struct { char *dev; @@ -1264,6 +1273,7 @@ VIR_ENUM_DECL(virDomainControllerModel) VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainFSAccessMode) VIR_ENUM_DECL(virDomainNet) +VIR_ENUM_DECL(virDomainNetBackend) VIR_ENUM_DECL(virDomainChrDevice) VIR_ENUM_DECL(virDomainChrChannelTarget) VIR_ENUM_DECL(virDomainChrConsoleTarget) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 86c5bb5..9eb54a1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -302,24 +302,61 @@ cleanup: } -int +static int qemuOpenVhostNet(virDomainNetDefPtr net, - unsigned long long qemuCmdFlags) + unsigned long long qemuCmdFlags, + int *vhostfd) { - /* If qemu supports vhost-net mode (including the -netdev command - * option), the nic model is virtio, and we can open - * /dev/vhost_net, assume that vhost-net mode is available and - * return the fd to /dev/vhost_net. Otherwise, return -1. - */ + *vhostfd = -1; /* assume we won't use vhost */ + /* If the config says explicitly to not use vhost, return now */ + if (net->backend_specified && + (net->backend == VIR_DOMAIN_NET_BACKEND_TYPE_QEMU)) { + return 0; + } + + /* If qemu doesn't support vhost-net mode (including the -netdev command + * option), don't try to open the device. + */ if (!(qemuCmdFlags & QEMUD_CMD_FLAG_VNET_HOST && qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV && - qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE && - net->model && STREQ(net->model, "virtio"))) - return -1; + qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { + if (net->backend_specified && + (net->backend == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("vhost-net is not supported with " + "this QEMU binary")); + return -1; + } + return 0; + } - return open("/dev/vhost-net", O_RDWR, 0); + /* If the nic model isn't virtio, don't try to open. */ + if (!(net->model && STREQ(net->model, "virtio"))) { + if (net->backend_specified && + (net->backend == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("vhost-net is only supported for " + "virtio network interfaces")); + return -1; + } + return 0; + } + + *vhostfd = open("/dev/vhost-net", O_RDWR, 0); + + /* If the config says explicitly to use vhost and we couldn't open it, + * report an error. + */ + if ((*vhostfd < 0) && net->backend_specified && + (net->backend == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("vhost-net was requested for an interface, " + "but is unavailable")); + return -1; + } + return 0; } @@ -3278,7 +3315,10 @@ qemuBuildCommandLine(virConnectPtr conn, net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { /* Attempt to use vhost-net mode for these types of network device */ - int vhostfd = qemuOpenVhostNet(net, qemuCmdFlags); + int vhostfd; + + if (qemuOpenVhostNet(net, qemuCmdFlags, &vhostfd) < 0) + goto error; if (vhostfd >= 0) { virCommandTransferFD(cmd, vhostfd); @@ -4618,6 +4658,13 @@ qemuParseCommandLineNet(virCapsPtr caps, } else if (STREQ(keywords[i], "model")) { def->model = values[i]; values[i] = NULL; + } else if (STREQ(keywords[i], "vhost")) { + if ((values[i] == NULL) || STREQ(values[i], "on")) { + def->backend = VIR_DOMAIN_NET_BACKEND_TYPE_VHOST; + } else if (STREQ(keywords[i], "off")) { + def->backend = VIR_DOMAIN_NET_BACKEND_TYPE_QEMU; + } + def->backend_specified = 1; } } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 4c42a10..5439184 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -116,9 +116,6 @@ int qemuNetworkIfaceConnect(virConnectPtr conn, unsigned long long qemCmdFlags) ATTRIBUTE_NONNULL(1); -int qemuOpenVhostNet(virDomainNetDefPtr net, - unsigned long long qemuCmdFlags); - int qemuPhysIfaceConnect(virConnectPtr conn, struct qemud_driver *driver, virDomainNetDefPtr net, -- 1.7.3.4

4 8

[libvirt] [PATCH 2/2] Make sure the rundir is accessible by the user
by Guido Günther 09 Mar '11

09 Mar '11

otherwise the user might not have enough permissions to access the socket if roots umask is 077. http://bugs.debian.org/614210 --- daemon/libvirtd.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 610e7fd..a968e05 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -3156,7 +3156,9 @@ static int create_rundir (void) { const char *rundir = LOCALSTATEDIR "/run/libvirt"; int ret = 0; + mode_t old_umask; + old_umask = umask(022); if (mkdir (rundir, 0755)) { if (errno != EEXIST) { char ebuf[1024]; @@ -3165,6 +3167,7 @@ static int create_rundir (void) ret = VIR_DAEMON_ERR_RUNDIR; } } + umask(old_umask); return ret; } -- 1.7.4.1

2 3

[libvirt] [PATCH] storage: replace the deprecated option of qemu-img.
by Osier Yang 09 Mar '11

09 Mar '11

qemu-img silently disable "-e", so we can't use it for volume encryption anymore, change it into "-o encryption=on". I'm afraid of it will inroduce compatibility problem for older qemu without "-o" option, but "-o" option is already used in the codes, seems it's fine. * src/storage/storage_backend.c --- src/storage/storage_backend.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 2eede74..c381444 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -778,7 +778,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, imgargv[8] = vol->target.path; imgargv[9] = size; if (vol->target.encryption != NULL) - imgargv[10] = "-e"; + imgargv[10] = "-o encryption=on"; break; case QEMU_IMG_BACKING_FORMAT_OPTIONS: @@ -786,13 +786,18 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, virReportOOMError(); goto cleanup; } + + if (vol->target.encryption != NULL) { + if (virAsprintf(&optflag, ",encryption=on") < 0) { + virReportOOMError(); + goto cleanup; + } + } + imgargv[6] = "-o"; imgargv[7] = optflag; imgargv[8] = vol->target.path; imgargv[9] = size; - if (vol->target.encryption != NULL) - imgargv[10] = "-e"; - break; default: VIR_INFO("Unable to set backing store format for %s with %s", @@ -800,7 +805,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, imgargv[6] = vol->target.path; imgargv[7] = size; if (vol->target.encryption != NULL) - imgargv[8] = "-e"; + imgargv[8] = "-o encryption=on"; } ret = virStorageBackendCreateExecCommand(pool, vol, imgargv); @@ -817,7 +822,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, NULL }; if (vol->target.encryption != NULL) - imgargv[6] = "-e"; + imgargv[6] = "-o encryption=on"; ret = virStorageBackendCreateExecCommand(pool, vol, imgargv); } -- 1.7.4

3 4

[libvirt] [PATCH] docs: correct range of default NAT subnet
by Eric Blake 09 Mar '11

09 Mar '11

* docs/formatdomain.html.in: Fix typo. --- Pushing under the trivial rule. docs/formatdomain.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9b9ab29..8b6e5e4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1145,7 +1145,7 @@ network config with '<code>virsh net-dumpxml [networkname]</code>'. There is one virtual network called 'default' setup out of the box which does NAT'ing to the default route and has an IP range of - <code>192.168.22.0/255.255.255.0</code>. Each guest will have an + <code>192.168.122.0/255.255.255.0</code>. Each guest will have an associated tun device created with a name of vnetN, which can also be overridden with the <target> element (see <a href="#elementsNICSTargetOverride">overriding the target element</a>). -- 1.7.4

2 1