- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Advertise <qcow2discard/> in capabilities if discard works for qcow2 backing files.
by Richard W.M. Jones 10 Mar '14

10 Mar '14

Qemu since 1.5 supports discard. However until qemu 1.6 it didn't work for qcow2 files. Ref: http://wiki.qemu.org/ChangeLog/1.5 http://wiki.qemu.org/ChangeLog/1.6 If qemu >= 1.6, add this to guest capabilities: <features> <drivediscard/> <qcow2discard/> <--- </features> --- src/conf/capabilities.c | 3 ++- src/qemu/qemu_capabilities.c | 13 +++++++++++++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index ff5912a..08c9b73 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -948,7 +948,8 @@ virCapabilitiesFormatXML(virCapsPtr caps) STREQ(caps->guests[i]->features[j]->name, "ia64_be") || STREQ(caps->guests[i]->features[j]->name, "cpuselection") || STREQ(caps->guests[i]->features[j]->name, "deviceboot") || - STREQ(caps->guests[i]->features[j]->name, "drivediscard")) { + STREQ(caps->guests[i]->features[j]->name, "drivediscard") || + STREQ(caps->guests[i]->features[j]->name, "qcow2discard")) { virBufferAsprintf(&xml, " <%s/>\n", caps->guests[i]->features[j]->name); } else { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b755fb2..b527690 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -251,6 +251,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "spiceport", "usb-kbd", /* 165 */ + "qcow2-discard", ); struct _virQEMUCaps { @@ -782,6 +783,10 @@ virQEMUCapsInitGuest(virCapsPtr caps, !virCapabilitiesAddGuestFeature(guest, "drivediscard", 0, 0)) goto error; + if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_QCOW2_DISCARD) && + !virCapabilitiesAddGuestFeature(guest, "qcow2discard", 0, 0)) + goto error; + if (virCapabilitiesAddGuestDomain(guest, "qemu", NULL, @@ -1113,6 +1118,10 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-machine")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); + /* discard option works for qcow2 backing files since 1.6 */ + if (qemuCaps->version >= 1006000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_QCOW2_DISCARD); + /* USB option is supported v1.3.0 onwards */ if (qemuCaps->version >= 1003000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); @@ -2569,6 +2578,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, if (virQEMUCapsInitArchQMPBasic(qemuCaps, mon) < 0) goto cleanup; + /* discard option works for qcow2 backing files since 1.6 */ + if (qemuCaps->version >= 1006000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_QCOW2_DISCARD); + /* USB option is supported v1.3.0 onwards */ if (qemuCaps->version >= 1003000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b5445e7..a0ce506 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -204,6 +204,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */ QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ + QEMU_CAPS_QCOW2_DISCARD = 166, /* discard works for qcow2 backing files */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 597f873..0ab5e22 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -142,4 +142,5 @@ <flag name='spice-file-xfer-disable'/> <flag name='spiceport'/> <flag name='usb-kbd'/> + <flag name='qcow2-discard'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 0c1dd87..d5cca41 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -140,4 +140,5 @@ <flag name='spice-file-xfer-disable'/> <flag name='spiceport'/> <flag name='usb-kbd'/> + <flag name='qcow2-discard'/> </qemuCaps> -- 1.8.5.3

1 1

[libvirt] [PATCH] Change file names in comments to match the files they are in
by Ján Tomko 10 Mar '14

10 Mar '14

