- Devel - libvirt List Archives

[libvirt] [PATCHv3 0/4] Automaticaly fill <memory> element for NUMA enabled guests
by Peter Krempa 04 Mar '15

04 Mar '15

While there is still a discussion open upstream on a possible change of naming here I'm posting this so that comments can be held against this version. Peter Krempa (4): conf: Replace access to def->mem.max_balloon with accessor functions qemu: command: Add helper to align memory sizes conf: Automatically use NUMA memory size in case NUMA is enabled conf: Make specifying <memory> optional docs/schemas/domaincommon.rng | 18 ++--- src/conf/domain_conf.c | 81 +++++++++++++++++++--- src/conf/domain_conf.h | 4 ++ src/hyperv/hyperv_driver.c | 2 +- src/libvirt_private.syms | 3 + src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 8 +-- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_driver.c | 12 ++-- src/lxc/lxc_fuse.c | 4 +- src/lxc/lxc_native.c | 4 +- src/openvz/openvz_driver.c | 2 +- src/parallels/parallels_driver.c | 2 +- src/parallels/parallels_sdk.c | 12 ++-- src/phyp/phyp_driver.c | 11 +-- src/qemu/qemu_command.c | 23 +++--- src/qemu/qemu_domain.c | 21 ++++++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 21 +++--- src/qemu/qemu_hotplug.c | 8 ++- src/qemu/qemu_process.c | 2 +- src/test/test_driver.c | 8 +-- src/uml/uml_driver.c | 8 +-- src/vbox/vbox_common.c | 4 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 12 ++-- src/xen/xm_internal.c | 14 ++-- src/xenapi/xenapi_driver.c | 2 +- src/xenapi/xenapi_utils.c | 4 +- src/xenconfig/xen_common.c | 8 ++- src/xenconfig/xen_sxpr.c | 9 +-- .../qemuxml2argv-cpu-numa-no-memory-element.args | 7 ++ .../qemuxml2argv-cpu-numa-no-memory-element.xml | 24 +++++++ .../qemuxml2argv-minimal-no-memory.xml | 25 +++++++ .../qemuxml2argv-numatune-memnode.args | 2 +- tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-cpu-numa-no-memory-element.xml | 28 ++++++++ tests/qemuxml2xmltest.c | 1 + 38 files changed, 299 insertions(+), 105 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-no-memory.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml -- 2.2.2

1 4

[libvirt] [PATCH] parallels: Cleanup partly opened drivers on connect open failure
by Michal Privoznik 04 Mar '15

04 Mar '15

Well, the parallelsConnectOpen() joins several sub-driver openings into one big if condition. If any of sub-driver fails to open, the whole API finishes immediately. The problem is, sub-drivers may have left some memory allocated. Fortunately, we have a free function for that: parallelsConnectClose(). This is, however, not prepared for partially allocated driver structure. So, prepare the free function for it and call it at the right place, in the if body. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This commit assumes that virNetworkObjListFree() accepts NULL, and thus depends on this patch (which has been ACKed already): https://www.redhat.com/archives/libvir-list/2015-February/msg01127.html Should I push both during freeze or wait until after the release? src/parallels/parallels_driver.c | 7 ++++++- src/parallels/parallels_network.c | 4 ++++ src/parallels/parallels_storage.c | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index c9338b5..650b790 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -264,8 +264,10 @@ parallelsConnectOpen(virConnectPtr conn, if ((ret = parallelsOpenDefault(conn)) != VIR_DRV_OPEN_SUCCESS || (ret = parallelsStorageOpen(conn, flags)) != VIR_DRV_OPEN_SUCCESS || - (ret = parallelsNetworkOpen(conn, flags)) != VIR_DRV_OPEN_SUCCESS) + (ret = parallelsNetworkOpen(conn, flags)) != VIR_DRV_OPEN_SUCCESS) { + parallelsConnectClose(conn); return ret; + } return VIR_DRV_OPEN_SUCCESS; } @@ -275,6 +277,9 @@ parallelsConnectClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; + if (!privconn) + return 0; + parallelsNetworkClose(conn); parallelsStorageClose(conn); diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 3e7087d..c5834c5 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -336,6 +336,10 @@ parallelsNetworkOpen(virConnectPtr conn, int parallelsNetworkClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; + + if (!privconn) + return 0; + parallelsDriverLock(privconn); virNetworkObjListFree(&privconn->networks); parallelsDriverUnlock(privconn); diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index d2c5bf2..56c1b42 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -72,9 +72,15 @@ parallelsStorageClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; + if (!privconn) + return 0; + virStorageDriverStatePtr storageState = privconn->storageState; privconn->storageState = NULL; + if (!storageState) + return 0; + parallelsStorageLock(storageState); virStoragePoolObjListFree(&privconn->pools); VIR_FREE(storageState->configDir); -- 2.0.5

3 2

[libvirt] QEMU, libvirt, and KVM are participating in Outreachy May-August 2015
by Stefan Hajnoczi 04 Mar '15

04 Mar '15

QEMU, libvirt, and KVM are participating in the Outreachy (formerly known as Outreach Program for Women) May-August 2015 round. Outreachy is a 12-week full-time paid internship for working on open source projects. We are able to participate thanks to sponsors who will be listed on the Outreachy website in the future: http://outreachy.org/ >From the website: Outreachy is "open to women (cis and trans), trans men, genderqueer people, and all participants of the Ascend Project (http://ascendproject.org/) regardless of gender". Check out the project ideas list and details on how to apply: http://qemu-project.org/Outreachy_2015_MayAugust We encourage applicants to apply for both Outreachy and Google Summer of Code if they are eligible: http://qemu-project.org/Google_Summer_of_Code_2015 Stefan

1 0

[libvirt] [libvirt-designer][PATCH] Makefile: Build tests at the same time as the rest
by Michal Privoznik 04 Mar '15

04 Mar '15

