October 2012 - Devel - libvirt List Archives

[libvirt] [PATCH] util: Re-format literal strings in virXMLEmitWarning
by Peter Krempa 29 Oct '12

29 Oct '12

And drop a stray space at the end of the first line of the warning. --- Yes, some lines exceed 80 columns. --- src/util/xml.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/util/xml.c b/src/util/xml.c index dad9227..30323b3 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -796,13 +796,15 @@ static int virXMLEmitWarning(int fd, const char *cmd) { size_t len; - const char *prologue = "\n\n"; + const char *prologue = + "\n\n"; if (fd < 0 || !cmd) { errno = EINVAL; -- 1.7.12.4

2 2

[libvirt] [PATCH v3] xml: print uuids in the warning
by Ján Tomko 29 Oct '12

29 Oct '12

In the XML warning, we print a virsh command line that can be used to edit that XML. This patch prints UUIDs if the entity name contains special characters (like shell metacharacters, or "--" that would break parsing of the XML comment). If the entity doesn't have a UUID, just print the virsh command that can be used to edit it. --- As opposed to previous versions, this doesn't use virBuffer and it doesn't do any shell escaping at all. The name parameter can be null now. commit 9b704ab8235af010b1fda4886201aab02098b969 xml: omit domain name from comment if it contains double hyphen only checked the 'name' parameter of virXMLEmitWarning. virXMLSaveFile invocation when creating a snapshot put the domain name in 'cmd', which means that snapshot XMLs of a domain with "--" in the name still can't be parsed by libvirt. --- src/conf/domain_conf.c | 6 +++++- src/conf/network_conf.c | 6 +++++- src/conf/nwfilter_conf.c | 12 ++++++++++-- src/conf/storage_conf.c | 6 +++++- src/libvirt_private.syms | 1 + src/parallels/parallels_storage.c | 3 +-- src/qemu/qemu_domain.c | 9 +-------- src/util/xml.c | 18 +++++++++++++----- src/util/xml.h | 1 + 9 files changed, 42 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 90ec9aa..7bf0282 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14288,6 +14288,7 @@ int virDomainSaveXML(const char *configDir, virDomainDefPtr def, const char *xml) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; char *configFile = NULL; int ret = -1; @@ -14301,7 +14302,10 @@ int virDomainSaveXML(const char *configDir, goto cleanup; } - ret = virXMLSaveFile(configFile, def->name, "edit", xml); + virUUIDFormat(def->uuid, uuidstr); + ret = virXMLSaveFile(configFile, + virXMLPickShellSafeComment(def->name, uuidstr), "edit", + xml); cleanup: VIR_FREE(configFile); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 8976f2a..a55339d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1978,6 +1978,7 @@ int virNetworkSaveXML(const char *configDir, virNetworkDefPtr def, const char *xml) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; char *configFile = NULL; int ret = -1; @@ -1991,7 +1992,10 @@ int virNetworkSaveXML(const char *configDir, goto cleanup; } - ret = virXMLSaveFile(configFile, def->name, "net-edit", xml); + virUUIDFormat(def->uuid, uuidstr); + ret = virXMLSaveFile(configFile, + virXMLPickShellSafeComment(def->name, uuidstr), + "net-edit", xml); cleanup: VIR_FREE(configFile); diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 27dbee8..b6d5d40 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2717,6 +2717,7 @@ int virNWFilterSaveXML(const char *configDir, virNWFilterDefPtr def, const char *xml) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; char *configFile = NULL; int ret = -1; @@ -2730,7 +2731,10 @@ int virNWFilterSaveXML(const char *configDir, goto cleanup; } - ret = virXMLSaveFile(configFile, def->name, "nwfilter-edit", xml); + virUUIDFormat(def->uuid, uuidstr); + ret = virXMLSaveFile(configFile, + virXMLPickShellSafeComment(def->name, uuidstr), + "nwfilter-edit", xml); cleanup: VIR_FREE(configFile); @@ -3151,6 +3155,7 @@ virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, virNWFilterObjPtr nwfilter, virNWFilterDefPtr def) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; char *xml; int ret; @@ -3174,7 +3179,10 @@ virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, return -1; } - ret = virXMLSaveFile(nwfilter->configFile, def->name, "nwfilter-edit", xml); + virUUIDFormat(def->uuid, uuidstr); + ret = virXMLSaveFile(nwfilter->configFile, + virXMLPickShellSafeComment(def->name, uuidstr), + "nwfilter-edit", xml); VIR_FREE(xml); return ret; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 5d9e61a..9a765d8 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1637,6 +1637,7 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, virStoragePoolObjPtr pool, virStoragePoolDefPtr def) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; char *xml; int ret = -1; @@ -1666,7 +1667,10 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, return -1; } - ret = virXMLSaveFile(pool->configFile, def->name, "pool-edit", xml); + virUUIDFormat(def->uuid, uuidstr); + ret = virXMLSaveFile(pool->configFile, + virXMLPickShellSafeComment(def->name, uuidstr), + "pool-edit", xml); VIR_FREE(xml); return ret; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8212726..02ca2c7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1819,6 +1819,7 @@ virURIParse; # xml.h virXMLChildElementCount; virXMLParseHelper; +virXMLPickShellSafeComment; virXMLPropString; virXMLSaveFile; virXPathBoolean; diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 76d885c..71f3f89 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -973,8 +973,7 @@ parallelsStorageVolumeDefine(virStoragePoolObjPtr pool, if (!xml_path) goto cleanup; - if (virXMLSaveFile(xml_path, privvol->name, - "volume-create", xmldesc)) { + if (virXMLSaveFile(xml_path, NULL, "volume-create", xmldesc)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Can't create file with volume description")); goto cleanup; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4e6a5e9..d01e366 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1599,7 +1599,6 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, char *snapDir = NULL; char *snapFile = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *tmp; virUUIDFormat(vm->def->uuid, uuidstr); newxml = virDomainSnapshotDefFormat(uuidstr, snapshot->def, @@ -1622,13 +1621,7 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, goto cleanup; } - if (virAsprintf(&tmp, "snapshot-edit %s", vm->def->name) < 0) { - virReportOOMError(); - goto cleanup; - } - - ret = virXMLSaveFile(snapFile, snapshot->def->name, tmp, newxml); - VIR_FREE(tmp); + ret = virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); cleanup: VIR_FREE(snapFile); diff --git a/src/util/xml.c b/src/util/xml.c index f3dc256..dad9227 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -780,6 +780,16 @@ error: goto cleanup; } +const char *virXMLPickShellSafeComment(const char *str1, const char *str2) +{ + if(str1 && !strpbrk(str1, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~") && + !strstr(str1, "--")) + return str1; + if(str2 && !strpbrk(str2, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~") && + !strstr(str2, "--")) + return str2; + return NULL; +} static int virXMLEmitWarning(int fd, const char *name, @@ -794,7 +804,7 @@ OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n\ or other application using the libvirt API.\n\ -->\n\n"; - if (fd < 0 || !name || !cmd) { + if (fd < 0 || !cmd) { errno = EINVAL; return -1; } @@ -807,9 +817,7 @@ or other application using the libvirt API.\n\ if (safewrite(fd, cmd, len) != len) return -1; - /* Omit the domain name if it contains a double hyphen - * because they aren't allowed in XML comments */ - if (!strstr(name, "--")) { + if (name) { if (safewrite(fd, " ", 1) != 1) return -1; @@ -837,7 +845,7 @@ virXMLRewriteFile(int fd, void *opaque) { struct virXMLRewriteFileData *data = opaque; - if (data->warnName && data->warnCommand) { + if (data->warnCommand) { if (virXMLEmitWarning(fd, data->warnName, data->warnCommand) < 0) return -1; } diff --git a/src/util/xml.h b/src/util/xml.h index a3750fa..c3b05df 100644 --- a/src/util/xml.h +++ b/src/util/xml.h @@ -61,6 +61,7 @@ xmlDocPtr virXMLParseHelper(int domcode, const char *url, xmlXPathContextPtr *pctxt); +const char *virXMLPickShellSafeComment(const char *str1, const char *str2); /** * virXMLParse: * @filename: file to parse, or NULL for string parsing -- 1.7.8.6