Some of these are leftovers from renaming the files, others are just typos. Also introduce an ugly awk script to enforce this. --- cfg.mk | 25 +++++++++++++++++++++++++ daemon/libvirtd-config.c | 2 +- daemon/libvirtd-config.h | 2 +- src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_command.h | 2 +- src/conf/domain_audit.h | 2 +- src/datatypes.c | 2 +- src/hyperv/hyperv_wmi.c | 2 +- src/interface/interface_backend_netcf.c | 4 ++-- src/locking/domain_lock.h | 2 +- src/locking/lock_daemon_config.c | 2 +- src/lxc/lxc_hostdev.c | 2 +- src/lxc/lxc_hostdev.h | 2 +- src/network/bridge_driver.h | 2 +- src/network/bridge_driver_platform.h | 2 +- src/node_device/node_device_driver.c | 2 +- src/node_device/node_device_driver.h | 2 +- src/nodeinfo.h | 2 +- src/openvz/openvz_conf.h | 2 +- src/openvz/openvz_util.c | 2 +- src/openvz/openvz_util.h | 2 +- src/parallels/parallels_driver.h | 2 +- src/parallels/parallels_network.c | 2 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.h | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/remote/remote_driver.h | 2 +- src/rpc/virnetservermdns.h | 2 +- src/storage/storage_backend_mpath.h | 2 +- src/storage/storage_backend_sheepdog.h | 2 +- src/test/test_driver.c | 2 +- src/test/test_driver.h | 2 +- src/uml/uml_conf.h | 2 +- src/util/viratomic.c | 2 +- src/util/virbitmap.c | 2 +- src/util/virebtables.h | 2 +- src/util/virerror.h | 2 +- src/util/vireventpoll.h | 2 +- src/util/viruuid.c | 2 +- src/util/virxml.h | 2 +- src/xen/xen_driver.h | 2 +- src/xen/xen_hypervisor.c | 2 +- src/xen/xen_hypervisor.h | 2 +- src/xen/xen_inotify.c | 2 +- src/xen/xen_inotify.h | 2 +- src/xen/xm_internal.c | 2 +- src/xenapi/xenapi_driver.h | 2 +- tests/testutils.h | 2 +- tools/virsh-interface.h | 2 +- tools/virsh-network.h | 2 +- tools/virt-host-validate.c | 2 +- 52 files changed, 77 insertions(+), 52 deletions(-) diff --git a/cfg.mk b/cfg.mk index 2a8957a..c5f99aa 100644 --- a/cfg.mk +++ b/cfg.mk @@ -863,6 +863,31 @@ sc_prohibit_atoi: halt='Use virStrToLong* instead of atoi, atol, atof, atoq, atoll' \ $(_sc_search_regexp) +# Don't +sc_prohibit_wrong_filename_in_comment: + @fail=0; \ + awk 'BEGIN { \ + fail=0; \ + } FNR < 3 { \ + n=match($$0, /[[:space:]][^[:space:]]*[.][ch][[:space:]:]/); \ + if (n > 0) { \ + A=substr($$0, RSTART+1, RLENGTH-2); \ + n=split(FILENAME, arr, "/"); \ + if (A != arr[n]) { \ + print "in " FILENAME ": " A " mentioned in comments "; \ + fail=1; \ + } \ + } \ + } END { \ + if (fail == 1) { \ + exit 1; \ + } \ + }' $$($(VC_LIST_EXCEPT) | grep '\.[ch]$$') || fail=1; \ + if test $$fail -eq 1; then \ + { echo '$(ME): The file name in comments must match the actual ' \ + 'file name' 1>&2; exit 1; } \ + fi; + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index c816fda..856a038 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -1,5 +1,5 @@ /* - * libvirtd.c: daemon start of day, guest process & i/o management + * libvirtd-config.c: daemon start of day, guest process & i/o management * * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h index a24d5d2..0829273 100644 --- a/daemon/libvirtd-config.h +++ b/daemon/libvirtd-config.h @@ -1,5 +1,5 @@ /* - * libvirtd.c: daemon start of day, guest process & i/o management + * libvirtd-config.h: daemon start of day, guest process & i/o management * * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 1fcc0f2..a19daac 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -1,5 +1,5 @@ /* - * bhyve_process.c: bhyve command generation + * bhyve_command.c: bhyve command generation * * Copyright (C) 2014 Roman Bogorodskiy * diff --git a/src/bhyve/bhyve_command.h b/src/bhyve/bhyve_command.h index 8326971..66d934d 100644 --- a/src/bhyve/bhyve_command.h +++ b/src/bhyve/bhyve_command.h @@ -1,5 +1,5 @@ /* - * bhyve_process.c: bhyve command generation + * bhyve_command.h: bhyve command generation * * Copyright (C) 2014 Roman Bogorodskiy * diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h index 9486216..70b09e5 100644 --- a/src/conf/domain_audit.h +++ b/src/conf/domain_audit.h @@ -1,5 +1,5 @@ /* - * domain_audit.c: Domain audit management + * domain_audit.h: Domain audit management * * Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/datatypes.c b/src/datatypes.c index 33d941d..20752cd 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -1,5 +1,5 @@ /* - * datatypes.h: management of structs for public data types + * datatypes.c: management of structs for public data types * * Copyright (C) 2006-2014 Red Hat, Inc. * diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 39eed0c..a603bad 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -1,6 +1,6 @@ /* - * hyperv_wmi.h: general WMI over WSMAN related functions and structures for + * hyperv_wmi.c: general WMI over WSMAN related functions and structures for * managing Microsoft Hyper-V hosts * * Copyright (C) 2011 Matthias Bolte <matthias.bolte(a)googlemail.com> diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index c525ca9..b4c1fe9 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -1,6 +1,6 @@ /* - * interface_driver.c: backend driver methods to handle physical - * interface configuration using the netcf library. + * interface_backend_netcf.c: backend driver methods to handle physical + * interface configuration using the netcf library. * * Copyright (C) 2006-2013 Red Hat, Inc. * diff --git a/src/locking/domain_lock.h b/src/locking/domain_lock.h index eefe6cd..a9b19c8 100644 --- a/src/locking/domain_lock.h +++ b/src/locking/domain_lock.h @@ -1,5 +1,5 @@ /* - * domain_lock.c: Locking for domain lifecycle operations + * domain_lock.h: Locking for domain lifecycle operations * * Copyright (C) 2010-2011 Red Hat, Inc. * diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c index 8e632f5..68cd9e9 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -1,5 +1,5 @@ /* - * lock_daemon_config.h: virtlockd config file handling + * lock_daemon_config.c: virtlockd config file handling * * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c index b7248df..c3ecc48 100644 --- a/src/lxc/lxc_hostdev.c +++ b/src/lxc/lxc_hostdev.c @@ -1,5 +1,5 @@ /* - * virLXC_hostdev.c: VIRLXC hostdev management + * lxc_hostdev.c: VIRLXC hostdev management * * Copyright (C) 2006-2007, 2009-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/lxc/lxc_hostdev.h b/src/lxc/lxc_hostdev.h index 41bb178..cf89a99 100644 --- a/src/lxc/lxc_hostdev.h +++ b/src/lxc/lxc_hostdev.h @@ -1,5 +1,5 @@ /* - * virLXC_hostdev.h: VIRLXC hostdev management + * lxc_hostdev.h: VIRLXC hostdev management * * Copyright (C) 2006-2007, 2009-2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 1c2a4a7..decc08f 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -1,5 +1,5 @@ /* - * network_driver.h: core driver methods for managing networks + * bridge_driver.h: core driver methods for managing networks * * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driver_platform.h index 82d96f6..22f3aae 100644 --- a/src/network/bridge_driver_platform.h +++ b/src/network/bridge_driver_platform.h @@ -1,5 +1,5 @@ /* - * bridge_driver.h: platform specific routines for bridge driver + * bridge_driver_platform.h: platform specific routines for bridge driver * * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index d5a92cd..55b3eb3 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1,5 +1,5 @@ /* - * node_device.c: node device enumeration + * node_device_driver.c: node device enumeration * * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2008 Virtual Iron Software, Inc. diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 0f62c83..e238ff8 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -1,5 +1,5 @@ /* - * node_device.h: node device enumeration + * node_device_driver.h: node device enumeration * * Copyright (C) 2008 Virtual Iron Software, Inc. * Copyright (C) 2008 David F. Lively diff --git a/src/nodeinfo.h b/src/nodeinfo.h index 413fddd..c81fcbb 100644 --- a/src/nodeinfo.h +++ b/src/nodeinfo.h @@ -1,5 +1,5 @@ /* - * nodeinfo.c: Helper routines for OS specific node information + * nodeinfo.h: Helper routines for OS specific node information * * Copyright (C) 2006-2008, 2011-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index 47b5123..a7de7d2 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -1,5 +1,5 @@ /* - * openvz_config.h: config information for OpenVZ VPSs + * openvz_conf.h: config information for OpenVZ VPSs * * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2006, 2007 Binary Karma. diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index 8920d14..3113751 100644 --- a/src/openvz/openvz_util.c +++ b/src/openvz/openvz_util.c @@ -1,5 +1,5 @@ /* - * openvz_driver.c: core driver methods for managing OpenVZ VEs + * openvz_util.c: core driver methods for managing OpenVZ VEs * * Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2012 Guido Günther diff --git a/src/openvz/openvz_util.h b/src/openvz/openvz_util.h index 680e507..0c8d55a 100644 --- a/src/openvz/openvz_util.h +++ b/src/openvz/openvz_util.h @@ -1,5 +1,5 @@ /* - * openvz_driver.h: common util functions for managing openvz VPEs + * openvz_util.h: common util functions for managing openvz VPEs * * Copyright (C) 2012 Guido Günther * diff --git a/src/parallels/parallels_driver.h b/src/parallels/parallels_driver.h index a503abe..babe5c0 100644 --- a/src/parallels/parallels_driver.h +++ b/src/parallels/parallels_driver.h @@ -1,5 +1,5 @@ /* - * parallels_driver.c: core driver functions for managing + * parallels_driver.h: core driver functions for managing * Parallels Cloud Server hosts * * Copyright (C) 2012 Parallels, Inc. diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 63daf53..432f0cc 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -1,5 +1,5 @@ /* - * parallels_storage.c: core privconn functions for managing + * parallels_network.c: core privconn functions for managing * Parallels Cloud Server hosts * * Copyright (C) 2013 Red Hat, Inc. diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4a3820c..553bff9 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1,5 +1,5 @@ /* - * qemu_agent.h: interaction with QEMU guest agent + * qemu_agent.c: interaction with QEMU guest agent * * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bad63c5..c321eda 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1,5 +1,5 @@ /* - * qemu_domain.h: QEMU domain private state + * qemu_domain.c: QEMU domain private state * * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/qemu/qemu_driver.h b/src/qemu/qemu_driver.h index 84f74c4..df7533a 100644 --- a/src/qemu/qemu_driver.h +++ b/src/qemu/qemu_driver.h @@ -1,5 +1,5 @@ /* - * driver.h: core driver methods for managing qemu guests + * qemu_driver.h: core driver methods for managing qemu guests * * Copyright (C) 2006, 2007 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6703c92..dd72a79 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1,5 +1,5 @@ /* - * qemu_hotplug.h: QEMU device hotplug management + * qemu_hotplug.c: QEMU device hotplug management * * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index 912f0f8..4033a3c 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -1,5 +1,5 @@ /* - * remote_internal.h: driver to provide access to libvirtd running + * remote_driver.h: driver to provide access to libvirtd running * on a remote machine * * Copyright (C) 2006-2007, 2010 Red Hat, Inc. diff --git a/src/rpc/virnetservermdns.h b/src/rpc/virnetservermdns.h index a1c19c1..e91b264 100644 --- a/src/rpc/virnetservermdns.h +++ b/src/rpc/virnetservermdns.h @@ -1,5 +1,5 @@ /* - * virnetservermdns.c: advertise server sockets + * virnetservermdns.h: advertise server sockets * * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2007 Daniel P. Berrange diff --git a/src/storage/storage_backend_mpath.h b/src/storage/storage_backend_mpath.h index d7f20f3..b666645 100644 --- a/src/storage/storage_backend_mpath.h +++ b/src/storage/storage_backend_mpath.h @@ -1,5 +1,5 @@ /* - * storage_backend_scsi.h: storage backend for SCSI handling + * storage_backend_mpath.h: storage backend for multipath handling * * Copyright (C) 2009-2009 Red Hat, Inc. * Copyright (C) 2009-2008 Dave Allan diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h index bc114ff..b0d8440 100644 --- a/src/storage/storage_backend_sheepdog.h +++ b/src/storage/storage_backend_sheepdog.h @@ -1,5 +1,5 @@ /* - * storage_backend_sheepog.h: storage backend for Sheepdog handling + * storage_backend_sheepdog.h: storage backend for Sheepdog handling * * Copyright (C) 2012 Wido den Hollander * Copyright (C) 2012 Frank Spijkerman diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6806ffd..27295db 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1,5 +1,5 @@ /* - * test.c: A "mock" hypervisor for use by application unit tests + * test_driver.c: A "mock" hypervisor for use by application unit tests * * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/test/test_driver.h b/src/test/test_driver.h index b9bf566..df74433 100644 --- a/src/test/test_driver.h +++ b/src/test/test_driver.h @@ -1,5 +1,5 @@ /* - * test.h: A "mock" hypervisor for use by application unit tests + * test_driver.h: A "mock" hypervisor for use by application unit tests * * Copyright (C) 2006-2006 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index a914be0..05e19ff 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -1,5 +1,5 @@ /* - * config.h: VM configuration management + * uml_conf.h: VM configuration management * * Copyright (C) 2006, 2007, 2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/util/viratomic.c b/src/util/viratomic.c index 160a20b..278a749 100644 --- a/src/util/viratomic.c +++ b/src/util/viratomic.c @@ -1,5 +1,5 @@ /* - * viratomic.h: atomic integer operations + * viratomic.c: atomic integer operations * * Copyright (C) 2012 Red Hat, Inc. * diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 870c8fe..775262d 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -1,5 +1,5 @@ /* - * virbitmap.h: Simple bitmap operations + * virbitmap.c: Simple bitmap operations * * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2010 Novell, Inc. diff --git a/src/util/virebtables.h b/src/util/virebtables.h index c0d443d..2b6f1dd 100644 --- a/src/util/virebtables.h +++ b/src/util/virebtables.h @@ -1,5 +1,5 @@ /* - * virebtables.c: Helper APIs for managing ebtables + * virebtables.h: Helper APIs for managing ebtables * * Copyright (C) 2007-2008, 2013 Red Hat, Inc. * Copyright (C) 2009 IBM Corp. diff --git a/src/util/virerror.h b/src/util/virerror.h index 5ae4eb5..2de04f4 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -1,5 +1,5 @@ /* - * virerror.c: error handling and reporting code for libvirt + * virerror.h: error handling and reporting code for libvirt * * Copyright (C) 2006-2014 Red Hat, Inc. * diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h index c46ab80..8844c9c 100644 --- a/src/util/vireventpoll.h +++ b/src/util/vireventpoll.h @@ -1,5 +1,5 @@ /* - * vireventpool.h: Poll based event loop for monitoring file handles + * vireventpoll.h: Poll based event loop for monitoring file handles * * Copyright (C) 2007 Daniel P. Berrange * Copyright (C) 2007 Red Hat, Inc. diff --git a/src/util/viruuid.c b/src/util/viruuid.c index c5fa9a8..48f5e2e 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -1,5 +1,5 @@ /* - * viruuid.h: helper APIs for dealing with UUIDs + * viruuid.c: helper APIs for dealing with UUIDs * * Copyright (C) 2007-2013 Red Hat, Inc. * diff --git a/src/util/virxml.h b/src/util/virxml.h index d967a2e..781b3bf 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -1,5 +1,5 @@ /* - * virxml.c: helper APIs for dealing with XML documents + * virxml.h: helper APIs for dealing with XML documents * * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h index b8c1c27..1ed870d 100644 --- a/src/xen/xen_driver.h +++ b/src/xen/xen_driver.h @@ -1,5 +1,5 @@ /* - * xen_unified.c: Unified Xen driver. + * xen_driver.h: Unified Xen driver. * * Copyright (C) 2007, 2010-2011 Red Hat, Inc. * diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index f9c7b40..d24db06 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1,5 +1,5 @@ /* - * xen_internal.c: direct access to Xen hypervisor level + * xen_hypervisor.c: direct access to Xen hypervisor level * * Copyright (C) 2005-2013 Red Hat, Inc. * diff --git a/src/xen/xen_hypervisor.h b/src/xen/xen_hypervisor.h index 6aeab79..2990e51 100644 --- a/src/xen/xen_hypervisor.h +++ b/src/xen/xen_hypervisor.h @@ -1,5 +1,5 @@ /* - * xen_internal.h: internal API for direct access to Xen hypervisor level + * xen_hypervisor.h: internal API for direct access to Xen hypervisor level * * Copyright (C) 2005, 2010-2011 Red Hat, Inc. * diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index 2e9787f..c9718bd 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -1,5 +1,5 @@ /* - * xen_inofify.c: Xen notification of xml file activity in the + * xen_inotify.c: Xen notification of xml file activity in the * following dirs: * /etc/xen * /var/lib/xend/domains diff --git a/src/xen/xen_inotify.h b/src/xen/xen_inotify.h index 6055c88..8a9370d 100644 --- a/src/xen/xen_inotify.h +++ b/src/xen/xen_inotify.h @@ -1,5 +1,5 @@ /* - * xen_inofify.h: Xen notification of xml files + * xen_inotify.h: Xen notification of xml files * * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2008 VirtualIron diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index d9a3502..5d078e7 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1,5 +1,5 @@ /* - * xm_internal.h: helper routines for dealing with inactive domains + * xm_internal.c: helper routines for dealing with inactive domains * * Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h index 30a8f1e..0925731 100644 --- a/src/xenapi/xenapi_driver.h +++ b/src/xenapi/xenapi_driver.h @@ -1,5 +1,5 @@ /* - * xenapi_driver.h.c: Xen API driver header file to be included in libvirt.c. + * xenapi_driver.h: Xen API driver header file to be included in libvirt.c. * Copyright (C) 2009, 2010 Citrix Ltd. * * This library is free software; you can redistribute it and/or diff --git a/tests/testutils.h b/tests/testutils.h index fa37246..e89492b 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -1,5 +1,5 @@ /* - * utils.c: test utils + * testutils.h: test utils * * Copyright (C) 2005, 2008-2013 Red Hat, Inc. * diff --git a/tools/virsh-interface.h b/tools/virsh-interface.h index 2544f7e..6272aab 100644 --- a/tools/virsh-interface.h +++ b/tools/virsh-interface.h @@ -1,5 +1,5 @@ /* - * virsh-interface.c: Commands to manage host interface + * virsh-interface.h: Commands to manage host interface * * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * diff --git a/tools/virsh-network.h b/tools/virsh-network.h index 7178fde..3beeeb9 100644 --- a/tools/virsh-network.h +++ b/tools/virsh-network.h @@ -1,5 +1,5 @@ /* - * virsh-network.c: Commands to manage network + * virsh-network.h: Commands to manage network * * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c index d3cf19c..a8c2075 100644 --- a/tools/virt-host-validate.c +++ b/tools/virt-host-validate.c @@ -1,5 +1,5 @@ /* - * virt-host-check.c: Sanity check a hypervisor host + * virt-host-validate.c: Sanity check a hypervisor host * * Copyright (C) 2012 Red Hat, Inc. * -- 1.8.3.2