Currently, since we were using check_PROGRAMS in the Makefile template, the test program build was postponed until 'make check' was run. That's not optimal. Lets build (not run!) test program in the 'make all' phase. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- >From my libvirt development experience, I'm used to just run make from my text editor. For instance, when changing some function header, I just run make and let the compiler catch all the places that need fixing. I think it's common practice. libvirt-designer/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-designer/Makefile.am b/libvirt-designer/Makefile.am index bda4240..fd7627d 100644 --- a/libvirt-designer/Makefile.am +++ b/libvirt-designer/Makefile.am @@ -82,9 +82,9 @@ libvirt-designer-enum-types.c: $(DESIGNER_HEADER_FILES) libvirt-designer-enum-ty $(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/libvirt-designer-enum-types.c.template $(DESIGNER_HEADER_FILES:%=$(srcdir)/%) ) | \ sed -e "s/G_TYPE_VIR_CONFIG/GVIR_CONFIG_TYPE/" -e "s/g_vir/gvir/" > libvirt-designer-enum-types.c -check_PROGRAMS = test-designer-domain +noinst_PROGRAMS = test-designer-domain -TESTS = $(check_PROGRAMS) +TESTS = $(noinst_PROGRAMS) test_designer_domain_CFLAGS = \ -I$(top_srcdir) \ -- 2.0.5

2 2

[libvirt] [PATCH] storage: tweak condition to properly test lseek
by Erik Skultety 04 Mar '15

04 Mar '15

