- Devel - libvirt List Archives

[libvirt] [PATCH 1/2] Fix order of disks and controllers
by Jiri Denemark 03 Nov '11

03 Nov '11

Commit 2d6adabd53c8f1858191d521dc9b4948d1205955 replaced qsorting disk and controller devices with inserting them at the right position. That was to fix unnecessary reordering of devices. However, when parsing domain XML devices are just taken in the order in which they appear in the XML since. Use the correct insertion algorithm to honor device target. --- src/conf/domain_conf.c | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 35 ++++++++++++------- tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 14 ++++---- tests/xmconfigdata/test-escape-paths.cfg | 2 +- tests/xmconfigdata/test-escape-paths.xml | 10 +++--- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b406202..48ed7eb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5883,7 +5883,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (!disk) goto error; - def->disks[def->ndisks++] = disk; + virDomainDiskInsertPreAlloced(def, disk); } VIR_FREE(nodes); @@ -5899,7 +5899,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (!controller) goto error; - def->controllers[def->ncontrollers++] = controller; + virDomainControllerInsertPreAlloced(def, controller); } VIR_FREE(nodes); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args index 23249f3..14367b1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args @@ -1,13 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,\ -nowait -no-acpi -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -drive \ -file=sheepdog:example.org:6000:image,if=none,id=drive-virtio-disk0 -device \ -virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,\ -bootindex=3 -drive file=/root/boot.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ -bootindex=1 -drive file=/dev/null,if=none,id=drive-fdc0-0-1 -global \ -isa-fdc.driveB=drive-fdc0-0-1 -global isa-fdc.bootindexB=4 -device \ -virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,\ -bootindex=2 -net user,vlan=0,name=hostnet0 -usb -device virtio-balloon-pci,\ -id=balloon0,bus=pci.0,addr=0x5 +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/root/boot.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-drive file=sheepdog:example.org:6000:image,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \ +-drive file=/dev/null,if=none,id=drive-fdc0-0-1 \ +-global isa-fdc.driveB=drive-fdc0-0-1 \ +-global isa-fdc.bootindexB=4 \ +-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,bootindex=2 \ +-net user,vlan=0,name=hostnet0 \ +-usb \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml index ba8a9b2..0022c92 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml @@ -18,6 +18,13 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <disk type='file' device='cdrom'> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <boot order='1'/> + <readonly/> + <address type='drive' controller='0' bus='1' unit='0'/> + </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='sheepdog' name='image'> @@ -26,13 +33,6 @@ <target dev='vda' bus='virtio'/> <boot order='3'/> </disk> - <disk type='file' device='cdrom'> - <source file='/root/boot.iso'/> - <target dev='hdc' bus='ide'/> - <boot order='1'/> - <readonly/> - <address type='drive' controller='0' bus='1' unit='0'/> - </disk> <disk type='file' device='floppy'> <driver name='qemu' type='raw'/> <source file='/dev/null'/> diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg index e3e6db9..13be2a0 100644 --- a/tests/xmconfigdata/test-escape-paths.cfg +++ b/tests/xmconfigdata/test-escape-paths.cfg @@ -19,7 +19,7 @@ vnc = 1 vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" -disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso&test,hdc:cdrom,r", """phy:/dev/HostVG/XenGuest'",hdb,w""" ] +disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", """phy:/dev/HostVG/XenGuest'",hdb,w""", "file:/root/boot.iso&test,hdc:cdrom,r" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ] parallel = "none" serial = "none" diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml index 13e6e29..9eaf90c 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -25,17 +25,17 @@ <source dev='/dev/HostVG/XenGuest2'/> <target dev='hda' bus='ide'/> </disk> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/HostVG/XenGuest'"'/> + <target dev='hdb' bus='ide'/> + </disk> <disk type='file' device='cdrom'> <driver name='file'/> <source file='/root/boot.iso&test'/> <target dev='hdc' bus='ide'/> <readonly/> </disk> - <disk type='block' device='disk'> - <driver name='phy'/> - <source dev='/dev/HostVG/XenGuest'"'/> - <target dev='hdb' bus='ide'/> - </disk> <interface type='bridge'> <mac address='00:16:3e:66:92:9c'/> <source bridge='xenbr1'/> -- 1.7.5.3

4 21

[libvirt] [libvirt-glib] Ask gtkdoc-scan to generate the sections file
by Zeeshan Ali (Khattak) 03 Nov '11

03 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> This frees us from maintaining the sections file. --- docs/libvirt-gconfig/Libvirt-gconfig-sections.txt | 166 -------------- docs/libvirt-gconfig/Makefile.am | 2 +- docs/libvirt-glib/Libvirt-glib-sections.txt | 22 -- docs/libvirt-glib/Makefile.am | 2 +- docs/libvirt-gobject/Libvirt-gobject-sections.txt | 244 --------------------- docs/libvirt-gobject/Makefile.am | 2 +- 6 files changed, 3 insertions(+), 435 deletions(-) delete mode 100644 docs/libvirt-gconfig/Libvirt-gconfig-sections.txt delete mode 100644 docs/libvirt-glib/Libvirt-glib-sections.txt delete mode 100644 docs/libvirt-gobject/Libvirt-gobject-sections.txt diff --git a/docs/libvirt-gconfig/Libvirt-gconfig-sections.txt b/docs/libvirt-gconfig/Libvirt-gconfig-sections.txt deleted file mode 100644 index e2dcc5f..0000000 --- a/docs/libvirt-gconfig/Libvirt-gconfig-sections.txt +++ /dev/null @@ -1,166 +0,0 @@ -<SECTION> -<FILE>libvirt-gconfig-object</FILE> -<TITLE>GVirConfigObject</TITLE> -gvir_config_object_validate -gvir_config_object_get_doc -gvir_config_object_get_schema -<SUBSECTION Standard> -GVIR_TYPE_OBJECT -GVIR_OBJECT -GVIR_OBJECT_CLASS -GVIR_IS_OBJECT -GVIR_IS_OBJECT_CLASS -GVIR_OBJECT_GET_CLASS -<SUBSECTION Private> -GVirConfigObjectPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-domain</FILE> -<TITLE>GVirConfigDomain</TITLE> -gvir_config_domain_new -<SUBSECTION Standard> -GVIR_TYPE_DOMAIN -GVIR_DOMAIN -GVIR_DOMAIN_CLASS -GVIR_IS_DOMAIN -GVIR_IS_DOMAIN_CLASS -GVIR_DOMAIN_GET_CLASS -<SUBSECTION Private> -GVirConfigDomainPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-domain-snapshot</FILE> -<TITLE>GVirConfigDomainSnapshot</TITLE> -gvir_config_domain_snapshot_new -<SUBSECTION Standard> -GVIR_TYPE_DOMAIN_SNAPSHOT -GVIR_DOMAIN_SNAPSHOT -GVIR_DOMAIN_SNAPSHOT_CLASS -GVIR_IS_DOMAIN_SNAPSHOT -GVIR_IS_DOMAIN_SNAPSHOT_CLASS -GVIR_DOMAIN_SNAPSHOT_GET_CLASS -<SUBSECTION Private> -GVirConfigDomainSnapshotPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-interface</FILE> -<TITLE>GVirConfigInterface</TITLE> -gvir_config_interface_new -<SUBSECTION Standard> -GVIR_TYPE_INTERFACE -GVIR_INTERFACE -GVIR_INTERFACE_CLASS -GVIR_IS_INTERFACE -GVIR_IS_INTERFACE_CLASS -GVIR_INTERFACE_GET_CLASS -<SUBSECTION Private> -GVirConfigInterfacePrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-network-filter</FILE> -<TITLE>GVirConfigNetworkFilter</TITLE> -gvir_config_network_filter_new -<SUBSECTION Standard> -GVIR_TYPE_NETWORK_FILTER -GVIR_NETWORK_FILTER -GVIR_NETWORK_FILTER_CLASS -GVIR_IS_NETWORK_FILTER -GVIR_IS_NETWORK_FILTER_CLASS -GVIR_NETWORK_FILTER_GET_CLASS -<SUBSECTION Private> -GVirConfigNetworkFilterPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-network</FILE> -<TITLE>GVirConfigNetwork</TITLE> -gvir_config_network_new -<SUBSECTION Standard> -GVIR_TYPE_NETWORK -GVIR_NETWORK -GVIR_NETWORK_CLASS -GVIR_IS_NETWORK -GVIR_IS_NETWORK_CLASS -GVIR_NETWORK_GET_CLASS -<SUBSECTION Private> -GVirConfigNetworkPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-node-device</FILE> -<TITLE>GVirConfigNodeDevice</TITLE> -gvir_config_node_device_new -<SUBSECTION Standard> -GVIR_TYPE_NODE_DEVICE -GVIR_NODE_DEVICE -GVIR_NODE_DEVICE_CLASS -GVIR_IS_NODE_DEVICE -GVIR_IS_NODE_DEVICE_CLASS -GVIR_NODE_DEVICE_GET_CLASS -<SUBSECTION Private> -GVirConfigNodeDevicePrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-secret</FILE> -<TITLE>GVirConfigSecret</TITLE> -gvir_config_secret_get_new -<SUBSECTION Standard> -GVIR_TYPE_SECRET -GVIR_SECRET -GVIR_SECRET_CLASS -GVIR_IS_SECRET -GVIR_IS_SECRET_CLASS -GVIR_SECRET_GET_CLASS -<SUBSECTION Private> -GVirConfigSecretPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-storage-pool</FILE> -<TITLE>GVirConfigStoragePool</TITLE> -gvir_config_storage_pool_new -<SUBSECTION Standard> -GVIR_TYPE_STORAGE_POOL -GVIR_STORAGE_POOL -GVIR_STORAGE_POOL_CLASS -GVIR_IS_STORAGE_POOL -GVIR_IS_STORAGE_POOL_CLASS -GVIR_STORAGE_POOL_GET_CLASS -<SUBSECTION Private> -GVirConfigStoragePoolPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-storage-vol</FILE> -<TITLE>GVirConfigStorageVol</TITLE> -gvir_config_storage_vol_new -<SUBSECTION Standard> -GVIR_TYPE_STORAGE_VOL -GVIR_STORAGE_VOL -GVIR_STORAGE_VOL_CLASS -GVIR_IS_STORAGE_VOL -GVIR_IS_STORAGE_VOL_CLASS -GVIR_STORAGE_VOL_GET_CLASS -<SUBSECTION Private> -GVirConfigStorageVolPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gconfig-capabilities</FILE> -<TITLE>GVirConfigCapabilities</TITLE> -gvir_config_capabilities_new -<SUBSECTION Standard> -GVIR_TYPE_CAPABILITIES -GVIR_CAPABILITIES -GVIR_CAPABILITIES_CLASS -GVIR_IS_CAPABILITIES -GVIR_IS_CAPABILITIES_CLASS -GVIR_CAPABILITIES_GET_CLASS -<SUBSECTION Private> -GVirConfigCapabilitiesPrivate -</SECTION> diff --git a/docs/libvirt-gconfig/Makefile.am b/docs/libvirt-gconfig/Makefile.am index de5bc82..8936aba 100644 --- a/docs/libvirt-gconfig/Makefile.am +++ b/docs/libvirt-gconfig/Makefile.am @@ -9,7 +9,7 @@ DOC_SOURCE_DIR=../../libvirt-gconfig SCANGOBJ_OPTIONS= -SCAN_OPTIONS= +SCAN_OPTIONS=--rebuild-sections --rebuild-types MKDB_OPTIONS=--sgml-mode --output-format=xml diff --git a/docs/libvirt-glib/Libvirt-glib-sections.txt b/docs/libvirt-glib/Libvirt-glib-sections.txt deleted file mode 100644 index 506a2ba..0000000 --- a/docs/libvirt-glib/Libvirt-glib-sections.txt +++ /dev/null @@ -1,22 +0,0 @@ -<SECTION> -<FILE>libvirt-glib-main</FILE> -<TITLE>Initialization</TITLE> -gvir_init -gvir_init_check -</SECTION> - -<SECTION> -<FILE>libvirt-glib-event</FILE> -<TITLE>Event Handling</TITLE> -gvir_event_register -</SECTION> - -<SECTION> -<FILE>libvirt-glib-error</FILE> -<TITLE>Error Handling</TITLE> -gvir_error_new -gvir_error_new_literal -gvir_error_new_valist -</SECTION> - - diff --git a/docs/libvirt-glib/Makefile.am b/docs/libvirt-glib/Makefile.am index 01190d1..6efc644 100644 --- a/docs/libvirt-glib/Makefile.am +++ b/docs/libvirt-glib/Makefile.am @@ -9,7 +9,7 @@ DOC_SOURCE_DIR=../../libvirt-glib SCANGOBJ_OPTIONS= -SCAN_OPTIONS= +SCAN_OPTIONS=--rebuild-sections --rebuild-types MKDB_OPTIONS=--sgml-mode --output-format=xml diff --git a/docs/libvirt-gobject/Libvirt-gobject-sections.txt b/docs/libvirt-gobject/Libvirt-gobject-sections.txt deleted file mode 100644 index b6baf2e..0000000 --- a/docs/libvirt-gobject/Libvirt-gobject-sections.txt +++ /dev/null @@ -1,244 +0,0 @@ -<SECTION> -<FILE>libvirt-gobject-connection</FILE> -<TITLE>GVirConnection</TITLE> -gvir_connection_new -gvir_connection_open -gvir_connection_open_async -gvir_connection_open_finish -gvir_connection_is_open -gvir_connection_close -gvir_connection_fetch_domains -gvir_connection_fetch_domains_async -gvir_connection_fetch_domains_finish -gvir_connection_get_uri -gvir_connection_get_domains -gvir_connection_get_domain -gvir_connection_find_domain_by_id -gvir_connection_find_domain_by_name -gvir_connection_create_domain -gvir_connection_fetch_storage_pools -gvir_connection_fetch_storage_pools_async -gvir_connection_fetch_storage_pools_finish -gvir_connection_get_storage_pools -gvir_connection_get_storage_pool -gvir_connection_find_storage_pool_by_name -gvir_connection_create_storage_pool -gvir_connection_get_stream -<SUBSECTION Standard> -GVIR_TYPE_CONNECTION -GVIR_CONNECTION -GVIR_CONNECTION_CLASS -GVIR_IS_CONNECTION -GVIR_IS_CONNECTION_CLASS -GVIR_CONNECTION_GET_CLASS -<SUBSECTION Private> -GVirConnectionPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-domain</FILE> -<TITLE>GVirDomain</TITLE> -GVirDomainState -GVirDomainInfo -gvir_domain_get_name -gvir_domain_get_uuid -gvir_domain_get_id -gvir_domain_start -gvir_domain_resume -gvir_domain_stop -gvir_domain_delete -gvir_domain_shutdown -gvir_domain_reboot -gvir_domain_get_info -gvir_domain_get_config -gvir_domain_screenshot -<SUBSECTION Standard> -GVIR_TYPE_DOMAIN -GVIR_DOMAIN -GVIR_DOMAIN_CLASS -GVIR_IS_DOMAIN -GVIR_IS_DOMAIN_CLASS -GVIR_DOMAIN_GET_CLASS -<SUBSECTION Private> -GVirDomainPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-domain-snapshot</FILE> -<TITLE>GVirDomainSnapshot</TITLE> -gvir_domain_snapshot_get_name -gvir_domain_snapshot_get_config -<SUBSECTION Standard> -GVIR_TYPE_DOMAIN_SNAPSHOT -GVIR_DOMAIN_SNAPSHOT -GVIR_DOMAIN_SNAPSHOT_CLASS -GVIR_IS_DOMAIN_SNAPSHOT -GVIR_IS_DOMAIN_SNAPSHOT_CLASS -GVIR_DOMAIN_SNAPSHOT_GET_CLASS -<SUBSECTION Private> -GVirDomainSnapshotPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-interface</FILE> -<TITLE>GVirInterface</TITLE> -gvir_interface_get_name -gvir_interface_get_config -<SUBSECTION Standard> -GVIR_TYPE_INTERFACE -GVIR_INTERFACE -GVIR_INTERFACE_CLASS -GVIR_IS_INTERFACE -GVIR_IS_INTERFACE_CLASS -GVIR_INTERFACE_GET_CLASS -<SUBSECTION Private> -GVirInterfacePrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-manager</FILE> -<TITLE>GVirManager</TITLE> -gvir_manager_new -gvir_manager_add_connection -gvir_manager_remove_connection -gvir_manager_get_connections -gvir_manager_find_connection_by_uri -<SUBSECTION Standard> -GVIR_TYPE_MANAGER -GVIR_MANAGER -GVIR_MANAGER_CLASS -GVIR_IS_MANAGER -GVIR_IS_MANAGER_CLASS -GVIR_MANAGER_GET_CLASS -<SUBSECTION Private> -GVirManagerPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-network-filter</FILE> -<TITLE>GVirNetworkFilter</TITLE> -gvir_network_filter_get_name -gvir_network_filter_get_uuid -gvir_network_filter_get_config -<SUBSECTION Standard> -GVIR_TYPE_NETWORK_FILTER -GVIR_NETWORK_FILTER -GVIR_NETWORK_FILTER_CLASS -GVIR_IS_NETWORK_FILTER -GVIR_IS_NETWORK_FILTER_CLASS -GVIR_NETWORK_FILTER_GET_CLASS -<SUBSECTION Private> -GVirNetworkFilterPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-network</FILE> -<TITLE>GVirNetwork</TITLE> -gvir_network_get_name -gvir_network_get_uuid -gvir_network_get_config -<SUBSECTION Standard> -GVIR_TYPE_NETWORK -GVIR_NETWORK -GVIR_NETWORK_CLASS -GVIR_IS_NETWORK -GVIR_IS_NETWORK_CLASS -GVIR_NETWORK_GET_CLASS -<SUBSECTION Private> -GVirNetworkPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-node-device</FILE> -<TITLE>GVirNodeDevice</TITLE> -gvir_node_device_get_name -gvir_node_device_get_config -<SUBSECTION Standard> -GVIR_TYPE_NODE_DEVICE -GVIR_NODE_DEVICE -GVIR_NODE_DEVICE_CLASS -GVIR_IS_NODE_DEVICE -GVIR_IS_NODE_DEVICE_CLASS -GVIR_NODE_DEVICE_GET_CLASS -<SUBSECTION Private> -GVirNodeDevicePrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-secret</FILE> -<TITLE>GVirSecret</TITLE> -gvir_secret_get_name -gvir_secret_get_uuid -gvir_secret_get_config -<SUBSECTION Standard> -GVIR_TYPE_SECRET -GVIR_SECRET -GVIR_SECRET_CLASS -GVIR_IS_SECRET -GVIR_IS_SECRET_CLASS -GVIR_SECRET_GET_CLASS -<SUBSECTION Private> -GVirSecretPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-storage-pool</FILE> -<TITLE>GVirStoragePool</TITLE> -gvir_storage_pool_get_name -gvir_storage_pool_get_uuid -gvir_storage_pool_get_config -gvir_storage_pool_refresh -gvir_storage_pool_refresh_async -gvir_storage_pool_refresh_finish -gvir_storage_pool_get_volumes -gvir_storage_pool_get_volume -gvir_storage_pool_create_volume -gvir_storage_pool_build -gvir_storage_pool_build_async -gvir_storage_pool_build_finish -gvir_storage_pool_start -gvir_storage_pool_start_async -gvir_storage_pool_start_finish -<SUBSECTION Standard> -GVIR_TYPE_STORAGE_POOL -GVIR_STORAGE_POOL -GVIR_STORAGE_POOL_CLASS -GVIR_IS_STORAGE_POOL -GVIR_IS_STORAGE_POOL_CLASS -GVIR_STORAGE_POOL_GET_CLASS -<SUBSECTION Private> -GVirStoragePoolPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-storage-vol</FILE> -<TITLE>GVirStorageVol</TITLE> -gvir_storage_vol_get_name -gvir_storage_vol_get_path -gvir_storage_vol_get_config -<SUBSECTION Standard> -GVIR_TYPE_STORAGE_VOL -GVIR_STORAGE_VOL -GVIR_STORAGE_VOL_CLASS -GVIR_IS_STORAGE_VOL -GVIR_IS_STORAGE_VOL_CLASS -GVIR_STORAGE_VOL_GET_CLASS -<SUBSECTION Private> -GVirStorageVolPrivate -</SECTION> - -<SECTION> -<FILE>libvirt-gobject-stream</FILE> -<TITLE>GVirStream</TITLE> -gvir_stream_get_name -gvir_stream_get_config -<SUBSECTION Standard> -GVIR_TYPE_STREAM -GVIR_STREAM -GVIR_STREAM_CLASS -GVIR_IS_STREAM -GVIR_IS_STREAM_CLASS -GVIR_STREAM_GET_CLASS -<SUBSECTION Private> -GVirStreamPrivate -</SECTION> diff --git a/docs/libvirt-gobject/Makefile.am b/docs/libvirt-gobject/Makefile.am index 26f3ce4..a5c7967 100644 --- a/docs/libvirt-gobject/Makefile.am +++ b/docs/libvirt-gobject/Makefile.am @@ -9,7 +9,7 @@ DOC_SOURCE_DIR=../../libvirt-gobject SCANGOBJ_OPTIONS= -SCAN_OPTIONS= +SCAN_OPTIONS=--rebuild-sections --rebuild-types MKDB_OPTIONS=--sgml-mode --output-format=xml -- 1.7.7