2 1

[libvirt] [PATCH] gitignore: ignore more files
by liguang 29 Oct '12

29 Oct '12

ignore *.patch, cscope.po.out, cscope.in.out Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 1cd2d45..d2d6657 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ *.pyc *.rej *.s +*.patch *~ .deps .gdb_history @@ -185,6 +186,8 @@ TAGS coverage cscope.files cscope.out +cscope.in.out +cscope.po.out results.log stamp-h stamp-h.in -- 1.7.1

3 2

[libvirt] How you can help with maintenance releases
by Cole Robinson 27 Oct '12

27 Oct '12

Hey all, As you're likely aware, I've been cutting maintenance releases of certain libvirt versions for the past six months: http://wiki.libvirt.org/page/Maintenance_Releases Since I'm not hugely involved with development these days, and things move pretty quick in libvirt land, I'd like to appeal to you fine gentleman for a bit of assistance here. None of this is mandatory, but hopefully it's low enough effort that I get a few bites :) Here's the gist: Next time you post a bug fix for an issue you can imagine someone actually hitting and filing a bug report about, consider doing one of the following: - Pushing the patch to the relevant maint branches - CCing me on the posting, with a note that this might be a maint candidate Of course, doing this for patches that someone else posts is completely fine with me too :) Take a look at the current branched versions and their original release dates: libvirt 0.9.6: Sep 22 2011 libvirt 0.9.11: Apr 3 2012 libvirt 0.10.2: September 24 2012 So if you find a bug in code that you know hasn't been touched for a year, it might be a candidate for all 3 branches! Jiri recently noticed this and cherry-picked a patch, (which was very much appreciated!): http://libvirt.org/git/?p=libvirt.git;a=commit;h=bebe5122b9af50f0b25f47f30e… http://libvirt.org/git/?p=libvirt.git;a=commit;h=d325704a3fdf947fa862bf62ec… http://libvirt.org/git/?p=libvirt.git;a=commit;h=77cecd2bc306416d985230bb29… As an example of how to push a patch to a maintenance branch, say you want to backport master commit ab12cd34: git checkout --track remotes/origin/v0.10.2-maint git checkout v0.10.2-maint git cherry-pick -x ab12cd34 git push v0.10.2-maint If the cherry-pick doesn't apply cleanly, feel free to just CC me and I'll straighten it out. That's it! Let me know if you have any questions. Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 0.10.2.1 maintenance release
by Cole Robinson 27 Oct '12