According to the POSIX standard, off_t (returned by lseek) is defined as signed integral type no shorter than int. Because our offset variable is defined as unsigned long long, the original check was passed successfully if UINT64_MAX had been used as offset value, due to implicit conversion. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1177219 --- src/fdstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fdstream.c b/src/fdstream.c index 5d80fc2..b8ea86e 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -610,7 +610,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, } if (offset && - lseek(fd, offset, SEEK_SET) != offset) { + lseek(fd, offset, SEEK_SET) < 0) { virReportSystemError(errno, _("Unable to seek %s to %llu"), path, offset); -- 1.9.3

3 2

[libvirt] [PATCH] virsh: tweak domif-getlink link state reporting message
by Erik Skultety 04 Mar '15

04 Mar '15

According to docs, we only support 2 link states for an interface up/down, 'up' being the default state if link state is unspecified in domain's XML, so the message when no link state is provided should be changed a little. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1141119 --- tools/virsh-domain-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 925eb1b..18ce9ae 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -756,7 +756,7 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) if ((state = virXPathString("string(./link/@state)", ctxt))) vshPrint(ctl, "%s %s", iface, state); else - vshPrint(ctl, "%s default", iface); + vshPrint(ctl, "%s up", iface); ret = true; -- 1.9.3

2 2

[libvirt] [libvirt-designer 1/2] Fix gvir_designer_domain_get_fallback_disk_controller leak
by Christophe Fergeau 04 Mar '15

04 Mar '15

When the list of devices is empty (osinfo_list_get_length(devices) == 0), the 'devices' object would be leaked. --- libvirt-designer/libvirt-designer-domain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index c1a0e83..6629fb5 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -1517,7 +1517,7 @@ gvir_designer_domain_get_fallback_disk_controller(GVirDesignerDomain *design, GError **error) { OsinfoEntity *dev = NULL; - OsinfoDeviceList *devices; + OsinfoDeviceList *devices = NULL; OsinfoFilter *filter; int virt_type; @@ -1552,9 +1552,11 @@ gvir_designer_domain_get_fallback_disk_controller(GVirDesignerDomain *design, dev = osinfo_list_get_nth(OSINFO_LIST(devices), 0); g_object_ref(G_OBJECT(dev)); - g_object_unref(G_OBJECT(devices)); cleanup: + if (devices != NULL) + g_object_unref(G_OBJECT(devices)); + return OSINFO_DEVICE(dev); } -- 2.1.0

2 3

[libvirt] [libvirt-designer][PATCH] test: Add new SimpleDisk test
by Michal Privoznik 04 Mar '15

04 Mar '15

This test is meant for adding CDROM, floppy and disk to a domain. For now, each method has _file and _device variant, which are tested for now. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Funny, when reviewing Chritophe's patches, I've found one forgotten branch too. libvirt-designer/test-designer-domain.c | 101 ++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/libvirt-designer/test-designer-domain.c b/libvirt-designer/test-designer-domain.c index bbd5a28..90f7e68 100644 --- a/libvirt-designer/test-designer-domain.c +++ b/libvirt-designer/test-designer-domain.c @@ -125,6 +125,41 @@ static const gchar *capslxcxml = " </guest>" "</capabilities>"; +static const gchar *domain_machine_simple_iso_result = + "<domain>\n" + " <devices>\n" + " <disk type=\"file\">\n" + " <source file=\"/foo/bar1\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hda\"/>\n" + " </disk>\n" + " <disk type=\"block\">\n" + " <source dev=\"/foo/bar2\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hdb\"/>\n" + " </disk>\n" + " <disk type=\"file\">\n" + " <source file=\"/foo/bar3\"/>\n" + " <driver name=\"qemu\" type=\"qcow2\"/>\n" + " <target bus=\"ide\" dev=\"hdc\"/>\n" + " </disk>\n" + " <disk type=\"block\">\n" + " <source dev=\"/foo/bar4\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hdd\"/>\n" + " </disk>\n" + " <disk type=\"file\">\n" + " <source file=\"/foo/bar5\"/>\n" + " <driver name=\"qemu\" type=\"bochs\"/>\n" + " <target bus=\"ide\" dev=\"hde\"/>\n" + " </disk>\n" + " <disk type=\"block\">\n" + " <source dev=\"/foo/bar6\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hdf\"/>\n" + " </disk>\n" + " </devices>\n" + "</domain>"; static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer opaque) { @@ -142,6 +177,49 @@ static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer } +static void test_domain_machine_simple_disk_setup(GVirDesignerDomain **design, gconstpointer opaque) +{ + GError *error = NULL; + GVirConfigDomainDisk *disk; + OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); + OsinfoDb *db = osinfo_db_new(); + OsinfoPlatform *platform = osinfo_platform_new("http://myhypervisor.org/awesome/6.6.6"); + GVirConfigCapabilities *caps = gvir_config_capabilities_new_from_xml(capsqemuxml, NULL); + + *design = gvir_designer_domain_new(db, os, platform, caps); + g_assert(*design); + + disk = gvir_designer_domain_add_cdrom_file(*design, "/foo/bar1", "raw", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_cdrom_device(*design, "/foo/bar2", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_disk_file(*design, "/foo/bar3", "qcow2", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_disk_device(*design, "/foo/bar4", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_floppy_file(*design, "/foo/bar5", "bochs", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_disk_device(*design, "/foo/bar6", &error); + g_assert(disk); + g_object_unref(disk); + + g_object_unref(os); + g_object_unref(db); + g_object_unref(platform); + g_object_unref(caps); +} + + static void test_domain_container_setup(GVirDesignerDomain **design, gconstpointer opaque) { OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); @@ -243,6 +321,22 @@ static void test_domain_machine_alt_arch_run(GVirDesignerDomain **design, gconst g_object_unref(osconfig); } +static void test_domain_machine_simple_disk_run(GVirDesignerDomain **design, gconstpointer opaque) +{ + GError *error = NULL; + gboolean ret; + GVirConfigDomain *config; + gchar *xml; + + config = gvir_designer_domain_get_config(*design); + xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(config)); + g_test_message("XML %s", xml); + g_assert_cmpstr(xml, + ==, + domain_machine_simple_iso_result); + g_free(xml); +} + static void test_domain_container_host_arch_run(GVirDesignerDomain **design, gconstpointer opaque) { GError *error = NULL; @@ -362,5 +456,12 @@ int main(int argc, char **argv) test_domain_container_setup, test_domain_container_alt_arch_run, test_domain_teardown); + g_test_add("/TestDesignerDomain/SimpleDisk", + GVirDesignerDomain *, + &domain, + test_domain_machine_simple_disk_setup, + test_domain_machine_simple_disk_run, + test_domain_teardown); + return g_test_run(); } -- 2.0.5

2 2

[libvirt] overlayfs support to lxc driver
by Vasiliy Tolstov 04 Mar '15

04 Mar '15

Hello. I'm interesting in implementing overlayfs support to lxc libvirt driver. As i see i simply can utilize filesystem type='template' for this usage. In case os template fs i need to mount with lowerdir /var/lib/libvirt/filesystems/template to /var/lib/libvirt/filesystems/name But i have problem: overlayfs fs need upperdir that store differences and mountpoint that used by clients. In case of libvirt usage - upperdir need to be places in /var/lib/libvirt/filesystems, but where i can put mountpoint dir ? /var/run/libvirt or in /tmp/libvirt-XXXXX ? Also what is the preferred way to integrate overlayfs support to libvirt? I can addd mount type to filesystem type='mount' or use (like now) template type. What is the preferred way? Thanks -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

2 4

[libvirt] [libvirt-designer 0/7]
by Christophe Fergeau 04 Mar '15

04 Mar '15

Hey, After seeing the libvirt-designer GSoC idea, I remembered about a bunch of libvirt-designer patches I had never sent :) Here they are, a few leak fixes/build cleanups, and addition of 2 new methods for completeness. Christophe

2 9

[libvirt] [PATCH] qemu: fix not remove the pidfile when close a vm after restart libvirtd
by Luyao Huang 04 Mar '15

04 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1197600 when create a happy vm and then restart libvirtd, we will loss priv->pidfile, because we don't check if it is there is a pidfile. However we only use this pidfile when we start the vm, and won't use it after it start, so this is not a big deal. But it is strange when vm is offline but pidfile still exist, so remove vmname.pid in state dir (maybe /run/libvirt/qemu/)when priv->pidfile is NULL. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_process.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 515402e..46b93b3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -92,6 +92,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, { char ebuf[1024]; char *file = NULL; + char *pidfile = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; @@ -99,16 +100,19 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) goto cleanup; + if (virAsprintf(&pidfile, "%s/%s.pid", cfg->stateDir, vm->def->name) < 0) + goto cleanup; + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); VIR_FREE(file); - if (priv->pidfile && - unlink(priv->pidfile) < 0 && + if (unlink(priv->pidfile ? priv->pidfile : pidfile) < 0 && errno != ENOENT) VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); + VIR_FREE(pidfile); ret = 0; cleanup: -- 1.8.3.1

3 2

[libvirt] [PATCH] docs: add a mention for start a vm with rawio = 'yes'
by Luyao Huang 03 Mar '15

03 Mar '15

When we start a vm which have rawio = 'yes' settings without any file caps settings for qemu, qemu process still cannot use this caps (CAP_SYS_RAWIO) and the /proc/pidofqemu/status like this: CapInh: 0000000000020000 CapPrm: 0000000000000000 CapEff: 0000000000000000 CapBnd: 0000001fffffffff this is because we do not set file caps for qemu (see man 7 capabilities), although laine have mentioned this in commit e11451, i think it will be good if we add this in docs. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- docs/formatdomain.html.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fb0a0d1..2bcb59d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1886,7 +1886,10 @@ than that (per-process basis, affects all the domain disks). To confine the capability as much as possible for QEMU driver as this stage, <code>sgio</code> is recommended, it's more - secure than <code>rawio</code>. + secure than <code>rawio</code>. If you really want use rawio + = 'yes', please also add file caps for qemu (like this + 'setcap "cap_sys_rawio+ie" /usr/libexec/qemu-kvm', for more details + please see capabilities(7)). </dd> <dt><code>sgio</code> attribute <span class="since">since 1.0.2</span></dt> -- 1.8.3.1

4 3

[libvirt] [PATCH] qemuProcessReconnect: Fill in pid file path
by Michal Privoznik 03 Mar '15

03 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1197600 So, libvirt uses pid file to track pid of started qemus. Whenever a domain is started, its pid is put into corresponding pid file. The pid file path is generated based on domain name and stored into domain object internals. However, it's not stored in the status XML and therefore lost on daemon restarts. Hence, later, when domain is being shut down, the daemon does not know which pid file to unlink, and the correct pid file is left behind. To avoid this, lets generate the pid file path again in qemuProcessReconnect(). Reported-by: Luyao Huang <lhuang(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7ce6115..e77616a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3762,6 +3762,13 @@ qemuProcessReconnect(void *opaque) cfg = virQEMUDriverGetConfig(driver); priv = obj->privateData; + /* XXX If we ever gonna change pid file pattern, come up with + * some intelligence here to deal with old paths. */ + if (!(priv->pidfile = virPidFileBuildPath(cfg->stateDir, obj->def->name))) { + virReportSystemError(errno, "%s", _("Failed to build pidfile path.")); + goto killvm; + } + if (qemuDomainObjBeginJob(driver, obj, QEMU_JOB_MODIFY) < 0) goto killvm; -- 2.0.5

3 2

[libvirt] [PATCH v3 0/9] qemu: Add quorum support to libvirt
by Matthias Gatto 03 Mar '15

03 Mar '15

The purpose of these patches is to introduce quorum for libvirt I've try to follow this proposal: http://www.redhat.com/archives/libvir-list/2014-May/msg00533.html This feature ask for 6 task: 1) Allow a _virStorageSource to contain more than one backing store. Because all the actual libvirt code use the backingStore field as a pointer and we needs want to change that, I've decide to encapsulate the backingStore field to simplifie the array manipulation. 2) Add the missing field a quorum need in _virStorageSource and the VIR_STORAGE_TYPE_QUORUM and VIR_STORAGE_FILE_QUORUM in their respectives enums. 3) Parse and format the xml Because a quorum allows to have more than one backing store at the same level we need to change virDomainDiskDefFormat and virDomainDiskDefParseXML to call virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse in a loop. virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse can call themself recursively in a loop because a quorum can contain another quorum 4) Add nodename We need to add nodename support in _virStorageSource because qemu use them for their child. 5) Build qemu string As for the xml, we have to call the function which create quorum recursively. But this task have the problem explained here: http://www.redhat.com/archives/libvir-list/2014-October/msg00529.html The _virStorageSource missing some informations that can be passed to a child, and therefore this version of quorum is incomplet. 6) Allow to hotplug/change a disk in a quorum This part is not present in these patches because for this task we have to use blockdev-add, and currently libvirt use device_add for hotpluging that doesn't allow to hotplug quorum childs. There is 3 way to handle this problem: 1) create a virDomainBlockDevAdd function in libvirt witch call blockdev-add. 2) use blockdev-add instead of device_add in qemuMonitorJSONAddDevice 3) write a hack which uses blockdev-add when only attaching quorum (but i'm pretty sure this solution is not the good one) V2: -Rebase on master -Add Documentation V3: -Transforme the backingStore field in virStorageSource into an array of pointer instead of a pointer -Modify virStorageSourceSetBackingStore to allow it to expand the backingStore size. Matthias Gatto (9): virstoragefile: Add virStorageSourceGetBackingStore virstoragefile: Always use virStorageSourceGetBackingStore to get backing store virstoragefile: Add virStorageSourceSetBackingStore virstoragefile: Always use virStorageSourceSetBackingStore to set backing store virstoragefile: change backingStore to backingStores. virstoragefile: Add quorum in virstoragefile domain_conf: Read and Write quorum config qemu: Add quorum support in qemuBuildDriveDevStr virstoragefile: Add node-name docs/formatdomain.html.in | 27 ++++- docs/schemas/domaincommon.rng | 96 +++++++++++------ docs/schemas/storagecommon.rng | 1 + docs/schemas/storagevol.rng | 1 + src/conf/domain_conf.c | 195 ++++++++++++++++++++++++++-------- src/conf/storage_conf.c | 23 ++-- src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 114 ++++++++++++++++++++ src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 30 +++--- src/qemu/qemu_migration.c | 1 + src/security/security_dac.c | 2 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 33 +++--- src/storage/storage_backend_fs.c | 36 ++++--- src/storage/storage_backend_gluster.c | 10 +- src/storage/storage_backend_logical.c | 15 ++- src/storage/storage_driver.c | 2 +- src/util/virstoragefile.c | 116 +++++++++++++++++--- src/util/virstoragefile.h | 12 ++- tests/virstoragetest.c | 18 ++-- 23 files changed, 573 insertions(+), 173 deletions(-) -- 1.8.3.1