2 1

[libvirt] [PATCH] lxc: use common code for process cleanup
by Eric Blake 03 Nov '11

03 Nov '11

Based on a Coverity report - the return value of waitpid() should always be checked, to avoid problems with leaking resources. * src/lxc/lxc_controller.c (lxcControllerRun): Use simpler virPidAbort. --- Daniel previously said to wait until after the lxc multi-console patches were in before visiting this file; but now that those are in, this fix is still applicable: https://www.redhat.com/archives/libvir-list/2011-October/msg01083.html src/lxc/lxc_controller.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 649ac87..137ef52 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -59,6 +59,7 @@ #include "util.h" #include "virfile.h" #include "virpidfile.h" +#include "command.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -1266,14 +1267,8 @@ cleanup: VIR_FORCE_CLOSE(loopDevs[i]); VIR_FREE(loopDevs); - if (container > 1) { - int status; - kill(container, SIGTERM); - if (!(waitpid(container, &status, WNOHANG) == 0 && - WIFEXITED(status))) - kill(container, SIGKILL); - waitpid(container, NULL, 0); - } + virPidAbort(container); + return rc; } -- 1.7.4.4

2 2

[libvirt] client hang in virDomainCreateXML
by Jiff Shen 03 Nov '11

03 Nov '11

Hi, We are using Ubuntu 10.04 eucalyptus 1.6.2 and libvirt 0.7.5. We found eucalyptus-nc sometimes hangs in virDomainCreateXML, and never gets response from libvirtd. After 2 days of investigation, I found there is another libvirt client connects to libvirtd 'qemu:///system', which is the same URI as eucalyptus-nc. The bug never shows after I disabled the client. My question is: 1, can I have multiple clients connect to qemu:///system? 2, is this an bug in libvirt and has it been fixed? Thanks a lot

3 2

[libvirt] sVirt support for LXC?
by Dong-In David Kang 03 Nov '11

03 Nov '11

Hello, We are at the later stage of a project. We are very much interested in sVirt support for LXC. Is there any branch that we can try? We are willing to test one. As I wrote below, we tried Daniel's branch https://gitorious.org/~berrange/libvirt/staging/commits/lxc-svirt. But we didn't have much luck. Any help? Do you have any schedule of adding sVirt support for LXC to upstream libvirt? Thanks, David. ---------------------- Dr. Dong-In "David" Kang Computer Scientist USC/ISI ----- Original Message ----- From: "Eric Blake" <eblake(a)redhat.com> To: "Dong-In David Kang" <dkang(a)isi.edu> Cc: libvir-list(a)redhat.com Sent: Wednesday, November 2, 2011 12:57:16 PM Subject: Re: [libvirt] sVirt support for LXC? On 11/02/2011 10:37 AM, Dong-In David Kang wrote: > > Hello, Replying to a random previous message, even if you change the subject line, doesn't create a new thread. Your message got buried in an existing thread, making it harder to find; in the future, it is better to start a new thread via a fresh email rather than replying to an existing mail. > > Is it planned to support sVirt for LXC? Eventually. It's a work in progress, and tracking this mailing list you will see as it improves. > I know the current libvirt does not support sVirt for LXC. > I found that a branch at https://gitorious.org/~berrange/libvirt/staging/commits/lxc-svirt seems to support sVirt for LXC. Yes, that's Daniel's staging area as he works on improving the situation. > I downloaded the tar file and overwrite libvirt-0.9.6 with the branch. Not recommended. Running a staging area patch is rather risky, and it's better to wait for it to hit upstream libvirt.git first, especially if you want support from this list. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list ---------------------- Dr. Dong-In "David" Kang Computer Scientist USC/ISI

2 2

[libvirt] [PATCH] Remove translations in socket test case
by Daniel P. Berrange 03 Nov '11

03 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The test case errors should not be translated since they're only targetted at developers, not users. * tests/virnetsockettest.c: Remove error reporting with translations --- tests/virnetsockettest.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) Pushed as a build breaker fix (make syntax-check fails) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index a76e5cc..16713e8 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -207,14 +207,11 @@ static int testSocketUNIXAccept(const void *data ATTRIBUTE_UNUSED) tmpdir = mkdtemp(template); if (tmpdir == NULL) { - virReportSystemError(errno, "%s", - _("Failed to create temporary directory")); + VIR_WARN("Failed to create temporary directory"); goto cleanup; } - if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0) { - virReportOOMError(); + if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0) goto cleanup; - } if (virNetSocketNewListenUNIX(path, 0700, -1, getgid(), &lsock) < 0) goto cleanup; @@ -260,14 +257,11 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED) tmpdir = mkdtemp(template); if (tmpdir == NULL) { - virReportSystemError(errno, "%s", - _("Failed to create temporary directory")); + VIR_WARN("Failed to create temporary directory"); goto cleanup; } - if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0) { - virReportOOMError(); + if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0) goto cleanup; - } if (virNetSocketNewListenUNIX(path, 0700, -1, getgid(), &lsock) < 0) goto cleanup; -- 1.7.6.4

