- Devel - libvirt List Archives

[libvirt] Lifecycle events during reboot for KVM and Xen
by Thomas Bechtold 07 Aug '14

07 Aug '14

Hi, during debugging a problem[1] of Openstack Nova I recognized the following: Doing a reboot (from inside of the VM with "reboot" command) on a kvm VM doesn't send any lifecycle events (events debugged with [2]). Doing the same thing with a xen VM leads to 2 events: First a VIR_DOMAIN_EVENT_STOPPED and then a VIR_DOMAIN_EVENT_STARTED event. The problem here is that for the xen case it doesn't seem to be possible to recognize that a reboot is ongoing. For that reason the OpenStack Nova component just forces the domain to stop after receiving the VIR_DOMAIN_EVENT_STOPPED event. Is it expected that the 2 drivers send different events for the same action or a bug in qemu/xen/libvirt? Cheers, Tom [1] https://bugs.launchpad.net/nova/+bug/1293480 [2] https://gist.github.com/toabctl/53f26989ad7634a3168b

1 0

[libvirt] [PATCH V3 00/24] xen_xm parsing code refactor
by David Kiarie 07 Aug '14

07 Aug '14

Kiarie Kahurani (24): src/xenxs:Refactor code parsing memory config src/xenxs:Refactor code parsing virtual time config src/xenxs:Refactor code parsing event actions src/xenxs:Refactor code parsing PCI config src/xenxs:Refactor code parsing CPU features src/xenxs:Refactor code parsing xm disk config src/xenxs:Refactor code parsing Vfb config src/xenxs:Refactor code parsing Char devices config src/xenxs:Refactor code parsing Vif config src/xenxs:Refactor code parsing emulated hardware config src/xenxs:Refactor code parsing general config src/xenxs:Refactor code parsing OS config src/xenxs:Export code for reuse src/xenxs:Refactor code formating general VM config src/xenxs:Refactor code formating memory config src/xenxs:Refactor code formating virtual time config src/xenxs:Refactor code formating event actions config src/xenxs:Refactor code formating Char devices config src/xenxs:Refactor code formating xm disk config src/xenxs:Refactor code formating CPU features config src/xenxs:Refactor code formating OS config src/xenxs:Refactor code formating Vfb config src/xenxs:Refactor code formating emulated devices config src/xenxs:Export code src/xenxs/xen_xm.c | 2217 +++++++++++--------- src/xenxs/xen_xm.h | 4 + tests/xmconfigdata/test-escape-paths.cfg | 12 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-localtime.cfg | 10 +- tests/xmconfigdata/test-fullvirt-net-ioemu.cfg | 10 +- tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 10 +- tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 10 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 10 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 10 +- .../test-fullvirt-serial-dev-2-ports.cfg | 10 +- .../test-fullvirt-serial-dev-2nd-port.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-file.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-null.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 10 +- .../test-fullvirt-serial-tcp-telnet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 10 +- tests/xmconfigdata/test-fullvirt-sound.cfg | 12 +- tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 10 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-utc.cfg | 10 +- tests/xmconfigdata/test-no-source-cdrom.cfg | 10 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.cfg | 2 +- .../test-paravirt-new-pvfb-vncdisplay.cfg | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 2 +- tests/xmconfigdata/test-paravirt-vcpu.cfg | 2 +- tests/xmconfigdata/test-pci-devs.cfg | 10 +- 35 files changed, 1416 insertions(+), 1083 deletions(-) V3 of series refactoring xen_xm.c code for reuse in the xen-xl parser. Changes since V2 -Formating fixes -reused Vif formating and parsing code -- 1.8.4.5

2 29

[libvirt] valgrind report on active commit
by Eric Blake 06 Aug '14

06 Aug '14

I'm still investigating, but posting this trace now in case someone else spots the bug. I created a chain three deep (base.img <- mid.img <- top.img), then ran blockcopy --finish, blockcommit --active --shallow --pivot, and another blockcommit --active --shallow --pivot. The last attempt to pivot exposed the bad memory use: ==25612== Invalid read of size 4 ==25612== at 0x50E7C90: virStorageSourceGetActualType (virstoragefile.c:1948) ==25612== by 0x209C0B18: qemuDomainDetermineDiskChain (qemu_domain.c:2473) ==25612== by 0x209D7F6A: qemuProcessHandleBlockJob (qemu_process.c:1087) ==25612== by 0x209F40C9: qemuMonitorEmitBlockJob (qemu_monitor.c:1357) ==25612== by 0x20A06B7F: qemuMonitorJSONHandleBlockJobImpl (qemu_monitor_json.c:922) ==25612== by 0x20A06D18: qemuMonitorJSONHandleBlockJobCompleted (qemu_monitor_json.c:969) ==25612== by 0x20A048CD: qemuMonitorJSONIOProcessEvent (qemu_monitor_json.c:166) ==25612== by 0x20A04A73: qemuMonitorJSONIOProcessLine (qemu_monitor_json.c:195) ==25612== by 0x20A04CDB: qemuMonitorJSONIOProcess (qemu_monitor_json.c:237) ==25612== by 0x209F1047: qemuMonitorIOProcess (qemu_monitor.c:402) ==25612== by 0x209F1AB1: qemuMonitorIO (qemu_monitor.c:651) ==25612== by 0x50A73C0: virEventPollDispatchHandles (vireventpoll.c:510) ==25612== Address 0xe4b5610 is 0 bytes inside a block of size 200 free'd ==25612== at 0x4A07577: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==25612== by 0x50839E9: virFree (viralloc.c:582) ==25612== by 0x50E7E51: virStorageSourceFree (virstoragefile.c:2015) ==25612== by 0x209D7EFF: qemuProcessHandleBlockJob (qemu_process.c:1073) ==25612== by 0x209F40C9: qemuMonitorEmitBlockJob (qemu_monitor.c:1357) ==25612== by 0x20A06B7F: qemuMonitorJSONHandleBlockJobImpl (qemu_monitor_json.c:922) ==25612== by 0x20A06D18: qemuMonitorJSONHandleBlockJobCompleted (qemu_monitor_json.c:969) ==25612== by 0x20A048CD: qemuMonitorJSONIOProcessEvent (qemu_monitor_json.c:166) ==25612== by 0x20A04A73: qemuMonitorJSONIOProcessLine (qemu_monitor_json.c:195) ==25612== by 0x20A04CDB: qemuMonitorJSONIOProcess (qemu_monitor_json.c:237) ==25612== by 0x209F1047: qemuMonitorIOProcess (qemu_monitor.c:402) ==25612== by 0x209F1AB1: qemuMonitorIO (qemu_monitor.c:651) -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 1

[libvirt] [PATCH v5 0/4] fix blockcopy across libvirtd restart, turn on active blockcommit
by Eric Blake 06 Aug '14

06 Aug '14

v4 was here: https://www.redhat.com/archives/libvir-list/2014-June/msg01095.html Since then: I _finally_ implemented persistent domain updates to match live changes, by reimplementing how <mirror> is tracked in XML to be more robust to libvirtd restarts. In particular, it fixes a bug in v4 that Adam Litke pointed out where a pivot commit would emit a ready event for 'active commit' but then a completed event for plain 'commit'. Patches 1 and 2 are completely local to blockcopy, and fix a long-standing bug where it is not robust to libvirtd restarts (similar to the bug fixed in 60e4944). They are pre-requisite to turning on active commit. Patches 3 and 4 are borderline on whether it is a new feature or a bug fix. But consider that commit 47549d5 turned on qemu feature probing with the intent of getting this in 1.2.7, and we already missed getting active commit into 1.2.6. As it is, patch 4 is very similar to the already-acked counterpart of v4. Therefore, even though I missed rc1, I'm arguing that this whole series should be included in rc2 in time for 1.2.7. Not done yet, but that I'd also like to have in the release if I can swing it: the new virConnectGetDomainCapabilities API needs to expose features on whether active commit will work. Also, I'd like to fix libvirtd restarts to inspect all existing <mirror> tags and see if the job completed while libvirtd was offline (that is, when we miss an event, we should still start up in the correct state when reconnecting to qemu). Eric Blake (4): blockcopy: add more XML for state tracking blockjob: properly track blockcopy xml changes on disk blockcommit: track job type in xml blockcommit: turn on active commit docs/formatdomain.html.in | 23 ++- docs/schemas/domaincommon.rng | 19 ++- src/conf/domain_conf.c | 56 ++++++- src/conf/domain_conf.h | 14 +- src/qemu/qemu_driver.c | 167 ++++++++++++++------- src/qemu/qemu_process.c | 92 ++++++++++-- .../qemuxml2argv-disk-active-commit.xml | 37 +++++ .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 8 +- .../qemuxml2xmlout-disk-mirror-old.xml | 4 +- tests/qemuxml2xmltest.c | 1 + 10 files changed, 336 insertions(+), 85 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml -- 1.9.3

2 14

[libvirt] Error
by ahmad jan 06 Aug '14

06 Aug '14

I want to configure Libvirt-1.2.7 on ubuntu and found the following Error "Could not find linxml2 anywhere" guide please

3 2

[libvirt] libvirt external disk-only snapshot will pause the VM?
by Yuanzhen Gu 06 Aug '14

06 Aug '14

Hello folks, If I give command to take external disk-only live snapshot, such as # virsh snapshot-create-as vm1 snapshot_vm1 --disk-only will the guest OS be paused or suspend while the snapshot being taken? Thanks very much! Best, Yuanzhen

2 8

[libvirt] [PATCH] Node Devices: Fix nodedev-list for fc_host & vports.
by Prerna Saxena 06 Aug '14

06 Aug '14