27 Oct '12

libvirt 0.10.2.1 maintenance release is now available. This is libvirt 0.10.2 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.10.2.1.tar.gz Changes in this version: * qemu: Fix domxml-to-native network model conversion * parallels: fix build for some older compilers * documentation: HTML tag fix * network: fix networkValidate check for default portgroup and vlan * esx: Update version checks for vSphere 5.1 * Fix detection of Xen sysctl version 9 * selinux: Don't fail RestoreAll if file doesn't have a default label * storage: don't shadow global 'wait' declaration * Remove a couple duplicates from AUTHORS.in (cherry picked from commit 2e99fa0385eea0084c520b4a3798a8663fb11b7a) * storage: Don't do wait loops from VolLookupByPath * storage: Add timeout for iscsi volume's stable path discovery * spec: Fix multilib issue with systemtap tapsets * docs: Fix installation of internals/*.html * virsh: Fix segfault of snapshot-list * docs: virsh: clarify behavior of send-key * daemon: Avoid 'Could not find keytab file' in syslog * network: don't allow multiple default portgroups * network: always create dnsmasq hosts and addnhosts files, even if empty * network: free/null newDef if network fails to start * Autogenerate AUTHORS * build: avoid infinite autogen loop * selinux: relabel tapfd in qemuPhysIfaceConnect * network: Set to NULL after virNetworkDefFree() * selinux: remove unused variables in socket labelling (cherry picked from commit d37a3a1d6c6508f235965185453602ba310cc66e) * selinux: fix wrong tapfd relablling * selinux: Use raw contexts 2 * selinux: add security selinux function to label tapfd * selinux: Use raw contexts * network: fix dnsmasq/radvd binding to IPv6 on recent kernels * qemu: Clear async job when p2p migration fails early * storage: lvm: lvcreate fails with allocation=0, don't do that * storage: lvm: Don't overwrite lvcreate errors * spec: Add runtime requirement for libssh2 * spec: Add support for libssh2 transport * conf: Fix crash with cleanup * Properly parse (unsigned) long long * Correct name of domain/pm/suspend-to-mem in docs (cherry picked from commit 0ec6aebb6461b3d6ef71322114cf160ae2d3de19) * storage: Report UUID/name consistently in driver errors * Change qemuSetSchedularParameters to use AFFECT_CURRENT * nodeinfo: Fully convert to new virReportError * Call curl_global_init from virInitialize to avoid thread-safety issues * fix kvm_pv_eoi with kvmclock * esx: Disable libcurl's use of signals to fix a segfault * S390: Buffer too small for large CPU numbers. * spec: prefer canonical name of util-linux * docs: fix links in migration.html TOC * Correct checking of virStrcpyStatic() return value * build: avoid -Wno-format on new-enough gcc * qemu: Use proper agent entering function when freezing filesystems * lxc: Correctly report active cgroups * build: fix bitmap conversion when !CPU_ALLOC * Add note about numeric domain names to manpage * build: default selinuxfs mount point to /sys/fs/selinux * ARMHF: implement /proc/cpuinfo parsing * python: return error if PyObject obj is NULL for unwrapper helper functions * Fix compilation of legacy xen driver with Xen 4.2 * Fix handling of itanium arch name in QEMU driver * Fix potential deadlock when agent is closed * Fix (rare) deadlock in QEMU monitor callbacks * Don't skip over socket label cleanup * Don't ignore return value of qemuProcessKill * Fix deadlock in handling EOF in LXC monitor * Support Xen sysctl version 9 in Xen 4.2 * build: avoid older gcc warning * parallels: don't give null pointers to virBitmapEqual * parallels: fix memory allocation * Don't use O_TRUNC when opening QEMU logfiles * Simplify some redundant locking while unref'ing objects * Remove pointless virLXCProcessMonitorDestroy method * Convert virLXCMonitor to use virObject * Move virProcess{Kill,Abort,TranslateStatus} into virprocess.{c,h} * Move virProcessKill into virprocess.{h,c} * Rename virCommandTranslateStatus to virProcessTranslateStatus * Rename virPid{Abort,Wait} to virProcess{Abort,Wait} * Rename virKillProcess to virProcessKill * Fix start of containers with custom root filesystem * Update how to compile with -Werror * build: fix detection of netcf linked with libnl1 * command: Change virCommandAddEnv so it replaces existing environment variables. (cherry picked from commit 2b32735af480055e27400068d27364d521071117) * command: Move environ-adding code to common function virCommandAddEnv. For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 0.9.11.7 maintenance release
by Cole Robinson 27 Oct '12

