- Devel - libvirt List Archives

[libvirt] [PATCH]util: Helper function for checking existence of hook files for specific driver
by Chen Hanxiao 25 Sep '13

25 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We refresh the status of hook scripts only when start/restart libvirt or reloads its configuration. But hooks scripts may be changed. This function will help to check its existence. And we do not need to start/restart libvirt if we add/remove hook files. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/util/virhook.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/util/virhook.c b/src/util/virhook.c index 159efdb..c4a1a15 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -129,6 +129,12 @@ virHookCheck(int no, const char *driver) { return ret; } +static int +virHookDriverCheck(int driver) { + return virHookCheck(driver, + virHookDriverTypeToString(driver)); +} + /* * virHookInitialize: * @@ -170,11 +176,12 @@ virHookPresent(int driver) { if ((driver < VIR_HOOK_DRIVER_DAEMON) || (driver >= VIR_HOOK_DRIVER_LAST)) return 0; - if (virHooksFound == -1) + if (virHookDriverCheck(driver) != 1) { + VIR_DEBUG("Driver %s hooks files not found", + virHookDriverTypeToString(driver)); return 0; + } - if ((virHooksFound & (1 << driver)) == 0) - return 0; return 1; } -- 1.8.2.1

2 1

[libvirt] [PATCH v3 0/4] don't masquerade local broadcast/multicast packets
by Laszlo Ersek 25 Sep '13

25 Sep '13

Masquerading local broadcast breaks DHCP replies for some clients. There has been a report about broken local multicast too. (See references in the patches.) Regarding multicast, right now the series disables masquerading for the most restrictive local multicast range only. v2->v3 changes: - Rename iptables(Add|Remove)ForwardDontMasquerade to iptables(Add|Remove)DontMasquerade [Laine]. - Pass (address, prefix) pairs as both source and destination parameters to these functions. - Introduce virPfxSocketAddr structure for simpler handling of said (address, prefix) pairs. - Also prevent masquerading of directed broadcast [Laine]. - Start to get serious about pointers-to-const. Testing: - "make check" and "make syntax-check" pass, - thanks to the great docs on libvirt.org (compiling & deployment) I even managed to test this on my RHEL-6 laptop, with repeated net-start / net-destroy commands. Chain POSTROUTING (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination 0 0 RETURN all -- * * 192.168.122.0/24 224.0.0.0/24 0 0 RETURN all -- * * 192.168.122.0/24 192.168.122.255 0 0 RETURN all -- * * 192.168.122.0/24 255.255.255.255 0 0 MASQUERADE tcp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 0 0 MASQUERADE udp -- * * 192.168.122.0/24 !192.168.122.0/24 masq ports: 1024-65535 0 0 MASQUERADE all -- * * 192.168.122.0/24 !192.168.122.0/24 Laszlo Ersek (4): iptablesFormatNetwork(): constify target of "netaddr" parameter util/viriptables: add/remove rules that short-circuit masquerading virSocketAddrBroadcastByPrefix(): constify target of "addr" parameter bridge driver: don't masquerade local subnet broadcast/multicast packets src/util/viriptables.h | 11 +++ src/util/virsocketaddr.h | 8 +- src/network/bridge_driver_linux.c | 151 +++++++++++++++++++++++++++++++++++++- src/util/viriptables.c | 84 ++++++++++++++++++++- src/util/virsocketaddr.c | 8 +- src/libvirt_private.syms | 2 + 6 files changed, 251 insertions(+), 13 deletions(-) -- 1.8.3.1

5 20

[libvirt] [PATCH]util: Refresh virHook before checking its existence
by Chen Hanxiao 25 Sep '13

25 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We refresh the status of hook scripts only when start/stop libvirt, or reload its configuration. But the status of hooks scripts may be changed. We need to refresh its status before checking its existence. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/util/virhook.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/util/virhook.c b/src/util/virhook.c index 159efdb..5500f62 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -170,11 +170,15 @@ virHookPresent(int driver) { if ((driver < VIR_HOOK_DRIVER_DAEMON) || (driver >= VIR_HOOK_DRIVER_LAST)) return 0; - if (virHooksFound == -1) - return 0; + if (virHookInitialize() > 0) { + if (virHooksFound == -1) + return 0; - if ((virHooksFound & (1 << driver)) == 0) + if ((virHooksFound & (1 << driver)) == 0) + return 0; + } else { return 0; + } return 1; } -- 1.8.2.1

2 1

Re: [libvirt] virDomainGetInfo() returns wrong domain state
by Panday Ritesh Sharma (rpanday) 25 Sep '13

25 Sep '13

Hi Libvirt support team, Could you please help me with below query. Regards Ritesh Sharma From: Panday Ritesh Sharma (rpanday) Sent: Tuesday, September 24, 2013 8:22 PM To: 'libvir-list(a)redhat.com'; 'libvirt-users(a)redhat.com'; Vinay Shankarkumar (vinays) Cc: Basavaraj Bendigeri (bbendige); q-se-dev(mailer list) Subject: virDomainGetInfo() returns wrong domain state Hi Team, I have written below code to get the VM state at run time. I found, though the VM is in shut-off state, when I use the function virDomainGetInfo(); I get state as running. Could you please let me know what wrong I am doing. To know the actual VM state I used 'virsh list' and it clearly shows the VM is in shut-off state. Please find the log and code snippet below. Log from virsh: ================= [host:~]$ virsh list --all Id Name State ---------------------------------------------------- 1 calvados running 2 LCXR running 3 default-sdr--1 running - test--2 shut off Out put: ========= 04.03.06.698923264:INFO: vm_libvirt_state_to_vmm_state: state returned is 1 Note : Here 1 is actually running. Code snippet: =============== enum cidl_vmm_vm_state vm_libvirt_state_to_vmm_state(unsigned char libvirt_state) { enum cidl_vmm_vm_state state; INFO("%s: state returned is %u\n",__FUNCTION__, libvirt_state); <<<<<<<<<<<<<<<<<< if (libvirt_state == VIR_DOMAIN_RUNNING) { state = cidl_vm_state_running; } else if ((libvirt_state == VIR_DOMAIN_PAUSED) || (libvirt_state == VIR_DOMAIN_BLOCKED)) { state = cidl_vm_state_paused; } else if (libvirt_state == VIR_DOMAIN_SHUTOFF) { state = cidl_vm_state_defined; } else { state = cidl_vm_state_not_defined; } return state; } virDomainInfo res_util; virDomainPtr dom = virDomainLookupByName(virt, private_names[vm_idx]); res = virDomainGetInfo(dom, &res_util); vminfo[vm_idx].vm_state = vm_libvirt_state_to_vmm_state(res_util.state); Regards Ritesh Sharma

1 0

[libvirt] bug. libvirt related to selinux.
by yue 25 Sep '13

25 Sep '13

hi,all when 'virsh start testname-1' failed, but i can start it throught commandline which is copy from libvirtd.log. selinux is disabled now. ---------------- libvirtError: internal error Process exited while reading console log output: char device redirected to /dev/pts/3 qemu-kvm: -drive file=/rhev/data-center/7828f2ae-955e-4e4b-a4bb-43807629dc52/d028d521-d4a9-4dd7-a0fe-3e9b60e7c4e4/images/ac025dc1-4e25-4b71-8c56-88dcb61b9f09/c1bfddb4-3562-4893-9df8-3f3239b277a9,if=none,id=drive-ide0-0-0,format=qcow2,serial=ac025dc1-4e25-4b71-8c56-88dcb61b9f09,cache=none,werror=stop,rerror=stop,aio=native: could not open disk image /rhev/data-center/7828f2ae-955e-4e4b-a4bb-43807629dc52/d028d521-d4a9-4dd7-a0fe-3e9b60e7c4e4/images/ac025dc1-4e25-4b71-8c56-88dcb61b9f09/c1bfddb4-3562-4893-9df8-3f3239b277a9: Operation not permitted audit.log type=VIRT_CONTROL msg=audit(1379810795.213:41569): user pid=1637 uid=0 auid=4294967295 ses=4294967295 subj=system_u:system_r:virtd_t:s0-s0:c0.c1023 msg='virt=kvm op=start reason=booted vm="testname-1" uuid=24f7e975-9aa5-4a14-b0f0-590add14c8b5 vm-pid=-1 exe="/usr/sbin/libvirtd" hostname=? addr=? terminal=? res=failed'

2 2

[libvirt] [PATCH v2 0/2] don't masquerade local broadcast/multicast packets
by Laszlo Ersek 24 Sep '13

24 Sep '13

Masquerading local broadcast breaks DHCP replies for some clients. There has been a report about broken local multicast too. (See references in the patches.) Testing: build tested the upstream series. Tested the RHEL-6.4.z and RHEL-7.0 backports with OVMF netboot on virbr0. Changes between v1 (at http://www.redhat.com/archives/libvir-list/2013-May/msg01872.html ) and v2: - forward-ported to current upstream master (commit 49a5262d). This includes conflict resolution for: commit 477a619e1b37694e3c59c0d6c84ede6d2e28b878 Author: Roman Bogorodskiy <bogorodskiy(a)gmail.com> Date: Fri Jun 28 00:52:30 2013 -0400 Drop iptablesContext in both patches #1 and #2, and for commit 4ac708f250867f65091a20b153c204862d389cb9 Author: Roman Bogorodskiy <bogorodskiy(a)gmail.com> Date: Wed Jul 24 16:22:54 2013 +0400 bridge driver: extract platform specifics in patch #2. Laszlo Ersek (2): util/viriptables: add/remove rules that short-circuit masquerading bridge driver: don't masquerade local subnet broadcast/multicast packets src/util/viriptables.h | 8 ++++ src/network/bridge_driver_linux.c | 70 +++++++++++++++++++++++++++++-- src/util/viriptables.c | 88 +++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 + 4 files changed, 164 insertions(+), 4 deletions(-) -- 1.8.3.1

3 11

[libvirt] [PATCH] Fix format specifier for OOM test fprintfs
by Daniel P. Berrange 24 Sep '13

24 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The testutils.c file had some fprintfs which had not been converted from %d to %zu, when 'testCounter' change to be a size_t. This was a build breaker if --enable-test-oom was enabled Pushed as a build fix Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/testutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index a215f3f..45882c5 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -717,9 +717,9 @@ int virtTestMain(int argc, approxAlloc = virAllocTestCount(); testCounter++; if (virTestGetDebug()) - fprintf(stderr, "%d) OOM...\n", testCounter); + fprintf(stderr, "%zu) OOM...\n", testCounter); else - fprintf(stderr, "%d) OOM of %d allocs ", testCounter, approxAlloc); + fprintf(stderr, "%zu) OOM of %d allocs ", testCounter, approxAlloc); if (mp) { size_t i; -- 1.8.3.1

1 0

[libvirt] [PATCH 0/4] Improve passthrough of early errors from qemu log
by Peter Krempa 24 Sep '13

24 Sep '13

Upgrade error messages in some cases of early failure. See 4/4 for better explanation. Peter Krempa (4): qemu_process: Make qemuProcessReadLog() more versatile and reusable qemu: monitor: Add infrastructure to access VM logs for better err msgs qemu: monitor: Produce better errors on monitor hangup qemu: Wire up better early error reporting src/qemu/qemu_monitor.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_process.c | 54 +++++++++++++++++++-------- src/qemu/qemu_process.h | 2 + 4 files changed, 133 insertions(+), 22 deletions(-) -- 1.8.3.2

2 10

[libvirt] [PATCHv2 0/3] Change preference of default PCI passthrough type to VFIO
by Peter Krempa 24 Sep '13

24 Sep '13

Peter Krempa (3): qemu: hostdev: Refactor PCI passhrough handling qemu: hostdev: Add checks if PCI passthrough is availabe in the host qemu: Prefer VFIO for PCI device passthrough docs/formatdomain.html.in | 9 ++- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 28 ++++++--- src/qemu/qemu_hostdev.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hostdev.h | 5 ++ src/qemu/qemu_hotplug.c | 29 ++++++---- src/qemu/qemu_process.c | 6 ++ tests/qemuxml2argvtest.c | 11 ++++ 8 files changed, 208 insertions(+), 25 deletions(-) -- 1.8.3.2

1 3

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 24 Sep '13

24 Sep '13

Since we're about to freeze, it's time to pick up the latest upstream gnulib. Among other changes, gnulib now guarantees the use of some -f flags that we were previously manually adding. * .gnulib: Update to latest, in part for warning improvements. * m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): Drop flags that are now guaranteed by gnulib. * bootstrap: Resync to gnulib. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under my gnulib maintenance rule. * .gnulib 0ba0877...4a5ee89 (31): > manywarnings: enable nicer gcc warning messages > timespec: use the new TIMESPEC_RESOLUTION in a few more places > warnings: port --enable-gcc-warnings to Solaris Studio 12.3 > configmake: support new --runstatedir option > ctype, string: depend on extern-inline > userspec: support optional parameters to parse_user_spec() > timespec: new function make_timespec, and new constants > stdio: OS X port of putc_unlocked + extern inline > signal: OS X port of sigaddset etc. + extern inline > extern-inline: do not always suppress extern inline on OS X > extern-inline: document fixes for ctype and wctype macros > fflush, freadahead, fseeko: Fix for Android > pmccabe2html: fix portability issues > getgroups: statement without effect > autoupdate > update from texinfo > update from texinfo > glob: fix compilation > glob: fix build for platforms without __THROW > autoupdate > regex-quote: fix buffer access out of bounds > glob: avoid -Wattribute warnings on glibc > headers: check that _GL_INLINE_HEADER_BEGIN is defined > bootstrap: remove the --version requirement from ancillary tools > gc: support HMAC-SHA256 and HMAC-SHA512. > gettext: update to version 0.18.3.1 > selinux-at: omit unnecessary include > autoupdate > d-ino: avoid false negative on symlink > update from texinfo > autoupdate .gnulib | 2 +- bootstrap | 19 +++++++++++-------- m4/virt-compile-warnings.m4 | 2 -- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gnulib b/.gnulib index 0ba0877..4a5ee89 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 0ba087759d2797c8f7d3c34bef6268ba3fd212cb +Subproject commit 4a5ee89c8a8be7350a8fd8ca1bacb196a190e492 diff --git a/bootstrap b/bootstrap index cc7fc1b..e31d17d 100755 --- a/bootstrap +++ b/bootstrap @@ -209,12 +209,16 @@ bootstrap_sync=false # Use git to update gnulib sources use_git=true +check_exists() { + ($1 --version </dev/null) >/dev/null 2>&1 + test $? -lt 126 +} + # find_tool ENVVAR NAMES... # ------------------------- # Search for a required program. Use the value of ENVVAR, if set, -# otherwise find the first of the NAMES that can be run (i.e., -# supports --version). If found, set ENVVAR to the program name, -# die otherwise. +# otherwise find the first of the NAMES that can be run. +# If found, set ENVVAR to the program name, die otherwise. # # FIXME: code duplication, see also gnu-web-doc-update. find_tool () @@ -225,7 +229,7 @@ find_tool () eval "find_tool_res=\$$find_tool_envvar" if test x"$find_tool_res" = x; then for i; do - if ($i --version </dev/null) >/dev/null 2>&1; then + if check_exists $i; then find_tool_res=$i break fi @@ -463,8 +467,7 @@ check_versions() { if [ "$req_ver" = "-" ]; then # Merely require app to exist; not all prereq apps are well-behaved # so we have to rely on $? rather than get_version. - $app --version >/dev/null 2>&1 </dev/null - if [ 126 -le $? ]; then + if ! check_exists $app; then warn_ "Error: '$app' not found" ret=1 fi @@ -551,10 +554,10 @@ fi echo "$0: Bootstrapping from checked-out $package sources..." # See if we can use gnulib's git-merge-changelog merge driver. -if $use_git && test -d .git && (git --version) >/dev/null 2>/dev/null ; then +if $use_git && test -d .git && check_exists git; then if git config merge.merge-changelog.driver >/dev/null ; then : - elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then + elif check_exists git-merge-changelog; then echo "$0: initializing git-merge-changelog driver" git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 938c8bb..8f905cc 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -187,8 +187,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ esac wantwarn="$wantwarn -fexceptions" wantwarn="$wantwarn -fasynchronous-unwind-tables" - wantwarn="$wantwarn -fdiagnostics-show-option" - wantwarn="$wantwarn -funit-at-a-time" # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure # fire even without -O. -- 1.8.3.1

1 0

[libvirt] [PATCH 0/2]
by Claudio Bley 24 Sep '13

24 Sep '13

Hi. I used the rawhide RPMs to take out the DLLs for a test drive on Windows 64bit the other day. While trying to read the "screenshot" from the test domain using the test:///default connection, I only received 5 Bytes of the libvirtLogo.png file. Looking at the test driver, the condition piqued my interest, but wasn't the cause of the short read, only a bit odd. See patch #1. The actual cause was that the file was opened in text mode and the seventh byte was a 0x1A which triggered EOF on the FD. See patch #2. Claudio Bley (2): test: fix call to virFDStreamOpenFile in testDomainScreenshot Always open files in binary mode in virFDStreamOpenFileInternal src/fdstream.c | 2 +- src/test/test_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.8.3.1

3 7

[libvirt] [PATCH] conf: Fix virNetworkAssignDef's comment.
by lawrancejing 24 Sep '13

24 Sep '13

--- src/conf/network_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 6968e25..c877a6d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -333,7 +333,7 @@ virNetworkObjAssignDef(virNetworkObjPtr network, * def. For an existing network, use "live" and current state of the * network to determine which to replace. * - * Returns -1 on failure, 0 on success. + * Returns NULL on error, virNetworkObjPtr on success. */ virNetworkObjPtr virNetworkAssignDef(virNetworkObjListPtr nets, -- 1.7.1

4 4

[libvirt] [PATCH 0/3] More OOM check fixes
by Daniel P. Berrange 24 Sep '13

24 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> More OOM fixes. These didn't cause crashes, rather invalid XML / cli arg generation. Daniel P. Berrange (3): Add missing check for OOM when building boot menu args Honour error returned by virBitmapFormat Check return value of virDomainControllerInsert when parsing QEMU args src/conf/domain_conf.h | 9 ++++++--- src/qemu/qemu_command.c | 38 ++++++++++++++++++++++---------------- 2 files changed, 28 insertions(+), 19 deletions(-) -- 1.8.3.1

2 4

[libvirt] [PATCH] Add --disable-securityfs configure option
by Bogdan Purcareata 24 Sep '13

24 Sep '13

Securityfs is not enabled on all kernels running libvirt containers. This patch introduces a configure option that can specify whether containers should mount securityfs in their rootfs. Signed-off-by: Bogdan Purcareata <bogdan.purcareata(a)freescale.com> --- configure.ac | 8 ++++++++ src/lxc/lxc_container.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index 553015a..b4351dd 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,14 @@ then [Extra package version]) fi +dnl Enable securityfs mounts if necessary +AC_ARG_ENABLE([securityfs], + AS_HELP_STRING([--disable-securityfs], [Disable mounting securityfs from container domains])) + +AS_IF([test "x$enable_securityfs" != "xno"],[ + AC_DEFINE_UNQUOTED([WITH_SECURITYFS],[],[Securityfs present]) + ]) + dnl Required minimum versions of all libs we depend on LIBXML_REQUIRED="2.6.0" GNUTLS_REQUIRED="1.0.25" diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c60f5d8..72f1e81 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -768,8 +768,10 @@ static const virLXCBasicMountInfo lxcBasicMounts[] = { { "/proc/sys", "/proc/sys", NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { "sysfs", "/sys", "sysfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, +#if WITH_SECURITYFS { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, +#endif #if WITH_SELINUX { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, @@ -872,8 +874,10 @@ static int lxcContainerMountBasicFS(bool userns_enabled) continue; #endif +#if WITH_SECURITYFS if (STREQ(mnt->src, "securityfs") && userns_enabled) continue; +#endif if (virFileMakePath(mnt->dst) < 0) { virReportSystemError(errno, -- 1.7.11.7

3 3

[libvirt] [Patch]LXC: Add support for attach/detach/update controller in config for LXC
by Chen Hanxiao 24 Sep '13

24 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Add support for attach/detach/update controller in config for LXC. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4cf0b50..9c58f67 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2750,6 +2750,7 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDiskDefPtr disk; virDomainNetDefPtr net; virDomainHostdevDefPtr hostdev; + virDomainControllerDefPtr controller; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -2787,6 +2788,21 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef, ret = 0; break; + case VIR_DOMAIN_DEVICE_CONTROLLER: + controller = dev->data.controller; + if (virDomainControllerFind(vmdef, controller->type, + controller->idx) >= 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Target already exists")); + return -1; + } + + if (virDomainControllerInsert(vmdef, controller) < 0) + return -1; + dev->data.controller = NULL; + ret = 0; + break; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent attach of device is not supported")); @@ -2849,6 +2865,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDiskDefPtr disk, det_disk; virDomainNetDefPtr net; virDomainHostdevDefPtr hostdev, det_hostdev; + virDomainControllerDefPtr controller, det_cont; int idx; char mac[VIR_MAC_STRING_BUFLEN]; @@ -2895,6 +2912,19 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, break; } + case VIR_DOMAIN_DEVICE_CONTROLLER: + controller = dev->data.controller; + if ((idx = virDomainControllerFind(vmdef, controller->type, + controller->idx)) < 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("device not present in domain configuration")); + return -1; + } + det_cont = virDomainControllerRemove(vmdef, idx); + virDomainControllerDefFree(det_cont); + ret = 0; + break; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent detach of device is not supported")); -- 1.8.2.1

2 2

Re: [libvirt] [PATCH] conf: Fix virNetworkAssignDef's comment.
by lawrance jing 24 Sep '13

24 Sep '13

OK. 2013/9/24 lawrance jing <lawrancejing(a)gmail.com>: > OK, thanks. > > 2013/9/24 Osier Yang <jyang(a)redhat.com>: >> On 24/09/13 15:57, lawrance jing wrote: >>> >>> I changed virNetworkAssignDef's comment,however what the patch show is >>> "-333,7 +333,7 @@ virNetworkObjAssignDef". Please give me a hint, thank you. >> >> >> Oh, it was confused, ACK and pushed. By the way, it's nicer if your reply >> mails with text format. >> >> Osier

1 0

[libvirt] How to intercept the VM start event and run the identity check
by Исаев Виталий Анатольевич 24 Sep '13

24 Sep '13

Dear developers! We are working on the project based on Red Hat Enterprise Virtualisation and Red Hat Identity Management. RHEV environment will be deployed in protected internal enterprise network. Now we are developing special admin tools in order to extend functionality of RHEL IdM and we faced with a rather difficult problem... The system should meet the increased demands of informational security, so what we are trying to implement is: 1. Intercept the event of user's VM start on the RHEL Hypervisor; 2. Suspend the VM; 3. Mount VM's disk to Hypervisor (or some other VM, for instance, admin's VM); 4. Check the integrity of the VM's system files (count md5sum etc.) 5. Unmount disk; 6. If verification is passed, start the VM, else - power off and disable VM till the decision of administrator. Is there any opportunity to implement this within the libvirt API? Thank you, Vitaly Isaev, "Fintech" JSC, Moscow, Russia www.fintech.ru<http://www.fintech.ru>

2 1

[libvirt] [PATCH 00/10] Fix multiple OOM problems
by Daniel P. Berrange 24 Sep '13

24 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Running out long ignored OOM injection tests identified a number of problems. This series fixes those that I have found so far, but more are to follow. I'm also rewriting the OOM injection code to make it much, much, much faster to run. Daniel P. Berrange (10): Fix crash on OOM when parsing disk security label Fix crash on OOM in parsing CPU mask in domain XML Fix crash if OOM occurs when creating virConnectPtr Fix crash on OOM in qemuDomainCCWAddressSetCreate() Fix crash on OOM in qemuAddRBDHost Fix allocation of arglist in qemuStringToArgvEnv Fix error checking of qemuParseKeywords return status Fix missing OOM check in qemuParseCommandLine when splitting strings Fix reporting of errors in OOM injection code Don't ignore allocation failure in virCommandAddEnvPassCommon src/conf/domain_conf.c | 5 ++-- src/datatypes.c | 10 +++++--- src/qemu/qemu_command.c | 59 ++++++++++++++++++++++++-------------------- src/qemu/qemu_command.h | 1 + src/qemu/qemu_monitor_json.c | 4 +-- src/util/viralloc.c | 18 ++++++++++++-- src/util/vircommand.c | 5 +++- 7 files changed, 63 insertions(+), 39 deletions(-) -- 1.8.3.1

2 20

[libvirt] [PATCH v4 0/7] cpu: add function to get the models for an arch
by Giuseppe Scrivano 24 Sep '13

24 Sep '13

This series adds a new API "virConnectGetCPUModelNames" that allows to retrieve the list of CPU models known by the hypervisor for a specific architecture. This new function is mainly needed by virt-manager to not read directly the cpu_map.xml file (it could also be different when accessing a remote daemon). *v4 main changes - cpuGetModels translates the arch name to the driver name. - virConnectGetCPUModelNames handles models==NULL, and - amended all the changes reported for v3 *v3 main changes - virConnectGetCPUModelNames returns the number of models instead of 0 on success. - Use VIR_INSERT_ELEMENT instead of VIR_EXPAND_N. - Fix a potential memory leak in the python bindings. - Move virsh changes to a separate commit. - Remove API documentation from libvirt.h. *v2 main changes - set a hard limit for the number of CPU models that is possible to fetch from a remote server. - Use VIR_EXPAND_N instead of VIR_REALLOC_N. - s|1.1.2|1.1.3| Giuseppe Scrivano (7): libvirt: add new public API virConnectGetCPUModelNames cpu: add function to get the models for an arch virConnectGetCPUModelNames: implement the remote protocol virConnectGetCPUModelNames: add the support for qemu virConnectGetCPUModelNames: add the support for the test protocol virsh: add function to get the CPU models for an arch python: add bindings for virConnectGetCPUModelNames daemon/remote.c | 52 ++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 4 ++ python/generator.py | 1 + python/libvirt-override-api.xml | 7 ++++ python/libvirt-override.c | 52 ++++++++++++++++++++++++++ python/libvirt-override.py | 11 ++++++ src/cpu/cpu.c | 82 ++++++++++++++++++++++++++++++++++++++++- src/cpu/cpu.h | 5 ++- src/driver.h | 7 ++++ src/libvirt.c | 51 +++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 14 +++++++ src/remote/remote_driver.c | 63 +++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 22 ++++++++++- src/remote_protocol-structs | 13 +++++++ src/test/test_driver.c | 11 ++++++ tools/virsh-host.c | 54 +++++++++++++++++++++++++++ tools/virsh.pod | 5 +++ 19 files changed, 457 insertions(+), 3 deletions(-) -- 1.8.3.1

2 14

[libvirt] [PATCHv2 1/2] VMware: Support more than 2 driver backends
by Doug Goldstein 24 Sep '13

24 Sep '13

Currently the VMware version check code only supports two types of VMware backends, Workstation and Player. But in the near future we will have an additional one so we need to support more. Additionally, we discover and cache the path to the vmrun binary so we should use that path when using the cooresponding binary from the VMware VIX SDK. --- change from v1: * Added default case so we don't potentially pass NULL to virCommand --- src/vmware/vmware_conf.c | 28 +++++++++++++++++++++++++--- src/vmware/vmware_driver.c | 20 ++++++++++++++++++-- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 261a4f6..c11c92d 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -257,10 +257,30 @@ vmwareExtractVersion(struct vmware_driver *driver) { unsigned long version = 0; int ret = -1; - virCommandPtr cmd; + virCommandPtr cmd = NULL; char * outbuf = NULL; - const char * bin = (driver->type == VMWARE_DRIVER_PLAYER) ? - "vmplayer" : "vmware"; + char *bin = NULL; + char *vmwarePath = NULL; + + if ((vmwarePath = mdir_name(driver->vmrun)) == NULL) + goto cleanup; + + switch (driver->type) { + case VMWARE_DRIVER_PLAYER: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer")) + goto cleanup; + break; + + case VMWARE_DRIVER_WORKSTATION: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware")) + goto cleanup; + break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid driver type for version detection")); + goto cleanup; + } cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); @@ -276,6 +296,8 @@ vmwareExtractVersion(struct vmware_driver *driver) cleanup: virCommandFree(cmd); VIR_FREE(outbuf); + VIR_FREE(bin); + VIR_FREE(vmwarePath); return ret; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 4e56971..01d65ed 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -93,6 +93,7 @@ vmwareConnectOpen(virConnectPtr conn, { struct vmware_driver *driver; size_t i; + char *tmp; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -144,8 +145,23 @@ vmwareConnectOpen(virConnectPtr conn, if (virMutexInit(&driver->lock) < 0) goto cleanup; - driver->type = STRNEQ(conn->uri->scheme, "vmwareplayer") ? - VMWARE_DRIVER_WORKSTATION : VMWARE_DRIVER_PLAYER; + if ((tmp = STRSKIP(conn->uri->scheme, "vmware")) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI " + "scheme '%s'"), conn->uri->scheme); + goto cleanup; + } + + driver->type = -1; + for (i = 0; i < VMWARE_DRIVER_LAST; i++) { + if (STREQ(tmp, vmwareDriverTypeToString(i))) + driver->type = i; + } + + if (driver->type == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " + "requested VMware backend '%s'"), tmp); + goto cleanup; + } if (!(driver->domains = virDomainObjListNew())) goto cleanup; -- 1.8.1.5

1 1

[libvirt] [PATCH 0/3] Followup fix for CVE-2013-4311
by Daniel P. Berrange 23 Sep '13

23 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The initial fix for CVE-2013-4311 had a flaw which affected the ACL code only. The first patch fixes that flaw, the next two add a test suite for the code in question. Daniel P. Berrange (3): Fix typo in identity code which is pre-requisite for CVE-2013-4311 Add a virNetSocketNewConnectSockFD method Add test case for virNetServerClient object identity code cfg.mk | 2 +- src/libvirt_private.syms | 1 + src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetsocket.c | 18 +++++ src/rpc/virnetsocket.h | 2 + tests/Makefile.am | 14 +++- tests/virnetserverclientmock.c | 64 +++++++++++++++++ tests/virnetserverclienttest.c | 159 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 259 insertions(+), 3 deletions(-) create mode 100644 tests/virnetserverclientmock.c create mode 100644 tests/virnetserverclienttest.c -- 1.8.3.1

2 7

[libvirt] [PATCH] build: ensure 'make check' sees up-to-date config.h
by Eric Blake 23 Sep '13

23 Sep '13

Nehal J. Wani reported on IRC a rather interesting build failure: In file included from util/virnetdevbridge.c:53:0: /usr/include/linux/in6.h:30:8: error: redefinition of 'struct in6_addr' struct in6_addr { ^ I traced it to the fact that he ran 'git pull; make check' across commit e62e0094. What happened is that the configure changes result in a new variable that was set to be defined on his system, but config.h was not regenerated to contain the value of that variable. Running 'make' instead of 'make check' cleaned up the problem. A bit more investigation, and I see that in Makefile.am, automake sticks rules that rebuild config.h as part of 'make all', and that we also had a dependency 'check-local: all'; BUT the rule for check-local is run only at the point when the top-level directory is visited. Automake documents that SUBDIRS should contain an explicit '.' at the point the top-level should be visited (defaulting to last, if it doesn't appear). Sure enough, with this patch, 'make check' now does the top-level 'all' rules, which regenerates 'config.h' BEFORE compiling any code that might depend on changed content of that file. * Makefile.am (SUBDIRS): Put '.' first, not last. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Tough to argue the build-breaker rule on this one, since a fresh checkout doesn't hit it (only a 'make check' without a 'make', across an incremental build that happened to need new configure substitutions). So I'll wait for a review for my one-liner. Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4e24ecf..66cb677 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ LCOV = lcov GENHTML = genhtml -SUBDIRS = gnulib/lib include src daemon tools docs gnulib/tests \ +SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ examples/dominfo examples/domsuspend examples/python examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap -- 1.7.1

2 4

Re: [libvirt] [PATCH 6/6] qemu: Add support for emulated CPU features
by Eduardo Habkost 23 Sep '13

23 Sep '13

(CCing qemu-devel and libvir-list) On Sun, Sep 22, 2013 at 04:44:55PM +0200, Borislav Petkov wrote: > From: Borislav Petkov <bp(a)suse.de> > > Add support for the KVM_GET_EMULATED_CPUID ioctl and leave feature bits > enabled, when requested by userspace, if kvm emulates them. > > Signed-off-by: Borislav Petkov <bp(a)suse.de> This will break some assumptions about the semantics of "-cpu host", that today means "enable every single feature that can be enabled in the host". This, in turn, breaks the assumption that "-cpu host" can be used by libvirt to get information about all CPU features supported by the host. So, I have two questions: 1) Should "-cpu host" enable GET_EMULATED_CPUID features? (I believe the answer is "no"); 2) If not, we need a new mechanism to let libvirt know which features can be enabled on a host (in a way that would allow libvirt to easily calculate the set of possible destination hosts to which a VM can be migrated, before deciding to migrate it). This interface is getting complex enough for me to consider simply asking libvirt developers to call GET_EMULATED_CPUID and GET_SUPPORTED_CPUID directly, instead of asking QEMU for information. But if libvirt does that, it needs a way to know if it's running a QEMU version that supports GET_EMULATED_CPUID, or an old version that supports only GET_SUPPORTED_CPUID. Another alternative is to simply let libvirt ignore GET_EMULATED_CPUID by now, and treat GET_EMULATED_CPUID features as not supported by the host. But then it will break the use cases that prompted the creation of GET_EMULATED_CPUID in the first place. > --- > include/sysemu/kvm.h | 4 ++++ > linux-headers/linux/kvm.h | 4 ++++ > target-i386/cpu.c | 7 +++++++ > target-i386/kvm.c | 38 ++++++++++++++++++++++++++++++++++---- > 4 files changed, 49 insertions(+), 4 deletions(-) > > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index 9bbe3db1464e..8eda1ada848a 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -265,6 +265,10 @@ int kvm_check_extension(KVMState *s, unsigned int extension); > > uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, > uint32_t index, int reg); > + > +uint32_t kvm_arch_get_emulated_cpuid(KVMState *env, uint32_t function, > + uint32_t index, int reg); > + > void kvm_cpu_synchronize_state(CPUState *cpu); > > /* generic hooks - to be moved/refactored once there are more users */ > diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h > index c614070662e1..edc8f2db1f8d 100644 > --- a/linux-headers/linux/kvm.h > +++ b/linux-headers/linux/kvm.h > @@ -541,6 +541,7 @@ struct kvm_ppc_smmu_info { > #define KVM_TRACE_ENABLE __KVM_DEPRECATED_MAIN_W_0x06 > #define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07 > #define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08 > +#define KVM_GET_EMULATED_CPUID _IOWR(KVMIO, 0x09, struct kvm_cpuid2) > > /* > * Extension capability list. > @@ -666,6 +667,9 @@ struct kvm_ppc_smmu_info { > #define KVM_CAP_IRQ_MPIC 90 > #define KVM_CAP_PPC_RTAS 91 > #define KVM_CAP_IRQ_XICS 92 > +#define KVM_CAP_ARM_EL1_32BIT 93 > +#define KVM_CAP_SPAPR_MULTITCE 94 > +#define KVM_CAP_EXT_EMUL_CPUID 95 > > #ifdef KVM_CAP_IRQ_ROUTING > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index c36345e426d7..5406348ceb4a 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1850,7 +1850,14 @@ static void filter_features_for_kvm(X86CPU *cpu) > wi->cpuid_ecx, > wi->cpuid_reg); > uint32_t requested_features = env->features[w]; > + > + uint32_t emul_features = kvm_arch_get_emulated_cpuid(s, wi->cpuid_eax, > + wi->cpuid_ecx, > + wi->cpuid_reg); > + > env->features[w] &= host_feat; > + env->features[w] |= (requested_features & emul_features); > + I find the above logic confusing: you remove a few bits just to re-add them later. Isn't easier and simpler to simply do: env->features[w] &= (host_feat | emul_features); ? > cpu->filtered_features[w] = requested_features & ~env->features[w]; > } > } > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index 749aa09a21a6..7f598f01bda5 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -80,7 +80,7 @@ bool kvm_allows_irq0_override(void) > return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing(); > } > > -static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > +static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int ioctl, int max) > { > struct kvm_cpuid2 *cpuid; > int r, size; > @@ -88,7 +88,7 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > size = sizeof(*cpuid) + max * sizeof(*cpuid->entries); > cpuid = (struct kvm_cpuid2 *)g_malloc0(size); > cpuid->nent = max; > - r = kvm_ioctl(s, KVM_GET_SUPPORTED_CPUID, cpuid); > + r = kvm_ioctl(s, ioctl, cpuid); > if (r == 0 && cpuid->nent >= max) { > r = -E2BIG; > } > @@ -97,7 +97,10 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > g_free(cpuid); > return NULL; > } else { > - fprintf(stderr, "KVM_GET_SUPPORTED_CPUID failed: %s\n", > + fprintf(stderr, "%s failed: %s\n", > + (ioctl == (int)KVM_GET_SUPPORTED_CPUID > + ? "KVM_GET_SUPPORTED_CPUID" > + : "KVM_GET_EMULATED_CPUID"), > strerror(-r)); > exit(1); > } > @@ -112,7 +115,17 @@ static struct kvm_cpuid2 *get_supported_cpuid(KVMState *s) > { > struct kvm_cpuid2 *cpuid; > int max = 1; > - while ((cpuid = try_get_cpuid(s, max)) == NULL) { > + while ((cpuid = try_get_cpuid(s, KVM_GET_SUPPORTED_CPUID, max)) == NULL) { > + max *= 2; > + } > + return cpuid; > +} > + > +static struct kvm_cpuid2 *get_emulated_cpuid(KVMState *s) > +{ > + struct kvm_cpuid2 *cpuid; > + int max = 1; > + while ((cpuid = try_get_cpuid(s, KVM_GET_EMULATED_CPUID, max)) == NULL) { > max *= 2; > } > return cpuid; > @@ -241,6 +254,23 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, > return ret; > } > > +uint32_t kvm_arch_get_emulated_cpuid(KVMState *s, uint32_t function, > + uint32_t index, int reg) > +{ > + struct kvm_cpuid2 *cpuid __attribute__((unused)); > + > + if (!kvm_check_extension(s, KVM_CAP_EXT_EMUL_CPUID)) > + return 0; > + > + cpuid = get_emulated_cpuid(s); > + > + struct kvm_cpuid_entry2 *entry = cpuid_find_entry(cpuid, function, index); > + if (entry) > + return cpuid_entry_get_reg(entry, reg); > + > + return 0; > +} > + > typedef struct HWPoisonPage { > ram_addr_t ram_addr; > QLIST_ENTRY(HWPoisonPage) list; > -- > 1.8.4 > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Eduardo

1 0

[libvirt] [PATCH 1/2] VMware: Support more than 2 driver backends
by Doug Goldstein 23 Sep '13

23 Sep '13

Currently the VMware version check code only supports two types of VMware backends, Workstation and Player. But in the near future we will have an additional one so we need to support more. Additionally, we discover and cache the path to the vmrun binary so we should use that path when using the cooresponding binary from the VMware VIX SDK. --- src/vmware/vmware_conf.c | 23 ++++++++++++++++++++--- src/vmware/vmware_driver.c | 20 ++++++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 261a4f6..d7ea8c4 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -257,10 +257,25 @@ vmwareExtractVersion(struct vmware_driver *driver) { unsigned long version = 0; int ret = -1; - virCommandPtr cmd; + virCommandPtr cmd = NULL; char * outbuf = NULL; - const char * bin = (driver->type == VMWARE_DRIVER_PLAYER) ? - "vmplayer" : "vmware"; + char *bin = NULL; + char *vmwarePath = NULL; + + if ((vmwarePath = mdir_name(driver->vmrun)) == NULL) + goto cleanup; + + switch (driver->type) { + case VMWARE_DRIVER_PLAYER: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer")) + goto cleanup; + break; + + case VMWARE_DRIVER_WORKSTATION: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware")) + goto cleanup; + break; + } cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); @@ -276,6 +291,8 @@ vmwareExtractVersion(struct vmware_driver *driver) cleanup: virCommandFree(cmd); VIR_FREE(outbuf); + VIR_FREE(bin); + VIR_FREE(vmwarePath); return ret; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 4e56971..01d65ed 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -93,6 +93,7 @@ vmwareConnectOpen(virConnectPtr conn, { struct vmware_driver *driver; size_t i; + char *tmp; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -144,8 +145,23 @@ vmwareConnectOpen(virConnectPtr conn, if (virMutexInit(&driver->lock) < 0) goto cleanup; - driver->type = STRNEQ(conn->uri->scheme, "vmwareplayer") ? - VMWARE_DRIVER_WORKSTATION : VMWARE_DRIVER_PLAYER; + if ((tmp = STRSKIP(conn->uri->scheme, "vmware")) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI " + "scheme '%s'"), conn->uri->scheme); + goto cleanup; + } + + driver->type = -1; + for (i = 0; i < VMWARE_DRIVER_LAST; i++) { + if (STREQ(tmp, vmwareDriverTypeToString(i))) + driver->type = i; + } + + if (driver->type == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " + "requested VMware backend '%s'"), tmp); + goto cleanup; + } if (!(driver->domains = virDomainObjListNew())) goto cleanup; -- 1.8.1.5

2 4

[libvirt] Libvirt ESX: Image file not getting copied to ESX server
by varun bhatnagar 23 Sep '13

23 Sep '13

Hi, I am trying to start a node using libvirt on ESX hypervisor. Before starting I am performing the following steps: 1) vol-create datastore1 /local/new_volume.xml (Creating a volume in pool) 2) define /local/esxdomain.xml (Defining a node) 3) start MyNode (Starting a node) I tried to get the status of my node and it is showing *running *but I am not able to ping my node (as it is in network). I later got the console of my node and found out that my node is not even getting started. It says "Operating System Not Found". I guess this is because my vmdk image file is not getting copied and the first command is just placing two files .vmdk and *-flat.vmdk (these are dummy files I guess). But it is not placing my original .vmdk files. How to place the original vmdk file in datastore. If I place it using scp command then libvirt pops out a message saying "Could not start domain: GenericVmConfigFault". How to resolve this error. I am pasting my xml files below. Any help is appreciated... :) *new_volume.xml:* *<volume> <name>test/MyNode.vmdk</name> <allocation>0</allocation> <capacity unit='G'>3</capacity> <target> <path>/local/vmdk/MyNode.vmdk</path> <format type='vmdk'/> </target> </volume>* *esxdomain.xml: * *<domain type='vmware'> <name>test</name> <memory>1048576</memory> <currentMemory>1048576</currentMemory> <vcpu>1</vcpu> <console>/dev/console</console> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='file' device='disk'> <source file='[datastore1] test/MyNode.vmdk'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> <controller type='scsi' index='0' model='lsilogic'/>  <interface type='bridge'> <mac address='00:50:56:0f:01:01'/> <source bridge='VM Network'/> </interface> <interface type='bridge'> <mac address='00:50:56:0f:01:02'/> <source bridge='dummyPortGroup1'/> </interface> <interface type='bridge'> <mac address='00:50:56:0f:01:03'/> <source bridge='dummyPortGroup2'/> </interface> </devices> </domain>* Regards, Varun