2 1

[libvirt] [PATCH 0/4] new APIs/commands for managed core dump
by Hong Xiang 03 Nov '11

03 Nov '11

This patch series added new APIs and virsh commands for 'managed core dump' functionality. Existing functionalities are intact. The 'managed core dump' functionality is in line with 'managed save', there can be at most 1 managed core dump per domain. In addition to the generate/check-existence/remove APIs/commands, there's also a download API/command to get the managed core dump of a domain for local use. Currently the new functionality has only been implemented for qemu hypervisor driver. Hong Xiang (4): new public APIs for managed core dump remote driver implementation qemu driver implementation New virsh commands for managed core dump include/libvirt/libvirt.h.in | 13 +++ src/driver.h | 18 ++++ src/libvirt.c | 187 +++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 8 ++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 176 ++++++++++++++++++++++++++++++++++++- src/remote/remote_driver.c | 4 + src/remote/remote_protocol.x | 31 ++++++- tools/virsh.c | 200 ++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 636 insertions(+), 3 deletions(-)

1 4

[libvirt] [PATCHv5 0/3] Add VIR_TYPED_PARAM_STRING
by Eric Blake 03 Nov '11

03 Nov '11

This builds on v4: https://www.redhat.com/archives/libvir-list/2011-October/msg00446.html It only implements the front end of supporting typed strings across an RPC call; I'm still working on refactoring the back half of the v4 series to actually wire up blkio device weights to be the first use that actually sends a string, but wanted to get the review started on these now. Changes from v4: Added a driver feature bit. With that, it is no longer necessary to set a flag when setting parameters (libvirt.c rejects attempts for a new client to send strings to an old server lacking the feature), and getting strings no longer needs user interactions (the user does not have to worry about the flag bit; either the client is too old so the flag is not set, or the client is new enough and libvirt.c probes to see if the driver supports things to auto-set the flag; also, libvirt.c takes care of filtering out strings on the server side before returning so that the drivers do not have to pay much attention to the flag). Eric Blake (3): API: add VIR_TYPED_PARAM_STRING API: remote support for VIR_TYPED_PARAM_STRING API: add trivial qemu support for VIR_TYPED_PARAM_STRING daemon/remote.c | 33 ++++++++++-- include/libvirt/libvirt.h.in | 28 ++++++++++- src/libvirt.c | 119 +++++++++++++++++++++++++++++++++++++----- src/libvirt_internal.h | 9 +++- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 24 +++++++-- src/remote/remote_driver.c | 28 +++++++++- src/remote/remote_protocol.x | 2 + src/remote_protocol-structs | 2 + src/rpc/gendispatch.pl | 3 +- src/util/util.c | 14 +++++ src/util/util.h | 2 + 12 files changed, 237 insertions(+), 28 deletions(-) -- 1.7.4.4

2 8

[libvirt] [PATCH 0/5] more virTypedParameter cleanup
by Eric Blake 02 Nov '11

02 Nov '11

Following in the wake of my qemu cleanup [1], I figured it was worth fixing the other drivers as well. Let me know if I should squash this into one patch instead of 5. [1] https://www.redhat.com/archives/libvir-list/2011-November/msg00055.html Eric Blake (5): esx: allow getting < max typed parameters libxl: allow getting < max typed parameters lxc: allow getting < max typed parameters test: drop redundant check xen: allow getting < max typed parameters src/esx/esx_driver.c | 14 +------------- src/libxl/libxl_driver.c | 22 ++++++++++------------ src/lxc/lxc_driver.c | 16 +++------------- src/test/test_driver.c | 4 ---- src/xen/xen_hypervisor.c | 26 ++++++++++++-------------- src/xen/xend_internal.c | 28 +++++++++++++--------------- 6 files changed, 39 insertions(+), 71 deletions(-) -- 1.7.4.4

2 12

[libvirt] [PATCH] API: document scheduler parameter names
by Eric Blake 02 Nov '11

02 Nov '11

Document the parameter names that will be used by virDomain{Get,Set}SchedulerParameters{,Flags}, rather than hard-coding those names in each driver, to match what is done with memory, blkio, and blockstats parameters. * include/libvirt/libvirt.h.in (VIR_DOMAIN_SCHEDULER_CPU_SHARES) (VIR_DOMAIN_SCHEDULER_VCPU_PERIOD) (VIR_DOMAIN_SCHEDULER_VCPU_QUOTA, VIR_DOMAIN_SCHEDULER_WEIGHT) (VIR_DOMAIN_SCHEDULER_CAP): New field name macros. * src/qemu/qemu_driver.c (qemuSetSchedulerParametersFlags) (qemuGetSchedulerParametersFlags): Use new defines. * src/test/test_driver.c (testDomainGetSchedulerParamsFlags) (testDomainSetSchedulerParamsFlags): Likewise. * src/xen/xen_hypervisor.c (xenHypervisorGetSchedulerParameters) (xenHypervisorSetSchedulerParameters): Likewise. * src/xen/xend_internal.c (xenDaemonGetSchedulerParameters) (xenDaemonSetSchedulerParameters): Likewise. * src/lxc/lxc_driver.c (lxcSetSchedulerParametersFlags) (lxcGetSchedulerParametersFlags): Likewise. --- As mentioned here: https://www.redhat.com/archives/libvir-list/2011-November/msg00055.html I will welcome any suggested improvements on how to describe what those parameter names are configuring. Especially for the phrase "mysterious 'oo_req'", which looks just awful in public docs. include/libvirt/libvirt.h.in | 73 ++++++++++++++++++++++++++++++++--------- src/lxc/lxc_driver.c | 5 ++- src/qemu/qemu_driver.c | 25 ++++++++------ src/test/test_driver.c | 4 +- src/xen/xen_hypervisor.c | 19 ++++++----- src/xen/xend_internal.c | 18 +++++----- 6 files changed, 95 insertions(+), 49 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 92a14a8..0840d46 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -533,6 +533,46 @@ typedef virTypedParameter *virTypedParameterPtr; /* Management of scheduler parameters */ +/** + * VIR_DOMAIN_SCHEDULER_CPU_SHARES: + * + * Macro represents proportional weight of the scheduler used on the + * host cpu, when using the posix scheduler, as a ullong. + */ +#define VIR_DOMAIN_SCHEDULER_CPU_SHARES "cpu_shares" + +/** + * VIR_DOMAIN_SCHEDULER_VCPU_PERIOD: + * + * Macro represents the enforcement period for a quota, in microseconds, + * when using the posix scheduler, as a ullong. + */ +#define VIR_DOMAIN_SCHEDULER_VCPU_PERIOD "vcpu_period" + +/** + * VIR_DOMAIN_SCHEDULER_VCPU_QUOTA: + * + * Macro represents the maximum bandwidth to be used within a period, + * when using the posix scheduler, as an llong. + */ +#define VIR_DOMAIN_SCHEDULER_VCPU_QUOTA "vcpu_quota" + +/** + * VIR_DOMAIN_SCHEDULER_WEIGHT: + * + * Macro represents the relative weight, when using the credit + * scheduler, as a uint. + */ +#define VIR_DOMAIN_SCHEDULER_WEIGHT "weight" + +/** + * VIR_DOMAIN_SCHEDULER_CAP: + * + * Macro represents the maximum scheduler cap, when using the credit + * scheduler, as a uint. + */ +#define VIR_DOMAIN_SCHEDULER_CAP "cap" + /* * Fetch scheduler parameters, caller allocates 'params' field of size 'nparams' */ @@ -586,15 +626,16 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; /** * VIR_DOMAIN_BLOCK_STATS_FIELD_LENGTH: * - * Macro providing the field length of virDomainBlockStatsFlagsStruct + * Macro providing the field length of parameter names when using + * virDomainBlockStatsFlags(). */ -#define VIR_DOMAIN_BLOCK_STATS_FIELD_LENGTH 80 +#define VIR_DOMAIN_BLOCK_STATS_FIELD_LENGTH VIR_TYPED_PARAM_FIELD_LENGTH /** * VIR_DOMAIN_BLOCK_STATS_READ_BYTES: * * Macro represents the total number of read bytes of the - * block device. + * block device, as an llong. */ #define VIR_DOMAIN_BLOCK_STATS_READ_BYTES "rd_bytes" @@ -602,7 +643,7 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; * VIR_DOMAIN_BLOCK_STATS_READ_REQ: * * Macro represents the total read requests of the - * block device. + * block device, as an llong. */ #define VIR_DOMAIN_BLOCK_STATS_READ_REQ "rd_operations" @@ -610,7 +651,7 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; * VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES: * * Macro represents the total time spend on cache reads in - * nano-seconds of the block device. + * nano-seconds of the block device, as an llong. */ #define VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES "rd_total_times" @@ -618,7 +659,7 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; * VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES: * * Macro represents the total number of write bytes of the - * block device. + * block device, as an llong. */ #define VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES "wr_bytes" @@ -626,7 +667,7 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; * VIR_DOMAIN_BLOCK_STATS_WRITE_REQ: * * Macro represents the total write requests of the - * block device. + * block device, as an llong. */ #define VIR_DOMAIN_BLOCK_STATS_WRITE_REQ "wr_operations" @@ -634,7 +675,7 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; * VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES: * * Macro represents the total time spend on cache writes in - * nano-seconds of the block device. + * nano-seconds of the block device, as an llong. */ #define VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES "wr_total_times" @@ -642,7 +683,7 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; * VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ: * * Macro represents the total flush requests of the - * block device. + * block device, as an llong. */ #define VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ "flush_operations" @@ -650,14 +691,14 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; * VIR_DOMAIN_BLOCK_STATS_FLUSH_TOTAL_TIMES: * * Macro represents the total time spend on cache flushing in - * nano-seconds of the block device. + * nano-seconds of the block device, as an llong. */ #define VIR_DOMAIN_BLOCK_STATS_FLUSH_TOTAL_TIMES "flush_total_times" /** * VIR_DOMAIN_BLOCK_STATS_ERRS: * - * In Xen this returns the mysterious 'oo_req' + * In Xen this returns the mysterious 'oo_req', as an llong. */ #define VIR_DOMAIN_BLOCK_STATS_ERRS "errs" @@ -1136,7 +1177,7 @@ char * virDomainGetSchedulerType(virDomainPtr domain, * VIR_DOMAIN_BLKIO_WEIGHT: * * Macro for the Blkio tunable weight: it represents the io weight - * the guest can use. + * the guest can use, as a uint. */ #define VIR_DOMAIN_BLKIO_WEIGHT "weight" @@ -1163,7 +1204,7 @@ int virDomainGetBlkioParameters(virDomainPtr domain, * VIR_DOMAIN_MEMORY_HARD_LIMIT: * * Macro for the memory tunable hard_limit: it represents the maximum memory - * the guest can use. + * the guest can use, as a ullong. */ #define VIR_DOMAIN_MEMORY_HARD_LIMIT "hard_limit" @@ -1172,7 +1213,7 @@ int virDomainGetBlkioParameters(virDomainPtr domain, * VIR_DOMAIN_MEMORY_SOFT_LIMIT: * * Macro for the memory tunable soft_limit: it represents the memory upper - * limit enforced during memory contention. + * limit enforced during memory contention, as a ullong. */ #define VIR_DOMAIN_MEMORY_SOFT_LIMIT "soft_limit" @@ -1181,7 +1222,7 @@ int virDomainGetBlkioParameters(virDomainPtr domain, * VIR_DOMAIN_MEMORY_MIN_GUARANTEE: * * Macro for the memory tunable min_guarantee: it represents the minimum - * memory guaranteed to be reserved for the guest. + * memory guaranteed to be reserved for the guest, as a ullong. */ #define VIR_DOMAIN_MEMORY_MIN_GUARANTEE "min_guarantee" @@ -1190,7 +1231,7 @@ int virDomainGetBlkioParameters(virDomainPtr domain, * VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT: * * Macro for the swap tunable swap_hard_limit: it represents the maximum swap - * plus memory the guest can use. This limit has to be more than + * plus memory the guest can use, as a ullong. This limit has to be more than * VIR_DOMAIN_MEMORY_HARD_LIMIT. */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3af7a30..9c89c41 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2524,7 +2524,7 @@ lxcSetSchedulerParametersFlags(virDomainPtr domain, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - if (STRNEQ(param->field, "cpu_shares")) { + if (STRNEQ(param->field, VIR_DOMAIN_SCHEDULER_CPU_SHARES)) { lxcError(VIR_ERR_INVALID_ARG, _("Invalid parameter `%s'"), param->field); goto cleanup; @@ -2603,7 +2603,8 @@ lxcGetSchedulerParametersFlags(virDomainPtr domain, if (virCgroupGetCpuShares(group, &val) != 0) goto cleanup; params[0].value.ul = val; - if (virStrcpyStatic(params[0].field, "cpu_shares") == NULL) { + if (virStrcpyStatic(params[0].field, + VIR_DOMAIN_SCHEDULER_CPU_SHARES) == NULL) { lxcError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field cpu_shares too big for destination")); goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f81cb88..37272e0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6297,7 +6297,8 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, } } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE)) { qemuReportError(VIR_ERR_INVALID_ARG, - _("Memory tunable `%s' not implemented"), param->field); + _("Memory tunable `%s' not implemented"), + param->field); ret = -1; } else { qemuReportError(VIR_ERR_INVALID_ARG, @@ -6696,7 +6697,7 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - if (STREQ(param->field, "cpu_shares")) { + if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CPU_SHARES)) { if (param->type != VIR_TYPED_PARAM_ULLONG) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", _("invalid type for cpu_shares tunable, expected a 'ullong'")); @@ -6717,7 +6718,7 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_CONFIG) { vmdef->cputune.shares = params[i].value.ul; } - } else if (STREQ(param->field, "vcpu_period")) { + } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_VCPU_PERIOD)) { if (param->type != VIR_TYPED_PARAM_ULLONG) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", _("invalid type for vcpu_period tunable," @@ -6737,7 +6738,7 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_CONFIG) { vmdef->cputune.period = params[i].value.ul; } - } else if (STREQ(param->field, "vcpu_quota")) { + } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_VCPU_QUOTA)) { if (param->type != VIR_TYPED_PARAM_LLONG) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", _("invalid type for vcpu_quota tunable," @@ -6981,11 +6982,11 @@ qemuGetSchedulerParametersFlags(virDomainPtr dom, out: params[0].value.ul = shares; params[0].type = VIR_TYPED_PARAM_ULLONG; - /* XXX make these field names public in libvirt.h */ - if (virStrcpyStatic(params[0].field, "cpu_shares") == NULL) { + if (virStrcpyStatic(params[0].field, + VIR_DOMAIN_SCHEDULER_CPU_SHARES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Field name '%s' too long"), - "cpu_shares"); + VIR_DOMAIN_SCHEDULER_CPU_SHARES); goto cleanup; } @@ -6995,10 +6996,11 @@ out: if (*nparams > saved_nparams) { params[1].value.ul = period; params[1].type = VIR_TYPED_PARAM_ULLONG; - if (virStrcpyStatic(params[1].field, "vcpu_period") == NULL) { + if (virStrcpyStatic(params[1].field, + VIR_DOMAIN_SCHEDULER_VCPU_PERIOD) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Field name '%s' too long"), - "vcpu_period"); + VIR_DOMAIN_SCHEDULER_VCPU_PERIOD); goto cleanup; } saved_nparams++; @@ -7007,10 +7009,11 @@ out: if (*nparams > saved_nparams) { params[2].value.ul = quota; params[2].type = VIR_TYPED_PARAM_LLONG; - if (virStrcpyStatic(params[2].field, "vcpu_quota") == NULL) { + if (virStrcpyStatic(params[2].field, + VIR_DOMAIN_SCHEDULER_VCPU_QUOTA) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Field name '%s' too long"), - "vcpu_quota"); + VIR_DOMAIN_SCHEDULER_VCPU_QUOTA); goto cleanup; } saved_nparams++; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 326409d..4e1973a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2713,7 +2713,7 @@ testDomainGetSchedulerParamsFlags(virDomainPtr domain, testError(VIR_ERR_INVALID_ARG, "%s", _("Invalid parameter count")); goto cleanup; } - strcpy(params[0].field, "weight"); + strcpy(params[0].field, VIR_DOMAIN_SCHEDULER_WEIGHT); params[0].type = VIR_TYPED_PARAM_UINT; /* XXX */ /*params[0].value.ui = privdom->weight;*/ @@ -2759,7 +2759,7 @@ testDomainSetSchedulerParamsFlags(virDomainPtr domain, } for (i = 0; i < nparams; i++) { - if (STRNEQ(params[i].field, "weight")) { + if (STRNEQ(params[i].field, VIR_DOMAIN_SCHEDULER_WEIGHT)) { testError(VIR_ERR_INVALID_ARG, "field"); goto cleanup; } diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 58ae6a3..f1a8e68 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1203,9 +1203,6 @@ xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams) return schedulertype; } -static const char *str_weight = "weight"; -static const char *str_cap = "cap"; - /** * xenHypervisorGetSchedulerParameters: * @domain: pointer to the Xen Hypervisor block @@ -1291,17 +1288,21 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain, if (ret < 0) return(-1); - if (virStrcpyStatic(params[0].field, str_weight) == NULL) { + if (virStrcpyStatic(params[0].field, + VIR_DOMAIN_SCHEDULER_WEIGHT) == NULL) { virXenError(VIR_ERR_INTERNAL_ERROR, - "Weight %s too big for destination", str_weight); + "Weight %s too big for destination", + VIR_DOMAIN_SCHEDULER_WEIGHT); return -1; } params[0].type = VIR_TYPED_PARAM_UINT; params[0].value.ui = op_dom.u.getschedinfo.u.credit.weight; - if (virStrcpyStatic(params[1].field, str_cap) == NULL) { + if (virStrcpyStatic(params[1].field, + VIR_DOMAIN_SCHEDULER_CAP) == NULL) { virXenError(VIR_ERR_INTERNAL_ERROR, - "Cap %s too big for destination", str_cap); + "Cap %s too big for destination", + VIR_DOMAIN_SCHEDULER_CAP); return -1; } params[1].type = VIR_TYPED_PARAM_UINT; @@ -1402,7 +1403,7 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, for (i = 0; i < nparams; i++) { memset(&buf, 0, sizeof(buf)); - if (STREQ (params[i].field, str_weight) && + if (STREQ (params[i].field, VIR_DOMAIN_SCHEDULER_WEIGHT) && params[i].type == VIR_TYPED_PARAM_UINT) { val = params[i].value.ui; if ((val < 1) || (val > USHRT_MAX)) { @@ -1411,7 +1412,7 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain, return(-1); } op_dom.u.getschedinfo.u.credit.weight = val; - } else if (STREQ (params[i].field, str_cap) && + } else if (STREQ (params[i].field, VIR_DOMAIN_SCHEDULER_CAP) && params[i].type == VIR_TYPED_PARAM_UINT) { val = params[i].value.ui; if (val >= USHRT_MAX) { diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index fa39e8b..4fcc628 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -3554,9 +3554,6 @@ error: } -static const char *str_weight = "weight"; -static const char *str_cap = "cap"; - /** * xenDaemonGetSchedulerParameters: * @domain: pointer to the Domain block @@ -3635,18 +3632,21 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain, goto error; } - if (virStrcpyStatic(params[0].field, str_weight) == NULL) { + if (virStrcpyStatic(params[0].field, + VIR_DOMAIN_SCHEDULER_WEIGHT) == NULL) { virXendError(VIR_ERR_INTERNAL_ERROR, _("Weight %s too big for destination"), - str_weight); + VIR_DOMAIN_SCHEDULER_WEIGHT); goto error; } params[0].type = VIR_TYPED_PARAM_UINT; params[0].value.ui = sexpr_int(root, "domain/cpu_weight"); - if (virStrcpyStatic(params[1].field, str_cap) == NULL) { + if (virStrcpyStatic(params[1].field, + VIR_DOMAIN_SCHEDULER_CAP) == NULL) { virXendError(VIR_ERR_INTERNAL_ERROR, - _("Cap %s too big for destination"), str_cap); + _("Cap %s too big for destination"), + VIR_DOMAIN_SCHEDULER_CAP); goto error; } params[1].type = VIR_TYPED_PARAM_UINT; @@ -3727,10 +3727,10 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain, memset(&buf_weight, 0, VIR_UUID_BUFLEN); memset(&buf_cap, 0, VIR_UUID_BUFLEN); for (i = 0; i < nparams; i++) { - if (STREQ (params[i].field, str_weight) && + if (STREQ (params[i].field, VIR_DOMAIN_SCHEDULER_WEIGHT) && params[i].type == VIR_TYPED_PARAM_UINT) { snprintf(buf_weight, sizeof(buf_weight), "%u", params[i].value.ui); - } else if (STREQ (params[i].field, str_cap) && + } else if (STREQ (params[i].field, VIR_DOMAIN_SCHEDULER_CAP) && params[i].type == VIR_TYPED_PARAM_UINT) { snprintf(buf_cap, sizeof(buf_cap), "%u", params[i].value.ui); } else { -- 1.7.4.4

