- Devel - libvirt List Archives

[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