1 0

[libvirt] [PATCH] docs: Load libvirt_access*.xml from build dir
by Jiri Denemark 23 Sep '13

23 Sep '13

The xml files are generated in build directory and thus docs/newapi.xsl was not able to find them in a VPATH build. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/Makefile.am | 1 + docs/newapi.xsl | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index c6a3ead..faf2a32 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -242,6 +242,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/ \ + --stringparam builddir $(abs_top_builddir) \ $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \ if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 606d244..b1728ee 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -25,18 +25,20 @@  <xsl:key name="symbols" match="/api/symbols/*" use="@name"/> + <xsl:param name="builddir" select=".."/> +  <xsl:variable name="htmldir">html</xsl:variable> <xsl:variable name="href_base">../</xsl:variable> <xsl:variable name="acls"> - <xsl:copy-of select="document('../src/libvirt_access.xml')/aclinfo/api"/> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access.xml')/aclinfo/api"/> </xsl:variable> <xsl:variable name="qemuacls"> - <xsl:copy-of select="document('../src/libvirt_access_qemu.xml')/aclinfo/api"/> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access_qemu.xml')/aclinfo/api"/> </xsl:variable> <xsl:variable name="lxcacls"> - <xsl:copy-of select="document('../src/libvirt_access_lxc.xml')/aclinfo/api"/> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access_lxc.xml')/aclinfo/api"/> </xsl:variable> <xsl:template name="aclinfo"> -- 1.8.3.2

3 6

[libvirt] Libvirt not able to attach console to VM on ESX hypervisor
by varun bhatnagar 23 Sep '13

23 Sep '13

Hi, I have started a virtual machine on my ESXi server. I was trying to attach a console to it but when I executed the command I got a message saying that *"Attaching a console is not supported in the current hypervisor." *Is there any way (patch or something) through which I can attach a console to my VM. The ESX version is 5.1 and I am using latest version of libvirt. Regards, Varun

4 4

[libvirt] [PATCH]LXC: Check the existence of dir before resolving symlinks
by Chen Hanxiao 23 Sep '13

23 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If dir does not exist, raise a proper error in logs and don't let virFileResolveAllLinks throw itself's exceptions in logs, which may be misleading. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a979452..c60f5d8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1696,6 +1696,7 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) { char *newroot; size_t i; + char ebuf[1024]; VIR_DEBUG("Resolving symlinks"); @@ -1703,6 +1704,13 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) virDomainFSDefPtr fs = vmDef->fss[i]; if (!fs->src) continue; + + if (access(fs->src, F_OK)) { + VIR_DEBUG("Failed to access '%s': %s", fs->src, + virStrerror(errno, ebuf, sizeof(ebuf))); + return -1; + } + VIR_DEBUG("Resolving '%s'", fs->src); if (virFileResolveAllLinks(fs->src, &newroot) < 0) { VIR_DEBUG("Failed to resolve symlink at %s", fs->src); -- 1.8.2.1

2 1

[libvirt] [PATCH]LXC: follow the unit style of /proc/meminfo
by Chen Hanxiao 23 Sep '13

23 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we start libvirt_lxc with fuse complied, we could see an isolate /proc/meminfo based on fuse. Part of this were modified based on container's mem cgroup, with the unit style of "KB"; rest of them were copied from /proc/meminfo, with another unit style of "kB". It looks a little strange. We should keep pace with the style of kernel function meminfo_proc_show, and change all "KB" to "kB". Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_fuse.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index e672b0f..9d12832 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -165,43 +165,43 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, if (STREQ(line, "MemTotal") && (def->mem.hard_limit || def->mem.max_balloon)) - virBufferAsprintf(new_meminfo, "MemTotal: %8llu KB\n", + virBufferAsprintf(new_meminfo, "MemTotal: %8llu kB\n", meminfo.memtotal); else if (STREQ(line, "MemFree") && (def->mem.hard_limit || def->mem.max_balloon)) - virBufferAsprintf(new_meminfo, "MemFree: %8llu KB\n", + virBufferAsprintf(new_meminfo, "MemFree: %8llu kB\n", (meminfo.memtotal - meminfo.memusage)); else if (STREQ(line, "Buffers")) - virBufferAsprintf(new_meminfo, "Buffers: %8d KB\n", 0); + virBufferAsprintf(new_meminfo, "Buffers: %8d kB\n", 0); else if (STREQ(line, "Cached")) - virBufferAsprintf(new_meminfo, "Cached: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Cached: %8llu kB\n", meminfo.cached); else if (STREQ(line, "Active")) - virBufferAsprintf(new_meminfo, "Active: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Active: %8llu kB\n", (meminfo.active_anon + meminfo.active_file)); else if (STREQ(line, "Inactive")) - virBufferAsprintf(new_meminfo, "Inactive: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Inactive: %8llu kB\n", (meminfo.inactive_anon + meminfo.inactive_file)); else if (STREQ(line, "Active(anon)")) - virBufferAsprintf(new_meminfo, "Active(anon): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Active(anon): %8llu kB\n", meminfo.active_anon); else if (STREQ(line, "Inactive(anon)")) - virBufferAsprintf(new_meminfo, "Inactive(anon): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Inactive(anon): %8llu kB\n", meminfo.inactive_anon); else if (STREQ(line, "Active(file)")) - virBufferAsprintf(new_meminfo, "Active(file): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Active(file): %8llu kB\n", meminfo.active_file); else if (STREQ(line, "Inactive(file)")) - virBufferAsprintf(new_meminfo, "Inactive(file): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Inactive(file): %8llu kB\n", meminfo.inactive_file); else if (STREQ(line, "Unevictable")) - virBufferAsprintf(new_meminfo, "Unevictable: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Unevictable: %8llu kB\n", meminfo.unevictable); else if (STREQ(line, "SwapTotal") && def->mem.swap_hard_limit) - virBufferAsprintf(new_meminfo, "SwapTotal: %8llu KB\n", + virBufferAsprintf(new_meminfo, "SwapTotal: %8llu kB\n", (meminfo.swaptotal - meminfo.memtotal)); else if (STREQ(line, "SwapFree") && def->mem.swap_hard_limit) - virBufferAsprintf(new_meminfo, "SwapFree: %8llu KB\n", + virBufferAsprintf(new_meminfo, "SwapFree: %8llu kB\n", (meminfo.swaptotal - meminfo.memtotal - meminfo.swapusage + meminfo.memusage)); else { -- 1.8.2.1

3 2

[libvirt] [PATCH 0/5] Change preference of default PCI passthrough type
by Peter Krempa 23 Sep '13

23 Sep '13

Change the default type to VFIO if available. Please note that the majority of the code here is only compile tested as I don't have appropriate hardware to test it. Peter Krempa (5): qemu: hostdev: Refactor PCI passhrough handling qemu: hostdev: Add checks if PCI passthrough is availabe in the host qemu: hotplug: Verify that the selected pci passhtrough option is present qemu: Check if PCI passhtrough is available in the host when starting qemu: Prefer VFIO for PCI device passthrough docs/formatdomain.html.in | 9 ++- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 27 +++++--- src/qemu/qemu_hostdev.c | 76 ++++++++++++++++++++++ src/qemu/qemu_hostdev.h | 3 + src/qemu/qemu_hotplug.c | 63 +++++++++++++++--- src/qemu/qemu_process.c | 57 ++++++++++++++++ .../qemuxml2argv-hostdev-pci-address-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 4 +- 10 files changed, 216 insertions(+), 29 deletions(-) -- 1.8.3.2

3 11

[libvirt] [PATCH] virsh: Add missing "async" option in virsh-domain.c opts_block_commit.
by Simone Gotti 23 Sep '13

23 Sep '13

After commit 8aecd351266a66efa59b7f7be77bf66693d99ce0 it'll detect that a required option is not defined and it will assert and exit with: virsh.c:1364: vshCommandOpt: Assertion `valid->name' failed. --- tools/virsh-domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 49cd154..856e888 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1544,6 +1544,10 @@ static const vshCmdOptDef opts_block_commit[] = { .type = VSH_OT_INT, .help = N_("with --wait, abort if copy exceeds timeout (in seconds)") }, + {.name = "async", + .type = VSH_OT_BOOL, + .help = N_("with --wait, don't wait for cancel to finish") + }, {.name = NULL} }; -- 1.8.3.1

2 3

[libvirt] [PATCH] conf: Do better job when comparing features ABI compatibility
by Peter Krempa 23 Sep '13

23 Sep '13

The ABI compatibility check for domain features didn't check the expanded HyperV and APIC EOI values, thus possibly allowing change in guest ABI. Add the check and use typecasted switch statement to warn developers when adding a new HyperV feature. --- src/conf/domain_conf.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c4b6464..8953579 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13354,6 +13354,72 @@ virDomainRedirFilterDefCheckABIStability(virDomainRedirFilterDefPtr src, return true; } + +static bool +virDomainDefFeaturesCheckABIStability(virDomainDefPtr src, + virDomainDefPtr dst) +{ + size_t i; + + /* basic check */ + if (src->features != dst->features) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain features %d does not match source %d"), + dst->features, src->features); + return false; + } + + /* APIC EOI */ + if (src->apic_eoi != dst->apic_eoi) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("State of APIC EOI differs: " + "source: '%s', destination: '%s'"), + virDomainFeatureStateTypeToString(src->apic_eoi), + virDomainFeatureStateTypeToString(dst->apic_eoi)); + return false; + } + + /* hyperv */ + if (src->features & (1 << VIR_DOMAIN_FEATURE_HYPERV)) { + for (i = 0; i < VIR_DOMAIN_HYPERV_LAST; i++) { + switch ((enum virDomainHyperv) i) { + case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: + if (src->hyperv_features[i] != dst->hyperv_features[i]) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("State of HyperV enlightenment " + "feature '%s' differs: " + "source: '%s', destination: '%s'"), + virDomainHypervTypeToString(i), + virDomainFeatureStateTypeToString(src->hyperv_features[i]), + virDomainFeatureStateTypeToString(dst->hyperv_features[i])); + return false; + } + + break; + + case VIR_DOMAIN_HYPERV_SPINLOCKS: + /* spinlock count matters! */ + if (src->hyperv_spinlocks != dst->hyperv_spinlocks) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("HyperV spinlock retry count differs: " + "source: '%u', destination: '%u'"), + src->hyperv_spinlocks, + dst->hyperv_spinlocks); + return false; + } + break; + + case VIR_DOMAIN_HYPERV_LAST: + break; + } + } + } + + return true; +} + + /* This compares two configurations and looks for any differences * which will affect the guest ABI. This is primarily to allow * validation of custom XML config passed in during migration @@ -13455,12 +13521,8 @@ virDomainDefCheckABIStability(virDomainDefPtr src, return false; } - if (src->features != dst->features) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain features %d does not match source %d"), - dst->features, src->features); + if (!virDomainDefFeaturesCheckABIStability(src, dst)) return false; - } if (src->clock.ntimers != dst->clock.ntimers) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -- 1.8.3.2

2 2

[libvirt] [v4 0/5] virsh: More intelligent auto-completion
by Tomas Meszaros 22 Sep '13

22 Sep '13

This series implements advanced auto-completion for virsh. Using custom option completers (examples in 3/5, 4/5 and 5/5), it is possible to further complete any option with defined completer function. Option completer function should return list of completed names for each desired option. Using C99 initialization, it is easy to enable specific completer for any option. For example, when we want domain completer for "start --domain" option, we write vshDomainCompleter() and along with desired flags, initialize targeted opts struct. static const vshCmdOptDef opts_start[] = { {.name = "domain", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, .help = N_("name of the inactive domain"), .completer = vshDomainCompleter, .completer_flags = VIR_CONNECT_LIST_DOMAINS_INACTIVE | VIR_CONNECT_LIST_DOMAINS_PERSISTENT }, Auto-completion itself then works like this: virsh # start --domain <TAB> domain1 domain2 domainN virsh # vol-key <TAB> --help --pool --vol vol1 vol2 --- v4: * rewritten to use only option completers v3: https://www.redhat.com/archives/libvir-list/2013-August/msg01294.html v2: https://www.redhat.com/archives/libvir-list/2013-August/msg00992.html v1: https://www.redhat.com/archives/libvir-list/2013-August/msg00371.html Tomas Meszaros (5): virsh: Add vshCmdCompleter and vshOptCompleter virsh: Improve readline generators and readline completion virsh: Add vshDomainCompleter virsh: Add vshSuspendTargetCompleter virsh: Add vshRebootShutdownModeCompleter tools/virsh-domain-monitor.c | 52 +++++-- tools/virsh-domain.c | 310 +++++++++++++++++++++++++++++--------- tools/virsh-snapshot.c | 50 +++++-- tools/virsh.c | 350 +++++++++++++++++++++++++++++++++++++++---- tools/virsh.h | 8 + 5 files changed, 648 insertions(+), 122 deletions(-) -- 1.8.3.1

2 8

Re: [libvirt] [Users] Starting VM Error
by Dan Kenigsberg 22 Sep '13

22 Sep '13

On Sun, Sep 15, 2013 at 01:59:29PM +0200, Gianluca Cecchi wrote: > On Sun, Sep 15, 2013 at 1:50 PM, Gianluca Cecchi wrote: > > and > > [root@tekkaman ~]# chgrp kvm /var/lib/libvirt/images/testvm.img > [root@tekkaman ~]# ll /var/lib/libvirt/images/testvm.img > -rw-rw----. 1 vdsm kvm 197120 Sep 15 12:24 /var/lib/libvirt/images/testvm.img > > [root@tekkaman ~]# virsh undefine testvm2 > Please enter your authentication name: virshuser > Please enter your password: > Domain testvm2 has been undefined > > [root@tekkaman ~]# virsh define /tmp/testvm2.xml > Please enter your authentication name: virshuser > Please enter your password: > Domain testvm2 defined from /tmp/testvm2.xml > > [root@tekkaman ~]# virsh start testvm2 > Please enter your authentication name: virshuser > Please enter your password: > error: Failed to start domain testvm2 > error: internal error Process exited while reading console log output: > char device redirected to /dev/pts/2 > qemu-kvm: -drive > file=/var/lib/libvirt/images//testvm.img,if=none,id=drive-virtio-disk0,format=qcow2: > could not open disk image /var/lib/libvirt/images//testvm.img: > Permission denied Gianluca, due to all the twists of this thread, I no longer recall which libvirt version you are using. Would you remind us? All signs show that it starts up qemu without setting its auxiliary group properly (Assuming that your # groups qemu qemu : qemu kvm is just as mine) I've added libvir-list so the fine folks there could check why qemu cannot read/write files group-owned by kvm. Dan.

3 5

[libvirt] ANNOUNCE: libvirt 0.10.2.8 maintenance release
by Cole Robinson 21 Sep '13

21 Sep '13

libvirt 0.10.2.8 maintenance release is now available. This is libvirt 0.10.2 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.10.2.8.tar.gz Changes in this version: * virsh: fix change-media bug on disk block type * libvirt: lxc: don't mkdir when selinux is disabled * Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296) * Add support for using 3-arg pkcheck syntax for process (CVE-2013-4311) * Include process start time when doing polkit checks * win32: Pretend that close-on-exec works * virDomainDefParseXML: set the argument of virBitmapFree to NULL after calling virBitmapFree * security: provide supplemental groups even when parsing label (CVE-2013-4291) * virbitmap: Refactor virBitmapParse to avoid access beyond bounds of array * bitmap: add virBitmapCountBits For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH] qemu: use "ide" as device name for implicit SATA controller on Q35
by Laine Stump 20 Sep '13

20 Sep '13

This resolves https://bugzilla.redhat.com/show_bug.cgi?id=1008903 The Q35 machinetype has an implicit SATA controller at 00:1F.2 which isn't given the "expected" id of ahci0 by qemu when it's created. The original suggested solution to this problem was to not specify any controller for the disks that use the default controller and just specify "unit=n" instead; qemu should then use the first ide or sata controller for the disk. Unfortunately, this "solution" is ignorant of the fact that in the case of SATA disks, the "unit" attribute in the disk XML is actually *not* being used for the unit, but is instead used to specify the "bus" number; each SATA controller has 6 buses, and each bus only allows a single unit. This makes it nonsensical to specify unit='n' where n is anything other than 0. It also means that the only way to connect more than a single device to the implicit SATA controller is to explicitly give the bus names, which happen to be "ide.$n", where $n can be replaced by the disk's "unit" number. --- src/qemu/qemu_command.c | 15 ++++++--------- tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4628dac..e6239c9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4383,18 +4383,15 @@ qemuBuildDriveDevStr(virDomainDefPtr def, if (qemuDomainMachineIsQ35(def) && disk->info.addr.drive.controller == 0) { /* Q35 machines have an implicit ahci (sata) controller at - * 00:1F.2 which has no "id" associated with it. For this - * reason, we can't refer to it as "ahci0". Instead, we - * don't give an id, which qemu interprets as "use the - * first ahci controller". We then need to specify the - * unit with "unit=%d" rather than adding it onto the bus - * arg. + * 00:1F.2 which for some reason is hardcoded with the id + * "ide" instead of the seemingly more reasonable "ahci0" + * or "sata0". */ - virBufferAsprintf(&opt, ",unit=%d", disk->info.addr.drive.unit); + virBufferAsprintf(&opt, ",bus=ide.%d", disk->info.addr.drive.unit); } else { /* All other ahci controllers have been created by - * libvirt, so they *do* have an id, and we can identify - * them that way. + * libvirt, and we gave them the id "ahci${n}" where ${n} + * is the controller number. So we identify them that way. */ virBufferAsprintf(&opt, ",bus=ahci%d.%d", disk->info.addr.drive.controller, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args index e10ccb1..175c0dc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args @@ -5,5 +5,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x2 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ --device ide-drive,unit=0,drive=drive-sata0-0-0,id=sata0-0-0 \ +-device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args index 4461eba..6bd5f4c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args @@ -4,5 +4,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x2 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ --device ide-drive,unit=0,drive=drive-sata0-0-0,id=sata0-0-0 \ +-device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 -- 1.8.3.1

5 7

[libvirt] [PATCH] build: Generate libvirt_access*.xml in source dir
by Jiri Denemark 20 Sep '13

20 Sep '13

Technically, these files should be generated in build dir but since docs/newapi.xsl style sheet is expecting them to be in source dir, it's much easier to put them there than trying to convince newapi.xsl to look elsewhere. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1388c5f..c456d48 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -863,9 +863,9 @@ ACCESS_DRIVER_SYM_FILES = \ libvirt_access_lxc.syms ACCESS_DRIVER_API_FILES = \ - libvirt_access.xml \ - libvirt_access_qemu.xml \ - libvirt_access_lxc.xml + $(srcdir)/libvirt_access.xml \ + $(srcdir)/libvirt_access_qemu.xml \ + $(srcdir)/libvirt_access_lxc.xml ACCESS_DRIVER_SOURCES = \ access/viraccessperm.h access/viraccessperm.c \ @@ -1554,15 +1554,15 @@ libvirt_access_lxc.syms: $(srcdir)/rpc/gendispatch.pl \ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclsym \ lxc LXC $(LXC_PROTOCOL) > $@ -libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ +$(srcdir)/libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ remote REMOTE $(REMOTE_PROTOCOL) > $@ -libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ +$(srcdir)/libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ qemu QEMU $(QEMU_PROTOCOL) > $@ -libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ +$(srcdir)/libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ lxc LXC $(LXC_PROTOCOL) > $@ -- 1.8.3.2

3 4

[libvirt] storage pool that contains thin LVs
by Dusty Mabe 20 Sep '13

20 Sep '13

Hey guys, Just looking at https://bugzilla.redhat.com/show_bug.cgi?id=924672 and looks like all we need to do is ignore thin pools and thin pool data devices. With some trivial testing this seems to work fine (i.e. failed before and works now). diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index a1a37a1..0154256 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -85,6 +85,10 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, if (attrs[4] != 'a') return 0; + /* Skip thin pools(t) and thin pool data(T) */ + if (attrs[0] == 't' || attrs[0] == 'T') + return 0; + /* See if we're only looking for a specific volume */ if (data != NULL) { vol = data; I'm sure the fix isn't this trivial but i can finish it up and submit an official patch (through git) if this is close. Dusty

3 3

[libvirt] [PATCH] Don't dereference NULL in qemumonitorjsontest
by Ján Tomko 20 Sep '13

20 Sep '13

In case of an error, qemuMonitorTestNewSimple returns NULL. Error out instead of dereferencing it. Found by Coverity, reported by John Ferlan. --- Pushed as trivial. tests/qemumonitorjsontest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index b451e8e..0fb8d65 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -960,6 +960,9 @@ testQemuMonitorJSONCPU(const void *data) bool running = false; virDomainPausedReason reason = 0; + if (!test) + return -1; + if (qemuMonitorTestAddItem(test, "stop", "{\"return\": {}}") < 0 || qemuMonitorTestAddItem(test, "query-status", "{\"return\": {" @@ -1016,6 +1019,9 @@ testQemuMonitorJSONSimpleFunc(const void *opaque) const char *reply = data->reply; int ret = -1; + if (!test) + return -1; + if (!reply) reply = "{\"return\":{}}"; -- 1.8.1.5

2 1

[libvirt] [PATCH 0/2] qemumonitorjsontest improvements
by Michal Privoznik 20 Sep '13

20 Sep '13

Just a couple of tests. Michal Privoznik (2): qemumonitorjsontest: Test CPU state handling code qemumonitorjsontest: Introduce DO_TEST_SIMPLE tests/qemumonitorjsontest.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) -- 1.8.1.5

3 6

[libvirt] [PATCH] Add checking of dbus_message_iter_append_basic return value
by Daniel P. Berrange 20 Sep '13

20 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Coverity complains that the test suite did not check the return value of dbus_message_iter_append_basic() as we did in most other places. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/virsystemdmock.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c index 59b312d..b8fc031 100644 --- a/tests/virsystemdmock.c +++ b/tests/virsystemdmock.c @@ -82,10 +82,8 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio dbus_message_iter_init_append(reply, &iter); if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, - &error_message)) { - dbus_message_unref(reply); - return NULL; - } + &error_message)) + goto error; } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); } @@ -98,19 +96,25 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub); - dbus_message_iter_append_basic(&sub, + if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, - &svc1); - if (!getenv("FAIL_NO_SERVICE")) - dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, - &svc2); + &svc1)) + goto error; + if (!getenv("FAIL_NO_SERVICE") && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc2)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); } return reply; + + error: + dbus_message_unref(reply); + return NULL; } #else -- 1.8.3.1

2 1

[libvirt] [PATCH 0/3] VMware: Driver updates for future work
by Doug Goldstein 20 Sep '13

20 Sep '13

While some of these patches seem unncessary (e.g. vmrun lookup/caching) my end goal is to add VMware Fusion support to libvirt. Rationale for patch 1: In libvirt we prefer enums and using some of the standardized APIs for enum/str handling. Rationale for patch 2: VMware Fusion command line utilities will never be in PATH on a Mac OS X machine and nor is it correct to tell the user to have it in your path. The tools live in /Applications/VMware Fusion.app/ or /Library/Application Support/VMware Fusion.app/ and app bundles should not appear in your path. In the future it will allow us to add these pathes in the list of paths to search for. We can also improve the Windows user experience and populate the Windows path in here as well since most users don't have the VMware install dir in their PATH. Rationale for patch 3: Testing is good. VMware Fusion has a slightly different string format for the version so the code will need to change this allows us to add tests. I personally don't own a copy of VMware Workstation or VMware Fusion, so if anyone does please send me (or submit patches) of additional version numbers so that we can improve our test coverage. Doug Goldstein (3): VMware: Convert driver type defines to enum VMware: Store vmrun binary's path in the driver VMware: Make version parsing testable and add tests .gitignore | 1 + src/Makefile.am | 6 ++ src/libvirt_vmware.syms | 12 ++++ src/vmware/vmware_conf.c | 61 ++++++++++++----- src/vmware/vmware_conf.h | 15 ++++- src/vmware/vmware_driver.c | 63 +++++++++++------- tests/Makefile.am | 14 ++++ tests/vmwareverdata/workstation-7.0.0.txt | 1 + tests/vmwarevertest.c | 105 ++++++++++++++++++++++++++++++ 9 files changed, 233 insertions(+), 45 deletions(-) create mode 100644 src/libvirt_vmware.syms create mode 100644 tests/vmwareverdata/workstation-7.0.0.txt create mode 100644 tests/vmwarevertest.c -- 1.8.1.5