3 3

[libvirt] Seeking for advice on 'virsh console' problems debugging
by Roman Bogorodskiy 10 Mar '14

10 Mar '14

Hi, I've been trying to understand why 'virsh console' doesn't work on FreeBSD for some time and now I feel like I got stuck. Background of the problem. Some time ago I started implementing console support for the bhyve driver. I initially implemented it using nmdm(4) device: http://www.freebsd.org/cgi/man.cgi?query=nmdm&sektion=4&manpath=FreeBSD+10.… But 'virsh console' didn't work on it and exited immediately. I though that it could be nmdm compatibility issue and decided to go with the plan /dev/pts devices. But I got the same problem with it. So I decided to try use console with qemu driver. And... I got the same problem. After some investigation, I spotted this block in tools/virsh-console.c:376 while (!con->quit) { if (virCondWait(&con->cond, &con->lock) < 0) { VIR_ERROR(_("unable to wait on console condition")); goto cleanup; } } The strange thing is that it doesn't look con->lock mutex before waiting. FreeBSD man page for pthread_cond_wait() says that it errors in that situation: [EPERM] The specified mutex was not locked by the calling thread. I replaced VIR_ERROR with virReportSystemError and it returns EPERM indeed. So I've added virMutexLock() before calling virCondWait() and it partially solved the problem for me -- 'virsh console' stopped exiting immediately. Actually, it started output for guest, but it's badly formatted: it includes lots and lots of whitespaces. Input doesn't work properly (cannot type in sensible stuff). Here's a sample output, even libvirt messages are badly formatted (I added some debug prints along the way). http://people.freebsd.org/~novel/misc/ttyweirdness.png So, e.g. dmesg output for the guest looks almost the same. Looks like there's something wrong with the terminal settings, but how could that be debugged? PS Worth to mention that 'cu' worked all the time for me on these devices (both created by bhyve and qemu). Roman Bogorodskiy