3 4

[libvirt] unable to set security context error ...
by Onkar N Mahajan 02 Nov '11

02 Nov '11

I am getting 'system_u:object_r:svirt_image_t:s0:c129,c783' on '/var/lib/libvirt/images/vm01.img': Permission denied' when I try to install using virt-manager. #semanage fcontext -l | grep images /var/lib/libvirt/images(/.*)? all files system_u:object_r:svirt_image_t:s0 /var/lib/tftpboot/images(/.*)? all files system_u:object_r:cobbler_var_lib_t:s0 /var/lib/xen/images(/.*)? all files system_u:object_r:xen_image_t:s0 /var/www/cobbler/images(/.*)? all files system_u:object_r:cobbler_var_lib_t:s0 and #ls -aZ drwxr-xr-x. root root unconfined_u:object_r:virt_var_lib_t:s0 . drwxr-xr-x. root root system_u:object_r:virt_var_lib_t:s0 .. -rw-------. root root system_u:object_r:svirt_image_t:s0 vm01.img Installation fails with following error message : Unable to complete install: 'unable to set security context 'system_u:object_r:svirt_image_t:s0:c129,c783' on '/var/lib/libvirt/images/vm01.img': Permission denied' Traceback (most recent call last): File "/usr/local/share/virt-manager/virtManager/asyncjob.py", line 44, in cb_wrapper callback(asyncjob, *args, **kwargs) File "/usr/local/share/virt-manager/virtManager/create.py", line 1902, in do_install guest.start_install(False, meter=meter) File "/usr/lib/python2.7/site-packages/virtinst/Guest.py", line 1224, in start_install noboot) File "/usr/lib/python2.7/site-packages/virtinst/Guest.py", line 1292, in _create_guest dom = self.conn.createLinux(start_xml or final_xml, 0) File "/usr/lib64/python2.7/site-packages/libvirt.py", line 1277, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirtError: unable to set security context 'system_u:object_r:svirt_image_t:s0:c129,c783' on '/var/lib/libvirt/images/vm01.img': Permission denied also, [/usr/libexec]#which qemu-kvm /usr/bin/qemu-kvm [/usr/libexec]#ls -aZ /usr/bin/qemu-kvm -rwxr-xr-x. root root unconfined_u:object_r:qemu_exec_t:s0 /usr/bin/qemu-kvm [/usr/libexec]#which libvirtd /usr/local/sbin/libvirtd [/usr/libexec]#ls -aZ /usr/local/sbin/libvirtd -rwxr-xr-x. root root system_u:object_r:bin_t:s0 /usr/local/sbin/libvirtd Please help me as to where I am going wrong.. Regards, Onkar

1 0

[libvirt] Notes from the KVM Forum relevant to libvirt
by Daniel P. Berrange 02 Nov '11

02 Nov '11

I was at the KVM Forum / LinuxCon last week and there were many interesting things discussed which are relevant to ongoing libvirt development. Here was the list that caught my attention. If I have missed any, fill in the gaps.... - Sandbox/container KVM. The Solaris port of KVM puts QEMU inside a zone so that an exploit of QEMU can't escape into the full OS. Containers are Linux's parallel of Zones, and while not nearly as secure yet, it would still be worth using more containers support to confine QEMU. - Events for object changes. We already have async events for virDomainPtr. We need the same for virInterfacePtr, virStoragePoolPtr, virStorageVolPtr and virNodeDevPtr, so that at the very least applications can be notified when objects are created or removed. For virNodeDevPtr we also want to be notified when properties change (ie CDROM media change). - CGroups passthrough. There is alot of experimentation with cgroups. We don't want to expose cgroups as a direct concept in the libvirt API, but we should consider putting a generic cgroups get/set in the libvirt-qemu.so library, or create a libvirt-linux.so library. Also likely add a <linux:cgroups> XML element to store arbitrary tunables in the XML. Same (low) level of support as with qemu:XXX of course - CPUSet for changing CPU + Memory NUMA pinning. The CPUset cgroups controller is able to actually move a guest's memory between NUMA nodes. We can already change VCPU pinning, but we need a new API to do node pinning of the whole VM, so we can ensure the I/O threads are also moved. We also need an API to move the memory pinning to new nodes. - Guest NUMA topology. If we have guests with RAM size > node size, we need to expose a NUMA topology into the guest. The CPU/memory pinning APIs will also need to be able to pin individual guest NUMA nodes to individual host NUMA nodes. - AHCI controller. IDE is going the way of the dodo. We need to add support for QEMU's new AHCI controller. This is quite simple, we already have a 'sata' disk type we can wire up to QEMU - VFIO PCI passthru. The current PCI assignment code may well be changed to use something called 'VFIO'. This will need some work in libvirt to support new CLI arg syntax, and probably some SELinux work - QCow3. There will soon be a QCow3 format. We need to add code to detect it and extract backing stores, etc. Trivial since the primary header format will still be the same as QCow2. - QMP completion. Given anthony's plan for a complete replacement of the current CLI + monitor syntax in QEMU 2.0 (long way out), he has dropped objections to adding new commands to QMP in the near future. So all existing HMP commands will immediately be made available in QMP with no attempt to re-design them now. So the need for the HMP passthrough command will soon go away. - Migration + VEPA/VNLink failures. As raised previously on this list, Cisco really wants libvirt to have the ability to do migration, and optionally *not* fail, even if the VEPA/VNLink setup fails. This will require an event notification to the app if a failure of a device backend occurs, and an API to let the admin app fix the device backend (virDomainUpdateDevice) and some way to tell migration what bits are allowed to fail. - Virtio SCSI. We need to support this new stuff in QEMU when it is eventually implemented. It will mean we avoid the PCI slot usage problems inherant in virtio-blk, and get other things like multipath and decent SCSI passthrough support. - USB 2.0. We need to support this in libvirt asap. It is very important for desktop experiance and to support better integration with SPICE This also gets us proper USB port addressing. Fun footnote, QEMU USB has *never* supported migration. The USB tablet only works by sheer luck, as OS' see the device disappear on migration & come back with different device ID/port addr and so does a re-initialize ! - Native KVM tool. The problem statement was that the QEMU code is too big/complex & and command line args are too complex, so lets rewrite from scratch to make the code small & CLI simple. They achieve this, but of course primarily because they lack so many features compared to QEMU. They had libvirt support as a bullet point on their preso, but I'm not expecting it to replace the current QEMU KVM support in the forseeable future, given its current level of features and the size of its dev team compared to QEMU/KVM. They did have some fun demos of booting using the host OS filesystem though. We can actually do the same with regular KVM/libvirt but there's no nice demo tool to show it off. I'm hoping to create one.... - Shared memory devices. Some people doing high performance work are using the QEMU shared memory device. We don't support this (ivhshm device) in libvirt yet. Fairly niche use cases but might be nice to have this. - SDK / Docs. Request for a more SDK like approach to KVM development tools and documentation. Also want to simplify libvirt operations. The exposure of the virt-install internal API as official GObjects would have significantly helped the project Ricardo (from IBM) described in his presentation. Of course no one can argue that we need more documentation in every area. - USB managed mode. As we do with PCI passthrough, we should be able to detach USB device from host OS, and perform a reset before attaching to the guest, and most importantly track which USB devices have been given to which guest, so we don't duplicate assign. We have all neccessary APIs, just need to wire them up. - PCI passthrough. We need to support setting of MAC addr, VLAN and VEPA/VNLink properties against VFs from SRIOV NICs that are assigned to a guest. For those who were not at the KVM Forum, the presentations are already available online at: http://www.linux-kvm.org/page/KVM_Forum_2011 All the session were also video recorded, so sometime in the next week or two, there should be OGG videos of the talks being uploaded to the same site. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