2 6

[libvirt] [PATCH] daemon: Avoid dead code in polkit auth
by Jiri Denemark 20 Sep '13

20 Sep '13

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- daemon/remote.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 3ac528c..2ff2288 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2738,12 +2738,13 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, int status = -1; char *ident = NULL; bool authdismissed = 0; - bool supportsuid = false; char *pkout = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virCommandPtr cmd = NULL; +# ifndef PKCHECK_SUPPORTS_UID static bool polkitInsecureWarned; +# endif virMutexLock(&priv->lock); action = virNetServerClientGetReadonly(client) ? @@ -2775,19 +2776,21 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, (long long) callerPid, callerUid); virCommandAddArg(cmd, "--process"); + # ifdef PKCHECK_SUPPORTS_UID - supportsuid = true; -# endif - if (supportsuid) { - virCommandAddArgFormat(cmd, "%lld,%llu,%lu", - (long long) callerPid, timestamp, (unsigned long) callerUid); - } else { - if (!polkitInsecureWarned) { - VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure."); - polkitInsecureWarned = true; - } - virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp); + virCommandAddArgFormat(cmd, "%lld,%llu,%lu", + (long long) callerPid, + timestamp, + (unsigned long) callerUid); +# else + if (!polkitInsecureWarned) { + VIR_WARN("No support for caller UID with pkcheck. " + "This deployment is known to be insecure."); + polkitInsecureWarned = true; } + virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp); +# endif + virCommandAddArg(cmd, "--allow-user-interaction"); if (virAsprintf(&ident, "pid:%lld,uid:%d", -- 1.8.3.2

2 2

[libvirt] Release of libvirt-java-0.5.1
by Daniel Veillard 20 Sep '13

20 Sep '13

That release fixes the java-6 compatibility problem of the 0.5.0 build. It is tagged in git and available at the usual place: ftp://libvirt.org/libvirt/java/ as well as in the maven repository for libvirt-java at http://libvirt.org/maven2/org/libvirt/libvirt/ Thanks Wido and Claudio for fixing the issue, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] About 'virsh update-device' for floppy and cdrom
by liyang 20 Sep '13

20 Sep '13

Hi experts: When I did some test, I was puzzled by one thing: When I use "virsh update-device" to update floppy device, always got an error message, "error: internal error unable to execute QEMU command 'change': Could not open'***file':Permission denied".But when I execute command "setenforce 0" befroe "udpate-device", floppy device can be updated. Steps like this: ---------------------------------------------------------------Start # virsh start virt-tests-vm1 Domain virt-tests-vm1 started # cat /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/update_iso.xml <disk type='file' device='floppy'> <driver name='qemu' type='raw'/> <source file='/add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/change_media_old.iso'/> <target dev='fda'/> <readonly/> </disk> # ll /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/change_media_old.iso -rw-r--r--. 1 qemu qemu 1404928 Sep 20 10:48 /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/change_media_old.iso # virsh update-device virt-tests-vm1 /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/update_iso.xml --force error: Failed to update device from /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/update_iso.xml error: internal error unable to execute QEMU command 'change': Could not open '/add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/change_media_old.iso': Permission denied # cat /selinux/enforce 1 # setenforce 0 # virsh update-device virt-tests-vm1 /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/update_iso.xml --force Device updated successfully ---------------------------------------------------------------End But with same command, about cdrom device it worked though "/selinux/enforce" is 1. Steps like this: ---------------------------------------------------------------Start # virsh start virt-tests-vm1 Domain virt-tests-vm1 started # cat /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/update_iso.xml <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/change_media_old.iso'/> <target dev='hdc'/> <readonly/> </disk> # ll /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/change_media_old.iso -rw-r--r--. 1 qemu qemu 1404928 Sep 20 10:58 /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/change_media_old.iso # cat /selinux/enforce 1 # virsh update-device virt-tests-vm1 /add_storage/liyang/github-autotest_new/client/tests/virt/tmp/tmp/update_iso.xml --force Device updated successfully ---------------------------------------------------------------End So I want to know why it's different between 'floppy' and 'cdrom', and what's the difference? Also why floppy needs 'permissive' mode but cdrom doesn't? Wish your help! -- Regards, -------------------------------------------------- Li Yang TEL：+86+25-86630566-8529 EMail：liyang.fnst(a)cn.fujitsu.com --------------------------------------------------

1 0

[libvirt] Schedule for next release
by Daniel Veillard 20 Sep '13

20 Sep '13

If we want to stick to the end of the month schedule we need to enter freeze for 1.1.3 next week, I suggest to do this early on Wed 25 so that we can plan on pushing 1.1.3 on the Tue 1st Oct So unless there is a serious issue, let's plan to freeze next Wed, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [v0.9.12-maint 0/9] CVE fixes
by Eric Blake 19 Sep '13

19 Sep '13

I've completed and pushed my backport work for both CVEs that were patched today, into all branches v0.10.2-maint and newer (basically, we have 0.10.2, then all releases since 1.0.2). One last branch in active use (hello Debian) remains to be patched; but here, the backport work had enough conflict resolutions that I decided to post my work for review first. Daniel P. Berrange (9): Introduce APIs for splitting/joining strings Rename virKillProcess to virProcessKill Rename virPid{Abort, Wait} to virProcess{Abort, Wait} Rename virCommandTranslateStatus to virProcessTranslateStatus Move virProcessKill into virprocess.{h, c} Move virProcess{Kill, Abort, TranslateStatus} into virprocess.{c, h} Include process start time when doing polkit checks Add support for using 3-arg pkcheck syntax for process (CVE-2013-4311) Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296) .gitignore | 1 + configure.ac | 8 + daemon/libvirtd.c | 3 +- daemon/remote.c | 33 +++- libvirt.spec.in | 3 +- po/POTFILES.in | 1 + src/Makefile.am | 2 + src/libvirt_private.syms | 16 +- src/lxc/lxc_container.c | 3 +- src/lxc/lxc_controller.c | 3 +- src/qemu/qemu_agent.c | 3 +- src/qemu/qemu_monitor.c | 3 +- src/qemu/qemu_process.c | 3 +- src/rpc/virnetserverclient.c | 8 +- src/rpc/virnetserverclient.h | 3 +- src/rpc/virnetsocket.c | 22 ++- src/rpc/virnetsocket.h | 3 +- src/uml/uml_driver.c | 3 +- src/util/command.c | 167 ++------------------ src/util/command.h | 8 - src/util/util.c | 64 +------- src/util/util.h | 1 - src/util/virprocess.c | 359 +++++++++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 45 ++++++ src/util/virstring.c | 179 +++++++++++++++++++++ src/util/virstring.h | 40 +++++ tests/Makefile.am | 9 +- tests/testutils.c | 5 +- tests/virstringtest.c | 161 +++++++++++++++++++ 29 files changed, 908 insertions(+), 251 deletions(-) create mode 100644 src/util/virprocess.c create mode 100644 src/util/virprocess.h create mode 100644 src/util/virstring.c create mode 100644 src/util/virstring.h create mode 100644 tests/virstringtest.c -- 1.8.3.1

2 12

[libvirt] [PATCH 0/3] Fix for polkit race condition
by Daniel P. Berrange 19 Sep '13

19 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The following 3 patches have been reviewed on the libvirt-security list as the libvirt side of the fix for polkit CVE-2013-4288. Given that it was already reviewed, I have pushed this. Daniel P. Berrange (3): Also store user & group ID values in virIdentity Ensure system identity includes process start time Add support for using 3-arg pkcheck syntax for process (CVE-2013-4311) configure.ac | 8 ++++++++ daemon/remote.c | 22 ++++++++++++++++++--- libvirt.spec.in | 3 +-- src/access/viraccessdriverpolkit.c | 40 +++++++++++++++++++++++++++++++++----- src/rpc/virnetserverclient.c | 18 +++++++++++++++++ src/util/viridentity.c | 39 +++++++++++++++++++++++++++++++++---- src/util/viridentity.h | 2 ++ 7 files changed, 118 insertions(+), 14 deletions(-) -- 1.8.3.1

3 9

[libvirt] memory pinning problem
by David Weber 19 Sep '13

19 Sep '13

Hi, we try to use vcpu pinning on a 2 socket server with Intel Xeon E5620 cpus, HT enabled and 2*6*16GiB Ram but experience problems if we try to start a guest on the second socket: error: Failed to start domain test error: internal error: process exited while connecting to monitor: kvm_init_vcpu failed: Cannot allocate memory Libvirt version 1.1.1 Linux 3.11-rc7 Because I coudn't find any other service which allowed a 7M file upload, I put the log file and everything else which could perhabs be relevant into a github repository: https://github.com/David-Weber/vcpu-pinning When we try to start a guest on the first node it runs fine: <vcpu placement='static' cpuset='0-3,8-11'>4</vcpu> <numatune> <memory mode='strict' nodeset='0'/> </numatune> Starting it on the second node fails <vcpu placement='static' cpuset='4-7,12-15'>4</vcpu> <numatune> <memory mode='strict' nodeset='1'/> </numatune> Even more strange, starting it with the CPUs of the second node and the memory of the first node works: <vcpu placement='static' cpuset='4-7,12-15'>4</vcpu> <numatune> <memory mode='strict' nodeset='0'/> </numatune> The log file contains these three cases. Using the placement='auto' parameter leads to the same problem. If numad return the second node, the guest won't start. Is this a configuration, a libvirt or a cgroup problem? :) Cheers, David

2 7

[libvirt] Auto-assignment of USB devices and auto-creation of USB hubs
by Jamie Bainbridge 19 Sep '13

19 Sep '13

Hello, I've been helping a customer out this week with assigning specific devices to specific USB controllers inside his KVM VMs. He's got USB1 devices which need a UHCI controller (because of rubbishy Windows device drivers) and USB2 devices which need a EHCI controller ("speed mismatch" on a UHCI hub). I've suggested config similar to this: <controller type='usb' index='0' model='ehci'> </controller> <controller type='usb' index='1' model='piix3-uhci'> </controller> <input type='tablet' bus='usb'/> <hub type='usb'> <address type='usb' bus='1' port='2'/> </hub> <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0xAAAA'/> <product id='0xAAAA'/> </source> <address type='usb' bus='1' port='2.1'/> </hostdev> <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0xBBBB'/> <product id='0xBBBB'/> </source> <address type='usb' bus='1' port='2.2'/> </hostdev> and I explained the concept to him with diagrams like these: UHCI --+-- Tablet (port 1) +-- HUB (port 2) --. +-- Device (port 2.1) +-- Device (port 2.2) UHCI --+-- Tablet (port 1) +-- HUB (port 2) --. +-- HUB (port 2.1) --. | +-- Device (port 2.1.1) | +-- Device (port 2.1.2) | +-- HUB (port 2.2) --. +-- Device (port 2.2.1) (then imagine extending this example out to also include EHCI controller and devices) He's very happy so far and I've just been working it all out through trial and error and reading the libvirt domain specification. My observation is that you can either: a) let libvirt plug everything into the UHCI controller, regardless of what other controllers are there and what order they appear in or b) find out how many ports a controller/hub has through trial and error, manually create USB hubs, and map every single device and port out manually with no middle ground in between. I think it would be way better if users could just assign a USB hostdev to a controller, then let libvirt do all the heavy lifting in regards to hubs and ports. For example, : <controller type='usb' index='0' model='ehci'> </controller> <controller type='usb' index='1' model='piix3-uhci'> </controller> <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x0529'/> <product id='0x0001'/> </source> <address type='usb' bus='1'/> </hostdev> <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x3923'/> <product id='0x709b'/> </source> <address type='usb' bus='1'/> </hostdev> I can see it's already been discussed that we couldn't just implement "port=auto" because we need migration stability: http://www.redhat.com/archives/libvir-list/2011-August/msg00816.html but much like how you add: <controller type='usb' index='0' model='ehci'> </controller> then save the XML, and go "virsh edit" and the controller automagically has a PCI address assigned, we could enter this into the XML: <hostdev mode='subsystem' type='usb' managed='yes'> <source> whatever </source> <address type='usb' bus='1'/> </hostdev> then save the XML, and "virsh edit" again, and all the port/hub stuff would already be there pre-made as required. Any thoughts? Is this worth logging an RFE for? Cheers, Jamie

3 2

Re: [libvirt] [virt-tools-list] [Spice-devel] More on virt-viewer for windows
by Eric Blake 19 Sep '13

19 Sep '13