2 8

[libvirt] [PATCH] Wildcard ignore tests/*test instead of listing every one
by Daniel P. Berrange 10 Mar '14

10 Mar '14

There is a forever growing list of test cases. It is just not worth listing each one individually when a wildcard can do the job. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 73 +------------------------------------------------------------- 1 file changed, 1 insertion(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index cb60734..efbce50 100644 --- a/.gitignore +++ b/.gitignore @@ -145,85 +145,14 @@ /tests/*.log /tests/*.pid /tests/*.trs -/tests/*xml2*test /tests/commandhelper -/tests/commandtest -/tests/conftest -/tests/cputest -/tests/domainconftest -/tests/domainsnapshotxml2xmltest -/tests/esxutilstest -/tests/eventtest -/tests/fchosttest -/tests/fdstreamtest -/tests/hashtest -/tests/jsontest -/tests/libvirtdconftest -/tests/lxcconf2xmltest -/tests/metadatatest -/tests/networkxml2argvtest -/tests/nodeinfotest -/tests/nwfilterxml2xmltest -/tests/objecteventtest +/tests/*test /tests/object-locking /tests/object-locking-files.txt /tests/object-locking.cm[ix] -/tests/openvzutilstest -/tests/qemuagenttest -/tests/qemuargv2xmltest -/tests/qemucapabilitiestest -/tests/qemuhelptest -/tests/qemuhotplugtest -/tests/qemumonitorjsontest -/tests/qemumonitortest -/tests/qemuxmlnstest -/tests/qparamtest /tests/reconnect -/tests/secaatest -/tests/seclabeltest -/tests/securityselinuxlabeltest -/tests/securityselinuxtest -/tests/sexpr2xmltest -/tests/shunloadtest -/tests/sockettest /tests/ssh -/tests/statstest -/tests/storagebackendsheepdogtest -/tests/sysinfotest /tests/test_conf -/tests/utiltest -/tests/viratomictest -/tests/virauthconfigtest -/tests/virbitmaptest -/tests/virbuftest -/tests/vircapstest -/tests/vircgrouptest -/tests/virdbustest -/tests/virdrivermoduletest -/tests/virendiantest -/tests/virfiletest -/tests/virhashtest -/tests/viridentitytest -/tests/virkeycodetest -/tests/virkeyfiletest -/tests/virkmodtest -/tests/virlockspacetest -/tests/virlogtest -/tests/virnet*test -/tests/virpcitest -/tests/virportallocatortest -/tests/virscsitest -/tests/virshtest -/tests/virstoragetest -/tests/virstringtest -/tests/virsystemdtest -/tests/virtimetest -/tests/viruritest -/tests/virusbtest -/tests/vmwarevertest -/tests/vmx2xmltest -/tests/xencapstest -/tests/xmconfigtest /tools/*.[18] /tools/libvirt-guests.init /tools/libvirt-guests.service -- 1.8.5.3

4 4

[libvirt] [PATCH] Add a mutex to serialize updates to firewall
by Daniel P. Berrange 10 Mar '14

10 Mar '14

For https://bugzilla.redhat.com/show_bug.cgi?id=1066801 The nwfilter conf update mutex previously serialized updates to the internal data structures for firewall rules, and updates to the firewall itself. The latter was recently turned into a read/write lock, and filter instantiation allowed to proceed in parallel. It was believed that this was ok, since each filter is created on a seperate iptables/ebtables chain. It turns out that there is a sutle lock ordering problem on virNWFilterObjPtr instances. __virNWFilterInstantiateFilter will hold a lock on the virNWFilterObjPtr it is instantiating. This in turn invokes virNWFilterInstantiate which then invokes virNWFilterDetermineMissingVarsRec which then invokes virNWFilterObjFindByName. This iterates over every single virNWFilterObjPtr in the list, locking them and checking their name. So if 2 or more threads try to instantiate a filter in parallel, they'll all hold 1 lock at the top level in the __virNWFilterInstantiateFilter method which will cause the other thread to deadlock in virNWFilterObjFindByName. The fix is to add an exclusive mutex to serialize the execution of __virNWFilterInstantiateFilter. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 6 ++++-- src/nwfilter/nwfilter_gentech_driver.c | 34 ++++++++++++++++++++++++++++++++-- src/nwfilter/nwfilter_gentech_driver.h | 2 +- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 5908df7..2e89d07 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -200,7 +200,8 @@ nwfilterStateInitialize(bool privileged, if (virNWFilterDHCPSnoopInit() < 0) goto err_exit_learnshutdown; - virNWFilterTechDriversInit(privileged); + if (virNWFilterTechDriversInit(privileged) < 0) + goto err_dhcpsnoop_shutdown; if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB, driverState) < 0) @@ -251,6 +252,7 @@ error: err_techdrivers_shutdown: virNWFilterTechDriversShutdown(); +err_dhcpsnoop_shutdown: virNWFilterDHCPSnoopShutdown(); err_exit_learnshutdown: virNWFilterLearnShutdown(); @@ -327,10 +329,10 @@ nwfilterStateCleanup(void) { if (driverState->privileged) { virNWFilterConfLayerShutdown(); - virNWFilterTechDriversShutdown(); virNWFilterDHCPSnoopShutdown(); virNWFilterLearnShutdown(); virNWFilterIPAddrMapShutdown(); + virNWFilterTechDriversShutdown(); nwfilterDriverLock(driverState); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 8c5cd57..5144dce 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -55,15 +55,34 @@ static virNWFilterTechDriverPtr filter_tech_drivers[] = { NULL }; +/* Serializes instantiation of filters. This is neccessary + * to avoid lock ordering deadlocks. eg __virNWFilterInstantiateFilter + * will hold a lock on a virNWFilterObjPtr. This in turn invokes + * virNWFilterInstantiate which invokes virNWFilterDetermineMissingVarsRec + * which invokes virNWFilterObjFindByName. This iterates over every single + * virNWFilterObjPtr in the list. So if 2 threads try to instantiate a + * filter in parallel, they'll both hold 1 lock at the top level in + * __virNWFilterInstantiateFilter which will cause the other thread + * to dead lock in virNWFilterObjFindByName. + * + * XXX better long term solution is to make virNWFilterObjList use a + * hash table as is done for virDomainObjList. You can then get + * lockless lookup of objects by name. + */ +static virMutex updateMutex; -void virNWFilterTechDriversInit(bool privileged) { +int virNWFilterTechDriversInit(bool privileged) { size_t i = 0; VIR_DEBUG("Initializing NWFilter technology drivers"); + if (virMutexInitRecursive(&updateMutex) < 0) + return -1; + while (filter_tech_drivers[i]) { if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) filter_tech_drivers[i]->init(privileged); i++; } + return 0; } @@ -74,6 +93,7 @@ void virNWFilterTechDriversShutdown(void) { filter_tech_drivers[i]->shutdown(); i++; } + virMutexDestroy(&updateMutex); } @@ -935,6 +955,8 @@ _virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, int ifindex; int rc; + virMutexLock(&updateMutex); + /* after grabbing the filter update lock check for the interface; if it's not there anymore its filters will be or are being removed (while holding the lock) and we don't want to build new ones */ @@ -962,6 +984,8 @@ _virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, foundNewFilter); cleanup: + virMutexUnlock(&updateMutex); + return rc; } @@ -981,6 +1005,7 @@ virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver, bool foundNewFilter = false; virNWFilterReadLockFilterUpdates(); + virMutexLock(&updateMutex); rc = __virNWFilterInstantiateFilter(driver, vmuuid, @@ -1006,6 +1031,7 @@ virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver, } virNWFilterUnlockFilterUpdates(); + virMutexUnlock(&updateMutex); return rc; } @@ -1129,7 +1155,11 @@ _virNWFilterTeardownFilter(const char *ifname) int virNWFilterTeardownFilter(const virDomainNetDef *net) { - return _virNWFilterTeardownFilter(net->ifname); + int ret; + virMutexLock(&updateMutex); + ret = _virNWFilterTeardownFilter(net->ifname); + virMutexUnlock(&updateMutex); + return ret; } diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index f4789e1..d72e040 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -31,7 +31,7 @@ virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); int virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res, void *data); -void virNWFilterTechDriversInit(bool privileged); +int virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void); enum instCase { -- 1.8.5.3

2 2

[libvirt] [PATCH] Fix locking in virsh console
by Roman Bogorodskiy 10 Mar '14

10 Mar '14

While I'm still fighting with console on FreeBSD, I decided to sumbit that fix as it seems to be useful on its own. With that change I'm able to run virsh on FreeBSD to connect to libvirtd on Linux and get console working properly there. Roman Bogorodskiy (1): Fix locking in virsh console tools/virsh-console.c | 5 +++++ 1 file changed, 5 insertions(+) -- 1.8.4.2

2 3

[libvirt] How to detect if qemu supports discard?
by Richard W.M. Jones 10 Mar '14

10 Mar '14

from src/qemu/qemu_command.c: if (disk->discard) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DISCARD)) { virBufferAsprintf(&opt, ",discard=%s", virDomainDiskDiscardTypeToString(disk->discard)); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("discard is not supported by this QEMU binary")); goto error; } } However there appears to be no way to tell programmatically if the qemu binary supports discard (ie. via libvirt). Therefore libguestfs can never know when it is safe to use this option in the XML. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