6 13

[libvirt] [PATCH 1/2] docs: improve typed parameter documentation
by Eric Blake 02 Nov '11

02 Nov '11

virDomainBlockStatsFlags was missing a check that was present in virDomainGetMemoryParameters. Additionally, I found that the existing descriptions were a bit hard to read. A later patch will fix qemu to return fewer than max parameters if @nparams was too small on input, rather than outright fail. * src/libvirt.c (virDomainGetMemoryParameters) (virDomainGetBlkioParameters, virDomainGetSchedulerParameters) (virDomainGetSchedulerParametersFlags): Tweak documentation wording. (virDomainBlockStatsFlags): Likewise, and add sanity check. --- src/libvirt.c | 100 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 65 insertions(+), 35 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e9d1a29..f9cddef 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3639,15 +3639,17 @@ error: * @domain: pointer to domain object * @params: pointer to memory parameter object * (return value, allocated by the caller) - * @nparams: pointer to number of memory parameters + * @nparams: pointer to number of memory parameters; input and output * @flags: one of virDomainModificationImpact * - * Get all memory parameters, the @params array will be filled with the values - * equal to the number of parameters suggested by @nparams + * Get all memory parameters. On input, @nparams gives the size of the + * @params array; on output, @nparams gives how many slots were filled + * with parameter information, which might be less but will not exceed + * the input value. * - * As the value of @nparams is dynamic, call the API setting @nparams to 0 and - * @params as NULL, the API returns the number of parameters supported by the - * HV by updating @nparams on SUCCESS. The caller should then allocate @params + * As a special case, calling with @params as NULL and @nparams as 0 on + * input will cause @nparams on output to contain the number of parameters + * supported by the hypervisor. The caller should then allocate @params * array, i.e. (sizeof(@virTypedParameter) * @nparams) bytes and call the API * again. * @@ -3765,12 +3767,21 @@ error: * @domain: pointer to domain object * @params: pointer to blkio parameter object * (return value, allocated by the caller) - * @nparams: pointer to number of blkio parameters + * @nparams: pointer to number of blkio parameters; input and output * @flags: an OR'ed set of virDomainModificationImpact * - * Get all blkio parameters, the @params array will be filled with the values - * equal to the number of parameters suggested by @nparams. - * See virDomainGetMemoryParameters for an equivalent usage example. + * Get all blkio parameters. On input, @nparams gives the size of the + * @params array; on output, @nparams gives how many slots were filled + * with parameter information, which might be less but will not exceed + * the input value. + * + * As a special case, calling with @params as NULL and @nparams as 0 on + * input will cause @nparams on output to contain the number of parameters + * supported by the hypervisor. The caller should then allocate @params + * array, i.e. (sizeof(@virTypedParameter) * @nparams) bytes and call the API + * again. + * + * See virDomainGetMemoryParameters() for an equivalent usage example. * * This function may require privileged access to the hypervisor. This function * expects the caller to allocate the @params. @@ -6335,14 +6346,17 @@ error: * @params: pointer to scheduler parameter objects * (return value) * @nparams: pointer to number of scheduler parameter objects - * (this value must be at least as large as the returned value - * nparams of virDomainGetSchedulerType) + * (this value should generally be as large as the returned value + * nparams of virDomainGetSchedulerType()); input and output + * + * Get all scheduler parameters. On input, @nparams gives the size of the + * @params array; on output, @nparams gives how many slots were filled + * with parameter information, which might be less but will not exceed + * the input value. @nparams cannot be 0. * - * Get all scheduler parameters, the @params array will be filled with the - * values and @nparams will be updated to the number of valid elements in - * @params. It is hypervisor specific whether this returns the live or + * It is hypervisor specific whether this returns the live or * persistent state; for more control, use - * virDomainGetSchedulerParametersFlags. + * virDomainGetSchedulerParametersFlags(). * * Returns -1 in case of error, 0 in case of success. */ @@ -6391,15 +6405,28 @@ error: * (return value) * @nparams: pointer to number of scheduler parameter * (this value should be same than the returned value - * nparams of virDomainGetSchedulerType) + * nparams of virDomainGetSchedulerType()); input and output * @flags: one of virDomainModificationImpact * - * Get the scheduler parameters, the @params array will be filled with the - * values. + * Get all scheduler parameters. On input, @nparams gives the size of the + * @params array; on output, @nparams gives how many slots were filled + * with parameter information, which might be less but will not exceed + * the input value. @nparams cannot be 0. * * The value of @flags can be exactly VIR_DOMAIN_AFFECT_CURRENT, * VIR_DOMAIN_AFFECT_LIVE, or VIR_DOMAIN_AFFECT_CONFIG. * + * Here is a sample code snippet: + * + * char *ret = virDomainGetSchedulerType(dom, &nparams); + * if (ret && nparams != 0) { + * if ((params = malloc(sizeof(*params) * nparams)) == NULL) + * goto error; + * memset(params, 0, sizeof(*params) * nparams); + * if (virDomainGetSchedulerParametersFlags(dom, params, &nparams, 0)) + * goto error; + * } + * * Returns -1 in case of error, 0 in case of success. */ int @@ -6633,8 +6660,8 @@ error: * @path: path to the block device * @params: pointer to block stats parameter object * (return value) - * @nparams: pointer to number of block stats - * @flags: unused, always passes 0 + * @nparams: pointer to number of block stats; input and output + * @flags: unused, always pass 0 * * This function is to get block stats parameters for block * devices attached to the domain. @@ -6646,24 +6673,26 @@ error: * Domains may have more than one block device. To get stats for * each you should make multiple calls to this function. * - * The @params array will be filled with the value equal to the number of - * parameters suggested by @nparams. + * On input, @nparams gives the size of the @params array; on output, + * @nparams gives how many slots were filled with parameter + * information, which might be less but will not exceed the input + * value. * - * As the value of @nparams is dynamic, call the API setting @nparams to 0 and - * @params as NULL, the API returns the number of parameters supported by the - * HV by updating @nparams on SUCCESS. (Note that block device of different type - * might support different parameters numbers, so it might be necessary to compute - * @nparams for each block device type). The caller should then allocate @params + * As a special case, calling with @params as NULL and @nparams as 0 on + * input will cause @nparams on output to contain the number of parameters + * supported by the hypervisor. (Note that block devices of different types + * might support different parameters, so it might be necessary to compute + * @nparams for each block device). The caller should then allocate @params * array, i.e. (sizeof(@virTypedParameter) * @nparams) bytes and call the API - * again. See virDomainGetMemoryParameters for more details. + * again. See virDomainGetMemoryParameters() for more details. * * Returns -1 in case of error, 0 in case of success. */ -int virDomainBlockStatsFlags (virDomainPtr dom, - const char *path, - virTypedParameterPtr params, - int *nparams, - unsigned int flags) +int virDomainBlockStatsFlags(virDomainPtr dom, + const char *path, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) { virConnectPtr conn; @@ -6677,7 +6706,8 @@ int virDomainBlockStatsFlags (virDomainPtr dom, virDispatchError(NULL); return -1; } - if (!path || (nparams == NULL) || (*nparams < 0)) { + if (!path || (nparams == NULL) || (*nparams < 0) || + (params == NULL && *nparams != 0)) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } -- 1.7.4.4

4 7

[libvirt] [PATCH] fix crash when starting network
by Wen Congyang 02 Nov '11

02 Nov '11

commit 27908453 introduces a regression, and it will cause libvirt crashed when starting network. The reason is that tapfd may be NULL, but we dereference it without checking whether it is NULL. --- src/util/bridge.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/util/bridge.c b/src/util/bridge.c index 952f0f3..6774f99 100644 --- a/src/util/bridge.c +++ b/src/util/bridge.c @@ -484,7 +484,8 @@ brAddTap(brControl *ctl, errno = brCreateTap(ctl, ifname, vnet_hdr, tapfd); - if (*tapfd < 0 || errno) + /* fd has been closed in brCreateTap() when it failed. */ + if (errno) goto error; /* We need to set the interface MAC before adding it @@ -494,22 +495,23 @@ brAddTap(brControl *ctl, * device before we set our static MAC. */ if ((errno = brSetInterfaceMac(ctl, *ifname, macaddr))) - goto error; + goto close_fd; /* We need to set the interface MTU before adding it * to the bridge, because the bridge will have its * MTU adjusted automatically when we add the new interface. */ if ((errno = brSetInterfaceMtu(ctl, bridge, *ifname))) - goto error; + goto close_fd; if ((errno = brAddInterface(ctl, bridge, *ifname))) - goto error; + goto close_fd; if (up && ((errno = brSetInterfaceUp(ctl, *ifname, 1)))) - goto error; + goto close_fd; return 0; - error: - VIR_FORCE_CLOSE(*tapfd); - +close_fd: + if (tapfd) + VIR_FORCE_CLOSE(*tapfd); +error: return errno; } -- 1.7.1

5 5

[libvirt] [PATCH] Add missing param initialization in qemuDomainBlockStatsFlags
by Daniel P. Berrange 02 Nov '11