2 12

[libvirt] [PATCH] schema: Fix interface link state schema
by Peter Krempa 03 Mar '15

03 Mar '15

In commit edd1295e1da6bfe8e4e257e5fbfad71ac0bf7c87 I've introduced an XML element that allows to configure state of the network interface link. Somehow the RNG schema hunk ended up in a weird place in the network schema definition. Move it to the right place and add a test case. Note that the link state is set up via the monitor at VM startup so I originally didn't think of adding a test case. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1173468 --- docs/schemas/domaincommon.rng | 12 ++++++++++++ docs/schemas/network.rng | 11 ----------- tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml | 1 + 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4e4fe9f..6c45b1c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2314,10 +2314,22 @@ - the name of the script used to set up the binding - the target device used - boot order + - link state --> <define name="interface-options"> <interleave> <optional> + <element name="link"> + <attribute name="state"> + <choice> + <value>up</value> + <value>down</value> + </choice> + </attribute> + <empty/> + </element> + </optional> + <optional> <element name="target"> <attribute name="dev"> <ref name="deviceName"/> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 56b6086..4edb6eb 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -299,17 +299,6 @@ <optional> <ref name="vlan"/> </optional> - <optional> - <element name="link"> - <attribute name="state"> - <choice> - <value>up</value> - <value>down</value> - </choice> - </attribute> - <empty/> - </element> - </optional>  <zeroOrMore> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml b/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml index ec5ab61..d907b9b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-interface-driver.xml @@ -39,6 +39,7 @@ <mac address='52:54:00:e5:48:58'/> <model type='virtio'/> <driver ioeventfd='on' event_idx='on' queues='5'/> + <link state='up'/> </interface> <serial type='pty'> <target port='0'/> -- 2.2.2

2 2

[libvirt] [PATCH 0/2] Update find-storage-pool-source[-as] man page
by John Ferlan 03 Mar '15

03 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=921426 The first patch is just a change to the error message. As it turns out only the host is necessary to find iSCSI targets. I have to assume over time adjustments to the code made the need to provide the name obsolete, but I did not research exactly which change may have done that... The second patch is a virsh man page change to describe the functionality based on how the code works today. It's perhaps "of interest" that the rbd and sheepdog backends provide to means to find all possible sources. I also suppose zfs could use something, but I don't build with zfs. John Ferlan (2): iscsi: Adjust error message for findStorageSources backend virsh.pod: Update find-storage-pool-sources[-as] man page src/storage/storage_backend_iscsi.c | 5 ++--- tools/virsh.pod | 45 ++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 9 deletions(-) -- 2.1.0

2 5