3 2

[libvirt] [bug-report] libvirtd can't be connected by using the master branch with lots of VMs
by Wangpan 10 Mar '14

10 Mar '14

bug address: https://bugzilla.redhat.com/show_bug.cgi?id=1066801 I can reproduce it at master/v1.2.1-maint/v1.1.4-maint/v1.1.3.4 release branches everytime, but cann't reproduce it at v1.2.1，so I believe this bug is imported by the maintain patches after v1.2.1 release. Steps to Reproduce: 1.create many VMs(40 in my env) on the host 2.kill -9 `pid of libvirtd` 3.start libvirtd by using service libvirt-bin start Actual results: virsh version/list command is hung there without any responses Expected results: virsh version/list return the correct things Additional info: if there are few VMs(1 vm in my env), the virsh version command is OK Thanks in advance! 2014-03-07 Wangpan

2 4

[libvirt] [PATCH 0/4] Add keepalive support in virsh
by Martin Kletzander 10 Mar '14

10 Mar '14

*** BLURB *** Martin Kletzander (4): virsh: Sort options alphabetically virsh: Add keepalive in new vshConnect function virsh: Prohibit virConnectOpen* functions in virsh [DO_NOT_APPLY_UPSTREAM] virsh: add connection monitoring into vshWatchJob cfg.mk | 8 ++- tests/virsh-optparse | 3 +- tools/virsh-domain.c | 21 +++++--- tools/virsh.c | 141 +++++++++++++++++++++++++++++++++++++-------------- tools/virsh.h | 7 +++ tools/virsh.pod | 38 +++++++------- 6 files changed, 152 insertions(+), 66 deletions(-) -- 1.9.0