In a system with Fiber Channel Host Adapters, a query to list all Fibre Channel HBAs OR Vports currently returns empty list: $ virsh nodedev-list --cap fc_host $ Libvirt correctly discovers properties for all HBAs. However, the reporting fails because of incorrect flag comparison while filtering these types. This is fixed by removing references to 'VIR_CONNECT_LIST_NODE_DEVICES_CAP_*' for comparison and replacing those with 'VIR_NODE_DEV_CAP_*' Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- src/conf/node_device_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 96524a6..025d08c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1732,12 +1732,12 @@ virNodeDeviceCapMatch(virNodeDeviceObjPtr devobj, return true; if (cap->type == VIR_NODE_DEV_CAP_SCSI_HOST) { - if (type == VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST && + if (type == VIR_NODE_DEV_CAP_FC_HOST && (cap->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST)) return true; - if (type == VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPORTS && + if (type == VIR_NODE_DEV_CAP_VPORTS && (cap->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS)) return true; -- 1.9.3 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 2

[libvirt] [PATCH] snapshot: conf: Enforce absolute paths on disk and memory images
by Peter Krempa 06 Aug '14

06 Aug '14

RNG schema as well as the qemu driver requires absolute paths for memory and disk snapshot image files but the XML parser was not enforcing it. Add checks to avoid problems in qemu where the configuration it creates is invalid. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1126329 --- src/conf/snapshot_conf.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 240ca90..c53a66b 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -177,6 +177,16 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, } } + /* validate that the passed path is absolute */ + if (virStorageSourceIsLocalStorage(def->src) && + def->src->path && + def->src->path[0] != '/') { + virReportError(VIR_ERR_XML_ERROR, + _("disk snapshot image path '%s' must be absolute"), + def->src->path); + goto cleanup; + } + if (!def->snapshot && (def->src->path || def->src->format)) def->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; @@ -327,6 +337,14 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, def->file = memoryFile; memoryFile = NULL; + /* verify that memory path is absolute */ + if (def->file && def->file[0] != '/') { + virReportError(VIR_ERR_XML_ERROR, + _("memory snapshot file path (%s) must be absolute"), + def->file); + goto cleanup; + } + if ((n = virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) goto cleanup; if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_DISKS) { -- 2.0.2

2 2

[libvirt] [PATCH] qemu: Make virFileFindHugeTLBFS fault tolerant
by Michal Privoznik 06 Aug '14

06 Aug '14

Since commit be0782e1 we are parsing /proc/meminfo to find out the default huge page size. However, if the host we are running at does not support any huge pages (e.g. CONFIG_HUGETLB_PAGE is turned off), we will not successfully parse the meminfo file and hence the whole qemu driver init process fails. Moreover, the default huge page size is needed if and only if there's at least one hugetlbfs mount point. So the fix consists of moving the virFileGetDefaultHugepageSize function call after the first hugetlbfs mount point is found. With this fix, we fail to start with one or more hugetlbfs mounts and malformed meminfo file, but that's expected (how can one mount hugetlbfs without kernel supporting huge pages?). Workaround in that case is to umount all the hugetlbfs mounts. Reported-by: Jim Fehlig <jfehlig(a)suse.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virfile.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 9863fd0..f9efc65 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2990,10 +2990,7 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, char mntbuf[1024]; virHugeTLBFSPtr fs = NULL; size_t nfs = 0; - unsigned long long default_hugepagesz; - - if (virFileGetDefaultHugepageSize(&default_hugepagesz) < 0) - goto cleanup; + unsigned long long default_hugepagesz = 0; if (!(f = setmntent(PROC_MOUNTS, "r"))) { virReportSystemError(errno, @@ -3019,6 +3016,10 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, if (virFileGetHugepageSize(tmp->mnt_dir, &tmp->size) < 0) goto cleanup; + if (!default_hugepagesz && + virFileGetDefaultHugepageSize(&default_hugepagesz) < 0) + goto cleanup; + tmp->deflt = tmp->size == default_hugepagesz; } -- 1.8.5.5

3 2

[libvirt] handle different version of QEMU
by Matthias Gatto 06 Aug '14

06 Aug '14

Hello, I'm implementing the "new" QEMU option of block_set_io_throttle(@bps_max, @bps_rd_max...), but i have a problem: The old version of QEMU(before 1.7) does not handle it, so I'd like to know what function should i use to know the version of QEMU, and what's the proper way to handle this problem ?

2 2

[libvirt] [python PATCH] Bump version to 1.2.8 for new dev cycle
by Eric Blake 06 Aug '14

06 Aug '14

Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 334d7b2..f5c6542 100755 --- a/setup.py +++ b/setup.py @@ -309,7 +309,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '1.2.7', + version = '1.2.8', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 1.9.3

4 4

[libvirt] [PATCH v2 0/8] Add iSCSI hostdev pass-through device
by John Ferlan 05 Aug '14

05 Aug '14

Followup/rebase to partially ACK'd pile of changes - figure it's just as easy for me to keep things together and it's better to see things in totality... See: http://www.redhat.com/archives/libvir-list/2014-July/msg00592.html * Patches 1-5 were adjusted to use the first_/second_ naming scheme rather than a/b. * Typo for 'vedor' in patch 1 adjusted. * Changed name of iSCSIFree to iSCSIClear. John Ferlan (8): hostdev: Introduce virDomainHostdevSubsysUSB hostdev: Introduce virDomainHostdevSubsysPCI hostdev: Introduce virDomainHostdevSubsysSCSI hostdev: Introduce virDomainHostdevSubsysSCSIHost Add virConnectPtr for qemuBuildSCSIHostdevDrvStr hostdev: Introduce virDomainHostdevSubsysSCSIiSCSI domain_conf: Common routine to handle network storage host xml def hostdev: Add iSCSI hostdev XML docs/formatdomain.html.in | 142 +++++-- docs/schemas/domaincommon.rng | 46 +- src/conf/domain_audit.c | 38 +- src/conf/domain_conf.c | 471 ++++++++++++++------- src/conf/domain_conf.h | 80 +++- src/libxl/libxl_conf.c | 9 +- src/libxl/libxl_domain.c | 6 +- src/libxl/libxl_driver.c | 34 +- src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_controller.c | 10 +- src/lxc/lxc_driver.c | 16 +- src/qemu/qemu_cgroup.c | 69 +-- src/qemu/qemu_command.c | 158 ++++--- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_conf.c | 20 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_hotplug.c | 93 ++-- src/qemu/qemu_hotplug.h | 9 +- src/security/security_apparmor.c | 33 +- src/security/security_dac.c | 66 +-- src/security/security_selinux.c | 64 +-- src/security/virt-aa-helper.c | 5 +- src/util/virhostdev.c | 295 +++++++------ .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 14 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 46 ++ .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 14 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi.xml | 40 ++ ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 16 + ...qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 46 ++ .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 16 + .../qemuxml2argv-hostdev-scsi-virtio-iscsi.xml | 40 ++ tests/qemuxml2argvtest.c | 16 + tests/qemuxml2xmltest.c | 5 + 33 files changed, 1322 insertions(+), 610 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.xml -- 1.9.3

2 24

[libvirt] [PATCH 0/2] Fix PCI address validation
by Pavel Hrdina 05 Aug '14

05 Aug '14

Pavel Hrdina (2): domain_conf: refactor virDomainDeviceAddressIsValid to boolean device_conf: PCI address pci_0000_00_00_0 is also valid src/conf/device_conf.c | 7 ++++--- src/conf/device_conf.h | 2 +- src/conf/domain_conf.c | 16 ++++++++-------- src/conf/domain_conf.h | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) -- 1.8.5.5

2 4

[libvirt] [PATCH] blockjob: correctly report active commit for job info
by Eric Blake 05 Aug '14

05 Aug '14

Commit 232a31b munged job info to report 'active commit' instead of 'commit' when generating events, but forgot to also munge the polling variant of the command. * src/qemu/qemu_driver.c (qemuDomainBlockJobImpl): Adjust type as needed. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a3de784..57cc913 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15103,6 +15103,9 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, ret = qemuMonitorBlockJob(priv->mon, device, basePath, backingPath, bandwidth, info, mode, async); qemuDomainObjExitMonitor(driver, vm); + if (info && info->type == VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT && + disk->mirrorJob == VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT) + info->type = disk->mirrorJob; if (ret < 0) { if (mode == BLOCK_JOB_ABORT && disk->mirror) disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE; -- 1.9.3

2 2

[libvirt] [PATCH] qemu: reword caps-related error
by Martin Kletzander 05 Aug '14

05 Aug '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8eba8e8..a4a96af 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3456,7 +3456,9 @@ static int qemuDumpToFd(virQEMUDriverPtr driver, virDomainObjPtr vm, if (ret <= 0) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported dumpformat '%s'"), dumpformat); + _("unsupported dumpformat '%s' " + "for this QEMU binary"), + dumpformat); ret = -1; goto cleanup; } -- 2.0.4

2 1

[libvirt] [PATCH] lxc: Report container init process failures.
by Jarek Dziedzic 05 Aug '14

05 Aug '14

This change improves the reporting of container stop reason. Before this change if the init process of lxc container has crashed or returned non zero status, the domain state listeners would be notified that a domain has stopped due to normal shutdown. This maps to VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN and is exactly the same as the stop reason reported when the init process ends without errors. After this patch, when the container init process exits with a non zero status (or crashes) the reported stop reason will be VIR_DOMAIN_EVENT_STOPPED_CRASHED. --- src/lxc/lxc_controller.c | 16 ++++++++++++++-- src/lxc/lxc_monitor_protocol.x | 3 ++- src/lxc/lxc_process.c | 3 +++ src/lxc_monitor_protocol-structs | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 2d220eb..e8ff1c4 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -821,7 +821,7 @@ static int lxcControllerClearCapabilities(void) static bool wantReboot = false; static virMutex lock = VIR_MUTEX_INITIALIZER; - +static int initProcessExitCode = 0; static void virLXCControllerSignalChildIO(virNetServerPtr server, siginfo_t *info ATTRIBUTE_UNUSED, @@ -834,6 +834,11 @@ static void virLXCControllerSignalChildIO(virNetServerPtr server, ret = waitpid(-1, &status, WNOHANG); VIR_DEBUG("Got sig child %d vs %lld", ret, (unsigned long long)ctrl->initpid); if (ret == ctrl->initpid) { + VIR_DEBUG("Init process waitpid status 0x%x", status); + if (WIFEXITED(status)) { + initProcessExitCode = WEXITSTATUS(status); + VIR_INFO("Init process exited. Exit code = %d", initProcessExitCode); + } virNetServerQuit(server); virMutexLock(&lock); if (WIFSIGNALED(status) && @@ -841,6 +846,10 @@ static void virLXCControllerSignalChildIO(virNetServerPtr server, VIR_DEBUG("Status indicates reboot"); wantReboot = true; } + else if (WIFSIGNALED(status)) { + initProcessExitCode = 0x80 + WTERMSIG(status); + VIR_INFO("Init process received a signal %d. Exit code = %d", WTERMSIG(status), initProcessExitCode); + } virMutexUnlock(&lock); } } @@ -2080,7 +2089,10 @@ virLXCControllerEventSendExit(virLXCControllerPtr ctrl, memset(&msg, 0, sizeof(msg)); switch (exitstatus) { case 0: - msg.status = VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN; + if (initProcessExitCode == 0) + msg.status = VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN; + else + msg.status = VIR_LXC_MONITOR_EXIT_STATUS_INIT_PROCESS_ERROR; break; case 1: msg.status = VIR_LXC_MONITOR_EXIT_STATUS_REBOOT; diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x index 0926e26..beb2272 100644 --- a/src/lxc/lxc_monitor_protocol.x +++ b/src/lxc/lxc_monitor_protocol.x @@ -7,7 +7,8 @@ enum virLXCMonitorExitStatus { VIR_LXC_MONITOR_EXIT_STATUS_ERROR, VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN, - VIR_LXC_MONITOR_EXIT_STATUS_REBOOT + VIR_LXC_MONITOR_EXIT_STATUS_REBOOT, + VIR_LXC_MONITOR_EXIT_STATUS_INIT_PROCESS_ERROR }; struct virLXCMonitorExitEventMsg { diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 3353dc1..fb65919 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -553,6 +553,9 @@ static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED case VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN: priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; break; + case VIR_LXC_MONITOR_EXIT_STATUS_INIT_PROCESS_ERROR: + priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_CRASHED; + break; case VIR_LXC_MONITOR_EXIT_STATUS_ERROR: priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_FAILED; break; diff --git a/src/lxc_monitor_protocol-structs b/src/lxc_monitor_protocol-structs index da72ec0..b3877d3 100644 --- a/src/lxc_monitor_protocol-structs +++ b/src/lxc_monitor_protocol-structs @@ -3,6 +3,7 @@ enum virLXCMonitorExitStatus { VIR_LXC_MONITOR_EXIT_STATUS_ERROR = 0, VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN = 1, VIR_LXC_MONITOR_EXIT_STATUS_REBOOT = 2, + VIR_LXC_MONITOR_EXIT_STATUS_INIT_PROCESS_ERROR = 3, }; struct virLXCMonitorExitEventMsg { enum virLXCMonitorExitStatus status; -- 1.9.3

1 0

[libvirt] help
by Himanshu Sharma 05 Aug '14

05 Aug '14

Dear Team, Greetings!! I'm testing libvirt with VMware ESXi. I'm able to connect to VMware ESXi with libvirt driver but not able to connect it through "Virtual Machine manager" GUI also not able to run virt-clone command inturn to clone ESXi VM. Can you please guide me how to do so? -----Original Message----- From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] On Behalf Of libvir-list-request(a)redhat.com Sent: 05 August 2014 14:49 To: Himanshu Sharma Subject: Welcome to the "libvir-list" mailing list Welcome to the libvir-list(a)redhat.com mailing list! To post to this list, send your email to: libvir-list(a)redhat.com General information about the mailing list is at: https://www.redhat.com/mailman/listinfo/libvir-list If you ever want to unsubscribe or change your options (eg, switch to or from digest mode, change your password, etc.), visit your subscription page at: https://www.redhat.com/mailman/options/libvir-list/himanshu.sharma%40nectec… You can also make such adjustments via email by sending a message to: libvir-list-request(a)redhat.com with the word `help' in the subject or body (don't include the quotes), and you will get back a message with instructions. You must know your password to change your options (including changing the password, itself) or to unsubscribe. It is: Normally, Mailman will remind you of your redhat.com mailing list passwords once every month, although you can disable this if you prefer. This reminder will also include instructions on how to unsubscribe or change your account options. There is also a button on your options page that will email your current password to you. DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NEC or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NEC or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

2 1

[libvirt] [PATCH] lxc: Report container init process failures.
by Jarek Dziedzic 05 Aug '14

05 Aug '14

This change improves the reporting of container stop reason. Before this change if the init process of lxc container has crashed or returned non zero status, the domain state listeners would be notified that a domain has stopped due to normal shutdown. This maps to VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN and is exactly the same as the stop reason reported when the init process ends without errors. After this patch, when the container init process exits with a non zero status (or crashes) the reported stop reason will be VIR_DOMAIN_EVENT_STOPPED_CRASHED. --- src/lxc/lxc_controller.c | 16 ++++++++++++++-- src/lxc/lxc_monitor_protocol.x | 3 ++- src/lxc/lxc_process.c | 3 +++ src/lxc_monitor_protocol-structs | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 2d220eb..e8ff1c4 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -821,7 +821,7 @@ static int lxcControllerClearCapabilities(void) static bool wantReboot = false; static virMutex lock = VIR_MUTEX_INITIALIZER; - +static int initProcessExitCode = 0; static void virLXCControllerSignalChildIO(virNetServerPtr server, siginfo_t *info ATTRIBUTE_UNUSED, @@ -834,6 +834,11 @@ static void virLXCControllerSignalChildIO(virNetServerPtr server, ret = waitpid(-1, &status, WNOHANG); VIR_DEBUG("Got sig child %d vs %lld", ret, (unsigned long long)ctrl->initpid); if (ret == ctrl->initpid) { + VIR_DEBUG("Init process waitpid status 0x%x", status); + if (WIFEXITED(status)) { + initProcessExitCode = WEXITSTATUS(status); + VIR_INFO("Init process exited. Exit code = %d", initProcessExitCode); + } virNetServerQuit(server); virMutexLock(&lock); if (WIFSIGNALED(status) && @@ -841,6 +846,10 @@ static void virLXCControllerSignalChildIO(virNetServerPtr server, VIR_DEBUG("Status indicates reboot"); wantReboot = true; } + else if (WIFSIGNALED(status)) { + initProcessExitCode = 0x80 + WTERMSIG(status); + VIR_INFO("Init process received a signal %d. Exit code = %d", WTERMSIG(status), initProcessExitCode); + } virMutexUnlock(&lock); } } @@ -2080,7 +2089,10 @@ virLXCControllerEventSendExit(virLXCControllerPtr ctrl, memset(&msg, 0, sizeof(msg)); switch (exitstatus) { case 0: - msg.status = VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN; + if (initProcessExitCode == 0) + msg.status = VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN; + else + msg.status = VIR_LXC_MONITOR_EXIT_STATUS_INIT_PROCESS_ERROR; break; case 1: msg.status = VIR_LXC_MONITOR_EXIT_STATUS_REBOOT; diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x index 0926e26..beb2272 100644 --- a/src/lxc/lxc_monitor_protocol.x +++ b/src/lxc/lxc_monitor_protocol.x @@ -7,7 +7,8 @@ enum virLXCMonitorExitStatus { VIR_LXC_MONITOR_EXIT_STATUS_ERROR, VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN, - VIR_LXC_MONITOR_EXIT_STATUS_REBOOT + VIR_LXC_MONITOR_EXIT_STATUS_REBOOT, + VIR_LXC_MONITOR_EXIT_STATUS_INIT_PROCESS_ERROR }; struct virLXCMonitorExitEventMsg { diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 3353dc1..fb65919 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -553,6 +553,9 @@ static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED case VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN: priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; break; + case VIR_LXC_MONITOR_EXIT_STATUS_INIT_PROCESS_ERROR: + priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_CRASHED; + break; case VIR_LXC_MONITOR_EXIT_STATUS_ERROR: priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_FAILED; break; diff --git a/src/lxc_monitor_protocol-structs b/src/lxc_monitor_protocol-structs index da72ec0..b3877d3 100644 --- a/src/lxc_monitor_protocol-structs +++ b/src/lxc_monitor_protocol-structs @@ -3,6 +3,7 @@ enum virLXCMonitorExitStatus { VIR_LXC_MONITOR_EXIT_STATUS_ERROR = 0, VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN = 1, VIR_LXC_MONITOR_EXIT_STATUS_REBOOT = 2, + VIR_LXC_MONITOR_EXIT_STATUS_INIT_PROCESS_ERROR = 3, }; struct virLXCMonitorExitEventMsg { enum virLXCMonitorExitStatus status; -- 1.9.3

1 0

[libvirt] help
by Himanshu Sharma 05 Aug '14

05 Aug '14

Dear Team, Greetings!! I'm testing libvirt with VMware ESXi. I'm able to connect to VMware ESXi with libvirt driver but not able to connect it through "Virtual Machine manager" GUI also not able to run virt-clone command inturn to clone ESXi VM. Can you please guide me how to do so? -----Original Message----- From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] On Behalf Of libvir-list-request(a)redhat.com Sent: 05 August 2014 14:49 To: Himanshu Sharma Subject: Welcome to the "libvir-list" mailing list Welcome to the libvir-list(a)redhat.com mailing list! To post to this list, send your email to: libvir-list(a)redhat.com General information about the mailing list is at: https://www.redhat.com/mailman/listinfo/libvir-list If you ever want to unsubscribe or change your options (eg, switch to or from digest mode, change your password, etc.), visit your subscription page at: https://www.redhat.com/mailman/options/libvir-list/himanshu.sharma%40nectec… You can also make such adjustments via email by sending a message to: libvir-list-request(a)redhat.com with the word `help' in the subject or body (don't include the quotes), and you will get back a message with instructions. You must know your password to change your options (including changing the password, itself) or to unsubscribe. It is: Normally, Mailman will remind you of your redhat.com mailing list passwords once every month, although you can disable this if you prefer. This reminder will also include instructions on how to unsubscribe or change your account options. There is also a button on your options page that will email your current password to you. DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NEC or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NEC or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

1 0

Re: [libvirt] Welcome to the "libvir-list" mailing list
by Himanshu Sharma 05 Aug '14

05 Aug '14

Dear Team, Greetings!! I'm testing libvirt with VMware ESXi. I'm able to connect to VMware ESXi with libvirt driver but not able to connect it through "Virtual Machine manager" GUI also not able to run virt-clone command inturn to clone ESXi VM. Can you please guide me how to do so? -----Original Message----- From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] On Behalf Of libvir-list-request(a)redhat.com Sent: 05 August 2014 14:49 To: Himanshu Sharma Subject: Welcome to the "libvir-list" mailing list Welcome to the libvir-list(a)redhat.com mailing list! To post to this list, send your email to: libvir-list(a)redhat.com General information about the mailing list is at: https://www.redhat.com/mailman/listinfo/libvir-list If you ever want to unsubscribe or change your options (eg, switch to or from digest mode, change your password, etc.), visit your subscription page at: https://www.redhat.com/mailman/options/libvir-list/himanshu.sharma%40nectec… You can also make such adjustments via email by sending a message to: libvir-list-request(a)redhat.com with the word `help' in the subject or body (don't include the quotes), and you will get back a message with instructions. You must know your password to change your options (including changing the password, itself) or to unsubscribe. It is: Normally, Mailman will remind you of your redhat.com mailing list passwords once every month, although you can disable this if you prefer. This reminder will also include instructions on how to unsubscribe or change your account options. There is also a button on your options page that will email your current password to you. DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NEC or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NEC or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

1 0

[libvirt] [Discussion] How do we think about time out mechanism?
by James 05 Aug '14

05 Aug '14

There's a kind of situation that when libvirtd's under a lot of pressure, just as we start a lot of VMs at the same time, some libvirt APIs may take a lot of time to return. And this will block the up level job to be finished. Mostly we can't wait forever, we want a time out mechnism to help us out. When one API takes more than some time, it can return time out as a result, and do some rolling back. So my question is: do we have a plan to give a 'time out' solution or a better solution to fix this kind of problems in the future? And when? Thanks all! -- Best Regards James

2 6

[libvirt] [PATCH] Fix typo error attribute name vlan-id should be vlanid in docs
by Jianwei Hu 05 Aug '14

05 Aug '14

[root@localhost ~]# virsh nwfilter-dumpxml myself <filter name='myself' chain='root'> <uuid>7192ef51-cd50-4f14-ad7b-fa5c69ea19e3</uuid> <rule action='accept' direction='in' priority='500'> <vlan dstmacaddr='00:11:22:33:44:55' vlanid='44'/> </rule> </filter> [root@localhost ~]# ebtables -t nat -L Bridge table: nat ... -p 802_1Q -d 0:11:22:33:44:55 --vlan-id 44 -j ACCEPT --- docs/formatnwfilter.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 45b97f7..7169fa9 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -765,7 +765,7 @@ <td>Mask applied to MAC address of destination</td> </tr> <tr> - <td>vlan-id</td> + <td>vlanid</td> <td>UINT16 (0x0-0xfff, 0 - 4095)</td> <td>VLAN ID</td> </tr> -- 1.8.3.1

2 1

[libvirt] [python PATCH] maint: document use of libvirt's run script
by Eric Blake 05 Aug '14

05 Aug '14

Ever since libvirt commit 78c09530, it's easier to just use the run script. * README: Mention run script. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- README | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README b/README index df1de59..96082f0 100644 --- a/README +++ b/README @@ -32,10 +32,11 @@ A makefile shim is provided so that you can do rather than directly invoking setup.py. As of libvirt 1.2.6, it is possible to develop against an uninstalled -libvirt.git checkout, by setting some environment variables: +libvirt.git checkout, by setting PKG_CONFIG_PATH and LD_LIBRARY_PATH +environment variables to point into that libvirt tree; you can even +automate this by using libvirt's run script: - export PKG_CONFIG_PATH=/path/to/libvirt/git/src/ - export LD_LIBRARY_PATH=/path/to/libvirt/git/src/.libs/ + /path/to/libvirt/run python setup.py build Patches for this code should be sent to the main libvirt development mailing list -- 1.9.3

2 1

[libvirt] [PATCH v2 00/25] Refactor the xm parser
by David Kiarie 04 Aug '14

04 Aug '14

Kiarie Kahurani (25): src/xenxs:Refactor code parsing memory config src/xenxs:Refactor code parsing event actions config src/xenxs:Refactor code parsing virtual time controls config src/xenxs:Refactor code parsing PCI devices config src/xenxs:Refactor code parsing CPU features config src/xenxs:Refactor code parsing disk config src/xenxs:Refactor code parsing Vfb config src/xenxs:Refactor code parsing OS related config src/xenxs:Refactor code parsing Char device related config src/xenxs:Refactor code parsing Vif src/xenxs:Refactor code parsing emulated hardware config src/xenxs:Refactor code parsing general config src/xenxs:Organise functions to avoid duplication src/xenxs:Refactor code formating general config src/xenxs:Refactor code formating memory config src/xenxs:Reafactor code formating virtual time config src/xenxs:Refactor code formating event actions config src/xenxs:Refactor code formating Vif config src/xenxs:Refactor code formating Vfb config src/xenxs:Refactor code formating CPU config and features src/xenxs:Refactor code formating disk list src/xenxs:Refactor code formating emulated devices config src/xenxs:Refactor char devices formating code src/xenxs:Refactor code formating OS config src/xenxs:Export code to be reused src/xenxs/xen_xm.c | 2009 ++++++++++++-------- src/xenxs/xen_xm.h | 6 +- tests/xmconfigdata/test-escape-paths.cfg | 14 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 12 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 12 +- tests/xmconfigdata/test-fullvirt-localtime.cfg | 12 +- tests/xmconfigdata/test-fullvirt-net-ioemu.cfg | 12 +- tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 12 +- tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 12 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 12 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 12 +- .../test-fullvirt-serial-dev-2-ports.cfg | 12 +- .../test-fullvirt-serial-dev-2nd-port.cfg | 12 +- tests/xmconfigdata/test-fullvirt-serial-file.cfg | 12 +- tests/xmconfigdata/test-fullvirt-serial-null.cfg | 12 +- tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 12 +- tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 12 +- tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 12 +- .../test-fullvirt-serial-tcp-telnet.cfg | 12 +- tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 12 +- tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 12 +- tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 12 +- tests/xmconfigdata/test-fullvirt-sound.cfg | 14 +- tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 12 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 12 +- tests/xmconfigdata/test-fullvirt-utc.cfg | 12 +- tests/xmconfigdata/test-no-source-cdrom.cfg | 12 +- tests/xmconfigdata/test-pci-devs.cfg | 12 +- 28 files changed, 1326 insertions(+), 1005 deletions(-) This patches try to refactor the code for the xen-xm parser since much of the code can be reused when writing the xen-xl parser. changes since Prepost I have finished refactoring all the code Fixed numerous memory leaks I have also changed the layout of the tests since they depend on the layout of the code which I have changed I would also like to hear some comment on what configs I should support in the new xen-xl parser. Regards, David -- 1.8.4.5

2 36

[libvirt] link error on cygwin
by Eric Blake 04 Aug '14

04 Aug '14

Even though I pushed a last-minute patch for 1.2.7 to fix the compiler phase of the build on cygwin, I'm stumped on how to fix this error from the link phase: CCLD libvirtd.exe ../src/.libs/libvirt_driver_remote.a(libvirt_net_rpc_server_la-virnetserver.oo): In function `virNetServerNew': /home/eblake/libvirt/src/rpc/virnetserver.c:357: multiple definition of `virNetServerNew' /home/eblake/libvirt/src/.libs/libvirt.dll.a(d001949.o):(.text+0x0): first defined here and several others. Looks like we are including a link library through two paths, and cygwin is not as tolerant of that as Linux; but I'm not sure where in the Makefile.am to tweak to try and fix it. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

Re: [libvirt] [Qemu-devel] [PATCH] [RFC] Add machine type pc-1.0-qemu-kvm for live migrate compatibility with qemu-kvm
by Alex Bligh 04 Aug '14

04 Aug '14

On 22 Jul 2014, at 19:43, Alex Bligh <alex(a)alex.org.uk> wrote: > Testing has been light to date (i.e. > can I migrate it inbound with -S without anything complaining). I've given this quite a bit more testing today. It works fine qemu-kvm 1.0 -> qemu-2.0+patch (cirrus vga) It works fine qemu-2.0+patch -> qemu-2.0+patch (cirrus vga) It doesn't (yet) work qemu-2.0+patch -> qemu-kvm 1.0 (cirrus vga). The reason for this is (at least) that I need to emulate the broken versioning of the mc146818rtc timer section, as writing it correctly confuses qemu-kvm 1.0. Therefore please don't bother testing migration back to 1.0 yet. -- Alex Bligh

5 21

[libvirt] [PATCH] Perform disk config validity checking for attach-device config
by John Ferlan 04 Aug '14

04 Aug '14

https://bugzilla.redhat.com/show_bug.cgi?id=1078126 Using 'virsh attach-device --config' (or --persistent) to attach a file backed lun device will succeed; however, subsequent domain restarts will result in failure because the configuration of a file backed lun is not supported. Although allowing 'illegal configurations' is something that can be allowed, it may not be practical in this case. Generally, when attaching a device to a domain means the domain must be running. A way around this is using the --config (or --persistent) option. When an attach is done to a running domain, a temporary configuration is modified first followed by the live update. The live update will make a number of disk validity checks when building the qemu command to attach the disk. If any fail, then change is rejected. Rather than allow a potentially illegal combination, adjust the code in the configuration path to make the same checks as the running path will make with respect to disk validity checks. This way we avoid having the potential for some subsequent start/reboot to fail because an illegal combination was allowed. NB: The live checking remains since it is possible to just to --live configuration modification. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_command.c | 138 ++++++++++++++++++++++++++---------------------- src/qemu/qemu_command.h | 3 ++ src/qemu/qemu_driver.c | 2 + 3 files changed, 81 insertions(+), 62 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4e074e5..8e56151 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3234,6 +3234,81 @@ qemuGetDriveSourceString(virStorageSourcePtr src, } +int +qemuBuildCheckDisk(virDomainDiskDefPtr disk, + virQEMUCapsPtr qemuCaps) +{ + if (virDiskNameToIndex(disk->dst) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unsupported disk type '%s'"), disk->dst); + goto error; + } + + if (disk->wwn) { + if ((disk->bus != VIR_DOMAIN_DISK_BUS_IDE) && + (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only ide and scsi disk support wwn")); + goto error; + } + } + + if ((disk->vendor || disk->product) && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only scsi disk supports vendor and product")); + goto error; + } + + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + /* make sure that both the bus and the qemu binary support + * type='lun' (SG_IO). + */ + if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk device='lun' is not supported for bus='%s'"), + virDomainDiskQEMUBusTypeToString(disk->bus)); + goto error; + } + if (disk->src->type == VIR_STORAGE_TYPE_NETWORK) { + if (disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk device='lun' is not supported " + "for protocol='%s'"), + virStorageNetProtocolTypeToString(disk->src->protocol)); + goto error; + } + } else if (!virDomainDiskSourceIsBlockType(disk)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disk device='lun' is only valid for block " + "type disk source")); + goto error; + } + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SG_IO)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disk device='lun' is not supported by " + "this QEMU")); + goto error; + } + if (disk->wwn) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting wwn is not supported for lun device")); + goto error; + } + if (disk->vendor || disk->product) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product is not supported " + "for lun device")); + goto error; + } + } + return 0; + error: + return -1; +} + + char * qemuBuildDriveStr(virConnectPtr conn, virDomainDiskDefPtr disk, @@ -3620,71 +3695,10 @@ qemuBuildDriveDevStr(virDomainDefPtr def, { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *bus = virDomainDiskQEMUBusTypeToString(disk->bus); - int idx = virDiskNameToIndex(disk->dst); int controllerModel; - if (idx < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported disk type '%s'"), disk->dst); + if (qemuBuildCheckDisk(disk, qemuCaps) < 0) goto error; - } - - if (disk->wwn) { - if ((disk->bus != VIR_DOMAIN_DISK_BUS_IDE) && - (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only ide and scsi disk support wwn")); - goto error; - } - } - - if ((disk->vendor || disk->product) && - disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only scsi disk supports vendor and product")); - goto error; - } - - if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { - /* make sure that both the bus and the qemu binary support - * type='lun' (SG_IO). - */ - if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO && - disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk device='lun' is not supported for bus='%s'"), - bus); - goto error; - } - if (disk->src->type == VIR_STORAGE_TYPE_NETWORK) { - if (disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk device='lun' is not supported for protocol='%s'"), - virStorageNetProtocolTypeToString(disk->src->protocol)); - goto error; - } - } else if (!virDomainDiskSourceIsBlockType(disk)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disk device='lun' is only valid for block type disk source")); - goto error; - } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SG_IO)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disk device='lun' is not supported by this QEMU")); - goto error; - } - if (disk->wwn) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting wwn is not supported for lun device")); - goto error; - } - if (disk->vendor || disk->product) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting vendor or product is not supported " - "for lun device")); - goto error; - } - } switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index b71e964..00097f9 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -271,4 +271,7 @@ qemuParseKeywords(const char *str, int qemuGetDriveSourceString(virStorageSourcePtr src, virConnectPtr conn, char **source); + +int qemuBuildCheckDisk(virDomainDiskDefPtr disk, + virQEMUCapsPtr qemuCaps); #endif /* __QEMU_COMMAND_H__*/ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a3de784..5bc2785 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6744,6 +6744,8 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, _("target %s already exists"), disk->dst); return -1; } + if (qemuBuildCheckDisk(disk, qemuCaps) < 0) + return -1; if (virDomainDiskInsert(vmdef, disk)) return -1; /* vmdef has the pointer. Generic codes for vmdef will do all jobs */ -- 1.9.3

1 0

[libvirt] [libvirt-glib] [PATCH v6 1/3] libvirt-gobject-domain: Add _fetch_snapshots
by mail＠baedert.org 04 Aug '14

04 Aug '14

From: Timm Bäder <mail(a)baedert.org> This function can be used to fetch the snapshots of a domain (according to the given GVirDomainSnapshotListFlags) and save them in a domain-internal GHashTable. A function to access them from outside will be added in a later patch. --- libvirt-gobject/libvirt-gobject-domain.c | 85 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 37 ++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 2 + 3 files changed, 124 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index c6e30e5..708cb3b 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -38,6 +38,8 @@ struct _GVirDomainPrivate { virDomainPtr handle; gchar uuid[VIR_UUID_STRING_BUFLEN]; + GHashTable *snapshots; + GMutex *lock; }; G_DEFINE_TYPE(GVirDomain, gvir_domain, G_TYPE_OBJECT); @@ -121,6 +123,11 @@ static void gvir_domain_finalize(GObject *object) g_debug("Finalize GVirDomain=%p", domain); + if (priv->snapshots) { + g_hash_table_unref(priv->snapshots); + } + g_mutex_free(priv->lock); + virDomainFree(priv->handle); G_OBJECT_CLASS(gvir_domain_parent_class)->finalize(object); @@ -237,6 +244,7 @@ static void gvir_domain_init(GVirDomain *domain) g_debug("Init GVirDomain=%p", domain); domain->priv = GVIR_DOMAIN_GET_PRIVATE(domain); + domain->priv->lock = g_mutex_new(); } typedef struct virDomain GVirDomainHandle; @@ -1514,3 +1522,80 @@ gvir_domain_create_snapshot(GVirDomain *dom, g_free(custom_xml); return dom_snapshot; } + + + +/** + * gvir_domain_fetch_snapshots: + * @dom: The domain + * @list_flags: bitwise-OR of #GVirDomainSnapshotListFlags + * @cancellable: (allow-none)(transfer-none): cancellation object + * @error: (allow-none): Place-holder for error or NULL + * + * Returns: TRUE on success, FALSE otherwise. + */ +gboolean gvir_domain_fetch_snapshots(GVirDomain *dom, + guint list_flags, + GCancellable *cancellable, + GError **error) +{ + GVirDomainPrivate *priv; + virDomainSnapshotPtr *snapshots = NULL; + GVirDomainSnapshot *snap; + GHashTable *snap_table; + int n_snaps = 0; + int i; + gboolean ret = FALSE; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail((error == NULL) || (*error == NULL), FALSE); + + priv = dom->priv; + + snap_table = g_hash_table_new_full(g_str_hash, + g_str_equal, + NULL, + g_object_unref); + + + n_snaps = virDomainListAllSnapshots(priv->handle, &snapshots, list_flags); + + if (g_cancellable_set_error_if_cancelled(cancellable, error)) { + goto cleanup; + } + + if (n_snaps < 0) { + gvir_set_error(error, GVIR_DOMAIN_ERROR, 0, + "Unable to fetch snapshots of %s", + gvir_domain_get_name(dom)); + goto cleanup; + } + + for (i = 0; i < n_snaps; i ++) { + if (g_cancellable_set_error_if_cancelled(cancellable, error)) { + goto cleanup; + } + snap = GVIR_DOMAIN_SNAPSHOT(g_object_new(GVIR_TYPE_DOMAIN_SNAPSHOT, + "handle", snapshots[i], + NULL)); + g_hash_table_insert(snap_table, + (gpointer)gvir_domain_snapshot_get_name(snap), + snap); + } + + + g_mutex_lock(priv->lock); + if (priv->snapshots != NULL) + g_hash_table_unref(priv->snapshots); + priv->snapshots = snap_table; + snap_table = NULL; + g_mutex_unlock(priv->lock); + + ret = TRUE; + +cleanup: + free(snapshots); + if (snap_table != NULL) + g_hash_table_unref(snap_table); + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 38d3458..8c1a8e5 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -183,6 +183,39 @@ typedef enum { GVIR_DOMAIN_REBOOT_GUEST_AGENT = VIR_DOMAIN_REBOOT_GUEST_AGENT, } GVirDomainRebootFlags; +/** + * GVirDomainSnapshotListFlags: + * @GVIR_DOMAIN_SNAPSHOT_LIST_ALL: List all snapshots + * @GVIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS: List all descendants, not just + * children, when listing a snapshot. + * For historical reasons, groups do not use contiguous bits. + * @GVIR_DOMAIN_SNAPSHOT_LIST_ROOTS: Filter by snapshots with no parents, when listing a domain + * @GVIR_DOMAIN_SNAPSHOT_LIST_METADATA: Filter by snapshots which have metadata + * @GVIR_DOMAIN_SNAPSHOT_LIST_LEAVES: Filter by snapshots with no children + * @GVIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES: Filter by snapshots that have children + * @GVIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA: Filter by snapshots with no metadata + * @GVIR_DOMAIN_SNAPSHOT_LIST_INACTIVE: Filter by snapshots taken while guest was shut off + * @GVIR_DOMAIN_SNAPSHOT_LIST_ACTIVE: Filter by snapshots taken while guest was active, and with memory state + * @GVIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY: Filter by snapshots taken while guest was active, but without memory state + * @GVIR_DOMAIN_SNAPSHOT_LIST_INTERNAL: Filter by snapshots stored internal to disk images + * @GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL: Filter by snapshots that use files external to disk images + */ +typedef enum { + GVIR_DOMAIN_SNAPSHOT_LIST_ALL = 0, + GVIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS = VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS, + GVIR_DOMAIN_SNAPSHOT_LIST_ROOTS = VIR_DOMAIN_SNAPSHOT_LIST_ROOTS, + GVIR_DOMAIN_SNAPSHOT_LIST_METADATA = VIR_DOMAIN_SNAPSHOT_LIST_METADATA, + GVIR_DOMAIN_SNAPSHOT_LIST_LEAVES = VIR_DOMAIN_SNAPSHOT_LIST_LEAVES, + GVIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES = VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES, + GVIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA = VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA, + GVIR_DOMAIN_SNAPSHOT_LIST_INACTIVE = VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE, + GVIR_DOMAIN_SNAPSHOT_LIST_ACTIVE = VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE, + GVIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY = VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY, + GVIR_DOMAIN_SNAPSHOT_LIST_INTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL, + GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL +} GVirDomainSnapshotListFlags; + + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { @@ -330,6 +363,10 @@ gvir_domain_create_snapshot(GVirDomain *dom, guint flags, GError **err); +gboolean gvir_domain_fetch_snapshots(GVirDomain *dom, + guint list_flags, + GCancellable *cancellable, + GError **error); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index b781cc6..781310f 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -236,7 +236,9 @@ LIBVIRT_GOBJECT_0.1.5 { LIBVIRT_GOBJECT_0.1.9 { global: + gvir_domain_fetch_snapshots; gvir_domain_snapshot_delete; + gvir_domain_snapshot_list_flags_get_type; } LIBVIRT_GOBJECT_0.1.5; # .... define new API here using predicted next version number .... -- 2.0.3

2 3

[libvirt] [PATCH v2] storage: Refresh storage pool after upload
by John Ferlan 04 Aug '14

04 Aug '14

https://bugzilla.redhat.com/show_bug.cgi?id=1072653 Upon successful upload of a volume, the target volume and storage pool were not updated to reflect any changes as a result of the upload. Make use of the existing stream close callback mechanism to force a backend pool refresh to occur in a separate thread once the stream closes. The separate thread should avoid potential deadlocks if the refresh needed to wait on some event from the event loop which is used to perform the stream callback. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Update since v1 - as discussed in original posting, use virThreadCreate to generate a thread to handle the refresh callback: http://www.redhat.com/archives/libvir-list/2014-July/msg01395.html Avoid the Free callback function and have the thread do the memory free as long as thread creation was successful. Thus a couple of changes to function names were appropriate. Understood that this can wait for 1.2.8 - figured to get it ready to go NOTE: Still used pool refresh, since I found that without this patch applied a pool-dumpxml displayed the same allocation/available before and after the upload, so that data is not refreshed for each call as was my concern over using refreshVol vs. refreshPool # virsh pool-dumpxml default ... <allocation unit='bytes'>33852141568</allocation> <available unit='bytes'>110510419968</available> ... # virsh vol-upload test-qcow2-4g.img test.img default # virsh pool-dumpxml default ... <allocation unit='bytes'>33852141568</allocation> <available unit='bytes'>110510419968</available> ... # src/libvirt.c | 8 ++++ src/libvirt_private.syms | 1 + src/storage/storage_driver.c | 103 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 3 ++ 4 files changed, 115 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index 143d319..992e4f2 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -13960,6 +13960,14 @@ virStorageVolDownload(virStorageVolPtr vol, * detect any errors. The results will be unpredictable if * another active stream is writing to the storage volume. * + * When the data stream is closed whether the upload is successful + * or not the target storage pool will be refreshed to reflect pool + * and volume changes as a result of the upload. Depending on + * the target volume storage backend and the source stream type + * for a successful upload, the target volume may take on the + * characteristics from the source stream such as format type, + * capacity, and allocation. + * * Returns 0, or -1 upon error. */ int diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e792a44..08111d4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -825,6 +825,7 @@ virFDStreamCreateFile; virFDStreamOpen; virFDStreamOpenFile; virFDStreamOpenPTY; +virFDStreamSetInternalCloseCb; # libvirt_internal.h diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index efbe5ff..b023281 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -59,6 +59,12 @@ static virStorageDriverStatePtr driverState; static int storageStateCleanup(void); +typedef struct _virStorageVolStreamInfo virStorageVolStreamInfo; +typedef virStorageVolStreamInfo *virStorageVolStreamInfoPtr; +struct _virStorageVolStreamInfo { + char *pool_name; +}; + static void storageDriverLock(virStorageDriverStatePtr driver) { virMutexLock(&driver->lock); @@ -1956,6 +1962,78 @@ storageVolDownload(virStorageVolPtr obj, } +/** + * Frees opaque data. + * + * @opaque Data to be freed. + */ +static void +virStorageVolPoolRefreshDataFree(void *opaque) +{ + virStorageVolStreamInfoPtr cbdata = opaque; + + VIR_FREE(cbdata->pool_name); + VIR_FREE(cbdata); +} + +/** + * Thread to handle the pool refresh + * + * @st Pointer to stream being closed. + * @opaque Domain's device information structure. + */ +static void +virStorageVolPoolRefreshThread(void *opaque) +{ + + virStorageVolStreamInfoPtr cbdata = opaque; + virStoragePoolObjPtr pool = NULL; + virStorageBackendPtr backend; + + storageDriverLock(driverState); + if (!(pool = virStoragePoolObjFindByName(&driverState->pools, + cbdata->pool_name))) + goto cleanup; + + if (!(backend = virStorageBackendForType(pool->def->type))) + goto cleanup; + + virStoragePoolObjClearVols(pool); + if (backend->refreshPool(NULL, pool) < 0) + VIR_DEBUG("Failed to refresh storage pool"); + + cleanup: + if (pool) + virStoragePoolObjUnlock(pool); + storageDriverUnlock(driverState); + virStorageVolPoolRefreshDataFree(cbdata); +} + +/** + * Callback being called if a FDstream is closed. Will spin off a thread + * to perform a pool refresh. + * + * @st Pointer to stream being closed. + * @opaque Buffer to hold the pool name to be rereshed + */ +static void +virStorageVolFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, + void *opaque) +{ + virThread thread; + + if (virThreadCreate(&thread, false, virStorageVolPoolRefreshThread, + opaque) < 0) { + /* Not much else can be done */ + VIR_ERROR(_("Failed to create thread to handle pool refresh")); + goto error; + } + return; /* Thread will free opaque data */ + + error: + virStorageVolPoolRefreshDataFree(opaque); +} + static int storageVolUpload(virStorageVolPtr obj, virStreamPtr stream, @@ -1966,6 +2044,7 @@ storageVolUpload(virStorageVolPtr obj, virStorageBackendPtr backend; virStoragePoolObjPtr pool = NULL; virStorageVolDefPtr vol = NULL; + virStorageVolStreamInfoPtr cbdata = NULL; int ret = -1; virCheckFlags(0, -1); @@ -1996,11 +2075,35 @@ storageVolUpload(virStorageVolPtr obj, goto cleanup; } + /* If we have a refreshPool, use the callback routine in order to + * refresh the pool after the volume upload stream closes. This way + * we make sure the volume and pool data are refreshed without user + * interaction and we can just lookup the backend in the callback + * routine in order to call the refresh API. + */ + if (backend->refreshPool) { + if (VIR_ALLOC(cbdata) < 0 || + VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0) + goto cleanup; + } + ret = backend->uploadVol(obj->conn, pool, vol, stream, offset, length, flags); + /* Add cleanup callback - call after uploadVol since the stream + * is then fully set up + */ + if (cbdata) { + virFDStreamSetInternalCloseCb(stream, + virStorageVolFDStreamCloseCb, + cbdata, NULL); + cbdata = NULL; + } + cleanup: virStoragePoolObjUnlock(pool); + if (cbdata) + virStorageVolPoolRefreshDataFree(cbdata); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 849ae31..e377df9 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2981,6 +2981,9 @@ of the amount of data to be uploaded. A negative value is interpreted as an unsigned long long value to essentially include everything from the offset to the end of the volume. An error will occur if the I<local-file> is greater than the specified length. +See the description for the libvirt virStorageVolUpload API for details +regarding possible target volume and pool changes as a result of the +pool refresh when the upload is attempted. =item B<vol-download> [I<--pool> I<pool-or-uuid>] [I<--offset> I<bytes>] [I<--length> I<bytes>] I<vol-name-or-key-or-path> I<local-file> -- 1.9.3

2 2

[libvirt] [PATCH] Post-release version bump for new dev cycle
by Eric Blake 04 Aug '14

04 Aug '14

Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f37c716..9dd07d2 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.7], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.8], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.9.3

1 0

[libvirt] [PATCH] domtop: Remove unused variable
by Michal Privoznik 04 Aug '14

04 Aug '14

The variable 'k' in the print_cpu_usage function is not used anywhere and can fire a warning on some compilers. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/domtop/domtop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index 204fdc3..e50988e 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -199,7 +199,7 @@ print_cpu_usage(const char *dom_name, virTypedParameterPtr now_params, size_t now_nparams) { - size_t i, j, k; + size_t i, j; size_t nparams = now_nparams; bool delim = false; -- 1.8.5.5

2 1

[libvirt] [PATCH] domtop: Turn parse_argv into void
by Michal Privoznik 04 Aug '14

04 Aug '14

Currently, the function follows the usual pattern used in our code: int ret = -1; ... ret = 0; cleanup: return ret; However, the function always call exit() on error, so the cleanup label is never jumped onto. Therefore, it doesn't make any sense to have the parse_argv function return an integer value, if it effectively can return only value of zero. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/domtop/domtop.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index af5da46..204fdc3 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -94,13 +94,12 @@ print_usage(const char *progname) unified_progname); } -static int +static void parse_argv(int argc, char *argv[], const char **uri, const char **dom_name, unsigned int *milliseconds) { - int ret = -1; int arg; unsigned long val; char *p; @@ -155,10 +154,6 @@ parse_argv(int argc, char *argv[], if (argc > optind) *dom_name = argv[optind]; - - ret = 0; - cleanup: - return ret; } static int @@ -368,8 +363,7 @@ main(int argc, char *argv[]) unsigned int milliseconds = 500; /* Sleep this long between two API calls */ const int connect_flags = 0; /* No connect flags for now */ - if (parse_argv(argc, argv, &uri, &dom_name, &milliseconds) < 0) - goto cleanup; + parse_argv(argc, argv, &uri, &dom_name, &milliseconds); DEBUG("Proceeding with uri=%s dom_name=%s milliseconds=%u", uri, dom_name, milliseconds); -- 1.8.5.5

2 1

[libvirt] Entering freeze for libvirt-1.2.7
by Daniel Veillard 03 Aug '14

03 Aug '14

It's that time for the month ! As planned I have tagged a first release candidate in git and sent tarbal and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work for my limited testing but please give it a try, and let's fix the reported bugs ! I will try to put a release candidate 2 snapshot out on Wednesday and make the release on Friday, 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/

2 2

[libvirt] Release of libvirt-1.2.7
by Daniel Veillard 03 Aug '14

03 Aug '14

As planned it's out, tagged in git, source tarball and rpms are available as usual from: ftp://libvirt.org/libvirt/ This is a rather large release for the month of July, close to 300 commits, mostly around incremental improvements and bug fixes. There is a new API however: Features: - Introduce virConnectGetDomainCapabilities (Michal Privoznik) Documentation: - bhyve: document recent changes (Roman Bogorodskiy) - fix an incorrect example for memoryBacking (Chen Hanxiao) - libvirt-guests: fix some typos in a comment (Martin Kletzander) - libvirt: Fix 'quest' typo in comment (Li Yang) - Point to list of valid pool target volume formats (John Ferlan) - Documented VIR_DOMAIN_FEATURE_CAPABILITIES use of virDomainCapabilitesPolicy (Cédric Bosdonnat) - Explicitly specify how to override spice channel mode (Peter Krempa) - add domain to address of hostdev pci (Hu Tao) - domain: Clarify that disk type 'lun' works with iSCSI too (Peter Krempa) - esx: Fix a comment about VSphere versions (Geoff Hickey) - virsh: Document bandwidth maximum more clearly (John Ferlan) - mention more about older capability feature bits (Eric Blake) - Be more specific about semantics of _REUSE_EXT flag (Peter Krempa) - Document that snapshot name of block-backed disk isn't autogenerated (Peter Krempa) - virsh: document the possibility of accepting integers for numatune mode (Martin Kletzander) - Document the need to free vir*Ptr objects per-function (Ján Tomko) - Document the need to free vir*Ptr objects (Ján Tomko) - LXC: fix an improper comments for lxcDomainDestroyFlags (Chen Hanxiao) - formatdomain.html fixes (Michele Paolino) - Fix broken link in the HACKING page (Michele Paolino) - formatdomain: Fix issues found describing auth (John Ferlan) - LXC: update comments of lxcDomainCreateXMLWithFiles() and lxcDomainCreateXML() (Yue wenyuan) Portability: - build: fix build on cygwin (Eric Blake) - domtop: Fix build on mingw (Michal Privoznik) - build: fix build without numactl (Eric Blake) - Fix build on non-Linux platforms (Roman Bogorodskiy) - check for cfg->spiceTLS earlier in qemuProcessSPICEAllocatePorts (Ján Tomko) - build: package .pc files for mingw64 (Eric Blake) - build: fix gnulib build for mingw (Eric Blake) - util: cgroup: Fix build on non-cgroup platforms (Peter Krempa) - Don't require iptables-ipv6 on >= F17 and RHEL >= 7 (Ján Tomko) - tools/wireshark: fix rpm build (Pavel Hrdina) - tests: Avoid double linking some libraries (Michal Privoznik) Bug fixes: - network: always set disable_ipv6, even when it should be 0 (Laine Stump) - Fix a crash when cloning a volume with no backing store (Ján Tomko) - qemu: error out if PCI passthrough type is not supported (Hu Tao) - storage: create: Create files with correct mode (Peter Krempa) - nodedev: fix a uninitialized variable build failure (Chen Hanxiao) - nodedev: fix pci express memory leak (Eric Blake) - qemu: sound: Fix uninitialized model string (Peter Krempa) - qemu: Fix starting of VMs with empty CDROM drives (Peter Krempa) - util: virTimeFieldsThenRaw never returns negative (James) - qemu: cgroup: Don't use NULL path on default backed RNGs (Peter Krempa) - qemuConnectGetDomainCapabilities: Report error on unknown arch (Michal Privoznik) - remove range checking for blkiotune weight (Martin Kletzander) - qemuConnectGetDomainCapabilities: Use wiser defaults (Michal Privoznik) - leaseshelper: avoid mem leak after storing lease entries (Nehal J Wani) - conf: avoid memory leaks while parsing seclabel (Eric Blake) - nwfilter: plug memory leak with firewall (Eric Blake) - metadata: track title edits across libvirtd restart (Eric Blake) - Fix build after 47e5b5ae3262f140955abd57bbb13337c65a3497 (Peter Krempa) - qemu: snapshot: Forbid taking/reverting snapshots in PMSUSPENDED state (Peter Krempa) - qemu: snapshot: Forbid taking snapshot in invalid state (Peter Krempa) - schema: pool: netfs: Don't enforce slash in glusterfs pool source (Peter Krempa) - examples: domtop: Avoid leaking memory (Peter Krempa) - examples: domtop: Fix uninitialized variable use (Peter Krempa) - qemu: snapshot: Forbid snapshots of iSCSI passthrough devices (Peter Krempa) - storage: Disallow vol_wipe for sparse logical volumes (John Ferlan) - virsh vol-upload/download disallow negative offset (John Ferlan) - storage: Split out volume wiping as separate backend function (Peter Krempa) - esx: Fix a bug in the XML code for storage pools (Geoff Hickey) - blockjob: wait for pivot to complete (Eric Blake) - Fix const correctness (Michal Privoznik) - Fix assignment of comparison against zero (Ján Tomko) - Fix error on fs pool build failure (Ján Tomko) - spec: fix invalid syntax (Eric Blake) - libxl: fix return value error Attach|DetachDeviceFlags (Chunyan Liu) - qemu: blockcopy: Initialize correct source structure (Peter Krempa) - GetBlockInfo: Use the correct path to qemuOpenFile (John Ferlan) - virseclabel: Resolve Coverity FORWARD_NULL issue (John Ferlan) - conf: Always format seclabel's model (Michal Privoznik) - conf: Fix possible NULL dereference in virStorageVolTargetDefFormat (Matthias Bolte) - conf: Don't allow multiple seclabels for same model (Michal Privoznik) - qemu: don't error out when cgroups don't exist (Martin Kletzander) - util: storage: Fix build after 25924dec0f9329d429aadae14e273602307e2214 (Peter Krempa) - qemu: fix domxml-to-native failing when spice_tls is not enabled (Jincheng Miao) - virEventPollDispatchHandles: Honour array boundaries (Michal Privoznik) - Allow updating names in DHCP hosts by matching IPs. (Ján Tomko) - Actually fix the spec file (Ján Tomko) - libxl: fix crash in migrate confirm for transient domains (Jim Fehlig) - libxl: acquire job though begin phase only (Jim Fehlig) - libxl: remove domain when migration prepare fails (Jim Fehlig) - qemu: raise an eror when using aio=native without cache=none (Giuseppe Scrivano) - Do not allow changing the UUID of a nwfilter (Hu Jianwei) - LXC: Allow setting max mem lower than current mem (Ján Tomko) - virsh: domain: Use inactive XML when unplugging interface with --config (Peter Krempa) - Free the return value of virFileFindResource (Ján Tomko) - qemu_domain: fix startup policy for disks (Pavel Hrdina) - Fix segfault when starting a domain with no cpu definition (Ján Tomko) - qemu: raise an error when trying to use readonly ide disks (Giuseppe Scrivano) Improvements: - blockcommit: turn on active commit (Eric Blake) - blockcommit: track job type in xml (Eric Blake) - Domain config: write <features/> if some capabilities are set. (Cédric Bosdonnat) - blockjob: properly track blockcopy xml changes on disk (Eric Blake) - blockcopy: add more XML for state tracking (Eric Blake) - qemu: Implement ./hugepages/page/[@size, @unit, @nodeset] (Michal Privoznik) - domain: Introduce ./hugepages/page/[@size, @unit, @nodeset] (Michal Privoznik) - virbitmap: Introduce virBitmapOverlaps (Michal Privoznik) - qemu: Utilize virFileFindHugeTLBFS (Michal Privoznik) - Introduce virFileFindHugeTLBFS (Michal Privoznik) - schema: bhyve and nmdm updates (Roman Bogorodskiy) - nodedev: move pci express types to virpci.h (Eric Blake) - nodedev: let compiler help us on switches (Eric Blake) - qemu: sound: Handle all possible sound cards in switch statement (Peter Krempa) - conf: RNG: Always fill in default random source path for default backend (Peter Krempa) - spec: arm and aarch64 have kvm support with F20+ (Cole Robinson) - spec: Use power64 macro (Cole Robinson) - test: qemu: Add tests for multiple virtio-rng devices (Peter Krempa) - virtio-rng: allow multiple RNG devices (Peter Krempa) - bhyve: cdrom support (Roman Bogorodskiy) - virsh: add option for selecting domdisplay type (Martin Kletzander) - virsh: add error message when no graphical display is found (Martin Kletzander) - hostdev: Introduce virDomainHostdevSubsysSCSIiSCSI (John Ferlan) - Add virConnectPtr for qemuBuildSCSIHostdevDrvStr (John Ferlan) - hostdev: Introduce virDomainHostdevSubsysSCSIHost (John Ferlan) - hostdev: Introduce virDomainHostdevSubsysSCSI (John Ferlan) - hostdev: Introduce virDomainHostdevSubsysPCI (John Ferlan) - hostdev: Introduce virDomainHostdevSubsysUSB (John Ferlan) - qemu: snapshot: Use storage driver to pre-create snapshot file (Peter Krempa) - storage: Implement virStorageFileCreate for local and gluster files (Peter Krempa) - qemu: Implement DAC driver chown callback to co-operate with storage drv (Peter Krempa) - security: DAC: Plumb usage of chown callback (Peter Krempa) - security: DAC: Introduce callback to perform image chown (Peter Krempa) - security: DAC: Remove superfluous link resolution (Peter Krempa) - storage: Add witness for checking storage volume use in security driver (Peter Krempa) - storage: Implement storage driver helper to chown disk images (Peter Krempa) - numatune: finish the split from domain_conf and remove all dependencies (Martin Kletzander) - maint: simplify some syntax check exemptions (Eric Blake) - spec: Enable sanlock on qemu_kvm_arches for RHEL (Jiri Denemark) - Added myself in AUTHORS.in (Cédric Bosdonnat) - Introduce virTristateSwitch enum (Ján Tomko) - Introduce virTristateBool enum type (Ján Tomko) - LXC: show used memory as 0 when domain is not active (Chen Hanxiao) - lxc domain from xml: convert lxc.cap.drop (Cédric Bosdonnat) - lxc: allow to keep or drop capabilities (Cédric Bosdonnat) - LXC: create a bind mount for sysfs when enable userns but disable netns (Chen Hanxiao) - storage: logical: drop useless if (Roman Bogorodskiy) - getAdapterName: Lookup stable scsi_host (John Ferlan) - scsi_host: Introduce virFindSCSIHostByPCI (John Ferlan) - Add unique_id to nodedev output (John Ferlan) - virutil: Introduce virReadSCSIUniqueId (John Ferlan) - scsi_backend: Use existing LINUX_SYSFS_SCSI_HOST_PREFIX definition (John Ferlan) - storage: Introduce parentaddr into virStoragePoolSourceAdapter (Osier Yang) - virStoragePoolSourceAdapter: Refine the SCSI_HOST adapter name (Osier Yang) - getAdapterName: check for SCSI_HOST (John Ferlan) - node_device: HAL: Ignore return value of virStrToLong_ui (Peter Krempa) - util: Check return value from virStrToLong* functions (Peter Krempa) - qemu: snapshot: Reject revertion from clearly bad states (Peter Krempa) - qemu: snapshot: Convert if-else switch to switch statement (Peter Krempa) - bhyve: reconnect to domains after libvirtd restart (Roman Bogorodskiy) - examples: Introduce domtop (Michal Privoznik) - Kill last strto{l,ll,d} scouts (Michal Privoznik) - lxc conf2xml: convert lxc.network.name for veth networks (Cédric Bosdonnat) - lxc network configuration allows setting target container NIC name (Cédric Bosdonnat) - spec: Consolidate with_qemu* definitions (Jiri Denemark) - storage: Convert 'building' into a bool (John Ferlan) - Fix build by dropping redefined typedefs (Roman Bogorodskiy) - test: metadata: Improve test coverage (Peter Krempa) - Log an error when we fail to set the COW attribute (Ján Tomko) - storage: wipe: Move helper code into storage backend (Peter Krempa) - schema: put interleave at correct level (Eric Blake) - schema: add interleave inside numatune (Martin Kletzander) - qemu: leave restricting cpuset.mems after initialization (Martin Kletzander) - qemu: split out cpuset.mems setting (Martin Kletzander) - qemu: pass numa node binding preferences to qemu (Martin Kletzander) - qemu: enable disjoint numa cpu ranges (Martin Kletzander) - qemu: newer -numa parameter capability probing (Martin Kletzander) - qemu: memory-backend-ram capability probing (Martin Kletzander) - qemu: allow qmp probing for cmdline options without params (Martin Kletzander) - numatune: add support for per-node memory bindings in private APIs (Martin Kletzander) - conf, schema: add support for memnode elements (Martin Kletzander) - numatune: Encapsulate numatune configuration in order to unify results (Martin Kletzander) - numatune: unify numatune struct and enum names (Martin Kletzander) - numatune: create new module for numatune (Martin Kletzander) - conf, schema: add 'id' field for cells (Martin Kletzander) - conf: purely a code movement (Martin Kletzander) - qemu: remove useless error check (Martin Kletzander) - qemu: purely a code movement (Martin Kletzander) - support for QEMU vhost-user (Michele Paolino) - util: forbid freeing const pointers (Eric Blake) - add nocow test case (Chunyan Liu) - storagevol: add nocow to vol xml (Chunyan Liu) - storage: fs: Don't fail volume update if backing store isn't accessible (Peter Krempa) - storage: fs: Properly parse backing store info (Peter Krempa) - storage: fs: Process backing store data in virStorageBackendProbeTarget (Peter Krempa) - storage: backend: fs: Touch up coding style (Peter Krempa) - storage: Track backing store of a volume in the target struct (Peter Krempa) - storage: backend: Fix formatting of function arguments (Peter Krempa) - Rework lxc apparmor profile (Cédric Bosdonnat) - Implement interface stats for BSD (Roman Bogorodskiy) - util: virstatslinux: make more generic (Roman Bogorodskiy) - libxl: support hotplug of <interface> (Chunyan Liu) - libxl: add HOSTDEV type in libxlDomainDetachDeviceConfig (Chunyan Liu) - spec: Update polkit dependencies for CVE-2013-4311 (Jiri Denemark) - capabilities: use bool instead of int (Eric Blake) - openvswitch: Delete port if it exists while adding a new one (Chunhe Li) - virSecurityLabelDefParseXML: Rework (Michal Privoznik) - aa-helper: adjust previous patch (Cédric Bosdonnat) - Don't output libvirt-UUID.files for LXC apparmor profiles (Cédric Bosdonnat) - libxl: Correct cast to virDomainDiskDiscard enum. (Ian Campbell) - LXC: add support for --config in setmem command (Chen Hanxiao) - virSecurityDeviceLabelDef: substitute 'norelabel' with 'relabel' (Michal Privoznik) - virSecurityLabelDef: substitute 'norelabel' with 'relabel' (Michal Privoznik) - storage: Split out volume upload/download as separate backend function (Peter Krempa) - libxl: add discard support to libxl_device_disk (Olaf Hering) - conf: Improve metadata type verification (Peter Krempa) - qemu: snapshot: Refactor image labelling of new snapshot files (Peter Krempa) - qemu: Refactor qemuDomainPrepareDiskChainElement (Peter Krempa) - qemu: snapshot: Improve approach to deal with snapshot metadata (Peter Krempa) - qemu: block: Properly track disk source while pivoting to new image (Peter Krempa) - qemu: blockcopy: Use the mirror disk source to label the files (Peter Krempa) - util: storage: Return complete parent info from virStorageFileChainLookup (Peter Krempa) - util: storage: Make virStorageFileChainLookup more network storage aware (Peter Krempa) - security: AppArmor: Implement per-image seclabel set (Peter Krempa) - security: AppArmor: Implement per-image seclabel restore (Peter Krempa) - security: DAC: Implement per-image seclabel set (Peter Krempa) - security: DAC: Implement per-image seclabel restore (Peter Krempa) - security: selinux: Implement per-image seclabel set (Peter Krempa) - security: selinux: Implement per-image seclabel restore (Peter Krempa) - security: Introduce APIs to label single images (Peter Krempa) - locking: Add APIs to lock individual image files (Peter Krempa) - qemu: cgroup: Setup only the top level disk image for read-write access (Peter Krempa) - qemu: cgroup: Add functions to set cgroup image stuff on individual imgs (Peter Krempa) - util: XML: Avoid forward function declaration (Peter Krempa) - libxl: rename goto label (Jim Fehlig) - maint: update to latest gnulib (Eric Blake) - properly indent virSecurityLabelDefsParseXML() parameters (Martin Kletzander) - Fix the indentation in libvirt.spec.in (Ján Tomko) - util: cgroup: Add helper to convert device mode to string (Peter Krempa) - util: storage: Copy parent's disk metadata to backing chain elements (Peter Krempa) - util: storage: Add function to transfer config parts to new chain element (Peter Krempa) - util: storagefile: Add deep copy for struct virStorageSource (Peter Krempa) - storage: Move readonly and shared flags to disk source from disk def (Peter Krempa) - conf: Don't output seclabels for backingStore elements (Peter Krempa) - storage: file: Tolerate NULL src when uninitializing the backend (Peter Krempa) - qemu: Add helper to initialize storage file backend with correct uid/gid (Peter Krempa) - qemu: Don't propagate whole disk definition into qemuDomainGetImageIds (Peter Krempa) - qemu: Add support for networked disks for block pull/block rebase (Peter Krempa) - qemu: Add support for networked disks for block commit (Peter Krempa) - lib: Introduce flag VIR_DOMAIN_BLOCK_REBASE_RELATIVE (Peter Krempa) - lib: Introduce flag VIR_DOMAIN_BLOCK_COMMIT_RELATIVE (Peter Krempa) - qemu: refactor qemuDomainGetBlockInfo to work with remote storage (Peter Krempa) - storage: gluster: Optimize header reader functions (Peter Krempa) - util: storage: Allow specifying format for virStorageFileGetMetadataFromBuf (Peter Krempa) - util: storage: Inline use of virStorageFileGetMetadataFromFDInternal (Peter Krempa) - audit: Audit smartcard devices (Peter Krempa) - audit: Add auditing for serial/parallel/channel/console character devs (Peter Krempa) - virt-lxc-convert: make free return values in bytes (Cédric Bosdonnat) - qemu: dump: Report better error when dumping VM with passthrough devices (Peter Krempa) - LXC: remove duplicate controller check code (Chen Hanxiao) - wireshark: Honor API change coming with 1.12 release (Michal Privoznik) - wireshark: Include more of libvirt internals (Michal Privoznik) - qemu: monitor: Add support for backing name specification for block-stream (Peter Krempa) - qemu: monitor: Add argument for specifying backing name for block commit (Peter Krempa) - qemu: caps: Add capability for change-backing-file command (Peter Krempa) - audit: disk: Refactor disk auditing to avoid auditing remote storage (Peter Krempa) - conf: audit: Split out common steps to audit domain devices (Peter Krempa) - conf: audit: rng: Reorder new and old RNG device definitions (Peter Krempa) - util: storage: Add helper to determine whether storage is local (Peter Krempa) - Utilize virDomainDiskAuth for storage pools (John Ferlan) - Utilize virDomainDiskAuth for domain disk (John Ferlan) - qemuargv2xmltest: Resurrect RBD and iSCSI auth (John Ferlan) - virstorage: Introduce virStorageAuthDef (John Ferlan) - blockjob: turn on qemu capability bit for active commit (Eric Blake) - blockjob: allow omitted arguments to QMP block-commit (Eric Blake) - qemu: Implement virConnectGetDomainCapabilities (Michal Privoznik) - qemu_capabilities: Introduce virQEMUCapsGetDefaultMachine (Michal Privoznik) - qemu_capabilities: Introduce virQEMUCapsIsMachineSupported (Michal Privoznik) - qemu_capabilities: Introduce virQEMUCapsCacheLookupByArch (Michal Privoznik) - tests: Move qemu caps XML parsing into shared unit (Michal Privoznik) - virsh: expose virConnectGetDomainCapabilities (Michal Privoznik) - Introduce domain_capabilities (Michal Privoznik) - Remove double OOM error reporting (Ján Tomko) - Remove double OOM error reporting from JSON monitor (Ján Tomko) - Add OOM error reporting to a few fucntions (Ján Tomko) - Set errno on OOM in lxcProcReadMeminfo (Ján Tomko) - Use virBufferCheckError everywhere we report OOM error (Ján Tomko) - Report errors in virCapabilitiesFormatXML (Ján Tomko) - Introduce virBufferCheckError (Ján Tomko) - Use virStringReplace instead of openvz_replace (Ján Tomko) - Remove useless condition in networkRadvdConfContents (Ján Tomko) - usb: Remove redundant comment (Ján Tomko) - More indentation fixes (Ján Tomko) - Fix indentation in bridge driver (Ján Tomko) - virsh: Allow attach-disk to specify disk target bus (Yanbing Du) - qemu: Add cmd_per_lun, max_sectors to virtio-scsi (Mike Perez) - Add invariant TSC cpu flag (Ján Tomko) - util: unify extra asterisk in viralloc.h (Martin Kletzander) Cleanups: - tests: Remove stale scsihostdata dir (Michal Privoznik) - xenapiConnectGetCapabilities: Remove unused 'cleanup' label (Michal Privoznik) Thanks everybody for the help with this release, be it with ideas, bug reports, patch and reviews or translations ! 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] [PATCH] build: fix build on cygwin
by Eric Blake 03 Aug '14

03 Aug '14

Cygwin has getifaddrs(), but not AF_LINK, leading to: util/virstats.c: In function 'virNetInterfaceStats': util/virstats.c:138:41: error: 'AF_LINK' undeclared (first use in this function) if (ifa->ifa_addr->sa_family != AF_LINK) ... * src/util/virstats.c (virNetInterfaceStats): Only use getifaddrs if AF_LINK is present. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virstats.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virstats.c b/src/util/virstats.c index 910803f..b10fd85 100644 --- a/src/util/virstats.c +++ b/src/util/virstats.c @@ -1,7 +1,7 @@ /* * virstats.c: Block and network stats. * - * Copyright (C) 2007-2010 Red Hat, Inc. + * Copyright (C) 2007-2010, 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,7 +29,7 @@ #include <unistd.h> #include <regex.h> -#ifdef HAVE_GETIFADDRS +#if defined(HAVE_GETIFADDRS) && defined(AF_LINK) # include <net/if.h> # include <ifaddrs.h> #endif @@ -119,7 +119,7 @@ virNetInterfaceStats(const char *path, _("/proc/net/dev: Interface not found")); return -1; } -#elif defined(HAVE_GETIFADDRS) +#elif defined(HAVE_GETIFADDRS) && defined(AF_LINK) int virNetInterfaceStats(const char *path, struct _virDomainInterfaceStats *stats) -- 1.9.3

1 0

[libvirt] [PATCH] network: always set disable_ipv6, even when it should be 0
by Laine Stump 03 Aug '14

03 Aug '14

libvirt previously only touched an interface's disable_ipv6 setting in sysfs if it needed to be set to 1, assuming that 0 is the default. Apparently that isn't always the case though (kernel 3.15.7-1 in Arch Linux reportedly defaults a new interface's disable_ipv6 setting to 1) so this patch explicitly sets it to 0 or 1 as appropriate. --- src/network/bridge_driver.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6ccc6e2..965fdec 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1824,33 +1824,34 @@ networkSetIPv6Sysctls(virNetworkObjPtr network) { char *field = NULL; int ret = -1; + bool enableIPv6 = !!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0); - if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) { - /* Only set disable_ipv6 if there are no ipv6 addresses defined for - * the network. - */ - if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", - network->def->bridge) < 0) - goto cleanup; + /* set disable_ipv6 if there are no ipv6 addresses defined for the + * network. But also unset it if there *are* ipv6 addresses, as we + * can't be sure of its default value. + */ + if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", + network->def->bridge) < 0) + goto cleanup; - if (access(field, W_OK) < 0 && errno == ENOENT) { + if (access(field, W_OK) < 0 && errno == ENOENT) { + if (!enableIPv6) VIR_DEBUG("ipv6 appears to already be disabled on %s", network->def->bridge); - ret = 0; - goto cleanup; - } + ret = 0; + goto cleanup; + } - if (virFileWriteStr(field, "1", 0) < 0) { - virReportSystemError(errno, - _("cannot write to %s to disable IPv6 on bridge %s"), - field, network->def->bridge); - goto cleanup; - } - VIR_FREE(field); + if (virFileWriteStr(field, enableIPv6 ? "0" : "1", 0) < 0) { + virReportSystemError(errno, + _("cannot write to %s to enable/disable IPv6 " + "on bridge %s"), field, network->def->bridge); + goto cleanup; } + VIR_FREE(field); - /* The rest of the ipv6 sysctl tunables should always be set, - * whether or not we're using ipv6 on this bridge. + /* The rest of the ipv6 sysctl tunables should always be set the + * same, whether or not we're using ipv6 on this bridge. */ /* Prevent guests from hijacking the host network by sending out -- 1.9.3

2 2

[libvirt] How to reboot domain(virtual machine) after shutdown it through php-libvirt
by Subhu G 02 Aug '14

02 Aug '14

How to reboot domain(virtual machine) after shutdown it through php-libvirt: Hi, Am new to php livbvirt. and i successfully listed the all domains in server. and get resource of particular domain and call the shutdown function. $res = libvirt_domain_lookup_by_name($conn, $name); $stop = libvirt_domain_shutdown($res); Now shutdowned domain is not display in domain list. Now the problem is how to reboot/restart that domain again? libvirt having function for reboot, that is, libvirt_domain_create($res); My doubt is what is argument here, how to get that shutdowned domain resources. Any one kindly help me.

2 1

[libvirt] [PATCH] qemu: fix comment in qemu.conf
by Martin Kletzander 01 Aug '14

01 Aug '14

There are multiple mount points after commit 725a211f, but one comment wasn't changed to use plurals. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index a079b93..7bbbe09 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -339,8 +339,8 @@ # The size of huge page served by specific mount point is determined by # libvirt at the daemon startup. # -# NB, within this mount point, guests will create memory backing files -# in a location of $MOUNTPOINT/libvirt/qemu +# NB, within these mount points, guests will create memory backing +# files in a location of $MOUNTPOINT/libvirt/qemu # #hugetlbfs_mount = "/dev/hugepages" -- 2.0.2

2 1

[libvirt] [PATCH] Fix a crash when cloning a volume with no backing store
by Ján Tomko 01 Aug '14

01 Aug '14

Introduced by commit 15213d1, not yet released. --- src/storage/storage_backend.c | 2 +- tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv | 2 ++ tests/storagevolxml2argvtest.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 27b02cb..5cada39 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -887,7 +887,7 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, * backing store, not really sure what use it serves though, and it * may cause issues with lvm. Untested essentially. */ - if (inputvol && + if (inputvol && inputvol->target.backingStore && STRNEQ_NULLABLE(inputvol->target.backingStore->path, vol->target.backingStore->path)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv b/tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv new file mode 100644 index 0000000..fd1f4c0 --- /dev/null +++ b/tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv @@ -0,0 +1,2 @@ +qemu-img convert -f raw -O qcow2 -o encryption=on \ +/var/lib/libvirt/images/sparse.img /var/lib/libvirt/images/OtherDemo.img diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 2a45f6f..f9d2d2d 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -237,6 +237,9 @@ mymain(void) "qcow2-nobacking-convert-prealloc", flags, FMT_OPTIONS); DO_TEST_FAIL("pool-dir", "vol-qcow2", "pool-dir", "vol-file", + "qcow2-convert-nobacking", 0, FMT_OPTIONS); + DO_TEST_FAIL("pool-dir", "vol-qcow2", + "pool-dir", "vol-file", "qcow2-convert-prealloc", flags, FMT_OPTIONS); DO_TEST("pool-dir", "vol-qcow2", NULL, NULL, -- 1.8.5.5

2 2

[libvirt] [Query] In search of 'lost' fc_host adapters ?
by Prerna Saxena 01 Aug '14

01 Aug '14

Hi, I recently found that libvirt failed to display Fiber Channel adapters on systems with FC cards.This occured both on x86 as well as powerpc, as follows: virsh # nodedev-list --cap fc_host virsh # The system had legitimate fc_hosts : [root@localhost ~]# ls /sys/class/fc_host/ host1 host2 host3 host4 [root@localhost ~]# Debugging further, I found that libvirt has correctly identified the fiber channel host adapters. This could be independently verified by checking capabilities for individual host adapters. As an example, [root@localhost ~]# virsh nodedev-dumpxml scsi_host1 <device> <name>scsi_host1</name> <path>/sys/devices/pci0000:00/0000:00:00.0/0000:01:00.0/host1</path> <parent>pci_0000_01_00_0</parent> <capability type='scsi_host'> <host>1</host> <capability type='fc_host'> ===> Fiber channel host. <wwnn>20000120fa2cf086</wwnn> <wwpn>10000090fa2cf086</wwpn> <fabric_wwn>1000000533bedc10</fabric_wwn> </capability> <capability type='vport_ops'> <max_vports>255</max_vports> <vports>0</vports> </capability> </capability> </device> However, a virsh query for available fc_host adapters seemed to fail. I found this was happening because the callbacks pertaining to NodeDevice for the virsh connection pointer were those of "Remote" driver, in place of the "Udev" Node device driver. The remote driver callback : static int remoteConnectListAllNodeDevices(virConnectPtr conn, virNodeDevicePtr **devices, unsigned int flags) This didnt seem to process fiber channel host flag, and so my query returned a blank list. For the problem at hand , it is easy to fix the remote driver to process fc_hosts. But this would unnecessarily duplicate code between udev & remote drivers. I need some pointers on how callbacks get chosen by libvirt. The logs show that: 2014-07-31 10:45:43.226+0000: 22913: debug : virRegisterNodeDeviceDriver:619 : registering Test as device driver 0 ... 2014-07-31 10:45:43.226+0000: 22913: debug : virRegisterNodeDeviceDriver:619 : registering ESX as device driver 1 ... 2014-07-31 10:45:43.226+0000: 22913: debug : virRegisterNodeDeviceDriver:619 : registering remote as device driver 2 ... 2014-07-31 10:45:43.228+0000: 22913: debug : virRegisterNodeDeviceDriver:619 : registering udevNodeDeviceDriver as device driver 3 How does libvirt connection register all callbacks for the remote driver, given choice of 4 drivers --test, ESX, remote or Udev ? Is there a way we can set a preference for the udev driver to be used first -- such that the remote can just be a sane "default" if nothing else is available?? Looking forward to suggestions on how I can fix this ? BTW, I tried disabling the remote using configure script, but that meant scsi driver (and a few others) got disabled too. Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

1 0

[libvirt] [PATCH 0/9] LXC network configuration support
by Cédric Bosdonnat 01 Aug '14

01 Aug '14

Hi all, This patch series aims at filling one of the remaining gaps between lxc and our lxc driver. It opens up the possibilities to setup IP addresses on network devices, adds the possibility to add them default gateways, and uses them all in the libvirt driver. The LXC conf2xml conversion has also been updated to help migrating the remaining untouched lxc.network.ipv[46]* properties. The first patch in the series has almost nothing to do with the rest: it just adds some forgotten VIR_FREE from one of my previous patch. -- Cedric Cédric Bosdonnat (9): Domain conf: allow more than one IP address for net devices LXC: set IP addresses to veth devices in the container lxc conf2xml: convert IP addresses Allow network capabilities hostdev to configure IP addresses lxc conf2xml: convert ip addresses for hostdev NICs Domain network devices can now have a <gateway> element lxc conf2xml: convert lxc.network.ipv[46].gateway LXC: use the new net devices gateway definition LXC: honour network devices link state docs/formatdomain.html.in | 39 ++++ docs/schemas/domaincommon.rng | 55 +++++- src/conf/domain_conf.c | 211 +++++++++++++++++++-- src/conf/domain_conf.h | 22 ++- src/libvirt_private.syms | 2 + src/lxc/lxc_container.c | 66 ++++++- src/lxc/lxc_native.c | 173 ++++++++++++----- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 6 +- src/qemu/qemu_driver.c | 25 ++- src/qemu/qemu_hotplug.c | 6 +- src/uml/uml_conf.c | 2 +- src/vbox/vbox_tmpl.c | 3 +- src/xenxs/xen_sxpr.c | 12 +- src/xenxs/xen_xm.c | 12 +- .../lxcconf2xmldata/lxcconf2xml-physnetwork.config | 4 + tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 3 + tests/lxcconf2xmldata/lxcconf2xml-simple.config | 4 + tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 3 + tests/lxcxml2xmldata/lxc-hostdev.xml | 3 + tests/lxcxml2xmldata/lxc-idmap.xml | 3 + 21 files changed, 548 insertions(+), 108 deletions(-) -- 1.8.4.5

3 11

[libvirt] CPU model API (v3)
by Zeeshan Ali (Khattak) 01 Aug '14

01 Aug '14

v3: Two classes for CPU model: * CapabilitiesCpuModel * DomainCpuModel that derives from CapabilitiesCpuModel.

2 11

[libvirt] [PATCH] blockcopy: check dst = identical device
by Chunyan Liu 01 Aug '14

01 Aug '14

Check whether dst is the same device as source, if yes, report error and exit. Currently if dst is the same device as source, blockcopy is still going and qemu 'drive-mirror' is executed. Considering that: a). blockcopy to the same device is meaningless. b.) result is unexpected. (tested with block device whose source path is /dev/sdaX, after blockcopy, shutdown VM and then create VM from xml again, the VM cannot be started.) This case should not be allowed. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 704ba39..87a3790 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15309,6 +15309,13 @@ qemuDomainBlockCopy(virDomainObjPtr vm, } /* Prepare the destination file. */ + if (STREQ(disk->src->path, dest)) { + virReportError(VIR_ERR_INVALID_ARG, + _("destination '%s' is the same as disk '%s' source"), + dest, path); + goto endjob; + } + if (stat(dest, &st) < 0) { if (errno != ENOENT) { virReportSystemError(errno, _("unable to stat for disk %s: %s"), -- 1.8.4.5

4 9

[libvirt] How to Disbale SPICE recording; microphone input to Guests
by bancfc＠openmailbox.org 01 Aug '14

01 Aug '14

Hi. I just noticed that Spice audio recording is on by default. It passes microphone input to guests. Is there a way to disable this behvior through libvirt xml? On another note I think the privacy implications are alarming. Could you please change this to be off/safe by default.

1 0

[libvirt] [PATCH 0/2] Fix domiftune bandwidth bounds checking
by Ján Tomko 31 Jul '14

31 Jul '14

For https://bugzilla.redhat.com/show_bug.cgi?id=1043735 Ján Tomko (2): virsh: check if domiftune parameters fit into UINT Don't overwrite errors from virNetDevBandwidthSet src/lxc/lxc_process.c | 6 +----- src/network/bridge_driver.c | 6 +----- src/qemu/qemu_command.c | 6 +----- src/qemu/qemu_driver.c | 6 +----- src/qemu/qemu_hotplug.c | 6 +----- src/util/virnetdevmacvlan.c | 3 --- tools/virsh-domain.c | 14 ++++++++++++++ 7 files changed, 19 insertions(+), 28 deletions(-) -- 1.8.5.5

2 8

[libvirt] missing libvirt-sock after compile and install libvirt 1.2.6
by Yuanzhen Gu 30 Jul '14

30 Jul '14

Hi folks, I compiled and installed libvirt latest version 1.2.6, based on this tutorial, http://blog.scottlowe.org/2012/11/05/compiling-libvirt-1-0-0-on-ubuntu-12-0… I have compiled qemu and installed too, and make a symbolic link to /usr/bin/qemu-system-x86_64 but my question is even I launch a vm in qemu, $virsh list showed nothing, further more, 1) if I use virtual machine manager, it get connection failiure, due to socket to '/var/run/libvirt/libvirt-sock'; No such file of dirctory. 2). there is missing libvirt-bin under /etc/init.d/, after compile and installed libvirt 1.2.6 3). I tried to start libvirtd daemon, sudo /usr/sbin/libvirtd/start shows "/usr/sbin/libvirtd: unexpected, non-option, command line arguments" 4). I've checked /var/log/libvirt/libvirtd.log which shows cannot find suitable emulator for x86_64 I've stuck here for whole afternoon yesterday, any help or suggestion is highly appreciated, thanks a lot in advance ! Best, Yuanzhen

3 4

[libvirt] [PATCH] docs: bhyve: document recent changes
by Roman Bogorodskiy 30 Jul '14

30 Jul '14

- mention that one disk and one network limitation is no longer actual for 1.2.6 and newer - add 'cdrom' device to the sample domain XML --- docs/drvbhyve.html.in | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index e75eb83..9a97c57 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -42,9 +42,10 @@ in this sample domain XML. -A limitation that is not obvious from this sample domain XML is that currently only a -single network and a single disk device are supported for each domain (as PCI slot allocation code -in libvirt bhyve driver is yet to be implemented). +Note: an older versions of the libvirt bhyve driver had a limitation that only a +single network and a single disk device were supported for each domain. However, +since 1.2.6 the libvirt bhyve driver supports +up to 31 PCI devices. <pre> @@ -71,6 +72,11 @@ in libvirt bhyve driver is yet to be implemented). <source file='/path/to/bhyve_freebsd.img'/> <target dev='hda' bus='sata'/> </disk> + <disk type='file' device='cdrom'> + <driver name='file' type='raw'/> + <source file='/path/to/cdrom.iso'/> + <target dev='hdc' bus='sata'/> + </disk> <interface type='bridge'> <model type='virtio'/> <source bridge="virbr0"/> -- 1.9.0

2 2

[libvirt] [PATCH v6 0/2] turn on active commit
by Eric Blake 30 Jul '14

30 Jul '14

v5 was here, and got tentative ACKs: https://www.redhat.com/archives/libvir-list/2014-July/msg01414.html the only change is some reordering of logic in patch 2/2 (the former 4/4) to make sure that even for a super-fast commit where the event d occurs before the API call regains the lock that the event is correct. I'm still unsure whether to count this as a bug fix to a partial new feature and include it in 1.2.7, or defer it to 1.2.8. If we want it in this release, then getting it in before rc2 would be the nicest. Also at: http://repo.or.cz/w/libvirt/ericb.git/shortlog/refs/heads/gluster or git checkout git://repo.or.cz/libvirt/ericb.git gluster Eric Blake (2): blockcommit: track job type in xml blockcommit: turn on active commit docs/formatdomain.html.in | 15 ++++--- docs/schemas/domaincommon.rng | 13 ++++++ src/conf/domain_conf.c | 33 ++++++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_driver.c | 48 +++++++++++++++++++--- src/qemu/qemu_process.c | 39 +++++++++++++++++- .../qemuxml2argv-disk-active-commit.xml | 37 +++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 6 +-- .../qemuxml2xmlout-disk-mirror-old.xml | 4 +- tests/qemuxml2xmltest.c | 1 + 10 files changed, 179 insertions(+), 18 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml -- 1.9.3

3 6

[libvirt] [RFC] Adding a "none" model for video cards
by Jean-Baptiste Rouault 30 Jul '14

30 Jul '14

Hi, I'm trying to run vexpress-a9 virtual machines (armv7l architecture) using libvirt. The vexpress-a9 doesn't support vga cards, but libvirt adds a video "cirrus" video card when there is a "graphics" element in the domain xml. This prevents the domain from booting. At the moment, the only workaround I found is to add the following to my xml file : <qemu:commandline> <qemu:arg value='-vga'/> <qemu:arg value='none'/> </qemu:commandline> What do you think about adding a "none" model type for video cards ? I know it is a bit strange to declare a video card in order to have none... I don't know the QEMU driver well, but maybe this could be handled by the driver ? i.e. "no VGA card when the machine is vexpress-a9". Regards, Jean-Baptiste -- Jean-Baptiste ROUAULT R&D Engineer - diateam : Architectes de l'information Phone : +33 (0)2 98 050 050 Fax : +33 (0)2 98 050 051

2 1

[libvirt] [PATCH] Domain config: write <features/> if some capabilities are set.
by Cédric Bosdonnat 30 Jul '14

30 Jul '14

If all features are set to default (including the capabilities policy), but some capabilities are toggled, we need to output the <features> element when formatting the config. --- src/conf/domain_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2a8cdeb..421a44a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17860,7 +17860,8 @@ virDomainDefFormatInternal(virDomainDefPtr def, break; } - if (i != VIR_DOMAIN_FEATURE_LAST) { + if (i != VIR_DOMAIN_FEATURE_LAST || + virDomainDefHasCapabilitiesFeatures(def)) { virBufferAddLit(buf, "<features>\n"); virBufferAdjustIndent(buf, 2); -- 1.8.4.5

3 2

[libvirt] [RFC] Memory hotplug for qemu guests and the relevant XML parts
by Peter Krempa 30 Jul '14

30 Jul '14

Hi, qemu recently added support for memory hotplug (hot unplug will arrive later) since commit ~ bef3492d1169a54c966cecd0e0b1dd25e9341582 in qemu.git. For the hotplug to work the VM needs to be started with a certain number of "dimm" slots for plugging virtual memory modules. The memory of the VM at startup has to occupy at least one of the slots. Later on the management can decide to plug more memory to the guest by inserting a virtual memory module into the guest. For representing this in libvirt I'm thinking of using the <devices> section of our domain XML where we'd add a new device type: <memory type="ram"> <source .../>  <target .../>  <address type="acpi-dimm" slot="1"/> </memory> type="ram" to denote that we are adding RAM memory. This will allow possible extensions for example to add a generic pflash (type="flash", type="rom") device or other memory type mapped in the address space. To enable this infrastructure qemu needs two command line options supplied, one setting the maximum amount of supportable memory and the second one the maximum number of memory modules (capped at 256 due to ACPI). The current XML format for specifying memory looks like this: <memory unit='KiB'>524288</memory> <currentMemory unit='KiB'>524288</currentMemory> I'm thinking of adding following attributes to the memory element: <memory slots='16' max-memory='1' max-memory-unit='TiB'/> This would then be updated to the actual size after summing sizes of the memory modules to: <memory slots='16' max-memory='1' max-memory-unit='TiB'/> unit='MiB'>512</memory> This would also allow a possibility to specify the line above and libvirt would then add a memory module holding the whole guest memory. Representing the memory module as a device will then allow us to use the existing hot(un)plug APIs to do the operations on the actual VM. For the ram memory type the source and target elements will allow to specify the following option. For backing the guest with normal memory: <source type="ram" size="500" unit="MiB" host-node="2"/> For hugepage-backed guest: <source type="hugepage" page-size="2048" count="1024" node="1"/> Note: node attribute target's host numa node and is optional. And possibly others possibly for the rom/flash types: <source type="file" path="/asdf"/> For targetting the RAM module the target element could have the following format: <target model="dimm" node='2' address='0xdeadbeef'/> "node" determines the guest numa node to connect the memory "module" to. The attribute is optional for non-numa guests or node 0 is assumed. "address" determines the address in the guest's memory space where the memory will be mapped. This is optional and not recommended being set by the user (except for special cases). For expansion the model="pflash" device may be added. For migration the target VM needs to be started with the hotplugged modules already specified on the command line, which is in line how we treat devices currently. My suggestion above contrasts with the approach Michal and Martin took when adding the numa and hugepage backing capabilities as they describe a node while this describes the memory device beneath it. I think those two approaches can co-exist whilst being mutually-exclusive. Simply when using memory hotplug, the memory will need to be specified using the memory modules. Non-hotplug guests could use the approach defined originally. That concludes my thoughts on this subject, but I'm open for discussion or other approach (I didn't start implementation yet). Thanks Peter

3 10

[libvirt] [PATCH] docs: fix an incorrect example for memoryBacking
by Chen Hanxiao 30 Jul '14

30 Jul '14

commit 136ad49740f017aabcac48d02d2df6ab7b0195e9 forgot to add an end-tags for hugepages. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/formatdomain.html.in | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2f0be20..df3fc4a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -620,6 +620,7 @@ <hugepages> <page size="1" unit="G" nodeset="0-3,5"/> <page size="2" unit="M" nodeset="4"/> + </hugepages> <nosharepages/> <locked/> </memoryBacking> -- 1.9.0

2 1

[libvirt] [PATCH 0/2] (for 1.2.7) network: Bring netdevs online later
by Matthew Rosato 29 Jul '14

29 Jul '14

The following patchset introduces code to defer setting netdevs online (and therefore registering MACs) until right before beginning guest CPU execution. The first patch introduces some infrastructure changes in preparation of the actual function added in the 2nd patch. Associated BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1081461 Changes since RFC: * Add a separate patch to introduce a flags field for macvlan/macvtap creation. * Use macvlan/tap IFUP flags to skip virNetDevSetOnline (for qemu only). * Add hotplug support. * For macvlan, save the current virNetDevVPortProfileOp in virDomainNetDef during qemuPhysIfaceConnect. As Laine mentioned, could use this field in a future patch to eliminate passing virNetDevVPortProfileOp everywhere. * Add qemu_interface.c and qemu_interface.h to encapsulate new functions. Matthew Rosato (2): util: Introduce flags field for macvtap creation network: Bring netdevs online later src/Makefile.am | 1 + src/conf/domain_conf.h | 2 ++ src/lxc/lxc_process.c | 3 +- src/qemu/qemu_command.c | 9 ++++-- src/qemu/qemu_hotplug.c | 7 +++++ src/qemu/qemu_interface.c | 65 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_interface.h | 33 ++++++++++++++++++++++ src/qemu/qemu_process.c | 4 +++ src/util/virnetdevmacvlan.c | 32 +++++++++++++-------- src/util/virnetdevmacvlan.h | 10 ++++++- 10 files changed, 150 insertions(+), 16 deletions(-) create mode 100644 src/qemu/qemu_interface.c create mode 100644 src/qemu/qemu_interface.h -- 1.7.9.5

3 9

[libvirt] [python PATCH] spec: Reorganize to satisfy buggy spectool
by Jiri Denemark 29 Jul '14

29 Jul '14

From: Jiri Denemark <Jiri.Denemark(a)gmail.com> spectool parses a specfile and strips everything but a preamble. However, if the first section is preceded by %if clause, it keeps it there which then makes rpmbuild complain about unmatched %if. Let's make the buggy tool happy by moving sections around so that the first one is not in any conditional. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt-python.spec.in | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index b51571e..8a21003 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -22,14 +22,6 @@ BuildRequires: python3-nose BuildRequires: python3-lxml %endif -%if %{with_python3} -%package -n libvirt-python3 -Summary: The libvirt virtualization API python3 binding -Url: http://libvirt.org -License: LGPLv2+ -Group: Development/Libraries -%endif - # Don't want provides for python shared objects %{?filter_provides_in: %filter_provides_in %{python_sitearch}/.*\.so} %{?filter_setup} @@ -41,6 +33,12 @@ supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). %if %{with_python3} +%package -n libvirt-python3 +Summary: The libvirt virtualization API python3 binding +Url: http://libvirt.org +License: LGPLv2+ +Group: Development/Libraries + %description -n libvirt-python3 The libvirt-python package contains a module that permits applications written in the Python programming language to use the interface -- 2.0.2

2 1

[libvirt] [PATCH] storage: Refresh storage pool after upload
by John Ferlan 29 Jul '14

29 Jul '14

https://bugzilla.redhat.com/show_bug.cgi?id=1072653 Upon successful upload of a volume, the target volume and storage pool were not updated to reflect any changes as a result of the upload. Make use of the existing stream close callback mechanism to force a backend pool refresh to occur once the stream closes. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/libvirt.c | 8 +++++ src/libvirt_private.syms | 1 + src/storage/storage_driver.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 3 ++ 4 files changed, 90 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index 143d319..992e4f2 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -13960,6 +13960,14 @@ virStorageVolDownload(virStorageVolPtr vol, * detect any errors. The results will be unpredictable if * another active stream is writing to the storage volume. * + * When the data stream is closed whether the upload is successful + * or not the target storage pool will be refreshed to reflect pool + * and volume changes as a result of the upload. Depending on + * the target volume storage backend and the source stream type + * for a successful upload, the target volume may take on the + * characteristics from the source stream such as format type, + * capacity, and allocation. + * * Returns 0, or -1 upon error. */ int diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b1fb7c9..7ef68a1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -825,6 +825,7 @@ virFDStreamCreateFile; virFDStreamOpen; virFDStreamOpenFile; virFDStreamOpenPTY; +virFDStreamSetInternalCloseCb; # libvirt_internal.h diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index efbe5ff..5fd5514 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -59,6 +59,12 @@ static virStorageDriverStatePtr driverState; static int storageStateCleanup(void); +typedef struct _virStorageVolStreamInfo virStorageVolStreamInfo; +typedef virStorageVolStreamInfo *virStorageVolStreamInfoPtr; +struct _virStorageVolStreamInfo { + char *pool_name; +}; + static void storageDriverLock(virStorageDriverStatePtr driver) { virMutexLock(&driver->lock); @@ -1956,6 +1962,52 @@ storageVolDownload(virStorageVolPtr obj, } +/** + * Frees opaque data provided for the stream closing callback + * + * @opaque Data to be freed. + */ +static void virStorageVolFDStreamCloseCbFree(void *opaque) +{ + virStorageVolStreamInfoPtr cbdata = opaque; + + VIR_FREE(cbdata->pool_name); + VIR_FREE(cbdata); +} + +/** + * Callback being called if a FDstream is closed. Frees device entries + * from data structures and removes lockfiles. + * + * @st Pointer to stream being closed. + * @opaque Domain's device information structure. + */ +static void virStorageVolFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, + void *opaque) +{ + + virStorageVolStreamInfoPtr cbdata = opaque; + virStoragePoolObjPtr pool = NULL; + virStorageBackendPtr backend; + + storageDriverLock(driverState); + if (!(pool = virStoragePoolObjFindByName(&driverState->pools, + cbdata->pool_name))) + goto cleanup; + + if (!(backend = virStorageBackendForType(pool->def->type))) + goto cleanup; + + virStoragePoolObjClearVols(pool); + if (backend->refreshPool(NULL, pool) < 0) + VIR_DEBUG("Failed to refresh storage pool"); + + cleanup: + if (pool) + virStoragePoolObjUnlock(pool); + storageDriverUnlock(driverState); +} + static int storageVolUpload(virStorageVolPtr obj, virStreamPtr stream, @@ -1966,6 +2018,7 @@ storageVolUpload(virStorageVolPtr obj, virStorageBackendPtr backend; virStoragePoolObjPtr pool = NULL; virStorageVolDefPtr vol = NULL; + virStorageVolStreamInfoPtr cbdata = NULL; int ret = -1; virCheckFlags(0, -1); @@ -1996,11 +2049,36 @@ storageVolUpload(virStorageVolPtr obj, goto cleanup; } + /* If we have a refreshPool, use the callback routine in order to + * refresh the pool after the volume upload stream closes. This way + * we make sure the volume and pool data are refreshed without user + * interaction and we can just lookup the backend in the callback + * routine in order to call the refresh API. + */ + if (backend->refreshPool) { + if (VIR_ALLOC(cbdata) < 0 || + VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0) + goto cleanup; + } + ret = backend->uploadVol(obj->conn, pool, vol, stream, offset, length, flags); + /* Add cleanup callback - call after uploadVol since the stream + * is then fully set up + */ + if (cbdata) { + virFDStreamSetInternalCloseCb(stream, + virStorageVolFDStreamCloseCb, + cbdata, + virStorageVolFDStreamCloseCbFree); + cbdata = NULL; + } + cleanup: virStoragePoolObjUnlock(pool); + if (cbdata) + virStorageVolFDStreamCloseCbFree(cbdata); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 849ae31..e377df9 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2981,6 +2981,9 @@ of the amount of data to be uploaded. A negative value is interpreted as an unsigned long long value to essentially include everything from the offset to the end of the volume. An error will occur if the I<local-file> is greater than the specified length. +See the description for the libvirt virStorageVolUpload API for details +regarding possible target volume and pool changes as a result of the +pool refresh when the upload is attempted. =item B<vol-download> [I<--pool> I<pool-or-uuid>] [I<--offset> I<bytes>] [I<--length> I<bytes>] I<vol-name-or-key-or-path> I<local-file> -- 1.9.3

3 7

[libvirt] [PATCH] qemu: error out if PCI passthrough type is not supported
by Hu Tao 29 Jul '14

29 Jul '14

If PCI passthrough type is not supported, we should error out rather than continue building the command line. When starting a domain, the type has been already checked by qemuPrepareHostdevPCICheckSupport() before building qemu command line, so the problem doesn't emerge. But when coverting a domain xml without specifying passthrough type explictly to qemu arg, we will get a malformed command line. the xml: <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0001' bus='0x03' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </hostdev> the converted command line: -device ,host=0001:03:00.0,id=hostdev0,bus=pci.0,addr=0x5 After this patch, virsh gives an error message: virsh domxml-to-native qemu-argv /tmp/tmp.xml error: internal error: invalid PCI passthrough type 'default' Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com> --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7f9357c..12d6354 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4880,7 +4880,7 @@ qemuBuildPCIHostdevDevStr(virDomainDefPtr def, virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid PCI passthrough type '%s'"), virDomainHostdevSubsysPCIBackendTypeToString(backend)); - break; + goto error; } virBufferAddLit(&buf, ",host="); -- 1.8.0

2 1

[libvirt] [PATCH for 1.2.7] storage: create: Create files with correct mode
by Peter Krempa 29 Jul '14

29 Jul '14

Use correct mode when pre-creating files (for snapshots). The refactor changing to storage driver usage caused a regression as some systems created the file with 000 permissions forbidding qemu to write the file. Pass mode to the creating functions to avoid the problem. Regression since 185e07a5f82bc0692324f3ee13b4816d71b653c1. --- src/storage/storage_backend_fs.c | 6 +++++- src/storage/storage_backend_gluster.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 378c553..b8f907a 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1390,8 +1390,12 @@ static int virStorageFileBackendFileCreate(virStorageSourcePtr src) { int fd = -1; + mode_t mode = S_IRUSR; - if ((fd = virFileOpenAs(src->path, O_WRONLY | O_TRUNC | O_CREAT, 0, + if (!src->readonly) + mode |= S_IWUSR; + + if ((fd = virFileOpenAs(src->path, O_WRONLY | O_TRUNC | O_CREAT, mode, src->drv->uid, src->drv->gid, 0)) < 0) { errno = -fd; return -1; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 38d02ac..8a7d7e5 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -638,8 +638,13 @@ virStorageFileBackendGlusterCreate(virStorageSourcePtr src) { virStorageFileBackendGlusterPrivPtr priv = src->drv->priv; glfs_fd_t *fd = NULL; + mode_t mode = S_IRUSR; - if (!(fd = glfs_open(priv->vol, src->path, O_CREAT | O_TRUNC | O_WRONLY))) + if (!src->readonly) + mode |= S_IWUSR; + + if (!(fd = glfs_creat(priv->vol, src->path, + O_CREAT | O_TRUNC | O_WRONLY, mode))) return -1; ignore_value(glfs_close(fd)); -- 2.0.0

2 2

[libvirt] [PATCH] schema: bhyve and nmdm updates
by Roman Bogorodskiy 29 Jul '14

29 Jul '14

* docs/schemas/domaincommon.rng: Add bhyve domain type, nmdm serial type and master and slave optional attributes for serial that are used by nmdm * tests/domainschematest: Add bhyvexml2argvdata directory to validate bhyve XMLs --- docs/schemas/domaincommon.rng | 8 ++++++++ tests/domainschematest | 1 + 2 files changed, 9 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f6f697c..7ace1c2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -201,6 +201,7 @@ <value>vbox</value> <value>phyp</value> <value>parallels</value> + <value>bhyve</value> </choice> </attribute> </define> @@ -3010,6 +3011,7 @@ <value>pty</value> <value>spicevmc</value> <value>spiceport</value> + <value>nmdm</value> </choice> </define> @@ -3083,6 +3085,12 @@ <attribute name="channel"/> </optional> <optional> + <attribute name="master"/> + </optional> + <optional> + <attribute name="slave"/> + </optional> + <optional> <ref name='devSeclabel'/> </optional> </element> diff --git a/tests/domainschematest b/tests/domainschematest index 9ebf0b9..6d077ea 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -8,6 +8,7 @@ DIRS="" DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata" DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata " DIRS="$DIRS lxcxml2xmldata lxcxml2xmloutdata" +DIRS="$DIRS bhyvexml2argvdata" SCHEMA="domain.rng" check_schema "$DIRS" "$SCHEMA" -- 1.9.0

2 2

[libvirt] [PATCH] nodedev: fix a uninitialized variable build failure
by Chen Hanxiao 29 Jul '14

29 Jul '14

Fix a -Werror=maybe-uninitialized warring Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/conf/node_device_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 78bc63f..96524a6 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1349,7 +1349,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, { virNodeDevCapsDefPtr caps; char *tmp; - int val, ret; + int val, ret = -1; if (VIR_ALLOC(caps) < 0) return NULL; -- 1.9.0

2 1

[libvirt] [PATCH v2 0/3] fix pciexpress memory leak
by Eric Blake 28 Jul '14

28 Jul '14

diff in v2: split out trivial fixes, refactor pcie code to virpci.h, add proper free function to cover all leaks Eric Blake (3): nodedev: let compiler help us on switches nodedev: move pci express types to virpci.h nodedev: fix pci express memory leak src/conf/node_device_conf.c | 13 ++++++------- src/conf/node_device_conf.h | 29 +---------------------------- src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 2 +- src/util/virpci.c | 15 +++++++++++++++ src/util/virpci.h | 33 ++++++++++++++++++++++++++++++++- 6 files changed, 56 insertions(+), 37 deletions(-) -- 1.9.3

2 6

[libvirt] LXC broken on Linux >= 3.15
by Richard Weinberger 28 Jul '14

28 Jul '14

Hi! Kernel commit 23adbe12 ("fs,userns: Change inode_capable to capable_wrt_inode_uidgid") uncovered a libvirt-lxc issue. Starting with that commit the kernel correctly checks also the gid of an inode. Sadly this change breaks libvirt-lxc in a way such that openpty() will always fail with -EPERM within a container. Therefore ssh and other programs are no longer usable. Libvirt's virLXCControllerSetupDevPTS() has a hardcoded mount string for mounting devpts, namely "newinstance,ptmxmode=0666,mode=0620,gid=5", devpts correctly translates the uid and gid while mounting but libvirt mounts devpts _before_ setting up the uid/gid mappings. Therefore the internal gid for the new devpts instance is still 5 instead the mapped gid and the new check in the kernel will always fail. We have two options to fix that: a) virLXCControllerSetupDevPTS() translates the gid (5) by hand and passes the correct value to devpts. (IMHO hacky) b) We setup devpts and therefore also the consoles after installing the mappings. This needs maybe a bit of work. First I thought a trivial patch like the appended one will do it, but then libvirt fails to start a guest with no further explanation. Maybe I've later the time to investigate further. What do you think? Thanks, //richard diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 2d220eb..3435f42 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2157,9 +2157,6 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupResourceLimits(ctrl) < 0) goto cleanup; - if (virLXCControllerSetupDevPTS(ctrl) < 0) - goto cleanup; - if (virLXCControllerPopulateDevices(ctrl) < 0) goto cleanup; @@ -2172,9 +2169,6 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupFuse(ctrl) < 0) goto cleanup; - if (virLXCControllerSetupConsoles(ctrl, containerTTYPaths) < 0) - goto cleanup; - if (lxcSetPersonality(ctrl->def) < 0) goto cleanup; @@ -2198,6 +2192,12 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupUserns(ctrl) < 0) goto cleanup; + if (virLXCControllerSetupDevPTS(ctrl) < 0) + goto cleanup; + + if (virLXCControllerSetupConsoles(ctrl, containerTTYPaths) < 0) + goto cleanup; + if (virLXCControllerMoveInterfaces(ctrl) < 0) goto cleanup;

2 2

[libvirt] [RFC] require for suggestions on support for ivshmem device
by Wangrui (K) 28 Jul '14

28 Jul '14

Hi, Libvirt does not support ivshmem(Inter-VM Shared Memory) device recently, thus, I would like to know if there's any plan to support it in the future? If not, I would like to contribute a serial of patches to do so. On Jan 28, Wangyufei (James) asked about this question, and Daniel replied with 2 suggestions: 1. Libvirt should be capable of configuring the guest's xml on ivshmem. 2.An ivshmem daemon is needed to run on the host to support it, libvirt is recommended to provide such a daemon. Please refer to https://www.redhat.com/archives/libvir-list/2014-January/msg01335.html for details. What I'll do later is the 1st suggestion, the 2nd one is left to be accomplished by someone else. Here is the detailed work I'll do to support configuration of the guest in libvirt: virDomainDefParseXML: parse ivshmem device xml when defining dom.xml virDomainDeviceInfoIterateInternal: iterate ivshmem devices qemuAssignDevicePCISlots: assign ivshmem device pci slots virDomainDefFormatInternal: format ivshmem device xml (Eg. virsh edit dom) virDomainDefFree: free ivshmem device def qemuBuildCommandLine: build ivshmem device command line when vm starts qemuAssignDeviceAliases: assign ivshmem device aliases when vm starts virDomainDeviceDefParse: attach and parse ivshmem device xml qemuDomainAttachDeviceConfig: attach ivshmem device xml persistently qemuDomainAttachDeviceLive: attach ivshmem device online qemuDomainDetachDeviceConfig: detach ivshmem device xml persistently qemuDomainDetachDeviceLive: detach ivshmem device online There are two ways to use ivshmem with qemu (please refer to http://qemu.weilnetz.de/qemu-doc.html#pcsys_005fother_005fdevs ): 1.Guests map a POSIX shared memory region into the guest as a PCI device that enables zero-copy communication to the application level of the guests, The basic syntax is: qemu-system-i386-device ivshmem, size = <size in format accepted by -m> [, shm = <shm name>] 2.If desired, interrupts can be sent between guest VMs accessing the same shared memory region. Interrupt support requires using a shared memory server and using a chardev socket to connect to it. An example syntax when using the shared memory server is: qemu-system-i386-device ivshmem, size = <size in format accepted by -m> [, chardev = <id>] [, msi = on] [, ioeventfd = on] [, vectors = n] [, role = peer | master] qemu-system-i386-chardev socket, path = <path>, id = <id> The respective xml configuration for the above 2 qemu command lines are shown as below: Example1: automatically attach device with KVM <devices> <ivshmem role='master'> <memory name='dom-ivshmem' size='2'/> </ivshmem> </devices> NOTE: "size" means ivshmem size in unit MB, "name" means shm name "role" is optional, it may be set to "master" or "peer", the default one is "master" Example2: manually attach device with static PCI slot 4 requested <devices> <ivshmem role='master'> <memory name='dom-ivshmem' size='2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </ivshmem> </devices> Example3: automatically attach device with KVM <devices> <ivshmem role='master' type='unix'> <source mode='connect' path='/tmp/ivshmem'/> <memory name='dom-ivshmem' size='2'/> </ivshmem> </devices> NOTE: "path" means shared memory socket path which is set by the daemon. " source mode " and "type" is similar with vmchannel. I'm looking forward to your suggestions, thank you very much.

5 6

[libvirt] [PATCHv2] conf: Add USB sound card support and implement it for qemu
by Peter Krempa 28 Jul '14

28 Jul '14

--- Notes: Version 2: - added docs docs/formatdomain.html.in | 5 +++-- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 ++++++++++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 9 ++++++--- 13 files changed, 33 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8950959..d1cca19 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4959,9 +4959,10 @@ qemu-kvm -net nic,model=? /dev/null The <code>sound</code> element has one mandatory attribute, <code>model</code>, which specifies what real sound device is emulated. Valid values are specific to the underlying hypervisor, though typical - choices are 'es1370', 'sb16', 'ac97', and 'ich6' + choices are 'es1370', 'sb16', 'ac97', 'ich6' and 'usb'. ( - 'ac97' only since 0.6.0, 'ich6' only since 0.8.8) + 'ac97' only since 0.6.0, 'ich6' only since 0.8.8, + 'usb' only since 1.2.7) </dd> </dl> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 910f6e2..814b305 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -458,7 +458,8 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "pcspk", "ac97", "ich6", - "ich9") + "ich9", + "usb") VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST, "virtio", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b988b17..3ddeede 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1166,6 +1166,7 @@ typedef enum { VIR_DOMAIN_SOUND_MODEL_AC97, VIR_DOMAIN_SOUND_MODEL_ICH6, VIR_DOMAIN_SOUND_MODEL_ICH9, + VIR_DOMAIN_SOUND_MODEL_USB, VIR_DOMAIN_SOUND_MODEL_LAST } virDomainSoundModel; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 07306e5..eb2bbfd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -263,6 +263,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "memory-backend-ram", /* 170 */ "numa", + "usb-audio", ); @@ -1481,6 +1482,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "pvpanic", QEMU_CAPS_DEVICE_PANIC }, { "usb-kbd", QEMU_CAPS_DEVICE_USB_KBD }, { "memory-backend-ram", QEMU_CAPS_OBJECT_MEMORY_RAM }, + { "usb-audio", QEMU_CAPS_OBJECT_USB_AUDIO }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4332633..ac65ef3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -211,6 +211,7 @@ typedef enum { QEMU_CAPS_CHANGE_BACKING_FILE = 169, /* change name of backing file in metadata */ QEMU_CAPS_OBJECT_MEMORY_RAM = 170, /* -object memory-backend-ram */ QEMU_CAPS_NUMA = 171, /* newer -numa handling with disjoint cpu ranges */ + QEMU_CAPS_OBJECT_USB_AUDIO = 172, /* usb-audio device support */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index beb8ca8..0ed6a57 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2090,9 +2090,10 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, for (i = 0; i < def->nsounds; i++) { if (def->sounds[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) continue; - /* Skip ISA sound card, and PCSPK */ + /* Skip ISA sound card, PCSPK and usb-audio */ if (def->sounds[i]->model == VIR_DOMAIN_SOUND_MODEL_SB16 || - def->sounds[i]->model == VIR_DOMAIN_SOUND_MODEL_PCSPK) + def->sounds[i]->model == VIR_DOMAIN_SOUND_MODEL_PCSPK || + def->sounds[i]->model == VIR_DOMAIN_SOUND_MODEL_USB) continue; if (virDomainPCIAddressReserveNextSlot(addrs, &def->sounds[i]->info, @@ -4687,6 +4688,15 @@ qemuBuildSoundDevStr(virDomainDefPtr def, case VIR_DOMAIN_SOUND_MODEL_ICH6: model = "intel-hda"; break; + case VIR_DOMAIN_SOUND_MODEL_USB: + model = "usb-audio"; + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_USB_AUDIO)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("usb-audio controller is not supported " + "by this QEMU binary")); + goto error; + } + break; case VIR_DOMAIN_SOUND_MODEL_ICH9: model = "ich9-intel-hda"; if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA)) { diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index ebbfb82..c8a379a 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -115,4 +115,5 @@ <flag name='enable-fips'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index ab631a2..4b7651e 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -128,4 +128,5 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index e710b60..d146bf9 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -129,4 +129,5 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 36758c8..5fa30aa 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -137,4 +137,5 @@ <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index ca2c236..f364bbf 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -144,4 +144,5 @@ <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> <flag name='msg-timestamp'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 4b9f693..10ce1b5 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -143,4 +143,5 @@ <flag name='host-pci-multidomain'/> <flag name='msg-timestamp'/> <flag name='numa'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 105a563..366e36d 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -842,7 +842,8 @@ mymain(void) QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, QEMU_CAPS_VNC_SHARE_POLICY, QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_USB_STORAGE); + QEMU_CAPS_DEVICE_USB_STORAGE, + QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("qemu-1.2.0", 1002000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -951,7 +952,8 @@ mymain(void) QEMU_CAPS_VNC_SHARE_POLICY, QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_USB_STORAGE_REMOVABLE); + QEMU_CAPS_USB_STORAGE_REMOVABLE, + QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("qemu-kvm-1.2.0", 1002000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -1065,7 +1067,8 @@ mymain(void) QEMU_CAPS_VNC_SHARE_POLICY, QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_USB_STORAGE_REMOVABLE); + QEMU_CAPS_USB_STORAGE_REMOVABLE, + QEMU_CAPS_OBJECT_USB_AUDIO); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.0.0

1 0

[libvirt] [PATCH] support vhost-scsi controller
by Zhang Min 28 Jul '14

28 Jul '14

libvirt support vhost-scsi controller. The way to config the vhost-scsi controller is edit the xml file, Format is as follows: <controller type='scsi' index='0' model='vhost-scsi'> <source wwpn='naa.6001405f5e3acbba' event_idx='on'/> </controller> the tag of "wwpn" is necessary, the 'model' must be 'vhost-scsi' 'event_idx' is optional. Signed-off-by: Zhang Min <rudy.zhangmin(a)huawei.com> --- src/conf/domain_conf.c | 64 +++++++++++++++++++++++++++++++++++++++-- src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 21 ++++++++++++- src/vmx/vmx.c | 3 +- 6 files changed, 94 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 54925ba..e42ede7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -306,7 +306,8 @@ VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAS "vmpvscsi", "ibmvscsi", "virtio-scsi", - "lsisas1078"); + "lsisas1078", + "vhost-scsi"); VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "piix3-uhci", @@ -1290,6 +1291,10 @@ void virDomainControllerDefFree(virDomainControllerDefPtr def) if (!def) return; + if (def->vhostscsi.wwpn) + VIR_FREE(def->vhostscsi.wwpn); + memset(&def->vhostscsi, 0, sizeof(def->vhostscsi)); + virDomainDeviceInfoClear(&def->info); VIR_FREE(def); @@ -6051,6 +6056,9 @@ virDomainControllerDefParseXML(xmlNodePtr node, char *max_sectors = NULL; xmlNodePtr saved = ctxt->node; int rc; + char *wwpn = NULL; + char *event_idx = NULL; + int event_idx_num = 0; ctxt->node = node; @@ -6087,13 +6095,42 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->model = -1; } + def->vhostscsi.wwpn = NULL; cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { if (xmlStrEqual(cur->name, BAD_CAST "driver")) queues = virXMLPropString(cur, "queues"); - cmd_per_lun = virXMLPropString(cur, "cmd_per_lun"); - max_sectors = virXMLPropString(cur, "max_sectors"); + else if(xmlStrEqual(cur->name, BAD_CAST "source")) { + switch (def->model) { + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI: + wwpn = virXMLPropString(cur, "wwpn"); + if (wwpn && !STREQ(wwpn,"")) { + def->vhostscsi.wwpn = wwpn; + wwpn = NULL; + } else { + virReportError(VIR_ERR_XML_ERROR, + _("vhost-scsi:wwpn can't be null")); + goto error; + } + + event_idx = virXMLPropString(cur, "event_idx"); + if (event_idx) { + if ((event_idx_num = virDomainVirtioEventIdxTypeFromString(event_idx)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown vhost-scsi event_idx mode '%s'"), + event_idx); + goto error; + } + def->vhostscsi.event_idx = event_idx_num; + } + break; + default: + break; + } + } + cmd_per_lun = virXMLPropString(cur, "cmd_per_lun"); + max_sectors = virXMLPropString(cur, "max_sectors"); } cur = cur->next; } @@ -6216,6 +6253,12 @@ virDomainControllerDefParseXML(xmlNodePtr node, goto error; } + if (def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI && + def->vhostscsi.wwpn == NULL) { + virReportError(VIR_ERR_XML_ERROR,_("vhost-scsi:wwpn can't be null")); + goto error; + } + cleanup: ctxt->node = saved; VIR_FREE(type); @@ -6224,6 +6267,8 @@ virDomainControllerDefParseXML(xmlNodePtr node, VIR_FREE(queues); VIR_FREE(cmd_per_lun); VIR_FREE(max_sectors); + VIR_FREE(wwpn); + VIR_FREE(event_idx); return def; @@ -15300,10 +15345,21 @@ virDomainControllerDefFormat(virBufferPtr buf, break; } - if (def->queues || def->cmd_per_lun || def->max_sectors || + if (def->queues || def->cmd_per_lun || def->max_sectors || def->vhostscsi.wwpn virDomainDeviceInfoIsSet(&def->info, flags) || pcihole64) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); + + if (def->vhostscsi.wwpn) { + virBufferAsprintf(buf, " <source wwpn='%s'", def->vhostscsi.wwpn); + + if (def->vhostscsi.event_idx) { + virBufferAsprintf(buf, " event_idx='%s'", + virDomainVirtioEventIdxTypeToString(def->vhostscsi.event_idx)); + } + virBufferAddLit(buf, "/>\n"); + } + if (def->queues) virBufferAsprintf(buf, "<driver queues='%u'/>\n", def->queues); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a00e30a..7b3cfd8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -679,6 +679,7 @@ typedef enum { VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078, + VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST } virDomainControllerModelSCSI; @@ -713,6 +714,14 @@ struct _virDomainPCIControllerOpts { unsigned long pcihole64size; }; +/* Stores the vhost-scsi controller configuration */ +typedef struct _virDomainControllerVhostDef virDomainControllerVhostDef; +typedef virDomainControllerVhostDef *virDomainControllerVhostDefPtr; +struct _virDomainControllerVhostDef { + char *wwpn; + int event_idx; +}; + /* Stores the virtual disk controller configuration */ struct _virDomainControllerDef { int type; @@ -721,6 +730,7 @@ struct _virDomainControllerDef { unsigned int queues; unsigned int cmd_per_lun; unsigned int max_sectors; + virDomainControllerVhostDef vhostscsi; union { virDomainVirtioSerialOpts vioserial; virDomainPCIControllerOpts pciopts; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 40ebf29..bf124b7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -258,6 +258,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "host-pci-multidomain", "msg-timestamp", "active-commit", + "vhost-scsi-pci", ); @@ -1445,6 +1446,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-s390", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI }, + { "vhost-scsi-pci", QEMU_CAPS_VHOST_SCSI }, { "megasas", QEMU_CAPS_SCSI_MEGASAS }, { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0ea8de8..9eb18f4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -208,6 +208,7 @@ typedef enum { QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */ QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ QEMU_CAPS_ACTIVE_COMMIT = 168, /* block-commit works without 'top' */ + QEMU_CAPS_VHOST_SCSI = 153, /* -device vhost-scsi-pci */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fb64cda..02edad2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -701,6 +701,14 @@ qemuSetSCSIControllerModel(virDomainDefPtr def, return -1; } break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOST_SCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support " + "vhost scsi controller")); + return -1; + } + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: /*TODO: need checking work here if necessary */ break; @@ -4119,8 +4127,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, virBuffer buf = VIR_BUFFER_INITIALIZER; int model; - if (!(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && - def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) { + if (!((def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) && + (def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI || + def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI))) { if (def->queues) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("'queues' is only supported by virtio-scsi controller")); @@ -4157,6 +4166,14 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, else virBufferAddLit(&buf, "virtio-scsi-pci"); break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VHOST_SCSI: + virBufferAddLit(&buf, "vhost-scsi-pci"); + virBufferAsprintf(&buf, ",wwpn=%s", def->vhostscsi.wwpn); + if (def->vhostscsi.event_idx) { + virBufferAsprintf(&buf, ",event_idx=%s", + virDomainVirtioEventIdxTypeToString(def->vhostscsi.event_idx)); + } + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC: virBufferAddLit(&buf, "lsi"); break; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index cd6c51e..ace6ccd 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -517,7 +517,8 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST, "pvscsi", "UNUSED ibmvscsi", "UNUSED virtio-scsi", - "UNUSED lsisas1078"); + "UNUSED lsisas1078", + "UNUSED vhost-scsi"); /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -- zhang min

3 2

[libvirt] [PATCH 0/2] qemu: add vhost-scsi-pci support
by Nicholas A. Bellinger 28 Jul '14

28 Jul '14

From: Nicholas Bellinger <nab(a)linux-iscsi.org> Hi Daniel & Co, The following is the patch series to add support for vhost-scsi-pci from QEMU >= v1.5.x into libvirt. It includes proper support for passing a pre-opened vhostfd into vhost-scsi, which is required in order to properly support nova performing a device_add for adding a individual vhost-scsi-pci WWPN endpoint -> SCSI controller. The logic closely follows what vhost-net already does in order to allow a child qemu process to interact with the vhost-scsi character device for registering vhost memory, setting vhost-scsi endpoints, etc. This code has been tested using openstack nova volume-attach, using a Juno v2 development head from 07192014. Thank you, --nab Mike Perez (1): qemu: add vhost-scsi-pci definitions Nicholas Bellinger (1): qemu: add support vhost-scsi-pci for device_add hotplug Makefile.am | 2 +- docs/formatdomain.html.in | 20 ++-- docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 20 +++- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 115 ++++++++++++++++++-- src/qemu/qemu_command.h | 8 +- src/qemu/qemu_hotplug.c | 47 +++++++- src/qemu/qemu_monitor.c | 24 ++++ src/qemu/qemu_monitor.h | 4 + src/vmx/vmx.c | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + .../qemuxml2argv-disk-vhost-scsi-cmd_per_lun.args | 9 ++ .../qemuxml2argv-disk-vhost-scsi-cmd_per_lun.xml | 29 +++++ .../qemuxml2argv-disk-vhost-scsi-max_sectors.args | 9 ++ .../qemuxml2argv-disk-vhost-scsi-max_sectors.xml | 29 +++++ .../qemuxml2argv-disk-vhost-scsi-num_queues.args | 9 ++ .../qemuxml2argv-disk-vhost-scsi-num_queues.xml | 29 +++++ .../qemuxml2argv-disk-vhost-scsi-wwpn.args | 9 ++ .../qemuxml2argv-disk-vhost-scsi-wwpn.xml | 29 +++++ tests/qemuxml2argvtest.c | 12 ++ tests/qemuxml2xmltest.c | 4 + 26 files changed, 399 insertions(+), 23 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-vhost-scsi-cmd_per_lun.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-vhost-scsi-cmd_per_lun.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-vhost-scsi-max_sectors.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-vhost-scsi-max_sectors.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-vhost-scsi-num_queues.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-vhost-scsi-num_queues.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-vhost-scsi-wwpn.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-vhost-scsi-wwpn.xml -- 1.7.9.5

3 10

[libvirt] [PATCH] qemu: sound: Fix uninitialized model string
by Peter Krempa 28 Jul '14

28 Jul '14

Commit e5f36698e3efc3d258b2996c7423c47e05ec52b2 introduces a false-positive build failure in the sound card model handling switch. Initialize the model to NULL although the value should never be used. --- Notes: Pushed under the build-breaker and trivial rules. src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cb3c584..beb8ca8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4674,7 +4674,7 @@ qemuBuildSoundDevStr(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; - const char *model; + const char *model = NULL; /* Hack for devices with different names in QEMU and libvirt */ switch ((virDomainSoundModel) sound->model) { -- 2.0.0

1 0

[libvirt] [PATCH 0/2] add support for --config in setmaxmem command
by Chen Hanxiao 28 Jul '14

28 Jul '14

Chen Hanxiao (2): LXC: add support for --config in setmaxmem command LXC: use lxcDomainSetMemoryFlags to do lxcDomainSetMaxMemory's work src/lxc/lxc_driver.c | 105 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 54 deletions(-) -- 1.9.0

3 7

[libvirt] [PATCH 0/2] qemu: usb-audio support and cleanup of sound card handling
by Peter Krempa 28 Jul '14

28 Jul '14

qemu supports the usb sound card for a while, add support to libvirt too Peter Krempa (2): conf: Add USB sound card support and implement it for qemu qemu: sound: Handle all possible sound cards in switch statement src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 33 +++++++++++++++++++-------- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 9 +++++--- 12 files changed, 41 insertions(+), 14 deletions(-) -- 2.0.0

3 6

[libvirt] about ceph+qcow2+qemu(snapshot) support issue ?
by haiquan517＠sina.com 28 Jul '14

28 Jul '14

Hi , Could you pls help me ask one question , now we are testing a fuction , about Ceph+ qcow2+(qemu(snapshot) tec, now we are running this command print this error : virsh snapshot-create-as --domain win08q2 --name snapwin08q2 --description "test ucsm+qcow2"error: operation failed: Error -5 while writing VM so we want

1 0

[libvirt] [PATCH] conf: RNG: Always fill in default random source path for default backend
by Peter Krempa 28 Jul '14

28 Jul '14

Libvirt documents that the default entropy source for the 'random' backend of a RNG device is /dev/random. Instead of storing and propagating NULL across our code and checking it in multiple places fill the default in the post parse callback and use that in the other places. --- Sending the fix as promised in the multiple-rng series. src/conf/domain_audit.c | 10 ++-------- src/conf/domain_conf.c | 14 +++++++++----- src/qemu/qemu_cgroup.c | 12 ++++-------- src/qemu/qemu_command.c | 5 ++--- .../qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args | 3 ++- 6 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 2d1b1fb..93625fc 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -253,10 +253,7 @@ virDomainAuditRNG(virDomainObjPtr vm, if (newDef) { switch ((virDomainRNGBackend) newDef->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: - if (newDef->source.file) - newsrcpath = newDef->source.file; - else - newsrcpath = "/dev/random"; + newsrcpath = newDef->source.file; break; case VIR_DOMAIN_RNG_BACKEND_EGD: @@ -271,10 +268,7 @@ virDomainAuditRNG(virDomainObjPtr vm, if (oldDef) { switch ((virDomainRNGBackend) oldDef->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: - if (oldDef->source.file) - oldsrcpath = oldDef->source.file; - else - oldsrcpath = "/dev/random"; + oldsrcpath = oldDef->source.file; break; case VIR_DOMAIN_RNG_BACKEND_EGD: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9c3cd8a..910f6e2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3057,6 +3057,14 @@ virDomainDeviceDefPostParseInternal(virDomainDeviceDefPtr dev, } } + /* set default path for virtio-rng "random" backend to /dev/random */ + if (dev->type == VIR_DOMAIN_DEVICE_RNG && + dev->data.rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM && + !dev->data.rng->source.file) { + if (VIR_STRDUP(dev->data.rng->source.file, "/dev/random") < 0) + return -1; + } + return 0; } @@ -16546,11 +16554,7 @@ virDomainRNGDefFormat(virBufferPtr buf, switch ((virDomainRNGBackend) def->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: - if (def->source.file) - virBufferEscapeString(buf, ">%s</backend>\n", def->source.file); - else - virBufferAddLit(buf, "/>\n"); - + virBufferEscapeString(buf, ">%s</backend>\n", def->source.file); break; case VIR_DOMAIN_RNG_BACKEND_EGD: diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 419be9a..43d14d4 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -587,16 +587,12 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, for (i = 0; i < vm->def->nrngs; i++) { if (vm->def->rngs[i]->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM) { VIR_DEBUG("Setting Cgroup ACL for RNG device"); - const char *rngpath = vm->def->rngs[i]->source.file; - - /* fix path when using the default */ - if (!rngpath) - rngpath = "/dev/random"; - - rv = virCgroupAllowDevicePath(priv->cgroup, rngpath, + rv = virCgroupAllowDevicePath(priv->cgroup, + vm->def->rngs[i]->source.file, VIR_CGROUP_DEVICE_RW); virDomainAuditCgroupPath(vm, priv->cgroup, "allow", - rngpath, "rw", rv == 0); + vm->def->rngs[i]->source.file, + "rw", rv == 0); if (rv < 0 && !virLastErrorIsSystemErrno(ENOENT)) goto cleanup; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7f9357c..cdf7740 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5626,9 +5626,8 @@ qemuBuildRNGBackendArgs(virCommandPtr cmd, goto cleanup; } - virBufferAsprintf(&buf, "rng-random,id=%s", dev->info.alias); - if (dev->source.file) - virBufferAsprintf(&buf, ",filename=%s", dev->source.file); + virBufferAsprintf(&buf, "rng-random,id=%s,filename=%s", + dev->info.alias, dev->source.file); virCommandAddArg(cmd, "-object"); virCommandAddArgBuffer(cmd, &buf); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args index 4ae6257..58cc473 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args @@ -3,5 +3,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -S -M pc -m 214 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --object rng-random,id=rng0 \ +-object rng-random,id=rng0,filename=/dev/random \ -device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args index 1082ede..d1faf09 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args @@ -3,7 +3,8 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -M pc -m 214 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --object rng-random,id=rng0 -device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7 \ +-object rng-random,id=rng0,filename=/dev/random \ +-device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7 \ -chardev socket,id=charrng1,host=1.2.3.4,port=1234 \ -object rng-egd,chardev=charrng1,id=rng1 \ -device virtio-rng-pci,rng=rng1,bus=pci.0,addr=0x4 -- 2.0.0

2 2

[libvirt] default virtual network race with NetworkManager in a VM
by Cole Robinson 27 Jul '14

27 Jul '14

Hi all, There's a long standing issue with running libvirt inside a VM: https://bugzilla.redhat.com/show_bug.cgi?id=811967 Summary: Run a VM using the default virtual network with IP address 192.168.122.XXX. Install libvirtd inside the VM, reboot. On startup, libvirtd in the VM can bring up its copy of the default virtual network, before NetworkManager has a chance to run. The nested network grabs the route for 192.168.122.0 before NetworkManager can claim it for the VM's normal networking. Result is the VM doesn't have any network connectivity to the outside world. If NetworkManager starts first, a libvirt check at virtual network startup time will refuse to override the existing route and avoid the problem. This is from https://bugzilla.redhat.com/show_bug.cgi?id=235961 The past few Fedora releases haven't generated that many complaints about this, but we've had reports that it's happening quite frequently with rawhide/f21, see the last comments of that first bug report. There's some suggestions in the bug about possible fixes, like listening to NetworkManager API events and stopping the virtual network if needed. But they are just ideas that no one has really researched. Anyone have a novel solution and/or some cycles to poke at this? (FWIW no one has tried to determine what has changed that's tickling this issue more often, but regardless the root issue should be dealt with) Thanks, Cole

1 0

Re: [libvirt] [Qemu-devel] [PATCH] [RFC] Add machine type pc-1.0-qemu-kvm for live migrate compatibility with qemu-kvm
by Andreas Färber 27 Jul '14

27 Jul '14

Hi Alex, + quintela, mst, libvirt Am 22.07.2014 20:43, schrieb Alex Bligh: > Add a machine type pc-1.0-qemu-kvm for live migrate compatibility > with qemu-kvm version 1.0. > > Signed-off-by: Alex Bligh <alex(a)alex.org.uk> > --- > hw/acpi/piix4.c | 49 ++++++++++++++++++++++++++++++++++++++++++++-- > hw/i386/pc_piix.c | 31 +++++++++++++++++++++++++++++ > hw/timer/i8254_common.c | 41 ++++++++++++++++++++++++++++++++++++++ > include/hw/acpi/piix4.h | 1 + > include/hw/timer/i8254.h | 2 ++ > 5 files changed, 122 insertions(+), 2 deletions(-) > > This RFC patch adds inbound migrate capability from qemu-kvm version > 1.0. The main ideas are those set out in Cole Robinson's patch here: > http://pkgs.fedoraproject.org/cgit/qemu.git/tree/0001-Fix-migration-from-qe… > however, rather than patching statically (and breaking inbound > migration on existing machine types), I have added a new machine > type (pc-1.0-qemu-kvm) without affecting any other machine types. This sounds like a really cool feature that SUSE would probably be interested in extending back to 0.14 and 0.15, but I see a fundamental flaw: libvirt on those old source systems does not know it should use a different machine name on the destination side and would still use pc-1.0, wouldn't it? After all, it needs to be able to migrate to other old qemu-kvm machines, so it can't just be updated to use the new name. Minor bikeshedding: I would ask to keep the package name in front of the machine version, e.g. qemu-kvm-pc-1.0. Or just kvm-pc-1.0 since this is a QEMU parameter anyway. Haven't reviewed the code in detail yet. Regards, Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

2 1

[libvirt] [PATCH 1/2] spec: Use power64 macro
by Cole Robinson 25 Jul '14

25 Jul '14

From: Peter Robinson <pbrobinson(a)fedoraproject.org> Covers the whole ppc64 family. Example bug for binutils: https://bugzilla.redhat.com/show_bug.cgi?id=834651 --- libvirt.spec.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 76e57aa..cac7d99 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -60,15 +60,16 @@ %if 0%{?fedora} %if 0%{?fedora} < 16 # Fedora doesn't have any QEMU on ppc64 until FC16 - only ppc + # I think F17 is the first release with the power64 macro %ifarch ppc64 %define with_qemu_tcg 0 %endif %endif %if 0%{?fedora} >= 18 - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x + %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %endif %if 0%{?fedora} >= 20 - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x %{arm} + %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} %endif %endif -- 1.9.3

2 5

[libvirt] [PATCH v2 0/6] Hugepages wrt NUMA
by Michal Privoznik 25 Jul '14

25 Jul '14

Another attempt. I've dropped the 1/7 from v1, and changed a few bits raised during review. Although, I'm still using: <memoryBacking> <hugepages> <page size='2048' unit='KiB'/> </hugepages> </memoryBacking> as I don't feel there's any disagreement. But if there is I can rework the patches. Michal Privoznik (6): Introduce virFileFindHugeTLBFS qemu: Utilize virFileFindHugeTLBFS virbitmap: Introduce virBitmapOverlaps domain: Introduce ./hugepages/page/[@size,@unit,@nodeset] qemu: Implement ./hugepages/page/[@size,@unit,@nodeset] tests: Some testing of hugepages mapping docs/formatdomain.html.in | 18 +- docs/schemas/domaincommon.rng | 19 +- src/Makefile.am | 12 +- src/conf/domain_conf.c | 197 +++++++++++++++++++-- src/conf/domain_conf.h | 13 +- src/libvirt_private.syms | 3 + src/parallels/parallels_driver.c | 2 +- src/qemu/qemu.conf | 9 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 111 ++++++++++-- src/qemu/qemu_conf.c | 124 +++++++++++-- src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_driver.c | 39 ++-- src/qemu/qemu_process.c | 21 ++- src/util/virbitmap.c | 20 +++ src/util/virbitmap.h | 3 + src/util/virfile.c | 151 +++++++++++++++- src/util/virfile.h | 12 ++ .../qemuxml2argv-hugepages-pages.args | 16 ++ .../qemuxml2argv-hugepages-pages.xml | 45 +++++ .../qemuxml2argv-hugepages-pages2.args | 10 ++ .../qemuxml2argv-hugepages-pages2.xml | 38 ++++ .../qemuxml2argv-hugepages-pages3.args | 9 + .../qemuxml2argv-hugepages-pages3.xml | 38 ++++ tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 2 +- tests/qemuxml2argvtest.c | 18 +- tests/qemuxml2xmltest.c | 3 + tests/virbitmaptest.c | 26 +++ 29 files changed, 878 insertions(+), 93 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.xml -- 1.8.5.5

3 14

[libvirt] [libvirt-glib] [PATCH v5 1/3] libvirt-gobject-domain: Add _fetch_snapshots
by Timm Bäder 25 Jul '14

25 Jul '14

This function can be used to fetch the snapshots of a domain (according to the given GVirDomainSnapshotListFlags) and save them in a domain-internal GHashTable. A function to access them from outside will be added in a later patch. --- libvirt-gobject/libvirt-gobject-domain.c | 86 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 37 ++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 2 + 3 files changed, 125 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index c6e30e5..adb5179 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -38,6 +38,8 @@ struct _GVirDomainPrivate { virDomainPtr handle; gchar uuid[VIR_UUID_STRING_BUFLEN]; + GHashTable *snapshots; + GMutex *lock; }; G_DEFINE_TYPE(GVirDomain, gvir_domain, G_TYPE_OBJECT); @@ -121,6 +123,11 @@ static void gvir_domain_finalize(GObject *object) g_debug("Finalize GVirDomain=%p", domain); + if (priv->snapshots) { + g_hash_table_unref(priv->snapshots); + } + g_mutex_free(priv->lock); + virDomainFree(priv->handle); G_OBJECT_CLASS(gvir_domain_parent_class)->finalize(object); @@ -237,6 +244,7 @@ static void gvir_domain_init(GVirDomain *domain) g_debug("Init GVirDomain=%p", domain); domain->priv = GVIR_DOMAIN_GET_PRIVATE(domain); + domain->priv->lock = g_mutex_new(); } typedef struct virDomain GVirDomainHandle; @@ -1514,3 +1522,81 @@ gvir_domain_create_snapshot(GVirDomain *dom, g_free(custom_xml); return dom_snapshot; } + + + +/** + * gvir_domain_fetch_snapshots: + * @dom: The domain + * @list_flags: bitwise-OR of #GVirDomainSnapshotListFlags + * @cancellable: (allow-none)(transfer-none): cancellation object + * @error: (allow-none): Place-holder for error or NULL + * + * Returns: TRUE on success, FALSE otherwise. + */ +gboolean gvir_domain_fetch_snapshots(GVirDomain *dom, + guint list_flags, + GCancellable *cancellable, + GError **error) +{ + GVirDomainPrivate *priv; + virDomainSnapshotPtr *snapshots = NULL; + GVirDomainSnapshot *snap; + GHashTable *snap_table; + int n_snaps = 0; + int i; + gboolean ret = TRUE; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail((error == NULL) || (*error == NULL), FALSE); + + priv = dom->priv; + + snap_table = g_hash_table_new_full(g_str_hash, + g_str_equal, + NULL, + g_object_unref); + + + n_snaps = virDomainListAllSnapshots(priv->handle, &snapshots, list_flags); + + if (g_cancellable_set_error_if_cancelled(cancellable, error)) { + ret = FALSE; + goto cleanup; + } + + if (n_snaps < 0) { + gvir_set_error(error, GVIR_DOMAIN_ERROR, 0, + "Unable to fetch snapshots of %s", + gvir_domain_get_name(dom)); + ret = FALSE; + goto cleanup; + } + + for (i = 0; i < n_snaps; i ++) { + if (g_cancellable_set_error_if_cancelled(cancellable, error)) { + ret = FALSE; + goto cleanup; + } + snap = GVIR_DOMAIN_SNAPSHOT(g_object_new(GVIR_TYPE_DOMAIN_SNAPSHOT, + "handle", snapshots[i], + NULL)); + g_hash_table_insert(snap_table, + (gpointer)gvir_domain_snapshot_get_name(snap), + snap); + } + + + g_mutex_lock(priv->lock); + if (priv->snapshots != NULL) + g_hash_table_unref(priv->snapshots); + priv->snapshots = snap_table; + snap_table = NULL; + g_mutex_unlock(priv->lock); + +cleanup: + free(snapshots); + if (snap_table != NULL) + g_hash_table_unref (snap_table); + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 38d3458..8c1a8e5 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -183,6 +183,39 @@ typedef enum { GVIR_DOMAIN_REBOOT_GUEST_AGENT = VIR_DOMAIN_REBOOT_GUEST_AGENT, } GVirDomainRebootFlags; +/** + * GVirDomainSnapshotListFlags: + * @GVIR_DOMAIN_SNAPSHOT_LIST_ALL: List all snapshots + * @GVIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS: List all descendants, not just + * children, when listing a snapshot. + * For historical reasons, groups do not use contiguous bits. + * @GVIR_DOMAIN_SNAPSHOT_LIST_ROOTS: Filter by snapshots with no parents, when listing a domain + * @GVIR_DOMAIN_SNAPSHOT_LIST_METADATA: Filter by snapshots which have metadata + * @GVIR_DOMAIN_SNAPSHOT_LIST_LEAVES: Filter by snapshots with no children + * @GVIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES: Filter by snapshots that have children + * @GVIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA: Filter by snapshots with no metadata + * @GVIR_DOMAIN_SNAPSHOT_LIST_INACTIVE: Filter by snapshots taken while guest was shut off + * @GVIR_DOMAIN_SNAPSHOT_LIST_ACTIVE: Filter by snapshots taken while guest was active, and with memory state + * @GVIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY: Filter by snapshots taken while guest was active, but without memory state + * @GVIR_DOMAIN_SNAPSHOT_LIST_INTERNAL: Filter by snapshots stored internal to disk images + * @GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL: Filter by snapshots that use files external to disk images + */ +typedef enum { + GVIR_DOMAIN_SNAPSHOT_LIST_ALL = 0, + GVIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS = VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS, + GVIR_DOMAIN_SNAPSHOT_LIST_ROOTS = VIR_DOMAIN_SNAPSHOT_LIST_ROOTS, + GVIR_DOMAIN_SNAPSHOT_LIST_METADATA = VIR_DOMAIN_SNAPSHOT_LIST_METADATA, + GVIR_DOMAIN_SNAPSHOT_LIST_LEAVES = VIR_DOMAIN_SNAPSHOT_LIST_LEAVES, + GVIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES = VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES, + GVIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA = VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA, + GVIR_DOMAIN_SNAPSHOT_LIST_INACTIVE = VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE, + GVIR_DOMAIN_SNAPSHOT_LIST_ACTIVE = VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE, + GVIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY = VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY, + GVIR_DOMAIN_SNAPSHOT_LIST_INTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL, + GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL +} GVirDomainSnapshotListFlags; + + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { @@ -330,6 +363,10 @@ gvir_domain_create_snapshot(GVirDomain *dom, guint flags, GError **err); +gboolean gvir_domain_fetch_snapshots(GVirDomain *dom, + guint list_flags, + GCancellable *cancellable, + GError **error); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index b781cc6..781310f 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -236,7 +236,9 @@ LIBVIRT_GOBJECT_0.1.5 { LIBVIRT_GOBJECT_0.1.9 { global: + gvir_domain_fetch_snapshots; gvir_domain_snapshot_delete; + gvir_domain_snapshot_list_flags_get_type; } LIBVIRT_GOBJECT_0.1.5; # .... define new API here using predicted next version number .... -- 2.0.1

2 5

[libvirt] [PATCH] qemu: Fix starting of VMs with empty CDROM drives
by Peter Krempa 25 Jul '14

25 Jul '14

Since 24e5cafba6dbc2722e05f92dc0ae31b0f938f9f0 (thankfully unreleased) when a VM with an empty disk drive would be started the code would call stat() on NULL path as a check was missing from the callback rendering machines unstartable. Report success when the path is empty (denoting an empty drive). --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ca0d77f..704ba39 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -343,6 +343,9 @@ qemuSecurityChownCallback(virStorageSourcePtr src, if (virStorageSourceIsLocalStorage(src)) { /* use direct chmod for local files so that the file doesn't * need to be initialized */ + if (!src->path) + return 0; + if (stat(src->path, &sb) >= 0) { if (sb.st_uid == uid && sb.st_gid == gid) { -- 2.0.0

2 2

[libvirt] [PATCH] libvirt: Fix 'quest' typo in comment
by Li Yang 25 Jul '14

25 Jul '14

Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- src/libvirt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 79bcdf1..143d319 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2950,7 +2950,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, * a crashed state after the dump completes. If @flags includes * VIR_DUMP_LIVE, then make the core dump while continuing to allow * the guest to run; otherwise, the guest is suspended during the dump. - * VIR_DUMP_RESET flag forces reset of the quest after dump. + * VIR_DUMP_RESET flag forces reset of the guest after dump. * The above three flags are mutually exclusive. * * Additionally, if @flags includes VIR_DUMP_BYPASS_CACHE, then libvirt @@ -3042,7 +3042,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) * a crashed state after the dump completes. If @flags includes * VIR_DUMP_LIVE, then make the core dump while continuing to allow * the guest to run; otherwise, the guest is suspended during the dump. - * VIR_DUMP_RESET flag forces reset of the quest after dump. + * VIR_DUMP_RESET flag forces reset of the guest after dump. * The above three flags are mutually exclusive. * * Additionally, if @flags includes VIR_DUMP_BYPASS_CACHE, then libvirt -- 1.7.1

2 1

[libvirt] [PATCH] util: virTimeFieldsThenRaw never return negative
by James 25 Jul '14

25 Jul '14

virTimeFieldsThenRaw will never return negative result, so I clean up the related meaningless judgements to make it better. Signed-off-by: James <james.wangyufei(a)huawei.com> --- src/util/virtime.c | 23 ++++++++--------------- src/util/virtime.h | 8 ++++---- tests/virtimetest.c | 3 +-- 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/util/virtime.c b/src/util/virtime.c index 2a91ea5..a49e287 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -94,7 +94,8 @@ int virTimeFieldsNowRaw(struct tm *fields) if (virTimeMillisNowRaw(&now) < 0) return -1; - return virTimeFieldsThenRaw(now, fields); + virTimeFieldsThenRaw(now, fields); + return 0; } @@ -121,9 +122,8 @@ const unsigned short int __mon_yday[2][13] = { * Converts the timestamp @when into broken-down field format. * Time time is always in UTC * - * Returns 0 on success, -1 on error with errno set */ -int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) +void virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) { /* This code is taken from GLibC under terms of LGPLv2+ */ long int days, rem, y; @@ -171,7 +171,6 @@ int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) days -= ip[y]; fields->tm_mon = y; fields->tm_mday = days + 1; - return 0; } @@ -209,8 +208,7 @@ int virTimeStringThenRaw(unsigned long long when, char *buf) { struct tm fields; - if (virTimeFieldsThenRaw(when, &fields) < 0) - return -1; + virTimeFieldsThenRaw(when, &fields); fields.tm_year += 1900; fields.tm_mon += 1; @@ -264,7 +262,8 @@ int virTimeFieldsNow(struct tm *fields) if (virTimeMillisNow(&now) < 0) return -1; - return virTimeFieldsThen(now, fields); + virTimeFieldsThen(now, fields); + return 0; } @@ -276,16 +275,10 @@ int virTimeFieldsNow(struct tm *fields) * Converts the timestamp @when into broken-down field format. * Time time is always in UTC * - * Returns 0 on success, -1 on error with error reported */ -int virTimeFieldsThen(unsigned long long when, struct tm *fields) +void virTimeFieldsThen(unsigned long long when, struct tm *fields) { - if (virTimeFieldsThenRaw(when, fields) < 0) { - virReportSystemError(errno, "%s", - _("Unable to break out time format")); - return -1; - } - return 0; + virTimeFieldsThenRaw(when, fields); } diff --git a/src/util/virtime.h b/src/util/virtime.h index 25332db..f9432da 100644 --- a/src/util/virtime.h +++ b/src/util/virtime.h @@ -43,8 +43,8 @@ int virTimeMillisNowRaw(unsigned long long *now) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virTimeFieldsNowRaw(struct tm *fields) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +void virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) + ATTRIBUTE_NONNULL(2); int virTimeStringNowRaw(char *buf) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virTimeStringThenRaw(unsigned long long when, char *buf) @@ -57,8 +57,8 @@ int virTimeMillisNow(unsigned long long *now) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virTimeFieldsNow(struct tm *fields) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -int virTimeFieldsThen(unsigned long long when, struct tm *fields) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +void virTimeFieldsThen(unsigned long long when, struct tm *fields) + ATTRIBUTE_NONNULL(2); char *virTimeStringNow(void); char *virTimeStringThen(unsigned long long when); diff --git a/tests/virtimetest.c b/tests/virtimetest.c index 859bd13..64bf19b 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -44,8 +44,7 @@ static int testTimeFields(const void *args) const struct testTimeFieldsData *data = args; struct tm actual; - if (virTimeFieldsThen(data->when, &actual) < 0) - return -1; + virTimeFieldsThen(data->when, &actual); #define COMPARE(field) \ do { \ -- 1.7.12.4

2 1

[libvirt] [PATCH] libvirt-guests: fix some typos in a comment
by Martin Kletzander 25 Jul '14

25 Jul '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as trivial tools/libvirt-guests.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index a158b62..1b17bbe 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2011-2013 Red Hat, Inc. +# Copyright (C) 2011-2014 Red Hat, Inc. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -250,8 +250,8 @@ suspend_guest() } # shutdown_guest URI GUEST -# Start a ACPI shutdown of GUEST on URI. This function return after the quest -# was successfully shutdown or the timeout defined by $SHUTDOWN_TIMEOUT expires. +# Start an ACPI shutdown of GUEST on URI. This function returns after the guest +# was successfully shutdown or the timeout defined by $SHUTDOWN_TIMEOUT expired. shutdown_guest() { uri=$1 -- 2.0.2

1 0

[libvirt] [PATCH V2 0/6] Some improvements for video model.
by Wang Rui 25 Jul '14

25 Jul '14

From: Zeng Junliang <zengjunliang(a)huawei.com> https://www.redhat.com/archives/libvir-list/2014-June/msg00569.html diff to v1: - Rmoving the confusing vram attribute for cirrus and stdvga. - leave out cirrus for the new vgamem attribute. - add secondary-vga supports and some other docs and tests. Zeng Junliang (6): qemu: Remove vram attribute in some cases qemu: Introduce vgamem attribute for video model qemu: Add support for secondary-vga tests: modify test case related to vgamem attribute tests: Add test cases for secondary-vga docs: add description for vgamem attribute and secondary-vga docs/formatdomain.html.in | 39 ++++--- docs/schemas/domaincommon.rng | 5 + qemuxml2argv-graphics-vnc-secondary-vga.xml | 39 +++++++ src/conf/domain_conf.c | 71 ++++++++++-- src/conf/domain_conf.h | 4 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 125 ++++++++++++++------- ...qemuhotplug-console-compat-2+console-virtio.xml | 2 +- .../qemuxml2argv-console-compat-2.xml | 2 +- .../qemuxml2argv-controller-order.xml | 2 +- .../qemuxml2argv-graphics-listen-network.xml | 2 +- .../qemuxml2argv-graphics-listen-network2.xml | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 5 +- ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 4 +- .../qemuxml2argv-graphics-spice-agentmouse.xml | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 4 +- .../qemuxml2argv-graphics-spice-compression.xml | 4 +- .../qemuxml2argv-graphics-spice-listen-network.xml | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 +- .../qemuxml2argv-graphics-spice-sasl.args | 3 +- .../qemuxml2argv-graphics-spice-sasl.xml | 2 +- .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- .../qemuxml2argv-graphics-spice.args | 5 +- .../qemuxml2argv-graphics-spice.xml | 4 +- .../qemuxml2argv-graphics-vnc-policy.xml | 2 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 2 +- .../qemuxml2argv-graphics-vnc-secondary-vga.args | 7 ++ .../qemuxml2argv-graphics-vnc-secondary-vga.xml | 39 +++++++ .../qemuxml2argv-graphics-vnc-socket.xml | 2 +- .../qemuxml2argv-graphics-vnc-tls.xml | 2 +- .../qemuxml2argv-graphics-vnc-websocket.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- .../qemuxml2argv-net-bandwidth.xml | 2 +- .../qemuxml2argv-pci-autoadd-addr.xml | 2 +- .../qemuxml2argv-pci-autoadd-idx.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml | 2 +- .../qemuxml2argv-pcihole64-q35.args | 3 +- .../qemuxml2argv-pcihole64-q35.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 2 +- .../qemuxml2argv-serial-spiceport.args | 4 +- .../qemuxml2argv-serial-spiceport.xml | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 9 +- .../qemuxml2argv-video-device-pciaddr-default.xml | 6 +- tests/qemuxml2argvtest.c | 10 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 57 files changed, 345 insertions(+), 123 deletions(-) create mode 100644 qemuxml2argv-graphics-vnc-secondary-vga.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-secondary-vga.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-secondary-vga.xml -- 1.7.12.4

3 15

[libvirt] [PATCH 0/3] Multiple RNG device support
by Peter Krempa 25 Jul '14

25 Jul '14

Qemu and kernel support multiple RNG's, so I revived my old patch to add the support to libvirt. Peter Krempa (3): qemu: cgroup: Don't use NULL path on default backed RNGs virtio-rng: allow multiple RNG devices test: qemu: Add tests for multiple virtio-rng devices src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 58 +++++++++++----------- src/conf/domain_conf.h | 4 +- src/qemu/qemu_cgroup.c | 27 ++++++---- src/qemu/qemu_command.c | 29 ++++++----- .../qemuxml2argv-virtio-rng-multiple.args | 9 ++++ .../qemuxml2argv-virtio-rng-multiple.xml | 31 ++++++++++++ tests/qemuxml2argvtest.c | 2 + 8 files changed, 109 insertions(+), 55 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.xml -- 2.0.0

3 7

[libvirt] about ceph+qcow2+qemu(snapshot) support issue ?
by haiquan517＠sina.com 25 Jul '14

25 Jul '14

Hi , Could you pls help me ask one question , now we are testing a fuction , about Ceph+ qcow2+(qemu(snapshot) tec, now we are running this command print this error : virsh snapshot-create-as --domain win08q2 --name snapwin08q2 --description "test ucsm+qcow2"error: operation failed: Error -5 while writing VM so we want to confirm that the ceph rbd if support qemu qcow2 format oneline snapshot , thanks a lot!

1 0

[libvirt] [PATCH] util: virTimeFieldsThenRaw never return negative
by Wang Rui 25 Jul '14

25 Jul '14

From: James <james.wangyufei(a)huawei.com> virTimeFieldsThenRaw will never return negative result, so I delete related judgement. Signed-off-by: James <james.wangyufei(a)huawei.com> --- src/util/virtime.c | 7 ++----- src/util/virtime.h | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/util/virtime.c b/src/util/virtime.c index 2a91ea5..662c161 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -121,9 +121,8 @@ const unsigned short int __mon_yday[2][13] = { * Converts the timestamp @when into broken-down field format. * Time time is always in UTC * - * Returns 0 on success, -1 on error with errno set */ -int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) +void virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) { /* This code is taken from GLibC under terms of LGPLv2+ */ long int days, rem, y; @@ -171,7 +170,6 @@ int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) days -= ip[y]; fields->tm_mon = y; fields->tm_mday = days + 1; - return 0; } @@ -209,8 +207,7 @@ int virTimeStringThenRaw(unsigned long long when, char *buf) { struct tm fields; - if (virTimeFieldsThenRaw(when, &fields) < 0) - return -1; + virTimeFieldsThenRaw(when, &fields); fields.tm_year += 1900; fields.tm_mon += 1; diff --git a/src/util/virtime.h b/src/util/virtime.h index 25332db..61f36dc 100644 --- a/src/util/virtime.h +++ b/src/util/virtime.h @@ -43,12 +43,12 @@ int virTimeMillisNowRaw(unsigned long long *now) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virTimeFieldsNowRaw(struct tm *fields) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -int virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virTimeStringNowRaw(char *buf) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virTimeStringThenRaw(unsigned long long when, char *buf) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +void virTimeFieldsThenRaw(unsigned long long when, struct tm *fields) + ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; /* These APIs are *not* async signal safe and return -1, * raising a libvirt error on failure -- 1.7.12.4

2 2

[libvirt] KVM Forum 2014 Call for Participation
by Paolo Bonzini 24 Jul '14

24 Jul '14

================================================================= KVM Forum 2014: Call For Participation October 14-16, 2014 - Congress Centre Düsseldorf - Düsseldorf, Germany (All submissions must be received before midnight July 27, 2014) ================================================================= KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. Mark your calendar and join us in advancing KVM. http://events.linuxfoundation.org/events/kvm-forum/ Once again we are colocated with the Linux Foundation's LinuxCon Europe, CloudOpen Europe, Embedded Linux Conference (ELC) Europe, and this year, the Linux Plumbers Conference. KVM Forum attendees will be able to attend LinuxCon + CloudOpen + ELC for a discounted rate. http://events.linuxfoundation.org/events/kvm-forum/attend/register We invite you to lead part of the discussion by submitting a speaking proposal for KVM Forum 2014. http://events.linuxfoundation.org/cfp Suggested topics: KVM/Kernel - Scaling and optimizations - Nested virtualization - Linux kernel performance improvements - Resource management (CPU, I/O, memory) - Hardening and security - VFIO: SR-IOV, GPU, platform device assignment - Architecture ports QEMU - Management interfaces: QOM and QMP - New devices, new boards, new architectures - Scaling and optimizations - Desktop virtualization and SPICE - Virtual GPU - virtio and vhost, including non-Linux or non-virtualized uses - Hardening and security - New storage features - Live migration and fault tolerance - High availability and continuous backup - Real-time guest support - Emulation and TCG - Firmware: ACPI, UEFI, coreboot, u-Boot, etc. - Testing Management and infrastructure - Managing KVM: Libvirt, OpenStack, oVirt, etc. - Storage: glusterfs, Ceph, etc. - Software defined networking: Open vSwitch, OpenDaylight, etc. - Network Function Virtualization - Security - Provisioning - Performance tuning =============== SUBMITTING YOUR PROPOSAL =============== Abstracts due: July 27, 2014 Please submit a short abstract (~150 words) describing your presentation proposal. Slots vary in length up to 45 minutes. Also include in your proposal the proposal type -- one of: - technical talk - end-user talk Submit your proposal here: http://events.linuxfoundation.org/cfp Please only use the categories "presentation" and "panel discussion" You will receive a notification whether or not your presentation proposal was accepted by Aug 20th. Speakers will receive a complimentary pass for the event. In the instance that your submission has multiple presenters, only the primary speaker for a proposal will receive a complementary event pass. For panel discussions, all panelists will receive a complimentary event pass. TECHNICAL TALKS A good technical talk should not just report on what has happened over the last year; it should present a concrete problem and how it impacts the user and/or developer community. Whenever applicable, it should focus on the work that needs to be done or the difficulties that haven't yet been solved. Summarizing recent developments is okay but it should not be more than a small portion of the overall talk. END-USER TALKS One of the big challenges as developers is to know what, where and how people actually use our software. We will reserve a few slots for end users talking about their deployment challenges and achievements. If you are using KVM in production you are encouraged submit a speaking proposal. Simply mark it as an end-user talk. As an end user, this is a unique opportunity to get your input to developers. HANDS-ON / BOF SESSIONS We will reserve some time for people to get together and discuss strategic decisions as well as other topics that are best solved within smaller groups. This time can also be used for hands-on hacking sessions if you have concrete code problems to solve. These sessions will be announced during the event. If you are interested in organizing such a session, please add it to the list at http://www.linux-kvm.org/page/KVM_Forum_2014_BOF Let people you think might be interested know about it, and encourage them to add their names to the wiki page as well. Please try to add your ideas to the list before KVM Forum starts. PANEL DISCUSSIONS If you are proposing a panel discussion, please make sure that you list all of your potential panelists in your abstract. We will request full biographies if a panel is accepted. =============== HOTEL / TRAVEL =============== The KVM Forum 2014 will be held in Düsseldorf, Germany at Congress Centre Düsseldorf http://events.linuxfoundation.org/events/kvm-forum/attend/hotel-and-travel =============== IMPORTANT DATES =============== Notification: August 20, 2014 Schedule announced: August 29, 2014 Event dates: October 14-16, 2014 Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2014 in October! -your KVM Forum 2014 Program Committee Please contact us with any questions or comments.

1 1

[libvirt] [PATCH] qemu: Remove extraneous space in function prototypes
by John Ferlan 24 Jul '14

24 Jul '14

During review of the iSCSI hostdev series, eblake noted that the prototypes shouldn't have the extranenous space between the "*" and the function name: http://www.redhat.com/archives/libvir-list/2014-July/msg01227.html Since it was more invasive than 1 or 2 lines - I said I'd send a patch covering this once committed. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NOTE: There are other instances of this in other trees - I figured I'd just cover this particular directory. I can do more if desired... src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.h | 136 +++++++++++++++++++++---------------------- src/qemu/qemu_conf.h | 2 +- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4332633..d80daaa 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -310,7 +310,7 @@ bool virQEMUCapsSupportsChardev(virDomainDefPtr def, bool virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps, const char *canonical_machine); -const char * virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps); +const char *virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps); int virQEMUCapsInitGuestFromBinary(virCapsPtr caps, const char *binary, diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index b71e964..95f3fc9 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -58,11 +58,11 @@ typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; struct _qemuBuildCommandLineCallbacks { - char * (*qemuGetSCSIDeviceSgName) (const char *sysfs_prefix, - const char *adapter, - unsigned int bus, - unsigned int target, - unsigned int unit); + char *(*qemuGetSCSIDeviceSgName) (const char *sysfs_prefix, + const char *adapter, + unsigned int bus, + unsigned int target, + unsigned int unit); }; extern qemuBuildCommandLineCallbacks buildCommandLineCallbacks; @@ -89,27 +89,27 @@ qemuBuildChrDeviceStr(char **deviceStr, virQEMUCapsPtr qemuCaps); /* With vlan == -1, use netdev syntax, else old hostnet */ -char * qemuBuildHostNetStr(virDomainNetDefPtr net, - virQEMUDriverPtr driver, - char type_sep, - int vlan, - char **tapfd, - int tapfdSize, - char **vhostfd, - int vhostfdSize); +char *qemuBuildHostNetStr(virDomainNetDefPtr net, + virQEMUDriverPtr driver, + char type_sep, + int vlan, + char **tapfd, + int tapfdSize, + char **vhostfd, + int vhostfdSize); /* Legacy, pre device support */ -char * qemuBuildNicStr(virDomainNetDefPtr net, - const char *prefix, - int vlan); +char *qemuBuildNicStr(virDomainNetDefPtr net, + const char *prefix, + int vlan); /* Current, best practice */ -char * qemuBuildNicDevStr(virDomainDefPtr def, - virDomainNetDefPtr net, - int vlan, - int bootindex, - int vhostfdSize, - virQEMUCapsPtr qemuCaps); +char *qemuBuildNicDevStr(virDomainDefPtr def, + virDomainNetDefPtr net, + int vlan, + int bootindex, + int vhostfdSize, + virQEMUCapsPtr qemuCaps); char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps); @@ -123,68 +123,68 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, virQEMUCapsPtr qemuCaps); /* Current, best practice */ -char * qemuBuildDriveDevStr(virDomainDefPtr def, - virDomainDiskDefPtr disk, - int bootindex, - virQEMUCapsPtr qemuCaps); -char * qemuBuildFSDevStr(virDomainDefPtr domainDef, - virDomainFSDefPtr fs, - virQEMUCapsPtr qemuCaps); +char *qemuBuildDriveDevStr(virDomainDefPtr def, + virDomainDiskDefPtr disk, + int bootindex, + virQEMUCapsPtr qemuCaps); +char *qemuBuildFSDevStr(virDomainDefPtr domainDef, + virDomainFSDefPtr fs, + virQEMUCapsPtr qemuCaps); /* Current, best practice */ -char * qemuBuildControllerDevStr(virDomainDefPtr domainDef, - virDomainControllerDefPtr def, - virQEMUCapsPtr qemuCaps, - int *nusbcontroller); +char *qemuBuildControllerDevStr(virDomainDefPtr domainDef, + virDomainControllerDefPtr def, + virQEMUCapsPtr qemuCaps, + int *nusbcontroller); -char * qemuBuildWatchdogDevStr(virDomainDefPtr domainDef, - virDomainWatchdogDefPtr dev, - virQEMUCapsPtr qemuCaps); +char *qemuBuildWatchdogDevStr(virDomainDefPtr domainDef, + virDomainWatchdogDefPtr dev, + virQEMUCapsPtr qemuCaps); -char * qemuBuildMemballoonDevStr(virDomainDefPtr domainDef, - virDomainMemballoonDefPtr dev, - virQEMUCapsPtr qemuCaps); +char *qemuBuildMemballoonDevStr(virDomainDefPtr domainDef, + virDomainMemballoonDefPtr dev, + virQEMUCapsPtr qemuCaps); -char * qemuBuildUSBInputDevStr(virDomainDefPtr domainDef, - virDomainInputDefPtr dev, - virQEMUCapsPtr qemuCaps); +char *qemuBuildUSBInputDevStr(virDomainDefPtr domainDef, + virDomainInputDefPtr dev, + virQEMUCapsPtr qemuCaps); -char * qemuBuildSoundDevStr(virDomainDefPtr domainDef, - virDomainSoundDefPtr sound, - virQEMUCapsPtr qemuCaps); +char *qemuBuildSoundDevStr(virDomainDefPtr domainDef, + virDomainSoundDefPtr sound, + virQEMUCapsPtr qemuCaps); /* Legacy, pre device support */ -char * qemuBuildPCIHostdevPCIDevStr(virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps); +char *qemuBuildPCIHostdevPCIDevStr(virDomainHostdevDefPtr dev, + virQEMUCapsPtr qemuCaps); /* Current, best practice */ -char * qemuBuildPCIHostdevDevStr(virDomainDefPtr def, - virDomainHostdevDefPtr dev, - const char *configfd, - virQEMUCapsPtr qemuCaps); +char *qemuBuildPCIHostdevDevStr(virDomainDefPtr def, + virDomainHostdevDefPtr dev, + const char *configfd, + virQEMUCapsPtr qemuCaps); int qemuOpenPCIConfig(virDomainHostdevDefPtr dev); /* Legacy, pre device support */ -char * qemuBuildUSBHostdevUSBDevStr(virDomainHostdevDefPtr dev); +char *qemuBuildUSBHostdevUSBDevStr(virDomainHostdevDefPtr dev); /* Current, best practice */ -char * qemuBuildUSBHostdevDevStr(virDomainDefPtr def, +char *qemuBuildUSBHostdevDevStr(virDomainDefPtr def, + virDomainHostdevDefPtr dev, + virQEMUCapsPtr qemuCaps); + +char *qemuBuildSCSIHostdevDrvStr(virConnectPtr conn, + virDomainHostdevDefPtr dev, + virQEMUCapsPtr qemuCaps, + qemuBuildCommandLineCallbacksPtr callbacks) + ATTRIBUTE_NONNULL(4); +char *qemuBuildSCSIHostdevDevStr(virDomainDefPtr def, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps); -char * qemuBuildSCSIHostdevDrvStr(virConnectPtr conn, - virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps, - qemuBuildCommandLineCallbacksPtr callbacks) - ATTRIBUTE_NONNULL(4); -char * qemuBuildSCSIHostdevDevStr(virDomainDefPtr def, - virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps); - -char * qemuBuildHubDevStr(virDomainDefPtr def, - virDomainHubDefPtr dev, - virQEMUCapsPtr qemuCaps); -char * qemuBuildRedirdevDevStr(virDomainDefPtr def, - virDomainRedirdevDefPtr dev, - virQEMUCapsPtr qemuCaps); +char *qemuBuildHubDevStr(virDomainDefPtr def, + virDomainHubDefPtr dev, + virQEMUCapsPtr qemuCaps); +char *qemuBuildRedirdevDevStr(virDomainDefPtr def, + virDomainRedirdevDefPtr dev, + virQEMUCapsPtr qemuCaps); int qemuNetworkIfaceConnect(virDomainDefPtr def, virConnectPtr conn, virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 78b08e5..1ee5175 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -284,7 +284,7 @@ bool qemuSharedDeviceEntryDomainExists(qemuSharedDeviceEntryPtr entry, int *index) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -char * qemuGetSharedDeviceKey(const char *disk_path) +char *qemuGetSharedDeviceKey(const char *disk_path) ATTRIBUTE_NONNULL(1); void qemuSharedDeviceEntryFree(void *payload, const void *name) -- 1.9.3

2 2

[libvirt] [PATCH] bhyve: cdrom support
by Roman Bogorodskiy 24 Jul '14

24 Jul '14

Add support for CDROM devices for bhyve driver using bhyve(8)'s 'ahci-cd' device type. As bhyve currently does not support media insertion at runtime, disallow to start a domain with an empty source path for cdrom devices. --- src/bhyve/bhyve_command.c | 43 +++++++++++++++++----- .../bhyvexml2argv-disk-cdrom.args | 3 ++ .../bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 22 +++++++++++ tests/bhyvexml2argvtest.c | 1 + 4 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index f1862fe..7862bc8 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -152,13 +152,31 @@ bhyveBuildDiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, virCommandPtr cmd) { const char *bus_type; + const char *disk_source; switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_SATA: - bus_type = "ahci-hd"; + switch (disk->device) { + case VIR_DOMAIN_DISK_DEVICE_DISK: + bus_type = "ahci-hd"; + break; + case VIR_DOMAIN_DISK_DEVICE_CDROM: + bus_type = "ahci-cd"; + break; + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unsupported disk device")); + return -1; + } break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - bus_type = "virtio-blk"; + if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) { + bus_type = "virtio-blk"; + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unsupported disk device")); + return -1; + } break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -166,22 +184,26 @@ bhyveBuildDiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, return -1; } - if (disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unsupported disk device")); - return -1; - } - if (virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_FILE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported disk type")); return -1; } + disk_source = virDomainDiskGetSource(disk); + + if ((disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && + (disk_source == NULL)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cdrom device without source path " + "not supported")); + return -1; + } + virCommandAddArg(cmd, "-s"); virCommandAddArgFormat(cmd, "%d:0,%s,%s", disk->info.addr.pci.slot, bus_type, - virDomainDiskGetSource(disk)); + disk_source); return 0; } @@ -282,7 +304,8 @@ virBhyveProcessBuildLoadCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, disk = def->disks[0]; - if (disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) { + if ((disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) && + (disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported disk device")); return NULL; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args new file mode 100644 index 0000000..eb38969 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args @@ -0,0 +1,3 @@ +/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-cd,/tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml new file mode 100644 index 0000000..d70219c --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml @@ -0,0 +1,22 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file' device='cdrom'> + <driver name='file' type='raw'/> + <source file='/tmp/cdrom.iso'/> + <target dev='hdc' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index f6f2bc4..408c73a 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -104,6 +104,7 @@ mymain(void) DO_TEST("base"); DO_TEST("acpiapic"); + DO_TEST("disk-cdrom"); DO_TEST("disk-virtio"); DO_TEST("macaddr"); DO_TEST("serial"); -- 1.9.0

2 2

[libvirt] [PATCH] remove range checking for blkiotune weight
by Martin Kletzander 24 Jul '14

24 Jul '14

This was changed before: https://www.redhat.com/archives/libvir-list/2013-October/msg00525.html but not everywhere in the code. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1100769 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/lxc/lxc_driver.c | 14 -------------- src/qemu/qemu_driver.c | 14 -------------- tools/virsh-domain.c | 2 +- tools/virsh.pod | 5 +---- 4 files changed, 2 insertions(+), 33 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ecd9053..9e12ecc 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2559,13 +2559,6 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = &params[i]; 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; - continue; - } - if (virCgroupSetBlkioWeight(priv->cgroup, params[i].value.ui) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || @@ -2660,13 +2653,6 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = &params[i]; 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; - continue; - } - persistentDef->blkio.weight = params[i].value.ui; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS) || diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 06d3f53..be622af 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7819,13 +7819,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = &params[i]; 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; - continue; - } - if (virCgroupSetBlkioWeight(priv->cgroup, params[i].value.ui) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || @@ -7920,13 +7913,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = &params[i]; 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; - continue; - } - persistentDef->blkio.weight = params[i].value.ui; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS) || diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6fcfd9c..ad68aab 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1255,7 +1255,7 @@ static const vshCmdOptDef opts_blkiotune[] = { }, {.name = "weight", .type = VSH_OT_INT, - .help = N_("IO Weight in range [100, 1000]") + .help = N_("IO Weight") }, {.name = "device-weights", .type = VSH_OT_STRING, diff --git a/tools/virsh.pod b/tools/virsh.pod index 849ae31..f387ab7 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1824,13 +1824,10 @@ Specifying -1 as a value for these limits is interpreted as unlimited. [[I<--config>] [I<--live>] | [I<--current>]] Display or set the blkio parameters. QEMU/KVM supports I<--weight>. -I<--weight> is in range [100, 1000]. After kernel 2.6.39, the value -could be in the range [10, 1000]. B<device-weights> is a single string listing one or more device/weight pairs, in the format of /path/to/device,weight,/path/to/device,weight. -Each weight is in the range [100, 1000], [10, 1000] after kernel 2.6.39, -or the value 0 to remove that device from per-device listings. +Specifying 0 for any weight removes that device from per-device listings. Only the devices listed in the string are modified; any existing per-device weights for other devices remain unchanged. -- 2.0.2

2 1

[libvirt] [PATCH] qemuConnectGetDomainCapabilities: Report error on unknown arch
by Michal Privoznik 24 Jul '14

24 Jul '14

If user hasn't provided any @emulatorbin, the qemuCaps are searched by @arch provided (which in fact can be guessed from the host). However, there's no guarantee that the qemu binary for @arch will exist. Therefore qemu capabilities may be nonexistent too. If that's the case, we should throw an error message prior jumping onto 'cleanup' label as the helper lookup function remains silent on no search result. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Notes: This would qualify to be pushed under trivial rule, but maybe somebody has a better idea for the error message (or its code). src/qemu/qemu_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 06d3f53..8e01965 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16990,8 +16990,12 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn, } } else { if (!(qemuCaps = virQEMUCapsCacheLookupByArch(driver->qemuCapsCache, - arch))) + arch))) { + virReportError(VIR_ERR_INVALID_ARG, + _("unable to find any emulator to serve '%s' " + "architecture"), virArchToString(arch)); goto cleanup; + } emulatorbin = virQEMUCapsGetBinary(qemuCaps); } -- 1.8.5.5

2 1

[libvirt] [PATCH 0/2] Allow display type selection in virsh domdisplay
by Martin Kletzander 24 Jul '14

24 Jul '14

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=997802 Martin Kletzander (2): virsh: add error message when no graphical display is found virsh: add option for selecting domdisplay type tools/virsh-domain.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) -- 2.0.2

2 3

[libvirt] [PATCH RFC] storage: ZFS support
by Roman Bogorodskiy 24 Jul '14

24 Jul '14

Implement ZFS storage backend driver. Currently supported only on FreeBSD because of ZFS limitations on Linux. Features supported: - pool-start, pool-stop - pool-info - vol-list - vol-create / vol-delete Pool definition looks like that: <pool type='zfs'> <name>myzfspool</name> <source> <name>actualpoolname</name> </source> </pool> The 'actualpoolname' value is a name of the pool on the system, such as shown by 'zpool list' command. Target makes no sense here because volumes path is always /dev/zvol/$poolname/$volname. Users has to create a pool on his own, this driver doesn't support pool creation currently. A volume could be used with Qemu by adding an entry like this: <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='myzfspool' volume='vol5'/> <target dev='hdc' bus='ide'/> </disk> --- configure.ac | 43 +++++ include/libvirt/libvirt.h.in | 1 + po/POTFILES.in | 1 + src/Makefile.am | 8 + src/conf/storage_conf.c | 11 +- src/conf/storage_conf.h | 4 +- src/qemu/qemu_conf.c | 1 + src/storage/storage_backend.c | 6 + src/storage/storage_backend_zfs.c | 344 ++++++++++++++++++++++++++++++++++++++ src/storage/storage_backend_zfs.h | 29 ++++ src/storage/storage_driver.c | 1 + tools/virsh-pool.c | 3 + 12 files changed, 449 insertions(+), 3 deletions(-) create mode 100644 src/storage/storage_backend_zfs.c create mode 100644 src/storage/storage_backend_zfs.h diff --git a/configure.ac b/configure.ac index f37c716..7e46460 100644 --- a/configure.ac +++ b/configure.ac @@ -1734,6 +1734,10 @@ AC_ARG_WITH([storage-gluster], [AS_HELP_STRING([--with-storage-gluster], [with Gluster backend for the storage driver @<:@default=check@:>@])], [],[with_storage_gluster=check]) +AC_ARG_WITH([storage-zfs], + [AS_HELP_STRING([--with-storage-zfs], + [with ZFS backend for the storage driver @<:@default=check@:>@])], + [],[with_storage_zfs=check]) if test "$with_libvirtd" = "no"; then with_storage_dir=no @@ -1746,6 +1750,7 @@ if test "$with_libvirtd" = "no"; then with_storage_rbd=no with_storage_sheepdog=no with_storage_gluster=no + with_storage_zfs=no fi if test "$with_storage_dir" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_STORAGE_DIR], 1, [whether directory backend for storage driver is enabled]) @@ -1963,6 +1968,43 @@ if test "$with_storage_gluster" = "yes"; then fi AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"]) +if test "$with_storage_zfs" = "check"; then + with_storage_zfs=$with_freebsd +fi + +if test "$with_storage_zfs" = "yes" && test "$with_freebsd" = "no"; then + AC_MSG_ERROR([The ZFS storage driver can be enabled on FreeBSD only.]) +fi + +if test "$with_storage_zfs" = "yes" || + test "$with_storage_zfs" = "check"; then + AC_PATH_PROG([ZFS], [zfs], [], [$PATH:/sbin:/usr/sbin]) + AC_PATH_PROG([ZPOOL], [zpool], [], [$PATH:/sbin:/usr/sbin]) + + if test "$with_storage_zfs" = "yes"; then + if test -z "$ZFS" || test -z "$ZPOOL"; then + AC_MSG_ERROR([We need zfs and zpool for ZFS storage driver]) + fi + else + if test -z "$ZFS" || test -z "$ZPOOL"; then + with_storage_zfs=no + fi + + if test "$with_storage_zfs" = "check"; then + with_storage_zfs=yes + fi + fi + + if test "$with_storage_zfs" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_STORAGE_ZFS], 1, + [whether ZFS backend for storage driver is enabled]) + AC_DEFINE_UNQUOTED([ZFS], ["$ZFS"], [Location of zfs program]) + AC_DEFINE_UNQUOTED([ZPOOL], ["$ZPOOL"], [Location of zpool program]) + fi +fi +AM_CONDITIONAL([WITH_STORAGE_ZFS], + [test "$with_storage_zfs" = "yes"]) + if test "$with_storage_fs" = "yes" || test "$with_storage_gluster" = "yes"; then AC_PATH_PROG([GLUSTER_CLI], [gluster], [], [$PATH:/sbin:/usr/sbin]) @@ -2806,6 +2848,7 @@ AC_MSG_NOTICE([ Disk: $with_storage_disk]) AC_MSG_NOTICE([ RBD: $with_storage_rbd]) AC_MSG_NOTICE([Sheepdog: $with_storage_sheepdog]) AC_MSG_NOTICE([ Gluster: $with_storage_gluster]) +AC_MSG_NOTICE([ ZFS: $with_storage_zfs]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Security Drivers]) AC_MSG_NOTICE([]) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index ad6785f..47ea695 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3170,6 +3170,7 @@ typedef enum { VIR_CONNECT_LIST_STORAGE_POOLS_RBD = 1 << 14, VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG = 1 << 15, VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER = 1 << 16, + VIR_CONNECT_LIST_STORAGE_POOLS_ZFS = 1 << 17, } virConnectListAllStoragePoolsFlags; int virConnectListAllStoragePools(virConnectPtr conn, diff --git a/po/POTFILES.in b/po/POTFILES.in index d10e892..2646bcc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -148,6 +148,7 @@ src/storage/storage_backend_mpath.c src/storage/storage_backend_rbd.c src/storage/storage_backend_scsi.c src/storage/storage_backend_sheepdog.c +src/storage/storage_backend_zfs.c src/storage/storage_driver.c src/test/test_driver.c src/uml/uml_conf.c diff --git a/src/Makefile.am b/src/Makefile.am index 982f63d..d5d06d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -862,6 +862,9 @@ STORAGE_DRIVER_SHEEPDOG_SOURCES = \ STORAGE_DRIVER_GLUSTER_SOURCES = \ storage/storage_backend_gluster.h storage/storage_backend_gluster.c +STORAGE_DRIVER_ZFS_SOURCES = \ + storage/storage_backend_zfs.h storage/storage_backend_zfs.c + STORAGE_HELPER_DISK_SOURCES = \ storage/parthelper.c @@ -1514,6 +1517,10 @@ libvirt_driver_storage_impl_la_CFLAGS += $(GLUSTERFS_CFLAGS) libvirt_driver_storage_impl_la_LIBADD += $(GLUSTERFS_LIBS) endif WITH_STORAGE_GLUSTER +if WITH_STORAGE_ZFS +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_ZFS_SOURCES) +endif WITH_STORAGE_ZFS + if WITH_NODE_DEVICES # Needed to keep automake quiet about conditionals if WITH_DRIVER_MODULES @@ -1723,6 +1730,7 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_RBD_SOURCES) \ $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ $(STORAGE_DRIVER_GLUSTER_SOURCES) \ + $(STORAGE_DRIVER_ZFS_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index e33eb1b..5ec9c97 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -61,7 +61,8 @@ VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, "dir", "fs", "netfs", "logical", "disk", "iscsi", - "scsi", "mpath", "rbd", "sheepdog", "gluster") + "scsi", "mpath", "rbd", + "sheepdog", "gluster", "zfs") VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_STORAGE_POOL_FS_LAST, @@ -278,7 +279,13 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { .formatFromString = virStorageVolFormatDiskTypeFromString, .formatToString = virStorageVolFormatDiskTypeToString, }, - } + }, + {.poolType = VIR_STORAGE_POOL_ZFS, + .poolOptions = { + .flags = (VIR_STORAGE_POOL_SOURCE_NAME), + .defaultFormat = VIR_STORAGE_FILE_RAW, + }, + }, }; diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index ecd0dfe..1276ac2 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -92,6 +92,7 @@ typedef enum { VIR_STORAGE_POOL_RBD, /* RADOS Block Device */ VIR_STORAGE_POOL_SHEEPDOG, /* Sheepdog device */ VIR_STORAGE_POOL_GLUSTER, /* Gluster device */ + VIR_STORAGE_POOL_ZFS, /* ZFS */ VIR_STORAGE_POOL_LAST, } virStoragePoolType; @@ -509,7 +510,8 @@ VIR_ENUM_DECL(virStoragePartedFs) VIR_CONNECT_LIST_STORAGE_POOLS_MPATH | \ VIR_CONNECT_LIST_STORAGE_POOLS_RBD | \ VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG | \ - VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER) + VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER | \ + VIR_CONNECT_LIST_STORAGE_POOLS_ZFS) # define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL \ (VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE | \ diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e62bec0..1ed47a8 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1292,6 +1292,7 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, case VIR_STORAGE_POOL_LOGICAL: case VIR_STORAGE_POOL_DISK: case VIR_STORAGE_POOL_SCSI: + case VIR_STORAGE_POOL_ZFS: if (!(def->src->path = virStorageVolGetPath(vol))) goto cleanup; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 27b02cb..aad913e 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -88,6 +88,9 @@ #if WITH_STORAGE_GLUSTER # include "storage_backend_gluster.h" #endif +#if WITH_STORAGE_ZFS +# include "storage_backend_zfs.h" +#endif #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -125,6 +128,9 @@ static virStorageBackendPtr backends[] = { #if WITH_STORAGE_GLUSTER &virStorageBackendGluster, #endif +#if WITH_STORAGE_ZFS + &virStorageBackendZFS, +#endif NULL }; diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c new file mode 100644 index 0000000..1079bc7 --- /dev/null +++ b/src/storage/storage_backend_zfs.c @@ -0,0 +1,344 @@ +/* + * storage_backend_zfs.c: storage backend for ZFS handling + * + * Copyright (C) 2014 Roman Bogorodskiy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include "viralloc.h" +#include "virerror.h" +#include "virfile.h" +#include "storage_backend_zfs.h" +#include "virlog.h" +#include "virstring.h" + +#define VIR_FROM_THIS VIR_FROM_STORAGE + +VIR_LOG_INIT("storage.storage_backend_zfs"); + +/* + * Some common flags of zfs and zpool commands we use: + * -H -- don't print headers and separate fields by tab + * -p -- show exact numbers instead of human-readable, i.e. + * for size, show just a number instead of 2G etc + */ + + +static int +virStorageBackendZFSCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, + bool *isActive) +{ + char *devpath; + + if (virAsprintf(&devpath, "/dev/zvol/%s", + pool->def->source.name) == -1) + return -1; + *isActive = virFileIsDir(devpath); + VIR_FREE(devpath); + + return 0; +} + +static int +virStorageBackendZFSStartPool(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) +{ + return 0; +} + +static int +virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, + const char *volume) +{ + int ret = -1; + char **tokens; + size_t count; + char **name_tokens = NULL; + char *vol_name; + bool is_new_vol = false; + virStorageVolDefPtr vol = NULL; + + if (!(tokens = virStringSplitCount(volume, "\t", 0, &count))) + return -1; + + if (count != 2) + goto cleanup; + + if (!(name_tokens = virStringSplit(tokens[0], "/", 2))) + goto cleanup; + + vol_name = name_tokens[1]; + + vol = virStorageVolDefFindByName(pool, vol_name); + + if (vol == NULL) { + if (VIR_ALLOC(vol) < 0) + goto cleanup; + + is_new_vol = true; + vol->type = VIR_STORAGE_VOL_BLOCK; + + if (VIR_STRDUP(vol->name, vol_name) < 0) + goto cleanup; + } + + if (!vol->key && VIR_STRDUP(vol->key, tokens[0]) < 0) + goto cleanup; + + if (vol->target.path == NULL) { + if (virAsprintf(&vol->target.path, "/dev/zvol/%s/%s", + pool->def->source.name, vol->name) < 0) + goto cleanup; + } + + if (virStrToLong_ull(tokens[1], NULL, 10, &vol->target.capacity) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("malformed volsize reported")); + goto cleanup; + } + + if (is_new_vol && + VIR_APPEND_ELEMENT(pool->volumes.objs, pool->volumes.count, vol) < 0) + goto cleanup; + + ret = 0; + cleanup: + virStringFreeList(tokens); + virStringFreeList(name_tokens); + if (is_new_vol && (ret == -1)) + virStorageVolDefFree(vol); + return ret; +} + +static int +virStorageBackendZFSFindVols(virStoragePoolObjPtr pool) +{ + virCommandPtr cmd = NULL; + char *volumes_list = NULL; + char **lines = NULL; + size_t i; + + /** + * $ zfs list -Hp -t volume -o name,volsize -r test + * test/vol1 5368709120 + * test/vol3 1073741824 + * test/vol4 1572864000 + * $ + * + * Arguments description: + * -t volume -- we want to see only volumes + * -o name,volsize -- limit output to name and volume size + * -r -- we want to see all the childer of our pool + */ + cmd = virCommandNewArgList(ZFS, + "list", "-Hp", + "-t", "volume", "-r", + "-o", "name,volsize", + pool->def->source.name, + NULL); + virCommandSetOutputBuffer(cmd, &volumes_list); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if (!(lines = virStringSplit(volumes_list, "\n", 0))) + goto cleanup; + + for (i = 0; lines[i]; i++) { + if (STREQ(lines[i], "")) + continue; + + if (virStorageBackendZFSParseVol(pool, lines[i]) < 0) + continue; + } + + cleanup: + virCommandFree(cmd); + virStringFreeList(lines); + VIR_FREE(volumes_list); + + return 0; +} + +static int +virStorageBackendZFSRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) +{ + virCommandPtr cmd = NULL; + char *zpool_props = NULL; + char **lines = NULL; + size_t i; + + /** + * $ zpool get -Hp health,size,free,allocated test + * test health ONLINE - + * test size 199715979264 - + * test free 198899976704 - + * test allocated 816002560 - + * $ + * + * Here we just provide a list of properties we want to see + */ + cmd = virCommandNewArgList(ZPOOL, + "get", "-Hp", + "health,size,free,allocated", + pool->def->source.name, + NULL); + virCommandSetOutputBuffer(cmd, &zpool_props); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if (!(lines = virStringSplit(zpool_props, "\n", 0))) + goto cleanup; + + for (i = 0; lines[i]; i++) { + char **tokens; + size_t count; + char *prop_name; + + if (STREQ(lines[i], "")) + continue; + + if (!(tokens = virStringSplitCount(lines[i], "\t", 0, &count))) + goto cleanup; + + if (count != 4) + continue; + + prop_name = tokens[1]; + + if (STREQ(prop_name, "free") || STREQ(prop_name, "size") || + STREQ(prop_name, "allocated")) { + unsigned long long value; + if (virStrToLong_ull(tokens[2], NULL, 10, &value) < 0) + goto cleanup; + + if (STREQ(prop_name, "free")) + pool->def->available = value; + else if (STREQ(prop_name, "size")) + pool->def->capacity = value; + else if (STREQ(prop_name, "allocated")) + pool->def->allocation = value; + } + } + + /* Obtain a list of volumes */ + if (virStorageBackendZFSFindVols(pool) < 0) + goto cleanup; + + cleanup: + virCommandFree(cmd); + virStringFreeList(lines); + VIR_FREE(zpool_props); + + return 0; +} + +static int +virStorageBackendZFSStopPool(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) +{ + return 0; +} + +static int +virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol) +{ + virCommandPtr cmd = NULL; + int ret = -1; + + vol->type = VIR_STORAGE_VOL_BLOCK; + + if (vol->target.path != NULL) { + /* A target path passed to CreateVol has no meaning */ + VIR_FREE(vol->target.path); + } + + if (virAsprintf(&vol->target.path, "/dev/zvol/%s/%s", + pool->def->source.name, vol->name) == -1) + return -1; + + /** + * $ zfs create -o volmode=dev -V 10240K test/volname + * + * -o volmode=dev -- we want to get volumes exposed as cdev + * devices. If we don't specify that zfs + * will lookup vfs.zfs.vol.mode sysctl value + * -V -- tells to create a volume with the specified size + */ + cmd = virCommandNewArgList(ZFS, "create", "-o", "volmode=dev", + "-V", NULL); + virCommandAddArgFormat(cmd, "%lluK", + VIR_DIV_UP(vol->target.capacity, 1024)); + virCommandAddArgFormat(cmd, "%s/%s", + pool->def->source.name, vol->name); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if (virAsprintf(&vol->key, "%s/%s", + pool->def->source.name, vol->name) == -1) + goto cleanup; + + if (virStorageBackendZFSFindVols(pool) < 0) + goto cleanup; + + ret = 0; + cleanup: + virCommandFree(cmd); + return ret; + +} + +static int +virStorageBackendZFSDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int flags) +{ + int ret = -1; + virCommandPtr destroy_cmd = virCommandNewArgList(ZFS, "destroy", NULL); + + virCheckFlags(0, -1); + + virCommandAddArgFormat(destroy_cmd, "%s/%s", + pool->def->source.name, vol->name); + + if (virCommandRun(destroy_cmd, NULL) < 0) + goto cleanup; + + ret = 0; + cleanup: + virCommandFree(destroy_cmd); + return ret; +} + + +virStorageBackend virStorageBackendZFS = { + .type = VIR_STORAGE_POOL_ZFS, + + .checkPool = virStorageBackendZFSCheckPool, + .startPool = virStorageBackendZFSStartPool, + .refreshPool = virStorageBackendZFSRefreshPool, + .stopPool = virStorageBackendZFSStopPool, + .createVol = virStorageBackendZFSCreateVol, + .deleteVol = virStorageBackendZFSDeleteVol, +}; diff --git a/src/storage/storage_backend_zfs.h b/src/storage/storage_backend_zfs.h new file mode 100644 index 0000000..4c34b59 --- /dev/null +++ b/src/storage/storage_backend_zfs.h @@ -0,0 +1,29 @@ +/* + * storage_backend_zfs.h: storage backend for ZFS handling + * + * Copyright (C) 2014 Roman Bogorodskiy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#ifndef __VIR_STORAGE_BACKEND_ZFS_H__ +# define __VIR_STORAGE_BACKEND_ZFS_H__ + +# include "storage_backend.h" + +extern virStorageBackend virStorageBackendZFS; + +#endif /* __VIR_STORAGE_BACKEND_ZFS_H__ */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 3830867..d23d663 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1431,6 +1431,7 @@ storageVolLookupByPath(virConnectPtr conn, case VIR_STORAGE_POOL_GLUSTER: case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_SHEEPDOG: + case VIR_STORAGE_POOL_ZFS: case VIR_STORAGE_POOL_LAST: if (VIR_STRDUP(stable_path, path) < 0) { virStoragePoolObjUnlock(pool); diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 7c40b5b..80313b1 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1063,6 +1063,9 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) case VIR_STORAGE_POOL_GLUSTER: flags |= VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER; break; + case VIR_STORAGE_POOL_ZFS: + flags |= VIR_CONNECT_LIST_STORAGE_POOLS_ZFS; + break; case VIR_STORAGE_POOL_LAST: break; } -- 1.9.0

2 2

[libvirt] [PATCH] change blkiotune weight range min from 100 to 10
by Martin Kletzander 24 Jul '14

24 Jul '14

This reflects the same change made in kernel commit df457f845e (before v2.6.38-rc7). On the rare occasion when the user would try setting the weight to value in range <10, 100) on older kernel, we will error out with EINVAL properly. Modifying the error message (adding a hint for example) would cause weird logs, especially without stacked error messages (I couldn't resist mentioning it again). There is no (easy) way of getting the limits from kernel, since it's not exposed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1100769 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/lxc/lxc_driver.c | 4 ++-- src/qemu/qemu_driver.c | 4 ++-- tools/virsh-domain.c | 2 +- tools/virsh.pod | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 05d10b4..a7f4b87 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2559,7 +2559,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (params[i].value.ui > 1000 || params[i].value.ui < 100) { + if (params[i].value.ui > 1000 || params[i].value.ui < 10) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; @@ -2660,7 +2660,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (params[i].value.ui > 1000 || params[i].value.ui < 100) { + if (params[i].value.ui > 1000 || params[i].value.ui < 10) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 626d557..eae8ae2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7819,7 +7819,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (params[i].value.ui > 1000 || params[i].value.ui < 100) { + if (params[i].value.ui > 1000 || params[i].value.ui < 10) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; @@ -7920,7 +7920,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (params[i].value.ui > 1000 || params[i].value.ui < 100) { + if (params[i].value.ui > 1000 || params[i].value.ui < 10) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("out of blkio weight range.")); ret = -1; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ba47258..c58beaf 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1255,7 +1255,7 @@ static const vshCmdOptDef opts_blkiotune[] = { }, {.name = "weight", .type = VSH_OT_INT, - .help = N_("IO Weight in range [100, 1000]") + .help = N_("IO Weight in range [10, 1000]") }, {.name = "device-weights", .type = VSH_OT_STRING, diff --git a/tools/virsh.pod b/tools/virsh.pod index 849ae31..9f3cbee 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1824,8 +1824,8 @@ Specifying -1 as a value for these limits is interpreted as unlimited. [[I<--config>] [I<--live>] | [I<--current>]] Display or set the blkio parameters. QEMU/KVM supports I<--weight>. -I<--weight> is in range [100, 1000]. After kernel 2.6.39, the value -could be in the range [10, 1000]. +I<--weight> is in range [100, 1000]. Since kernel 2.6.39, the value +is in the range [10, 1000]. B<device-weights> is a single string listing one or more device/weight pairs, in the format of /path/to/device,weight,/path/to/device,weight. -- 2.0.2

2 2

[libvirt] [PATCH 0/2] virtio serial address allocation
by Ján Tomko 24 Jul '14

24 Jul '14

Ján Tomko (2): Add test for virtio serial port assignment Implement virtio serial address allocation src/conf/domain_addr.c | 426 +++++++++++++++++++++ src/conf/domain_addr.h | 49 +++ src/conf/domain_conf.c | 30 -- src/libvirt_private.syms | 9 + src/qemu/qemu_command.c | 61 +++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_hotplug.c | 31 +- tests/qemuhotplugtest.c | 2 +- .../qemuxml2argv-channel-virtio-auto.args | 8 +- .../qemuxml2argv-channel-virtio-autoassign.args | 20 + .../qemuxml2argv-channel-virtio-autoassign.xml | 50 +++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-channel-virtio-auto.xml | 10 +- 14 files changed, 658 insertions(+), 42 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.xml -- 1.8.5.5

2 4

[libvirt] [libvirt-sandbox PATCH 0/2] virt-sandbox-service fixes
by Cédric Bosdonnat 24 Jul '14

24 Jul '14

Here are a 2 fixes that make virt-sandbox-service work for me. One allows it to work if selinux isn't handled by libvirtd, the other safely handles some file copying that can be different across distros. Cédric Bosdonnat (2): virt-sandbox-service: check for security label only if they can be handled virt-sandbox-service: fix some paths for SUSE bin/virt-sandbox-service | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) -- 1.8.4.5

2 3

[libvirt] [PATCH] spec: drop anything older than Fedora 13
by Eric Blake 24 Jul '14

24 Jul '14

RHEL 5 is based on libvirt 0.8.2, as was Fedora 13. RHEL 5 also happens to be the oldest box that we actively support with a buildbot, so it is time to clean up some crufty conditionals in the spec file that no longer are necessary for modern Fedora. Although it is probably okay to make further simplifications to a newer minimum Fedora version, that can be done as a later patch. This patch just focuses on cleaning any comparison of %{?fedora} that will always be true or false once we assume a minimum of F13. * libvirt.spec.in: Make with_audit default to on. Move other conditionals to a single RHEL-5 block. Simplify any fedora comparison older than 13. Document our assumptions. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- libvirt.spec.in | 69 ++++++++++++++++++++------------------------------------- 1 file changed, 24 insertions(+), 45 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9c7b241..091eec8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1,5 +1,7 @@ # -*- rpm-spec -*- +# This spec file assumes you are building for Fedora 13 or newer, +# or for RHEL 5 or newer. It may need some tweaks for other distros. # If neither fedora nor rhel was defined, try to guess them from %{dist} %if !0%{?rhel} && !0%{?fedora} %{expand:%(echo "%{?dist}" | \ @@ -122,7 +124,6 @@ %define with_libpcap 0%{!?_without_libpcap:0} %define with_macvtap 0%{!?_without_macvtap:0} %define with_libnl 0%{!?_without_libnl:0} -%define with_audit 0%{!?_without_audit:0} %define with_dtrace 0%{!?_without_dtrace:0} %define with_cgconfig 0%{!?_without_cgconfig:0} %define with_sanlock 0%{!?_without_sanlock:0} @@ -136,6 +137,7 @@ # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} +%define with_audit 0%{!?_without_audit:1} # Finally set the OS / architecture specific special cases @@ -224,31 +226,21 @@ %define with_libxl 0 %endif -# PolicyKit was introduced in Fedora 8 / RHEL-6 or newer -%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6 - %define with_polkit 0%{!?_without_polkit:1} -%endif - -# libcapng is used to manage capabilities in Fedora 12 / RHEL-6 or newer -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 - %define with_capng 0%{!?_without_capng:1} -%endif - # fuse is used to provide virtualized /proc for LXC %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_fuse 0%{!?_without_fuse:1} %endif -# netcf is used to manage network interfaces in Fedora 12 / RHEL-6 or newer -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 - %define with_netcf 0%{!?_without_netcf:%{server_drivers}} -%endif - -# udev is used to manage host devices in Fedora 12 / RHEL-6 or newer -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 - %define with_udev 0%{!?_without_udev:%{server_drivers}} -%else +# RHEL 5 lacks newer tools +%if 0%{?rhel} == 5 %define with_hal 0%{!?_without_hal:%{server_drivers}} +%else + %define with_polkit 0%{!?_without_polkit:1} + %define with_capng 0%{!?_without_capng:1} + %define with_netcf 0%{!?_without_netcf:%{server_drivers}} + %define with_udev 0%{!?_without_udev:%{server_drivers}} + %define with_yajl 0%{!?_without_yajl:%{server_drivers}} + %define with_dtrace 1 %endif # interface requires netcf @@ -256,11 +248,6 @@ %define with_interface 0 %endif -# Enable yajl library for JSON mode with QEMU -%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6 - %define with_yajl 0%{!?_without_yajl:%{server_drivers}} -%endif - # Enable sanlock library for lock management with QEMU # Sanlock is available only on x86_64 for RHEL %if 0%{?fedora} >= 16 @@ -321,16 +308,8 @@ %define with_libnl 1 %endif -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 5 - %define with_audit 0%{!?_without_audit:1} -%endif - -%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6 - %define with_dtrace 1 -%endif - # Pull in cgroups config system -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 6 %if %{with_qemu} || %{with_lxc} %define with_cgconfig 0%{!?_without_cgconfig:1} %endif @@ -350,7 +329,7 @@ # Force QEMU to run as non-root -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 6 %define qemu_user qemu %define qemu_group qemu %else @@ -473,7 +452,7 @@ BuildRequires: libattr-devel # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 %endif -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 6 # for augparse, optionally used in testing BuildRequires: augeas %endif @@ -538,7 +517,7 @@ BuildRequires: cyrus-sasl-devel %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 BuildRequires: polkit-devel >= 0.112 %else - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: polkit-devel >= 0.93 %else BuildRequires: PolicyKit-devel >= 0.6 @@ -621,7 +600,7 @@ BuildRequires: netcf-devel >= 0.1.4 %endif %endif %if %{with_esx} - %if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: libcurl-devel %else BuildRequires: curl-devel @@ -705,7 +684,7 @@ Requires: avahi-libs %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 Requires: polkit >= 0.112 %else - %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 + %if 0%{?fedora} || 0%{?rhel} >=6 Requires: polkit >= 0.93 %else Requires: PolicyKit >= 0.6 @@ -865,7 +844,7 @@ Requires: nfs-utils # For mkfs Requires: util-linux # For glusterfs - %if 0%{?fedora} >= 11 + %if 0%{?fedora} Requires: glusterfs-client >= 2.0.1 %endif %endif @@ -1579,7 +1558,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ %endif %endif -%if 0%{?fedora} < 14 && 0%{?rhel} < 6 +%if 0%{?rhel} == 5 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/libvirtd.conf %endif @@ -1607,7 +1586,7 @@ fi %if ! %{with_driver_modules} %if %{with_qemu} %pre daemon - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see # https://fedoraproject.org/wiki/Packaging:UsersAndGroups @@ -1762,7 +1741,7 @@ fi %if %{with_driver_modules} %if %{with_qemu} %pre daemon-driver-qemu - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see # https://fedoraproject.org/wiki/Packaging:UsersAndGroups @@ -1869,7 +1848,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf - %if 0%{?fedora} >= 14 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 %config(noreplace) %{_prefix}/lib/sysctl.d/libvirtd.conf %endif @@ -1897,7 +1876,7 @@ exit 0 %endif %if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} || 0%{?rhel} >= 6 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy %else -- 1.9.3

2 2

[libvirt] [PATCHv1.5 0/8] Gluster security driver support and snapshot file pre-creation
by Peter Krempa 24 Jul '14

24 Jul '14

I'm posting a rebased version as John notified me that the original series cannot be applied cleanly any more. Peter Krempa (8): storage: Implement storage driver helper to chown disk images storage: Add witness for checking storage volume use in security driver security: DAC: Remove superfluous link resolution security: DAC: Introduce callback to perform image chown security: DAC: Plumb usage of chown callback qemu: Implement DAC driver chown callback to co-operate with storage drv storage: Implement virStorageFileCreate for local and gluster files qemu: snapshot: Use storage driver to pre-create snapshot file src/qemu/qemu_driver.c | 66 ++++++++++++++++---- src/security/security_dac.c | 109 +++++++++++++++++++++++----------- src/security/security_dac.h | 3 + src/security/security_manager.c | 4 +- src/security/security_manager.h | 19 +++++- src/storage/storage_backend.h | 6 ++ src/storage/storage_backend_fs.c | 29 +++++++++ src/storage/storage_backend_gluster.c | 27 +++++++++ src/storage/storage_driver.c | 58 ++++++++++++++++++ src/storage/storage_driver.h | 3 + 10 files changed, 277 insertions(+), 47 deletions(-) -- 2.0.0

3 21

[libvirt] [PATCH v2] leaseshelper: improvements to support all events
by Nehal J Wani 24 Jul '14

24 Jul '14

This patch enables the helper program to detect event(s) triggered when there is a change in lease length or expiry and client-id. This transfers complete control of leases database to libvirt and obsoletes use of the lease database file (<network-name>.leases). That file will not be created, read, or written. This is achieved by adding the option --leasefile-ro to dnsmasq and passing a custom env var to leaseshelper, which helps us map events related to leases with their corresponding network bridges, no matter what the event be. Also, this requires the addition of a new non-lease entry in our custom lease database: "server-duid". It is required to identify a DHCPv6 server. Now that dnsmasq doesn't maintain its own leases database, it relies on our helper program to tell it about previous leases and server duid. Thus, this patch makes our leases program honor an extra action: "init", in which it sends the known info in a particular format to dnsmasq by printing it to stdout. --- This is compatible with libvirt 1.2.6 as only additions have been introduced, and the old leases file (*.staus) will still be supported. v1: https://www.redhat.com/archives/libvir-list/2014-July/msg00568.html src/network/bridge_driver.c | 7 ++ src/network/leaseshelper.c | 152 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 136 insertions(+), 23 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6a2e760..4363cd8 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1289,7 +1289,10 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps)); virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); + /* Libvirt gains full control of leases database */ + virCommandAddArgFormat(cmd, "--leasefile-ro"); virCommandAddArgFormat(cmd, "--dhcp-script=%s", leaseshelper_path); + virCommandAddEnvPair(cmd, "VIR_BRIDGE_NAME", network->def->bridge); *cmdout = cmd; ret = 0; @@ -3432,6 +3435,10 @@ networkGetDHCPLeases(virNetworkPtr network, goto error; } + /* Ignore server-duid. It's not part of a lease */ + if (virJSONValueObjectHasKey(lease_tmp, "server-duid")) + continue; + if (!(mac_tmp = virJSONValueObjectGetString(lease_tmp, "mac-address"))) { /* leaseshelper program guarantees that lease will be stored only if * mac-address is known otherwise not */ diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index e4b5283..cc4b4ac 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -50,6 +50,12 @@ */ #define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (32 * 1024 * 1024) +/* + * Use this when passing possibly-NULL strings to printf-a-likes. + * Required for unknown parameters during init call. + */ +#define EMPTY_STR(s) ((s) ? (s) : "*") + static const char *program_name; /* Display version information. */ @@ -65,7 +71,7 @@ usage(int status) if (status) { fprintf(stderr, _("%s: try --help for more details\n"), program_name); } else { - printf(_("Usage: %s add|old|del mac|clientid ip [hostname]\n" + printf(_("Usage: %s add|old|del|init mac|clientid ip [hostname]\n" "Designed for use with 'dnsmasq --dhcp-script'\n" "Refer to man page of dnsmasq for more details'\n"), program_name); @@ -89,6 +95,7 @@ enum virLeaseActionFlags { VIR_LEASE_ACTION_ADD, /* Create new lease */ VIR_LEASE_ACTION_OLD, /* Lease already exists, renew it */ VIR_LEASE_ACTION_DEL, /* Delete the lease */ + VIR_LEASE_ACTION_INIT, /* Tell dnsmasq of existing leases on restart */ VIR_LEASE_ACTION_LAST }; @@ -96,7 +103,7 @@ enum virLeaseActionFlags { VIR_ENUM_DECL(virLeaseAction); VIR_ENUM_IMPL(virLeaseAction, VIR_LEASE_ACTION_LAST, - "add", "old", "del"); + "add", "old", "del", "init"); int main(int argc, char **argv) @@ -105,6 +112,7 @@ main(int argc, char **argv) char *pid_file = NULL; char *lease_entries = NULL; char *custom_lease_file = NULL; + char *server_duid = NULL; const char *ip = NULL; const char *mac = NULL; const char *iaid = virGetEnvAllowSUID("DNSMASQ_IAID"); @@ -112,20 +120,26 @@ main(int argc, char **argv) const char *interface = virGetEnvAllowSUID("DNSMASQ_INTERFACE"); const char *exptime_tmp = virGetEnvAllowSUID("DNSMASQ_LEASE_EXPIRES"); const char *hostname = virGetEnvAllowSUID("DNSMASQ_SUPPLIED_HOSTNAME"); + const char *server_duid_env = virGetEnvAllowSUID("DNSMASQ_SERVER_DUID"); const char *leases_str = NULL; long long currtime = 0; long long expirytime = 0; size_t i = 0; + size_t count_ipv6 = 0; + size_t count_ipv4 = 0; int action = -1; int pid_file_fd = -1; int rv = EXIT_FAILURE; int custom_lease_file_len = 0; bool add = false; + bool init = false; bool delete = false; virJSONValuePtr lease_new = NULL; virJSONValuePtr lease_tmp = NULL; virJSONValuePtr leases_array = NULL; virJSONValuePtr leases_array_new = NULL; + virJSONValuePtr *leases_ipv4 = NULL; + virJSONValuePtr *leases_ipv6 = NULL; virSetErrorFunc(NULL, NULL); virSetErrorLogPriorityFunc(NULL); @@ -156,17 +170,18 @@ main(int argc, char **argv) } } - if (argc != 4 && argc != 5) { + if (argc != 4 && argc != 5 && argc != 2) { /* Refer man page of dnsmasq --dhcp-script for more details */ usage(EXIT_FAILURE); } /* Make sure dnsmasq knows the interface. The interface name is not known - * when dnsmasq (re)starts and throws 'del' events for expired leases. - * So, if any old lease has expired, it will be automatically removed the - * next time this program is invoked */ - if (!interface) - goto cleanup; + * via env variable set by dnsmasq when dnsmasq (re)starts and throws 'del' + * events for expired leases. So, libvirtd sets another env var for this + * purpose */ + if (!interface) { + interface = virGetEnvAllowSUID("VIR_BRIDGE_NAME"); + } ip = argv[3]; mac = argv[2]; @@ -185,9 +200,14 @@ main(int argc, char **argv) exptime[strlen(exptime) - 1] = '\0'; /* Check if it is an IPv6 lease */ - if (virGetEnvAllowSUID("DNSMASQ_IAID")) { + if (iaid) { mac = virGetEnvAllowSUID("DNSMASQ_MAC"); clientid = argv[2]; + + if (server_duid_env) { + if (VIR_STRDUP(server_duid, server_duid_env) < 0) + goto cleanup; + } } if (virAsprintf(&custom_lease_file, @@ -264,6 +284,8 @@ main(int argc, char **argv) goto cleanup; } } + } else if (action == VIR_LEASE_ACTION_INIT) { + init = true; } else { fprintf(stderr, _("Unsupported action: %s\n"), virLeaseActionTypeToString(action)); @@ -294,6 +316,7 @@ main(int argc, char **argv) i = 0; while (i < virJSONValueArraySize(leases_array)) { const char *ip_tmp = NULL; + const char *server_duid_tmp = NULL; long long expirytime_tmp = -1; if (!(lease_tmp = virJSONValueArrayGet(leases_array, i))) { @@ -302,6 +325,20 @@ main(int argc, char **argv) goto cleanup; } + if ((server_duid_tmp + = virJSONValueObjectGetString(lease_tmp, "server-duid"))) { + /* Control reaches here atmost once */ + if (!server_duid) { + /* Control reaches here when the 'action' is not for an + * ipv6 lease or, for some weird reason the env var + * DNSMASQ_SERVER_DUID wasn't set*/ + if (VIR_STRDUP(server_duid, server_duid_tmp) < 0) + goto cleanup; + } + i++; + continue; + } + if (!(ip_tmp = virJSONValueObjectGetString(lease_tmp, "ip-address")) || (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime_tmp) < 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -328,39 +365,108 @@ main(int argc, char **argv) goto cleanup; } + /* Store pointers to ipv4 and ipv6 leases */ + if (strchr(ip_tmp, ':')) + ignore_value(VIR_APPEND_ELEMENT(leases_ipv6, count_ipv6, lease_tmp)); + else + ignore_value(VIR_APPEND_ELEMENT(leases_ipv4, count_ipv4, lease_tmp)); + ignore_value(virJSONValueArraySteal(leases_array, i)); } } } - if (add) { - if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { + if (init) { + /* Man page of dnsmasq says: the script (helper program, in our case) + * should write the saved state of the lease database, in dnsmasq + * leasefile format, to stdout and exit with zero exit code, when + * called with argument init. Format: + * #For all ipv4 leases: + * Expiry_time MAC_address IP_address Hostname Client-id + * #If DHCPv6 is present: + * duid Server_DUID + * #For all ipv6 leases: + * Expiry_time IAID IP_address Hostname Client-DUID */ + long long expirytime_tmp = -1; + for (i = 0; i < count_ipv4; i++) { + lease_tmp = leases_ipv4[i]; + virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime_tmp); + printf("%lld %s %s %s %s\n", + expirytime_tmp, + virJSONValueObjectGetString(lease_tmp, "mac-address"), + virJSONValueObjectGetString(lease_tmp, "ip-address"), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + } + if (server_duid) { + printf("duid %s\n", server_duid); + for (i = 0; i < count_ipv6; i++) { + lease_tmp = leases_ipv6[i]; + virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &expirytime_tmp); + printf("%lld %s %s %s %s\n", + expirytime_tmp, + virJSONValueObjectGetString(lease_tmp, "iaid"), + virJSONValueObjectGetString(lease_tmp, "ip-address"), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "hostname")), + EMPTY_STR(virJSONValueObjectGetString(lease_tmp, "client-id"))); + } + } + } + else { + if (add) { + if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + lease_new = NULL; + } + + if (server_duid) { + if (!(lease_new = virJSONValueNewObject())) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + + if (virJSONValueObjectAppendString(lease_new, + "server-duid", server_duid) < 0) + goto cleanup; + + if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + lease_new = NULL; + } + + if (!(leases_str = virJSONValueToString(leases_array_new, true))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to create json")); + _("empty json array")); goto cleanup; } - lease_new = NULL; - } - if (!(leases_str = virJSONValueToString(leases_array_new, true))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("empty json array")); - goto cleanup; + /* Write to file */ + if (virFileRewrite(custom_lease_file, 0644, + customLeaseRewriteFile, &leases_str) < 0) + goto cleanup; } - /* Write to file */ - if (virFileRewrite(custom_lease_file, 0644, - customLeaseRewriteFile, &leases_str) < 0) - goto cleanup; - rv = EXIT_SUCCESS; cleanup: if (pid_file_fd != -1) virPidFileReleasePath(pid_file, pid_file_fd); + for (i = 0; i < count_ipv4; i++) + VIR_FREE(leases_ipv4); + for (i = 0; i < count_ipv6; i++) + VIR_FREE(leases_ipv6); VIR_FREE(pid_file); VIR_FREE(exptime); + VIR_FREE(server_duid); + VIR_FREE(lease_entries); VIR_FREE(custom_lease_file); virJSONValueFree(lease_new); virJSONValueFree(leases_array); -- 1.9.3

3 6

[libvirt] Building libvirt-python under mingw32
by Фарит Мутугуллин 24 Jul '14

24 Jul '14

Hello. I'm trying to build libvirt-python. And get these error messages: http://s17.postimg.org/4uor0767z/libvirt_python.jpg I have python 2.7.8 x86. What can be problem with?

1 0

[libvirt] [PATCHv4 0/2] lxc keep/drop capabilities
by Cédric Bosdonnat 24 Jul '14

24 Jul '14

Hi all, Even though the v3 has been ACKed (but not pushed), I rebased it on top of master before pushing it and did a few changes that are worth checking before. * Path 1 (feature) and 3 (doc) of the previous version merge merged together as suggested for another similar series. * virCgroupAllowDevice() has been changed to use negative major / minor device values to output '*'. I never saw any of them negative, but I don't have a good knowledge of that. -- Cedric Cédric Bosdonnat (2): lxc: allow to keep or drop capabilities lxc domain from xml: convert lxc.cap.drop docs/drvlxc.html.in | 47 ++++ docs/schemas/domaincommon.rng | 207 ++++++++++++++++++ src/conf/domain_conf.c | 126 ++++++++++- src/conf/domain_conf.h | 56 +++++ src/libvirt_private.syms | 3 + src/lxc/lxc_cgroup.c | 8 + src/lxc/lxc_container.c | 241 +++++++++++++++++++-- src/lxc/lxc_native.c | 25 +++ src/util/vircgroup.c | 57 ++++- src/util/vircgroup.h | 2 + tests/domainschemadata/domain-caps-features.xml | 28 +++ tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-cputune.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-idmap.xml | 2 + .../lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml | 4 + tests/lxcconf2xmldata/lxcconf2xml-memtune.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml | 4 + tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml | 2 + tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 4 + tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 8 + tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 4 + 22 files changed, 816 insertions(+), 20 deletions(-) create mode 100644 tests/domainschemadata/domain-caps-features.xml -- 1.8.4.5

6 9

[libvirt] [PATCH] leaseshelper: avoid mem leak after storing lease entries
by Nehal J Wani 24 Jul '14

24 Jul '14

Contents of existing lease file were being stored in a variable which was never freed. --- src/network/leaseshelper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index e4b5283..c8543a2 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -361,6 +361,7 @@ main(int argc, char **argv) VIR_FREE(pid_file); VIR_FREE(exptime); + VIR_FREE(lease_entries); VIR_FREE(custom_lease_file); virJSONValueFree(lease_new); virJSONValueFree(leases_array); -- 1.9.3

2 1

[libvirt] libvirt log format
by Yuanzhen Gu 23 Jul '14

23 Jul '14

Hello folks, Does any one know how to read the libvirt log information? For example, 2014-07-22 17:25:22.984+0000: 18571: debug : qemuMonitorIOProcess:356 : QEMU_MONITOR_IO_PROCESS: mon=0x7f733c000a40 buf={"timestamp": {"seconds": 1406049922, "microseconds": 983916}, "event": "STOP"} is there anyway to find the qemuMonitorIOProcess() function in the source code? and what does "356" after that means? Thanks! Best, Yuanzhen

2 1