[libvirt] [PATCH 0/2] Disallow the usage of the same target dev value
by John Ferlan 03 Mar '15

03 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1142631 Patch 1 was found when adjusting the bz to get the disk by the pool source instead of directly by file attribute. When using domblklist, the source wasn't displayed. Followed the model of the iscsi '@name' and added '@volume' (eg, <source pool='default' volume='test-1g.img'/>) Patch 2 started as a simple (hah!) double loop looking for duplicate dst strings. I chose a separate API called before qemuCheckDiskConfig since it's more of a "common" check that could be used by other drivers as opposed to the perhaps more specific single disk checks made. Besides I didn't want a ndisk factorial checking algorithm each time a disk was checked for something that could be checked once. With the code in place, running make check tripped over a number of existing tests that duplicated that '<target dev=...' value, so I fixed those. Of interest for a few was that the test would duplicate the supposedly unique alias id - those are cleaned up as well as a byproduct of the changes. John Ferlan (2): virsh: Adjust domblklist to understand disk volume syntax disk: Disallow duplicated target 'dev' values src/conf/domain_conf.c | 29 ++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 3 +++ .../qemuxml2argv-disk-scsi-disk-split.xml | 2 +- ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 2 +- .../qemuxml2argv-disk-scsi-lun-passthrough.xml | 2 +- .../qemuxml2argv-disk-source-pool-mode.xml | 2 +- .../qemuxml2argv-disk-source-pool.xml | 2 +- .../qemuxml2argv-pci-bridge-many-disks.args | 4 +-- .../qemuxml2argv-pci-bridge-many-disks.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 8 +++--- tests/qemuxml2argvdata/qemuxml2argv-pci-many.xml | 4 +-- .../qemuxml2xmlout-disk-source-pool.xml | 2 +- .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 +- tools/virsh-domain-monitor.c | 3 ++- 16 files changed, 52 insertions(+), 17 deletions(-) -- 2.1.0

2 5

[libvirt] QEMU, libvirt, and KVM are participating in Google Summer of Code 2015
by Stefan Hajnoczi 02 Mar '15

02 Mar '15

I am delighted to announce that QEMU, libvirt, and KVM are participating in Google Summer of Code 2015. Thanks to Google's generous funding we are inviting students to apply for 12-week full-time work from May to August 2015. Here is our project ideas list page where students can select a project to apply for: http://qemu-project.org/Google_Summer_of_Code_2015 Steps for students: 1. Check out the project ideas list (http://qemu-project.org/Google_Summer_of_Code_2015) 2. Get in touch with the mentors for the project you are interested in, begin discussing your application with them 3. Submit your application at http://google-melange.com/ from March 16-27 For more information on Google Summer of Code, please see: https://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2… Timeline: https://www.google-melange.com/gsoc/events/google/gsoc2015 Stefan

1 0

[libvirt] [PATCH] qemu: Don't crash in qemuDomainOpenChannel()
by Martin Kletzander 02 Mar '15

02 Mar '15