2 9

[libvirt] [PATCH] tests: Fix SELinux tests in VPATH build
by Jiri Denemark 10 Mar '14

10 Mar '14

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as a build-breaker. Notes: abs_builddir is used in more places in tests/securityselinuxhelper.c but since the path they are used in does not exist in abs_srcdir either, I guess it doesn't really matter what prefix is used there. tests/securityselinuxhelper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 703381c..dbc4c29 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -278,7 +278,7 @@ const char *selinux_virtual_domain_context_path(void) if (realis_selinux_enabled()) return realselinux_virtual_domain_context_path(); - return abs_builddir "/securityselinuxhelperdata/virtual_domain_context"; + return abs_srcdir "/securityselinuxhelperdata/virtual_domain_context"; } const char *selinux_virtual_image_context_path(void) @@ -288,7 +288,7 @@ const char *selinux_virtual_image_context_path(void) if (realis_selinux_enabled()) return realselinux_virtual_image_context_path(); - return abs_builddir "/securityselinuxhelperdata/virtual_image_context"; + return abs_srcdir "/securityselinuxhelperdata/virtual_image_context"; } #ifdef HAVE_SELINUX_LXC_CONTEXTS_PATH @@ -299,7 +299,7 @@ const char *selinux_lxc_contexts_path(void) if (realis_selinux_enabled()) return realselinux_lxc_contexts_path(); - return abs_builddir "/securityselinuxhelperdata/lxc_contexts"; + return abs_srcdir "/securityselinuxhelperdata/lxc_contexts"; } #endif -- 1.9.0

1 0