[adding libvir-list, for some cross-compiling development hints] On 09/17/2013 11:57 AM, Fernando Lozano wrote: > Yes, the libvirt comes grom 0.10.2. I'm running the latest windows > binaries provided by spice-space.org: > > C:\Program Files\VirtViewer\bin>virsh -V > Virsh command line tool of libvirt 0.10.2 Can someone from the Spice community chime in? Why is spice-space.org shipping a Fedora 18 build of libvirt (0.10.2.x) rather than Fedora 19 (1.0.5.x)? Who does the builds, and how often are they updated? >> Process Monitor is only useful if you make system calls; but libvirt is >> choking even before attempting the system calls because mingw is just >> such a hostile programming environment to programs that assume POSIX. > > That's precisely mingw advantage over cigwin: mingw binaries are native > windows binaries, using native windows semantics, not unix emulation. > They provide a better experience for windows users. Welcome to the > wonderful world of cross-platform developent! ;-) Actually, on my personal to-do list is to get a build of virsh working and available from cygwin.com, rather than requiring people to self-build it for cygwin. And since cygwin supports cross-compilation to mingw, just as Fedora does, but with the added advantage of also being able to run mingw binaries without having to worry about bugs in the wine emulation layer, it's actually a bit nicer for getting the best of both worlds when doing cross-compiling (posix development, native testing). If I can ever find the free time... > > >> Gnulib has helped a lot, and often times, it is just a matter of someone >> running under gdb to see where an assumption went wrong to make a quick >> patch to fix an issue. Where it gets tricky is that it is hard to find >> developers willing to do volunteer work on issues for a platform where >> you typically have to pay money before you can even use it. Also, the >> fact that you are using a pre-built version of a relatively old libvirt, >> instead of building your own from the latest sources, makes it hard to >> know what OTHER issues may have been fixed in the meantime (when given a >> choice, developers prefer to debug issues in the latest source, rather >> than trying to figure out which patches to backport to older branches). > I understand that, but I'm trying to be useful as a (windows) tester. If > I could I'd try to help as a developer. cross-compiling is not for the > faint of heart, and learning the first steps require a significant > investment in time. :-( > > Is there a how-to I can follow to generate binaries from the latest > sources? I do have Linux expertize, I use fedora on my personal > computer, but as C developer I can only run "configure; make; sudo make > install". All I've done so far is test cross-compilation from Fedora to mingw (I haven't tested the resulting binaries, only that the build completes without error). I suppose I could try to host the just-built binaries on a site for you to download; let me see what I can figure out. Meanwhile, I used './autobuild.sh' as my guide; which means I more or less did: $ sudo yum install \ mingw64-binutils \ mingw64-cpp \ mingw64-crt \ mingw64-curl \ mingw64-dbus \ mingw64-filesystem \ mingw64-gcc \ mingw64-gcc-c++ \ mingw64-gettext \ mingw64-gmp \ mingw64-gnutls \ mingw64-headers \ mingw64-libgcrypt \ mingw64-libgpg-error \ mingw64-libidn \ mingw64-libssh2 \ mingw64-libtasn1 \ mingw64-libxml2 \ mingw64-nettle \ mingw64-openssl \ mingw64-p11-kit \ mingw64-pkg-config \ mingw64-portablexdr \ mingw64-termcap \ mingw64-wine-gecko \ mingw64-win-iconv \ mingw64-zlib $ git clone git://libvirt.org/libvirt.git $ cd libvirt $ ./autogen.sh --help # see note [1] $ mkdir build-mingw $ cd build-mingw $ ../configure \ PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" \ PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ CC="x86_64-w64-mingw32-gcc" \ --build=$(uname -m)-w64-linux \ --host=x86_64-w64-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \ --without-libvirtd \ --without-python $ make [1] Yeah, we probably ought to have a more convenient way to bootstrap libvirt.git for VPATH builds without having to rely on the hack that options unrecognized by ./autogen.sh are passed on to ./configure, and that ./configure --help is the easiest way to do avoid polluting the top-level tree in a way that would interfere with VPATH builds. I use a VPATH build for my mingw cross-compilation in part so I can test both 32-bit and 64-bit binaries in parallel directories. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

6 8

[libvirt] [v0.9.12-maint 0/5] building 0.9.12 on newer systems
by Eric Blake 19 Sep '13

19 Sep '13

I'm pushing these backports under the build-breaker rule; they were all necessary for me to complete 'make check' on this old branch from within Fedora 19. It will set the stage for the CVE patches in another series. Daniel P. Berrange (1): Fix TLS tests with gnutls 3 Eric Blake (3): build: allow building with newer glibc-headers and -O0 build: more workarounds for if_bridge.h build: avoid confusing make with raw name 'undefine' Jiri Denemark (1): virsh: Fix POD syntax configure.ac | 20 +++++++++++++++++--- m4/virt-compile-warnings.m4 | 8 ++++++-- src/util/virnetdevbridge.c | 18 ++++++++++++++++++ tests/Makefile.am | 10 ++++++---- tests/virnettlscontexttest.c | 25 +++++++++++++++---------- tests/{undefine => virsh-undefine} | 0 tools/virsh.pod | 4 ++-- 7 files changed, 64 insertions(+), 21 deletions(-) rename tests/{undefine => virsh-undefine} (100%) -- 1.8.3.1

1 5

[libvirt] Remove more hardcoded paths from libvirtd --help
by Christophe Fergeau 18 Sep '13

18 Sep '13

In my previous 2 patches, I used constants defined in remote_driver.h to build privileged libvirtd --help output. However, there are a few more constants in this header that we can use to build the --help output, this series addresses that. Christophe

2 4

[libvirt] [PATCH] docs: fix virEventAddHandle return details
by Jonathan Lebon 18 Sep '13

18 Sep '13

In commit 6d41cb8, the interface for virEventAddHandleFunc was changed. This patch updates the documentation for virEventAddHandle to reflect the new significance of the return value. Also, both functions now mention -1 for failure. --- include/libvirt/libvirt.h.in | 4 ++-- src/util/virevent.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a47e33c..7944dfb 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3643,8 +3643,8 @@ typedef void (*virEventHandleCallback)(int watch, int fd, int events, void *opaq * If 'ff' callbacks are invoked directly from the virEventRemoveHandleFunc * they will likely deadlock in libvirt. * - * Returns a handle watch number to be used for updating - * and unregistering for events + * Returns -1 if the file handle cannot be registered, otherwise a handle + * watch number to be used for updating and unregistering for events */ typedef int (*virEventAddHandleFunc)(int fd, int event, virEventHandleCallback cb, diff --git a/src/util/virevent.c b/src/util/virevent.c index 886cb6d..fde29a2 100644 --- a/src/util/virevent.c +++ b/src/util/virevent.c @@ -48,7 +48,8 @@ static virEventRemoveTimeoutFunc removeTimeoutImpl = NULL; * * Register a callback for monitoring file handle events. * - * Returns -1 if the file handle cannot be registered, 0 upon success + * Returns -1 if the file handle cannot be registered, otherwise a handle + * watch number to be used for updating and unregistering for events */ int virEventAddHandle(int fd, -- 1.8.3.1

2 1

[libvirt] [PATCH] Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296)
by Eric Blake 18 Sep '13

18 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The 'stats' variable was not initialized to NULL, so if some early validation of the RPC call fails, it is possible to jump to the 'cleanup' label and VIR_FREE an uninitialized pointer. This is a security flaw, since the API can be called from a readonly connection which can trigger the validation checks. This was introduced in release v0.9.1 onwards by commit 158ba8730e44b7dd07a21ab90499996c5dec080a Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Wed Apr 13 16:21:35 2011 +0100 Merge all returns paths from dispatcher into single path Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Approved on the security list, and pushing on Daniel's behalf. I'm now working on backporting this to the various v*-maint branches. daemon/remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/remote.c b/daemon/remote.c index 6b082cf..3ac528c 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1146,7 +1146,7 @@ remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, remote_domain_memory_stats_ret *ret) { virDomainPtr dom = NULL; - struct _virDomainMemoryStat *stats; + struct _virDomainMemoryStat *stats = NULL; int nr_stats; size_t i; int rv = -1; -- 1.8.3.1

1 0

[libvirt] [PATCH 0/8] Normalization API
by Michal Privoznik 18 Sep '13

18 Sep '13

A while ago I've invented this vshCompleteXMLFromDomain() function to increase device-detach intelligence. Basically, it took user's XML and tried to find matching device in domain's XML. However, it was kind of buggy - finding the matching device uses string comparison. This works on text values. It doesn't on integer ones (who would expect that). So prior the lookup process, we need to normalize the integer values (and whole XML). However, this can't be done on the client side, since he has no knowledge which values are integer and which are not. Therefore we need a new API. Michal Privoznik (8): domain_conf: Introduce virDomainDeviceDefFormat Introduce new virDomainNormalizeXML API remote_driver: Implement virDomainNormalizeXML virsh: Expose virDomainNormalizeXML qemu: Implement vimDomainNormalizeXML domain_conf: Move MAC generation to post parse callback virDomainDeviceDefParse: Make PostParse callback call optional virsh: Resurrect vshCompleteXMLFromDomain daemon/remote.c | 50 ++++++++ include/libvirt/libvirt.h.in | 5 + python/generator.py | 1 + python/libvirt-override-api.xml | 7 ++ python/libvirt-override.c | 30 +++++ src/conf/domain_conf.c | 180 ++++++++++++++++------------- src/conf/domain_conf.h | 7 +- src/driver.h | 7 ++ src/libvirt.c | 51 ++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/libxl/libxl_driver.c | 12 +- src/lxc/lxc_driver.c | 6 +- src/openvz/openvz_conf.c | 1 + src/openvz/openvz_driver.c | 12 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_command.c | 7 +- src/qemu/qemu_driver.c | 51 +++++++- src/remote/remote_driver.c | 40 +++++++ src/remote/remote_protocol.x | 20 +++- src/uml/uml_driver.c | 4 +- src/vbox/vbox_tmpl.c | 5 +- src/vmx/vmx.c | 2 + src/xen/xend_internal.c | 6 +- src/xen/xm_internal.c | 8 +- src/xenapi/xenapi_driver.c | 1 + src/xenxs/xen_sxpr.c | 1 + src/xenxs/xen_xm.c | 1 + tests/openvzutilstest.c | 1 - tests/qemuhotplugtest.c | 3 +- tools/virsh-domain.c | 249 +++++++++++++++++++++++++++++++++++++++- tools/virsh.pod | 8 ++ 32 files changed, 666 insertions(+), 118 deletions(-) -- 1.8.1.5

4 21

[libvirt] [PATCH] doc: fix XML for the RNG device example
by Giuseppe Scrivano 18 Sep '13

18 Sep '13

Add a missing '/' to close the "source" element. Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- A minor detail that I have noticed while I copy-pasting the example. docs/formatdomain.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a927643..3689399 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4903,8 +4903,8 @@ qemu-kvm -net nic,model=? /dev/null <backend model='random'>/dev/random</backend>  <backend model='egd' type='udp'> - <source mode='bind' service='1234'> - <source mode='connect' host='1.2.3.4' service='1234'> + <source mode='bind' service='1234'/> + <source mode='connect' host='1.2.3.4' service='1234'/> </backend> </rng> </devices> -- 1.8.3.1

2 1

[libvirt] Integrating LiSA into libvirt
by Andreea Hodea 18 Sep '13

18 Sep '13

My name is Andreea and I am a member of LiSA team. LiSA stands for Linux Switching Appliance and offers a software switch that switches packets at Layer 2 and Layer 3. It is an open source project under development, you can find more about it from lisa.mindbit.ro or from https://github.com/lisa-project/. One of the development directions of LiSA is to integrate it into libvirt. First I'll state the motivation for such an integration and then I will describe a use case. The main reasons for extending libvirt network component with LiSA are related to the fact that different hypervisors offer different switching engines with different capabilities. By integrating LiSA into libvirt, the virtual machines would connect to LiSA switch ports as they were linked through a physical switch. Hence, with LiSA, the switching engine would offer the same switching capabilities independent of hypervisor. Moreover, if I understand correctly, in libvirt switching configurations are possible either through a set of commands in virsh or directly within a XML file. One of LiSA components is swcli that is a CLI for configuring and retrieving configurations of the software switch. Through swcli, the switching configurations (including VLANs, trunk or access mode interfaces etc.) are made through a CISCO-IOS like set of commands. I think this is a nice-to-have because it would separate complex network configurations from NIC configuration. That is, through libvirt the machines would just connect to the switch and other switching configurations, simple or complex, would be made from swcli. In other words, the XML file would remain simple and readable while the user would still be able to make switching specific configurations. In conclusion, LiSA and libvirt would make a great team for building a complex networking model, without complicating the setup of a virtual network. Scenario of where LiSA fits into libvirt =========================== I thought at the following scenario: two virtual machines linked together through a LiSA switch, i.e. the LiSA switch being the physical machine running LiSA. We, LiSA team, started by studying the virt-manager interface and figured out that an entry in the "Source device" drop down list when configuring a domain NIC should suffice our goal for the moment. When applying these changes, the XML configuration file should contain an interface tag of type "lisa-switch" or something similar. Therefore, a patch to libvirt for integrating LiSA would contain: - the implementation of two functions - virNetDevLisaAddPort - virNetDevLisaRemovePort - and a new interface type (XML level) for network configuration. I would like to have your feedback on the ideas above. Thanks, Andreea

4 4

[libvirt] [PATCH 1/2] daemon: Fix 'caert.pem' typo in privileged help output
by Christophe Fergeau 18 Sep '13

18 Sep '13

The help message indicates that the CA certificate is $sysconfdir/pki/CA/caert.pem while the actual path is $sysconfdir/pki/CA/cacert.pem This commit also fixes all translations files (through sed -i) to avoid trivial fuzzy translations. Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> --- daemon/libvirtd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index c9cd1a1..87d42b2 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1063,7 +1063,7 @@ daemonUsage(const char *argv0, bool privileged) " %s/run/libvirt/libvirt-sock-ro\n" "\n" " TLS:\n" - " CA certificate: %s/pki/CA/caert.pem\n" + " CA certificate: %s/pki/CA/cacert.pem\n" " Server certificate: %s/pki/libvirt/servercert.pem\n" " Server private key: %s/pki/libvirt/private/serverkey.pem\n" "\n" -- 1.8.3.1

3 5

[libvirt] Operation not permitted when start vm
by yue 18 Sep '13

18 Sep '13

hi,all please look at the error. env: libvirt-0.10.2-18.el6_4.5.x86_64 2.6.32-358.6.2.el6.x86_64 centos6.4 Thread-6291::ERROR::2013-09-18 12:44:21,205::vm::683::vm.Vm::(_startUnderlyingVm) vmId=`24f7e975-9aa5-4a14-b0f0-590add14c8b5`::The vm start process failed Traceback (most recent call last): File "/us r/share/vdsm/vm.py", line 645, in _startUnderlyingVm self._run() File "/usr/share/vdsm/libvirtvm.py", line 1529, in _run self._connection.createXML(domxml, flags), File "/usr/lib64/python2.6/site-packages/vdsm/libvirtconnection.py", line 83, in wrapper ret = f(*args, **kwargs) File "/usr/lib64/python2.6/site-packages/libvirt.py", line 2645, in createXML if ret is None:raise libvirtError('virDomainCreateXML() failed', conn=self) libvirtError: internal error Process exited while reading console log output: char device redirected to /dev/pts/4 qemu-kvm: -drive file=/rhev/data-center/7828f2ae-955e-4e4b-a4bb-43807629dc52/d028d521-d4a9-4dd7-a0fe-3e9b60e7c4e4/images/ac025dc1-4e25-4b71-8c56-88dcb61b9f09/cae1bb2d-0529-4287-95a3-13dcb14f082f,if=none,id=drive-ide0-0-0,format=qcow2,serial=ac025dc1-4e25-4b71-8c56-88dcb61b9f09,cache=none,werror=stop,rerror=stop,aio=n ative: could not open disk image /rhev/data-center/7828f2ae-955e-4e4b-a4bb-43807629dc52/d028d521-d4a9-4dd7-a0fe-3e9b60e7c4e4/images/ac025dc1-4e25-4b71-8c56-88dcb61b9f09/cae1bb2d-0529-4287-95a3-13dcb14f082f: Operation not permitted

2 1

[libvirt] Doc v2: How to use NPIV in libvirt
by Osier Yang 18 Sep '13

18 Sep '13

Thanks for John Ferlan's lots of internal feedbacks, I believe it's more readable, and better orgnized now. Should we create a page for it under http://libvirt.org/deployment.html or add it in WIKI? ========================================== NPIV in libvirt NPIV (N_Port ID Virtualization) is a Fibre Channel technology to share a single physical Fibre Channel HBA with multiple virtual ports. Henceforth known as a "virtual port" or "virtual Host Bus Adapter" (vHBA), each virtual port is identified by its own WWPN (Word Wide Port Name) and WWNN (Word Wide Node Name). In the virtualization world the vHBA controls the LUNs for virtual machines. The libvirt implementation provides flexibility to configure the LUN's either directly to the virtual machine or as part of a storage pool which then can be configured for use on a virtual machine. NPIV support in libvirt was first added to libvirt 0.6.5; however, the following sections will primarily describe NPIV functionality as of the current libvirt release, 1.1.2. There will be a troubleshooting and prior version considerations section to describe some historical differences. 1) Discovery Discovery of HBA(s) capable of NPIV is provided through the virsh command 'virsh nodedev-list --cap vports'. If no HBA is returned, then the host configuration should be checked. The XML output from the command "virsh nodedev-dumpxml" will list fields <name>, <wwnn>, and <wwpn> to be used in order to create a vHBA. Take care to also note the <max_vports> value as this lets you know if the HBA is going to exceed the maximum vHBA supported. The following output indicates a host that has two HBAs to support vHBA and the layout of a HBA's XML: # virsh nodedev-list --cap vports scsi_host4 scsi_host5 # virsh nodedev-dumpxml scsi_host5 <device> <name>scsi_host5</name> <parent>pci_0000_04_00_1</parent> <capability type='scsi_host'> <host>5</host> <capability type='fc_host'> <wwnn>2001001b32a9da4e</wwnn> <wwpn>2101001b32a9da4e</wwpn> <fabric_wwn>2001000dec9877c1</fabric_wwn> </capability> <capability type='vport_ops'> <max_vports>164</max_vports> <vports>5</vports> </capability> </capability> </device> The "max_vports" value indicates there are a possible of 164 vports available for use in the HBA configuration. The "vports" value indicates the number of vports currently being used. Support for detection of HBA's capable of NPIV support prior to libvirt 1.0.4 is described in the "Troubleshooting" section. 2) Creation of a vHBA using the node device driver In order to create a vHBA using the node device driver, select an HBA with available "vport" space, use the HBA "<name>" field as the "<parent>" field in the following XML: <device> <parent>scsi_host5</parent> <capability type='scsi_host'> <capability type='fc_host'> </capability> </capability> </device> Then create the vHBA with the command "virsh nodedev-create" (assuming above XML file is named "vhba.xml"): # virsh nodedev-create vhba.xml Node device scsi_host6 created from vhba.xml NOTE: If you specify "name" for the vHBA, then it will be ignored. The kernel will automatically pick the next SCSI host name in sequence not already used. The "wwpn" and "wwnn" values will be automatically generated by libvirt. In order to see the generated vHBA XML, use the command "virsh nodedev-dumpxml" as follows: # virsh nodedev-dumpxml scsi_host6 <device> <name>scsi_host6</name> <parent>scsi_host5</parent> <capability type='scsi_host'> <capability type='fc_host'> <wwnn>2001001b32a9da5e</wwnn> <wwpn>2101001b32a9da5e</wwpn> </capability> </capability> </device> This vHBA will only be defined as long the host is not rebooted. In order to create a persistent vHBA, one must use a libvirt storage pool (see next section). 3) Creation of vHBA by the storage pool By design, vHBAs managed by the node device driver are transient across host reboots. It is recommended to define a libvirt storage pool based on the vHBA in order to preserve the vHBA configuration. Using a storage pool has two primary advantage, first the libvirt code will find the LUN's path via simple virsh command output and second migration of virtual machine's requires only defining and starting a storage pool with the same vHBA name on the target machine if you use the LUN with libvirt storage pool and volume name in virtual machine config (see section 5). In order to create a persistent vHBA configuration create a libvirt 'scsi' storage pool using the XML as follows: <pool type='scsi'> <name>poolvhba0</name> <source> <adapter type='fc_host' wwnn='20000000c9831b4b' wwpn='10000000c9831b4b'/> </source> <target> <path>/dev/disk/by-path</path> <permissions> <mode>0700</mode> <owner>0</owner> <group>0</group> </permissions> </target> </pool> You must use the "type='scsi'" for the pool; The source adapter type must be "fc_host". Attributes "wwnn" and "wwpn" are provided as the unique identifier for the vHBA to be created. There is an optional attribute "parent" for source the adapter. It indicates the name of the HBA which you want to use to create the vHBA. Its value should be consistent with what node device driver dumps (e.g. scsi_host5). If it's not specified, libvirt will pick the first HBA capable of NPIV that has not exceeded the maximum vports it supports. NOTE: You can also create a scsi pool with source adapter type "fc_host" for a HBA, and in that case the attribute "parent" is not necessary. If you prefer to choose which parent HBA to use for your vHBA, then you must provide the parent, wwnn, and wwpn in the source adapter XML as follows: <source> <adapter type='fc_host' parent='scsi_host5' wwnn='20000000c9831b4b' wwpn='10000000c9831b4b'/> </source> To define the persistent pool (assuming above XML is named as poolvhba0.xml): # virsh pool-define poolvhba0.xml NOTE: One must use pool-define to define the pool as persistent, since a pool created by pool-create is transient and it will disappear after a system reboot or a libvirtd restart. To start the pool: # virsh pool-start poolvhba0 To destroy the pool: # virsh pool-destroy poolvhba0 When starting the pool, libvirt will check if the vHBA with same "wwpn:wwpn" already exists. If it does not exist, a new vHBA with the provided "wwpn:wwnn" will be created. Correspondingly，when destroying the pool the vHBA is destroyed too. Finally, in order to ensure that subsequent reboots of your host will automatically define vHBA's for use in virtual machines, one must set the storage pool autostart feature as follows (assuming the name of the created pool was "poolvhba0"): # virsh pool-autostart poolvhba0 4) Finding LUNs on your vHBA 4.1) Utilizing LUN's from a vHBA created by the storage pool Assuming that a storage pool was created for a vHBA, use the command "virsh vol-list" command in order to generate a list of available LUN's on the vHBA, as follows: # virsh vol-list poolvhba0 --details Name Path --------------------------------------------------------------------- unit:0:2:0 /dev/disk/by-path/pci-0000:04:00.1-fc-0x203500a0b85ad1d7-lun-0 block The list of LUN names displayed will be available for use as disk volumes in virtual machine configurations. 4.2) Utilizing LUN's from a vHBA created using the node device driver Finding an available LUN from a vHBA created using the node device driver can be achieved either via use of the "virsh nodedev-list" command or through manual searching of the hosts system file system. Use the "virsh nodedev-list --tree | more" and find the parent HBA to which the vHBA was configured. The following example lists the pertinent part of the tree for the example HBA "scsi_host5": +- scsi_host5 | +- scsi_host7 +- scsi_target5_0_0 | | | +- scsi_5_0_0_0 | +- scsi_target5_0_1 | | | +- scsi_5_0_1_0 | +- scsi_target5_0_2 | | | +- scsi_5_0_2_0 | | | +- block_sdb_3600a0b80005adb0b0000ab2d4cae9254 | +- scsi_target5_0_3 | +- scsi_5_0_3_0 The "block_" indicates it's a block device, the "sdb_" is a convention to signify the the short device path of "/dev/sdb", and the short device path or the number can be used to search the "/dev/disk/by-{id,path,uuid,label}/" name space for the specific LUN by name, for example: # ls /dev/disk/by-id/ | grep 3600a0b80005adb0b0000ab2d4cae9254 scsi-3600a0b80005adb0b0000ab2d4cae9254 # ls /dev/disk/by-path/ -l | grep sdb lrwxrwxrwx. 1 root root 9 Sep 16 05:58 pci-0000:04:00.1-fc-0x203500a0b85ad1d7-lun-0 -> ../../sdb As an option to using "virsh nodedev-list", it is possible to manually iterate through the "/sys/bus/scsi/device" and "/dev/disk/by-path" directory trees in order to find a LUN using the following steps: 1. Iterate over all the directories beginning with the SCSI host number of the vHBA under the "/sys/bus/scsi/devices" tree. For example, if the SCSI host number is 6, the command would be: # ls /sys/bus/scsi/devices/6:* -d /sys/bus/scsi/devices/6:0:0:0 /sys/bus/scsi/devices/6:0:1:0 /sys/bus/scsi/devices/6:0:2:0 /sys/bus/scsi/devices/6:0:3:0 2. List the "block" names of all the entries belongs to the SCSI host as follows: # ls /sys/bus/scsi/devices/6:*/block/ /sys/bus/scsi/devices/6:0:2:0/block/: sdc /sys/bus/scsi/devices/6:0:3:0/block/: sdd This indicates that "scsi_host6" has two LUNs, one is attached to "6:0:2:0", with the short device name "sdc", and the other is attached to "6:0:3:0", with the short device name "sdd". 3. Determine the stable path to the LUN. Unfortunately a device name such as "sdc" is not stable enough for use by libvirt. In order to get the stable path, use the "ls -l /dev/disk/by-path" and look for the "sdc" path: # ls -l /dev/disk/by-path/ | grep sdc lrwxrwxrwx. 1 root root 9 Sep 10 22:28 pci-0000:08:00.1-fc-0x205800a4085a3127-lun-0 -> ../../sdc Thus "/dev/disk/by-path/pci-0000:08:00.1-fc-0x205800a4085a3127-lun-0" is the stable path of the LUN attached to address "6:0:2:0" and will be used in virtual machine configurations. 5) Virtual machine configuration change to use vHBA LUN Adding the vHBA LUN to the virtual machine configuration is done via an XML modification to the virtual machine. 5.1) Using a LUN from a vHBA created by the storage pool Adding the vHBA LUN to the virtual machine is handled via XML to create a disk volume on the virtual machine with the following example XML: <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='poolvhba0' volume='unit:0:2:0'/> <target dev='hda' bus='ide'/> </disk> In particular note the usage of the "<source>" directive with the "pool" and "volume" attributes listing the storage pool and the short volume name. 5.2) Using a LUN from a vHBA created using the node device driver Configuring a vHBA on the virtual machine can be done with its stable path (path of {by-id|by-path|by-uuid|by-label}). The following is an XML example of a direct LUN path: <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/disk/by-path/pci-0000\:04\:00.1-fc-0x203400a0b85ad1d7-lun-0'/> <target dev='sda' bus='scsi'/> </disk> NOTE: The use of "device='disk'" and the long "<source>" device name. The example uses the "by-path" option. The backslashes prior to the colons are required, since colons can be considered as delimiters. 5.3) To configure the LUN as a pass-through device, use the following XML examples. For a vHBA created using the node device driver: <disk type='volume' device='lun'> <driver name='qemu' type='raw'/> <source dev='/dev/disk/by-path/pci-0000\:04\:00.1-fc-0x203400a0b85ad1d7-lun-0'/> <target dev='sda' bus='scsi'/> </disk> NOTE: The use of "device='lun'" and again the long "<source>" device name. Again, the backslashes prior to the colons are required. For a vHBA created by a storage pool: <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='poolvhba0' volume='unit:0:2:0'/> <target dev='hda' bus='ide'/> </disk> Although it is possible to use the LUN's path as the disk source for a vHBA created by the storage pool, it is recommended to use libvirt storage pool and storage volume instead. 6) Destroying a vHBA A vHBA created by the storage pool can be destroyed by the virsh command "pool-destroy", for example: # virsh pool-destroy poolvhba0 NOTE: If the storage pool is persistent, the vHBA will also be removed by libvirt when it destroys the storage pool. A vHBA created using the node device driver can be destroyed by the command "virsh nodedev-destroy", for example (assuming that scsi_host6 was created as shown earlier): # virsh nodedev-destroy scsi_host6 Destroying a vHBA removes it just as a reboot would do since the node device driver does not support persistent configurations. 7) Troubleshooting 7.1) Discovery of HBA capable of NPIV prior to 1.0.4 Prior to libvirt 1.0.4, discovery of HBAs capable of NPIV requires checking each of the HBAs on the host for the capability flag "vport_ops", as follows: First you need to find out all the HBA by capability flag "scsi_host": # virsh nodedev-list --cap scsi_host scsi_host0 scsi_host1 scsi_host2 scsi_host3 scsi_host4 scsi_host5 Now check each HBA to find one with the "vport_ops" capability, either one at a time as follows: # virsh nodedev-dumpxml scsi_host3 <device> <name>scsi_host3</name> <parent>pci_0000_00_08_0</parent> <capability type='scsi_host'> <host>3</host> </capability> </device> That says "scsi_host3" doesn't support vHBA # virsh nodedev-dumpxml scsi_host5 <device> <name>scsi_host5</name> <parent>pci_0000_04_00_1</parent> <capability type='scsi_host'> <host>5</host> <capability type='fc_host'> <wwnn>2001001b32a9da4e</wwnn> <wwpn>2101001b32a9da4e</wwpn> <fabric_wwn>2001000dec9877c1</fabric_wwn> </capability> <capability type='vport_ops' /> </capability> </device> But "scsi_host5" supports it. NOTE: In addition to libvirt 1.0.4 automating the lookup of HBA's capable of supporting a vHBA configuration, the XML tags "max_vports" and "vports" will describe the maximum vports allowed and the current vports in use. As an alternative and smarter way, you can avoid above cumbersome steps by simple script like: for i in $(virsh nodedev-list --cap scsi_host); do if virsh nodedev-dumpxml $i | grep vport_ops > /dev/null; then echo $i; fi done NOTE: It is possible that node device is named "pci_10df_fe00_scsi_host_0". This is because libvirt supports two backends for the node device driver ("udev" and "HAL"), but they lead to completely different naming styles. The udev backend is preferred over the HAL backend since HAL support is in maintenance mode. The udev backend is more common; however, if your destribution packager built the libvirt binaries without the udev backend, then the more complicated names such as "pci_10df_fe00_scsi_host_0" must be used. 7.2) Creation of a vHBA using the node device driver prior to 0.9.10 For libvirt prior to 0.9.10, you will need to specify the "wwnn" and "wwpn" manually when creating a vHBA, example XML as follows: <device> <name>scsi_host6</name> <parent>scsi_host5</parent> <capability type='scsi_host'> <capability type='fc_host'> <wwnn>2001001b32a9da5e</wwnn> <wwpn>2101001b32a9da5e</wwpn> </capability> </capability> </device> 7.3) Creation of storage pool based on vHBA prior to 1.0.5 Prior to libvirt 1.0.5, one can define a "scsi" type pool based on a vHBA by it's SCSI host name (e.g. "host5" in XML below), using an example XML as follows: <pool type='scsi'> <name>poolhba0</name> <uuid>e9392370-2917-565e-692b-d057f46512d6</uuid> <capacity unit='bytes'>0</capacity> <allocation unit='bytes'>0</allocation> <available unit='bytes'>0</available> <source> <adapter name='host0'/> </source> <target> <path>/dev/disk/by-path</path> <permissions> <mode>0700</mode> <owner>0</owner> <group>0</group> </permissions> </target> </pool> There are two disadvantage of using the SCSI host name as the source adapter. First the SCSI host number is not stable, thus it may cause trouble for your storage pool after a system reboot. Second, the adapter name (e.g. "host5") is not consistent with node device name (e.g. "scsi_host5"). Moreover, using the SCSI host name as the source adapter doesn't allow you to create a vHBA. NOTE: Since 1.0.5, the source adapter name was changed to be consistent with node device name, thus the second disadvantage is destroyed. Regards, Osier

1 1

[libvirt] [PATCH 0/3] Libvirt Wireshark dissector
by Yuto KAWAMURA(kawamuray) 18 Sep '13

18 Sep '13

From: "Yuto KAWAMURA(kawamuray)" <kawamuray.dadada(a)gmail.com> Introduce Wireshark dissector plugin which adds support to Wireshark for dissecting libvirt RPC protocol. This feature was presented by Michal Privoznik year before last[1]. But it did only support dissecting packet headers. This time I enhanced that dissector to support dissecting packet payload. Furthermore, I provide code generator of dissector. So you can get fresh build of dissector from libvirt RPC specification file at any version you like. [1] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html Yuto KAWAMURA(kawamuray) (3): Exclude files in VC_LIST_ALWAYS_EXCLUDE_REGEX from bracket-spacing-check Introduce Libvirt Wireshark dissector Add sample output of Wireshark dissector Makefile.am | 3 +- cfg.mk | 10 +- configure.ac | 69 +- devtools/wireshark-dissector/Makefile.am | 28 + devtools/wireshark-dissector/README.md | 25 + .../samples/libvirt-sample.pdml | 7970 ++++++++++++++++++++ devtools/wireshark-dissector/src/.gitignore | 2 + devtools/wireshark-dissector/src/Makefile.am | 31 + devtools/wireshark-dissector/src/moduleinfo.h | 36 + devtools/wireshark-dissector/src/packet-libvirt.c | 512 ++ devtools/wireshark-dissector/src/packet-libvirt.h | 127 + devtools/wireshark-dissector/src/plugin.c | 27 + devtools/wireshark-dissector/util/genxdrstub.pl | 1009 +++ 13 files changed, 9842 insertions(+), 7 deletions(-) create mode 100644 devtools/wireshark-dissector/Makefile.am create mode 100644 devtools/wireshark-dissector/README.md create mode 100644 devtools/wireshark-dissector/samples/libvirt-sample.pdml create mode 100644 devtools/wireshark-dissector/src/.gitignore create mode 100644 devtools/wireshark-dissector/src/Makefile.am create mode 100644 devtools/wireshark-dissector/src/moduleinfo.h create mode 100644 devtools/wireshark-dissector/src/packet-libvirt.c create mode 100644 devtools/wireshark-dissector/src/packet-libvirt.h create mode 100644 devtools/wireshark-dissector/src/plugin.c create mode 100755 devtools/wireshark-dissector/util/genxdrstub.pl -- 1.8.1.5

5 14

[libvirt] [PATCH v3 0/7] add new API virConnectGetCPUModelNames
by Giuseppe Scrivano 18 Sep '13

18 Sep '13

This series adds a new API "virConnectGetCPUModelNames" that allows to retrieve the list of CPU models known by the hypervisor for a specific architecture. This new function is mainly needed by virt-manager to not read directly the cpu_map.xml file (it could also be different when accessing a remote daemon). I have amended all the comments reported for v2. *v3 main changes - virConnectGetCPUModelNames returns the number of models instead of 0 on success. - Use VIR_INSERT_ELEMENT instead of VIR_EXPAND_N. - Fix a potential memory leak in the python bindings. - Move virsh changes to a separate commit. - Remove API documentation from libvirt.h. *v2 main changes - set a hard limit for the number of CPU models that is possible to fetch from a remote server. - Use VIR_EXPAND_N instead of VIR_REALLOC_N. - s|1.1.2|1.1.3| Giuseppe Scrivano (7): libvirt: add new public API virConnectGetCPUModelNames cpu: add function to get the models for an arch virConnectGetCPUModelNames: implement the remote protocol virConnectGetCPUModelNames: add the support for qemu virConnectGetCPUModelNames: add the support for the test protocol virsh: add function to get the CPU models for an arch python: add bindings for virConnectGetCPUModelNames daemon/remote.c | 43 +++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 4 +++ python/generator.py | 1 + python/libvirt-override-api.xml | 7 +++++ python/libvirt-override.c | 52 +++++++++++++++++++++++++++++++++++++ python/libvirt-override.py | 11 ++++++++ src/cpu/cpu.c | 56 ++++++++++++++++++++++++++++++++++++++++ src/cpu/cpu.h | 3 +++ src/driver.h | 7 +++++ src/libvirt.c | 46 +++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 ++++ src/qemu/qemu_driver.c | 14 ++++++++++ src/remote/remote_driver.c | 57 +++++++++++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 20 ++++++++++++++- src/remote_protocol-structs | 11 ++++++++ src/test/test_driver.c | 11 ++++++++ tools/virsh-host.c | 54 ++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 5 ++++ 19 files changed, 407 insertions(+), 1 deletion(-) -- 1.8.3.1

4 25

[libvirt] [PATCH] qemu: Avoid dangling job in qemuDomainSetBlockIoTune
by Jiri Denemark 18 Sep '13

18 Sep '13

virDomainSetBlockIoTuneEnsureACL was incorrectly called after we already started a job. As a result of this, the job was not cleaned up when an access driver had forbidden the action. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0763f9b..8a302d1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14673,15 +14673,15 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) return -1; + if (virDomainSetBlockIoTuneEnsureACL(dom->conn, vm->def, flags) < 0) + goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; priv = vm->privateData; cfg = virQEMUDriverGetConfig(driver); - if (virDomainSetBlockIoTuneEnsureACL(dom->conn, vm->def, flags) < 0) - goto cleanup; - if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto endjob; -- 1.8.3.2

2 2

[libvirt] Announce: Nuxis 1.3.0 and 2.0.0
by Nuno Fernandes 18 Sep '13

18 Sep '13

Hello, Nuxis is an integrated solution for virtualization management. Some of its features are centralized management of nodes/physical machines and virtual machines, management of virtual networks, storage management, ISO management, monitoring and statistics charts, backup/restore of appliance configurations, import from and export to other virtualization systems using the OVF format, access control, support for multiple operating systems on 32-bit and 64-bit architectures, including Linux and Windows, paravirtualized hardware acceleration drivers, live migrate, PXE boot, Web management, storage management with LVM, and more. We are pleased to announce major version 2.0.0. It's now based on 64-bit CentOS6 with the xen4centos repository. There are many bugfixes and a few enhancements: - physical volume resizing - triggering a warning message when one snapshot is out of free space - implementation of Storage iSCSI configuration and support. - Libvirt has been updated to 0.10.2.7, Xen to 4.2.3, and the kernel to 3.4.61. For more information please check http://freecode.com/projects/etvm and homepage http://www.nuxis.com. As always the code is at github https://github.com/eurotux/ETVA. We have a users mailling list at http://mailman.nuxis.com/pipermail/nuxis-users/ Best regards, Nuno Fernandes

1 0

[libvirt] [PATCH 0/2] Add support for device blkio iops and bps throttle
by hzguanqiang＠gmail.com 18 Sep '13

18 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> The patches add support for setting/getting blkio read/write bps/iops throttle per-device with blkio cgroup. Guan Qiang (2): blkiotune: add support for device iops and bps throttle blkiotune: add virsh support for blkiotune.throttle.iops/bps docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 40 ++ src/conf/domain_conf.c | 115 +++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 9 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_driver.c | 579 ++++++++++++++++++-- src/util/vircgroup.c | 79 ++- src/util/vircgroup.h | 8 +- .../qemuxml2argv-blkiotune-device.xml | 4 + tools/virsh-domain.c | 64 +++ tools/virsh.pod | 32 +- 14 files changed, 883 insertions(+), 113 deletions(-) -- 1.7.9.5

3 2

[libvirt] [RFC] Add iommu group commands
by Li Zhang 18 Sep '13

18 Sep '13

Hi, Currently, we need to assign the iommu group to guests manually. It needs to know the groups information. I think we can add some iommu group commands to provide users groups information. I can think of these commands as the following: #virsh group-list <--active> * list all the groups in the system with VFIO * --active: list the active groups which have been used by guests. #virsh group-devs <groupnum> * list the devices in the group. *If groupnum is not specified, it will list every groups' devices. # virsh group-dumpxml <groupnum> * dump the group's xml configuration. dumxml file for example: <iommuGroup number='1'> <address domain='0x0001' bus='0x40' slot='0x00' function='0x0'/> <address domain='0x0001' bus='0x40' slot='0x00' function='0x1'/> </iommuGroup> This information can also be got by #nodedev-dumpxml <device> But users still can't know all the groups and the devices in the group directly. Any suggestions? I want to add iommu symbol to the commands name, but it's too long. Thanks Li Zhang

2 2

[libvirt] [PATCH] virsh-domain: Remove unnecessary check and tune code in cmdDesc()
by Hongwei Bi 18 Sep '13

18 Sep '13

Since there is a check on buf through virBufferError(), it is not necessary to check desc again. --- tools/virsh-domain.c | 62 +++++++++++++++++++++---------------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e47877b..a8a0105 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6724,45 +6724,37 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } desc = virBufferContentAndReset(&buf); - if (edit || desc) { - if (!desc) { - desc = vshGetDomainDescription(ctl, dom, title, - config?VIR_DOMAIN_XML_INACTIVE:0); - if (!desc) - goto cleanup; - } - - if (edit) { - /* Create and open the temporary file. */ - if (!(tmp = vshEditWriteToTempFile(ctl, desc))) - goto cleanup; + if (edit) { + /* Create and open the temporary file. */ + if (!(tmp = vshEditWriteToTempFile(ctl, desc))) + goto cleanup; - /* Start the editor. */ - if (vshEditFile(ctl, tmp) == -1) - goto cleanup; + /* Start the editor. */ + if (vshEditFile(ctl, tmp) == -1) + goto cleanup; - /* Read back the edited file. */ - if (!(desc_edited = vshEditReadBackFile(ctl, tmp))) - goto cleanup; + /* Read back the edited file. */ + if (!(desc_edited = vshEditReadBackFile(ctl, tmp))) + goto cleanup; - /* strip a possible newline at the end of file; some - * editors enforce a newline, this makes editing the title - * more convenient */ - if (title && - (tmpstr = strrchr(desc_edited, '\n')) && - *(tmpstr+1) == '\0') - *tmpstr = '\0'; - - /* Compare original XML with edited. Has it changed at all? */ - if (STREQ(desc, desc_edited)) { - vshPrint(ctl, _("Domain description not changed.\n")); - ret = true; - goto cleanup; - } + /* strip a possible newline at the end of file; some + * editors enforce a newline, this makes editing the title + * more convenient */ + if (title && + (tmpstr = strrchr(desc_edited, '\n')) && + *(tmpstr+1) == '\0') + *tmpstr = '\0'; + + /* Compare original XML with edited. Has it changed at all? */ + if (STREQ(desc, desc_edited)) { + vshPrint(ctl, _("Domain description not changed.\n")); + ret = true; + goto cleanup; + } - VIR_FREE(desc); - desc = desc_edited; - desc_edited = NULL; + VIR_FREE(desc); + desc = desc_edited; + desc_edited = NULL; } if (virDomainSetMetadata(dom, type, desc, NULL, NULL, flags) < 0) { -- 1.7.1

2 2

[libvirt] [PATCHv3] Add forwarder attribute to <dns /> element.
by Diego Woitasen 18 Sep '13

18 Sep '13

Useful to set custom forwarders instead of using the contents of /etc/resolv.conf. It helps me to setup dnsmasq as local nameserver to resolv VM domain names from domain 0, when domain option is used. Signed-off-by: Diego Woitasen <diego.woitasen(a)vhgroup.net> --- docs/formatnetwork.html.in | 8 ++++ docs/schemas/network.rng | 5 +++ src/conf/network_conf.c | 43 ++++++++++++++++++++-- src/conf/network_conf.h | 2 + src/network/bridge_driver.c | 8 ++++ .../nat-network-dns-forwarders.conf | 16 ++++++++ .../nat-network-dns-forwarders.xml | 12 ++++++ tests/networkxml2conftest.c | 1 + 8 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e1482db..9fdc3cf 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -631,6 +631,8 @@ <domain name="example.com"/> <dns> <txt name="example" value="example value" /> + <forwarder addr="8.8.8.8"/> + <forwarder addr="8.8.4.4"/> <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> <host ip='192.168.122.2'> <hostname>myhost</hostname> @@ -685,6 +687,12 @@ Currently supported sub-elements of <code><dns></code> are: <dl> + <dt><code>forwarder</code></dt> + <dd>A <code>dns</code> element can have 0 or more <code>forwarder</code> elements. + Each forwarder element defines an IP address to be used as forwarder + in DNS server configuration. The addr attribute is required and defines the + IP address of every forwarder. <span class="since">Since N/A</span> + </dd> <dt><code>txt</code></dt> <dd>A <code>dns</code> element can have 0 or more <code>txt</code> elements. Each txt element defines a DNS TXT record and has two attributes, both diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index ab183f1..95db5c2 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -217,6 +217,11 @@ </attribute> </optional> <zeroOrMore> + <element name="forwarder"> + <attribute name="addr"><ref name="ipAddr"/></attribute> + </element> + </zeroOrMore> + <zeroOrMore> <element name="txt"> <attribute name="name"><ref name="dnsName"/></attribute> <attribute name="value"><text/></attribute> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d54f2aa..c9b90e7 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -175,6 +175,11 @@ virNetworkDNSSrvDefClear(virNetworkDNSSrvDefPtr def) static void virNetworkDNSDefClear(virNetworkDNSDefPtr def) { + if (def->forwarders) { + while (def->nfwds) + VIR_FREE(def->forwarders[--def->nfwds]); + VIR_FREE(def->forwarders); + } if (def->txts) { while (def->ntxts) virNetworkDNSTxtDefClear(&def->txts[--def->ntxts]); @@ -1037,8 +1042,9 @@ virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr *hostNodes = NULL; xmlNodePtr *srvNodes = NULL; xmlNodePtr *txtNodes = NULL; + xmlNodePtr *fwdNodes = NULL; char *forwardPlainNames = NULL; - int nhosts, nsrvs, ntxts; + int nfwds, nhosts, nsrvs, ntxts; size_t i; int ret = -1; xmlNodePtr save = ctxt->node; @@ -1058,6 +1064,30 @@ virNetworkDNSDefParseXML(const char *networkName, } } + nfwds = virXPathNodeSet("./forwarder", ctxt, &fwdNodes); + if (nfwds < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid <forwarder> element found in <dns> of network %s"), + networkName); + goto cleanup; + } + if (nfwds > 0) { + if (VIR_ALLOC_N(def->forwarders, nfwds) < 0) + goto cleanup; + + for (i = 0; i < nfwds; i++) { + def->forwarders[i] = virXMLPropString(fwdNodes[i], "addr"); + if (virSocketAddrParse(NULL, def->forwarders[i], AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid forwarder IP address '%s' " + "in network '%s'"), + def->forwarders[i], networkName); + goto cleanup; + } + def->nfwds++; + } + } + nhosts = virXPathNodeSet("./host", ctxt, &hostNodes); if (nhosts < 0) { virReportError(VIR_ERR_XML_ERROR, @@ -1121,6 +1151,7 @@ virNetworkDNSDefParseXML(const char *networkName, ret = 0; cleanup: VIR_FREE(forwardPlainNames); + VIR_FREE(fwdNodes); VIR_FREE(hostNodes); VIR_FREE(srvNodes); VIR_FREE(txtNodes); @@ -2267,13 +2298,14 @@ virNetworkDNSDefFormat(virBufferPtr buf, int result = 0; size_t i, j; - if (!(def->forwardPlainNames || def->nhosts || def->nsrvs || def->ntxts)) + if (!(def->forwardPlainNames || def->forwarders || def->nhosts || + def->nsrvs || def->ntxts)) goto out; virBufferAddLit(buf, "<dns"); if (def->forwardPlainNames) { virBufferAddLit(buf, " forwardPlainNames='yes'"); - if (!(def->nhosts || def->nsrvs || def->ntxts)) { + if (!(def->forwarders || def->nhosts || def->nsrvs || def->ntxts)) { virBufferAddLit(buf, "/>\n"); goto out; } @@ -2282,6 +2314,11 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); + for (i = 0; i < def->nfwds; i++) { + virBufferAsprintf(buf, "<forwarders addr='%s' />\n", + def->forwarders[i]); + } + for (i = 0; i < def->ntxts; i++) { virBufferAsprintf(buf, "<txt name='%s' value='%s'/>\n", def->txts[i].name, diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index c28bfae..b425986 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -122,6 +122,8 @@ struct _virNetworkDNSDef { virNetworkDNSHostDefPtr hosts; size_t nsrvs; virNetworkDNSSrvDefPtr srvs; + size_t nfwds; + char **forwarders; }; typedef struct _virNetworkIpDef virNetworkIpDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3a8be90..a2cfb35 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -708,6 +708,14 @@ networkDnsmasqConfContents(virNetworkObjPtr network, if (!network->def->dns.forwardPlainNames) virBufferAddLit(&configbuf, "domain-needed\n"); + if (network->def->dns.forwarders) { + virBufferAddLit(&configbuf, "no-resolv\n"); + for (i=0; i < network->def->dns.nfwds; i++) { + virBufferAsprintf(&configbuf, "server=%s\n", + network->def->dns.forwarders[i]); + } + } + if (network->def->domain) { virBufferAsprintf(&configbuf, "domain=%s\n" diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders.conf new file mode 100644 index 0000000..ebca289 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.conf @@ -0,0 +1,16 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +no-resolv +server=8.8.8.8 +server=8.8.4.4 +local=// +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.xml b/tests/networkxml2confdata/nat-network-dns-forwarders.xml new file mode 100644 index 0000000..eebec97 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.xml @@ -0,0 +1,12 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <forwarder addr='8.8.8.8' /> + <forwarder addr='8.8.4.4' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 5825af3..ad50e88 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -145,6 +145,7 @@ mymain(void) DO_TEST("nat-network-dns-srv-record", full); DO_TEST("nat-network-dns-hosts", full); DO_TEST("nat-network-dns-forward-plain", full); + DO_TEST("nat-network-dns-forwarders", full); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); -- 1.8.1.2

2 1

Re: [libvirt] Mass rebuild report for August 29 2013
by Eric Blake 17 Sep '13

17 Sep '13

On 08/29/2013 11:38 AM, Erik van Pienbroek wrote: > > This mass rebuild was done using winpthreads instead of the old > pthreads-w32 implementation. In Fedora itself winpthreads isn't > used by default yet, but it will be introduced in Fedora 20 once > all build failures which are caused by it are resolved (if this > takes too long the introduction of winpthreads in Fedora will > have to be postponed until Fedora 21 which is scheduled for > release in Q2 2014). The gcc package is still being built without > --enable-threads=posix (thus support for C++11 std::thread > is not enabled yet) > >> mingw-libvirt-1.1.1-1 >> Package owner: berrange >> Time to build: 6 minutes, 39 seconds >> Build logs: http://build1.vanpienbroek.nl/fedora-mingw-rebuild/20130829/mingw-libvirt-1… > > > Also caused by winpthreads: > > CCLD libvirt.la > ./.libs/libvirt_driver_remote.a(libvirt_net_rpc_client_la-virnetclient.o): In function `virNetClientIOEventLoop': > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:1517: undefined reference to `pthread_sigmask' > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:1524: undefined reference to `pthread_sigmask' > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:1524: undefined reference to `pthread_sigmask' > ./.libs/libvirt_driver_remote.a(libvirt_net_rpc_client_la-virnetclient.o): In function `virNetClientSetTLSSession': > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:785: undefined reference to `pthread_sigmask' > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:792: undefined reference to `pthread_sigmask' > ./.libs/libvirt_driver_remote.a(libvirt_net_rpc_client_la-virnetclient.o):/builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:809: more undefined references to `pthread_sigmask' follow > collect2: error: ld returned 1 exit status Hmm. The libvirt build for mingw explicitly wants to avoid pthread_*, and use native threading instead (at least we wanted to explicitly avoid the old pthreads-w32, and since we already have native thread support, we might as well use it instead of dragging in winpthreads). Probably a case of our configure checks not detecting the right situation once winpthreads are turned on. I'll see if we can get this fixed up for libvirt 1.1.2 (due real soon now), or if it will have to wait for 1.1.3 (a month out, but probably still in time to make it into F20). Is there an easy environment to set up (such as rawhide + a repo) for testing a mingw cross-build with winpthreads? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 3

[libvirt] [PATCH] build: hoist system-specific checks before library checks
by Eric Blake 17 Sep '13

17 Sep '13

Commit f92c7e3 fixed a regression for native builds, but introduced a regression for cross-compilation builds; in particular, ./autobuild.sh on a Fedora system with mingw cross-compiler fails with: checking for qemu-kvm... /usr/bin/qemu-kvm checking for yajl_parse_complete in -lyajl... no checking for yajl_tree_parse in -lyajl... no configure: error: You must install the libyajl library & headers to compile libvirt Since we default $with_qemu to 'yes' rather than 'check', and then flip that default based on platform-specific checks, those platform specifics need to come prior to any library checks that depend on the value of $with_qemu. * configure.ac: Ensure system defaults are sane before checking for things that make decisions based on system default. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm tempted to push this under the build-breaker rule, so that I can get a successful ./autobuild.sh run. configure.ac | 85 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/configure.ac b/configure.ac index 39b5fd5..69a01ae 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,50 @@ VERSION_SCRIPT_FLAGS=-Wl,--version-script= VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) +dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case +dnl we're working on BSD) +want_ifconfig=no + +dnl Make some notes about which OS we're compiling for, as the lxc and qemu +dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter +dnl are also linux specific. The "network" and storage_fs drivers are known +dnl to not work on MacOS X presently, so we also make a note if compiling +dnl for that + +with_linux=no with_osx=no with_freebsd=no +case $host in + *-*-linux*) with_linux=yes ;; + *-*-darwin*) with_osx=yes ;; + *-*-freebsd*) with_freebsd=yes ;; +esac + +if test $with_linux = no; then + if test "x$with_lxc" != xyes + then + with_lxc=no + fi + with_dtrace=no +fi + +if test $with_freebsd = yes; then + want_ifconfig=yes + + with_firewalld=no +fi + +if test $with_osx = yes; then + with_qemu=no +fi + +AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) +AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) + +if test "$with_libvirtd" = "no" ; then + with_qemu=no +fi + +# Check for compiler and library settings. + LIBVIRT_COMPILE_WARNINGS LIBVIRT_COMPILE_PIE LIBVIRT_LINKER_RELRO @@ -391,44 +435,6 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then sysconfdir='/etc' fi -dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case -dnl we're working on BSD) -want_ifconfig=no - -dnl Make some notes about which OS we're compiling for, as the lxc and qemu -dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter -dnl are also linux specific. The "network" and storage_fs drivers are known -dnl to not work on MacOS X presently, so we also make a note if compiling -dnl for that - -with_linux=no with_osx=no with_freebsd=no -case $host in - *-*-linux*) with_linux=yes ;; - *-*-darwin*) with_osx=yes ;; - *-*-freebsd*) with_freebsd=yes ;; -esac - -if test $with_linux = no; then - if test "x$with_lxc" != xyes - then - with_lxc=no - fi - with_dtrace=no -fi - -if test $with_freebsd = yes; then - want_ifconfig=yes - - with_firewalld=no -fi - -if test $with_osx = yes; then - with_qemu=no -fi - -AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) -AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) - dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], [AS_HELP_STRING([--with-xen], @@ -721,9 +727,6 @@ if test "x$with_vbox" = "xyes"; then fi AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"]) -if test "$with_libvirtd" = "no" ; then - with_qemu=no -fi if test "$with_qemu" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_QEMU], 1, [whether QEMU driver is enabled]) fi -- 1.8.3.1

1 1

[libvirt] [PATCH] build: skip ld_preload tests on non-Linux systems
by Eric Blake 17 Sep '13

17 Sep '13

A cross build to mingw fails with: CC virsystemdtest-virsystemdtest.o ../../tests/virsystemdtest.c: In function 'testCreateNoSystemd': ../../tests/virsystemdtest.c:97:9: error: implicit declaration of function 'unsetenv' [-Werror=implicit-function-declaration] unsetenv("FAIL_NO_SERVICE"); ^ ../../tests/virsystemdtest.c:97:9: error: nested extern declaration of 'unsetenv' [-Werror=nested-externs] We could cop out and pull in the gnulib unsetenv module. But when you stop and think about it, this test requires LD_PRELOAD to work, and systemd is a Linux-only concept anyways, both of which mean the test could never work on mingw in the first place. Simpler is to just fix the test to behave like our other LD_PRELOAD tests. * tests/virsystemdtest.c: Provide non-Linux implementation. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/virsystemdtest.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 7dc7520..e68b3ac 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -20,13 +20,16 @@ #include <config.h> -#include <stdlib.h> - -#include "virsystemd.h" -#include "virlog.h" #include "testutils.h" -#define VIR_FROM_THIS VIR_FROM_NONE +#ifdef __linux__ + +# include <stdlib.h> + +# include "virsystemd.h" +# include "virlog.h" + +# define VIR_FROM_THIS VIR_FROM_NONE static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) { @@ -188,7 +191,7 @@ mymain(void) if (virtTestRun("Test create bad systemd ", 1, testCreateBadSystemd, NULL) < 0) ret = -1; -#define TEST_SCOPE(name, partition, unitname) \ +# define TEST_SCOPE(name, partition, unitname) \ do { \ struct testScopeData data = { \ name, partition, unitname \ @@ -209,3 +212,11 @@ mymain(void) } VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virsystemdmock.so") + +#else +int +main(void) +{ + return EXIT_AM_SKIP; +} +#endif -- 1.8.3.1

1 0

Re: [libvirt] openvswitch vlan support when not a forwarded network
by Ajith Antony 17 Sep '13

17 Sep '13

Thank you Laine, for your prompt reply. Adding the dev list to broaden the audience. On Mon, Sep 16, 2013 at 9:21 AM, Laine Stump <laine(a)laine.org> wrote: On 09/16/2013 07:32 AM, Ajith Antony wrote: >> Hi, I'm not sure what the best way to pursue this is, but since it >> appears you authored the relevant code, you could advise of a good >> next step. > > Kind of. I think I wrote code for hostdev networks, but the original was > (if I remember correctly) written by Kyle Mestery with support only for > openvswitch. > >> I'm trying to use libvirt to set up openvswitch vlans, but ran into a >> problem where the libvirt code is precluding using vlans if the >> network is not "Forwarded."[1] I don't think there is any technical >> reason not to support vlans for non-forwarded networks. I verified >> this by manually adding vlan tags to the ephemeral ports created by >> the libvirt network definition. The tags worked as expected. >> [1] http://libvirt.org/git/?p=libvirt.git;a=blob;f=src/network/bridge_driver.c;… > > You're misunderstanding the intent (at least) of that if condition. The > way that you configure a libvirt network to use openvswitch is with the > following: > > <forward mode='bridge'/> > <virtualport type='openvswitch'> > <some other stuff I forget/> > </virtualport> > > That condition is only checking if: > > vlanAllowed = ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE && > > > 1) forward mode is 'bridge' (this doesn't necessarily mean that anything > will be forwarded beyond the bridge that the guest's network device is > connected to, only that it is connected to a bridge, i.e. as far as > libvirt is concerned any forwarding that *is* done will be L2 > forwarding. The specifics of how that happens are left up to the bridge.) Yes, I think this the test that interests me. The key fact in my scenario is that I'm not preconfiguring a bridge. I wouldn't be able to set the forward mode as 'bridge' unless I already prepared a bridge. I recongize that if I prepared a bridge that I could add more portgroups to it with thier unique vlan tags and not expect anything to actually cross the physical interface. I think this is what is is reccomended among the blogs when one searches for "openvswitch fake bridge." > You'll need to post a copy of your network config for me to understand > for sure, but I'm guessing that you're missing one of the two items in > your config, possibly indicating that you've misunderstood how to > configure a libvirt network that uses an openvswitch bridge. > > So can you send a copy of your network XML? The network that I'm trying to define is described as the following. Note there there is no <forward> element as I'm not expcting there to be a *real* bridge and I don't expect that I need to preconfigre explicit bridges. I expect an ephemeral virtual bridge to be created. <network> <name>ajith-net1</name> <virtualport type='openvswitch'/> <portgroup name='client_lan'> <vlan> <tag id='1'/> </vlan> </portgroup> <portgroup name='client_wan'> <vlan> <tag id='2'/> </vlan> </portgroup> </network> When I include the VLAN tags I get the error: error: unsupported configuration: <vlan> element specified for network ajith-net1, whose type doesn't support vlan configuration When I omit the VLAN tags as follows I am able to create the network: <network> <name>ajith-net1</name> <virtualport type='openvswitch'/> <portgroup name='client_lan'> </portgroup> <portgroup name='client_wan'> </portgroup> </network> In my domain configs I specify the network like so: <interface type='network'> <source network='ajith-net1' portgroup='client_lan'/> <virtualport type='openvswitch'/> <model type='virtio'/> </interface> The resulting ephemeral bridge(virbr1) looks like the following when my network(w/o vlans) and two domains are started. I don't know if the portgroup was meaningful, but it was accepted in the definition: $ sudo ovs-vsctl show <...> Bridge "virbr1" Port "vnet23" Interface "vnet23" Port "vnet25" Interface "vnet25" Port "virbr1" Interface "virbr1" type: internal Port "virbr1-nic" Interface "virbr1-nic" ovs_version: "1.9.3" My goal is assign unique vlan tags to the two portgroups. While the network and the domains are started, I can manually add tags to the ports: $ sudo ovs-vsctl set port vnet25 tag=2 $ sudo ovs-vsctl set port vnet23 tag=1 $ sudo ovs-vsctl show Bridge "virbr1" Port "vnet23" tag: 1 Interface "vnet23" Port "vnet25" tag: 2 Interface "vnet25" Port "virbr1" Interface "virbr1" type: internal Port "virbr1-nic" Interface "virbr1-nic" ovs_version: "1.9.3" This configuration behaves exactly as I want. I'm interested to learn how to prepare this without the manual step of tagging the ports outside of the libvirt operations. Ultimately my goal is to prepare isolated test environments that consist of several VM's attached to a similar qty of vlans. I intend to create many of these environments per host. I also recongnize that instead of portgroups, I could use separate networks altogether. From an administrative standpoint, I'd prefer to have one "network" per test environment, with several portgroups, instead of *many* networks. FWIW, I'm doing something similar on ESX, where I create a "vSwitch" and then create several "portgroups", each with its own vlan tag. These vSwitches are not attached to any physical interfaces. (My esx work is directly against the vsphere API, so I'm not sure if the same could be configured via libvirt) I'm looking to port this work to KVM. It seems like a pretty natural thing to support.

2 2

[libvirt] [PATCH] maint: ignore recently-added test
by Eric Blake 17 Sep '13

17 Sep '13

* .gitignore: Ignore metadatatest. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2b8652f..d70d0dd 100644 --- a/.gitignore +++ b/.gitignore @@ -166,6 +166,7 @@ /tests/hashtest /tests/jsontest /tests/libvirtdconftest +/tests/metadatatest /tests/networkxml2argvtest /tests/nodeinfotest /tests/nwfilterxml2xmltest -- 1.8.3.1

1 0

[libvirt] [PATCH libvirt-java] Set source and target version to Java 1.6
by Wido den Hollander 17 Sep '13

17 Sep '13

On platforms with Java 1.7 it will still produce compatible code with Java 1.6 platforms Java 1.6 is still out there and widely used. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- build.properties | 2 ++ build.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.properties b/build.properties index 679a271..7721f90 100644 --- a/build.properties +++ b/build.properties @@ -2,5 +2,7 @@ version=0.5.0 release=1 libvirt.required=0.9.12 java.required=1:1.5.0 +java.target=1.6 +java.source=1.6 rpm.topdir=/home/veillard/rpms jar.dir=/usr/share/java diff --git a/build.xml b/build.xml index 61b15bb..acd9c92 100644 --- a/build.xml +++ b/build.xml @@ -52,7 +52,7 @@ destdir="target/testclasses" cache="target/cache" closure="true" /> - <javac srcdir="src/test/java" debug="${javac.debug}" includes="**/*.java" classpathref="test.classpath" destdir="target/testclasses" includeAntRuntime="false" /> + <javac srcdir="src/test/java" debug="${javac.debug}" source="${java.source}" target="${java.target}" includes="**/*.java" classpathref="test.classpath" destdir="target/testclasses" includeAntRuntime="false" /> </target> <target name="build" depends="init" description="builds the code"> @@ -60,7 +60,7 @@ destdir="target/classes" cache="target/cache" closure="true" /> - <javac srcdir="src/main/java" debug="${javac.debug}" includes="**/*.java" classpathref="compile.classpath" destdir="target/classes" includeAntRuntime="false" /> + <javac srcdir="src/main/java" debug="${javac.debug}" source="${java.source}" target="${java.target}" includes="**/*.java" classpathref="compile.classpath" destdir="target/classes" includeAntRuntime="false" /> </target> <target name="test" depends="buildtests" description="tests the code"> -- 1.7.9.5

3 6

[libvirt] [PATCH 0/2] Add support for device blkio iops and bps throttle
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> The patches add support for setting/getting blkio read/write bps/iops throttle per-device with blkio cgroup. Guan Qiang (2): blkiotune: add support for device iops and bps throttle blkiotune: add virsh support for blkiotune.throttle.iops/bps docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 40 ++ src/conf/domain_conf.c | 115 +++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 9 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_driver.c | 579 ++++++++++++++++++-- src/util/vircgroup.c | 79 ++- src/util/vircgroup.h | 8 +- .../qemuxml2argv-blkiotune-device.xml | 4 + tools/virsh-domain.c | 64 +++ tools/virsh.pod | 32 +- 14 files changed, 883 insertions(+), 113 deletions(-) -- 1.7.9.5

3 2

[libvirt] [PATCH 2/2] blkiotune: add virsh support for blkiotune.throttle.iops/bps
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> This adds four parameters --device-read-bps, --device-write-bps, --device-read-iops and --device-write-iops to virsh command blkiotune for setting/getting blkiotune.throttle.{read/write}_{iops/bps}_device. --- tools/virsh-domain.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 32 +++++++++++++++++++++++-- 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 49cd154..2830d6a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1252,6 +1252,22 @@ static const vshCmdOptDef opts_blkiotune[] = { .type = VSH_OT_STRING, .help = N_("per-device IO Weights, in the form of /path/to/device,weight,...") }, + {.name = "device-read-bps", + .type = VSH_OT_STRING, + .help = N_("per-device read throughput limit in bytes per second, in the form of /path/to/device,read_bps,...") + }, + {.name = "device-write-bps", + .type = VSH_OT_STRING, + .help = N_("per-device write throughput limit in bytes per second, in the form of /path/to/device,write_bps,...") + }, + {.name = "device-read-iops", + .type = VSH_OT_STRING, + .help = N_("per-device read I/O operations limit per second, in the form of /path/to/device,read_iops,...") + }, + {.name = "device-write-iops", + .type = VSH_OT_STRING, + .help = N_("per-device write I/O operations limit per second, in the form of /path/to/device,write_iops,...") + }, {.name = "config", .type = VSH_OT_BOOL, .help = N_("affect next boot") @@ -1272,6 +1288,10 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) { virDomainPtr dom; const char *device_weight = NULL; + const char *device_read_bps = NULL; + const char *device_write_bps = NULL; + const char *device_read_iops = NULL; + const char *device_write_iops = NULL; int weight = 0; int nparams = 0; int maxparams = 0; @@ -1319,6 +1339,50 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) goto save_error; } + rv = vshCommandOptString(cmd, "device-read-bps", &device_read_bps); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + device_read_bps) < 0) + goto save_error; + } + + rv = vshCommandOptString(cmd, "device-write-bps", &device_write_bps); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + device_write_bps) < 0) + goto save_error; + } + + rv = vshCommandOptString(cmd, "device-read-iops", &device_read_iops); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + device_read_iops) < 0) + goto save_error; + } + + rv = vshCommandOptString(cmd, "device-write-iops", &device_write_iops); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + device_write_iops) < 0) + goto save_error; + } + if (nparams == 0) { /* get the number of blkio parameters */ if (virDomainGetBlkioParameters(dom, NULL, &nparams, flags) != 0) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 0ae5178..69829eb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1611,8 +1611,12 @@ The guaranteed minimum memory allocation for the guest. Specifying -1 as a value for these limits is interpreted as unlimited. =item B<blkiotune> I<domain> [I<--weight> B<weight>] -[I<--device-weights> B<device-weights>] [[I<--config>] -[I<--live>] | [I<--current>]] +[I<--device-weights> B<device-weights>] +[I<--device-read-bps> B<device-read-bps>] +[I<--device-write-bps> B<device-write-bps>] +[I<--device-read-iops> B<device-read-iops>] +[I<--device-write-iops> B<device-write-iops>] +[[I<--config>] [I<--live>] | [I<--current>]] Display or set the blkio parameters. QEMU/KVM supports I<--weight>. I<--weight> is in range [100, 1000]. @@ -1624,6 +1628,30 @@ device from per-device listings. Only the devices listed in the string are modified; any existing per-device weights for other devices remain unchanged. +B<device-read-bps> is a single string listing one or more device/read_bps +pairs, in the format of /path/to/device,read_bps,/path/to/device,read_bps. +Each read_bps is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device read_bps for other devices remain unchanged. + +B<device-write-bps> is a single string listing one or more device/write_bps +pairs, in the format of /path/to/device,write_bps,/path/to/device,write_bps. +Each write_bps is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device write_bps for other devices remain unchanged. + +B<device-read-iops> is a single string listing one or more device/read_iops +pairs, in the format of /path/to/device,read_iops,/path/to/device,read_iops. +Each read_iops is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device read_iops for other devices remain unchanged. + +B<device-write-iops> is a single string listing one or more device/write_iops +pairs, in the format of /path/to/device,write_iops,/path/to/device,write_iops. +Each write_iops is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device write_iops for other devices remain unchanged. + If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -- 1.7.9.5

1 0

[libvirt] [PATCH 1/2] blkiotune: add support for device iops and bps throttle
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> This adds per-device iops and bps throttle to <blkiotune>. By extending the existed 'domainSetBlkioParameters' interface, read/write iops and bps throttle for per-device can be set with blkio cgroup. The blkiotune xml entry is now looked like: <domain ...> <blkiotune> <device> <path>/path/to/block</path> <weight>1000</weight> <read_bps>100000</read_bps> <write_bps>100000</write_bps> <read_iops>100000</read_iops> <write_iops>1000000</write_iops> </device> </blkiotune> .. Elments <weight>,<read_bps>,<write_bps>,<read_iops>,<write_iops> are all optional, but must have one. --- docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 40 ++ src/conf/domain_conf.c | 115 +++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 9 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_driver.c | 579 ++++++++++++++++++-- src/util/vircgroup.c | 79 ++- src/util/vircgroup.h | 8 +- .../qemuxml2argv-blkiotune-device.xml | 4 + 12 files changed, 789 insertions(+), 111 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a927643..daf4f7a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -753,10 +753,18 @@ <device> <path>/dev/sda</path> <weight>1000</weight> + <read_bps>20000000</read_bps> + <write_bps>30000000</write_bps> + <read_iops>4000</read_iops> + <write_iops>5000</write_iops> </device> <device> <path>/dev/sdb</path> <weight>500</weight> + <read_bps>30000000</read_bps> + <write_bps>30000000</write_bps> + <read_iops>4300</read_iops> + <write_iops>6000</write_iops> </device> </blkiotune> ... diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4d333a8..10553af 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -621,9 +621,31 @@ <element name="path"> <ref name="absFilePath"/> </element> - <element name="weight"> - <ref name="weight"/> - </element> + <optional> + <element name="weight"> + <ref name="weight"/> + </element> + </optional> + <optional> + <element name="read_bps"> + <data type="unsignedLong"/> + </element> + </optional> + <optional> + <element name="write_bps"> + <data type="unsignedLong"/> + </element> + </optional> + <optional> + <element name="read_iops"> + <data type="unsignedLong"/> + </element> + </optional> + <optional> + <element name="write_iops"> + <data type="unsignedLong"/> + </element> + </optional> </interleave> </element> </zeroOrMore> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a47e33c..fd4a2e5 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1780,6 +1780,46 @@ char * virDomainGetSchedulerType(virDomainPtr domain, #define VIR_DOMAIN_BLKIO_DEVICE_WEIGHT "device_weight" +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS: + * + * Macro for the BLKIO tunable throttle.read_bps_device: it represents the read + * bytes per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,read_bps elements, + * separated by ',', with element read_bps as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS "device_read_bps" + +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS: + * + * Macro for the BLKIO tunable throttle.write_bps_device: it represents the write + * bytes per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,write_bps elements, + * separated by ',', with element write_bps as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS "device_write_bps" + +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS: + * + * Macro for the BLKIO tunable throttle.read_iops_device: it represents the read + * I/O operations per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,read_iops elements, + * separated by ',', with element read_iops as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS "device_read_iops" + +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS: + * + * Macro for the BLKIO tunable throttle.write_iops_device: it represents the write + * I/O operations per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,write_iops elements, + * separated by ',', with element write_iops as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS "device_write_iops" + /* Set Blkio tunables for the domain*/ int virDomainSetBlkioParameters(virDomainPtr domain, virTypedParameterPtr params, diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 05c1de4..f9df10f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -880,47 +880,100 @@ virDomainXMLOptionGetNamespace(virDomainXMLOptionPtr xmlopt) void -virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, +virBlkioDeviceIoTuneInfoArrayClear(virBlkioDeviceIoTuneInfoPtr devices, int ndevices) { size_t i; for (i = 0; i < ndevices; i++) - VIR_FREE(deviceWeights[i].path); + VIR_FREE(devices[i].path); } /** - * virDomainBlkioDeviceWeightParseXML + * virDomainBlkioDeviceIoTuneInfoParseXML * * this function parses a XML node: * * <device> * <path>/fully/qualified/device/path</path> * <weight>weight</weight> + * <read_bps>read_bps</read_bps> + * <write_bps>write_bps</write_bps> + * <read_iops>read_iops</read_iops> + * <write_iops>write_iops</write_iops> * </device> * - * and fills a virBlkioDeviceWeight struct. + * and fills a virBlkioDeviceIoTuneInfo struct. */ static int -virDomainBlkioDeviceWeightParseXML(xmlNodePtr root, - virBlkioDeviceWeightPtr dw) +virDomainBlkioDeviceIoTuneInfoParseXML(xmlNodePtr root, + virBlkioDeviceIoTuneInfoPtr dio) { char *c; xmlNodePtr node; + dio->read_bps = 0; + dio->write_bps = 0; + dio->read_iops = 0; + dio->write_iops = 0; + node = root->children; while (node) { if (node->type == XML_ELEMENT_NODE) { - if (xmlStrEqual(node->name, BAD_CAST "path") && !dw->path) { - dw->path = (char *)xmlNodeGetContent(node); + if (xmlStrEqual(node->name, BAD_CAST "path") && !dio->path) { + dio->path = (char *)xmlNodeGetContent(node); } else if (xmlStrEqual(node->name, BAD_CAST "weight")) { c = (char *)xmlNodeGetContent(node); - if (virStrToLong_ui(c, NULL, 10, &dw->weight) < 0) { + if (virStrToLong_ui(c, NULL, 10, &dio->weight) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("could not parse weight %s"), c); VIR_FREE(c); - VIR_FREE(dw->path); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "read_bps")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->read_bps) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse read_bps %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "write_bps")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->write_bps) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse write_bps %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "read_iops")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->read_iops) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse read_iops %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "write_iops")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->write_iops) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse write_iops %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); return -1; } VIR_FREE(c); @@ -928,7 +981,7 @@ virDomainBlkioDeviceWeightParseXML(xmlNodePtr root, } node = node->next; } - if (!dw->path) { + if (!dio->path) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("missing per-device path")); return -1; @@ -1988,8 +2041,8 @@ void virDomainDefFree(virDomainDefPtr def) VIR_FREE(def->description); VIR_FREE(def->title); - virBlkioDeviceWeightArrayClear(def->blkio.devices, - def->blkio.ndevices); + virBlkioDeviceIoTuneInfoArrayClear(def->blkio.devices, + def->blkio.ndevices); VIR_FREE(def->blkio.devices); virDomainWatchdogDefFree(def->watchdog); @@ -10962,15 +11015,15 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { size_t j; - if (virDomainBlkioDeviceWeightParseXML(nodes[i], - &def->blkio.devices[i]) < 0) + if (virDomainBlkioDeviceIoTuneInfoParseXML(nodes[i], + &def->blkio.devices[i]) < 0) goto error; def->blkio.ndevices++; for (j = 0; j < i; j++) { if (STREQ(def->blkio.devices[j].path, def->blkio.devices[i].path)) { virReportError(VIR_ERR_XML_ERROR, - _("duplicate device weight path '%s'"), + _("duplicate blkio device path '%s'"), def->blkio.devices[i].path); goto error; } @@ -16349,7 +16402,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, blkio = true; } else { for (n = 0; n < def->blkio.ndevices; n++) { - if (def->blkio.devices[n].weight) { + if (def->blkio.devices[n].weight || def->blkio.devices[n].read_bps || + def->blkio.devices[n].write_bps || def->blkio.devices[n].read_iops || + def->blkio.devices[n].write_iops) { blkio = true; break; } @@ -16364,13 +16419,33 @@ virDomainDefFormatInternal(virDomainDefPtr def, def->blkio.weight); for (n = 0; n < def->blkio.ndevices; n++) { - if (def->blkio.devices[n].weight == 0) + if (def->blkio.devices[n].weight == 0 && def->blkio.devices[n].read_bps == 0 && + def->blkio.devices[n].write_bps == 0 && def->blkio.devices[n].read_iops == 0 && + def->blkio.devices[n].write_iops == 0) continue; virBufferAddLit(buf, " <device>\n"); virBufferEscapeString(buf, " <path>%s</path>\n", def->blkio.devices[n].path); - virBufferAsprintf(buf, " <weight>%u</weight>\n", - def->blkio.devices[n].weight); + if (def->blkio.devices[n].weight) { + virBufferAsprintf(buf, " <weight>%u</weight>\n", + def->blkio.devices[n].weight); + } + if (def->blkio.devices[n].read_bps) { + virBufferAsprintf(buf, " <read_bps>%llu</read_bps>\n", + def->blkio.devices[n].read_bps); + } + if (def->blkio.devices[n].write_bps) { + virBufferAsprintf(buf, " <write_bps>%llu</write_bps>\n", + def->blkio.devices[n].write_bps); + } + if (def->blkio.devices[n].read_iops) { + virBufferAsprintf(buf, " <read_iops>%llu</read_iops>\n", + def->blkio.devices[n].read_iops); + } + if (def->blkio.devices[n].write_iops) { + virBufferAsprintf(buf, " <write_iops>%llu</write_iops>\n", + def->blkio.devices[n].write_iops); + } virBufferAddLit(buf, " </device>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9414ebf..1f350ed 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1857,11 +1857,15 @@ virDomainVcpuPinDefPtr virDomainVcpuPinFindByVcpu(virDomainVcpuPinDefPtr *def, int nvcpupin, int vcpu); -typedef struct _virBlkioDeviceWeight virBlkioDeviceWeight; -typedef virBlkioDeviceWeight *virBlkioDeviceWeightPtr; -struct _virBlkioDeviceWeight { +typedef struct _virBlkioDeviceIoTuneInfo virBlkioDeviceIoTuneInfo; +typedef virBlkioDeviceIoTuneInfo *virBlkioDeviceIoTuneInfoPtr; +struct _virBlkioDeviceIoTuneInfo { char *path; unsigned int weight; + unsigned long long read_bps; + unsigned long long write_bps; + unsigned long long read_iops; + unsigned long long write_iops; }; enum virDomainRNGModel { @@ -1908,8 +1912,8 @@ struct _virDomainIdMapDef { }; -void virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, - int ndevices); +void virBlkioDeviceIoTuneInfoArrayClear(virBlkioDeviceIoTuneInfoPtr devices, + int ndevices); typedef struct _virDomainResourceDef virDomainResourceDef; typedef virDomainResourceDef *virDomainResourceDefPtr; @@ -1937,7 +1941,7 @@ struct _virDomainDef { unsigned int weight; size_t ndevices; - virBlkioDeviceWeightPtr devices; + virBlkioDeviceIoTuneInfoPtr devices; } blkio; struct { diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 50e2f48..e6259cf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -103,7 +103,7 @@ virDomainAuditVcpu; # conf/domain_conf.h -virBlkioDeviceWeightArrayClear; +virBlkioDeviceIoTuneInfoArrayClear; virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainActualNetDefFree; @@ -1207,7 +1207,7 @@ virCgroupNewVcpu; virCgroupPathOfController; virCgroupRemove; virCgroupRemoveRecursively; -virCgroupSetBlkioDeviceWeight; +virCgroupSetBlkioDeviceIoTune; virCgroupSetBlkioWeight; virCgroupSetCpuCfsPeriod; virCgroupSetCpuCfsQuota; diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 0b0ca02..f2c32e7 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -112,10 +112,13 @@ static int virLXCCgroupSetupBlkioTune(virDomainDefPtr def, if (def->blkio.ndevices) { for (i = 0; i < def->blkio.ndevices; i++) { - virBlkioDeviceWeightPtr dw = &def->blkio.devices[i]; - if (!dw->weight) + virBlkioDeviceIoTuneInfoPtr dio = &def->blkio.devices[i]; + if (!dio->weight) continue; - if (virCgroupSetBlkioDeviceWeight(cgroup, dw->path, dw->weight) < 0) + if (virCgroupSetBlkioDeviceIoTune(cgroup, + dio->path, dio->weight, + dio->read_bps, dio->write_bps, + dio->read_iops, dio->write_iops) < 0) return -1; } } diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f95c7f2..20e700f 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -399,11 +399,13 @@ qemuSetupBlkioCgroup(virDomainObjPtr vm) if (vm->def->blkio.ndevices) { for (i = 0; i < vm->def->blkio.ndevices; i++) { - virBlkioDeviceWeightPtr dw = &vm->def->blkio.devices[i]; - if (!dw->weight) + virBlkioDeviceIoTuneInfoPtr dio = &vm->def->blkio.devices[i]; + if (!dio->weight) continue; - if (virCgroupSetBlkioDeviceWeight(priv->cgroup, dw->path, - dw->weight) < 0) + if (virCgroupSetBlkioDeviceIoTune(priv->cgroup, + dio->path, dio->weight, + dio->read_bps, dio->write_bps, + dio->read_iops, dio->write_iops) < 0) return -1; } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0763f9b..ff0ae98 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -131,7 +131,7 @@ # define KVM_CAP_NR_VCPUS 9 /* returns max vcpus per vm */ #endif -#define QEMU_NB_BLKIO_PARAM 2 +#define QEMU_NB_BLKIO_PARAM 6 #define QEMU_NB_BANDWIDTH_PARAM 6 @@ -7388,26 +7388,26 @@ cleanup: return ret; } -/* deviceWeightStr in the form of /device/path,weight,/device/path,weight +/* deviceIoTuneStr in the form of /device/path,ioTuneValue,/device/path,ioTuneValue or * for example, /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0,800 + * deviceIoTuneFiled represents the ioTune type to tune, including device weight, + * device read bps, device write bps, device read iops and device write iops. */ static int -qemuDomainParseDeviceWeightStr(char *deviceWeightStr, - virBlkioDeviceWeightPtr *dw, size_t *size) +qemuDomainParseDeviceIoTuneInfoStr(char *deviceIoTuneStr, + const char *deviceIoTuneFiled, + virBlkioDeviceIoTuneInfoPtr *dio, size_t *size) { char *temp; int ndevices = 0; int nsep = 0; - size_t i; - virBlkioDeviceWeightPtr result = NULL; - - *dw = NULL; - *size = 0; + size_t i, j, k; + virBlkioDeviceIoTuneInfoPtr result = NULL; - if (STREQ(deviceWeightStr, "")) + if (STREQ(deviceIoTuneStr, "")) return 0; - temp = deviceWeightStr; + temp = deviceIoTuneStr; while (temp) { temp = strchr(temp, ','); if (temp) { @@ -7426,8 +7426,11 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (VIR_ALLOC_N(result, ndevices) < 0) return -1; + for (i = 0; i < ndevices; i++) + memset(&result[i], 0, sizeof(result[i])); + i = 0; - temp = deviceWeightStr; + temp = deviceIoTuneStr; while (temp) { char *p = temp; @@ -7439,11 +7442,25 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (VIR_STRNDUP(result[i].path, temp, p - temp) < 0) goto cleanup; - /* weight */ + /* device ioTune value */ temp = p + 1; - if (virStrToLong_ui(temp, &p, 10, &result[i].weight) < 0) - goto error; + if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { + if (virStrToLong_ui(temp, &p, 10, &result[i].weight) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].read_bps) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].write_bps) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].read_iops) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].write_iops) < 0) + goto error; + } i++; @@ -7457,30 +7474,68 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (!i) VIR_FREE(result); - *dw = result; - *size = i; + for (j = 0; j < i; j++) { + bool found = false; + virBlkioDeviceIoTuneInfoPtr old, new; + + new = &result[j]; + for (k = 0; k < *size; k++) { + old = &(*dio)[k]; + if (STREQ(new->path, old->path)) { + found = true; + if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) + old->weight = new->weight; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) + old->read_bps = new->read_bps; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) + old->write_bps = new->write_bps; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) + old->read_iops = new->read_iops; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) + old->write_iops = new->write_iops; + break; + } + } + if (!found) { + if (!new->weight && !new->read_bps && !new->write_bps && + !new->read_iops && !new->write_iops) + continue; + if (VIR_EXPAND_N(*dio, *size, 1) < 0) + goto cleanup; + old = &(*dio)[*size -1]; + if (VIR_STRDUP(old->path, new->path) < 0) + goto cleanup; + old->weight = new->weight; + old->read_bps = new->read_bps; + old->write_bps = new->write_bps; + old->read_iops = new->read_iops; + old->write_iops = new->write_iops; + } + } + virBlkioDeviceIoTuneInfoArrayClear(result, ndevices); + VIR_FREE(result); return 0; error: virReportError(VIR_ERR_INVALID_ARG, - _("unable to parse device weight '%s'"), deviceWeightStr); + _("unable to parse device ioTune '%s'"), deviceIoTuneStr); cleanup: - virBlkioDeviceWeightArrayClear(result, ndevices); + virBlkioDeviceIoTuneInfoArrayClear(result, ndevices); VIR_FREE(result); return -1; } -/* Modify dest_array to reflect all device weight changes described in +/* Modify dest_array to reflect all device Iotune info changes described in * src_array. */ static int -qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *dest_array, - size_t *dest_size, - virBlkioDeviceWeightPtr src_array, - size_t src_size) +qemuDomainMergeDeviceIoTuneInfos(virBlkioDeviceIoTuneInfoPtr *dest_array, + size_t *dest_size, + virBlkioDeviceIoTuneInfoPtr src_array, + size_t src_size) { size_t i, j; - virBlkioDeviceWeightPtr dest, src; + virBlkioDeviceIoTuneInfoPtr dest, src; for (i = 0; i < src_size; i++) { bool found = false; @@ -7491,18 +7546,27 @@ qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *dest_array, if (STREQ(src->path, dest->path)) { found = true; dest->weight = src->weight; + dest->read_bps = src->read_bps; + dest->write_bps = src->write_bps; + dest->read_iops = src->read_iops; + dest->write_iops = src->write_iops; break; } } if (!found) { - if (!src->weight) + if (!src->weight && !src->read_bps && !src->write_bps && + !src->read_iops && !src->write_iops) continue; if (VIR_EXPAND_N(*dest_array, *dest_size, 1) < 0) return -1; dest = &(*dest_array)[*dest_size - 1]; - dest->path = src->path; + if (VIR_STRDUP(dest->path, src->path) < 0) + return -1; dest->weight = src->weight; - src->path = NULL; + dest->read_bps = src->read_bps; + dest->write_bps = src->write_bps; + dest->read_iops = src->read_iops; + dest->write_iops = src->write_iops; } } @@ -7531,6 +7595,14 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, VIR_TYPED_PARAM_UINT, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + VIR_TYPED_PARAM_STRING, NULL) < 0) return -1; @@ -7562,44 +7634,114 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_LIVE) { for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; + size_t ndevices = 0; + virBlkioDeviceIoTuneInfoPtr devices = NULL; + size_t j; + + if (qemuDomainMergeDeviceIoTuneInfos(&devices, &ndevices, + vm->def->blkio.devices, + vm->def->blkio.ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { if (params[i].value.ui > 1000 || params[i].value.ui < 100) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } if (virCgroupSetBlkioWeight(priv->cgroup, params[i].value.ui) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { - size_t ndevices; - virBlkioDeviceWeightPtr devices = NULL; - size_t j; - - if (qemuDomainParseDeviceWeightStr(params[i].value.s, - &devices, - &ndevices) < 0) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, + &devices, + &ndevices) < 0) { ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } - for (j = 0; j < ndevices; j++) { - if (virCgroupSetBlkioDeviceWeight(priv->cgroup, - devices[j].path, - devices[j].weight) < 0) { - ret = -1; - break; + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); } + continue; } - if (j != ndevices || - qemuDomainMergeDeviceWeights(&vm->def->blkio.devices, - &vm->def->blkio.ndevices, - devices, ndevices) < 0) + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } + + for (j = 0; j < ndevices; j++) { + if (virCgroupSetBlkioDeviceIoTune(priv->cgroup, + devices[j].path, devices[j].weight, + devices[j].read_bps, devices[j].write_bps, + devices[j].read_iops, devices[j].write_iops) < 0) { ret = -1; - virBlkioDeviceWeightArrayClear(devices, ndevices); - VIR_FREE(devices); + break; + } } + if (j != ndevices || + qemuDomainMergeDeviceIoTuneInfos(&vm->def->blkio.devices, + &vm->def->blkio.ndevices, + devices, ndevices) < 0) + ret = -1; + + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); } } if (ret < 0) @@ -7610,33 +7752,102 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; + virBlkioDeviceIoTuneInfoPtr devices = NULL; + size_t ndevices = 0; + + if (qemuDomainMergeDeviceIoTuneInfos(&devices, &ndevices, + persistentDef->blkio.devices, + persistentDef->blkio.ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { if (params[i].value.ui > 1000 || params[i].value.ui < 100) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } persistentDef->blkio.weight = params[i].value.ui; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { - virBlkioDeviceWeightPtr devices = NULL; - size_t ndevices; - - if (qemuDomainParseDeviceWeightStr(params[i].value.s, - &devices, - &ndevices) < 0) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, + &devices, + &ndevices) < 0) { ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } - if (qemuDomainMergeDeviceWeights(&persistentDef->blkio.devices, - &persistentDef->blkio.ndevices, - devices, ndevices) < 0) + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + &devices, + &ndevices) < 0) { ret = -1; - virBlkioDeviceWeightArrayClear(devices, ndevices); - VIR_FREE(devices); + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } } + + if (qemuDomainMergeDeviceIoTuneInfos(&persistentDef->blkio.devices, + &persistentDef->blkio.ndevices, + devices, ndevices) < 0) + ret = -1; + + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); } if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0) @@ -7747,6 +7958,122 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, goto cleanup; break; + case 2: /* blkiotune.throttle.device_read_bps */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].read_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].read_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + + case 3: /* blkiotune.throttle.device_write_bps */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].write_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].write_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + + case 4: /* blkiotune.throttle.device_read_iops */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].read_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].read_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + + case 5: /* blkiotune.throttle.device_write_iops */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].write_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].write_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + default: break; /* should not hit here */ @@ -7804,6 +8131,142 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, } break; + case 2: /* blkiotune.device_read_bps */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].read_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].read_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS); + goto cleanup; + } + break; + + case 3: /* blkiotune.device_write_bps */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].write_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].write_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS); + goto cleanup; + } + break; + + case 4: /* blkiotune.device_read_iops */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].read_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].read_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS); + goto cleanup; + } + break; + + case 5: /* blkiotune.device_write_iops */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].write_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].write_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS); + goto cleanup; + } + break; + default: break; /* should not hit here */ diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e99caf5..b506de5 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1825,23 +1825,36 @@ virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight) /** - * virCgroupSetBlkioDeviceWeight: + * virCgroupSetBlkioDeviceIoTune: * - * @group: The cgroup to change io device weight device for + * @group: The cgroup to change io device iotune device for * @path: The device with a weight to alter * @weight: The new device weight (100-1000), or 0 to clear + * @read_bps: The new read bps throttle, or 0 to clear + * @write_bps: The new write bps throttle, or 0 to clear + * @read_iops: The new read iops throttle, or 0 to clear + * @write_iops: The new write iops throttle, or 0 to clear * - * device_weight is treated as a write-only parameter, so - * there isn't a getter counterpart. + * paramters like device_weight, device_read_bps, device_write_bps, + * device_read_iops and device_write_iops are treated as write-only, + * so there isn't a getter counterpart. * * Returns: 0 on success, -1 on error */ int -virCgroupSetBlkioDeviceWeight(virCgroupPtr group, +virCgroupSetBlkioDeviceIoTune(virCgroupPtr group, const char *path, - unsigned int weight) -{ - char *str; + unsigned int weight, + unsigned long long read_bps, + unsigned long long write_bps, + unsigned long long read_iops, + unsigned long long write_iops) +{ + char *weight_str; + char *read_bps_str; + char *write_bps_str; + char *read_iops_str; + char *write_iops_str; struct stat sb; int ret; @@ -1866,15 +1879,51 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group, return -1; } - if (virAsprintf(&str, "%d:%d %d", major(sb.st_rdev), minor(sb.st_rdev), + if (virAsprintf(&weight_str, "%d:%d %d", major(sb.st_rdev), minor(sb.st_rdev), weight) < 0) return -1; + if (virAsprintf(&read_bps_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + read_bps) < 0) + return -1; + + if (virAsprintf(&write_bps_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + write_bps) < 0) + return -1; + + if (virAsprintf(&read_iops_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + read_iops) < 0) + return -1; + + if (virAsprintf(&write_iops_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + write_iops) < 0) + return -1; + ret = virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.weight_device", - str); - VIR_FREE(str); + weight_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.read_bps_device", + read_bps_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.write_bps_device", + write_bps_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.read_iops_device", + read_iops_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.write_iops_device", + write_iops_str); + VIR_FREE(weight_str); + VIR_FREE(read_bps_str); + VIR_FREE(write_bps_str); + VIR_FREE(read_iops_str); + VIR_FREE(write_iops_str); return ret; } @@ -3287,9 +3336,13 @@ virCgroupGetBlkioWeight(virCgroupPtr group ATTRIBUTE_UNUSED, int -virCgroupSetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED, +virCgroupSetBlkioDeviceIoTune(virCgroupPtr group ATTRIBUTE_UNUSED, const char *path ATTRIBUTE_UNUSED, - unsigned int weight ATTRIBUTE_UNUSED) + unsigned int weight ATTRIBUTE_UNUSED, + unsigned long long read_bps ATTRIBUTE_UNUSED, + unsigned long long write_bps ATTRIBUTE_UNUSED, + unsigned long long read_iops ATTRIBUTE_UNUSED, + unsigned long long write_iops ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform")); diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 835eb30..21980da 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -122,9 +122,13 @@ int virCgroupMoveTask(virCgroupPtr src_group, int virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight); int virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight); -int virCgroupSetBlkioDeviceWeight(virCgroupPtr group, +int virCgroupSetBlkioDeviceIoTune(virCgroupPtr group, const char *path, - unsigned int weight); + unsigned int weight, + unsigned long long read_bps, + unsigned long long write_bps, + unsigned long long read_iops, + unsigned long long write_iops); int virCgroupSetMemory(virCgroupPtr group, unsigned long long kb); int virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml index 743cf29..9bd97fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml @@ -8,6 +8,10 @@ <device> <path>/dev/sda</path> <weight>400</weight> + <read_bps>2000000000</read_bps> + <write_bps>1000000000</write_bps> + <read_iops>1000</read_iops> + <write_iops>2000</write_iops> </device> <device> <path>/dev/sdb</path> -- 1.7.9.5

1 0

[libvirt] [PATCH 1/5] Add https protocol support for cdrom disk
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Aline Manera <alinefm(a)br.ibm.com> The https protocol is also accepted by qemu/KVM when specifying the cdrom ISO image. The xml should be as following: <disk type='network' device='cdrom'> <source protocol='https' name='/url/path'> <host name='host.name' port='443'/> </source> </disk> Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 6 ++++ .../qemuxml2argv-disk-cdrom-network-https.args | 8 +++++ .../qemuxml2argv-disk-cdrom-network-https.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 8 files changed, 64 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f5a36d9..240571f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1511,6 +1511,14 @@ </disk> <disk type='network' device='cdrom'> <driver name='qemu' type='raw'/> + <source protocol="https" name="url_path"> + <host name="hostname" port="443"/> + </source> + <target dev='hdc' bus='ide' tray='open'/> + <readonly/> + </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> <source protocol="ftp" name="url_path"> <host name="hostname" port="21"/> </source> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index ecd3a42..2f91f0f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1231,6 +1231,7 @@ <value>gluster</value> <value>iscsi</value> <value>http</value> + <value>https</value> <value>ftp</value> </choice> </attribute> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e5fe900..04563f6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -265,6 +265,7 @@ VIR_ENUM_IMPL(virDomainDiskProtocol, VIR_DOMAIN_DISK_PROTOCOL_LAST, "gluster", "iscsi", "http", + "https", "ftp") VIR_ENUM_IMPL(virDomainDiskProtocolTransport, VIR_DOMAIN_DISK_PROTO_TRANS_LAST, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e4dfee9..d54b29e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -543,6 +543,7 @@ enum virDomainDiskProtocol { VIR_DOMAIN_DISK_PROTOCOL_GLUSTER, VIR_DOMAIN_DISK_PROTOCOL_ISCSI, VIR_DOMAIN_DISK_PROTOCOL_HTTP, + VIR_DOMAIN_DISK_PROTOCOL_HTTPS, VIR_DOMAIN_DISK_PROTOCOL_FTP, VIR_DOMAIN_DISK_PROTOCOL_LAST diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1521431..883b513 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3905,6 +3905,12 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, disk->hosts->port ? disk->hosts->port : "80"); virBufferEscape(&opt, ',', ",", "%s,", disk->src); break; + case VIR_DOMAIN_DISK_PROTOCOL_HTTPS: + virBufferAsprintf(&opt, "file=https://%s:%s", + disk->hosts->name, + disk->hosts->port ? disk->hosts->port : "443"); + virBufferEscape(&opt, ',', ",", "%s,", disk->src); + break; case VIR_DOMAIN_DISK_PROTOCOL_FTP: virBufferAsprintf(&opt, "file=ftp://%s:%s", disk->hosts->name, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args new file mode 100644 index 0000000..affa794 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/kvm -S \ +-M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ +-drive \ +file=https://host.name:443/url/path/file.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 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml new file mode 100644 index 0000000..b8a60ed --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml @@ -0,0 +1,37 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-1.2'>hvm</type> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/kvm</emulator> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol='https' name='/url/path/file.iso'> + <host name='host.name' port='443'/> + </source> + <target dev='hdc' bus='ide'/> + <readonly/> + <alias name='ide0-1-0'/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fdf1d31..a11c9a8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -445,6 +445,8 @@ mymain(void) DO_TEST("disk-cdrom", NONE); DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE); + DO_TEST("disk-cdrom-network-https", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, + QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-network-ftp", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-empty", QEMU_CAPS_DRIVE); -- 1.7.9.5

4 5

[libvirt] [PATCH 2/2] blkiotune: add virsh support for blkiotune.throttle.iops/bps
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> This adds four parameters --device-read-bps, --device-write-bps, --device-read-iops and --device-write-iops to virsh command blkiotune for setting/getting blkiotune.throttle.{read/write}_{iops/bps}_device. --- tools/virsh-domain.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 32 +++++++++++++++++++++++-- 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 49cd154..2830d6a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1252,6 +1252,22 @@ static const vshCmdOptDef opts_blkiotune[] = { .type = VSH_OT_STRING, .help = N_("per-device IO Weights, in the form of /path/to/device,weight,...") }, + {.name = "device-read-bps", + .type = VSH_OT_STRING, + .help = N_("per-device read throughput limit in bytes per second, in the form of /path/to/device,read_bps,...") + }, + {.name = "device-write-bps", + .type = VSH_OT_STRING, + .help = N_("per-device write throughput limit in bytes per second, in the form of /path/to/device,write_bps,...") + }, + {.name = "device-read-iops", + .type = VSH_OT_STRING, + .help = N_("per-device read I/O operations limit per second, in the form of /path/to/device,read_iops,...") + }, + {.name = "device-write-iops", + .type = VSH_OT_STRING, + .help = N_("per-device write I/O operations limit per second, in the form of /path/to/device,write_iops,...") + }, {.name = "config", .type = VSH_OT_BOOL, .help = N_("affect next boot") @@ -1272,6 +1288,10 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) { virDomainPtr dom; const char *device_weight = NULL; + const char *device_read_bps = NULL; + const char *device_write_bps = NULL; + const char *device_read_iops = NULL; + const char *device_write_iops = NULL; int weight = 0; int nparams = 0; int maxparams = 0; @@ -1319,6 +1339,50 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) goto save_error; } + rv = vshCommandOptString(cmd, "device-read-bps", &device_read_bps); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + device_read_bps) < 0) + goto save_error; + } + + rv = vshCommandOptString(cmd, "device-write-bps", &device_write_bps); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + device_write_bps) < 0) + goto save_error; + } + + rv = vshCommandOptString(cmd, "device-read-iops", &device_read_iops); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + device_read_iops) < 0) + goto save_error; + } + + rv = vshCommandOptString(cmd, "device-write-iops", &device_write_iops); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + device_write_iops) < 0) + goto save_error; + } + if (nparams == 0) { /* get the number of blkio parameters */ if (virDomainGetBlkioParameters(dom, NULL, &nparams, flags) != 0) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 0ae5178..69829eb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1611,8 +1611,12 @@ The guaranteed minimum memory allocation for the guest. Specifying -1 as a value for these limits is interpreted as unlimited. =item B<blkiotune> I<domain> [I<--weight> B<weight>] -[I<--device-weights> B<device-weights>] [[I<--config>] -[I<--live>] | [I<--current>]] +[I<--device-weights> B<device-weights>] +[I<--device-read-bps> B<device-read-bps>] +[I<--device-write-bps> B<device-write-bps>] +[I<--device-read-iops> B<device-read-iops>] +[I<--device-write-iops> B<device-write-iops>] +[[I<--config>] [I<--live>] | [I<--current>]] Display or set the blkio parameters. QEMU/KVM supports I<--weight>. I<--weight> is in range [100, 1000]. @@ -1624,6 +1628,30 @@ device from per-device listings. Only the devices listed in the string are modified; any existing per-device weights for other devices remain unchanged. +B<device-read-bps> is a single string listing one or more device/read_bps +pairs, in the format of /path/to/device,read_bps,/path/to/device,read_bps. +Each read_bps is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device read_bps for other devices remain unchanged. + +B<device-write-bps> is a single string listing one or more device/write_bps +pairs, in the format of /path/to/device,write_bps,/path/to/device,write_bps. +Each write_bps is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device write_bps for other devices remain unchanged. + +B<device-read-iops> is a single string listing one or more device/read_iops +pairs, in the format of /path/to/device,read_iops,/path/to/device,read_iops. +Each read_iops is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device read_iops for other devices remain unchanged. + +B<device-write-iops> is a single string listing one or more device/write_iops +pairs, in the format of /path/to/device,write_iops,/path/to/device,write_iops. +Each write_iops is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device write_iops for other devices remain unchanged. + If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -- 1.7.9.5

1 0

[libvirt] [PATCH 1/2] blkiotune: add support for device iops and bps throttle
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> This adds per-device iops and bps throttle to <blkiotune>. By extending the existed 'domainSetBlkioParameters' interface, read/write iops and bps throttle for per-device can be set with blkio cgroup. The blkiotune xml entry is now looked like: <domain ...> <blkiotune> <device> <path>/path/to/block</path> <weight>1000</weight> <read_bps>100000</read_bps> <write_bps>100000</write_bps> <read_iops>100000</read_iops> <write_iops>1000000</write_iops> </device> </blkiotune> .. Elments <weight>,<read_bps>,<write_bps>,<read_iops>,<write_iops> are all optional, but must have one. --- docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 40 ++ src/conf/domain_conf.c | 115 +++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 9 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_driver.c | 579 ++++++++++++++++++-- src/util/vircgroup.c | 79 ++- src/util/vircgroup.h | 8 +- .../qemuxml2argv-blkiotune-device.xml | 4 + 12 files changed, 789 insertions(+), 111 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a927643..daf4f7a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -753,10 +753,18 @@ <device> <path>/dev/sda</path> <weight>1000</weight> + <read_bps>20000000</read_bps> + <write_bps>30000000</write_bps> + <read_iops>4000</read_iops> + <write_iops>5000</write_iops> </device> <device> <path>/dev/sdb</path> <weight>500</weight> + <read_bps>30000000</read_bps> + <write_bps>30000000</write_bps> + <read_iops>4300</read_iops> + <write_iops>6000</write_iops> </device> </blkiotune> ... diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4d333a8..10553af 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -621,9 +621,31 @@ <element name="path"> <ref name="absFilePath"/> </element> - <element name="weight"> - <ref name="weight"/> - </element> + <optional> + <element name="weight"> + <ref name="weight"/> + </element> + </optional> + <optional> + <element name="read_bps"> + <data type="unsignedLong"/> + </element> + </optional> + <optional> + <element name="write_bps"> + <data type="unsignedLong"/> + </element> + </optional> + <optional> + <element name="read_iops"> + <data type="unsignedLong"/> + </element> + </optional> + <optional> + <element name="write_iops"> + <data type="unsignedLong"/> + </element> + </optional> </interleave> </element> </zeroOrMore> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a47e33c..fd4a2e5 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1780,6 +1780,46 @@ char * virDomainGetSchedulerType(virDomainPtr domain, #define VIR_DOMAIN_BLKIO_DEVICE_WEIGHT "device_weight" +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS: + * + * Macro for the BLKIO tunable throttle.read_bps_device: it represents the read + * bytes per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,read_bps elements, + * separated by ',', with element read_bps as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS "device_read_bps" + +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS: + * + * Macro for the BLKIO tunable throttle.write_bps_device: it represents the write + * bytes per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,write_bps elements, + * separated by ',', with element write_bps as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS "device_write_bps" + +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS: + * + * Macro for the BLKIO tunable throttle.read_iops_device: it represents the read + * I/O operations per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,read_iops elements, + * separated by ',', with element read_iops as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS "device_read_iops" + +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS: + * + * Macro for the BLKIO tunable throttle.write_iops_device: it represents the write + * I/O operations per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,write_iops elements, + * separated by ',', with element write_iops as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS "device_write_iops" + /* Set Blkio tunables for the domain*/ int virDomainSetBlkioParameters(virDomainPtr domain, virTypedParameterPtr params, diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 05c1de4..f9df10f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -880,47 +880,100 @@ virDomainXMLOptionGetNamespace(virDomainXMLOptionPtr xmlopt) void -virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, +virBlkioDeviceIoTuneInfoArrayClear(virBlkioDeviceIoTuneInfoPtr devices, int ndevices) { size_t i; for (i = 0; i < ndevices; i++) - VIR_FREE(deviceWeights[i].path); + VIR_FREE(devices[i].path); } /** - * virDomainBlkioDeviceWeightParseXML + * virDomainBlkioDeviceIoTuneInfoParseXML * * this function parses a XML node: * * <device> * <path>/fully/qualified/device/path</path> * <weight>weight</weight> + * <read_bps>read_bps</read_bps> + * <write_bps>write_bps</write_bps> + * <read_iops>read_iops</read_iops> + * <write_iops>write_iops</write_iops> * </device> * - * and fills a virBlkioDeviceWeight struct. + * and fills a virBlkioDeviceIoTuneInfo struct. */ static int -virDomainBlkioDeviceWeightParseXML(xmlNodePtr root, - virBlkioDeviceWeightPtr dw) +virDomainBlkioDeviceIoTuneInfoParseXML(xmlNodePtr root, + virBlkioDeviceIoTuneInfoPtr dio) { char *c; xmlNodePtr node; + dio->read_bps = 0; + dio->write_bps = 0; + dio->read_iops = 0; + dio->write_iops = 0; + node = root->children; while (node) { if (node->type == XML_ELEMENT_NODE) { - if (xmlStrEqual(node->name, BAD_CAST "path") && !dw->path) { - dw->path = (char *)xmlNodeGetContent(node); + if (xmlStrEqual(node->name, BAD_CAST "path") && !dio->path) { + dio->path = (char *)xmlNodeGetContent(node); } else if (xmlStrEqual(node->name, BAD_CAST "weight")) { c = (char *)xmlNodeGetContent(node); - if (virStrToLong_ui(c, NULL, 10, &dw->weight) < 0) { + if (virStrToLong_ui(c, NULL, 10, &dio->weight) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("could not parse weight %s"), c); VIR_FREE(c); - VIR_FREE(dw->path); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "read_bps")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->read_bps) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse read_bps %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "write_bps")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->write_bps) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse write_bps %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "read_iops")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->read_iops) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse read_iops %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "write_iops")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->write_iops) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse write_iops %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); return -1; } VIR_FREE(c); @@ -928,7 +981,7 @@ virDomainBlkioDeviceWeightParseXML(xmlNodePtr root, } node = node->next; } - if (!dw->path) { + if (!dio->path) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("missing per-device path")); return -1; @@ -1988,8 +2041,8 @@ void virDomainDefFree(virDomainDefPtr def) VIR_FREE(def->description); VIR_FREE(def->title); - virBlkioDeviceWeightArrayClear(def->blkio.devices, - def->blkio.ndevices); + virBlkioDeviceIoTuneInfoArrayClear(def->blkio.devices, + def->blkio.ndevices); VIR_FREE(def->blkio.devices); virDomainWatchdogDefFree(def->watchdog); @@ -10962,15 +11015,15 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { size_t j; - if (virDomainBlkioDeviceWeightParseXML(nodes[i], - &def->blkio.devices[i]) < 0) + if (virDomainBlkioDeviceIoTuneInfoParseXML(nodes[i], + &def->blkio.devices[i]) < 0) goto error; def->blkio.ndevices++; for (j = 0; j < i; j++) { if (STREQ(def->blkio.devices[j].path, def->blkio.devices[i].path)) { virReportError(VIR_ERR_XML_ERROR, - _("duplicate device weight path '%s'"), + _("duplicate blkio device path '%s'"), def->blkio.devices[i].path); goto error; } @@ -16349,7 +16402,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, blkio = true; } else { for (n = 0; n < def->blkio.ndevices; n++) { - if (def->blkio.devices[n].weight) { + if (def->blkio.devices[n].weight || def->blkio.devices[n].read_bps || + def->blkio.devices[n].write_bps || def->blkio.devices[n].read_iops || + def->blkio.devices[n].write_iops) { blkio = true; break; } @@ -16364,13 +16419,33 @@ virDomainDefFormatInternal(virDomainDefPtr def, def->blkio.weight); for (n = 0; n < def->blkio.ndevices; n++) { - if (def->blkio.devices[n].weight == 0) + if (def->blkio.devices[n].weight == 0 && def->blkio.devices[n].read_bps == 0 && + def->blkio.devices[n].write_bps == 0 && def->blkio.devices[n].read_iops == 0 && + def->blkio.devices[n].write_iops == 0) continue; virBufferAddLit(buf, " <device>\n"); virBufferEscapeString(buf, " <path>%s</path>\n", def->blkio.devices[n].path); - virBufferAsprintf(buf, " <weight>%u</weight>\n", - def->blkio.devices[n].weight); + if (def->blkio.devices[n].weight) { + virBufferAsprintf(buf, " <weight>%u</weight>\n", + def->blkio.devices[n].weight); + } + if (def->blkio.devices[n].read_bps) { + virBufferAsprintf(buf, " <read_bps>%llu</read_bps>\n", + def->blkio.devices[n].read_bps); + } + if (def->blkio.devices[n].write_bps) { + virBufferAsprintf(buf, " <write_bps>%llu</write_bps>\n", + def->blkio.devices[n].write_bps); + } + if (def->blkio.devices[n].read_iops) { + virBufferAsprintf(buf, " <read_iops>%llu</read_iops>\n", + def->blkio.devices[n].read_iops); + } + if (def->blkio.devices[n].write_iops) { + virBufferAsprintf(buf, " <write_iops>%llu</write_iops>\n", + def->blkio.devices[n].write_iops); + } virBufferAddLit(buf, " </device>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9414ebf..1f350ed 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1857,11 +1857,15 @@ virDomainVcpuPinDefPtr virDomainVcpuPinFindByVcpu(virDomainVcpuPinDefPtr *def, int nvcpupin, int vcpu); -typedef struct _virBlkioDeviceWeight virBlkioDeviceWeight; -typedef virBlkioDeviceWeight *virBlkioDeviceWeightPtr; -struct _virBlkioDeviceWeight { +typedef struct _virBlkioDeviceIoTuneInfo virBlkioDeviceIoTuneInfo; +typedef virBlkioDeviceIoTuneInfo *virBlkioDeviceIoTuneInfoPtr; +struct _virBlkioDeviceIoTuneInfo { char *path; unsigned int weight; + unsigned long long read_bps; + unsigned long long write_bps; + unsigned long long read_iops; + unsigned long long write_iops; }; enum virDomainRNGModel { @@ -1908,8 +1912,8 @@ struct _virDomainIdMapDef { }; -void virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, - int ndevices); +void virBlkioDeviceIoTuneInfoArrayClear(virBlkioDeviceIoTuneInfoPtr devices, + int ndevices); typedef struct _virDomainResourceDef virDomainResourceDef; typedef virDomainResourceDef *virDomainResourceDefPtr; @@ -1937,7 +1941,7 @@ struct _virDomainDef { unsigned int weight; size_t ndevices; - virBlkioDeviceWeightPtr devices; + virBlkioDeviceIoTuneInfoPtr devices; } blkio; struct { diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 50e2f48..e6259cf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -103,7 +103,7 @@ virDomainAuditVcpu; # conf/domain_conf.h -virBlkioDeviceWeightArrayClear; +virBlkioDeviceIoTuneInfoArrayClear; virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainActualNetDefFree; @@ -1207,7 +1207,7 @@ virCgroupNewVcpu; virCgroupPathOfController; virCgroupRemove; virCgroupRemoveRecursively; -virCgroupSetBlkioDeviceWeight; +virCgroupSetBlkioDeviceIoTune; virCgroupSetBlkioWeight; virCgroupSetCpuCfsPeriod; virCgroupSetCpuCfsQuota; diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 0b0ca02..f2c32e7 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -112,10 +112,13 @@ static int virLXCCgroupSetupBlkioTune(virDomainDefPtr def, if (def->blkio.ndevices) { for (i = 0; i < def->blkio.ndevices; i++) { - virBlkioDeviceWeightPtr dw = &def->blkio.devices[i]; - if (!dw->weight) + virBlkioDeviceIoTuneInfoPtr dio = &def->blkio.devices[i]; + if (!dio->weight) continue; - if (virCgroupSetBlkioDeviceWeight(cgroup, dw->path, dw->weight) < 0) + if (virCgroupSetBlkioDeviceIoTune(cgroup, + dio->path, dio->weight, + dio->read_bps, dio->write_bps, + dio->read_iops, dio->write_iops) < 0) return -1; } } diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f95c7f2..20e700f 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -399,11 +399,13 @@ qemuSetupBlkioCgroup(virDomainObjPtr vm) if (vm->def->blkio.ndevices) { for (i = 0; i < vm->def->blkio.ndevices; i++) { - virBlkioDeviceWeightPtr dw = &vm->def->blkio.devices[i]; - if (!dw->weight) + virBlkioDeviceIoTuneInfoPtr dio = &vm->def->blkio.devices[i]; + if (!dio->weight) continue; - if (virCgroupSetBlkioDeviceWeight(priv->cgroup, dw->path, - dw->weight) < 0) + if (virCgroupSetBlkioDeviceIoTune(priv->cgroup, + dio->path, dio->weight, + dio->read_bps, dio->write_bps, + dio->read_iops, dio->write_iops) < 0) return -1; } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0763f9b..ff0ae98 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -131,7 +131,7 @@ # define KVM_CAP_NR_VCPUS 9 /* returns max vcpus per vm */ #endif -#define QEMU_NB_BLKIO_PARAM 2 +#define QEMU_NB_BLKIO_PARAM 6 #define QEMU_NB_BANDWIDTH_PARAM 6 @@ -7388,26 +7388,26 @@ cleanup: return ret; } -/* deviceWeightStr in the form of /device/path,weight,/device/path,weight +/* deviceIoTuneStr in the form of /device/path,ioTuneValue,/device/path,ioTuneValue or * for example, /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0,800 + * deviceIoTuneFiled represents the ioTune type to tune, including device weight, + * device read bps, device write bps, device read iops and device write iops. */ static int -qemuDomainParseDeviceWeightStr(char *deviceWeightStr, - virBlkioDeviceWeightPtr *dw, size_t *size) +qemuDomainParseDeviceIoTuneInfoStr(char *deviceIoTuneStr, + const char *deviceIoTuneFiled, + virBlkioDeviceIoTuneInfoPtr *dio, size_t *size) { char *temp; int ndevices = 0; int nsep = 0; - size_t i; - virBlkioDeviceWeightPtr result = NULL; - - *dw = NULL; - *size = 0; + size_t i, j, k; + virBlkioDeviceIoTuneInfoPtr result = NULL; - if (STREQ(deviceWeightStr, "")) + if (STREQ(deviceIoTuneStr, "")) return 0; - temp = deviceWeightStr; + temp = deviceIoTuneStr; while (temp) { temp = strchr(temp, ','); if (temp) { @@ -7426,8 +7426,11 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (VIR_ALLOC_N(result, ndevices) < 0) return -1; + for (i = 0; i < ndevices; i++) + memset(&result[i], 0, sizeof(result[i])); + i = 0; - temp = deviceWeightStr; + temp = deviceIoTuneStr; while (temp) { char *p = temp; @@ -7439,11 +7442,25 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (VIR_STRNDUP(result[i].path, temp, p - temp) < 0) goto cleanup; - /* weight */ + /* device ioTune value */ temp = p + 1; - if (virStrToLong_ui(temp, &p, 10, &result[i].weight) < 0) - goto error; + if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { + if (virStrToLong_ui(temp, &p, 10, &result[i].weight) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].read_bps) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].write_bps) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].read_iops) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].write_iops) < 0) + goto error; + } i++; @@ -7457,30 +7474,68 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (!i) VIR_FREE(result); - *dw = result; - *size = i; + for (j = 0; j < i; j++) { + bool found = false; + virBlkioDeviceIoTuneInfoPtr old, new; + + new = &result[j]; + for (k = 0; k < *size; k++) { + old = &(*dio)[k]; + if (STREQ(new->path, old->path)) { + found = true; + if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) + old->weight = new->weight; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) + old->read_bps = new->read_bps; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) + old->write_bps = new->write_bps; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) + old->read_iops = new->read_iops; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) + old->write_iops = new->write_iops; + break; + } + } + if (!found) { + if (!new->weight && !new->read_bps && !new->write_bps && + !new->read_iops && !new->write_iops) + continue; + if (VIR_EXPAND_N(*dio, *size, 1) < 0) + goto cleanup; + old = &(*dio)[*size -1]; + if (VIR_STRDUP(old->path, new->path) < 0) + goto cleanup; + old->weight = new->weight; + old->read_bps = new->read_bps; + old->write_bps = new->write_bps; + old->read_iops = new->read_iops; + old->write_iops = new->write_iops; + } + } + virBlkioDeviceIoTuneInfoArrayClear(result, ndevices); + VIR_FREE(result); return 0; error: virReportError(VIR_ERR_INVALID_ARG, - _("unable to parse device weight '%s'"), deviceWeightStr); + _("unable to parse device ioTune '%s'"), deviceIoTuneStr); cleanup: - virBlkioDeviceWeightArrayClear(result, ndevices); + virBlkioDeviceIoTuneInfoArrayClear(result, ndevices); VIR_FREE(result); return -1; } -/* Modify dest_array to reflect all device weight changes described in +/* Modify dest_array to reflect all device Iotune info changes described in * src_array. */ static int -qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *dest_array, - size_t *dest_size, - virBlkioDeviceWeightPtr src_array, - size_t src_size) +qemuDomainMergeDeviceIoTuneInfos(virBlkioDeviceIoTuneInfoPtr *dest_array, + size_t *dest_size, + virBlkioDeviceIoTuneInfoPtr src_array, + size_t src_size) { size_t i, j; - virBlkioDeviceWeightPtr dest, src; + virBlkioDeviceIoTuneInfoPtr dest, src; for (i = 0; i < src_size; i++) { bool found = false; @@ -7491,18 +7546,27 @@ qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *dest_array, if (STREQ(src->path, dest->path)) { found = true; dest->weight = src->weight; + dest->read_bps = src->read_bps; + dest->write_bps = src->write_bps; + dest->read_iops = src->read_iops; + dest->write_iops = src->write_iops; break; } } if (!found) { - if (!src->weight) + if (!src->weight && !src->read_bps && !src->write_bps && + !src->read_iops && !src->write_iops) continue; if (VIR_EXPAND_N(*dest_array, *dest_size, 1) < 0) return -1; dest = &(*dest_array)[*dest_size - 1]; - dest->path = src->path; + if (VIR_STRDUP(dest->path, src->path) < 0) + return -1; dest->weight = src->weight; - src->path = NULL; + dest->read_bps = src->read_bps; + dest->write_bps = src->write_bps; + dest->read_iops = src->read_iops; + dest->write_iops = src->write_iops; } } @@ -7531,6 +7595,14 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, VIR_TYPED_PARAM_UINT, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + VIR_TYPED_PARAM_STRING, NULL) < 0) return -1; @@ -7562,44 +7634,114 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_LIVE) { for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; + size_t ndevices = 0; + virBlkioDeviceIoTuneInfoPtr devices = NULL; + size_t j; + + if (qemuDomainMergeDeviceIoTuneInfos(&devices, &ndevices, + vm->def->blkio.devices, + vm->def->blkio.ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { if (params[i].value.ui > 1000 || params[i].value.ui < 100) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } if (virCgroupSetBlkioWeight(priv->cgroup, params[i].value.ui) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { - size_t ndevices; - virBlkioDeviceWeightPtr devices = NULL; - size_t j; - - if (qemuDomainParseDeviceWeightStr(params[i].value.s, - &devices, - &ndevices) < 0) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, + &devices, + &ndevices) < 0) { ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } - for (j = 0; j < ndevices; j++) { - if (virCgroupSetBlkioDeviceWeight(priv->cgroup, - devices[j].path, - devices[j].weight) < 0) { - ret = -1; - break; + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); } + continue; } - if (j != ndevices || - qemuDomainMergeDeviceWeights(&vm->def->blkio.devices, - &vm->def->blkio.ndevices, - devices, ndevices) < 0) + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } + + for (j = 0; j < ndevices; j++) { + if (virCgroupSetBlkioDeviceIoTune(priv->cgroup, + devices[j].path, devices[j].weight, + devices[j].read_bps, devices[j].write_bps, + devices[j].read_iops, devices[j].write_iops) < 0) { ret = -1; - virBlkioDeviceWeightArrayClear(devices, ndevices); - VIR_FREE(devices); + break; + } } + if (j != ndevices || + qemuDomainMergeDeviceIoTuneInfos(&vm->def->blkio.devices, + &vm->def->blkio.ndevices, + devices, ndevices) < 0) + ret = -1; + + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); } } if (ret < 0) @@ -7610,33 +7752,102 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; + virBlkioDeviceIoTuneInfoPtr devices = NULL; + size_t ndevices = 0; + + if (qemuDomainMergeDeviceIoTuneInfos(&devices, &ndevices, + persistentDef->blkio.devices, + persistentDef->blkio.ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { if (params[i].value.ui > 1000 || params[i].value.ui < 100) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } persistentDef->blkio.weight = params[i].value.ui; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { - virBlkioDeviceWeightPtr devices = NULL; - size_t ndevices; - - if (qemuDomainParseDeviceWeightStr(params[i].value.s, - &devices, - &ndevices) < 0) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, + &devices, + &ndevices) < 0) { ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } - if (qemuDomainMergeDeviceWeights(&persistentDef->blkio.devices, - &persistentDef->blkio.ndevices, - devices, ndevices) < 0) + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + &devices, + &ndevices) < 0) { ret = -1; - virBlkioDeviceWeightArrayClear(devices, ndevices); - VIR_FREE(devices); + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } } + + if (qemuDomainMergeDeviceIoTuneInfos(&persistentDef->blkio.devices, + &persistentDef->blkio.ndevices, + devices, ndevices) < 0) + ret = -1; + + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); } if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0) @@ -7747,6 +7958,122 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, goto cleanup; break; + case 2: /* blkiotune.throttle.device_read_bps */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].read_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].read_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + + case 3: /* blkiotune.throttle.device_write_bps */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].write_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].write_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + + case 4: /* blkiotune.throttle.device_read_iops */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].read_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].read_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + + case 5: /* blkiotune.throttle.device_write_iops */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].write_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].write_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + default: break; /* should not hit here */ @@ -7804,6 +8131,142 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, } break; + case 2: /* blkiotune.device_read_bps */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].read_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].read_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS); + goto cleanup; + } + break; + + case 3: /* blkiotune.device_write_bps */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].write_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].write_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS); + goto cleanup; + } + break; + + case 4: /* blkiotune.device_read_iops */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].read_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].read_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS); + goto cleanup; + } + break; + + case 5: /* blkiotune.device_write_iops */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].write_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].write_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS); + goto cleanup; + } + break; + default: break; /* should not hit here */ diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e99caf5..b506de5 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1825,23 +1825,36 @@ virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight) /** - * virCgroupSetBlkioDeviceWeight: + * virCgroupSetBlkioDeviceIoTune: * - * @group: The cgroup to change io device weight device for + * @group: The cgroup to change io device iotune device for * @path: The device with a weight to alter * @weight: The new device weight (100-1000), or 0 to clear + * @read_bps: The new read bps throttle, or 0 to clear + * @write_bps: The new write bps throttle, or 0 to clear + * @read_iops: The new read iops throttle, or 0 to clear + * @write_iops: The new write iops throttle, or 0 to clear * - * device_weight is treated as a write-only parameter, so - * there isn't a getter counterpart. + * paramters like device_weight, device_read_bps, device_write_bps, + * device_read_iops and device_write_iops are treated as write-only, + * so there isn't a getter counterpart. * * Returns: 0 on success, -1 on error */ int -virCgroupSetBlkioDeviceWeight(virCgroupPtr group, +virCgroupSetBlkioDeviceIoTune(virCgroupPtr group, const char *path, - unsigned int weight) -{ - char *str; + unsigned int weight, + unsigned long long read_bps, + unsigned long long write_bps, + unsigned long long read_iops, + unsigned long long write_iops) +{ + char *weight_str; + char *read_bps_str; + char *write_bps_str; + char *read_iops_str; + char *write_iops_str; struct stat sb; int ret; @@ -1866,15 +1879,51 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group, return -1; } - if (virAsprintf(&str, "%d:%d %d", major(sb.st_rdev), minor(sb.st_rdev), + if (virAsprintf(&weight_str, "%d:%d %d", major(sb.st_rdev), minor(sb.st_rdev), weight) < 0) return -1; + if (virAsprintf(&read_bps_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + read_bps) < 0) + return -1; + + if (virAsprintf(&write_bps_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + write_bps) < 0) + return -1; + + if (virAsprintf(&read_iops_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + read_iops) < 0) + return -1; + + if (virAsprintf(&write_iops_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + write_iops) < 0) + return -1; + ret = virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.weight_device", - str); - VIR_FREE(str); + weight_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.read_bps_device", + read_bps_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.write_bps_device", + write_bps_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.read_iops_device", + read_iops_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.write_iops_device", + write_iops_str); + VIR_FREE(weight_str); + VIR_FREE(read_bps_str); + VIR_FREE(write_bps_str); + VIR_FREE(read_iops_str); + VIR_FREE(write_iops_str); return ret; } @@ -3287,9 +3336,13 @@ virCgroupGetBlkioWeight(virCgroupPtr group ATTRIBUTE_UNUSED, int -virCgroupSetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED, +virCgroupSetBlkioDeviceIoTune(virCgroupPtr group ATTRIBUTE_UNUSED, const char *path ATTRIBUTE_UNUSED, - unsigned int weight ATTRIBUTE_UNUSED) + unsigned int weight ATTRIBUTE_UNUSED, + unsigned long long read_bps ATTRIBUTE_UNUSED, + unsigned long long write_bps ATTRIBUTE_UNUSED, + unsigned long long read_iops ATTRIBUTE_UNUSED, + unsigned long long write_iops ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform")); diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 835eb30..21980da 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -122,9 +122,13 @@ int virCgroupMoveTask(virCgroupPtr src_group, int virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight); int virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight); -int virCgroupSetBlkioDeviceWeight(virCgroupPtr group, +int virCgroupSetBlkioDeviceIoTune(virCgroupPtr group, const char *path, - unsigned int weight); + unsigned int weight, + unsigned long long read_bps, + unsigned long long write_bps, + unsigned long long read_iops, + unsigned long long write_iops); int virCgroupSetMemory(virCgroupPtr group, unsigned long long kb); int virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml index 743cf29..9bd97fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml @@ -8,6 +8,10 @@ <device> <path>/dev/sda</path> <weight>400</weight> + <read_bps>2000000000</read_bps> + <write_bps>1000000000</write_bps> + <read_iops>1000</read_iops> + <write_iops>2000</write_iops> </device> <device> <path>/dev/sdb</path> -- 1.7.9.5

1 0

[libvirt] [PATCH 0/2] Shut metadatatest up
by Peter Krempa 17 Sep '13

17 Sep '13

Peter Krempa (2): test: Refactor setting of dummy error handlers tests: metadatatest: Quiesce errors on expected paths tests/esxutilstest.c | 12 +----------- tests/metadatatest.c | 2 ++ tests/reconnect.c | 6 +----- tests/sockettest.c | 9 +-------- tests/statstest.c | 9 +-------- tests/testutils.c | 13 ++++++++++--- tests/testutils.h | 2 ++ tests/utiltest.c | 12 +----------- 8 files changed, 19 insertions(+), 46 deletions(-) -- 1.8.3.2

2 5

[libvirt] [PATCH 0/5] Add support for device blkio iops and bps throttle
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> The patches add support for setting/getting blkio read/write bps/iops throttle per-device with blkio cgroup. Aline Manera (3): Add https protocol support for cdrom disk Add ftps protocol support for cdrom disk Add tftp protocol support for cdrom disk Guan Qiang (2): blkiotune: add support for device iops and bps throttle blkiotune: add virsh support for blkiotune.throttle.iops/bps docs/formatdomain.html.in | 32 ++ docs/schemas/domaincommon.rng | 31 +- include/libvirt/libvirt.h.in | 40 ++ src/conf/domain_conf.c | 120 +++- src/conf/domain_conf.h | 19 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 9 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_command.c | 18 + src/qemu/qemu_driver.c | 579 ++++++++++++++++++-- src/util/vircgroup.c | 79 ++- src/util/vircgroup.h | 8 +- .../qemuxml2argv-blkiotune-device.xml | 4 + .../qemuxml2argv-disk-cdrom-network-ftps.args | 8 + .../qemuxml2argv-disk-cdrom-network-ftps.xml | 37 ++ .../qemuxml2argv-disk-cdrom-network-https.args | 8 + .../qemuxml2argv-disk-cdrom-network-https.xml | 37 ++ .../qemuxml2argv-disk-cdrom-network-tftp.args | 7 + .../qemuxml2argv-disk-cdrom-network-tftp.xml | 37 ++ tests/qemuxml2argvtest.c | 6 + tools/virsh-domain.c | 64 +++ tools/virsh.pod | 32 +- 22 files changed, 1075 insertions(+), 114 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml -- 1.7.9.5

2 1

[libvirt] [PATCHv5 0/3] VMX: CD-ROM handling improvements
by Doug Goldstein 17 Sep '13

17 Sep '13

A user came into #virt the other day and was trying to get libvirtd to work with VMware Fusion 5, which is basically the Mac OS X version of VMware Workstation. In helping him out I noticed a few limitations of our VMX parser so I've added support through this patchset. I don't personally have access or own VMware's product. v5: * use virBufferEscapeString NULL handling instead of doing my own checks * merge v4's patch 1 into master * 2 & 3 of this series are unchanged and ACK'd from v4. v4: * Half the patchset has been merged at this point * Add back 'auto detect' support via <source startupPolicy='optional'/> * Made device='lun' match device='cdrom' * Patch 1 & 2 are new to the series v3: * Dropped 'auto detect' support from series as it needs more work based on feedback * Added patch to combine virVMXFormatHardDisk and virVMXFormatCDROM into one function. * Converted to <disk type='block' device='lun'> instead of adding a <driver> element to better match the behavior available via QEMU. v2: * Added additional test cases and fixed issues that arose from those *** BLURB HERE *** Doug Goldstein (3): Allow <source> for type=block to have no dev VMX: Add support for 'auto detect' fileNames VMX: Add a VMWare Fusion 5 configuration for tests docs/schemas/domaincommon.rng | 8 +- src/conf/domain_conf.c | 4 +- src/vmx/vmx.c | 28 +++++-- .../vmx2xml-cdrom-ide-raw-auto-detect.vmx | 5 ++ .../vmx2xml-cdrom-ide-raw-auto-detect.xml | 24 ++++++ .../vmx2xml-cdrom-scsi-raw-auto-detect.vmx | 6 ++ .../vmx2xml-cdrom-scsi-raw-auto-detect.xml | 24 ++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 88 ++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 39 ++++++++++ tests/vmx2xmltest.c | 4 + .../xml2vmx-cdrom-ide-raw-auto-detect.vmx | 14 ++++ .../xml2vmx-cdrom-ide-raw-auto-detect.xml | 14 ++++ .../xml2vmx-cdrom-scsi-raw-auto-detect.vmx | 15 ++++ .../xml2vmx-cdrom-scsi-raw-auto-detect.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 30 ++++++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 41 ++++++++++ tests/xml2vmxtest.c | 4 + 17 files changed, 352 insertions(+), 10 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-auto-detect.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-auto-detect.xml create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml -- 1.8.1.5

2 5

[libvirt] [PATCH 5/5] blkiotune: add virsh support for blkiotune.throttle.iops/bps
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> This adds four parameters --device-read-bps, --device-write-bps, --device-read-iops and --device-write-iops to virsh command blkiotune for setting/getting blkiotune.throttle.{read/write}_{iops/bps}_device. --- tools/virsh-domain.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 32 +++++++++++++++++++++++-- 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 49cd154..2830d6a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1252,6 +1252,22 @@ static const vshCmdOptDef opts_blkiotune[] = { .type = VSH_OT_STRING, .help = N_("per-device IO Weights, in the form of /path/to/device,weight,...") }, + {.name = "device-read-bps", + .type = VSH_OT_STRING, + .help = N_("per-device read throughput limit in bytes per second, in the form of /path/to/device,read_bps,...") + }, + {.name = "device-write-bps", + .type = VSH_OT_STRING, + .help = N_("per-device write throughput limit in bytes per second, in the form of /path/to/device,write_bps,...") + }, + {.name = "device-read-iops", + .type = VSH_OT_STRING, + .help = N_("per-device read I/O operations limit per second, in the form of /path/to/device,read_iops,...") + }, + {.name = "device-write-iops", + .type = VSH_OT_STRING, + .help = N_("per-device write I/O operations limit per second, in the form of /path/to/device,write_iops,...") + }, {.name = "config", .type = VSH_OT_BOOL, .help = N_("affect next boot") @@ -1272,6 +1288,10 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) { virDomainPtr dom; const char *device_weight = NULL; + const char *device_read_bps = NULL; + const char *device_write_bps = NULL; + const char *device_read_iops = NULL; + const char *device_write_iops = NULL; int weight = 0; int nparams = 0; int maxparams = 0; @@ -1319,6 +1339,50 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) goto save_error; } + rv = vshCommandOptString(cmd, "device-read-bps", &device_read_bps); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + device_read_bps) < 0) + goto save_error; + } + + rv = vshCommandOptString(cmd, "device-write-bps", &device_write_bps); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + device_write_bps) < 0) + goto save_error; + } + + rv = vshCommandOptString(cmd, "device-read-iops", &device_read_iops); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + device_read_iops) < 0) + goto save_error; + } + + rv = vshCommandOptString(cmd, "device-write-iops", &device_write_iops); + if (rv < 0) { + vshError(ctl, "%s", _("Unable to parse string parameter")); + goto cleanup; + } else if (rv > 0) { + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + device_write_iops) < 0) + goto save_error; + } + if (nparams == 0) { /* get the number of blkio parameters */ if (virDomainGetBlkioParameters(dom, NULL, &nparams, flags) != 0) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 0ae5178..69829eb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1611,8 +1611,12 @@ The guaranteed minimum memory allocation for the guest. Specifying -1 as a value for these limits is interpreted as unlimited. =item B<blkiotune> I<domain> [I<--weight> B<weight>] -[I<--device-weights> B<device-weights>] [[I<--config>] -[I<--live>] | [I<--current>]] +[I<--device-weights> B<device-weights>] +[I<--device-read-bps> B<device-read-bps>] +[I<--device-write-bps> B<device-write-bps>] +[I<--device-read-iops> B<device-read-iops>] +[I<--device-write-iops> B<device-write-iops>] +[[I<--config>] [I<--live>] | [I<--current>]] Display or set the blkio parameters. QEMU/KVM supports I<--weight>. I<--weight> is in range [100, 1000]. @@ -1624,6 +1628,30 @@ device from per-device listings. Only the devices listed in the string are modified; any existing per-device weights for other devices remain unchanged. +B<device-read-bps> is a single string listing one or more device/read_bps +pairs, in the format of /path/to/device,read_bps,/path/to/device,read_bps. +Each read_bps is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device read_bps for other devices remain unchanged. + +B<device-write-bps> is a single string listing one or more device/write_bps +pairs, in the format of /path/to/device,write_bps,/path/to/device,write_bps. +Each write_bps is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device write_bps for other devices remain unchanged. + +B<device-read-iops> is a single string listing one or more device/read_iops +pairs, in the format of /path/to/device,read_iops,/path/to/device,read_iops. +Each read_iops is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device read_iops for other devices remain unchanged. + +B<device-write-iops> is a single string listing one or more device/write_iops +pairs, in the format of /path/to/device,write_iops,/path/to/device,write_iops. +Each write_iops is a postive number, or the value 0 to remove that device from +per-device listings. Only the devices listed in the string are modified; +any existing per-device write_iops for other devices remain unchanged. + If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -- 1.7.9.5

1 0

[libvirt] [PATCH 4/5] blkiotune: add support for device iops and bps throttle
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> This adds per-device iops and bps throttle to <blkiotune>. By extending the existed 'domainSetBlkioParameters' interface, read/write iops and bps throttle for per-device can be set with blkio cgroup. The blkiotune xml entry is now looked like: <domain ...> <blkiotune> <device> <path>/path/to/block</path> <weight>1000</weight> <read_bps>100000</read_bps> <write_bps>100000</write_bps> <read_iops>100000</read_iops> <write_iops>1000000</write_iops> </device> </blkiotune> .. Elments <weight>,<read_bps>,<write_bps>,<read_iops>,<write_iops> are all optional, but must have one. --- docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 40 ++ src/conf/domain_conf.c | 115 +++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 9 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_driver.c | 579 ++++++++++++++++++-- src/util/vircgroup.c | 79 ++- src/util/vircgroup.h | 8 +- .../qemuxml2argv-blkiotune-device.xml | 4 + 12 files changed, 789 insertions(+), 111 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a927643..daf4f7a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -753,10 +753,18 @@ <device> <path>/dev/sda</path> <weight>1000</weight> + <read_bps>20000000</read_bps> + <write_bps>30000000</write_bps> + <read_iops>4000</read_iops> + <write_iops>5000</write_iops> </device> <device> <path>/dev/sdb</path> <weight>500</weight> + <read_bps>30000000</read_bps> + <write_bps>30000000</write_bps> + <read_iops>4300</read_iops> + <write_iops>6000</write_iops> </device> </blkiotune> ... diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4d333a8..10553af 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -621,9 +621,31 @@ <element name="path"> <ref name="absFilePath"/> </element> - <element name="weight"> - <ref name="weight"/> - </element> + <optional> + <element name="weight"> + <ref name="weight"/> + </element> + </optional> + <optional> + <element name="read_bps"> + <data type="unsignedLong"/> + </element> + </optional> + <optional> + <element name="write_bps"> + <data type="unsignedLong"/> + </element> + </optional> + <optional> + <element name="read_iops"> + <data type="unsignedLong"/> + </element> + </optional> + <optional> + <element name="write_iops"> + <data type="unsignedLong"/> + </element> + </optional> </interleave> </element> </zeroOrMore> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a47e33c..fd4a2e5 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1780,6 +1780,46 @@ char * virDomainGetSchedulerType(virDomainPtr domain, #define VIR_DOMAIN_BLKIO_DEVICE_WEIGHT "device_weight" +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS: + * + * Macro for the BLKIO tunable throttle.read_bps_device: it represents the read + * bytes per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,read_bps elements, + * separated by ',', with element read_bps as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS "device_read_bps" + +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS: + * + * Macro for the BLKIO tunable throttle.write_bps_device: it represents the write + * bytes per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,write_bps elements, + * separated by ',', with element write_bps as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS "device_write_bps" + +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS: + * + * Macro for the BLKIO tunable throttle.read_iops_device: it represents the read + * I/O operations per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,read_iops elements, + * separated by ',', with element read_iops as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS "device_read_iops" + +/** + * VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS: + * + * Macro for the BLKIO tunable throttle.write_iops_device: it represents the write + * I/O operations per second permitted through a block device, as a string. + * The string is parsed as a series of /path/to/device,write_iops elements, + * separated by ',', with element write_iops as a ullong. + */ +#define VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS "device_write_iops" + /* Set Blkio tunables for the domain*/ int virDomainSetBlkioParameters(virDomainPtr domain, virTypedParameterPtr params, diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 05c1de4..f9df10f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -880,47 +880,100 @@ virDomainXMLOptionGetNamespace(virDomainXMLOptionPtr xmlopt) void -virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, +virBlkioDeviceIoTuneInfoArrayClear(virBlkioDeviceIoTuneInfoPtr devices, int ndevices) { size_t i; for (i = 0; i < ndevices; i++) - VIR_FREE(deviceWeights[i].path); + VIR_FREE(devices[i].path); } /** - * virDomainBlkioDeviceWeightParseXML + * virDomainBlkioDeviceIoTuneInfoParseXML * * this function parses a XML node: * * <device> * <path>/fully/qualified/device/path</path> * <weight>weight</weight> + * <read_bps>read_bps</read_bps> + * <write_bps>write_bps</write_bps> + * <read_iops>read_iops</read_iops> + * <write_iops>write_iops</write_iops> * </device> * - * and fills a virBlkioDeviceWeight struct. + * and fills a virBlkioDeviceIoTuneInfo struct. */ static int -virDomainBlkioDeviceWeightParseXML(xmlNodePtr root, - virBlkioDeviceWeightPtr dw) +virDomainBlkioDeviceIoTuneInfoParseXML(xmlNodePtr root, + virBlkioDeviceIoTuneInfoPtr dio) { char *c; xmlNodePtr node; + dio->read_bps = 0; + dio->write_bps = 0; + dio->read_iops = 0; + dio->write_iops = 0; + node = root->children; while (node) { if (node->type == XML_ELEMENT_NODE) { - if (xmlStrEqual(node->name, BAD_CAST "path") && !dw->path) { - dw->path = (char *)xmlNodeGetContent(node); + if (xmlStrEqual(node->name, BAD_CAST "path") && !dio->path) { + dio->path = (char *)xmlNodeGetContent(node); } else if (xmlStrEqual(node->name, BAD_CAST "weight")) { c = (char *)xmlNodeGetContent(node); - if (virStrToLong_ui(c, NULL, 10, &dw->weight) < 0) { + if (virStrToLong_ui(c, NULL, 10, &dio->weight) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("could not parse weight %s"), c); VIR_FREE(c); - VIR_FREE(dw->path); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "read_bps")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->read_bps) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse read_bps %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "write_bps")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->write_bps) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse write_bps %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "read_iops")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->read_iops) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse read_iops %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); + return -1; + } + VIR_FREE(c); + } else if (xmlStrEqual(node->name, BAD_CAST "write_iops")) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ull(c, NULL, 10, &dio->write_iops) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse write_iops %s"), + c); + VIR_FREE(c); + VIR_FREE(dio->path); return -1; } VIR_FREE(c); @@ -928,7 +981,7 @@ virDomainBlkioDeviceWeightParseXML(xmlNodePtr root, } node = node->next; } - if (!dw->path) { + if (!dio->path) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("missing per-device path")); return -1; @@ -1988,8 +2041,8 @@ void virDomainDefFree(virDomainDefPtr def) VIR_FREE(def->description); VIR_FREE(def->title); - virBlkioDeviceWeightArrayClear(def->blkio.devices, - def->blkio.ndevices); + virBlkioDeviceIoTuneInfoArrayClear(def->blkio.devices, + def->blkio.ndevices); VIR_FREE(def->blkio.devices); virDomainWatchdogDefFree(def->watchdog); @@ -10962,15 +11015,15 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { size_t j; - if (virDomainBlkioDeviceWeightParseXML(nodes[i], - &def->blkio.devices[i]) < 0) + if (virDomainBlkioDeviceIoTuneInfoParseXML(nodes[i], + &def->blkio.devices[i]) < 0) goto error; def->blkio.ndevices++; for (j = 0; j < i; j++) { if (STREQ(def->blkio.devices[j].path, def->blkio.devices[i].path)) { virReportError(VIR_ERR_XML_ERROR, - _("duplicate device weight path '%s'"), + _("duplicate blkio device path '%s'"), def->blkio.devices[i].path); goto error; } @@ -16349,7 +16402,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, blkio = true; } else { for (n = 0; n < def->blkio.ndevices; n++) { - if (def->blkio.devices[n].weight) { + if (def->blkio.devices[n].weight || def->blkio.devices[n].read_bps || + def->blkio.devices[n].write_bps || def->blkio.devices[n].read_iops || + def->blkio.devices[n].write_iops) { blkio = true; break; } @@ -16364,13 +16419,33 @@ virDomainDefFormatInternal(virDomainDefPtr def, def->blkio.weight); for (n = 0; n < def->blkio.ndevices; n++) { - if (def->blkio.devices[n].weight == 0) + if (def->blkio.devices[n].weight == 0 && def->blkio.devices[n].read_bps == 0 && + def->blkio.devices[n].write_bps == 0 && def->blkio.devices[n].read_iops == 0 && + def->blkio.devices[n].write_iops == 0) continue; virBufferAddLit(buf, " <device>\n"); virBufferEscapeString(buf, " <path>%s</path>\n", def->blkio.devices[n].path); - virBufferAsprintf(buf, " <weight>%u</weight>\n", - def->blkio.devices[n].weight); + if (def->blkio.devices[n].weight) { + virBufferAsprintf(buf, " <weight>%u</weight>\n", + def->blkio.devices[n].weight); + } + if (def->blkio.devices[n].read_bps) { + virBufferAsprintf(buf, " <read_bps>%llu</read_bps>\n", + def->blkio.devices[n].read_bps); + } + if (def->blkio.devices[n].write_bps) { + virBufferAsprintf(buf, " <write_bps>%llu</write_bps>\n", + def->blkio.devices[n].write_bps); + } + if (def->blkio.devices[n].read_iops) { + virBufferAsprintf(buf, " <read_iops>%llu</read_iops>\n", + def->blkio.devices[n].read_iops); + } + if (def->blkio.devices[n].write_iops) { + virBufferAsprintf(buf, " <write_iops>%llu</write_iops>\n", + def->blkio.devices[n].write_iops); + } virBufferAddLit(buf, " </device>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9414ebf..1f350ed 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1857,11 +1857,15 @@ virDomainVcpuPinDefPtr virDomainVcpuPinFindByVcpu(virDomainVcpuPinDefPtr *def, int nvcpupin, int vcpu); -typedef struct _virBlkioDeviceWeight virBlkioDeviceWeight; -typedef virBlkioDeviceWeight *virBlkioDeviceWeightPtr; -struct _virBlkioDeviceWeight { +typedef struct _virBlkioDeviceIoTuneInfo virBlkioDeviceIoTuneInfo; +typedef virBlkioDeviceIoTuneInfo *virBlkioDeviceIoTuneInfoPtr; +struct _virBlkioDeviceIoTuneInfo { char *path; unsigned int weight; + unsigned long long read_bps; + unsigned long long write_bps; + unsigned long long read_iops; + unsigned long long write_iops; }; enum virDomainRNGModel { @@ -1908,8 +1912,8 @@ struct _virDomainIdMapDef { }; -void virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, - int ndevices); +void virBlkioDeviceIoTuneInfoArrayClear(virBlkioDeviceIoTuneInfoPtr devices, + int ndevices); typedef struct _virDomainResourceDef virDomainResourceDef; typedef virDomainResourceDef *virDomainResourceDefPtr; @@ -1937,7 +1941,7 @@ struct _virDomainDef { unsigned int weight; size_t ndevices; - virBlkioDeviceWeightPtr devices; + virBlkioDeviceIoTuneInfoPtr devices; } blkio; struct { diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 50e2f48..e6259cf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -103,7 +103,7 @@ virDomainAuditVcpu; # conf/domain_conf.h -virBlkioDeviceWeightArrayClear; +virBlkioDeviceIoTuneInfoArrayClear; virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainActualNetDefFree; @@ -1207,7 +1207,7 @@ virCgroupNewVcpu; virCgroupPathOfController; virCgroupRemove; virCgroupRemoveRecursively; -virCgroupSetBlkioDeviceWeight; +virCgroupSetBlkioDeviceIoTune; virCgroupSetBlkioWeight; virCgroupSetCpuCfsPeriod; virCgroupSetCpuCfsQuota; diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 0b0ca02..f2c32e7 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -112,10 +112,13 @@ static int virLXCCgroupSetupBlkioTune(virDomainDefPtr def, if (def->blkio.ndevices) { for (i = 0; i < def->blkio.ndevices; i++) { - virBlkioDeviceWeightPtr dw = &def->blkio.devices[i]; - if (!dw->weight) + virBlkioDeviceIoTuneInfoPtr dio = &def->blkio.devices[i]; + if (!dio->weight) continue; - if (virCgroupSetBlkioDeviceWeight(cgroup, dw->path, dw->weight) < 0) + if (virCgroupSetBlkioDeviceIoTune(cgroup, + dio->path, dio->weight, + dio->read_bps, dio->write_bps, + dio->read_iops, dio->write_iops) < 0) return -1; } } diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f95c7f2..20e700f 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -399,11 +399,13 @@ qemuSetupBlkioCgroup(virDomainObjPtr vm) if (vm->def->blkio.ndevices) { for (i = 0; i < vm->def->blkio.ndevices; i++) { - virBlkioDeviceWeightPtr dw = &vm->def->blkio.devices[i]; - if (!dw->weight) + virBlkioDeviceIoTuneInfoPtr dio = &vm->def->blkio.devices[i]; + if (!dio->weight) continue; - if (virCgroupSetBlkioDeviceWeight(priv->cgroup, dw->path, - dw->weight) < 0) + if (virCgroupSetBlkioDeviceIoTune(priv->cgroup, + dio->path, dio->weight, + dio->read_bps, dio->write_bps, + dio->read_iops, dio->write_iops) < 0) return -1; } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0763f9b..ff0ae98 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -131,7 +131,7 @@ # define KVM_CAP_NR_VCPUS 9 /* returns max vcpus per vm */ #endif -#define QEMU_NB_BLKIO_PARAM 2 +#define QEMU_NB_BLKIO_PARAM 6 #define QEMU_NB_BANDWIDTH_PARAM 6 @@ -7388,26 +7388,26 @@ cleanup: return ret; } -/* deviceWeightStr in the form of /device/path,weight,/device/path,weight +/* deviceIoTuneStr in the form of /device/path,ioTuneValue,/device/path,ioTuneValue or * for example, /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0,800 + * deviceIoTuneFiled represents the ioTune type to tune, including device weight, + * device read bps, device write bps, device read iops and device write iops. */ static int -qemuDomainParseDeviceWeightStr(char *deviceWeightStr, - virBlkioDeviceWeightPtr *dw, size_t *size) +qemuDomainParseDeviceIoTuneInfoStr(char *deviceIoTuneStr, + const char *deviceIoTuneFiled, + virBlkioDeviceIoTuneInfoPtr *dio, size_t *size) { char *temp; int ndevices = 0; int nsep = 0; - size_t i; - virBlkioDeviceWeightPtr result = NULL; - - *dw = NULL; - *size = 0; + size_t i, j, k; + virBlkioDeviceIoTuneInfoPtr result = NULL; - if (STREQ(deviceWeightStr, "")) + if (STREQ(deviceIoTuneStr, "")) return 0; - temp = deviceWeightStr; + temp = deviceIoTuneStr; while (temp) { temp = strchr(temp, ','); if (temp) { @@ -7426,8 +7426,11 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (VIR_ALLOC_N(result, ndevices) < 0) return -1; + for (i = 0; i < ndevices; i++) + memset(&result[i], 0, sizeof(result[i])); + i = 0; - temp = deviceWeightStr; + temp = deviceIoTuneStr; while (temp) { char *p = temp; @@ -7439,11 +7442,25 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (VIR_STRNDUP(result[i].path, temp, p - temp) < 0) goto cleanup; - /* weight */ + /* device ioTune value */ temp = p + 1; - if (virStrToLong_ui(temp, &p, 10, &result[i].weight) < 0) - goto error; + if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { + if (virStrToLong_ui(temp, &p, 10, &result[i].weight) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].read_bps) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].write_bps) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].read_iops) < 0) + goto error; + } else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) { + if (virStrToLong_ull(temp, &p, 10, &result[i].write_iops) < 0) + goto error; + } i++; @@ -7457,30 +7474,68 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, if (!i) VIR_FREE(result); - *dw = result; - *size = i; + for (j = 0; j < i; j++) { + bool found = false; + virBlkioDeviceIoTuneInfoPtr old, new; + + new = &result[j]; + for (k = 0; k < *size; k++) { + old = &(*dio)[k]; + if (STREQ(new->path, old->path)) { + found = true; + if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) + old->weight = new->weight; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) + old->read_bps = new->read_bps; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) + old->write_bps = new->write_bps; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) + old->read_iops = new->read_iops; + else if (STREQ(deviceIoTuneFiled, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) + old->write_iops = new->write_iops; + break; + } + } + if (!found) { + if (!new->weight && !new->read_bps && !new->write_bps && + !new->read_iops && !new->write_iops) + continue; + if (VIR_EXPAND_N(*dio, *size, 1) < 0) + goto cleanup; + old = &(*dio)[*size -1]; + if (VIR_STRDUP(old->path, new->path) < 0) + goto cleanup; + old->weight = new->weight; + old->read_bps = new->read_bps; + old->write_bps = new->write_bps; + old->read_iops = new->read_iops; + old->write_iops = new->write_iops; + } + } + virBlkioDeviceIoTuneInfoArrayClear(result, ndevices); + VIR_FREE(result); return 0; error: virReportError(VIR_ERR_INVALID_ARG, - _("unable to parse device weight '%s'"), deviceWeightStr); + _("unable to parse device ioTune '%s'"), deviceIoTuneStr); cleanup: - virBlkioDeviceWeightArrayClear(result, ndevices); + virBlkioDeviceIoTuneInfoArrayClear(result, ndevices); VIR_FREE(result); return -1; } -/* Modify dest_array to reflect all device weight changes described in +/* Modify dest_array to reflect all device Iotune info changes described in * src_array. */ static int -qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *dest_array, - size_t *dest_size, - virBlkioDeviceWeightPtr src_array, - size_t src_size) +qemuDomainMergeDeviceIoTuneInfos(virBlkioDeviceIoTuneInfoPtr *dest_array, + size_t *dest_size, + virBlkioDeviceIoTuneInfoPtr src_array, + size_t src_size) { size_t i, j; - virBlkioDeviceWeightPtr dest, src; + virBlkioDeviceIoTuneInfoPtr dest, src; for (i = 0; i < src_size; i++) { bool found = false; @@ -7491,18 +7546,27 @@ qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *dest_array, if (STREQ(src->path, dest->path)) { found = true; dest->weight = src->weight; + dest->read_bps = src->read_bps; + dest->write_bps = src->write_bps; + dest->read_iops = src->read_iops; + dest->write_iops = src->write_iops; break; } } if (!found) { - if (!src->weight) + if (!src->weight && !src->read_bps && !src->write_bps && + !src->read_iops && !src->write_iops) continue; if (VIR_EXPAND_N(*dest_array, *dest_size, 1) < 0) return -1; dest = &(*dest_array)[*dest_size - 1]; - dest->path = src->path; + if (VIR_STRDUP(dest->path, src->path) < 0) + return -1; dest->weight = src->weight; - src->path = NULL; + dest->read_bps = src->read_bps; + dest->write_bps = src->write_bps; + dest->read_iops = src->read_iops; + dest->write_iops = src->write_iops; } } @@ -7531,6 +7595,14 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, VIR_TYPED_PARAM_UINT, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + VIR_TYPED_PARAM_STRING, NULL) < 0) return -1; @@ -7562,44 +7634,114 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_LIVE) { for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; + size_t ndevices = 0; + virBlkioDeviceIoTuneInfoPtr devices = NULL; + size_t j; + + if (qemuDomainMergeDeviceIoTuneInfos(&devices, &ndevices, + vm->def->blkio.devices, + vm->def->blkio.ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { if (params[i].value.ui > 1000 || params[i].value.ui < 100) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } if (virCgroupSetBlkioWeight(priv->cgroup, params[i].value.ui) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { - size_t ndevices; - virBlkioDeviceWeightPtr devices = NULL; - size_t j; - - if (qemuDomainParseDeviceWeightStr(params[i].value.s, - &devices, - &ndevices) < 0) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, + &devices, + &ndevices) < 0) { ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } - for (j = 0; j < ndevices; j++) { - if (virCgroupSetBlkioDeviceWeight(priv->cgroup, - devices[j].path, - devices[j].weight) < 0) { - ret = -1; - break; + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); } + continue; } - if (j != ndevices || - qemuDomainMergeDeviceWeights(&vm->def->blkio.devices, - &vm->def->blkio.ndevices, - devices, ndevices) < 0) + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } + + for (j = 0; j < ndevices; j++) { + if (virCgroupSetBlkioDeviceIoTune(priv->cgroup, + devices[j].path, devices[j].weight, + devices[j].read_bps, devices[j].write_bps, + devices[j].read_iops, devices[j].write_iops) < 0) { ret = -1; - virBlkioDeviceWeightArrayClear(devices, ndevices); - VIR_FREE(devices); + break; + } } + if (j != ndevices || + qemuDomainMergeDeviceIoTuneInfos(&vm->def->blkio.devices, + &vm->def->blkio.ndevices, + devices, ndevices) < 0) + ret = -1; + + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); } } if (ret < 0) @@ -7610,33 +7752,102 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; + virBlkioDeviceIoTuneInfoPtr devices = NULL; + size_t ndevices = 0; + + if (qemuDomainMergeDeviceIoTuneInfos(&devices, &ndevices, + persistentDef->blkio.devices, + persistentDef->blkio.ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { if (params[i].value.ui > 1000 || params[i].value.ui < 100) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } persistentDef->blkio.weight = params[i].value.ui; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { - virBlkioDeviceWeightPtr devices = NULL; - size_t ndevices; - - if (qemuDomainParseDeviceWeightStr(params[i].value.s, - &devices, - &ndevices) < 0) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, + &devices, + &ndevices) < 0) { ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } continue; } - if (qemuDomainMergeDeviceWeights(&persistentDef->blkio.devices, - &persistentDef->blkio.ndevices, - devices, ndevices) < 0) + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + &devices, + &ndevices) < 0) { ret = -1; - virBlkioDeviceWeightArrayClear(devices, ndevices); - VIR_FREE(devices); + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS)) { + if (qemuDomainParseDeviceIoTuneInfoStr(params[i].value.s, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + &devices, + &ndevices) < 0) { + ret = -1; + if (ndevices) { + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); + } + continue; + } } + + if (qemuDomainMergeDeviceIoTuneInfos(&persistentDef->blkio.devices, + &persistentDef->blkio.ndevices, + devices, ndevices) < 0) + ret = -1; + + virBlkioDeviceIoTuneInfoArrayClear(devices, ndevices); + VIR_FREE(devices); } if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0) @@ -7747,6 +7958,122 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, goto cleanup; break; + case 2: /* blkiotune.throttle.device_read_bps */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].read_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].read_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + + case 3: /* blkiotune.throttle.device_write_bps */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].write_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].write_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + + case 4: /* blkiotune.throttle.device_read_iops */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].read_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].read_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + + case 5: /* blkiotune.throttle.device_write_iops */ + if (vm->def->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < vm->def->blkio.ndevices; j++) { + if (!vm->def->blkio.devices[j].write_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + vm->def->blkio.devices[j].path, + vm->def->blkio.devices[j].write_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (virTypedParameterAssign(param, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS, + VIR_TYPED_PARAM_STRING, + param->value.s) < 0) + goto cleanup; + break; + default: break; /* should not hit here */ @@ -7804,6 +8131,142 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, } break; + case 2: /* blkiotune.device_read_bps */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].read_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].read_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_BPS); + goto cleanup; + } + break; + + case 3: /* blkiotune.device_write_bps */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].write_bps) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].write_bps); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_BPS); + goto cleanup; + } + break; + + case 4: /* blkiotune.device_read_iops */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].read_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].read_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_READ_IOPS); + goto cleanup; + } + break; + + case 5: /* blkiotune.device_write_iops */ + if (persistentDef->blkio.ndevices > 0) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + bool comma = false; + + for (j = 0; j < persistentDef->blkio.ndevices; j++) { + if (!persistentDef->blkio.devices[j].write_iops) + continue; + if (comma) + virBufferAddChar(&buf, ','); + else + comma = true; + virBufferAsprintf(&buf, "%s,%llu", + persistentDef->blkio.devices[j].path, + persistentDef->blkio.devices[j].write_iops); + } + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + param->value.s = virBufferContentAndReset(&buf); + } + if (!param->value.s && VIR_STRDUP(param->value.s, "") < 0) + goto cleanup; + param->type = VIR_TYPED_PARAM_STRING; + if (virStrcpyStatic(param->field, + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field name '%s' too long"), + VIR_DOMAIN_BLKIO_THROTTLE_DEVICE_WRITE_IOPS); + goto cleanup; + } + break; + default: break; /* should not hit here */ diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e99caf5..b506de5 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1825,23 +1825,36 @@ virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight) /** - * virCgroupSetBlkioDeviceWeight: + * virCgroupSetBlkioDeviceIoTune: * - * @group: The cgroup to change io device weight device for + * @group: The cgroup to change io device iotune device for * @path: The device with a weight to alter * @weight: The new device weight (100-1000), or 0 to clear + * @read_bps: The new read bps throttle, or 0 to clear + * @write_bps: The new write bps throttle, or 0 to clear + * @read_iops: The new read iops throttle, or 0 to clear + * @write_iops: The new write iops throttle, or 0 to clear * - * device_weight is treated as a write-only parameter, so - * there isn't a getter counterpart. + * paramters like device_weight, device_read_bps, device_write_bps, + * device_read_iops and device_write_iops are treated as write-only, + * so there isn't a getter counterpart. * * Returns: 0 on success, -1 on error */ int -virCgroupSetBlkioDeviceWeight(virCgroupPtr group, +virCgroupSetBlkioDeviceIoTune(virCgroupPtr group, const char *path, - unsigned int weight) -{ - char *str; + unsigned int weight, + unsigned long long read_bps, + unsigned long long write_bps, + unsigned long long read_iops, + unsigned long long write_iops) +{ + char *weight_str; + char *read_bps_str; + char *write_bps_str; + char *read_iops_str; + char *write_iops_str; struct stat sb; int ret; @@ -1866,15 +1879,51 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group, return -1; } - if (virAsprintf(&str, "%d:%d %d", major(sb.st_rdev), minor(sb.st_rdev), + if (virAsprintf(&weight_str, "%d:%d %d", major(sb.st_rdev), minor(sb.st_rdev), weight) < 0) return -1; + if (virAsprintf(&read_bps_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + read_bps) < 0) + return -1; + + if (virAsprintf(&write_bps_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + write_bps) < 0) + return -1; + + if (virAsprintf(&read_iops_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + read_iops) < 0) + return -1; + + if (virAsprintf(&write_iops_str, "%d:%d %llu", major(sb.st_rdev), minor(sb.st_rdev), + write_iops) < 0) + return -1; + ret = virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.weight_device", - str); - VIR_FREE(str); + weight_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.read_bps_device", + read_bps_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.write_bps_device", + write_bps_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.read_iops_device", + read_iops_str); + ret = virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.write_iops_device", + write_iops_str); + VIR_FREE(weight_str); + VIR_FREE(read_bps_str); + VIR_FREE(write_bps_str); + VIR_FREE(read_iops_str); + VIR_FREE(write_iops_str); return ret; } @@ -3287,9 +3336,13 @@ virCgroupGetBlkioWeight(virCgroupPtr group ATTRIBUTE_UNUSED, int -virCgroupSetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED, +virCgroupSetBlkioDeviceIoTune(virCgroupPtr group ATTRIBUTE_UNUSED, const char *path ATTRIBUTE_UNUSED, - unsigned int weight ATTRIBUTE_UNUSED) + unsigned int weight ATTRIBUTE_UNUSED, + unsigned long long read_bps ATTRIBUTE_UNUSED, + unsigned long long write_bps ATTRIBUTE_UNUSED, + unsigned long long read_iops ATTRIBUTE_UNUSED, + unsigned long long write_iops ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform")); diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 835eb30..21980da 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -122,9 +122,13 @@ int virCgroupMoveTask(virCgroupPtr src_group, int virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight); int virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight); -int virCgroupSetBlkioDeviceWeight(virCgroupPtr group, +int virCgroupSetBlkioDeviceIoTune(virCgroupPtr group, const char *path, - unsigned int weight); + unsigned int weight, + unsigned long long read_bps, + unsigned long long write_bps, + unsigned long long read_iops, + unsigned long long write_iops); int virCgroupSetMemory(virCgroupPtr group, unsigned long long kb); int virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml index 743cf29..9bd97fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml @@ -8,6 +8,10 @@ <device> <path>/dev/sda</path> <weight>400</weight> + <read_bps>2000000000</read_bps> + <write_bps>1000000000</write_bps> + <read_iops>1000</read_iops> + <write_iops>2000</write_iops> </device> <device> <path>/dev/sdb</path> -- 1.7.9.5

1 0

[libvirt] [PATCH 3/5] Add tftp protocol support for cdrom disk
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Aline Manera <alinefm(a)br.ibm.com> qemu/KVM also supports a tftp URL while specifying the cdrom ISO image. The xml should be as following: <disk type='network' device='cdrom'> <source protocol='tftp' name='/url/path'> <host name='host.name' port='69'/> </source> </disk> Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 6 ++++ .../qemuxml2argv-disk-cdrom-network-tftp.args | 7 ++++ .../qemuxml2argv-disk-cdrom-network-tftp.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 8 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0b6cd45..a927643 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1533,6 +1533,14 @@ <target dev='hdc' bus='ide' tray='open'/> <readonly/> </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol="tftp" name="url_path"> + <host name="hostname" port="69"/> + </source> + <target dev='hdc' bus='ide' tray='open'/> + <readonly/> + </disk> <disk type='block' device='lun'> <driver name='qemu' type='raw'/> <source dev='/dev/sda'/> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2da3669..4d333a8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1234,6 +1234,7 @@ <value>https</value> <value>ftp</value> <value>ftps</value> + <value>tftp</value> </choice> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ff3da7a..05c1de4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -267,7 +267,8 @@ VIR_ENUM_IMPL(virDomainDiskProtocol, VIR_DOMAIN_DISK_PROTOCOL_LAST, "http", "https", "ftp", - "ftps") + "ftps", + "tftp") VIR_ENUM_IMPL(virDomainDiskProtocolTransport, VIR_DOMAIN_DISK_PROTO_TRANS_LAST, "tcp", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ab1290b..9414ebf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -546,6 +546,7 @@ enum virDomainDiskProtocol { VIR_DOMAIN_DISK_PROTOCOL_HTTPS, VIR_DOMAIN_DISK_PROTOCOL_FTP, VIR_DOMAIN_DISK_PROTOCOL_FTPS, + VIR_DOMAIN_DISK_PROTOCOL_TFTP, VIR_DOMAIN_DISK_PROTOCOL_LAST }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1bde013..4628dac 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3923,6 +3923,12 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, disk->hosts->port ? disk->hosts->port : "990"); virBufferEscape(&opt, ',', ",", "%s,", disk->src); break; + case VIR_DOMAIN_DISK_PROTOCOL_TFTP: + virBufferAsprintf(&opt, "file=tftp://%s:%s", + disk->hosts->name, + disk->hosts->port ? disk->hosts->port : "69"); + virBufferEscape(&opt, ',', ",", "%s,", disk->src); + break; } } else if (disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME) { if (qemuBuildVolumeString(conn, disk, &opt) < 0) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args new file mode 100644 index 0000000..bc0cb92 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/kvm -S \ +-M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ +-drive file=tftp://host.name:69/url/path/file.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 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml new file mode 100644 index 0000000..b311237 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml @@ -0,0 +1,37 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-1.2'>hvm</type> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/kvm</emulator> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol='tftp' name='/url/path/file.iso'> + <host name='host.name' port='69'/> + </source> + <target dev='hdc' bus='ide'/> + <readonly/> + <alias name='ide0-1-0'/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5daee82..ec4a6e5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -451,6 +451,8 @@ mymain(void) QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-network-ftps", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE); + DO_TEST("disk-cdrom-network-tftp", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, + QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-empty", QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-tray", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_TX_ALG); -- 1.7.9.5

1 0

[libvirt] [PATCH 2/5] Add ftps protocol support for cdrom disk
by hzguanqiang＠gmail.com 17 Sep '13

17 Sep '13

From: Aline Manera <alinefm(a)br.ibm.com> The ftps protocol is another protocol supported by qemu/KVM while specifying the cdrom ISO image. The xml should be as following: <disk type='network' device='cdrom'> <source protocol='ftps' name='/url/path'> <host name='host.name' port='990'/> </source> </disk> Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 6 ++++ .../qemuxml2argv-disk-cdrom-network-ftps.args | 8 +++++ .../qemuxml2argv-disk-cdrom-network-ftps.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 8 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 240571f..0b6cd45 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1525,6 +1525,14 @@ <target dev='hdc' bus='ide' tray='open'/> <readonly/> </disk> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol="ftps" name="url_path"> + <host name="hostname" port="990"/> + </source> + <target dev='hdc' bus='ide' tray='open'/> + <readonly/> + </disk> <disk type='block' device='lun'> <driver name='qemu' type='raw'/> <source dev='/dev/sda'/> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2f91f0f..2da3669 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1233,6 +1233,7 @@ <value>http</value> <value>https</value> <value>ftp</value> + <value>ftps</value> </choice> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04563f6..ff3da7a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -266,7 +266,8 @@ VIR_ENUM_IMPL(virDomainDiskProtocol, VIR_DOMAIN_DISK_PROTOCOL_LAST, "iscsi", "http", "https", - "ftp") + "ftp", + "ftps") VIR_ENUM_IMPL(virDomainDiskProtocolTransport, VIR_DOMAIN_DISK_PROTO_TRANS_LAST, "tcp", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d54b29e..ab1290b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -545,6 +545,7 @@ enum virDomainDiskProtocol { VIR_DOMAIN_DISK_PROTOCOL_HTTP, VIR_DOMAIN_DISK_PROTOCOL_HTTPS, VIR_DOMAIN_DISK_PROTOCOL_FTP, + VIR_DOMAIN_DISK_PROTOCOL_FTPS, VIR_DOMAIN_DISK_PROTOCOL_LAST }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 883b513..1bde013 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3917,6 +3917,12 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, disk->hosts->port ? disk->hosts->port : "21"); virBufferEscape(&opt, ',', ",", "%s,", disk->src); break; + case VIR_DOMAIN_DISK_PROTOCOL_FTPS: + virBufferAsprintf(&opt, "file=ftps://%s:%s", + disk->hosts->name, + disk->hosts->port ? disk->hosts->port : "990"); + virBufferEscape(&opt, ',', ",", "%s,", disk->src); + break; } } else if (disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME) { if (qemuBuildVolumeString(conn, disk, &opt) < 0) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args new file mode 100644 index 0000000..78dbff2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/kvm -S \ +-M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ +-drive \ +file=ftps://host.name:990/url/path/file.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 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml new file mode 100644 index 0000000..b4a0f52 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml @@ -0,0 +1,37 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-1.2'>hvm</type> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/kvm</emulator> + <disk type='network' device='cdrom'> + <driver name='qemu' type='raw'/> + <source protocol='ftps' name='/url/path/file.iso'> + <host name='host.name' port='990'/> + </source> + <target dev='hdc' bus='ide'/> + <readonly/> + <alias name='ide0-1-0'/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a11c9a8..5daee82 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -449,6 +449,8 @@ mymain(void) QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-network-ftp", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE); + DO_TEST("disk-cdrom-network-ftps", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, + QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-empty", QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-tray", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_TX_ALG); -- 1.7.9.5

1 0

[libvirt] Can I request a new release of libvirt-java?
by Wido den Hollander 17 Sep '13

17 Sep '13

Hello, In the recent months various new methods were added to libvirt-java which we (Apache CloudStack) would like to use in our KVM code. For example resizing storage volumes, right now we have to do this with Bash scripting since although libvirt supports resizing volumes, the current release (0.4.9) of libvirt-java doesn't. I don't know if there are any objections, but if possible I'd like to see 0.5.0 released so we get this new functionality for CloudStack. We use maven for building CloudStack and it fetches libvirt-java from libvirt.org/maven2 Thank you, Wido den Hollander

2 14

[libvirt] [PATCH 0/3] Support https, ftps and tftp for cdrom URL
by Aline Manera 17 Sep '13

17 Sep '13

From: Aline Manera <alinefm(a)br.ibm.com> qemu/KVM also supports https, ftps and tftp URL for cdrom definition. With this patchset we will support all the protocols supported by qemu/KVM. Aline Manera (3): Add https protocol support for cdrom disk Add ftps protocol support for cdrom disk Add tftp protocol support for cdrom disk docs/formatdomain.html.in | 24 +++++++++++++ docs/schemas/domaincommon.rng | 3 ++ src/conf/domain_conf.c | 5 ++- src/conf/domain_conf.h | 3 ++ src/qemu/qemu_command.c | 18 ++++++++++ .../qemuxml2argv-disk-cdrom-network-ftps.args | 8 +++++ .../qemuxml2argv-disk-cdrom-network-ftps.xml | 37 ++++++++++++++++++++ .../qemuxml2argv-disk-cdrom-network-https.args | 8 +++++ .../qemuxml2argv-disk-cdrom-network-https.xml | 37 ++++++++++++++++++++ .../qemuxml2argv-disk-cdrom-network-tftp.args | 7 ++++ .../qemuxml2argv-disk-cdrom-network-tftp.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++++ 12 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml -- 1.7.10.4

2 4

[libvirt] want help about python APIs doc
by Tony Gong 17 Sep '13

17 Sep '13

hi friends, I need some help for finding python APIs of libvirt. I have already find the Java APIs doc at here:http://libvirt.org/sources/java/javadoc/, is there any doc just like this to make me to find APIs more easy. many thanks!! tony gong

2 1

[libvirt] [PATCH 00/14] Add ability to handle the <metadata> element using the API
by Peter Krempa 17 Sep '13

17 Sep '13

This series adds the initialy omitted functionality of changing the <metadata> element using the virDomain[Get|Set]Metadata API. First few patches are cleanup of some code noticed during implementation of the other stuff. Peter Krempa (14): virsh-domain: Remove spurious ATTRIBUTE_UNUSED from cmdDesc virsh-domain: Line up signal names array qemu: Factor out body of qemuDomainGetMetadata for universal use qemu: Factor out body of qemuDomainSetMetadata for universal use conf: Factor out setting of metadata to simplify code util: Add helper to convert libxml2 nodes to a string virsh-domain: use virXMLNodeDump instead of xmlNodeDump virsh-domain: Add command to allow modifications of XML metadata conf: Add support for requesting of XML metadata via the API conf: allow to add XML metadata using the virDomainSetMetadata api lib: Don't force the key argument when deleting metadata lxc: Add metadata modification APIs test: Add <metadata> support into the test driver tests: Add metadata tests src/conf/domain_conf.c | 171 ++++++++++++++++++++++++++ src/conf/domain_conf.h | 17 +++ src/libvirt.c | 3 +- src/libvirt_private.syms | 4 + src/lxc/lxc_driver.c | 70 +++++++++++ src/qemu/qemu_driver.c | 122 ++----------------- src/test/test_driver.c | 68 +++++++++++ src/util/virxml.c | 187 +++++++++++++++++++++++++++++ src/util/virxml.h | 13 ++ tests/Makefile.am | 7 ++ tests/metadatatest.c | 245 ++++++++++++++++++++++++++++++++++++++ tools/virsh-domain.c | 304 ++++++++++++++++++++++++++++++++--------------- 12 files changed, 1001 insertions(+), 210 deletions(-) create mode 100644 tests/metadatatest.c -- 1.8.3.2

2 32

[libvirt] make check error
by hzguanqiang＠corp.netease.com 17 Sep '13

17 Sep '13

Hi guys, I made a automated test for the libvirt code in git source repository right now, It reported a check error. The operation steps and error info are as following: ubuntu@ubuntu:~/github/libvirt.git$ ./autogen.sh ubuntu@ubuntu:~/github/libvirt.git$ ./configure --enable-werror ubuntu@ubuntu:~/github/libvirt.git$ make check ............ make check-local make[3]: Entering directory `/home/ubuntu/github/libvirt.git/daemon' GEN check-augeas make[3]: Leaving directory `/home/ubuntu/github/libvirt.git/daemon' make[2]: Leaving directory `/home/ubuntu/github/libvirt.git/daemon' make[1]: Leaving directory `/home/ubuntu/github/libvirt.git/daemon' Making check in tools make[1]: Entering directory `/home/ubuntu/github/libvirt.git/tools' GEN libvirt-guests.sh make check-am make[2]: Entering directory `/home/ubuntu/github/libvirt.git/tools' CC virsh-virsh.o CC virsh-virsh-console.o CC virsh-virsh-domain.o virsh-domain.c: In function 'cmdMetadata': virsh-domain.c:6857:10: error: declaration of 'remove' shadows a global declaration [-Werror=shadow] cc1: all warnings being treated as errors make[2]: *** [virsh-virsh-domain.o] Error 1 make[2]: Leaving directory `/home/ubuntu/github/libvirt.git/tools' make[1]: *** [check] Error 2 make[1]: Leaving directory `/home/ubuntu/github/libvirt.git/tools' make: *** [check-recursive] Error 1 What's the problem? Thanks. BTW, The code version is: ubuntu@ubuntu:~/github/libvirt.git$ git branch -a -v * master 7655ed0 conf: Don't corrupt metadata on OOM remotes/origin/HEAD -> origin/master remotes/origin/master 7655ed0 conf: Don't corrupt metadata on OOM ------------------ Best regards! GuanQiang 2013-09-17

3 4

[libvirt] [PATCH 0/2] Build fixes after metadata series
by Peter Krempa 17 Sep '13

17 Sep '13

Some people reported a few issues on different systems/compilers. Series pushed under the build-breaker rule. Peter Krempa (2): conf: Avoid false positive of uninitialized variable use virsh: Don't shadow global variable "remove" in cmdMetadata src/conf/domain_conf.c | 9 +++------ tools/virsh-domain.c | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) -- 1.8.3.2

1 2

[libvirt] [PATCH] build: fix VPATH build of remote driver
by Eric Blake 17 Sep '13

17 Sep '13

Commit 073e1575 tried to set things up so that 1) generated files to be shipped in the tarball always live in srcdir, and 2) we have no files in SOURCES that depend on any other files with a literal $(srcdir) in the name, because that situation can cause confusing results for the make expansion of $@ depending on whether the file is found locally or via VPATH. But all my testing for that patch was done incrementally, where all the protocol.[ch] files had already been generated prior to the patch and were up-to-date in the srcdir, and thus I missed one case where $@ causes grief in a VPATH build from a fresh checkout: We have a pattern rule for generating remote_protocol.[ch], and what's more, the rule for protocol.c depends on protocol.h AND on the protocol.x file. The pattern for protocol.c is only satisfied via the VPATH lookup for protocol.x, and if protocol.h doesn't yet exist, the VPATH rule kicks in and we end up with a dependency on a file with $(srcdir) in the name. Based on make's rules for $@, this resulted in make building remote_protocol.h into srcdir (where we want it), then remote_protocol.c into builddir (oops, not so good for the tarball), and also causes the build to fail (the compiler can't find the .h if it lives in a different directory than the .c): CC remote/libvirt_driver_remote_la-remote_protocol.lo remote/remote_protocol.c:7:29: fatal error: remote_protocol.h: No such file or directory #include "remote_protocol.h" ^ compilation terminated. As before, the fix is to hard-code the output file to go into srcdir in spite of $@; but since this is in a pattern rule, we are forced to use $@ in the recipe, so the patch is a bit trickier than what was done in commit 073e1575. * src/Makefile.am (%protocol.c, %protocol.h): Force output to srcdir. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index da6f7a1..1388c5f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1014,11 +1014,11 @@ endif WITH_REMOTE %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ - $< $@ + $< $(srcdir)/$(subst $(srcdir)/,,$@) %protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \ - $< $@ + $< $(srcdir)/$(subst $(srcdir)/,,$@) if WITH_XEN noinst_LTLIBRARIES += libvirt_driver_xen_impl.la -- 1.8.3.1

1 0

[libvirt] [PATCH] conf: Don't corrupt metadata on OOM
by Peter Krempa 17 Sep '13

17 Sep '13

Eric Blake suggested that we could do a little better in case copying of the metadata to be set fails. With this patch, the old metadata is discarded after the new string is copied successfuly. --- src/conf/domain_conf.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7e78068..60f25ab 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18599,19 +18599,24 @@ virDomainDefSetMetadata(virDomainDefPtr def, xmlDocPtr doc = NULL; xmlNodePtr old; xmlNodePtr new; + char *tmp; int ret = -1; switch ((virDomainMetadataType) type) { case VIR_DOMAIN_METADATA_DESCRIPTION: - VIR_FREE(def->description); - if (VIR_STRDUP(def->description, metadata) < 0) + if (VIR_STRDUP(tmp, metadata) < 0) goto cleanup; + + VIR_FREE(def->description); + def->description = tmp; break; case VIR_DOMAIN_METADATA_TITLE: - VIR_FREE(def->title); - if (VIR_STRDUP(def->title, metadata) < 0) + if (VIR_STRDUP(tmp, metadata) < 0) goto cleanup; + + VIR_FREE(def->title); + def->title = tmp; break; case VIR_DOMAIN_METADATA_ELEMENT: -- 1.8.3.2

2 2

[libvirt] [PATCH] qemu: Fix memleak after commit 59898a88ce8431bd3ea249b8789edc2ef9985827
by Peter Krempa 17 Sep '13

17 Sep '13

If the ABI compatibility check with the "migratable" user XML is successful, we would leak the originaly parsed XML from the user that would not be used in this case. Reported by Ján Tomko. --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 75348a1..0763f9b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5274,6 +5274,8 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, /* use the user provided XML */ newdef = def2; def2 = NULL; + } else { + virDomainDefFree(def2); } virDomainDefFree(def); -- 1.8.3.2

2 2

[libvirt] [PATCH 0/2] Fix reverting of external snapshots with custom XML
by Peter Krempa 17 Sep '13

17 Sep '13

The external snapshot code mistakenly used non-"migratable" XMLs in the save image which caused problems with restoring them via the workaround way of doing virDomainRestore(). This series adds workaround to add compatibility with older snapshots and fixes the problem in the snapshot code. Unfortunately, this is not testable with unit tests. I'll try to do a autotest virt-test test case for this particular issue. Peter Krempa (2): qemu: Fix checking of ABI stability when restoring external checkpoints qemu: Use "migratable" XML definition when doing external checkpoints src/qemu/qemu_driver.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) -- 1.8.3.2

3 7

[libvirt] [PATCH v2 0/6]qemu: add usb-bot scsi controller support
by Guannan Ren 17 Sep '13

17 Sep '13

BZ:https://bugzilla.redhat.com/show_bug.cgi?id=917702 v2: After discussion in BZ, qemu guys hope the usb-bot(+usb-uas) can be supported although the absence of its hot-plug feature. In this patch, libvirt gives an unsupported error in this case. v1: https://www.redhat.com/archives/libvir-list/2013-September/msg00020.html And as the missing of hot-plug feature, the replacement of usb-storage is not a urgent thing. disk attached to usb-storage supports hot-plug/unplug already. Guannan Ren(6) qemu: add usb-bot qemu cap flag qemu: add usb-bot model scsi controller support qemu: add usb-bot support from disks points of view qemu: refactor out function to build scsi device qemu commandline qemu: no hot-plug/unplug support currently for usb-bot tests: add xml2argv test for usb-bot scsi controller docs/formatdomain.html.in | 4 ++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 5 +++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- src/qemu/qemu_hotplug.c | 14 ++++++++++++++ src/vmx/vmx.c | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-usbbot.args | 11 +++++++++++ tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-usbbot.xml | 33 +++++++++++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 13 files changed, 259 insertions(+), 58 deletions(-)

1 7

[libvirt] Release of libvirt-java-0.5.0
by Daniel Veillard 17 Sep '13

17 Sep '13

With a bit of delay, the release needed by Wido is finally available, it is tagged in git and I have pushed tarball, jar and rpms to the FTP: ftp://libvirt.org/libvirt/java/ Wido maybe you can push to Maven, I'm unsure how to do this and last time I tried I made a mess :-) I bumped the intermediate release number as this release includes more improvements and fixes than the previous ones and deprecates a couple of things: Portability: - Fix the rpm build (Daniel Veillard) - Explicitly set includeAntRuntime to false for javac tasks. (Claudio Bley) - Fix build with jna >= 3.5.0 (Jiri Denemark) Bug Fixes: - Fixed broken dates in Changelog (Daniel Veillard) - Fix memory leaks for libvirt functions returning newly allocated memory. (Claudio Bley) - Fix memory leak for virDomainGetSchedulerType. (Claudio Bley) Improvements: - Implement and use virDomainMigrateToURI2 by overloading migrateToUri (Wido den Hollander) - Implement virDomainMigrate2 and use it for a new migrate method. (Wido den Hollander) - Overload Domain.snapshotCreateXML with a method that has an argument for flags (Wido den Hollander) - Overload Domain.snapshotListNames with a method that has an additional flags argument. (Wido den Hollander) - Implement virDomainUndefineFlags by overloading the existing undefine method (Wido den Hollander) - Implement virStorageVolResize by adding resize to StorageVol (Wido den Hollander) - Implement virDomainBlockResize (Wido den Hollander) - Avoid creating new Arrays and Lists on every struct instantiation (Claudio Bley) - Make the build fail if any of the JUnit tests have errors or failures (Claudio Bley) - Avoid unnecessary copying and calling virResetLastError. (Claudio Bley) - Split "build" target and automatically rebuild out of date files. (Claudio Bley) - Split JUnit tests and use a fixture for Connect. (Claudio Bley) - Call processError only if a libvirt function indicates an error. (Claudio Bley) - Change visibility of class members to private to enforce encapsulation. (Claudio Bley) - Make finalize() methods protected. (Claudio Bley) - Add findbugs build file for ant. (Claudio Bley) - Introduce a javac.debug property. (Claudio Bley) - maint: correct name for license file (Eric Blake) - Add Javadoc and Source JARs to Maven repo (Wido den Hollander) - Fix the Maven build system with Ant (Wido den Hollander) Cleanups: - trivial remove unused imports (Stefan Majer) - Remove unused imports (Stefan Majer) - Remove functions not intended to be used by libvirt bindings. (Claudio Bley) - Remove the libvirt instance attribute from all classes. (Claudio Bley) - Mark virConnCopyLastError and virConnGetLastError as deprecated. (Claudio Bley) - Remove redundant public modifier from Libvirt interface methods. (Claudio Bley) Thanks Claudio, Wido and everybody else who contributed ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 6