- Devel - libvirt List Archives

[libvirt] virt-manager issue, FreeBSD
by Jason Helfman 07 Feb '15

07 Feb '15

Hi, I am working on resolving an issue with virt-manager on FreeBSD. A contributor recently worked on getting spice-gtk ported to FreeBSD, however I am working on this error when launching console.py. [helfman@its-helfman03 ~/workspace/ports/deskutils/virt-manager]$ python /usr/local/share/virt-manager/virtManager/console.py Traceback (most recent call last): File "/usr/local/share/virt-manager/virtManager/console.py", line 42, in <module> from virtManager.autodrawer import AutoDrawer ImportError: No module named virtManager.autodrawer Thanks for your help! Jason -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

1 0

[libvirt] [PATCH v3] qemu: Pass file descriptor when using TPM passthrough
by Stefan Berger 07 Feb '15

07 Feb '15

Pass the TPM file descriptor to QEMU via command line. Instead of passing /dev/tpm0 we now pass /dev/fdset/10 and the additional parameters -add-fd set=10,fd=20. This addresses the use case when QEMU is started with non-root privileges and QEMU cannot open /dev/tpm0 for example. One problem is that for the passing of the file descriptor set to work, virCommandReorderFDs must not be called on the virCommand. This is prevented by setting a flag in the virCommandPassFDGetFDIndex that is checked to be clear when virCommandReorderFDs is run. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> v2->v3: Fixed some memory leaks --- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 136 ++++++++++++++++++++++++++++++++++++++++++++--- src/util/vircommand.c | 33 ++++++++++++ src/util/vircommand.h | 3 ++ 4 files changed, 166 insertions(+), 7 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index aeec440..3194e8b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1164,6 +1164,7 @@ virCommandNewArgList; virCommandNewArgs; virCommandNonblockingFDs; virCommandPassFD; +virCommandPassFDGetFDIndex; virCommandPassListenFDs; virCommandRawStatus; virCommandRequireHandshake; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8ed7934..17debba 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -159,6 +159,58 @@ VIR_ENUM_IMPL(qemuNumaPolicy, VIR_DOMAIN_NUMATUNE_MEM_LAST, "interleave"); /** + * qemuVirCommandGetFDSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the QEMU -add-fd command line option + * for the given file descriptor. The file descriptor must previously + * have been 'transferred' in a virCommandPassFD() call. + * This function for example returns "set=10,fd=20". + */ +static char * +qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandPassFDGetFDIndex(cmd, fd); + + if (idx >= 0) { + ignore_value(virAsprintf(&result, "set=%d,fd=%d", idx, fd) < 0); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + + return result; +} + +/** + * qemuVirCommandGetDevSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the QEMU path= parameter where a file + * descriptor is accessed via a file descriptor set, for example + * /dev/fdset/10. The file descriptor must previously have been + * 'transferred' in a virCommandPassFD() call. + */ +static char * +qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandPassFDGetFDIndex(cmd, fd); + + if (idx >= 0) { + ignore_value(virAsprintf(&result, "/dev/fdset/%d", idx) < 0); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + return result; +} + + +/** * qemuPhysIfaceConnect: * @def: the definition of the VM (needed by 802.1Qbh and audit) * @driver: pointer to the driver instance @@ -5926,14 +5978,20 @@ qemuBuildRNGDeviceArgs(virCommandPtr cmd, static char *qemuBuildTPMBackendStr(const virDomainDef *def, + virCommandPtr cmd, virQEMUCapsPtr qemuCaps, - const char *emulator) + const char *emulator, + int *tpmfd, int *cancelfd) { const virDomainTPMDef *tpm = def->tpm; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *type = virDomainTPMBackendTypeToString(tpm->type); - char *cancel_path; + char *cancel_path = NULL; const char *tpmdev; + char *devset = NULL, *cancel_devset = NULL; + + *tpmfd = -1; + *cancelfd = -1; virBufferAsprintf(&buf, "%s,id=tpm-%s", type, tpm->info.alias); @@ -5946,11 +6004,49 @@ static char *qemuBuildTPMBackendStr(const virDomainDef *def, if (!(cancel_path = virTPMCreateCancelPath(tpmdev))) goto error; - virBufferAddLit(&buf, ",path="); - virBufferEscape(&buf, ',', ",", "%s", tpmdev); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { + *tpmfd = open(tpmdev, O_RDWR); + if (*tpmfd < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not open TPM device %s"), tpmdev); + goto error; + } + + virCommandPassFD(cmd, *tpmfd, + VIR_COMMAND_PASS_FD_CLOSE_PARENT); + devset = qemuVirCommandGetDevSet(cmd, *tpmfd); + if (devset == NULL) + goto error; + + *cancelfd = open(cancel_path, O_WRONLY); + if (*cancelfd < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not open TPM device's cancel path " + "%s"), cancel_path); + goto error; + } + + virCommandPassFD(cmd, *cancelfd, + VIR_COMMAND_PASS_FD_CLOSE_PARENT); + cancel_devset = qemuVirCommandGetDevSet(cmd, *cancelfd); + if (cancel_devset == NULL) + goto error; + + virBufferAddLit(&buf, ",path="); + virBufferEscape(&buf, ',', ",", "%s", devset); + VIR_FREE(devset); - virBufferAddLit(&buf, ",cancel-path="); - virBufferEscape(&buf, ',', ",", "%s", cancel_path); + virBufferAddLit(&buf, ",cancel-path="); + virBufferEscape(&buf, ',', ",", "%s", cancel_devset); + VIR_FREE(cancel_devset); + } else { + /* all test cases will use this path */ + virBufferAddLit(&buf, ",path="); + virBufferEscape(&buf, ',', ",", "%s", tpmdev); + + virBufferAddLit(&buf, ",cancel-path="); + virBufferEscape(&buf, ',', ",", "%s", cancel_path); + } VIR_FREE(cancel_path); break; @@ -5970,6 +6066,10 @@ static char *qemuBuildTPMBackendStr(const virDomainDef *def, emulator, type); error: + VIR_FREE(devset); + VIR_FREE(cancel_devset); + VIR_FREE(cancel_path); + virBufferFreeAndReset(&buf); return NULL; } @@ -9223,13 +9323,35 @@ qemuBuildCommandLine(virConnectPtr conn, if (def->tpm) { char *optstr; + int tpmfd = -1; + int cancelfd = -1; + char *fdset; - if (!(optstr = qemuBuildTPMBackendStr(def, qemuCaps, emulator))) + if (!(optstr = qemuBuildTPMBackendStr(def, cmd, qemuCaps, emulator, + &tpmfd, &cancelfd))) goto error; virCommandAddArgList(cmd, "-tpmdev", optstr, NULL); VIR_FREE(optstr); + if (tpmfd >= 0) { + fdset = qemuVirCommandGetFDSet(cmd, tpmfd); + if (!fdset) + goto error; + + virCommandAddArgList(cmd, "-add-fd", fdset, NULL); + VIR_FREE(fdset); + } + + if (cancelfd >= 0) { + fdset = qemuVirCommandGetFDSet(cmd, cancelfd); + if (!fdset) + goto error; + + virCommandAddArgList(cmd, "-add-fd", fdset, NULL); + VIR_FREE(fdset); + } + if (!(optstr = qemuBuildTPMDevStr(def, qemuCaps, emulator))) goto error; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 6527d85..2616446 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -67,6 +67,7 @@ enum { VIR_EXEC_RUN_SYNC = (1 << 3), VIR_EXEC_ASYNC_IO = (1 << 4), VIR_EXEC_LISTEN_FDS = (1 << 5), + VIR_EXEC_FIXED_FDS = (1 << 6), }; typedef struct _virCommandFD virCommandFD; @@ -214,6 +215,12 @@ virCommandReorderFDs(virCommandPtr cmd) if (!cmd || cmd->has_error || !cmd->npassfd) return; + if ((cmd->flags & VIR_EXEC_FIXED_FDS)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("The fds are fixed and cannot be reordered")); + goto error; + } + for (i = 0; i < cmd->npassfd; i++) maxfd = MAX(cmd->passfd[i].fd, maxfd); @@ -1019,6 +1026,32 @@ virCommandPassListenFDs(virCommandPtr cmd) cmd->flags |= VIR_EXEC_LISTEN_FDS; } +/* + * virCommandPassFDGetFDIndex: + * @cmd: pointer to virCommand + * @fd: FD to get index of + * + * Determine the index of the FD in the transfer set. + * + * Returns index >= 0 if @set contains @fd, + * -1 otherwise. + */ +int +virCommandPassFDGetFDIndex(virCommandPtr cmd, int fd) +{ + size_t i = 0; + + while (i < cmd->npassfd) { + if (cmd->passfd[i].fd == fd) { + cmd->flags |= VIR_EXEC_FIXED_FDS; + return i; + } + i++; + } + + return -1; +} + /** * virCommandSetPidFile: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index bf65de4..198da2f 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -62,6 +62,9 @@ void virCommandPassFD(virCommandPtr cmd, void virCommandPassListenFDs(virCommandPtr cmd); +int virCommandPassFDGetFDIndex(virCommandPtr cmd, + int fd); + void virCommandSetPidFile(virCommandPtr cmd, const char *pidfile) ATTRIBUTE_NONNULL(2); -- 1.9.3

3 12

[libvirt] [PATCH v2] maint: improve usage of autogen's --no-git
by Stefan Zimmermann 06 Feb '15

06 Feb '15

If you will build libvirt with the no-git-option than you is the gnulib-srcdir mandatory. You will lose this information till now. With this patch you will save this information. Signed-off-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com> --- autogen.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autogen.sh b/autogen.sh index 1965f64..d1c319d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -20,6 +20,10 @@ no_git= if test "x$1" = "x--no-git"; then no_git=" $1" shift + case "$1 $2" in + --gnulib-srcdir=*) no_git="$no_git $1"; shift ;; + --gnulib-srcdir\ *) no_git="$no_git $1=$2"; shift; shift;; + esac fi if test -z "$NOCONFIGURE" ; then if test "x$1" = "x--system"; then -- 2.1.4

2 1

[libvirt] [PATCH] network: don't allow multiple portgroups with the same name in a network
by Laine Stump 06 Feb '15

06 Feb '15

When defining and creating networks, we have been checking to make sure there is only a single "default" portgroup, but haven't verified that no two portgroups have the same name. We *do* check for multiple definitions when updating the portgroups in an existing network though. This patch adds a check to networkValidate(), which is called when a network is defined or created, to disallow duplicate names. It would actually make sense to do this in the network XML parser (since it's not really "something that might make sense but isn't supported by this driver", but is instead "something that should never be allowed"), but doing that carries the danger of causing errors when rereading the config of existing networks when libvirtd is restarted after an upgrade, and that would result in networks disappearing from libvirt's list. (I'm thinking I should change the error to "XML_ERROR" instead of "UNSUPPORTED", even though that's not the type of error that networkValidate is intended for) This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1115858 --- src/network/bridge_driver.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c56e8f2..d549ca5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1,7 +1,7 @@ /* * bridge_driver.c: core driver methods for managing network * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -2728,7 +2728,7 @@ static int networkValidate(virNetworkDefPtr def, bool check_active) { - size_t i; + size_t i, j; bool vlanUsed, vlanAllowed, badVlanUse = false; virPortGroupDefPtr defaultPortGroup = NULL; virNetworkIpDefPtr ipdef; @@ -2874,7 +2874,15 @@ networkValidate(virNetworkDefPtr def, } defaultPortGroup = &def->portGroups[i]; } - + for (j = i+1; j < def->nPortGroups; j++) { + if (STREQ(def->portGroups[i].name, def->portGroups[j].name)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("multiple <portgroup> elements with the " + "same name (%s) in network '%s'"), + def->portGroups[i].name, def->name); + return -1; + } + } if (def->portGroups[i].bandwidth && !bandwidthAllowed) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported <bandwidth> element in network '%s' " -- 2.1.0

2 1

[libvirt] [PATCHv3] Trivially support DomainHasManagedSaveImage
by Ján Tomko 05 Feb '15

05 Feb '15

Return 0 instead of ERR_NO_SUPPORT in each driver where we don't support managed save or -1 if the domain does not exist. This avoids spamming daemon logs when 'virsh dominfo' is run. https://bugzilla.redhat.com/show_bug.cgi?id=1095637 --- src/bhyve/bhyve_driver.c | 25 +++++++++++++- src/esx/esx_driver.c | 39 ++++++++++++++++++++- src/lxc/lxc_driver.c | 26 +++++++++++++- src/openvz/openvz_driver.c | 28 ++++++++++++++- src/parallels/parallels_driver.c | 20 ++++++++++- src/phyp/phyp_driver.c | 29 +++++++++++++++- src/uml/uml_driver.c | 33 +++++++++++++++++- src/vbox/vbox_common.c | 73 +++++++++++++++++++++++++++++++++++++++- src/vmware/vmware_driver.c | 27 ++++++++++++++- src/xenapi/xenapi_driver.c | 27 ++++++++++++++- 10 files changed, 317 insertions(+), 10 deletions(-) v2: implement the function in all drivers, not just LXC v3: also check if the domain exists diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 56cc8ab..ae39917 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -2,7 +2,7 @@ * bhyve_driver.c: core driver methods for managing bhyve guests * * Copyright (C) 2014 Roman Bogorodskiy - * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2014-2015 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 @@ -1430,6 +1430,28 @@ bhyveConnectDomainEventDeregisterAny(virConnectPtr conn, return 0; } +static int +bhyveDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = bhyveDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainHasManagedSaveImageEnsureACL(domain->conn, vm->def) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + static virHypervisorDriver bhyveHypervisorDriver = { .name = "bhyve", .connectOpen = bhyveConnectOpen, /* 1.2.2 */ @@ -1476,6 +1498,7 @@ static virHypervisorDriver bhyveHypervisorDriver = { .connectCompareCPU = bhyveConnectCompareCPU, /* 1.2.4 */ .connectDomainEventRegisterAny = bhyveConnectDomainEventRegisterAny, /* 1.2.5 */ .connectDomainEventDeregisterAny = bhyveConnectDomainEventDeregisterAny, /* 1.2.5 */ + .domainHasManagedSaveImage = bhyveDomainHasManagedSaveImage, /* 1.2.13 */ }; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 6b9965f..179f44c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1,7 +1,7 @@ /* * esx_driver.c: core driver functions for managing VMware ESX hosts * - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2009-2014 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * @@ -5147,6 +5147,42 @@ esxConnectListAllDomains(virConnectPtr conn, } #undef MATCH +static int +esxDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) +{ + int result = -1; + esxPrivate *priv = domain->conn->privateData; + esxVI_ManagedObjectReference *managedObjectReference = NULL; + char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + + virCheckFlags(0, -1); + + if (esxVI_EnsureSession(priv->primary) < 0) + return -1; + + virUUIDFormat(domain->uuid, uuid_string); + + if (esxVI_FindByUuid(priv->primary, priv->primary->datacenter->_reference, + uuid_string, esxVI_Boolean_True, + esxVI_Boolean_Undefined, + &managedObjectReference) < 0) { + return -1; + } + + if (!managedObjectReference) { + virReportError(VIR_ERR_NO_DOMAIN, + _("Could not find domain with UUID '%s'"), + uuid_string); + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_ManagedObjectReference_Free(&managedObjectReference); + return result; +} + static virHypervisorDriver esxHypervisorDriver = { .name = "ESX", @@ -5226,6 +5262,7 @@ static virHypervisorDriver esxHypervisorDriver = { .domainSnapshotHasMetadata = esxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainSnapshotDelete = esxDomainSnapshotDelete, /* 0.8.0 */ .connectIsAlive = esxConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = esxDomainHasManagedSaveImage, /* 1.2.13 */ }; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 487e2a2..3adb21d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_driver.c: linux container driver functions @@ -5726,6 +5726,29 @@ lxcNodeAllocPages(virConnectPtr conn, } +static int +lxcDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = lxcDomObjFromDomain(dom))) + return ret; + + if (virDomainHasManagedSaveImageEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + + /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { .name = LXC_DRIVER_NAME, @@ -5818,6 +5841,7 @@ static virHypervisorDriver lxcHypervisorDriver = { .domainLxcOpenNamespace = lxcDomainLxcOpenNamespace, /* 1.0.2 */ .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ + .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver lxcConnectDriver = { diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 556f626..5a5cd8d 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1,7 +1,7 @@ /* * openvz_driver.c: core driver methods for managing OpenVZ VEs * - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain * Copyright (C) 2007 Anoop Joe Cyriac @@ -2567,6 +2567,31 @@ openvzDomainMigrateConfirm3Params(virDomainPtr domain, return ret; } +static int +openvzDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + struct openvz_driver *driver = dom->conn->privateData; + virDomainObjPtr obj; + int ret = -1; + + virCheckFlags(0, -1); + + openvzDriverLock(driver); + obj = virDomainObjListFindByUUID(driver->domains, dom->uuid); + openvzDriverUnlock(driver); + if (!obj) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + ret = 0; + + cleanup: + if (obj) + virObjectUnlock(obj); + return ret; +} + + static virHypervisorDriver openvzHypervisorDriver = { .name = "OPENVZ", @@ -2632,6 +2657,7 @@ static virHypervisorDriver openvzHypervisorDriver = { .domainMigratePerform3Params = openvzDomainMigratePerform3Params, /* 1.2.8 */ .domainMigrateFinish3Params = openvzDomainMigrateFinish3Params, /* 1.2.8 */ .domainMigrateConfirm3Params = openvzDomainMigrateConfirm3Params, /* 1.2.8 */ + .domainHasManagedSaveImage = openvzDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver openvzConnectDriver = { diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index b569160..c9338b5 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -2,7 +2,7 @@ * parallels_driver.c: core driver functions for managing * Parallels Cloud Server hosts * - * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2014-2015 Red Hat, Inc. * Copyright (C) 2012 Parallels, Inc. * * This library is free software; you can redistribute it and/or @@ -956,6 +956,23 @@ parallelsDomainUndefine(virDomainPtr domain) return parallelsDomainUndefineFlags(domain, 0); } +static int +parallelsDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) +{ + parallelsConnPtr privconn = domain->conn->privateData; + virDomainObjPtr dom = NULL; + + virCheckFlags(0, -1); + + dom = virDomainObjListFindByUUID(privconn->domains, domain->uuid); + if (dom == NULL) { + parallelsDomNotFoundError(domain); + return -1; + } + + return 0; +} + static virHypervisorDriver parallelsDriver = { .name = "Parallels", .connectOpen = parallelsConnectOpen, /* 0.10.0 */ @@ -997,6 +1014,7 @@ static virHypervisorDriver parallelsDriver = { .connectIsEncrypted = parallelsConnectIsEncrypted, /* 1.2.5 */ .connectIsSecure = parallelsConnectIsSecure, /* 1.2.5 */ .connectIsAlive = parallelsConnectIsAlive, /* 1.2.5 */ + .domainHasManagedSaveImage = parallelsDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver parallelsConnectDriver = { diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 6c5a91e..d05f897 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright IBM Corp. 2009 * * phyp_driver.c: ssh layer to access Power Hypervisors @@ -3669,6 +3669,32 @@ phypDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) return phypDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE); } +static int +phypDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + + phyp_driverPtr phyp_driver = dom->conn->privateData; + LIBSSH2_SESSION *session = phyp_driver->session; + char *managed_system = phyp_driver->managed_system; + char *lpar_name = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + lpar_name = phypGetLparNAME(session, managed_system, dom->id, dom->conn); + + if (lpar_name == NULL) { + VIR_ERROR(_("Unable to determine domain's name.")); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(lpar_name); + return ret; +} + static virHypervisorDriver phypHypervisorDriver = { .name = "PHYP", .connectOpen = phypConnectOpen, /* 0.7.0 */ @@ -3698,6 +3724,7 @@ static virHypervisorDriver phypHypervisorDriver = { .connectIsSecure = phypConnectIsSecure, /* 0.7.3 */ .domainIsUpdated = phypDomainIsUpdated, /* 0.8.6 */ .connectIsAlive = phypConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = phypDomainHasManagedSaveImage, /* 1.2.13 */ }; static virStorageDriver phypStorageDriver = { diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 6ca038a..68efd18 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1,7 +1,7 @@ /* * uml_driver.c: core driver methods for managing UML guests * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -2943,6 +2943,36 @@ umlNodeAllocPages(virConnectPtr conn, } +static int +umlDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + struct uml_driver *driver = dom->conn->privateData; + int ret = -1; + virDomainObjPtr vm; + + virCheckFlags(0, -1); + + umlDriverLock(driver); + vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); + umlDriverUnlock(driver); + + if (!vm) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + + if (virDomainHasManagedSaveImageEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + + static virHypervisorDriver umlHypervisorDriver = { .name = "UML", .connectOpen = umlConnectOpen, /* 0.5.0 */ @@ -3006,6 +3036,7 @@ static virHypervisorDriver umlHypervisorDriver = { .nodeSetMemoryParameters = umlNodeSetMemoryParameters, /* 0.10.2 */ .nodeGetFreePages = umlNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = umlNodeAllocPages, /* 1.2.9 */ + .domainHasManagedSaveImage = umlDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver umlConnectDriver = { diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index bd3f50c..deca490 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2014, Taowei Luo (uaedante(a)gmail.com) - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2008-2009 Sun Microsystems, Inc. * * This library is free software; you can redistribute it and/or @@ -7588,6 +7588,76 @@ vboxNodeAllocPages(virConnectPtr conn ATTRIBUTE_UNUSED, startCell, cellCount, add); } +static int +vboxDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + vboxGlobalData *data = dom->conn->privateData; + vboxArray machines = VBOX_ARRAY_INITIALIZER; + vboxIIDUnion iid; + char *machineNameUtf8 = NULL; + PRUnichar *machineNameUtf16 = NULL; + unsigned char uuid[VIR_UUID_BUFLEN]; + size_t i; + bool matched = false; + nsresult rc; + int ret = -1; + + virCheckFlags(0, -1); + + if (!data->vboxObj) + return ret; + + VBOX_IID_INITIALIZE(&iid); + rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get list of machines, rc=%08x"), (unsigned)rc); + return ret; + } + + for (i = 0; i < machines.count; ++i) { + IMachine *machine = machines.items[i]; + PRBool isAccessible = PR_FALSE; + + if (!machine) + continue; + + gVBoxAPI.UIMachine.GetAccessible(machine, &isAccessible); + if (!isAccessible) + continue; + + gVBoxAPI.UIMachine.GetId(machine, &iid); + if (NS_FAILED(rc)) + continue; + vboxIIDToUUID(&iid, uuid); + vboxIIDUnalloc(&iid); + + if (memcmp(dom->uuid, uuid, VIR_UUID_BUFLEN) == 0) { + + PRUint32 state; + + matched = true; + + gVBoxAPI.UIMachine.GetName(machine, &machineNameUtf16); + VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineNameUtf8); + + gVBoxAPI.UIMachine.GetState(machine, &state); + + ret = 0; + } + + if (matched) + break; + } + + /* Do the cleanup and take care you dont leak any memory */ + VBOX_UTF8_FREE(machineNameUtf8); + VBOX_COM_UNALLOC_MEM(machineNameUtf16); + gVBoxAPI.UArray.vboxArrayRelease(&machines); + + return ret; +} + /** * Function Tables @@ -7661,6 +7731,7 @@ virHypervisorDriver vboxCommonDriver = { .connectIsAlive = vboxConnectIsAlive, /* 0.9.8 */ .nodeGetFreePages = vboxNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = vboxNodeAllocPages, /* 1.2.9 */ + .domainHasManagedSaveImage = vboxDomainHasManagedSaveImage, /* 1.2.13 */ }; static void updateDriver(void) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 2d7ba04..fb7fa5b 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------*/ /* - * Copyright (C) 2011-2012 Red Hat, Inc. + * Copyright (C) 2011-2015 Red Hat, Inc. * Copyright 2010, diateam (www.diateam.net) * Copyright (C) 2013. Doug Goldstein <cardoe(a)cardoe.com> * @@ -1195,6 +1195,30 @@ vmwareConnectListAllDomains(virConnectPtr conn, return ret; } +static int +vmwareDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + struct vmware_driver *driver = dom->conn->privateData; + virDomainObjPtr obj; + int ret = -1; + + virCheckFlags(0, -1); + + vmwareDriverLock(driver); + obj = virDomainObjListFindByUUID(driver->domains, dom->uuid); + vmwareDriverUnlock(driver); + if (!obj) { + virReportError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + ret = 0; + + cleanup: + if (obj) + virObjectUnlock(obj); + return ret; +} + static virHypervisorDriver vmwareHypervisorDriver = { @@ -1233,6 +1257,7 @@ static virHypervisorDriver vmwareHypervisorDriver = { .domainIsActive = vmwareDomainIsActive, /* 0.8.7 */ .domainIsPersistent = vmwareDomainIsPersistent, /* 0.8.7 */ .connectIsAlive = vmwareConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = vmwareDomainHasManagedSaveImage, /* 1.2.13 */ }; static virConnectDriver vmwareConnectDriver = { diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 0902f9a..afb6d6c 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1,6 +1,6 @@ /* * xenapi_driver.c: Xen API driver. - * Copyright (C) 2011-2014 Red Hat, Inc. + * Copyright (C) 2011-2015 Red Hat, Inc. * Copyright (C) 2009, 2010 Citrix Ltd. * * This library is free software; you can redistribute it and/or @@ -1977,6 +1977,30 @@ xenapiConnectIsAlive(virConnectPtr conn) return 0; } +static int +xenapiDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +{ + struct xen_vm_set *vms; + xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + + virCheckFlags(0, -1); + + if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { + if (vms->size != 1) { + xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, + _("Domain name is not unique")); + xen_vm_set_free(vms); + return -1; + } + xen_vm_set_free(vms); + return 0; + } + if (vms) + xen_vm_set_free(vms); + xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); + return -1; +} + /* The interface which we export upwards to libvirt.c. */ static virHypervisorDriver xenapiHypervisorDriver = { .name = "XenAPI", @@ -2029,6 +2053,7 @@ static virHypervisorDriver xenapiHypervisorDriver = { .nodeGetFreeMemory = xenapiNodeGetFreeMemory, /* 0.8.0 */ .domainIsUpdated = xenapiDomainIsUpdated, /* 0.8.6 */ .connectIsAlive = xenapiConnectIsAlive, /* 0.9.8 */ + .domainHasManagedSaveImage = xenapiDomainHasManagedSaveImage, /* 1.2.13 */ }; -- 2.0.5

2 1

[libvirt] [PATCH 0/2] Interface backend attribute improvements
by Ján Tomko 05 Feb '15

05 Feb '15

Both for https://bugzilla.redhat.com/show_bug.cgi?id=1147195 Ján Tomko (2): Only parse custom vhost path for virtio interfaces Error out when custom tap device path makes no sense src/conf/domain_conf.c | 6 +++- src/qemu/qemu_command.c | 17 +++++++++- .../qemuxml2argv-tap-vhost-incorrect.xml | 39 ++++++++++++++++++++++ .../qemuxml2xmlout-tap-vhost-incorrect.xml | 38 +++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml -- 2.0.5

2 4

[libvirt] 答复： Re: [PATCH 0/3] Prevent removing a in-used static bridge and destroying a in-used virtual network
by Lin Ma 05 Feb '15

05 Feb '15

>>>> "Daniel P. Berrange" <berrange(a)redhat.com> 2015-2-4 下午 23:10 >>> >On Wed, Feb 04, 2015 at 02:21:18AM -0500, Laine Stump wrote: >> On 02/03/2015 11:47 AM, Michal Privoznik wrote: >> > On 02.02.2015 15:08, Lin Ma wrote: >> >> * Get the live state info of a virtual network through netcf in networkGetXMLDesc. >> >> * Add --system flag for net-dumpxml to show the live state info. >> >> * Check the live state info in net-destroy. >> >> * Add --force flag for net-destroy to forcibly destroy the virtual network. >> >> * Check the transient interfaces info in iface-unbridge. >> >> >> >> --- >> >> Lin Ma (3): >> >> bridge_driver: Return the live state info of a given virtual network >> >> virsh: prevent destroying a in-used network for net-destroy >> >> virsh: prevent removing a in-used bridge for iface-unbridge >> >> >> >> include/libvirt/libvirt-network.h | 1 + >> >> src/Makefile.am | 3 + >> >> src/network/bridge_driver.c | 141 ++++++++++++++++++++++++++++++++++- >> >> src/network/bridge_driver_platform.h | 7 ++ >> >> tests/Makefile.am | 4 + >> >> tools/virsh-interface.c | 25 ++++++- >> >> tools/virsh-network.c | 62 ++++++++++++++- >> >> tools/virsh.pod | 8 +- >> >> 8 files changed, 241 insertions(+), 10 deletions(-) >> >> >> > So I've spent some time thinking about this. I don't really like the >> > idea of producing completely different XML (it doesn't even have >> > as its root element!). But I see what you're trying to >> > achieve. How about putting the bridged interfaces into the network >> > definition (on request signalized by a flag, of course). >> >> I think that if we're going to add the list of connected guest devices >> to a network's status, that it should just always be there - adding a >> new flag for every little bit of different status sets a bad precedent >> and sets us up to have an infinitely increasing number of flags. >> >> Like I mentioned in my response to one of the patches, I think this >> information is better gathered and maintained by the bridge driver as >> guests connect to / disconnect from a network; this avoids the necessity >> of dragging netcf into the picture and allows much better information - >> the name of the domain using each interface can be included. > >You know if this checking for guests were done in the virNetworkDestroy >API implementation in src/network/bridge_driver.c, instead of in >virsh, then we would not need any of this code for extending the XML >nor parsing it in virsh. We could simply check the number of connections >which is something we have directly available internally. So 95% of this >patch series would go away :-C I'm sad...... :-), Anyway, Because we keep the original behaviour of net-destroy, So we keep iface-unbridge no changes as well, Then droping this patch series makes sense.

1 0

[libvirt] [PATCH] check "fc_host" and "vport_ops" capabilitis in SCSI host nodedevs
by Shivaprasad G Bhat 05 Feb '15

05 Feb '15

virNodeListDevices called by listDevices indirectly uses the virNodeDeviceHasCap() which is buggy. Earlier, virNodeListDevices was used in "virsh nodedev-list" as well. Though, the code was rewritten to use vshNodeDeviceListCollect instead. The patch fixes listDevices output for the below python script. ------------- import libvirt conn = libvirt.openReadOnly('qemu:///system') fc = conn.listDevices('fc_host', 0) print(fc) ------------ --- Shivaprasad G Bhat (1): check "fc_host" and "vport_ops" capabilities in SCSI host nodedevs src/conf/node_device_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- Signature

3 8

[libvirt] [libvirt-test-API][PATCH 0/2] Add API openGraphicsFD test case
by Jincheng Miao 05 Feb '15

05 Feb '15

Add API openGraphicsFD test case to linux_domain.conf Jincheng Miao (2): domain: add open_graphicsfd Add open_graphicsFD to linux_domain.conf cases/linux_domain.conf | 14 ++++++ repos/domain/open_graphicsfd.py | 89 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) create mode 100644 repos/domain/open_graphicsfd.py

2 3

[libvirt] [PATCH] qemu: Properly report error when cookin uuid not match the ctxt uuid
by Luyao Huang 05 Feb '15

05 Feb '15

Add the missing jump to the error label when cookin uuid does not match the ctxt uuid. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_migration.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8a8fa63..879b1bf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1147,6 +1147,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, virReportError(VIR_ERR_INTERNAL_ERROR, _("Incoming cookie data had unexpected UUID %s vs %s"), tmp, uuidstr); + goto error; } VIR_FREE(tmp); -- 1.8.3.1

3 2