The problem here was that when opening a channel, we were checking whether the channel given is alias (can't be NULL for running domain) or it's name, which can be NULL (for example with spicevmc). In case of such domain qemuDomainOpenChannel() made the daemon crash. STREQ_NULLABLE() is safe to use since the code in question is wrapped in "if (name)" and is more readable, so use that instead of checking for non-NULL "vm->def->channels[i]->target.name". Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 83a4e18..c87cc05 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15450,7 +15450,7 @@ qemuDomainOpenChannel(virDomainPtr dom, if (vm->def->channels[i]->targetType == \ VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && - STREQ(name, vm->def->channels[i]->target.name)) + STREQ_NULLABLE(name, vm->def->channels[i]->target.name)) chr = vm->def->channels[i]; } } else { -- 2.3.1

3 2

[libvirt] [PATCH] conf: De-duplicate scheduling policy enums
by Martin Kletzander 02 Mar '15

02 Mar '15

Since adding the support for scheduler policy settings in commit 8680ea97, there are two enums with the same information. That was caused by rewriting the patch since first draft. Find out thanks to clang, but there was no impact whatsoever. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 20 +++++++------------- src/conf/domain_conf.h | 14 ++------------ src/libvirt_private.syms | 2 -- src/qemu/qemu_process.c | 2 +- 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9b7ae3f..95175ea 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -772,13 +772,6 @@ VIR_ENUM_IMPL(virDomainLoader, "rom", "pflash") -VIR_ENUM_IMPL(virDomainThreadSched, VIR_DOMAIN_THREAD_SCHED_LAST, - "other", /* default */ - "batch", - "idle", - "fifo", - "rr") - /* Internal mapping: subset of block job types that can be present in * <mirror> XML (remaining types are not two-phase). */ VIR_ENUM_DECL(virDomainBlockJob) @@ -12867,7 +12860,7 @@ virDomainThreadSchedParse(xmlNodePtr node, virDomainThreadSchedParamPtr sp) { char *tmp = NULL; - int sched = 0; + int pol = 0; tmp = virXMLPropString(node, name); if (!tmp) { @@ -12892,16 +12885,17 @@ virDomainThreadSchedParse(xmlNodePtr node, tmp = virXMLPropString(node, "scheduler"); if (tmp) { - if ((sched = virDomainThreadSchedTypeFromString(tmp)) <= 0) { + if ((pol = virProcessSchedPolicyTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid scheduler attribute: '%s'"), tmp); goto error; } - sp->scheduler = sched; + sp->policy = pol; VIR_FREE(tmp); - if (sp->scheduler >= VIR_DOMAIN_THREAD_SCHED_FIFO) { + if (sp->policy == VIR_PROC_POLICY_FIFO || + sp->policy == VIR_PROC_POLICY_RR) { tmp = virXMLPropString(node, "priority"); if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -19888,7 +19882,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!(ids = virBitmapFormat(sp->ids))) goto error; virBufferAsprintf(buf, "<vcpusched vcpus='%s' scheduler='%s'", - ids, virDomainThreadSchedTypeToString(sp->scheduler)); + ids, virProcessSchedPolicyTypeToString(sp->policy)); VIR_FREE(ids); if (sp->priority) @@ -19903,7 +19897,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!(ids = virBitmapFormat(sp->ids))) goto error; virBufferAsprintf(buf, "<iothreadsched iothreads='%s' scheduler='%s'", - ids, virDomainThreadSchedTypeToString(sp->scheduler)); + ids, virProcessSchedPolicyTypeToString(sp->policy)); VIR_FREE(ids); if (sp->priority) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 02ddd93..aafeadd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -50,6 +50,7 @@ # include "virbitmap.h" # include "virstoragefile.h" # include "virseclabel.h" +# include "virprocess.h" /* forward declarations of all device types, required by * virDomainDeviceDef @@ -1813,21 +1814,11 @@ typedef enum { VIR_DOMAIN_CPU_PLACEMENT_MODE_LAST } virDomainCpuPlacementMode; -typedef enum { - VIR_DOMAIN_THREAD_SCHED_OTHER = 0, - VIR_DOMAIN_THREAD_SCHED_BATCH, - VIR_DOMAIN_THREAD_SCHED_IDLE, - VIR_DOMAIN_THREAD_SCHED_FIFO, - VIR_DOMAIN_THREAD_SCHED_RR, - - VIR_DOMAIN_THREAD_SCHED_LAST -} virDomainThreadSched; - typedef struct _virDomainThreadSchedParam virDomainThreadSchedParam; typedef virDomainThreadSchedParam *virDomainThreadSchedParamPtr; struct _virDomainThreadSchedParam { virBitmapPtr ids; - virDomainThreadSched scheduler; + virProcessSchedPolicy policy; int priority; }; @@ -2881,7 +2872,6 @@ VIR_ENUM_DECL(virDomainRNGModel) VIR_ENUM_DECL(virDomainRNGBackend) VIR_ENUM_DECL(virDomainTPMModel) VIR_ENUM_DECL(virDomainTPMBackend) -VIR_ENUM_DECL(virDomainThreadSched) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainNostateReason) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ba05cc6..ead1b45 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -415,8 +415,6 @@ virDomainStateTypeFromString; virDomainStateTypeToString; virDomainTaintTypeFromString; virDomainTaintTypeToString; -virDomainThreadSchedTypeFromString; -virDomainThreadSchedTypeToString; virDomainTimerModeTypeFromString; virDomainTimerModeTypeToString; virDomainTimerNameTypeFromString; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd63fd7..faf9907 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2614,7 +2614,7 @@ qemuProcessSetSchedParams(int id, if (!s) return 0; - return virProcessSetScheduler(pid, s->scheduler, s->priority); + return virProcessSetScheduler(pid, s->policy, s->priority); } static int -- 2.3.1

2 1

[libvirt] [PATCH 0/2] fix corner case of spice graphics channel mode settings
by Pavel Hrdina 02 Mar '15

02 Mar '15

Pavel Hrdina (2): qemu: remove duplicated code for allocating spice ports qemu: check defaultMode for spice graphics independently src/qemu/qemu_driver.c | 45 ++---------------------------- src/qemu/qemu_process.c | 73 ++++++++++++++++++++++++++++--------------------- src/qemu/qemu_process.h | 5 ++++ 3 files changed, 49 insertions(+), 74 deletions(-) -- 2.0.5

2 4

[libvirt] [PATCH] Add ability to set rlimits at container boot
by Ryan Cleere 02 Mar '15

02 Mar '15

--- docs/formatdomain.html.in | 49 +++++++++++++++++++++++ docs/schemas/domaincommon.rng | 89 +++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.c | 92 +++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 33 ++++++++++++++++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 32 +++++++++++++++ src/util/virprocess.c | 4 +- src/util/virprocess.h | 2 + 8 files changed, 300 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f8d5f89..5aec51c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -348,6 +348,55 @@ </pre> + <p> + If you want to set an rlimit of the containter init process instead of + inheriting from the host init, set the <code>rlimits</code> element. You + are able to set any of the rlimits that setrlimits is able to set using + any of the following sub-elements: + </p> + + <dl> + <dt><code>as</code></dt> + <dd>Used to set RLIMIT_AS.</dd> + <dt><code>core</code></dt> + <dd>Used to set RLIMIT_CORE.</dd> + <dt><code>cpu</code></dt> + <dd>Used to set RLIMIT_CPU.</dd> + <dt><code>data</code></dt> + <dd>Used to set RLIMIT_DATA.</dd> + <dt><code>fsize</code></dt> + <dd>Used to set RLIMIT_FSIZE.</dd> + <dt><code>locks</code></dt> + <dd>Used to set RLIMIT_LOCKS.</dd> + <dt><code>memlock</code></dt> + <dd>Used to set RLIMIT_MEMLOCK.</dd> + <dt><code>msgqueue</code></dt> + <dd>Used to set RLIMIT_MSGQUEUE.</dd> + <dt><code>nice</code></dt> + <dd>Used to set RLIMIT_NICE.</dd> + <dt><code>nofile</code></dt> + <dd>Used to set RLIMIT_NOFILE.</dd> + <dt><code>nproc</code></dt> + <dd>Used to set RLIMIT_NPROC.</dd> + <dt><code>rss</code></dt> + <dd>Used to set RLIMIT_RSS.</dd> + <dt><code>rtprio</code></dt> + <dd>Used to set RLIMIT_RTPRIO.</dd> + <dt><code>rttime</code></dt> + <dd>Used to set RLIMIT_RTTIME.</dd> + <dt><code>sigpending</code></dt> + <dd>Used to set RLIMIT_SIGPENDING.</dd> + <dt><code>stack</code></dt> + <dd>Used to set RLIMIT_STACK.</dd> + </dl> + + <pre> + <rlimits> + <nofile>10240</nofile> + </rlimits> + </pre> + + <h3><a name="elementsSysinfo">SMBIOS System Information</a></h3> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d467dce..b98f8d5 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -59,6 +59,9 @@ <ref name="idmap"/> </optional> <optional> + <ref name="rlimits"/> + </optional> + <optional> <ref name="devices"/> </optional> <zeroOrMore> @@ -570,6 +573,92 @@ </interleave> </element> </define> + <define name="rlimits"> + <element name="rlimits"> + <interleave> + <optional> + <element name="cpu"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="fsize"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="data"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="stack"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="core"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rss"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nproc"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nofile"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="memlock"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="as"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="locks"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="sigpending"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="msgqueue"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="nice"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rtprio"> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name="rttime"> + <ref name='scaledInteger'/> + </element> + </optional> + </interleave> + </element> + </define> <!-- Resources usage defines the amount of memory (maximum and possibly current usage) and number of virtual CPUs used by that domain. diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d562e1a..399976e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -772,6 +772,24 @@ VIR_ENUM_IMPL(virDomainLoader, "rom", "pflash") +VIR_ENUM_IMPL(virDomainRLimit, VIR_DOMAIN_RLIMIT_LAST, + "cpu", + "fsize", + "data", + "stack", + "core", + "rss", + "nproc", + "nofile", + "memlock", + "as", + "locks", + "sigpending", + "msgqueue", + "nice", + "rtprio", + "rttime") + /* Internal mapping: subset of block job types that can be present in * <mirror> XML (remaining types are not two-phase). */ VIR_ENUM_DECL(virDomainBlockJob) @@ -979,7 +997,40 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, return -1; } +static virDomainRLimitsPtr +virDomainRLimitParseXML(xmlNodePtr node) +{ + char *c = NULL; + long long val; + virDomainRLimitsPtr def; + + if (VIR_ALLOC(def) < 0) + return NULL; + if (node->type == XML_ELEMENT_NODE) { + c = (char *)xmlNodeGetContent(node); + if (virStrToLong_ll(c, NULL, 10, &val) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not parse rlimit value of %s"), + c); + goto error; + } + VIR_FREE(c); + + def->limit = val; + if ((def->resource = virDomainRLimitTypeFromString((const char *)node->name)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("could not determine resource type of '%s'"), + node->name); + goto error; + } + } + return def; + error: + VIR_FREE(c); + VIR_FREE(def); + return NULL; +} static void virDomainObjListDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) @@ -14423,6 +14474,34 @@ virDomainDefParseXML(xmlDocPtr xml, virHashFree(bootHash); + if ((node = virXPathNode("./rlimits[1]", ctxt)) != NULL && (n = virXMLChildElementCount(node)) > 0) { + xmlNodePtr cur = node->children; + if (n && VIR_ALLOC_N(def->rlimits, n) < 0) + goto error; + + for (i = 0; i < n; i++) { + if (!(def->rlimits[i] = virDomainRLimitParseXML(cur))) { + for (j = 0; j < i; j++) + VIR_FREE(def->rlimits[j]); + VIR_FREE(def->rlimits); + goto error; + } + def->nrlimits++; + for (j = 0; j < i; j++) { + if (def->rlimits[j]->resource == def->rlimits[i]->resource) { + virReportError(VIR_ERR_XML_ERROR, + _("duplicate rlimit resources '%s'"), + virDomainRLimitTypeToString(def->rlimits[j]->resource)); + for (int k = 0; k < i; k++) + VIR_FREE(def->rlimits[k]); + VIR_FREE(def->rlimits); + goto error; + } + } + cur = cur->next; + } + } + return def; error: @@ -20048,6 +20127,19 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; } + if (def->nrlimits > 0) { + virBufferAddLit(buf, "<rlimits>\n"); + virBufferAdjustIndent(buf, 2); + for (n = 0; n < def->nrlimits; n++) { + virBufferAsprintf(buf, "<%s>%lld</%s>\n", + virDomainRLimitTypeToString(def->rlimits[n]->resource), + def->rlimits[n]->limit, + virDomainRLimitTypeToString(def->rlimits[n]->resource)); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</rlimits>\n"); + } + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</domain>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 93f2314..b032202 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1851,6 +1851,27 @@ typedef enum { VIR_DOMAIN_CLOCK_BASIS_LAST } virDomainClockBasis; +typedef enum { + VIR_DOMAIN_RLIMIT_CPU, + VIR_DOMAIN_RLIMIT_FSIZE, + VIR_DOMAIN_RLIMIT_DATA, + VIR_DOMAIN_RLIMIT_STACK, + VIR_DOMAIN_RLIMIT_CORE, + VIR_DOMAIN_RLIMIT_RSS, + VIR_DOMAIN_RLIMIT_NPROC, + VIR_DOMAIN_RLIMIT_NOFILE, + VIR_DOMAIN_RLIMIT_MEMLOCK, + VIR_DOMAIN_RLIMIT_AS, + VIR_DOMAIN_RLIMIT_LOCKS, + VIR_DOMAIN_RLIMIT_SIGPENDING, + VIR_DOMAIN_RLIMIT_MSGQUEUE, + VIR_DOMAIN_RLIMIT_NICE, + VIR_DOMAIN_RLIMIT_RTPRIO, + VIR_DOMAIN_RLIMIT_RTTIME, + + VIR_DOMAIN_RLIMIT_LAST +} virDomainRLimit; + typedef struct _virDomainClockDef virDomainClockDef; typedef virDomainClockDef *virDomainClockDefPtr; struct _virDomainClockDef { @@ -2039,6 +2060,14 @@ struct _virDomainPowerManagement { int s4; }; +typedef struct _virDomainRLimits virDomainRLimits; +typedef virDomainRLimits *virDomainRLimitsPtr; + +struct _virDomainRLimits { + int resource; + long long limit; +}; + /* * Guest VM main configuration * @@ -2156,6 +2185,9 @@ struct _virDomainDef { size_t nshmems; virDomainShmemDefPtr *shmems; + size_t nrlimits; + virDomainRLimitsPtr *rlimits; + /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; @@ -2844,6 +2876,7 @@ VIR_ENUM_DECL(virDomainRNGModel) VIR_ENUM_DECL(virDomainRNGBackend) VIR_ENUM_DECL(virDomainTPMModel) VIR_ENUM_DECL(virDomainTPMBackend) +VIR_ENUM_DECL(virDomainRLimit) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainNostateReason) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bd7870f..7b71ff1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1896,6 +1896,7 @@ virProcessGetNamespaces; virProcessGetStartTime; virProcessKill; virProcessKillPainfully; +virProcessPrLimit; virProcessRunInMountNamespace; virProcessSetAffinity; virProcessSetMaxFiles; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8a7c7e8..5c63a1b 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -798,6 +798,35 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl) return ret; } +static int virLXCControllerSetupRLimits(virLXCControllerPtr ctrl) +{ + int i, ret = -1; + struct rlimit rlim; + + VIR_DEBUG("Setting up rlimits"); + + VIR_DEBUG("nrlimits = %d", (int)ctrl->def->nrlimits); + VIR_DEBUG("setting limits on process %d", ctrl->initpid); + if (ctrl->def->nrlimits > 0) { + for (i = 0; i < ctrl->def->nrlimits; i++) { + rlim.rlim_max = rlim.rlim_cur = ctrl->def->rlimits[i]->limit; + VIR_DEBUG("Setting rlimit %s(%d) on pid %d to %lld", + virDomainRLimitTypeToString(ctrl->def->rlimits[i]->resource), + ctrl->def->rlimits[i]->resource, + ctrl->initpid, + ctrl->def->rlimits[i]->limit); + if (virProcessPrLimit(ctrl->initpid, ctrl->def->rlimits[i]->resource, &rlim) < 0) { + virReportSystemError(errno, "%s", + _("Unable to set rlimit")); + goto cleanup; + } + } + } + ret = 0; + cleanup: + return ret; +} + static void virLXCControllerClientCloseHook(virNetServerClientPtr client) { @@ -2318,6 +2347,9 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupCgroupLimits(ctrl) < 0) goto cleanup; + if (virLXCControllerSetupRLimits(ctrl) < 0) + goto cleanup; + if (virLXCControllerSetupUserns(ctrl) < 0) goto cleanup; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index d0a1500..d83ae28 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -676,13 +676,13 @@ int virProcessSetNamespaces(size_t nfdlist, } #if HAVE_PRLIMIT -static int +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim) { return prlimit(pid, resource, rlim, NULL); } #elif HAVE_SETRLIMIT -static int +int virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED, int resource ATTRIBUTE_UNUSED, struct rlimit *rlim ATTRIBUTE_UNUSED) diff --git a/src/util/virprocess.h b/src/util/virprocess.h index bcaede5..c40b41a 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -22,6 +22,7 @@ #ifndef __VIR_PROCESS_H__ # define __VIR_PROCESS_H__ +# include <sys/resource.h> # include <sys/types.h> # include "internal.h" @@ -73,4 +74,5 @@ typedef int (*virProcessNamespaceCallback)(pid_t pid, void *opaque); int virProcessRunInMountNamespace(pid_t pid, virProcessNamespaceCallback cb, void *opaque); +int virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim); #endif /* __VIR_PROCESS_H__ */ -- 1.9.3 (Apple Git-50)

4 6

[libvirt] [PATCH] virsh.pod: Add information regarding LXC for setmem, memtune, and dominfo
by John Ferlan 02 Mar '15

02 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1070695 Modify the virsh man page to more accurately describe which values are set by the virsh setmem and displayed by the virsh memtune or dominfo based on the setmem command results. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh.pod | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 343f26f..e435d01 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1925,6 +1925,13 @@ For example, vSphere/ESX rounds the parameter up to mebibytes (1024 kibibytes). For Xen, you can only adjust the memory of a running domain if the domain is paravirtualized or running the PV balloon driver. +For LXC, the value being set is the cgroups value for limit_in_bytes or the +maximum amount of user memory (including file cache). When viewing memory +inside the container, this is the /proc/meminfo "MemTotal" value. When viewing +the value from the host, use the B<virsh memtune> command. In order to view +the current memory in use and the maximum value allowed to set memory, use +the B<virsh dominfo> command. + =item B<setmaxmem> I<domain> B<size> [[I<--config>] [I<--live>] | [I<--current>]] @@ -1973,6 +1980,9 @@ Thus, when counting them, one needs to add up guest RAM, guest video RAM, and some memory overhead of QEMU itself. The last piece is hard to determine so one needs guess and try. +For LXC, the displayed hard_limit value is the current memory setting +from the XML or the results from a B<virsh setmem> command. + =over 4 =item I<--hard-limit> -- 2.1.0

2 1

[libvirt] [PATCH] disk: Provide a default storage source format type.
by John Ferlan 02 Mar '15

02 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1181062 According to the formatstorage.html description for <source> element and "format" attribute: "All drivers are required to have a default value for this, so it is optional." As it turns out the disk backend did not choose a default value, so I added a default of "msdos" if the source type is "unknown" as well as updating the storage.html backend disk volume driver documentation to indicate the default format is dos. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- docs/storage.html.in | 1 + src/storage/storage_backend_disk.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index f920dae..b9b503d 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -346,6 +346,7 @@ on the size and placement of volumes. The 'free extents' information will detail the regions which are available for creating new volumes. A volume cannot span across 2 different free extents. + It will default to using <code>msdos</code> as the pool source format. </p> <h3>Example pool input</h3> diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 39082cc..9a79325 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -468,13 +468,20 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, } if (ok_to_mklabel) { - /* eg parted /dev/sda mklabel msdos */ + /* eg parted /dev/sda mklabel --script msdos */ + int format = pool->def->source.format; + const char *fmt; + if (format == VIR_STORAGE_POOL_DISK_UNKNOWN || + format == VIR_STORAGE_POOL_DISK_DOS) + fmt = "msdos"; + else + fmt = virStoragePoolFormatDiskTypeToString(format); + cmd = virCommandNewArgList(PARTED, pool->def->source.devices[0].path, "mklabel", "--script", - ((pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) ? "msdos" : - virStoragePoolFormatDiskTypeToString(pool->def->source.format)), + fmt, NULL); ret = virCommandRun(cmd, NULL); } -- 2.1.0

2 1

[libvirt] [PATCH] docs: add a note that attr 'managed' is only used by PCI devices
by Erik Skultety 02 Mar '15

02 Mar '15

Our documentation isn't 100% clear about hostdev 'managed' attribute usage, because it only makes sense to use it with PCI devices, yet we format this attribute to all hostdev devices. By adding a note into the docs, we can possibly avoid confusion from customer's side and also avoid a solution using ternary logic. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1155887 --- docs/formatdomain.html.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fb0a0d1..6276a61 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3110,6 +3110,12 @@ then this setting not required. </dd> </dl> + <p> + Note: The <code>managed</code> attribute is only used with PCI devices + and is ignored by all the other device types, thus setting + <code>managed</code> explicitly with other than PCI device has the same + effect as omitting it. + </p> </dd> <dt><code>source</code></dt> <dd>The source element describes the device as seen from the host using -- 1.9.3

2 2