27 Oct '12

libvirt 0.9.11.7 maintenance release is now available. This is libvirt 0.9.11 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.11.7.tar.gz Changes in this version: * qemu: Fix domxml-to-native network model conversion * selinux: Don't fail RestoreAll if file doesn't have a default label * spec: Fix multilib issue with systemtap tapsets * docs: Fix installation of internals/*.html * docs: virsh: clarify behavior of send-key * daemon: Avoid 'Could not find keytab file' in syslog * storage: lvm: Don't overwrite lvcreate errors * qemu: Clear async job when p2p migration fails early * Revert "build: fix compilation without struct ifreq" For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH v2] qemu: Fix domxml-to-native network model conversion
by Cole Robinson 27 Oct '12

27 Oct '12

https://bugzilla.redhat.com/show_bug.cgi?id=636832 --- v2: Don't needlessly reallocate model src/qemu/qemu_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index feda4d9..7c462a2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5362,6 +5362,8 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, for (i = 0 ; i < def->nnets ; i++) { virDomainNetDefPtr net = def->nets[i]; int bootIndex = net->info.bootIndex; + char *model = net->model; + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { int actualType = virDomainNetGetActualType(net); const char *brname; @@ -5418,8 +5420,10 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, net->data.ethernet.dev = brname; net->data.ethernet.ipaddr = ipaddr; } + VIR_FREE(net->virtPortProfile); net->info.bootIndex = bootIndex; + net->model = model; } monitor_json = qemuCapsGet(caps, QEMU_CAPS_MONITOR_JSON); -- 1.7.11.7

2 3

[libvirt] [PATCH] build: typo fix for qemu cpu affinity
by Eric Blake 27 Oct '12

27 Oct '12

Introduced in commit 0039a32f. * src/qemu/qemu_process.c (qemuPrepareCpumap): s/covert/convert/ --- Pushing under the trivial rule. src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 318875d..3ac5282 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1926,7 +1926,7 @@ qemuPrepareCpumap(struct qemud_driver *driver, bool result; if (virBitmapGetBit(nodemask, i, &result) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to covert nodeset to cpuset")); + _("Failed to convert nodeset to cpuset")); virBitmapFree(cpumap); return NULL; } -- 1.7.11.7

2 1

[libvirt] [PATCHv9 0/9] blockjob: storage migration via block-copy
by Eric Blake 27 Oct '12

27 Oct '12

v8 was here: https://www.redhat.com/archives/libvir-list/2012-October/msg01105.html A couple of patches were applied independently. Also, this post clears up some bugs, such as improperly holding the driver lock or failing to clean up properly on error, as well as some improved commit messages. Eric Blake (9): blockjob: add qemu capabilities related to block jobs blockjob: react to active block copy blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: make drive-reopen safer blockjob: implement block copy for qemu blockjob: allow for existing files in block-copy blockjob: allow mirroring under SELinux and cgroup blockjob: relabel entire existing chain include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 12 ++ src/conf/domain_conf.h | 1 + src/libvirt.c | 7 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 423 ++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_migration.c | 5 + src/qemu/qemu_monitor.c | 56 +++++- src/qemu/qemu_monitor.h | 14 ++ src/qemu/qemu_monitor_json.c | 96 +++++++++- src/qemu/qemu_monitor_json.h | 21 ++- src/qemu/qemu_process.c | 3 + 15 files changed, 645 insertions(+), 12 deletions(-) -- 1.7.11.7

3 32

[libvirt] [PATCH] qemu: fix attach/detach of netdevs with matching mac addrs
by Laine Stump 26 Oct '12

26 Oct '12

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=862515 which describes inconsistencies in dealing with duplicate mac addresses on network devices in a domain. (at any rate, it resolves *almost* everything, and prints out an informative error message for the one problem that isn't solved, but has a workaround.) A synopsis of the problems: 1) you can't do a persistent attach-interface of a device with a mac address that matches an existing device. 2) you *can* do a live attach-interface of such a device. 3) you *can* directly edit a domain and put in two devices with matching mac addresses. 4) When running virsh detach-device (live or config), only MAC address is checked when matching the device to remove, so the first device with the desired mac address will be removed. This isn't always the one that's wanted. 5) when running virsh detach-interface (live or config), the only two items that can be specified to match against are mac address and model type (virtio, etc) - if multiple netdevs match both of those attributes, it again just finds the first one added and assumes that is the only match. Since it is completely valid to have multiple network devices with the same MAC address (although it can cause problems in many cases, there *are* valid use cases), what is needed is: 1) remove the restriction that prohibits doing a persistent add of a netdev with a duplicate mac address. 2) enhance the backend of virDomainDetachDeviceFlags to check for something that *is* guaranteed unique (but still work with just mac address, as long as it yields only a single results. This patch does three things: 1) removes the check for duplicate mac address during a persistent netdev attach. 2) unifies the searching for both live and config detach of netdevices in the subordinate functions of qemuDomainModifyDeviceFlags() to use the new function virDomainNetFindIdx (which matches mac address and PCI address if available, checking for duplicates if only mac address was specified). This function returns -2 if multiple matches are found, allowing the callers to print out an appropriate message. Steps 1 & 2 are enough to fully fix the problem when using virsh attach-device and detach-device (which require an XML description of the device rather than a bunch of commandline args) 3) modifies the virsh detach-interface command to check for multiple matches of mac address and show an error message suggesting use of the detach-device command in cases where there are multiple matching mac addresses. Later we should decide how we want to input a PCI address on the virsh commandline, and enhance detach-interface to take a --address option, eliminating the need to use detach-device * src/conf/domain_conf.c * src/conf/domain_conf.h * src/libvirt_private.syms * added new virDomainNetFindIdx function * removed now unused virDomainNetIndexByMac and virDomainNetRemoveByMac * src/qemu/qemu_driver.c * remove check for duplicate max from qemuDomainAttachDeviceConfig * use virDomainNetFindIdx/virDomainNetRemove instead of virDomainNetRemoveByMac in qemuDomainDetachDeviceConfig * use virDomainNetFindIdx instead of virDomainIndexByMac in qemuDomainUpdateDeviceConfig * src/qemu/qemu_hotplug.c * use virDomainNetFindIdx instead of a homespun loop in qemuDomainDetachNetDevice. * tools/virsh-domain.c: modified detach-interface command as described above --- src/conf/domain_conf.c | 58 ++++++++++++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 11 +++------ src/libvirt_private.syms | 3 +-- src/qemu/qemu_driver.c | 49 ++++++++++++++++++++++------------------ src/qemu/qemu_hotplug.c | 28 +++++++++++------------ tools/virsh-domain.c | 26 ++++++++++++++++------ 6 files changed, 104 insertions(+), 71 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0933c08..51a3b36 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7993,14 +7993,49 @@ int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net) return 0; } -int virDomainNetIndexByMac(virDomainDefPtr def, const virMacAddrPtr mac) +/* virDomainNetFindIdx: search according to mac address and guest side + * PCI address (if specified) + * + * Return: index of match if unique match found + * -1 if not found + * -2 if multiple matches + */ +int +virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) { - int i; + int ii, matchidx = -1; + bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI); - for (i = 0; i < def->nnets; i++) - if (!virMacAddrCmp(&def->nets[i]->mac, mac)) - return i; - return -1; + for (ii = 0 ; ii < def->nnets ; ii++) { + if (virMacAddrCmp(&def->nets[ii]->mac, &net->mac)) + continue; + + if ((matchidx >= 0) && !PCIAddrSpecified) { + /* there were multiple matches on mac address, and no + * qualifying guest-side PCI address was given, so we must + * fail (NB: a USB address isn't adequate, since it may + * specify only vendor and product ID, and there may be + * multiples of those. + */ + matchidx = -2; /* indicates "multiple matches" to caller */ + break; + } + if (PCIAddrSpecified) { + if (virDevicePCIAddressEqual(&def->nets[ii]->info.addr.pci, + &net->info.addr.pci)) { + /* exit early if the pci address was specified and + * it matches, as this guarantees no duplicates. + */ + matchidx = ii; + break; + } + } else { + /* no PCI address given, so there may be multiple matches */ + matchidx = ii; + } + } + return matchidx; } virDomainNetDefPtr @@ -8038,17 +8073,6 @@ virDomainNetRemove(virDomainDefPtr def, size_t i) return net; } -virDomainNetDefPtr -virDomainNetRemoveByMac(virDomainDefPtr def, const virMacAddrPtr mac) -{ - int i = virDomainNetIndexByMac(def, mac); - - if (i < 0) - return NULL; - return virDomainNetRemove(def, i); -} - - int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4151bc2..4c84cb5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2009,12 +2009,10 @@ virDomainDiskRemove(virDomainDefPtr def, size_t i); virDomainDiskDefPtr virDomainDiskRemoveByName(virDomainDefPtr def, const char *name); -int virDomainNetIndexByMac(virDomainDefPtr def, const virMacAddrPtr mac); +int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net); +virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, const char *device); int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net); -virDomainNetDefPtr -virDomainNetRemove(virDomainDefPtr def, size_t i); -virDomainNetDefPtr -virDomainNetRemoveByMac(virDomainDefPtr def, const virMacAddrPtr mac); +virDomainNetDefPtr virDomainNetRemove(virDomainDefPtr def, size_t i); int virDomainHostdevInsert(virDomainDefPtr def, virDomainHostdevDefPtr hostdev); virDomainHostdevDefPtr @@ -2274,9 +2272,6 @@ VIR_ENUM_DECL(virDomainCpuPlacementMode) VIR_ENUM_DECL(virDomainStartupPolicy) -virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, - const char *device); - # define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \ (VIR_CONNECT_LIST_DOMAINS_ACTIVE | \ VIR_CONNECT_LIST_DOMAINS_INACTIVE) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 699c9a3..ce6b9d1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -433,6 +433,7 @@ virDomainMemDumpTypeFromString; virDomainMemDumpTypeToString; virDomainNetDefFree; virDomainNetFind; +virDomainNetFindIdx; virDomainNetGetActualBandwidth; virDomainNetGetActualBridgeName; virDomainNetGetActualDirectDev; @@ -441,10 +442,8 @@ virDomainNetGetActualHostdev; virDomainNetGetActualType; virDomainNetGetActualVirtPortProfile; virDomainNetGetActualVlan; -virDomainNetIndexByMac; virDomainNetInsert; virDomainNetRemove; -virDomainNetRemoveByMac; virDomainNetTypeToString; virDomainNostateReasonTypeFromString; virDomainNostateReasonTypeToString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 254f191..3838c36 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6158,14 +6158,6 @@ qemuDomainAttachDeviceConfig(qemuCapsPtr caps, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if (virDomainNetIndexByMac(vmdef, &net->mac) >= 0) { - char macbuf[VIR_MAC_STRING_BUFLEN]; - - virMacAddrFormat(&net->mac, macbuf); - virReportError(VIR_ERR_INVALID_ARG, - _("mac %s already exists"), macbuf); - return -1; - } if (virDomainNetInsert(vmdef, net)) { virReportOOMError(); return -1; @@ -6237,11 +6229,12 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) { virDomainDiskDefPtr disk, det_disk; - virDomainNetDefPtr net, det_net; + virDomainNetDefPtr net; virDomainHostdevDefPtr hostdev, det_hostdev; virDomainLeaseDefPtr lease, det_lease; virDomainControllerDefPtr cont, det_cont; int idx; + char mac[VIR_MAC_STRING_BUFLEN]; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -6256,15 +6249,19 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if (!(det_net = virDomainNetRemoveByMac(vmdef, &net->mac))) { - char macbuf[VIR_MAC_STRING_BUFLEN]; - - virMacAddrFormat(&net->mac, macbuf); - virReportError(VIR_ERR_INVALID_ARG, - _("no nic of mac %s"), macbuf); + idx = virDomainNetFindIdx(vmdef, net); + if (idx == -2) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("multiple devices matching mac address %s found"), + virMacAddrFormat(&net->mac, mac)); + return -1; + } else if (idx < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("no matching network device was found")); return -1; } - virDomainNetDefFree(det_net); + /* this is guaranteed to succeed */ + virDomainNetDefFree(virDomainNetRemove(vmdef, idx)); break; case VIR_DOMAIN_DEVICE_HOSTDEV: { @@ -6319,6 +6316,8 @@ qemuDomainUpdateDeviceConfig(qemuCapsPtr caps, virDomainDiskDefPtr orig, disk; virDomainNetDefPtr net; int pos; + char mac[VIR_MAC_STRING_BUFLEN]; + switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -6356,12 +6355,18 @@ qemuDomainUpdateDeviceConfig(qemuCapsPtr caps, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((pos = virDomainNetIndexByMac(vmdef, &net->mac)) < 0) { - char macbuf[VIR_MAC_STRING_BUFLEN]; - - virMacAddrFormat(&net->mac, macbuf); - virReportError(VIR_ERR_INVALID_ARG, - _("mac %s doesn't exist"), macbuf); + pos = virDomainNetFindIdx(vmdef, net); + if (pos == -2) { + virMacAddrFormat(&net->mac, mac); + virReportError(VIR_ERR_OPERATION_FAILED, + _("couldn't find matching device " + "with mac address %s"), mac); + return -1; + } else if (pos < 0) { + virMacAddrFormat(&net->mac, mac); + virReportError(VIR_ERR_OPERATION_FAILED, + _("couldn't find matching device " + "with mac address %s"), mac); return -1; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7381921..0225654 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2448,30 +2448,28 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev) { - int i, ret = -1; + int detachidx, ret = -1; virDomainNetDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; int vlan; char *hostnet_name = NULL; + char mac[VIR_MAC_STRING_BUFLEN]; virNetDevVPortProfilePtr vport = NULL; - for (i = 0 ; i < vm->def->nnets ; i++) { - virDomainNetDefPtr net = vm->def->nets[i]; - - if (!virMacAddrCmp(&net->mac, &dev->data.net->mac)) { - detach = net; - break; + detachidx = virDomainNetFindIdx(vm->def, dev->data.net) + if (detachidx == -2) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("multiple devices matching mac address %s found"), + virMacAddrFormat(&dev->data.net->mac, mac)); + goto cleanup; } - } - - if (!detach) { + else if (detachidx < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("network device %02x:%02x:%02x:%02x:%02x:%02x not found"), - dev->data.net->mac.addr[0], dev->data.net->mac.addr[1], - dev->data.net->mac.addr[2], dev->data.net->mac.addr[3], - dev->data.net->mac.addr[4], dev->data.net->mac.addr[5]); + _("network device %s not found"), + virMacAddrFormat(&dev->data.net->mac, mac)); goto cleanup; } + detach = vm->def->nets[detachidx]; if (virDomainNetGetActualType(detach) == VIR_DOMAIN_NET_TYPE_HOSTDEV) { ret = qemuDomainDetachThisHostDevice(driver, vm, @@ -2575,7 +2573,7 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver, cleanup: if (!ret) { networkReleaseActualDevice(detach); - virDomainNetRemove(vm->def, i); + virDomainNetRemove(vm->def, detachidx); virDomainNetDefFree(detach); } VIR_FREE(hostnet_name); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0906267..0daaeb4 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7692,7 +7692,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) xmlDocPtr xml = NULL; xmlXPathObjectPtr obj=NULL; xmlXPathContextPtr ctxt = NULL; - xmlNodePtr cur = NULL; + xmlNodePtr cur = NULL, matchNode = NULL; xmlBufferPtr xml_buf = NULL; const char *mac =NULL, *type = NULL; char *doc; @@ -7738,10 +7738,12 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (!mac) + if (!mac) { + matchNode = obj->nodesetval->nodeTab[0]; goto hit; + } - /* search mac */ + /* multiple possibilities, so search for matching mac */ for (; i < obj->nodesetval->nodeNr; i++) { cur = obj->nodesetval->nodeTab[i]->children; while (cur != NULL) { @@ -7751,14 +7753,24 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) diff_mac = virMacAddrCompare(tmp_mac, mac); VIR_FREE(tmp_mac); if (!diff_mac) { - goto hit; + if (matchNode) { + /* this is the 2nd match, so it's ambiguous */ + vshError(ctl, _("Domain has multiple interfaces matching " + "mac address %s. You must use detach-device and " + "specify the device pci address to remove it."), + mac); + goto cleanup; + } + matchNode = obj->nodesetval->nodeTab[i]; } } cur = cur->next; } } - vshError(ctl, _("No found interface whose MAC address is %s"), mac); - goto cleanup; + if (!matchNode) { + vshError(ctl, _("No found interface whose MAC address is %s"), mac); + goto cleanup; + } hit: xml_buf = xmlBufferCreate(); @@ -7767,7 +7779,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0) { + if (xmlNodeDump(xml_buf, xml, matchNode, 0, 0) < 0) { vshError(ctl, "%s", _("Failed to create XML")); goto cleanup; } -- 1.7.11.7

2 2