02 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> * src/qemu/qemu_driver.c: Fix use of uninitialized 'params' --- src/qemu/qemu_driver.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f81cb88..3194e6b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7236,6 +7236,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, } if (tmp < *nparams && wr_req != -1) { + param = &params[tmp]; if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -7249,6 +7250,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, } if (tmp < *nparams && rd_bytes != -1) { + param = &params[tmp]; if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_READ_BYTES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -7262,6 +7264,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, } if (tmp < *nparams && rd_req != -1) { + param = &params[tmp]; if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_READ_REQ) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -7275,6 +7278,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, } if (tmp < *nparams && flush_req != -1) { + param = &params[tmp]; if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -7288,6 +7292,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, } if (tmp < *nparams && wr_total_times != -1) { + param = &params[tmp]; if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -7301,6 +7306,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, } if (tmp < *nparams && rd_total_times != -1) { + param = &params[tmp]; if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -7314,6 +7320,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, } if (tmp < *nparams && flush_total_times != -1) { + param = &params[tmp]; if (virStrcpyStatic(param->field, VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, -- 1.7.6.4

2 1

[libvirt] Coverity automatic detection
by Alex Jia 02 Nov '11

02 Nov '11

This email is automatically generated. The test result is based on the following git commit: 9765653 qemu: allow getting < max typed parameters For details, please see attachment. Regards, Alex

1 1

[libvirt] RFC decoupling VM NIC provisioning from VM NIC connection to backend networks
by Sumit Naiksatam (snaiksat) 02 Nov '11

02 Nov '11

Hi, In its current implementation Libvirt makes sure that the network interfaces that it passes/provision to a VM (for example to qemu[-kvm]) are already connected to its backend (interfaces/networks) by the time the VM starts its boot process. In a non virtualized setup it would be like booting a machine with the Ethernet cable already plugged into a router/switch port. While in a non virtualized setup you can boot a machine first (with no physical connection to a router/switch) and later connect its NIC/s to the switch/router, when you boot a VM via Libvirt it is not possible to decouple the two actions (VM boot, cable plug/unplug). An example of case where the capability of decoupling the two actions mentioned above is a requirement in Quantum/NetStack which is the network service leveraged by OpenStack. The modular design of OpenStack allows you to: - provision VMs with NIC/s - create networks - create ports on networks - plug/unplug a VM NIC into/from a given port on a network (at runtime) Note that this runtime plug/unplug requirement has nothing to do with hot plug/unplug of NICs. The idea is more that of decoupling the provisioning of a VM from the connection of the VM to the network/s. This would make it possible to change (at run-time too) the networks the NIC/s of a given VM are connected to. For example, when a VM boots, its interfaces should be in link down state if the network admin has not connected the VM NIC/s to any "network" yet. Even though libvirt already provides a way to change the link state of an a VM NIC, link state and physical connection are two different things and should be manageable independently. Ideally the configuration syntax should be interface type and hypervisor type agnostic. Let's take QEMU[-kvm] as an example - when Libvirt starts a QEMU VM, it passes to QEMU a number of file descriptors that map to host backend interfaces (for example macvtap interfaces). In order to introduce this runtime plug/unplug capability, we need a mechanism that permits to delay the binding between the host macvtap interfaces and the guest taps (because you cannot know the fd of the macvtap interfaces before you create them). This means you need a mechanism that allows you to change such fd/s at runtime: - you can close/reset an fd (ie, when you disconnect a VM NIC from its network) - you can open/set an fd (ie, when you connect a VM NIC to a network) This could probably be a libvirt command that translates to a QEMU monitor command. Can the runtime plug/unplug capability described above be achieved (cleanly) with another mechanism? Is anybody working on implementing something similar? [For more information on OpenStack/NetStack/Quantum and the above requirements please refer to the network model used therein: http://docs.openstack.org/incubation/openstack-network/admin/content/Wha tIsQuantum.html (information on network, port, and attachment abstractions) http://www.slideshare.net/danwent/quantum-diablo-summary (slides 7 & 8)] Thanks, ~Sumit Naiksatam. (On behalf of OpenStack/Quantum team)

4 6

[libvirt] [PATCHv2] esx: Support folders in the path of vpx:// connection URIs
by Matthias Bolte 01 Nov '11

01 Nov '11

Allow the datacenter and compute resource parts of the path to be prefixed with folders. Therefore, the way the path is parsed has changed. Before, it was split in 2 or 3 items and the items' meanings were determined by their positions. Now the path can have 2 or more items and the the vCenter server is asked whether a folder, datacenter of compute resource with the specified name exists at the current hierarchy level. Before the datacenter and compute resource lookup automatically traversed folders during lookup. This is logic got removed and folders have to be specified explicitly. The proper datacenter path including folders is now used when accessing a datastore over HTTPS. This makes virsh dumpxml and define work for datacenters in folders. https://bugzilla.redhat.com/show_bug.cgi?id=732676 --- v1: https://www.redhat.com/archives/libvir-list/2011-September/msg00345.html v2: - Fix managed object lookup for esx:// connections that was broken by the changes to esxVI_Context_LookupManagedObjectsByPath in v1 - Store parsed/generated path parts in the context docs/drvesx.html.in | 10 ++- src/esx/esx_driver.c | 30 +++-- src/esx/esx_util.c | 22 +--- src/esx/esx_util.h | 4 +- src/esx/esx_vi.c | 267 +++++++++++++++++++++++++++++++++++----- src/esx/esx_vi.h | 11 +- src/esx/esx_vi_generator.input | 4 + 7 files changed, 280 insertions(+), 68 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index da9d2a1..7d323b3 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -56,7 +56,7 @@ esx://example-esx.com/?no_verify=1 (ESX over HTTPS, but doesn't verify the s URIs have this general form (<code>[...]</code> marks an optional part). </p> <pre> -type://[username@]hostname[:port]/[datacenter[/cluster]/server][?extraparameters] +type://[username@]hostname[:port]/[[folder/...]datacenter/[folder/...][cluster/]server][?extraparameters] </pre> <p> The <code>type://</code> is either <code>esx://</code> or @@ -80,6 +80,14 @@ type://[username@]hostname[:port]/[datacenter[/cluster]/server][?extraparameters <pre> vpx://example-vcenter.com/dc1/cluster1/example-esx.com </pre> + <p> + Datacenters and clusters can be organized in folders, those have to be + specified as well. The driver can handle folders + <span class="since">since 0.9.7</span>. + </p> +<pre> +vpx://example-vcenter.com/folder1/dc1/folder2/example-esx.com +</pre> <h4><a name="extraparams">Extra parameters</a></h4> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index c5e4974..109d9f1 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -722,7 +722,7 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, if (esxVI_Context_Alloc(&priv->host) < 0 || esxVI_Context_Connect(priv->host, url, ipAddress, username, password, priv->parsedUri) < 0 || - esxVI_Context_LookupObjectsByPath(priv->host, priv->parsedUri) < 0) { + esxVI_Context_LookupManagedObjects(priv->host) < 0) { goto cleanup; } @@ -799,8 +799,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, char *url = NULL; if (hostSystemIpAddress == NULL && - (priv->parsedUri->path_datacenter == NULL || - priv->parsedUri->path_computeResource == NULL)) { + (priv->parsedUri->path == NULL || STREQ(priv->parsedUri->path, "/"))) { ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Path has to specify the datacenter and compute resource")); return -1; @@ -859,13 +858,13 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, } if (hostSystemIpAddress != NULL) { - if (esxVI_Context_LookupObjectsByHostSystemIp(priv->vCenter, - hostSystemIpAddress) < 0) { + if (esxVI_Context_LookupManagedObjectsByHostSystemIp + (priv->vCenter, hostSystemIpAddress) < 0) { goto cleanup; } } else { - if (esxVI_Context_LookupObjectsByPath(priv->vCenter, - priv->parsedUri) < 0) { + if (esxVI_Context_LookupManagedObjectsByPath(priv->vCenter, + priv->parsedUri->path) < 0) { goto cleanup; } } @@ -884,8 +883,8 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, /* - * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<path>][?<query parameter> ...] - * <path> = <datacenter>/<computeresource>[/<hostsystem>] + * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<path>][?<query parameter>...] + * <path> = [<folder>/...]<datacenter>/[<folder>/...]<computeresource>[/<hostsystem>] * * If no port is specified the default port is set dependent on the scheme and * transport parameter: @@ -899,7 +898,8 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, * For a vpx:// connection <path> references a host managed by the vCenter. * In case the host is part of a cluster then <computeresource> is the cluster * name. Otherwise <computeresource> and <hostsystem> are equal and the later - * can be omitted. + * can be omitted. As datacenters and computeresources can be organized in + * folders those have to be included in <path>. * * Optional query parameters: * - transport={http|https} @@ -967,6 +967,12 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, return VIR_DRV_OPEN_ERROR; } + if (STRCASENEQ(conn->uri->scheme, "vpx") && + conn->uri->path != NULL && STRNEQ(conn->uri->path, "/")) { + VIR_WARN("Ignoring unexpected path '%s' for non-vpx scheme '%s'", + conn->uri->path, conn->uri->scheme); + } + /* Require server part */ if (conn->uri->server == NULL) { ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", @@ -2759,7 +2765,7 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) domain->conn->uri->server, domain->conn->uri->port); virBufferURIEncodeString(&buffer, directoryAndFileName); virBufferAddLit(&buffer, "?dcPath="); - virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); + virBufferURIEncodeString(&buffer, priv->primary->datacenterPath); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); @@ -3227,7 +3233,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) virBufferURIEncodeString(&buffer, escapedName); virBufferAddLit(&buffer, ".vmx?dcPath="); - virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); + virBufferURIEncodeString(&buffer, priv->primary->datacenterPath); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index c14179d..1925802 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -51,7 +51,6 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) int noVerify; int autoAnswer; char *tmp; - char *saveptr; if (parsedUri == NULL || *parsedUri != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -184,26 +183,13 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) } } - /* Expected format: [/]<datacenter>/<computeresource>[/<hostsystem>] */ if (uri->path != NULL) { - tmp = strdup(uri->path); + (*parsedUri)->path = strdup(uri->path); - if (tmp == NULL) { + if ((*parsedUri)->path == NULL) { virReportOOMError(); goto cleanup; } - - if (esxVI_String_DeepCopyValue(&(*parsedUri)->path_datacenter, - strtok_r(tmp, "/", &saveptr)) < 0 || - esxVI_String_DeepCopyValue(&(*parsedUri)->path_computeResource, - strtok_r(NULL, "/", &saveptr)) < 0 || - esxVI_String_DeepCopyValue(&(*parsedUri)->path_hostSystem, - strtok_r(NULL, "", &saveptr)) < 0) { - VIR_FREE(tmp); - goto cleanup; - } - - VIR_FREE(tmp); } if ((*parsedUri)->transport == NULL) { @@ -242,9 +228,7 @@ esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri) VIR_FREE((*parsedUri)->transport); VIR_FREE((*parsedUri)->vCenter); VIR_FREE((*parsedUri)->proxy_hostname); - VIR_FREE((*parsedUri)->path_datacenter); - VIR_FREE((*parsedUri)->path_computeResource); - VIR_FREE((*parsedUri)->path_hostSystem); + VIR_FREE((*parsedUri)->path); VIR_FREE(*parsedUri); } diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 39fdb6d..8d172e1 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -37,9 +37,7 @@ struct _esxUtil_ParsedUri { int proxy_type; char *proxy_hostname; int proxy_port; - char *path_datacenter; - char *path_computeResource; - char *path_hostSystem; + char *path; }; int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 87ae802..314f322 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -616,8 +616,11 @@ ESX_VI__TEMPLATE__FREE(Context, esxVI_UserSession_Free(&item->session); VIR_FREE(item->sessionLock); esxVI_Datacenter_Free(&item->datacenter); + VIR_FREE(item->datacenterPath); esxVI_ComputeResource_Free(&item->computeResource); + VIR_FREE(item->computeResourcePath); esxVI_HostSystem_Free(&item->hostSystem); + VIR_FREE(item->hostSystemName); esxVI_SelectionSpec_Free(&item->selectSet_folderToChildEntity); esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToParent); esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToVm); @@ -789,21 +792,25 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, } int -esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, - esxUtil_ParsedUri *parsedUri) +esxVI_Context_LookupManagedObjects(esxVI_Context *ctx) { - char *hostSystemName = NULL; /* Lookup Datacenter */ - if (esxVI_LookupDatacenter(ctx, parsedUri->path_datacenter, - ctx->service->rootFolder, NULL, &ctx->datacenter, + if (esxVI_LookupDatacenter(ctx, NULL, ctx->service->rootFolder, NULL, + &ctx->datacenter, esxVI_Occurrence_RequiredItem) < 0) { return -1; } + ctx->datacenterPath = strdup(ctx->datacenter->name); + + if (ctx->datacenterPath == NULL) { + virReportOOMError(); + return -1; + } + /* Lookup (Cluster)ComputeResource */ - if (esxVI_LookupComputeResource(ctx, parsedUri->path_computeResource, - ctx->datacenter->hostFolder, NULL, - &ctx->computeResource, + if (esxVI_LookupComputeResource(ctx, NULL, ctx->datacenter->hostFolder, + NULL, &ctx->computeResource, esxVI_Occurrence_RequiredItem) < 0) { return -1; } @@ -814,38 +821,240 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, return -1; } + ctx->computeResourcePath = strdup(ctx->computeResource->name); + + if (ctx->computeResourcePath == NULL) { + virReportOOMError(); + return -1; + } + /* Lookup HostSystem */ - if (parsedUri->path_hostSystem == NULL && - STREQ(ctx->computeResource->_reference->type, - "ClusterComputeResource")) { - ESX_VI_ERROR(VIR_ERR_INVALID_ARG, "%s", - _("Path has to specify the host system")); + if (esxVI_LookupHostSystem(ctx, NULL, ctx->computeResource->_reference, + NULL, &ctx->hostSystem, + esxVI_Occurrence_RequiredItem) < 0) { return -1; } - if (parsedUri->path_hostSystem != NULL || - (parsedUri->path_computeResource != NULL && - parsedUri->path_hostSystem == NULL)) { - if (parsedUri->path_hostSystem != NULL) { - hostSystemName = parsedUri->path_hostSystem; + ctx->hostSystemName = strdup(ctx->hostSystem->name); + + if (ctx->hostSystemName == NULL) { + virReportOOMError(); + return -1; + } + + return 0; +} + +int +esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) +{ + int result = -1; + char *tmp = NULL; + char *saveptr = NULL; + char *previousItem = NULL; + char *item = NULL; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + esxVI_ManagedObjectReference *root = NULL; + esxVI_Folder *folder = NULL; + + tmp = strdup(path); + + if (tmp == NULL) { + virReportOOMError(); + goto cleanup; + } + + /* Lookup Datacenter */ + item = strtok_r(tmp, "/", &saveptr); + + if (item == NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' does not specify a datacenter"), path); + goto cleanup; + } + + root = ctx->service->rootFolder; + + while (ctx->datacenter == NULL && item != NULL) { + esxVI_Folder_Free(&folder); + + /* Try to lookup item as a folder */ + if (esxVI_LookupFolder(ctx, item, root, NULL, &folder, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (folder != NULL) { + /* It's a folder, use it as new lookup root */ + if (root != ctx->service->rootFolder) { + esxVI_ManagedObjectReference_Free(&root); + } + + root = folder->_reference; + folder->_reference = NULL; + } else { + /* Try to lookup item as a datacenter */ + if (esxVI_LookupDatacenter(ctx, item, root, NULL, &ctx->datacenter, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + } + + /* Build path_datacenter */ + if (virBufferUse(&buffer) > 0) { + virBufferAddChar(&buffer, '/'); + } + + virBufferAdd(&buffer, item, -1); + + previousItem = item; + item = strtok_r(NULL, "/", &saveptr); + } + + if (ctx->datacenter == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datacenter specified in '%s'"), path); + goto cleanup; + } + + if (virBufferError(&buffer)) { + virReportOOMError(); + goto cleanup; + } + + ctx->datacenterPath = virBufferContentAndReset(&buffer); + + /* Lookup (Cluster)ComputeResource */ + if (item == NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' does not specify a compute resource"), path); + goto cleanup; + } + + if (root != ctx->service->rootFolder) { + esxVI_ManagedObjectReference_Free(&root); + } + + root = ctx->datacenter->hostFolder; + + while (ctx->computeResource == NULL && item != NULL) { + esxVI_Folder_Free(&folder); + + /* Try to lookup item as a folder */ + if (esxVI_LookupFolder(ctx, item, root, NULL, &folder, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (folder != NULL) { + /* It's a folder, use it as new lookup root */ + if (root != ctx->datacenter->hostFolder) { + esxVI_ManagedObjectReference_Free(&root); + } + + root = folder->_reference; + folder->_reference = NULL; } else { - hostSystemName = parsedUri->path_computeResource; + /* Try to lookup item as a compute resource */ + if (esxVI_LookupComputeResource(ctx, item, root, NULL, + &ctx->computeResource, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + } + + /* Build path_computeResource */ + if (virBufferUse(&buffer) > 0) { + virBufferAddChar(&buffer, '/'); + } + + virBufferAdd(&buffer, item, -1); + + previousItem = item; + item = strtok_r(NULL, "/", &saveptr); + } + + if (ctx->computeResource == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find compute resource specified in '%s'"), + path); + goto cleanup; + } + + if (ctx->computeResource->resourcePool == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve resource pool")); + goto cleanup; + } + + if (virBufferError(&buffer)) { + virReportOOMError(); + goto cleanup; + } + + ctx->computeResourcePath = virBufferContentAndReset(&buffer); + + /* Lookup HostSystem */ + if (STREQ(ctx->computeResource->_reference->type, + "ClusterComputeResource")) { + if (item == NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' does not specify a host system"), path); + goto cleanup; } + + /* The path specified a cluster, it has to specify a host system too */ + previousItem = item; + item = strtok_r(NULL, "/", &saveptr); + } + + if (item != NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' ends with an excess item"), path); + goto cleanup; } - if (esxVI_LookupHostSystem(ctx, hostSystemName, + ctx->hostSystemName = strdup(previousItem); + + if (ctx->hostSystemName == NULL) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupHostSystem(ctx, ctx->hostSystemName, ctx->computeResource->_reference, NULL, &ctx->hostSystem, - esxVI_Occurrence_RequiredItem) < 0) { - return -1; + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; } - return 0; + if (ctx->hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find host system specified in '%s'"), path); + goto cleanup; + } + + result = 0; + + cleanup: + if (result < 0) { + virBufferFreeAndReset(&buffer); + } + + if (root != ctx->service->rootFolder && + (ctx->datacenter == NULL || root != ctx->datacenter->hostFolder)) { + esxVI_ManagedObjectReference_Free(&root); + } + + VIR_FREE(tmp); + esxVI_Folder_Free(&folder); + + return result; } int -esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, - const char *hostSystemIpAddress) +esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx, + const char *hostSystemIpAddress) { int result = -1; esxVI_ManagedObjectReference *managedObjectReference = NULL; @@ -1491,8 +1700,7 @@ esxVI_BuildSelectSetCollection(esxVI_Context *ctx) /* Folder -> childEntity (ManagedEntity) */ if (esxVI_BuildSelectSet(&ctx->selectSet_folderToChildEntity, "folderToChildEntity", - "Folder", "childEntity", - "folderToChildEntity\0") < 0) { + "Folder", "childEntity", NULL) < 0) { return -1; } @@ -1689,9 +1897,10 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, objectSpec->obj = root; objectSpec->skip = esxVI_Boolean_False; - if (STRNEQ(root->type, type)) { + if (STRNEQ(root->type, type) || STREQ(root->type, "Folder")) { if (STREQ(root->type, "Folder")) { - if (STREQ(type, "Datacenter") || STREQ(type, "ComputeResource") || + if (STREQ(type, "Folder") || STREQ(type, "Datacenter") || + STREQ(type, "ComputeResource") || STREQ(type, "ClusterComputeResource")) { objectSpec->selectSet = ctx->selectSet_folderToChildEntity; } else { diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 0b3f889..78d3986 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -204,8 +204,11 @@ struct _esxVI_Context { esxVI_UserSession *session; /* ... except the session ... */ virMutexPtr sessionLock; /* ... that is protected by this mutex */ esxVI_Datacenter *datacenter; + char *datacenterPath; /* including folders */ esxVI_ComputeResource *computeResource; + char *computeResourcePath; /* including folders */ esxVI_HostSystem *hostSystem; + char *hostSystemName; esxVI_SelectionSpec *selectSet_folderToChildEntity; esxVI_SelectionSpec *selectSet_hostSystemToParent; esxVI_SelectionSpec *selectSet_hostSystemToVm; @@ -221,10 +224,10 @@ void esxVI_Context_Free(esxVI_Context **ctx); int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress, const char *url, const char *username, const char *password, esxUtil_ParsedUri *parsedUri); -int esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, - esxUtil_ParsedUri *parsedUri); -int esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, - const char *hostSystemIpAddress); +int esxVI_Context_LookupManagedObjects(esxVI_Context *ctx); +int esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path); +int esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx, + const char *hostSystemIpAddress); int esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, const char *request, esxVI_Response **response, esxVI_Occurrence occurrence); diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 361a6e7..1a67a8c 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -755,6 +755,10 @@ managed object Datacenter extends ManagedEntity end +managed object Folder extends ManagedEntity +end + + managed object HostSystem extends ManagedEntity HostConfigManager configManager r end -- 1.7.4.1

2 2

[libvirt] [PATCH] esx: Support vSphere 5.x
by Patrice LACHANCE 01 Nov '11

01 Nov '11

Hello Based on http://www.redhat.com/archives/libvir-list/2010-July/msg00480.html, I created this quick patch to accept connection to vSphere 5.x Notes: - I had to remove the warnings for version > 4.1 & 5 because they were generating errors when running scripts encapsulating virsh commands with opennebula. A better option might be to relie on an environment variable (for example DONT_BLAME_LIBVIRT!) to toggle warnings on/off - Ran only a few tests but it works as expected. - Next steps should be to work on VMware API 5. integration Patrice diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 41086ef..78872d4 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -730,9 +730,11 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, if (priv->host->productVersion != esxVI_ProductVersion_ESX35 && priv->host->productVersion != esxVI_ProductVersion_ESX40 && priv->host->productVersion != esxVI_ProductVersion_ESX41 && - priv->host->productVersion != esxVI_ProductVersion_ESX4x) { + priv->host->productVersion != esxVI_ProductVersion_ESX4x && + priv->host->productVersion != esxVI_ProductVersion_ESX50 && + priv->host->productVersion != esxVI_ProductVersion_ESX5x) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("%s is neither an ESX 3.5 host nor an ESX 4.x host"), + _("%s is neither an ESX 3.5, 4.x nor 5.x host"), hostname); goto cleanup; } @@ -857,10 +859,11 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, if (priv->vCenter->productVersion != esxVI_ProductVersion_VPX25 && priv->vCenter->productVersion != esxVI_ProductVersion_VPX40 && priv->vCenter->productVersion != esxVI_ProductVersion_VPX41 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x) { + priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x && + priv->vCenter->productVersion != esxVI_ProductVersion_VPX50 && + priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("%s is neither a vCenter 2.5 server nor a vCenter " - "4.x server"), hostname); + _("%s is neither a vCenter 2.5, 4.x nor 5.x server"), hostname); goto cleanup; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 325157c..3a11116 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -675,9 +675,23 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, VIR_WARN("Found untested VI API major/minor version '%s'", ctx->service->about->apiVersion); + } else if (STRPREFIX(ctx->service->about->apiVersion, "5.0")) { + ctx->apiVersion = esxVI_APIVersion_50; + + /* + VIR_WARN("Found untested VI API major/minor version '%s'", + ctx->service->about->apiVersion); + */ + } else if (STRPREFIX(ctx->service->about->apiVersion, "5.")) { + ctx->apiVersion = esxVI_APIVersion_5x; + + /* + VIR_WARN("Found untested VI API major/minor version '%s'", + ctx->service->about->apiVersion); + */ } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VI API major/minor version '2.5' or '4.x' " + _("Expecting VI API major/minor version '2.5', '4.x' or '5.x' " "but found '%s'"), ctx->service->about->apiVersion); return -1; } @@ -704,10 +718,24 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, VIR_WARN("Found untested ESX major/minor version '%s'", ctx->service->about->version); + } else if (STRPREFIX(ctx->service->about->version, "5.0")) { + ctx->productVersion = esxVI_ProductVersion_ESX50; + + /* + VIR_WARN("Found untested ESX major/minor version '%s'", + ctx->service->about->version); + */ + } else if (STRPREFIX(ctx->service->about->version, "5.")) { + ctx->productVersion = esxVI_ProductVersion_ESX5x; + + /* + VIR_WARN("Found untested ESX major/minor version '%s'", + ctx->service->about->version); + */ } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting ESX major/minor version '3.5' or " - "'4.x' but found '%s'"), + _("Expecting ESX major/minor version '3.5', '4.x' or " + "'5.x' but found '%s'"), ctx->service->about->version); return -1; } @@ -723,9 +751,23 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, VIR_WARN("Found untested VPX major/minor version '%s'", ctx->service->about->version); + } else if (STRPREFIX(ctx->service->about->version, "5.0")) { + ctx->productVersion = esxVI_ProductVersion_VPX50; + + /* + VIR_WARN("Found untested VPX major/minor version '%s'", + ctx->service->about->version); + */ + } else if (STRPREFIX(ctx->service->about->version, "5.")) { + ctx->productVersion = esxVI_ProductVersion_VPX5x; + + /* + VIR_WARN("Found untested VPX major/minor version '%s'", + ctx->service->about->version); + */ } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VPX major/minor version '2.5' or '4.x' " + _("Expecting VPX major/minor version '2.5', '4.x' or '5.x' " "but found '%s'"), ctx->service->about->version); return -1; } @@ -3919,6 +3961,12 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersio case esxVI_ProductVersion_VPX4x: return 7; + case esxVI_ProductVersion_ESX50: + case esxVI_ProductVersion_VPX50: + case esxVI_ProductVersion_ESX5x: + case esxVI_ProductVersion_VPX5x: + return 8; + default: ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected product version")); diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index b8e921f..fbf3fb2 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -99,7 +99,9 @@ enum _esxVI_APIVersion { esxVI_APIVersion_25, esxVI_APIVersion_40, esxVI_APIVersion_41, - esxVI_APIVersion_4x /* > 4.1 */ + esxVI_APIVersion_4x, + esxVI_APIVersion_50, + esxVI_APIVersion_5x /* > 5.0 */ }; /* @@ -116,13 +118,17 @@ enum _esxVI_ProductVersion { esxVI_ProductVersion_ESX35 = esxVI_ProductVersion_ESX | 1, esxVI_ProductVersion_ESX40 = esxVI_ProductVersion_ESX | 2, esxVI_ProductVersion_ESX41 = esxVI_ProductVersion_ESX | 3, - esxVI_ProductVersion_ESX4x = esxVI_ProductVersion_ESX | 4, /* > 4.1 */ + esxVI_ProductVersion_ESX4x = esxVI_ProductVersion_ESX | 4, + esxVI_ProductVersion_ESX50 = esxVI_ProductVersion_ESX | 5, + esxVI_ProductVersion_ESX5x = esxVI_ProductVersion_ESX | 6, /* > 5.0 */ esxVI_ProductVersion_VPX = (1 << 2) << 16, esxVI_ProductVersion_VPX25 = esxVI_ProductVersion_VPX | 1, esxVI_ProductVersion_VPX40 = esxVI_ProductVersion_VPX | 2, esxVI_ProductVersion_VPX41 = esxVI_ProductVersion_VPX | 3, - esxVI_ProductVersion_VPX4x = esxVI_ProductVersion_VPX | 4 /* > 4.1 */ + esxVI_ProductVersion_VPX4x = esxVI_ProductVersion_VPX | 4, + esxVI_ProductVersion_VPX50 = esxVI_ProductVersion_VPX | 5, + esxVI_ProductVersion_VPX5x = esxVI_ProductVersion_VPX | 6 /* > 5.0 */ }; enum _esxVI_Occurrence {

2 1

[libvirt] [PATCH v3] Fix URI alias prefix matching
by Wen Ruo Lv 01 Nov '11

01 Nov '11

with /etc/libvirt/libvirt.conf below: uri_aliases = [ "hail=qemu:///system", "sleet=qemu+ssh://root 9 115 122 57/system", "sam=qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock", ] Neither "virsh -c hailly" nor "hai" should result in matching "hail=qemu:///system" Fix URI alias prefix matching when connecting Signed-off-by: Wen Ruo Lv <lvroyce(a)linux.vnet.ibm.com> --- src/libvirt.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e9d1a29..6f8a76f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -990,6 +990,8 @@ static int virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char **uri) { virConfValuePtr entry; + size_t alias_len; + if (value->type != VIR_CONF_LIST) { virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("Expected a list for 'uri_aliases' config parameter")); @@ -997,6 +999,7 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char * } entry = value->list; + alias_len = strlen(alias); while (entry) { char *offset; size_t safe; @@ -1022,7 +1025,8 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char * return -1; } - if (STREQLEN(entry->str, alias, offset-entry->str)) { + if (alias_len == (offset - entry->str) && + STREQLEN(entry->str, alias, alias_len)) { VIR_DEBUG("Resolved alias '%s' to '%s'", alias, offset+1); if (!(*uri = strdup(offset+1))) { -- 1.7.4.1

3 2

Re: [libvirt] [libvirt-users] Error on the site
by Eric Blake 01 Nov '11

01 Nov '11

On 11/01/2011 01:15 AM, Alexander Biryukov wrote: > Good afternoon. > I apologize for my English. > > Error on page: http://libvirt.org/formatdomain.html > To be more precise in the line "<target *def*='hdc' bus='ide'/>" Thanks; I'm pushing this as the trivial fix: diff --git i/docs/formatdomain.html.in w/docs/formatdomain.html.in index 4fb5829..c3e7752 100644 --- i/docs/formatdomain.html.in +++ w/docs/formatdomain.html.in @@ -925,7 +925,7 @@ </disk> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> - <target def='hdc' bus='ide'/> + <target dev='hdc' bus='ide'/> <readonly/> </disk> </devices> -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] Don't overwrite error message during VM cleanup
by Daniel P. Berrange 01 Nov '11

01 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> If an LXC VM fails to start, quite a few cleanup paths will result in the original error message being overwritten. Some other cleanup paths also forgot to actually terminate the VM. * src/lxc/lxc_driver.c: Ensure VM is terminated on startup failure and preserve original error --- src/lxc/lxc_driver.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 23efe1e..eabc1fb 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1622,6 +1622,7 @@ static int lxcVmStart(virConnectPtr conn, char *timestamp; virCommandPtr cmd = NULL; lxcDomainObjPrivatePtr priv = vm->privateData; + virErrorPtr err = NULL; if (!lxc_driver->cgroup) { lxcError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1753,8 +1754,7 @@ static int lxcVmStart(virConnectPtr conn, _("guest failed to start: %s"), out); } - lxcVmTerminate(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); - goto cleanup; + goto error; } if ((priv->monitorWatch = virEventAddHandle( @@ -1762,31 +1762,33 @@ static int lxcVmStart(virConnectPtr conn, VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP, lxcMonitorEvent, vm, NULL)) < 0) { - lxcVmTerminate(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); - goto cleanup; + goto error; } if (autoDestroy && lxcProcessAutoDestroyAdd(driver, vm, conn) < 0) - goto cleanup; + goto error; /* * Again, need to save the live configuration, because the function * requires vm->def->id != -1 to save tty info surely. */ if (virDomainSaveConfig(driver->stateDir, vm->def) < 0) - goto cleanup; + goto error; if (virDomainObjSetDefTransient(driver->caps, vm, false) < 0) - goto cleanup; + goto error; /* Write domain status to disk. */ if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) - goto cleanup; + goto error; rc = 0; cleanup: + if (rc != 0 && !err) + err = virSaveLastError(); + VIR_WARN("Cleanup %s" , err && err->message ? err->message : NULL); virCommandFree(cmd); if (VIR_CLOSE(logfd) < 0) { virReportSystemError(errno, "%s", _("could not close logfile")); @@ -1805,7 +1807,18 @@ cleanup: VIR_FORCE_CLOSE(handshakefds[0]); VIR_FORCE_CLOSE(handshakefds[1]); VIR_FREE(logfile); + + if (err) { + virSetError(err); + virResetError(err); + } + return rc; + +error: + err = virSaveLastError(); + lxcVmTerminate(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + goto cleanup; } /** -- 1.7.6.4

2 1

[libvirt] [PATCH] Add support for probing filesystem with libblkid
by Daniel P. Berrange 01 Nov '11

01 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The LXC code for mounting container filesystems from block devices tries all filesystems in /etc/filesystems and possibly those in /proc/filesystems. The regular mount binary, however, first tries using libblkid to detect the format. Add support for doing the same in libvirt, since Fedora's /etc/filesystems is missing many formats, most notably ext4 which is the default filesystem Fedora uses! * src/Makefile.am: Link libvirt_lxc to libblkid * src/lxc/lxc_container.c: Probe filesystem format with liblkid --- src/Makefile.am | 4 ++ src/lxc/lxc_container.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 105 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c36664b..bf26b19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1495,6 +1495,10 @@ libvirt_lxc_CFLAGS = \ $(AUDIT_CFLAGS) \ -I@top_srcdir@/src/conf \ $(AM_CFLAGS) +if HAVE_LIBBLKID +libvirt_lxc_CFLAGS += $(BLKID_CFLAGS) +libvirt_lxc_LDADD += $(BLKID_LIBS) +endif endif endif EXTRA_DIST += $(LXC_CONTROLLER_SOURCES) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 36ac3a9..647aaea 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -47,6 +47,10 @@ # include <cap-ng.h> #endif +#if HAVE_LIBBLKID +# include <blkid/blkid.h> +#endif + #include "virterror_internal.h" #include "logging.h" #include "lxc_container.h" @@ -627,6 +631,86 @@ cleanup: } +#ifdef HAVE_LIBBLKID +static int +lxcContainerMountDetectFilesystem(const char *src, char **type) +{ + int fd; + int ret = -1; + int rc; + const char *data = NULL; + blkid_probe blkid = NULL; + + *type = NULL; + + if ((fd = open(src, O_RDONLY)) < 0) { + virReportSystemError(errno, + _("Unable to open filesystem %s"), src); + return -1; + } + + if (!(blkid = blkid_new_probe())) { + virReportSystemError(errno, "%s", + _("Unable to create blkid library handle")); + goto cleanup; + } + if (blkid_probe_set_device(blkid, fd, 0, 0) < 0) { + virReportSystemError(EINVAL, + _("Unable to associated device %s with blkid library"), + src); + goto cleanup; + } + + blkid_probe_enable_superblocks(blkid, 1); + + blkid_probe_set_superblocks_flags(blkid, BLKID_SUBLKS_TYPE); + + rc = blkid_do_safeprobe(blkid); + if (rc != 0) { + if (rc == 1) /* Nothing found, return success with *type == NULL */ + goto done; + + if (rc == -2) { + virReportSystemError(EINVAL, + _("Too many filesystems detected for %s"), + src); + } else { + virReportSystemError(errno, + _("Unable to detect filesystem for %s"), + src); + } + goto cleanup; + } + + if (blkid_probe_lookup_value(blkid, "TYPE", &data, NULL) < 0) { + virReportSystemError(ENOENT, + _("Unable to find filesystem type for %s"), + src); + goto cleanup; + } + + if (!(*type = strdup(data))) { + virReportOOMError(); + goto cleanup; + } + +done: + ret = 0; +cleanup: + VIR_FORCE_CLOSE(fd); + blkid_free_probe(blkid); + return ret; +} +#else /* ! HAVE_LIBBLKID */ +static int +lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED, + char **type) +{ + /* No libblkid, so just return success with no detected type */ + *type = NULL; + return 0; +} +#endif /* ! HAVE_LIBBLKID */ /* * This functions attempts to do automatic detection of filesystem @@ -771,6 +855,8 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, { int fsflags = 0; int ret = -1; + char *format = NULL; + if (fs->readonly) fsflags |= MS_RDONLY; @@ -781,7 +867,21 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, goto cleanup; } - ret = lxcContainerMountFSBlockAuto(fs, fsflags, src, srcprefix); + if (lxcContainerMountDetectFilesystem(src, &format) < 0) + goto cleanup; + + if (format) { + VIR_DEBUG("Mount %s with detected format %s", src, format); + if (mount(src, fs->dst, format, fsflags, NULL) < 0) { + virReportSystemError(errno, + _("Failed to mount device %s to %s as %s"), + src, fs->dst, format); + goto cleanup; + } + ret = 0; + } else { + ret = lxcContainerMountFSBlockAuto(fs, fsflags, src, srcprefix); + } cleanup: return ret; -- 1.7.6.4

2 2

[libvirt] [PATCH] Fix error message when failing to detect filesystem
by Daniel P. Berrange 01 Nov '11

01 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> If we looped through /etc/filesystems trying to mount with each type and failed all options, we forget to actually raise an error message. * src/lxc/lxc_container.c: Raise error if unable to detect the filesystems. Also fix existing error message --- src/lxc/lxc_container.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index fbd5267..36ac3a9 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -725,7 +725,7 @@ retry: continue; virReportSystemError(errno, - _("Failed to bind mount directory %s to %s"), + _("Failed to mount device %s to %s"), src, fs->dst); goto cleanup; } @@ -746,6 +746,12 @@ retry: goto retry; } + if (ret != 0) { + virReportSystemError(ENODEV, + _("Failed to mount device %s to %s, unable to detect filesystem"), + src, fs->dst); + } + VIR_DEBUG("Done mounting filesystem ret=%d tryProc=%d", ret, tryProc); cleanup: -- 1.7.6.4

3 2

[libvirt] [PATCH] ServerClient: Flush SASL data
by Michal Privoznik 01 Nov '11

01 Nov '11

If daemon is using SASL it reads client data into a cache. This cache is big (usually 65KB) and can thus contain 2 or more messages. However, on socket event we can dispatch only one message. So if we read two messages at once, the second will not be dispatched as the socket event goes away with filling the cache. Moreover, when dispatching the cache we need to remember to take care of client max requests limit. --- src/rpc/virnetserverclient.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 1256f0f..69af746 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -71,6 +71,8 @@ struct _virNetServerClient virNetTLSSessionPtr tls; #if HAVE_SASL virNetSASLSessionPtr sasl; + int sasl_timer; /* Timer to be fired upon cached data, + so we jump out from poll() immediately */ #endif /* Count of messages in the 'tx' queue, @@ -103,6 +105,7 @@ struct _virNetServerClient static void virNetServerClientDispatchEvent(virNetSocketPtr sock, int events, void *opaque); static void virNetServerClientUpdateEvent(virNetServerClientPtr client); +static void virNetServerClientDispatchRead(virNetServerClientPtr client); static void virNetServerClientLock(virNetServerClientPtr client) { @@ -191,6 +194,19 @@ static int virNetServerClientRegisterEvent(virNetServerClientPtr client) return 0; } +static void virNetServerClientDispatchReadTimerFunc(int timer, + void *opaque) +{ + virNetServerClientPtr client = opaque; + virNetServerClientLock(client); + virEventUpdateTimeout(timer, -1); + /* Even if this timer is enabled iff client->rx != NULL, + * but meanwhile client was unlocked, so it might have changed */ + if (client->rx) + virNetServerClientDispatchRead(client); + virNetServerClientUnlock(client); +} + /* * @client: a locked client object */ @@ -204,6 +220,19 @@ static void virNetServerClientUpdateEvent(virNetServerClientPtr client) mode = virNetServerClientCalculateHandleMode(client); virNetSocketUpdateIOCallback(client->sock, mode); +#ifdef HAVE_SASL + if (client->nrequests < client->nrequests_max && + client->rx && + virNetSocketHasCachedData(client->sock)) { + if (client->sasl_timer) + virEventUpdateTimeout(client->sasl_timer, 0); + else + client->sasl_timer = virEventAddTimeout(0, + virNetServerClientDispatchReadTimerFunc, + client, + NULL); + } +#endif } @@ -556,6 +585,8 @@ void virNetServerClientFree(virNetServerClientPtr client) VIR_FREE(client->identity); #if HAVE_SASL virNetSASLSessionFree(client->sasl); + if (client->sasl_timer) + virEventRemoveTimeout(client->sasl_timer); #endif virNetTLSSessionFree(client->tls); virNetTLSContextFree(client->tlsCtxt); @@ -990,7 +1021,8 @@ virNetServerClientDispatchEvent(virNetSocketPtr sock, int events, void *opaque) } else { if (events & VIR_EVENT_HANDLE_WRITABLE) virNetServerClientDispatchWrite(client); - if (events & VIR_EVENT_HANDLE_READABLE) + if (events & VIR_EVENT_HANDLE_READABLE && + client->rx) virNetServerClientDispatchRead(client); } } -- 1.7.3.4

3 5