- Devel - libvirt List Archives

[libvirt] [PATCH 0/7] Introduce sVirt to LXC driver
by Daniel P. Berrange 24 Jan '12

24 Jan '12

This patch series adds support for sVirt to the LXC driver. In this series, all LXC guests continue to run unconfined by default. The app has to explicitly request sVirt confinement for the guest. This is to ensure backwards compatibility with existing deployments. Since we won't auto-relabel filesystem trees, it is not possible to turn it on by default, as we previously did with QEMU

2 17

[libvirt] [PATCH 0/3] Use guest agent to quiesce disks
by Michal Privoznik 24 Jan '12

24 Jan '12

Since we have qemu guest agent support in libvirt, we can start wiring up some things that GA already knows how to do. One of them is file system freeze and thaw. Domain snapshots can profit from this functionality. Michal Privoznik (3): qemu_agent: Create file system freeze and thaw functions snapshots: Introduce VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE flag virsh: Expose new VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE flag include/libvirt/libvirt.h.in | 4 ++ src/libvirt.c | 6 ++ src/qemu/qemu_agent.c | 68 ++++++++++++++++++++++++ src/qemu/qemu_agent.h | 3 + src/qemu/qemu_driver.c | 118 ++++++++++++++++++++++++++++++++++++----- tools/virsh.c | 6 ++ tools/virsh.pod | 14 ++++- 7 files changed, 202 insertions(+), 17 deletions(-) -- 1.7.3.4

2 9

[libvirt] [PATCH 0/3] qemu: support disabling/enabling kvmclock with <timer> elements
by Paolo Bonzini 24 Jan '12

24 Jan '12

QEMU supports a bunch of CPUID features that are tied to the kvm CPUID nodes rather than the processor's. They are "kvmclock", "kvm_nopiodelay", "kvm_mmu", "kvm_asyncpf". These are not known to libvirt and their CPUID leaf might move if (for example) the Hyper-V extensions are enabled. Hence their handling would anyway require some special-casing. However, among these the most useful is kvmclock; an additional "property" of this feature is that a <timer> element is a better model than a CPUID feature. This is what this series does. Patch 1 tweaks the -cpu parsing code so that it detects the "default" CPU names and (instead of creating a <cpu> element) sets the guest arch to either i686 or x86_64; this is useful and helped writing testcases. The next two patches add the new feature. Finally, patch 4 tweaks the default CPU model to be more precise when KVM is enabled. Paolo Bonzini (4): qemu: get arch name from <cpu> element conf: add kvmclock timer qemu: parse and create -cpu ...,-kvmclock qemu: default to kvm32/kvm64 when KVM is enabled docs/formatdomain.html.in | 4 +- docs/schemas/domaincommon.rng | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 138 ++++++++++++++++---- tests/qemuargv2xmltest.c | 4 + tests/qemuxml2argvdata/qemu-lib.sh | 1 + .../qemuxml2argv-cpu-host-kvmclock.args | 4 + .../qemuxml2argv-cpu-host-kvmclock.xml | 23 ++++ .../qemuxml2argv-cpu-kvmclock.args | 4 + .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 24 ++++ tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 4 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 21 +++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 3 + 15 files changed, 209 insertions(+), 31 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml -- 1.7.7.1

3 16

[libvirt] [PATCH] src/datatypes.h: fix typo
by Alon Levy 24 Jan '12

24 Jan '12

Signed-off-by: Alon Levy <alevy(a)redhat.com> --- src/datatypes.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/datatypes.h b/src/datatypes.h index 91b1bfd..47058ed 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -31,7 +31,7 @@ * VIR_CONNECT_MAGIC: * * magic value used to protect the API when pointers to connection structures - * are passed down by the uers. + * are passed down by the users. */ # define VIR_CONNECT_MAGIC 0x4F23DEAD # define VIR_IS_CONNECT(obj) ((obj) && (obj)->magic==VIR_CONNECT_MAGIC) -- 1.7.8.4

2 1

[libvirt] [PATCH 0/4] Add support for QEMU guest agent control
by Michal Privoznik 24 Jan '12

24 Jan '12

==== These patches are taken from here: https://www.redhat.com/archives/libvir-list/2011-October/msg00135.html I've just rebased and polished them. ==== The QEMU guest agent "/usr/bin/qemu-ga" has some handy functions for controlling the guest, not least, shutdown/reboot and filesystem freeze/thaw. In Fedora 15/16 the semantics of the ACPI power button have been changed to suspend-to-RAM which breaks our current shutdown implementation. By adding support for the agent we gain a more predictable way to shutdown / reboot guests. NB: the code currently has the same "flaw" as the monitor, in so much as we wait forever for a guest agent reply. We need to add a timeout ability to the agent code Daniel P. Berrange (4): QEMU guest agent support Add new virDomainShutdownFlags API Wire up QEMU agent to reboot/shutdown APIs Allow choice of shutdown method via virsh include/libvirt/libvirt.h.in | 15 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/driver.h | 5 + src/esx/esx_driver.c | 11 +- src/libvirt.c | 65 +++- src/libvirt_public.syms | 4 + src/libxl/libxl_driver.c | 12 +- src/openvz/openvz_driver.c | 1 + src/qemu/qemu_agent.c | 1151 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 69 +++ src/qemu/qemu_domain.c | 97 ++++ src/qemu/qemu_domain.h | 22 + src/qemu/qemu_driver.c | 107 ++++- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 188 +++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 8 +- src/remote_protocol-structs | 5 + src/test/test_driver.c | 11 +- src/uml/uml_driver.c | 11 +- src/vbox/vbox_tmpl.c | 11 +- src/vmware/vmware_driver.c | 1 + src/xen/xen_driver.c | 14 +- src/xenapi/xenapi_driver.c | 12 +- tools/virsh.c | 47 ++- tools/virsh.pod | 24 +- 27 files changed, 1854 insertions(+), 42 deletions(-) create mode 100644 src/qemu/qemu_agent.c create mode 100644 src/qemu/qemu_agent.h -- 1.7.3.4

4 24

[libvirt] libvirt and mingw64 x64, bad idea?
by Marc-André Lureau 24 Jan '12

24 Jan '12

Hi, I tried to update the fedora mingw package to follow the mingw64 packaging guideline and allow build for x86 and x64. But I got into build warning and errors for x86_64. (using Fedora Cross project repo: http://build1.openftd.org/fedora-cross/fedora-cross.repo, x86_64-w64-mingw32-gcc (GCC) 4.6.2 20110908 and later) ./configure --host=x86_64-w64-mingw32 --build=x86_64-unknown-linux-gnu --target=x86_64-w64-mingw32 --prefix=/usr/x86_64-w64-mingw32/sys-root/mingw --exec-prefix=/usr/x86_64-w64-mingw32/sys-root/mingw --bindir=/usr/x86_64-w64-mingw32/sys-root/mingw/bin --sbindir=/usr/x86_64-w64-mingw32/sys-root/mingw/sbin --sysconfdir=/usr/x86_64-w64-mingw32/sys-root/mingw/etc --datadir=/usr/x86_64-w64-mingw32/sys-root/mingw/share --includedir=/usr/x86_64-w64-mingw32/sys-root/mingw/include --libdir=/usr/x86_64-w64-mingw32/sys-root/mingw/lib --libexecdir=/usr/x86_64-w64-mingw32/sys-root/mingw/libexec --localstatedir=/usr/x86_64-w64-mingw32/sys-root/mingw/var --sharedstatedir=/usr/x86_64-w64-mingw32/sys-root/mingw/com --mandir=/usr/x86_64-w64-mingw32/sys-root/mingw/share/man --infodir=/usr/x86_64-w64-mingw32/sys-root/mingw/share/info --without-xen --without-qemu --without-openvz --without-lxc --without-vbox --without-xenapi --without-sasl --without-avahi --without-polkit --without-python --without-libvirtd --without-uml --without-phyp --without-hyperv --without-vmware --without-netcf --without-audit --without-dtrace --enable-static The somewhat worrying error is: util/command.c:54:1: error: static assertion failed: "verify (sizeof(pid_t) <= sizeof(int))" /* We have quite a bit of changes to make if this doesn't hold. */ verify(sizeof(pid_t) <= sizeof(int)); There are a few other warnings, see attached files. Is this going to be something difficult and worth to fix? regards -- Marc-André Lureau

3 2

[libvirt] [libvirt-glib] API to get/set custom metadata from/to domain config
by Zeeshan Ali (Khattak) 24 Jan '12

24 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain.c | 115 +++++++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 8 ++ libvirt-gconfig/libvirt-gconfig-helpers.c | 4 +- libvirt-gconfig/libvirt-gconfig.sym | 2 + 4 files changed, 128 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 61af625..d1faabd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -449,3 +449,118 @@ GList *gvir_config_domain_get_devices(GVirConfigDomain *domain) return data.devices; } + +static void set_namespace_on_tree(xmlNodePtr node, xmlNsPtr namespace) +{ + xmlNodePtr child; + + xmlSetNs(node, namespace); + + for (child = node->children; child != NULL; child = child->next) + set_namespace_on_tree(child, namespace); +} + +static xmlNodePtr gvir_config_domain_get_metadata_node + (GVirConfigDomain *domain, gboolean create) +{ + xmlNodePtr domain_node, metadata_node; + + domain_node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(domain)); + metadata_node = gvir_config_xml_get_element(domain_node, "metadata", NULL); + if (metadata_node == NULL && create) + metadata_node = xmlNewChild(domain_node, NULL, (xmlChar *)"metadata", NULL); + + return metadata_node; +} + +static xmlNodePtr gvir_config_domain_get_custom_xml_node + (GVirConfigDomain *domain, const gchar *ns_uri) +{ + xmlNodePtr metadata_node, node; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), NULL); + + metadata_node = gvir_config_domain_get_metadata_node(domain, FALSE); + if (metadata_node == NULL) + return NULL; + + for (node = metadata_node->children; node != NULL; node = node->next) { + if (node->ns != NULL && + (g_strcmp0 ((gchar *)node->ns->href, ns_uri) == 0)) + break; + } + + return node; +} + +gboolean gvir_config_domain_set_custom_xml(GVirConfigDomain *domain, + const gchar *xml, + const gchar *ns, + const gchar *ns_uri, + GError **error) +{ + xmlNodePtr metadata_node, node, old_node; + xmlDocPtr doc; + xmlNsPtr namespace; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), FALSE); + g_return_val_if_fail(xml != NULL, FALSE); + g_return_val_if_fail(ns != NULL, FALSE); + g_return_val_if_fail(ns_uri != NULL, FALSE); + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); + + metadata_node = gvir_config_domain_get_metadata_node(domain, TRUE); + + node = gvir_config_xml_parse(xml, NULL, error); + if (error != NULL && *error != NULL) + return FALSE; + + namespace = xmlNewNs(node, (xmlChar *)ns_uri, (xmlChar *)ns); + set_namespace_on_tree(node, namespace); + doc = node->doc; + + old_node = gvir_config_domain_get_custom_xml_node(domain, ns_uri); + if (old_node != NULL) + xmlReplaceNode(old_node, node); + else { + xmlUnlinkNode(node); + xmlAddChild(metadata_node, node); + } + + xmlFreeDoc(doc); + + return TRUE; +} + +gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, + const gchar *ns_uri, + GError **error) +{ + xmlNodePtr metadata_node, node; + xmlBufferPtr xmlbuf; + gchar *xml = NULL; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), NULL); + + metadata_node = gvir_config_domain_get_metadata_node(domain, FALSE); + if (metadata_node == NULL) + return NULL; + + node = gvir_config_domain_get_custom_xml_node(domain, ns_uri); + if (node == NULL) + return NULL; + + xmlbuf = xmlBufferCreate(); + if (xmlNodeDump(xmlbuf, metadata_node->doc, metadata_node, 0, 0) < 0) + gvir_config_set_error (error, + GVIR_CONFIG_OBJECT_ERROR, + 0, + "Failed to convert custom node '%s' to string", + node->name); + else + xml = g_strndup((gchar *)xmlBufferContent(xmlbuf), xmlBufferLength(xmlbuf)); + + xmlBufferFree(xmlbuf); + + return xml; +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 6cdaec9..96ded07 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -126,6 +126,14 @@ GList *gvir_config_domain_get_devices(GVirConfigDomain *domain); void gvir_config_domain_set_lifecycle(GVirConfigDomain *domain, GVirConfigDomainLifecycleEvent event, GVirConfigDomainLifecycleAction action); +gboolean gvir_config_domain_set_custom_xml(GVirConfigDomain *domain, + const gchar *xml, + const gchar *ns, + const gchar *ns_uri, + GError **error); +gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, + const gchar *ns_uri, + GError **error); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index c406a49..140a4a0 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -148,7 +148,9 @@ gvir_config_xml_parse(const char *xml, const char *root_node, GError **err) "Unable to parse configuration"); return NULL; } - if ((!doc->children) || (strcmp((char *)doc->children->name, root_node) != 0)) { + if ((!doc->children) || + (root_node != NULL && + (strcmp((char *)doc->children->name, root_node) != 0))) { g_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 88aef57..ab2c7bf 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -14,6 +14,8 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_new; gvir_config_domain_new_from_xml; gvir_config_domain_set_clock; + gvir_config_domain_set_custom_xml; + gvir_config_domain_get_custom_xml; gvir_config_domain_get_description; gvir_config_domain_set_description; gvir_config_domain_get_devices; -- 1.7.7.5

3 7

[libvirt] [libvirt-glib] Allow custom metadata in domain configuration XML
by Zeeshan Ali (Khattak) 24 Jan '12

24 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Applications can now insert custom nodes and hierarchies into domain cofiguration XML. Although currently not enforced, application are required to use their own namespaces on every custom node they insert. --- docs/formatdomain.html.in | 18 +++++++++ docs/schemas/domaincommon.rng | 26 +++++++++++++ src/conf/domain_conf.c | 24 ++++++++++++ src/conf/domain_conf.h | 3 ++ tests/domainsnapshotxml2xmlout/metadata.xml | 38 ++++++++++++++++++++ tests/domainsnapshotxml2xmltest.c | 1 + tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 4 ++ tests/qemuxml2argvdata/qemuxml2argv-metadata.xml | 29 +++++++++++++++ .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 29 +++++++++++++++ tests/qemuxml2xmltest.c | 2 + 10 files changed, 174 insertions(+), 0 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlout/metadata.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-metadata.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-metadata.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index de9b480..fa7dc7c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3548,6 +3548,24 @@ qemu-kvm -net nic,model=? /dev/null sub-element <code>label</code> are supported. </p> + <h3><a name="customMetadata">Custom metadata</a></h3> + +<pre> + ... + <metadata> + <app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo> + <app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar> + </metadata> + ...</pre> + + <dl> + <dt><code>metadata</code></dt> + <dd><code>metadata</code> node could be used by applications to + store custom metadata in the form of XML nodes/trees. Applications + must use custom namespaces on their XML nodes/trees. + <span class="since">Since 0.9.9</span></dd> + </dl> + <h2><a name="examples">Example configs</a></h2> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2041dfb..b42d758 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -43,6 +43,9 @@ <ref name="seclabel"/> </optional> <optional> + <ref name="metadata"/> + </optional> + <optional> <ref name='qemucmdline'/> </optional> </interleave> @@ -2942,6 +2945,29 @@ </element> </define> + <define name="metadata"> + <element name="metadata"> + <zeroOrMore> + <ref name="customElement"/> + </zeroOrMore> + </element> + </define> + + <define name="customElement"> + <element> + <anyName/> + <zeroOrMore> + <choice> + <attribute> + <anyName/> + </attribute> + <text/> + <ref name="customElement"/> + </choice> + </zeroOrMore> + </element> + </define> + <!-- Type library diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8eed85b..fb78d93 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1500,6 +1500,9 @@ void virDomainDefFree(virDomainDefPtr def) if (def->namespaceData && def->ns.free) (def->ns.free)(def->namespaceData); + if (def->metadata) + xmlFreeNode(def->metadata); + VIR_FREE(def); } @@ -8072,6 +8075,11 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->os.smbios_mode = VIR_DOMAIN_SMBIOS_NONE; /* not present */ } + /* Extract custom metadata */ + if ((node = virXPathNode("./metadata[1]", ctxt)) != NULL) { + def->metadata = xmlCopyNode (node, 1); + } + /* we have to make a copy of all of the callback pointers here since * we won't have the virCaps structure available during free */ @@ -11833,6 +11841,22 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto cleanup; } + /* Custom metadata comes at the end */ + if (def->metadata) { + xmlBufferPtr xmlbuf; + + xmlbuf = xmlBufferCreate(); + if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata, 4, 1) < 0) { + xmlBufferFree(xmlbuf); + goto cleanup; + } + virBufferAdjustIndent(buf, 2); + virBufferAdd(buf, (char *) xmlBufferContent(xmlbuf), xmlBufferLength(xmlbuf)); + virBufferAdjustIndent(buf, -2); + xmlBufferFree(xmlbuf); + virBufferAddLit(buf, "\n"); + } + virBufferAddLit(buf, "</domain>\n"); if (virBufferError(buf)) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a49795c..3b522a9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1525,6 +1525,9 @@ struct _virDomainDef { void *namespaceData; virDomainXMLNamespace ns; + + /* Application-specific custom metadata */ + xmlNodePtr metadata; }; enum virDomainTaintFlags { diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml new file mode 100644 index 0000000..45180c9 --- /dev/null +++ b/tests/domainsnapshotxml2xmlout/metadata.xml @@ -0,0 +1,38 @@ +<domainsnapshot> + <name>my snap name</name> + <description>!@#$%^</description> + <state>running</state> + <parent> + <name>earlier_snap</name> + </parent> + <creationTime>1272917631</creationTime> + <domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> + </domain> +</domainsnapshot> diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c index 90ff9bb..5c2e670 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/domainsnapshotxml2xmltest.c @@ -109,6 +109,7 @@ mymain(void) DO_TEST("noparent_nodescription_noactive", NULL, 0); DO_TEST("noparent_nodescription", NULL, 1); DO_TEST("noparent", "9d37b878-a7cc-9f9a-b78f-49b3abad25a8", 0); + DO_TEST("metadata", "c7a5fdbd-edaf-9455-926a-d65c16db1809", 0); virCapabilitiesFree(driver.caps); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args new file mode 100644 index 0000000..651793d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -name QEMUGuest1 -nographic -monitor unix:/tmp/test-monitor,\ +server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml new file mode 100644 index 0000000..a6888ee --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml new file mode 100644 index 0000000..a6888ee --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 293c2a7..df317fd 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -210,6 +210,8 @@ mymain(void) DO_TEST_DIFFERENT("graphics-listen-network2"); DO_TEST_DIFFERENT("graphics-spice-timeout"); + DO_TEST_DIFFERENT("metadata"); + virCapabilitiesFree(driver.caps); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); -- 1.7.7.5

1 0

[libvirt] [PATCH RFC 00/12] Fine grained access control proof of concept
by Daniel P. Berrange 23 Jan '12

23 Jan '12

This series of patch is the minimal required to get a working proof of concept implementation of fine grained access control in libvirt. This demonstrates - Obtaining a client identity from a socket - Ensuring RPC calls are executed with the correct identity sset - A policykit access driver that checks based on access vector alone - A SELinux access driver that checks based on access vector + object - A set of hooks in the QEMU driver to protect virDomainObjPtr access Things that are not done - APIs for changing the real/effective identity post-connect - A simple RBAC access driver for doing (Access vector, object) checks - SELinux policy for the SELinux driver - Access control hooks on all other QEMU driver methods - Access control hooks in LXC, UML, other libvirtd side drivers - Access control hooks in storage, network, interface, etc drivers - Document WTF todo to propagate SELinux contexts across TCP sockets using IPSec. Any hints welcome... - Lots more I can't think of right now I should note that the policykit driver is mostly useless because it is unable to let you do checks on anything other than permission name and UNIX process ID at this time. In theory it is supposed to be extendable to allow other types of identity information besides the process ID, and to include some kind of object identiers in the permission check, but no one seems to be attacking this. So I expect the simple RBAC driver to be the most used one in the common case usage of libvirt

1 12

[libvirt] [PATCH v2 0/8] Add ability to store notes with domains
by Peter Krempa 23 Jan '12

23 Jan '12

I've reworked this patches to use a separate element for storing the short note. This v2 also contains som new patches, especially added support for the LXC driver, and optionaly API to get the description. (See patches marked as optional). These are not required, just add a helper api to get the description and it's usage in virsh. v2 patches: xml: Add element <title> to allow short description of domains api: Add api to set domain title and description in runtime qemu: Implement note API in qemu driver virsh: Add support for modifying domain description and titles v1 patches: lxc: implement description API in LXC driver. api: Add API to get domain title and description (optional) lxc, qemu: Add support for virDomainGetDescription (optional) virsh: Add support for virDomainGetDescription api (optional) docs/formatdomain.html.in | 6 + docs/schemas/domaincommon.rng | 13 +- include/libvirt/libvirt.h.in | 13 + src/conf/domain_conf.c | 19 ++ src/conf/domain_conf.h | 1 + src/driver.h | 9 + src/libvirt.c | 92 +++++++ src/libvirt_public.syms | 6 + src/lxc/lxc_driver.c | 139 ++++++++++ src/qemu/qemu_driver.c | 139 ++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 19 ++- .../qemu-simple-description-title.xml | 27 ++ tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 5 + tools/virsh.c | 268 ++++++++++++++++++-- tools/virsh.pod | 34 +++- 16 files changed, 769 insertions(+), 23 deletions(-) create mode 100644 tests/domainschemadata/qemu-simple-description-title.xml -- 1.7.3.4

3 13

[libvirt] [BUG] EPOLL_CLOEXEC undeclared
by Philipp Hahn 23 Jan '12

23 Jan '12

Hi, $ cat /etc/debian_version 5.0.1 $ dpkg -S eventpoll.h linux-libc-dev: /usr/include/linux/eventpoll.h $ dpkg-query -W linux-libc-dev linux-libc-dev 2.6.32-35~ucs1.48.201109051614 $ git describe v0.9.9-57-g7eb9cfd $ ./autogen.sh ; make ... (cd .libs && rm -f libvirt_test.la && ln -s ../libvirt_test.la libvirt_test.la) gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../src/util -I../include -DIN_LIBVIRT -I../src/conf -I/usr/include/libxml2 -Wall -W -Wformat-y2k -Wformat-security -Winit-self -Wmissing-include-dirs -Wunused -Wunknown-pragmas -Wstrict-aliasing -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wnested-externs -Winline -Winvalid-pch -Wvolatile-register-var -Wdisabled-optimization -Wattributes -Wcoverage-mismatch -Wmultichar -Wdeprecated-declarations -Wdiv-by-zero -Wendif-labels -Wextra -Wformat-contains-nul -Wformat-extra-args -Wformat-zero-length -Wformat=2 -Wmultichar -Wnormalized=nfc -Woverflow -Wpointer-to-int-cast -Wpragmas -Wno-missing-field-initializers -Wno-sign-compare -Wno-format-nonliteral -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-all --param=ssp-buffer-size=4 -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option -funit-at-a-time -fipa-pure-const -g -O2 -MT libvirt_lxc-lxc_controller.o -MD -MP -MF .deps/libvirt_lxc-lxc_controller.Tpo -c -o libvirt_lxc-lxc_controller.o `test -f 'lxc/lxc_controller.c' || echo './'`lxc/lxc_controller.c lxc/lxc_controller.c: In function 'lxcControllerMain': lxc/lxc_controller.c:1176: warning: implicit declaration of function 'epoll_create1' lxc/lxc_controller.c:1176: warning: nested extern declaration of 'epoll_create1' [-Wnested-externs] lxc/lxc_controller.c:1176: error: 'EPOLL_CLOEXEC' undeclared (first use in this function) lxc/lxc_controller.c:1176: error: (Each undeclared identifier is reported only once lxc/lxc_controller.c:1176: error: for each function it appears in.) make[3]: *** [libvirt_lxc-lxc_controller.o] Error 1 make[3]: Leaving directory `/root/libvirt/src' ... $ git show v0.9.9-32-g9130396 | head -5 commit 9130396214975ba2251082f943c9717281039050 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Thu Jan 12 17:03:03 2012 +0000 Re-write LXC controller end-of-file I/O handling yet again Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

2 7

[libvirt] [PATCH] xen: Don't crash when we fail to init caps
by Guido Günther 23 Jan '12

23 Jan '12

by dereferencing a NULL pointer in the call to virNodeSuspendGetTargetMask. Only warn but Don't set an error to not overwrite an error code set by xenHypervisorMakeCapabilities. --- src/xen/xen_hypervisor.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 2bb3466..855576c 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2764,6 +2764,10 @@ xenHypervisorMakeCapabilities(virConnectPtr conn) utsname.machine, cpuinfo, capabilities); + if (caps == NULL) { + VIR_WARN("Failed to get host capabilities"); + return NULL; + } if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0) VIR_WARN("Failed to get host power management capabilities"); -- 1.7.8.3

2 5

[libvirt] Allow custom metadata in domain configuration XML
by Zeeshan Ali (Khattak) 23 Jan '12

23 Jan '12

Hi, Apologies for not using git-send-mail but for some reason its not working for me at the moment with gmail's SMTP. -- Regards, Zeeshan Ali (Khattak) FSF member#5124

4 5

[libvirt] [PATCH 0/2] consistent use of _LAST enum markers
by Eric Blake 23 Jan '12

23 Jan '12

This patch series will make it harder to add an enum value while forgetting to translate that enum to or from an appropriate string value. It also alters the public API so that users don't get _LAST enum values unless they ask for them, since such values are markers that might change over time rather than an official unchanging API value. Eric Blake (2): API: make declaration of _LAST enum values conditional maint: enforce use of _LAST marker cfg.mk | 12 +++- daemon/libvirtd.h | 8 +- include/libvirt/libvirt.h.in | 186 ++++++++++++++++++++++++++++++++++++----- python/generator.py | 3 +- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 3 +- src/internal.h | 4 + src/qemu/qemu_monitor_json.c | 9 +- src/remote/remote_protocol.x | 3 +- src/util/virtypedparam.c | 2 +- tests/cputest.c | 3 +- tools/virsh.c | 9 ++ 12 files changed, 207 insertions(+), 37 deletions(-) -- 1.7.7.5

3 6

[libvirt] Can't compile libvirt 0.9.9 (complains about apparmor)
by Jean-Philippe Menil 22 Jan '12

22 Jan '12

Hi, I need to compile libvirt 0.9.9 to work with qemu-kvm 1.0. I use to compile libvirt without apparmor or selinux, but this time, with the newer version, it seems that i can't compile with the following options: ./configure --disable-rpath --with-qemu=yes --with-qemu-user=libvirt-qemu --with-qemu-group=kvm --with-init-script=none --without-xen-inotify --without-uml --without-vmware --without-libssh2 --without-phyp --without-xenapi --without-libxl --without-esx --without-hyperv --without-test --without-remote --without-sasl --without-yajl --without-sanlock --without-polkit --without-avahi --without-audit --without-dtrace --without-numactl --without-capng --without-network --without-netcf --without-secrets --without-storage-lvm --without-storage-dir --without-storage-fs --without-storage-iscsi --without-storage-scsi --without-storage-mpath --without-storage-disk --without-python --without-driver-modules --without-hal --without-udev --without-libblkid --without-virtualport --without-macvtap --enable-debug=n --without-xen --without-vbox --without-lxc --without-openvz --with-driver-modules=no --without-apparmor --without-secdriver-apparmor --without-selinux --without-secdriver-selinux Relevant error is : configure:54338: error: You must install the AppArmor development package in order to compile libvirt Note that, if i compile with the option "with-apparmor", configure works fine, and i haven't any errors. Is it possible to compile libvirt without apparmor? Best regards. -- Jean-Philippe Menil - Pôle réseau Service IRTS DSI Université de Nantes jean-philippe.menil(a)univ-nantes.fr Tel : 02.53.48.49.27 - Fax : 02.53.48.49.09

1 0

[libvirt] [PATCH] xen: properly report out of memory when hvm_type is too small
by Guido Günther 21 Jan '12

21 Jan '12

--- src/xen/xen_hypervisor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 855576c..51b92d3 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2598,7 +2598,7 @@ xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn, &line[subs[1].rm_so], subs[1].rm_eo-subs[1].rm_so, sizeof(hvm_type)) == NULL) - return NULL; + goto no_memory; } else if (regexec (&flags_pae_rec, line, 0, NULL, 0) == 0) host_pae = 1; } -- 1.7.8.3

2 2

[libvirt] [PATCH 1/2] virsh: extend domif-{get, set}link command to accept target name as a parameter
by Taku Izumi 20 Jan '12

20 Jan '12

Other virsh domifXXX commands can accept target name as a parameter to specify interface. From viewpoint of consistency, virsh domif-getlink command should accept target name as a parameter. This patch achieves this. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- tools/virsh.c | 25 ++++++++++++++++++------- tools/virsh.pod | 3 ++- 2 files changed, 20 insertions(+), 8 deletions(-) Index: libvirt/tools/virsh.c =================================================================== --- libvirt.orig/tools/virsh.c +++ libvirt/tools/virsh.c @@ -1509,7 +1509,10 @@ cmdDomIfGetLink (vshControl *ctl, const const char *iface = NULL; int flags = 0; char *state = NULL; - char *mac = NULL; + char *value = NULL; + unsigned char macaddr[VIR_MAC_BUFLEN]; + const char *element; + const char *attribute; bool ret = false; int i; char *desc; @@ -1552,27 +1555,35 @@ cmdDomIfGetLink (vshControl *ctl, const goto cleanup; } + if (virParseMacAddr(iface, macaddr) == 0) { + element = "mac"; + attribute = "address"; + } else { + element = "target"; + attribute = "dev"; + } + /* find interface with matching mac addr */ for (i = 0; i < obj->nodesetval->nodeNr; i++) { cur = obj->nodesetval->nodeTab[i]->children; while (cur) { if (cur->type == XML_ELEMENT_NODE && - xmlStrEqual(cur->name, BAD_CAST "mac")) { + xmlStrEqual(cur->name, BAD_CAST element)) { - mac = virXMLPropString(cur, "address"); + value = virXMLPropString(cur, attribute); - if (STRCASEEQ(mac, iface)){ - VIR_FREE(mac); + if (STRCASEEQ(value, iface)){ + VIR_FREE(value); goto hit; } - VIR_FREE(mac); + VIR_FREE(value); } cur = cur->next; } } - vshError(ctl, _("Interface with address '%s' not found."), iface); + vshError(ctl, _("Interface (%s: %s) not found."), element, iface); goto cleanup; hit: Index: libvirt/tools/virsh.pod =================================================================== --- libvirt.orig/tools/virsh.pod +++ libvirt/tools/virsh.pod @@ -475,10 +475,11 @@ Modify link state of the domain's virtua state are "up" and "down. If --persistent is specified, only the persistent configuration of the domain is modified. -=item B<domif-getlink> I<domain> I<interface-MAC> I<--persistent> +=item B<domif-getlink> I<domain> I<interface-device> I<--persistent> Query link state of the domain's virtual interface. If --persistent is specified, query the persistent configuration. +I<interface-device> can be the interface's target name or the MAC address. =item B<domiftune> I<domain> I<interface-device> [[I<--config>] [I<--live>] | [I<--current>]]

2 3

[libvirt] [PATCH] maint: cleanup qemu capabilities
by Eric Blake 20 Jan '12

20 Jan '12

Fix inconsistent whitespace and long lines. * src/qemu/qemu_capabilities.h (qemuCapsFlags): Improve formatting. --- Pushing under the trivial rule, since this has come up multiple times this month with people trying to tweak unrelated parts of this enum while adding new values. src/qemu/qemu_capabilities.h | 161 +++++++++++++++++++++--------------------- 1 files changed, 80 insertions(+), 81 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6a5389e..eae7929 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -29,102 +29,101 @@ /* Internal flags to keep track of qemu command line capabilities */ enum qemuCapsFlags { - QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ - QEMU_CAPS_VNC_COLON = 1, /* Does the VNC take just port, or address + display */ - QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ - QEMU_CAPS_DRIVE = 3, /* Is the new -drive arg available */ - QEMU_CAPS_DRIVE_BOOT = 4, /* Does -drive support boot=on */ - QEMU_CAPS_NAME = 5, /* Is the -name flag available */ - QEMU_CAPS_UUID = 6, /* Is the -uuid flag available */ - QEMU_CAPS_DOMID = 7, /* Xenner only, special -domid flag available */ - QEMU_CAPS_VNET_HDR = 8, - QEMU_CAPS_MIGRATE_KVM_STDIO = 9, /* Original migration code from KVM. Also had tcp, but we can't use that - * since it had a design bug blocking the entire monitor console */ - QEMU_CAPS_MIGRATE_QEMU_TCP = 10, /* New migration syntax after merge to QEMU with TCP transport */ - QEMU_CAPS_MIGRATE_QEMU_EXEC = 11, /* New migration syntax after merge to QEMU with EXEC transport */ - QEMU_CAPS_DRIVE_CACHE_V2 = 12, /* Is the cache= flag wanting new v2 values */ - QEMU_CAPS_KVM = 13, /* Whether KVM is compiled in */ - QEMU_CAPS_DRIVE_FORMAT = 14, /* Is -drive format= avail */ - QEMU_CAPS_VGA = 15, /* Is -vga avail */ + QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ + QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */ + QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ + QEMU_CAPS_DRIVE = 3, /* Is the new -drive arg available */ + QEMU_CAPS_DRIVE_BOOT = 4, /* Does -drive support boot=on */ + QEMU_CAPS_NAME = 5, /* Is the -name flag available */ + QEMU_CAPS_UUID = 6, /* Is the -uuid flag available */ + QEMU_CAPS_DOMID = 7, /* Xenner: -domid flag available */ + QEMU_CAPS_VNET_HDR = 8, + QEMU_CAPS_MIGRATE_KVM_STDIO = 9, /* avoid kvm tcp migration bug */ + QEMU_CAPS_MIGRATE_QEMU_TCP = 10, /* have qemu tcp migration */ + QEMU_CAPS_MIGRATE_QEMU_EXEC = 11, /* have qemu exec migration */ + QEMU_CAPS_DRIVE_CACHE_V2 = 12, /* cache= flag wanting new v2 values */ + QEMU_CAPS_KVM = 13, /* Whether KVM is compiled in */ + QEMU_CAPS_DRIVE_FORMAT = 14, /* Is -drive format= avail */ + QEMU_CAPS_VGA = 15, /* Is -vga avail */ /* features added in qemu-0.10.0 or later */ - QEMU_CAPS_0_10 = 16, - QEMU_CAPS_NET_NAME = QEMU_CAPS_0_10, /* -net ...,name=str */ - QEMU_CAPS_HOST_NET_ADD = QEMU_CAPS_0_10, /* host_net_add monitor command */ - - QEMU_CAPS_PCIDEVICE = 17, /* PCI device assignment only supported by qemu-kvm */ - QEMU_CAPS_MEM_PATH = 18, /* mmap'ped guest backing supported */ - QEMU_CAPS_DRIVE_SERIAL = 19, /* -driver serial= available */ - QEMU_CAPS_XEN_DOMID = 20, /* -xen-domid (new style xen integration) */ - QEMU_CAPS_MIGRATE_QEMU_UNIX = 21, /* Does qemu support unix domain sockets for migration? */ - QEMU_CAPS_CHARDEV = 22, /* Is the new -chardev arg available */ - QEMU_CAPS_ENABLE_KVM = 23, /* Is the -enable-kvm flag available to "enable KVM full virtualization support" */ - QEMU_CAPS_MONITOR_JSON = 24, /* JSON mode for monitor */ - QEMU_CAPS_BALLOON = 25, /* -balloon available */ - QEMU_CAPS_DEVICE = 26, /* Is the new -device arg available */ - QEMU_CAPS_SDL = 27, /* Is the new -sdl arg available */ - QEMU_CAPS_SMP_TOPOLOGY = 28, /* Is sockets=s,cores=c,threads=t available for -smp? */ - QEMU_CAPS_NETDEV = 29, /* The -netdev flag & netdev_add/remove monitor commands */ - QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */ - QEMU_CAPS_VHOST_NET = 31, /* vhost-net support is available in qemu */ - QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */ - QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */ - QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */ - QEMU_CAPS_TDF = 35, /* -tdf flag (user-mode pit catchup) */ - QEMU_CAPS_PCI_CONFIGFD = 36, /* pci-assign.configfd */ - QEMU_CAPS_NODEFCONFIG = 37, /* -nodefconfig */ - QEMU_CAPS_BOOT_MENU = 38, /* -boot menu=on support */ - QEMU_CAPS_ENABLE_KQEMU = 39, /* -enable-kqemu flag */ - QEMU_CAPS_FSDEV = 40, /* -fstype filesystem passthrough */ - QEMU_CAPS_NESTING = 41, /* -enable-nesting (SVM/VMX) */ - QEMU_CAPS_NAME_PROCESS = 42, /* Is -name process= available */ - QEMU_CAPS_DRIVE_READONLY = 43, /* -drive readonly=on|off */ - QEMU_CAPS_SMBIOS_TYPE = 44, /* Is -smbios type= available */ - QEMU_CAPS_VGA_QXL = 45, /* The 'qxl' arg for '-vga' */ - QEMU_CAPS_SPICE = 46, /* Is -spice avail */ - QEMU_CAPS_VGA_NONE = 47, /* The 'none' arg for '-vga' */ - QEMU_CAPS_MIGRATE_QEMU_FD = 48, /* -incoming fd:n */ - QEMU_CAPS_BOOTINDEX = 49, /* -device bootindex property */ - QEMU_CAPS_HDA_DUPLEX = 50, /* -device hda-duplex */ - QEMU_CAPS_DRIVE_AIO = 51, /* -drive aio= supported */ - QEMU_CAPS_PCI_MULTIBUS = 52, /* bus=pci.0 vs bus=pci */ - QEMU_CAPS_PCI_BOOTINDEX = 53, /* pci-assign.bootindex */ - QEMU_CAPS_CCID_EMULATED = 54, /* -device ccid-card-emulated */ - QEMU_CAPS_CCID_PASSTHRU = 55, /* -device ccid-card-passthru */ - QEMU_CAPS_CHARDEV_SPICEVMC = 56, /* newer -chardev spicevmc */ - QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ - QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ - QEMU_CAPS_DEVICE_QXL_VGA = 59, /* Is the primary and vga campatible qxl device named qxl-vga? */ - QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ - QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* IOeventFD feature: virtio-{net|blk}-pci.ioeventfd=on/off */ - QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ + QEMU_CAPS_0_10 = 16, + QEMU_CAPS_NET_NAME = QEMU_CAPS_0_10, /* -net ...,name=str */ + QEMU_CAPS_HOST_NET_ADD = QEMU_CAPS_0_10, /* host_net_add command */ + + QEMU_CAPS_PCIDEVICE = 17, /* PCI device assignment supported */ + QEMU_CAPS_MEM_PATH = 18, /* mmap'ped guest backing supported */ + QEMU_CAPS_DRIVE_SERIAL = 19, /* -driver serial= available */ + QEMU_CAPS_XEN_DOMID = 20, /* -xen-domid */ + QEMU_CAPS_MIGRATE_QEMU_UNIX = 21, /* qemu migration via unix sockets */ + QEMU_CAPS_CHARDEV = 22, /* Is the new -chardev arg available */ + QEMU_CAPS_ENABLE_KVM = 23, /* -enable-kvm flag */ + QEMU_CAPS_MONITOR_JSON = 24, /* JSON mode for monitor */ + QEMU_CAPS_BALLOON = 25, /* -balloon available */ + QEMU_CAPS_DEVICE = 26, /* Is the new -device arg available */ + QEMU_CAPS_SDL = 27, /* Is the new -sdl arg available */ + QEMU_CAPS_SMP_TOPOLOGY = 28, /* -smp has sockets/cores/threads */ + QEMU_CAPS_NETDEV = 29, /* -netdev flag & netdev_add/remove */ + QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */ + QEMU_CAPS_VHOST_NET = 31, /* vhost-net support available */ + QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */ + QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */ + QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */ + QEMU_CAPS_TDF = 35, /* -tdf flag (user-mode pit catchup) */ + QEMU_CAPS_PCI_CONFIGFD = 36, /* pci-assign.configfd */ + QEMU_CAPS_NODEFCONFIG = 37, /* -nodefconfig */ + QEMU_CAPS_BOOT_MENU = 38, /* -boot menu=on support */ + QEMU_CAPS_ENABLE_KQEMU = 39, /* -enable-kqemu flag */ + QEMU_CAPS_FSDEV = 40, /* -fstype filesystem passthrough */ + QEMU_CAPS_NESTING = 41, /* -enable-nesting (SVM/VMX) */ + QEMU_CAPS_NAME_PROCESS = 42, /* Is -name process= available */ + QEMU_CAPS_DRIVE_READONLY = 43, /* -drive readonly=on|off */ + QEMU_CAPS_SMBIOS_TYPE = 44, /* Is -smbios type= available */ + QEMU_CAPS_VGA_QXL = 45, /* The 'qxl' arg for '-vga' */ + QEMU_CAPS_SPICE = 46, /* Is -spice avail */ + QEMU_CAPS_VGA_NONE = 47, /* The 'none' arg for '-vga' */ + QEMU_CAPS_MIGRATE_QEMU_FD = 48, /* -incoming fd:n */ + QEMU_CAPS_BOOTINDEX = 49, /* -device bootindex property */ + QEMU_CAPS_HDA_DUPLEX = 50, /* -device hda-duplex */ + QEMU_CAPS_DRIVE_AIO = 51, /* -drive aio= supported */ + QEMU_CAPS_PCI_MULTIBUS = 52, /* bus=pci.0 vs bus=pci */ + QEMU_CAPS_PCI_BOOTINDEX = 53, /* pci-assign.bootindex */ + QEMU_CAPS_CCID_EMULATED = 54, /* -device ccid-card-emulated */ + QEMU_CAPS_CCID_PASSTHRU = 55, /* -device ccid-card-passthru */ + QEMU_CAPS_CHARDEV_SPICEVMC = 56, /* newer -chardev spicevmc */ + QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ + QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ + QEMU_CAPS_DEVICE_QXL_VGA = 59, /* primary qxl device named qxl-vga? */ + QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ + QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* virtio-{net|blk}-pci.ioeventfd=on */ + QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ QEMU_CAPS_VIRTIO_BLK_EVENT_IDX = 63, /* virtio-blk-pci.event_idx */ QEMU_CAPS_VIRTIO_NET_EVENT_IDX = 64, /* virtio-net-pci.event_idx */ QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC = 65, /* Is cache=directsync supported? */ - QEMU_CAPS_PIIX3_USB_UHCI = 66, /* -device piix3-usb-uhci */ - QEMU_CAPS_PIIX4_USB_UHCI = 67, /* -device piix4-usb-uhci */ - QEMU_CAPS_USB_EHCI = 68, /* -device usb-ehci */ - QEMU_CAPS_ICH9_USB_EHCI1 = 69, /* -device ich9-usb-ehci1 and companions */ + QEMU_CAPS_PIIX3_USB_UHCI = 66, /* -device piix3-usb-uhci */ + QEMU_CAPS_PIIX4_USB_UHCI = 67, /* -device piix4-usb-uhci */ + QEMU_CAPS_USB_EHCI = 68, /* -device usb-ehci */ + QEMU_CAPS_ICH9_USB_EHCI1 = 69, /* -device ich9-usb-ehci1 and friends */ QEMU_CAPS_VT82C686B_USB_UHCI = 70, /* -device vt82c686b-usb-uhci */ - QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ - QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ - QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ - QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ + QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ + QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ + QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ - QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ - QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ - QEMU_CAPS_FSDEV_READONLY =79, /* -fsdev readonly supported */ + QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ + QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ + QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */ QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */ - QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* support for SG_IO commands, reportedly added in 0.11 */ + QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* SG_IO commands, since 0.11 */ QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */ - QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ + QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ - QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends ({b,io}ps{_rd,_wr,}) */ + QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ QEMU_CAPS_LAST, /* this must always be the last item */ }; -- 1.7.7.5

1 0

Re: [libvirt] [RFC 0/5]: QMP: add balloon-get-memory-stats command
by Eric Blake 20 Jan '12

20 Jan '12

On 01/19/2012 08:56 AM, Luiz Capitulino wrote: > Long ago, commit 625a5be added the guest provided memory statistics to > the query-balloon command. Unfortunately, it also introduced a severe > bug: query-balloon would hang if the guest didn't respond. This, in turn, > would also cause a hang in libvirt. > > Because of that, we decided to disable the guest memory stats feature > (commit 11724ff). > > As we decided to let commands implement ad-hoc async mechanisms until we > get a proper way to do it, I decided to try to re-enable that feature. > > My idea is to have a command and an event. The command gets the process > started by sending a request to guest and returns. Later, when the guest > makes the memory stats info available, it's sent to the client by means > of an QMP event (please, take a look at patch 05/05 for full details). > > I'm not sure if that approach is good for libvirt though, so it would be > very helpful to get their input (Eric, I'm CC'ing you here, but feel free > to route this to someone else). [I went ahead and cc'd the libvirt list] Yes, libvirt can live with this approach. And having this in parallel to a qemu-ga verb is nice, since, as it was pointed out, this would allow interaction with guests that have a balloon device but not a guest agent. You may want to read this thread [1], for thoughts on the impact of making another existing blocking command be extended into one that starts an async event and ends when an event is raised; libvirt can expose both a blocking and an asynchronous implementation to the user on top of the qemu model being just asynchronous. [1] https://www.redhat.com/archives/libvir-list/2012-January/msg00562.html Thinking aloud - do we need a means to poll the state of the balloon-stat query? On the one hand, if libvirtd issues the start command, then gets stopped, then the event occurs, then libvirtd is restarted, then libvirt won't know that the event was missed. On the other hand, since this involves guest interaction, libvirt already has to assume that the guest may be malicious and refuse to report stats and/or report invalid stats, so libvirt would already have to be prepared to give up if no event has arrived in a fixed amount of time, and that also means that restarting libvirtd can just ignore any balloon query that was in flight before the restart. So I guess I'm okay with just a start and an event, with no poll of the last-known guest response. But it does mean that qemu has to gracefully handle if libvirt makes two start requests in a row without any intervening events, and conversely that libvirt has to be prepared for an event that happens even when libvirt doesn't remember triggering the start command. > Another interesting point is that, there's another way of doing this and > it's using qemu-ga instead. That's, qemu-ga could read that information > from proc and return it. This is easier & simpler, as it doesn't involve > guest communication. We also could return a lot more information if needed. > The only disadvantage I can see is the dependency on qemu-ga... Most likely, we would want to teach libvirt to use both methods, and give the choice to the user on which approach to use when the guest supports both. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [test-API][PATCH 1/2] Fix compatibility problem on python 2.4
by Wayne Sun 20 Jan '12

20 Jan '12

* switch rpartition with rsplit * adjust the style --- generator.py | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/generator.py b/generator.py index 9a2ed06..6108963 100644 --- a/generator.py +++ b/generator.py @@ -124,10 +124,14 @@ class FuncGen(object): for i in range(loop_number): case_ref_name = self.cases_ref_names[i] - pkg_casename = case_ref_name.rpartition(":")[0] - funcname = case_ref_name.rpartition(":")[-1] + pkg_casename = case_ref_name.rsplit(":", 1)[0] + funcname = case_ref_name.rsplit(":", 1)[-1] + + if "_clean" not in funcname: + cleanoper = 0 + else: + cleanoper = 1 - cleanoper = 0 if "_clean" not in funcname else 1 if not cleanoper: self.fmt.print_start(pkg_casename, env_logger) @@ -182,7 +186,10 @@ class FuncGen(object): if not cleanoper: self.fmt.print_end(pkg_casename, ret, env_logger) else: - self.fmt.print_string(21*" " + "Done" if clean_ret < 1 else 21*" " + "Fail", env_logger) + if clean_ret < 1: + self.fmt.print_string(21*" " + "Done", env_logger) + else: + self.fmt.print_string(21*" " + "Fail", env_logger) end_time = time.strftime("%Y-%m-%d %H:%M:%S") -- 1.7.1

2 3

[libvirt] [PATCHv2 0/6] various cleanups
by Eric Blake 19 Jan '12

19 Jan '12

I think I've posted all of these before, but with no reviews yet. Eric Blake (6): threads: check for failure to set thread-local value build: silence some compiler warnings from gnulib lxc: use live/config helper util: add new file for virTypedParameter utils util: use new virTypedParameter helpers error: drop old-style error reporting daemon/remote.c | 1 + m4/virt-compile-warnings.m4 | 7 +- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/esx/esx_driver.c | 81 +++--- src/libvirt_private.syms | 21 +- src/libxl/libxl_driver.c | 44 +-- src/lxc/lxc_driver.c | 370 ++++++----------------- src/qemu/qemu_driver.c | 656 +++++++++++++---------------------------- src/test/test_driver.c | 27 +- src/util/conf.c | 22 +- src/util/threads-pthread.c | 14 +- src/util/threads-win32.c | 9 +- src/util/threads.h | 2 +- src/util/util.c | 16 +- src/util/util.h | 4 +- src/util/virterror.c | 7 +- src/util/virterror_internal.h | 8 - src/util/virtypedparam.c | 187 ++++++++++++ src/util/virtypedparam.h | 37 +++ src/xen/xen_hypervisor.c | 215 ++++++-------- tools/virsh.c | 1 + 22 files changed, 721 insertions(+), 1010 deletions(-) create mode 100644 src/util/virtypedparam.c create mode 100644 src/util/virtypedparam.h -- 1.7.7.5

2 15

[libvirt] Hidden symbols
by Shradha Shah 19 Jan '12

19 Jan '12

Hello All, When using a systemtap to get a call chain of functions that are executed during the migration of a vm from one host to another I realised that many of the symbols in libvirt are hidden and not visible to systemtap. Is there a way I can make all the symbols visible just for debugging purposes? Many Thanks, Regards, Shradha Shah

2 1

[libvirt] [libvirt-glib 1/4] Refactor gvir_config_object_delete_child
by Christophe Fergeau 19 Jan '12

19 Jan '12

By changing gvir_config_xml_foreach_child to make it robust against current node deletion in the "foreach" callback, we can use gvir_config_object_foreach_child to implement gvir_config_object_delete_child --- libvirt-gconfig/libvirt-gconfig-helpers.c | 5 +++- libvirt-gconfig/libvirt-gconfig-object.c | 32 ++++++++++++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index cc2e5cc..c406a49 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -169,14 +169,17 @@ void gvir_config_xml_foreach_child(xmlNodePtr node, g_return_if_fail(iter_func != NULL); - for (it = node->children; it != NULL; it = it->next) { + it = node->children; + while (it != NULL) { gboolean cont; + xmlNodePtr next = it->next; if (xmlIsBlankNode(it)) continue; cont = iter_func(it, opaque); if (!cont) break; + it = next; } } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 5645490..7fb8b69 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -465,27 +465,35 @@ gvir_config_object_replace_child_with_attribute(GVirConfigObject *object, g_object_unref(G_OBJECT(child)); } +static gboolean maybe_unlink_node(xmlNodePtr node, const char *name) +{ + if (g_strcmp0((char *)node->name, name) == 0) { + xmlUnlinkNode(node); + xmlFreeNode(node); + + return TRUE; + } + + return FALSE; +} + +static gboolean remove_oneshot(xmlNodePtr node, gpointer opaque) +{ + return !maybe_unlink_node(node, opaque); +} + G_GNUC_INTERNAL void gvir_config_object_delete_child(GVirConfigObject *object, const char *child_name) { - xmlNodePtr parent_node; - xmlNodePtr old_node; - g_return_if_fail(GVIR_CONFIG_IS_OBJECT(object)); g_return_if_fail(child_name != NULL); - parent_node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(object)); - g_return_if_fail(parent_node != NULL); + gvir_config_object_foreach_child(object, NULL, remove_oneshot, + (gpointer)child_name); +} - if (!(old_node = gvir_config_xml_get_element(parent_node, child_name, NULL))) - return; - /* FIXME: should we make sure there are no multiple occurrences - * of this node? - */ - xmlUnlinkNode(old_node); - xmlFreeNode(old_node); } -- 1.7.7.5

2 7

[libvirt] pibvirt php help
by punit gupta 19 Jan '12

19 Jan '12

sir i am trying to create ssh connention and i am able to connect with out password from terminal using virsh -c qemu+ssh://punit@192.168.102.133/system but this is not working with libvirt-php binding error :for libvirt-php ssh connection "Libvirt last error: cannot recv data: Resource temporarily unavailable" my php code is <?php $res1=libvirt_connect("qemu+ssh://punit@192.168.102.133/system",false); print_r($res1); printf ("\n"); if ($res1==false) { echo ("Libvirt last error: ".libvirt_get_last_error()); } ?> -- Punit Gupta M-Tect (jiit noida)

2 1

[libvirt] can not get screen shot using libvirt-php
by punit gupta 19 Jan '12

19 Jan '12

sir i am able to connect to local system an gett all the parameters but i am not able to get screen shots it gives error "Cannot find gvnccapture binary" -- Punit Gupta M-Tect (jiit noida)

2 1

[libvirt] [PATCH] Fix rpc generator to anchor matches for method names
by Daniel P. Berrange 19 Jan '12

19 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The RPC generator transforms methods matching certain patterns like 'id' or 'uuid', etc but does not anchor its matches to the end of the word. So if a method contains 'id' in the middle (eg virIdentity) then the RPC generator munges that. * src/rpc/gendispatch.pl: Anchor matches --- src/rpc/gendispatch.pl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index b36ca69..0460fca 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -34,10 +34,10 @@ sub name_to_ProcName { my $name = shift; my @elems = split /_/, $name; @elems = map ucfirst, @elems; - @elems = map { $_ =~ s/Nwfilter/NWFilter/; $_ =~ s/Xml/XML/; - $_ =~ s/Uri/URI/; $_ =~ s/Uuid/UUID/; $_ =~ s/Id/ID/; - $_ =~ s/Mac/MAC/; $_ =~ s/Cpu/CPU/; $_ =~ s/Os/OS/; - $_ =~ s/Nmi/NMI/; $_ } @elems; + @elems = map { $_ =~ s/Nwfilter/NWFilter/; $_ =~ s/Xml$/XML/; + $_ =~ s/Uri$/URI/; $_ =~ s/Uuid$/UUID/; $_ =~ s/Id$/ID/; + $_ =~ s/Mac$/MAC/; $_ =~ s/Cpu$/CPU/; $_ =~ s/Os$/OS/; + $_ =~ s/Nmi$/NMI/; $_ } @elems; join "", @elems } -- 1.7.7.5

2 1

[libvirt] [PATCH 0/4] Misc patches to support RBAC work
by Daniel P. Berrange 19 Jan '12

19 Jan '12

The following patches aren't really needed on their own, rather they are part of the role based access control work I'm doing. In order to keep my patch queue small, I'm sending these out now, since there is no harm in merging them

2 5

[libvirt] [PATCH] errors: Improve error reporting to log multiple errors instead of just the last one
by Michal Novotny 19 Jan '12

19 Jan '12

This patch introduces a new structure called virErrorsPtr which can get all the errors that occurred since the connection open. The error callback function is being used as many times as necessary. The new public function called virGetAllErrors() has been introduced to get all the errors that occurred. Also, a new test called errorreport has been written to test the functionality of error logging for multiple error occurrences. Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- include/libvirt/virterror.h | 14 ++++++ python/generator.py | 1 + src/util/virterror.c | 99 ++++++++++++++++++++++++++++++++++++---- src/util/virterror_internal.h | 1 + tests/Makefile.am | 9 +++- tests/errorreport.c | 74 ++++++++++++++++++++++++++++++ 6 files changed, 186 insertions(+), 12 deletions(-) create mode 100644 tests/errorreport.c diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index e896d67..c7a8018 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -118,6 +118,19 @@ struct _virError { see note above */ }; +/* + * virErrors: + * + * A libvirt Errors array instance + */ +typedef struct _virErrors virErrors; +typedef virErrors *virErrorsPtr; +struct _virErrors { + virErrorPtr lastError; + unsigned int nerrors; + virErrorPtr errors; +}; + /** * virErrorNumber: * @@ -261,6 +274,7 @@ typedef void (*virErrorFunc) (void *userData, virErrorPtr error); */ virErrorPtr virGetLastError (void); +virErrorsPtr virGetAllErrors (void); virErrorPtr virSaveLastError (void); void virResetLastError (void); void virResetError (virErrorPtr err); diff --git a/python/generator.py b/python/generator.py index 6fee3a4..315eb51 100755 --- a/python/generator.py +++ b/python/generator.py @@ -356,6 +356,7 @@ skip_impl = ( 'virDomainSnapshotListChildrenNames', 'virConnGetLastError', 'virGetLastError', + 'virGetAllErrors', 'virDomainGetInfo', 'virDomainGetState', 'virDomainGetControlInfo', diff --git a/src/util/virterror.c b/src/util/virterror.c index 380dc56..b03ae7c 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -190,11 +190,17 @@ static const char *virErrorDomainName(virErrorDomain domain) { static void virLastErrFreeData(void *data) { - virErrorPtr err = data; - if (!err) + virErrorsPtr errs = data; + if (!errs) return; - virResetError(err); - VIR_FREE(err); + + if (errs->lastError) { + virResetError(errs->lastError); + VIR_FREE(errs->lastError); + } + if (errs->errors) + VIR_FREE(errs->errors); + VIR_FREE(errs); } @@ -262,14 +268,18 @@ virCopyError(virErrorPtr from, static virErrorPtr virLastErrorObject(void) { - virErrorPtr err; - err = virThreadLocalGet(&virLastErr); - if (!err) { - if (VIR_ALLOC(err) < 0) + virErrorsPtr errs = NULL; + + errs = virThreadLocalGet(&virLastErr); + if (!errs) { + if (VIR_ALLOC(errs) < 0) + return NULL; + if (VIR_ALLOC(errs->lastError) < 0) return NULL; - virThreadLocalSet(&virLastErr, err); + virThreadLocalSet(&virLastErr, errs); } - return err; + + return errs->lastError; } @@ -292,6 +302,27 @@ virGetLastError(void) return err; } +/* + * virGetAllErrors: + * + * Provide a pointer to all errors caught at the library level + * + * The error object is kept in thread local storage, so separate + * threads can safely access this concurrently. + * + * Returns a pointer to all errors caught or NULL if none occurred. + */ +virErrorsPtr +virGetAllErrors(void) +{ + virErrorsPtr errs; + + errs = virThreadLocalGet(&virLastErr); + if (!errs || errs->nerrors == 0) + return NULL; + return errs; +} + /** * virSetError: * @newerr: previously saved error object @@ -316,11 +347,56 @@ virSetError(virErrorPtr newerr) virResetError(err); ret = virCopyError(newerr, err); + + /* Add error into the error array */ + virAddError(newerr); cleanup: errno = saved_errno; return ret; } +/* + * virAddError: + * @err: error pointer + * + * Add the error to the array of error pointer + */ +void +virAddError(virErrorPtr err) +{ + virErrorsPtr errs; + + /* Discard all error codes that mean 'no error' */ + if (!err || err->code == VIR_ERR_OK) + return; + + errs = virThreadLocalGet(&virLastErr); + + /* Shouldn't happen but doesn't hurt to check */ + if (!errs) + return; + + if (errs->errors == NULL) { + if (VIR_ALLOC(errs->errors) < 0) + return; + errs->nerrors = 0; + } + else { + if (VIR_REALLOC_N(errs->errors, errs->nerrors + 1) < 0) + return; + } + + /* Insert data into errors array element */ + errs->errors[errs->nerrors].domain = err->domain; + errs->errors[errs->nerrors].code = err->code; + errs->errors[errs->nerrors].message = strdup(err->message); + errs->errors[errs->nerrors].level = err->level; + errs->errors[errs->nerrors].int1 = err->int1; + errs->errors[errs->nerrors].int2 = err->int2; + + errs->nerrors++; +} + /** * virCopyLastError: * @to: target to receive the copy @@ -730,6 +806,9 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, to->int1 = int1; to->int2 = int2; + /* Add error into the error array */ + virAddError(to); + /* * Hook up the error or warning to the logging facility * XXXX should we include filename as 'category' instead of domain name ? diff --git a/src/util/virterror_internal.h b/src/util/virterror_internal.h index d61ea0d..b26aec2 100644 --- a/src/util/virterror_internal.h +++ b/src/util/virterror_internal.h @@ -86,6 +86,7 @@ void virReportOOMErrorFull(int domcode, int virSetError(virErrorPtr newerr); +void virAddError(virErrorPtr err); void virDispatchError(virConnectPtr conn); const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen); diff --git a/tests/Makefile.am b/tests/Makefile.am index f3b0c09..f15c915 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -97,7 +97,7 @@ check_PROGRAMS = virshtest conftest sockettest \ commandtest commandhelper seclabeltest \ hashtest virnetmessagetest virnetsockettest ssh \ utiltest virnettlscontexttest shunloadtest \ - virtimetest + virtimetest errorreport check_LTLIBRARIES = libshunload.la @@ -221,6 +221,7 @@ TESTS = virshtest \ virtimetest \ shunloadtest \ utiltest \ + errorreport \ $(test_scripts) if HAVE_YAJL @@ -321,6 +322,10 @@ xencapstest_SOURCES = \ xencapstest.c testutils.h testutils.c xencapstest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS) +errorreport_SOURCES = \ + errorreport.c testutils.h testutils.c +errorreport_LDADD = $(LDADDS) + reconnect_SOURCES = \ reconnect.c testutils.h testutils.c reconnect_LDADD = $(LDADDS) @@ -331,7 +336,7 @@ statstest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS) else EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \ - xencapstest.c reconnect.c \ + xencapstest.c reconnect.c errorreport.c \ testutilsxen.c testutilsxen.h endif diff --git a/tests/errorreport.c b/tests/errorreport.c new file mode 100644 index 0000000..cbe84dd --- /dev/null +++ b/tests/errorreport.c @@ -0,0 +1,74 @@ +#define BOGUS_NAME "SomeBogusDomainName" +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> + +#include "internal.h" +#include "testutils.h" +#include "command.h" + +/* + * malloc/realloc function used in this code since I was unable to use + * VIR_[RE]ALLOC[_N] functions as the compilation failed + */ + +int numErrors = 0; +int *myErrorCodes = NULL; + +static void errorHandler(void *userData ATTRIBUTE_UNUSED, + virErrorPtr error) { + myErrorCodes = (int *)realloc( myErrorCodes, (numErrors + 1) * sizeof(int)); + + myErrorCodes[numErrors] = error->code; + numErrors++; +} + +static int +mymain(void) +{ + int i, ret = EXIT_SUCCESS; + virConnectPtr conn; + virDomainPtr dom; + virErrorsPtr errs; + + myErrorCodes = (int *)malloc( sizeof(int) ); + + virSetErrorFunc(NULL, errorHandler); + + conn = virConnectOpen(NULL); + if (conn == NULL) + conn = virConnectOpenReadOnly(NULL); + + /* Attempt to fail for the first time */ + dom = virDomainLookupByID(conn, -1); + /* Attempt for the second time */ + virDomainFree(dom); + /* ... third time ... */ + dom = virDomainLookupByName(conn, BOGUS_NAME); + /* Now close the connection */ + virConnectClose(conn); + + /* ...and try to lookup - generate error for the fourth time :-) */ + dom = virDomainLookupByName(conn, BOGUS_NAME); + + errs = virGetAllErrors(); + if (errs) { + if (errs->nerrors != numErrors) { + ret = EXIT_FAILURE; + goto cleanup; + } + + for (i = 0; i < errs->nerrors; i++) { + if (errs->errors[i].code != myErrorCodes[i]) + fprintf(stderr, "Error code for error #%d mismatch: expect %d, actual %d\n", i, myErrorCodes[i], errs->errors[i].code); + } + } + +cleanup: + free(myErrorCodes); + + return ret; +} + +VIRT_TEST_MAIN(mymain) -- 1.7.7.4

2 5

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 19 Jan '12

19 Jan '12

Overall status: failed Start date: Wed Jan 18 2012 Start time: 18:32:52 UTC / 18:32:52 GMT Build counter: 1326911571 Build timestamp: 1326911571 URL: http://dhcp-0-241.camlab.fab.redhat.com/index.html Module: libvirt Status: failed URL: http://dhcp-0-241.camlab.fab.redhat.com/module-libvirt.html

4 3

[libvirt] [PATCH RFCv2 0/5] LibSSH2 transport for libvirt
by Peter Krempa 19 Jan '12

19 Jan '12

This patchset proposes to use libssh2 as ssh transport option in libvirt instead of the usual "spawn the client and connect pipes" approach. For this to work, you'll need at least libssh2 v 1.3.0. This is the second iteration of this functionality. I have completed nearly all of the functionality and tested most of the common situations. If you'd like to try this out, I've prepared for you a branch in my git repo: git checkout -B libssh_transport 66ca7ce573a69858c5af60645984bb1f2f90b1e7 git pull git://aeon.pipo.sk/libvirt.git libssh_transport (It should be up most of the time) To test the connection use URI's in the following format: qemu+libssh://USER@HOST:PORT/system?known_hosts=PATH_TO_KNOWN_HOSTS_FILE&keyfile=PATH_TO_PRIVATE_KEY The parameters may be omitted and then they take a default value (root@localhost:22). SSH Agent authentication is supported automaticaly. For public key to work you need to specify the path to the key. For host key verification to work, you'll need to specify the path to a known_hosts file. (It may be empty and even don't exist). I'd appreciate your feedback. Thanks for your comments and time. Peter Peter Krempa (5): libssh2_transport: add main libssh2 transport implementation libssh2_transport: add ssh context support to virNetSocket libssh2_transport: Add libssh2 session support to net client code libssh2_transport: Use libssh2 driver code in remote driver virsh: Reconnect to daemon if remote netcat crashes while using libssh configure.ac | 40 ++- include/libvirt/virterror.h | 4 + po/POTFILES.in | 1 + src/Makefile.am | 9 + src/libvirt_private.syms | 1 + src/remote/remote_driver.c | 116 +++-- src/rpc/virnetclient.c | 91 ++++- src/rpc/virnetclient.h | 11 + src/rpc/virnetlibsshcontext.c | 1132 +++++++++++++++++++++++++++++++++++++++++ src/rpc/virnetlibsshcontext.h | 76 +++ src/rpc/virnetsocket.c | 136 +++++- src/rpc/virnetsocket.h | 12 + src/util/virterror.c | 14 + tools/virsh.c | 3 +- 14 files changed, 1606 insertions(+), 40 deletions(-) create mode 100644 src/rpc/virnetlibsshcontext.c create mode 100644 src/rpc/virnetlibsshcontext.h -- 1.7.3.4

3 12

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 19 Jan '12

19 Jan '12

Overall status: failed Start date: Thu Jan 19 2012 Start time: 12:26:32 UTC / 12:26:32 GMT Build counter: 1326975992 Build timestamp: 1326975992 URL: http://t500wlan.home.berrange.com/index.html Module: libvirt Status: failed URL: http://t500wlan.home.berrange.com/module-libvirt.html

1 0

[libvirt] [PATCH] Add two NUMA tuning python bindings APIs
by Guannan Ren 19 Jan '12

19 Jan '12

*virDomainSetNumaParameters *virDomainGetNumaParameters --- python/libvirt-override-api.xml | 13 +++ python/libvirt-override.c | 186 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 704fee9..e09290c 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -248,6 +248,19 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetNumaParameters' file='python'> + <info>Change the NUMA tunables</info> + <return type='int' info='-1 in case of error, 0 in case of success.'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='params' type='virTypedParameterPtr' info='pointer to memory tunable objects'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> + <function name='virDomainGetNumaParameters' file='python'> + <info>Get the NUMA parameters</info> + <return type='virTypedParameterPtr' info='the I/O tunables value or None in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index d2aad0f..27ad1d8 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1000,6 +1000,190 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *info; + int i_retval; + int nparams = 0, i; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, + (char *)"OOi:virDomainSetNumaParameters", + &pyobj_domain, &info, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_INT_FAIL; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + free(params); + return VIR_PY_INT_FAIL; + } + + /* convert to a Python tuple of long objects */ + for (i = 0; i < nparams; i++) { + PyObject *key, *val; + key = libvirt_constcharPtrWrap(params[i].field); + val = PyDict_GetItem(info, key); + Py_DECREF(key); + + if (val == NULL) + continue; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + params[i].value.i = (int)PyInt_AS_LONG(val); + break; + + case VIR_TYPED_PARAM_UINT: + params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); + break; + + case VIR_TYPED_PARAM_LLONG: + params[i].value.l = (long long)PyLong_AsLongLong(val); + break; + + case VIR_TYPED_PARAM_ULLONG: + params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); + break; + + case VIR_TYPED_PARAM_DOUBLE: + params[i].value.d = (double)PyFloat_AsDouble(val); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + { + /* Hack - Python's definition of Py_True breaks strict + * aliasing rules, so can't directly compare + */ + PyObject *hacktrue = PyBool_FromLong(1); + params[i].value.b = hacktrue == val ? 1: 0; + Py_DECREF(hacktrue); + } + break; + + case VIR_TYPED_PARAM_STRING: + params[i].value.s = PyString_AsString(val); + break; + + default: + free(params); + return VIR_PY_INT_FAIL; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetNumaParameters(domain, params, nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { + free(params); + return VIR_PY_INT_FAIL; + } + + free(params); + return VIR_PY_INT_SUCCESS; +} + +static PyObject * +libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *info; + int i_retval; + int nparams = 0, i; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetNumaParameters", + &pyobj_domain, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_NONE; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + free(params); + return VIR_PY_NONE; + } + + /* convert to a Python tuple of long objects */ + if ((info = PyDict_New()) == NULL) { + free(params); + return VIR_PY_NONE; + } + + for (i = 0 ; i < nparams ; i++) { + PyObject *key, *val; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + val = PyInt_FromLong((long)params[i].value.i); + break; + + case VIR_TYPED_PARAM_UINT: + val = PyInt_FromLong((long)params[i].value.ui); + break; + + case VIR_TYPED_PARAM_LLONG: + val = PyLong_FromLongLong((long long)params[i].value.l); + break; + + case VIR_TYPED_PARAM_ULLONG: + val = PyLong_FromLongLong((long long)params[i].value.ul); + break; + + case VIR_TYPED_PARAM_DOUBLE: + val = PyFloat_FromDouble((double)params[i].value.d); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + val = PyBool_FromLong((long)params[i].value.b); + break; + + case VIR_TYPED_PARAM_STRING: + val = libvirt_constcharPtrWrap(params[i].value.s); + break; + + default: + free(params); + Py_DECREF(info); + return VIR_PY_NONE; + } + + key = libvirt_constcharPtrWrap(params[i].field); + PyDict_SetItem(info, key, val); + } + free(params); + return(info); +} + +static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -5162,6 +5346,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetBlkioParameters", libvirt_virDomainGetBlkioParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetMemoryParameters", libvirt_virDomainSetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, -- 1.7.7.5

3 5

[libvirt] [PATCH 0/8 v5] Summary on block IO throttle
by Lei Li 19 Jan '12

19 Jan '12

Changes since V3 - Use virTypedParameterPtr instead of specific struct in libvirt pulic API. - Relevant changes to remote driver, qemu driver, python support and virsh. Changes since V2 - Implement the Python binding support for setting blkio throttling. - Implement --current --live --config options support to unify the libvirt API. - Add changes in docs and tests. - Some changes suggested by Adam Litke, Eric Blake, Daniel P. Berrange. - Change the XML schema. - API name to virDomain{Set, Get}BlockIoTune. - Parameters changed to make them more self-explanatory. - virsh command name to blkdeviotune. - And other fixups. Changes since V1 - Implement the support to get the block io throttling for a device as read only connection - QMP/HMP. - Split virDomainBlockIoThrottle into two separate functions virDomainSetBlockIoThrottle - Set block I/O limits for a device - Requires a connection in 'write' mode. - Limits (info) structure passed as an input parameter virDomainGetBlockIoThrottle - Get the current block I/O limits for a device - Works on a read-only connection. - Current limits are written to the output parameter (reply). - And Other fixups suggested by Adam Litke, Daniel P. Berrange. - For dynamically allocate the blkiothrottle struct, I will fix it when implement --current --live --config options support. Today libvirt supports the cgroups blkio-controller, which handles proportional shares and throughput/iops limits on host block devices. blkio-controller does not support network file systems (NFS) or other QEMU remote block drivers (curl, Ceph/rbd, sheepdog) since they are not host block devices. QEMU I/O throttling works with all types of drive and can be applied independently to each drive attached to a guest and supports throughput/iops limits. To help add QEMU I/O throttling support to libvirt, we plan to complete it with add new API virDomain{Set, Get}BlockIoThrottle(), new command 'blkdeviotune' and Python bindings. Notes: Now all the planed features were implemented (#1#2 were implemented by Zhi Yong Wu), the previous comments were all fixed up too. And the qemu part patches have been accepted upstream and are expected to be part of the QEMU 1.1 release, git tree from Zhi Yong: http://repo.or.cz/w/qemu/kevin.git/shortlog/refs/heads/block 1) Enable the blkio throttling in xml when guest is starting up. Add blkio throttling in xml as follows: <disk type='file' device='disk'> ... <iotune> <total_bytes_sec>nnn</total_bytes_sec> ... </iotune> ... </disk> 2) Enable blkio throttling setting at guest running time. virsh blkdeviotune <domain> <device> [--total_bytes_sec<number>] [--read_bytes_sec<number>] \ [--write_bytes_sec<number>] [--total_iops_sec<number>] [--read_iops_sec<number>] [--write_iops_sec<number>] 3) The support to get the current block i/o throttling for a device - HMP/QMP. virsh blkiothrottle <domain> <device> total_bytes_sec: read_bytes_sec: write_bytes_sec: total_iops_sec: read_iops_sec: write_iops_sec: 4) Python binding support for setting blkio throttling. 5) --current --live --config options support to unify the libvirt API. virsh blkdeviotune <domain> <device> [--total_bytes_sec <number>] [--read_bytes_sec <number>] [--write_bytes_sec <number>] [--total_iops_sec <number>] [--read_iops_sec <number>] [--write_iops_sec <number>] [--config] [--live] [--current] daemon/remote.c | 108 +++++++ docs/formatdomain.html.in | 31 ++ docs/schemas/domaincommon.rng | 24 ++ include/libvirt/libvirt.h.in | 70 ++++ python/generator.py | 2 + python/libvirt-override-api.xml | 16 + python/libvirt-override.c | 179 +++++++++++ src/conf/domain_conf.c | 101 ++++++- src/conf/domain_conf.h | 12 + src/driver.h | 20 ++ src/libvirt.c | 145 +++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_command.c | 33 ++ src/qemu/qemu_driver.c | 338 ++++++++++++++++++++ src/qemu/qemu_monitor.c | 36 ++ src/qemu/qemu_monitor.h | 22 ++ src/qemu/qemu_monitor_json.c | 185 +++++++++++ src/qemu/qemu_monitor_json.h | 10 + src/qemu/qemu_monitor_text.c | 164 ++++++++++ src/qemu/qemu_monitor_text.h | 10 + src/remote/remote_driver.c | 96 ++++++ src/remote/remote_protocol.x | 26 ++- src/remote_protocol-structs | 24 ++ src/util/xml.h | 2 + .../qemuxml2argv-blkdeviotune.args | 4 + .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 37 +++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh.c | 240 ++++++++++++++ tools/virsh.pod | 23 ++ 30 files changed, 1958 insertions(+), 4 deletions(-) -- Lei

6 9

[libvirt] [PATCH v2] Added capability checking for block <iotune> setting.
by Martin Kletzander 18 Jan '12

18 Jan '12

There was missing capability for blkiotune and thus specifying these settings caused libvirt to run qemu with invalid parameters and then reporting qemu error instead of the standard libvirt one. The support for blkiotune setting was added in upstream qemu repo under commit 0563e191516289c9d2f282a8c50f2eecef2fa773. --- src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 13 +++++++++++++ tests/qemuxml2argvtest.c | 2 +- 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0a1c9aa..54757fc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -150,6 +150,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "drive-copy-on-read", "cpu-host", "fsdev-writeout", + + "drive-iotune", /* 85 */ ); struct qemu_feature_flags { @@ -1031,6 +1033,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_DRIVE_AIO); if (strstr(help, "copy-on-read=on|off")) qemuCapsSet(flags, QEMU_CAPS_DRIVE_COPY_ON_READ); + if (strstr(help, "bps=")) + qemuCapsSet(flags, QEMU_CAPS_DRIVE_IOTUNE); } if ((p = strstr(help, "-vga")) && !strstr(help, "-std-vga")) { const char *nl = strstr(p, "\n"); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 1d4d10e..6a5389e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -124,6 +124,8 @@ enum qemuCapsFlags { QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ + QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends ({b,io}ps{_rd,_wr,}) */ + QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3bbe9cf..aaccf62 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1987,6 +1987,19 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, } /* block I/O throttling */ + if ((disk->blkdeviotune.total_bytes_sec || + disk->blkdeviotune.read_bytes_sec || + disk->blkdeviotune.write_bytes_sec || + disk->blkdeviotune.total_iops_sec || + disk->blkdeviotune.read_iops_sec || + disk->blkdeviotune.write_iops_sec) && + !qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("block I/O throttling not supported with this " + "QEMU binary")); + goto error; + } + if (disk->blkdeviotune.total_bytes_sec) { virBufferAsprintf(&opt, ",bps=%llu", disk->blkdeviotune.total_bytes_sec); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5cec86b..d40b37e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -705,7 +705,7 @@ mymain(void) DO_TEST("cputune", false, QEMU_CAPS_NAME); DO_TEST("numatune-memory", false, NONE); DO_TEST("blkdeviotune", false, QEMU_CAPS_NAME, QEMU_CAPS_DEVICE, - QEMU_CAPS_DRIVE); + QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_IOTUNE); DO_TEST("multifunction-pci-device", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, -- 1.7.3.4

2 1

[libvirt] [PATCH] Added capability checking for block <iotune> setting.
by Martin Kletzander 18 Jan '12

18 Jan '12

There was missing capability for blkiotune and thus specifying these settings caused libvirt to run qemu with invalid parameters and then reporting qemu error instead of the standard libvirt one. --- src/qemu/qemu_capabilities.c | 6 ++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 13 +++++++++++++ tests/qemuxml2argvtest.c | 2 +- 4 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0a1c9aa..f50e0b0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -150,6 +150,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "drive-copy-on-read", "cpu-host", "fsdev-writeout", + + "drive-iotune", /* 85 */ ); struct qemu_feature_flags { @@ -1031,6 +1033,10 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_DRIVE_AIO); if (strstr(help, "copy-on-read=on|off")) qemuCapsSet(flags, QEMU_CAPS_DRIVE_COPY_ON_READ); + if (strstr(help, "bps=") && strstr(help, "iops=") && + strstr(help, "bps_rd=") && strstr(help, "bps_wr=") && + strstr(help, "iops_rd=") && strstr(help, "iops_wr=")) + qemuCapsSet(flags, QEMU_CAPS_DRIVE_IOTUNE); } if ((p = strstr(help, "-vga")) && !strstr(help, "-std-vga")) { const char *nl = strstr(p, "\n"); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 1d4d10e..6a5389e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -124,6 +124,8 @@ enum qemuCapsFlags { QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ + QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends ({b,io}ps{_rd,_wr,}) */ + QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3bbe9cf..aaccf62 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1987,6 +1987,19 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, } /* block I/O throttling */ + if ((disk->blkdeviotune.total_bytes_sec || + disk->blkdeviotune.read_bytes_sec || + disk->blkdeviotune.write_bytes_sec || + disk->blkdeviotune.total_iops_sec || + disk->blkdeviotune.read_iops_sec || + disk->blkdeviotune.write_iops_sec) && + !qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("block I/O throttling not supported with this " + "QEMU binary")); + goto error; + } + if (disk->blkdeviotune.total_bytes_sec) { virBufferAsprintf(&opt, ",bps=%llu", disk->blkdeviotune.total_bytes_sec); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5cec86b..d40b37e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -705,7 +705,7 @@ mymain(void) DO_TEST("cputune", false, QEMU_CAPS_NAME); DO_TEST("numatune-memory", false, NONE); DO_TEST("blkdeviotune", false, QEMU_CAPS_NAME, QEMU_CAPS_DEVICE, - QEMU_CAPS_DRIVE); + QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_IOTUNE); DO_TEST("multifunction-pci-device", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, -- 1.7.3.4

2 2

[libvirt] [libvirt-glib 1/3] API to get/set 'description' node in domain config
by Zeeshan Ali (Khattak) 18 Jan '12

18 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain.c | 28 ++++++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 2 ++ libvirt-gconfig/libvirt-gconfig.sym | 2 ++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index fba1ee2..c4027a3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -39,6 +39,7 @@ G_DEFINE_TYPE(GVirConfigDomain, gvir_config_domain, GVIR_CONFIG_TYPE_OBJECT); enum { PROP_0, PROP_NAME, + PROP_DESCRIPTION, PROP_MEMORY, PROP_VCPU, PROP_FEATURES @@ -55,6 +56,9 @@ static void gvir_config_domain_get_property(GObject *object, case PROP_NAME: g_value_take_string(value, gvir_config_domain_get_name(domain)); break; + case PROP_DESCRIPTION: + g_value_take_string(value, gvir_config_domain_get_description(domain)); + break; case PROP_MEMORY: g_value_set_uint64(value, gvir_config_domain_get_memory(domain)); break; @@ -81,6 +85,9 @@ static void gvir_config_domain_set_property(GObject *object, case PROP_NAME: gvir_config_domain_set_name(domain, g_value_get_string(value)); break; + case PROP_DESCRIPTION: + gvir_config_domain_set_description(domain, g_value_get_string(value)); + break; case PROP_MEMORY: gvir_config_domain_set_memory(domain, g_value_get_uint64(value)); break; @@ -114,6 +121,14 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, + PROP_DESCRIPTION, + g_param_spec_string("description", + "Description", + "Description (could be anything).", + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(object_class, PROP_MEMORY, g_param_spec_uint64("memory", "Memory", @@ -196,6 +211,19 @@ void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name) g_object_notify(G_OBJECT(domain), "name"); } +char *gvir_config_domain_get_description(GVirConfigDomain *domain) +{ + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), + "description"); +} + +void gvir_config_domain_set_description(GVirConfigDomain *domain, const char *description) +{ + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(domain), + "description", description); + g_object_notify(G_OBJECT(domain), "description"); +} + /** * gvir_config_domain_get_memory: * @domain: A domain configuration object. diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index e68f1ac..6cdaec9 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -102,6 +102,8 @@ GVirConfigDomain *gvir_config_domain_new(void); void gvir_config_domain_set_virt_type(GVirConfigDomain *domain, GVirConfigDomainVirtType type); char *gvir_config_domain_get_name(GVirConfigDomain *domain); void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name); +char *gvir_config_domain_get_description(GVirConfigDomain *domain); +void gvir_config_domain_set_description(GVirConfigDomain *domain, const char *description); guint64 gvir_config_domain_get_memory(GVirConfigDomain *domain); void gvir_config_domain_set_memory(GVirConfigDomain *domain, guint64 memory); guint64 gvir_config_domain_get_vcpus(GVirConfigDomain *domain); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 9bfe1d9..383acca 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -23,6 +23,8 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_set_memory; gvir_config_domain_get_name; gvir_config_domain_set_name; + gvir_config_domain_get_description; + gvir_config_domain_set_description; gvir_config_domain_set_os; gvir_config_domain_set_seclabel; gvir_config_domain_get_vcpus; -- 1.7.7.5

3 8

[libvirt] [PATCH v2 0/6] Console coruption with two or more clients series
by Peter Krempa 18 Jan '12

18 Jan '12

This series fixes anoying console corruption if two clients try to connect at same time to the console. The current state of this is, that two/more of threads compete for the data from the PTY. This causes that each of the consoles get scrambled and unusable. These patches add mutual exclusion for opening consoles with two different approaches and a option to terminate existing console streams. A sample implementation is done using qemu driver, but i'll add more of them if this will be OK. (They're basicaly the same as in qemu). For convinience, to review these patches: git checkout -b console_corruption 8d16201fe0e63afb5416a8eb7c6478f582ccccc0 git pull git://aeon.pipo.sk/libvirt.git console_dup (The machine should be up most of time) Peter Peter Krempa (6): Add flags for virDomainOpenConsole virsh: add support for VIR_DOMAIN_CONSOLE_FORCE flag fdstream: Emit stream abort callback even if poll() doesnt. fdstream: Add internal callback on stream close util: Add helpers for safe domain console operations qemu: Add ability to abort existing console while creating new one configure.ac | 37 +++- include/libvirt/libvirt.h.in | 12 +- src/Makefile.am | 5 +- src/fdstream.c | 95 +++++++++- src/fdstream.h | 11 + src/libvirt_private.syms | 6 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 21 ++- src/util/domain_safe_console.c | 399 ++++++++++++++++++++++++++++++++++++++++ src/util/domain_safe_console.h | 28 +++ tools/console.c | 5 +- tools/console.h | 3 +- tools/virsh.c | 18 ++- 14 files changed, 614 insertions(+), 34 deletions(-) create mode 100644 src/util/domain_safe_console.c create mode 100644 src/util/domain_safe_console.h -- 1.7.3.4

3 24

[libvirt] [libvirt-glib] Compilation warning and error
by Alex Jia 18 Jan '12

18 Jan '12

Hi Daniel, I'm trying libvirt-glib, however, I met some compilation warning and error, for details, please see attachment. Regards, Alex

3 6

[libvirt] [PATCH] python: Expose virDomain{G, S}etInterfaceParameters' APIs in python binding
by ajia＠redhat.com 18 Jan '12

18 Jan '12

From: Alex Jia <ajia(a)redhat.com> An simple example to show how to use it: #!/usr/bin/env python import libvirt conn = libvirt.open(None) dom = conn.lookupByName('foo') print dom.interfaceParameters('vnet0', 0) params = {'outbound.peak': 20, 'inbound.peak': 20, 'inbound.burst': 10, 'inbound.average': 10, 'outbound.average': 30, 'outbound.burst': 30} print dom.setInterfaceParameters('vnet0', params, 0) print dom.interfaceParameters('vnet0', 0) RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=770971 https://bugzilla.redhat.com/show_bug.cgi?id=771015 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override-api.xml | 15 +++ python/libvirt-override.c | 179 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 194 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 704fee9..b29c149 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -421,5 +421,20 @@ <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainMemoryFlags'/> <return type='char *' info='the returned buffer or None in case of error'/> </function> + <function name='virDomainSetInterfaceParameters' file='python'> + <info>Change the bandwidth tunables for a interface device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='device' type='const char *' info='interface name'/> + <arg name='params' type='virTypedParameterPtr' info='Pointer to bandwidth tuning params object'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='int' info='0 in case of success, -1 in case of failure'/> + </function> + <function name='virDomainGetInterfaceParameters' file='python'> + <info>Get the bandwidth tunables for a interface device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='device' type='const char *' info='interface name'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='virTypedParameterPtr' info='the bandwidth tunables value or None in case of error'/> + </function> </symbols> </api> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index d2aad0f..ecd9355 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -5108,6 +5108,183 @@ cleanup: return py_retval; } +static PyObject * +libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *info; + int i_retval; + int nparams = 0, i; + unsigned int flags; + const char *device; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, + (char *)"OzOi:virDomainSetInterfaceParameters", + &pyobj_domain, &device, &info, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_INT_FAIL; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + free(params); + return VIR_PY_INT_FAIL; + } + + /* convert to a Python tuple of long objects */ + for (i = 0; i < nparams; i++) { + PyObject *key, *val; + key = libvirt_constcharPtrWrap(params[i].field); + val = PyDict_GetItem(info, key); + Py_DECREF(key); + + if (val == NULL) + continue; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + params[i].value.i = (int)PyInt_AS_LONG(val); + break; + + case VIR_TYPED_PARAM_UINT: + params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); + break; + + case VIR_TYPED_PARAM_LLONG: + params[i].value.l = (long long)PyLong_AsLongLong(val); + break; + + case VIR_TYPED_PARAM_ULLONG: + params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); + break; + + case VIR_TYPED_PARAM_DOUBLE: + params[i].value.d = (double)PyFloat_AsDouble(val); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + { + /* Hack - Python's definition of Py_True breaks strict + * aliasing rules, so can't directly compare :-( + */ + PyObject *hacktrue = PyBool_FromLong(1); + params[i].value.b = hacktrue == val ? 1: 0; + Py_DECREF(hacktrue); + } + break; + + default: + free(params); + return VIR_PY_INT_FAIL; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetInterfaceParameters(domain, device, params, nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { + free(params); + return VIR_PY_INT_FAIL; + } + + free(params); + return VIR_PY_INT_SUCCESS; +} + +static PyObject * +libvirt_virDomainGetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *info; + int i_retval; + int nparams = 0, i; + unsigned int flags; + const char *device; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetInterfaceParameters", + &pyobj_domain, &device, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_NONE; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + free(params); + return VIR_PY_NONE; + } + + /* convert to a Python tuple of long objects */ + if ((info = PyDict_New()) == NULL) { + free(params); + return VIR_PY_NONE; + } + for (i = 0 ; i < nparams ; i++) { + PyObject *key, *val; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + val = PyInt_FromLong((long)params[i].value.i); + break; + + case VIR_TYPED_PARAM_UINT: + val = PyInt_FromLong((long)params[i].value.ui); + break; + + case VIR_TYPED_PARAM_LLONG: + val = PyLong_FromLongLong((long long)params[i].value.l); + break; + + case VIR_TYPED_PARAM_ULLONG: + val = PyLong_FromLongLong((long long)params[i].value.ul); + break; + + case VIR_TYPED_PARAM_DOUBLE: + val = PyFloat_FromDouble((double)params[i].value.d); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + val = PyBool_FromLong((long)params[i].value.b); + break; + + default: + free(params); + Py_DECREF(info); + return VIR_PY_NONE; + } + + key = libvirt_constcharPtrWrap(params[i].field); + PyDict_SetItem(info, key, val); + } + free(params); + return(info); +} + /************************************************************************ * * * The registration stuff * @@ -5206,6 +5383,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainMigrateGetMaxSpeed", libvirt_virDomainMigrateGetMaxSpeed, METH_VARARGS, NULL}, {(char *) "virDomainBlockPeek", libvirt_virDomainBlockPeek, METH_VARARGS, NULL}, {(char *) "virDomainMemoryPeek", libvirt_virDomainMemoryPeek, METH_VARARGS, NULL}, + {(char *) "virDomainSetInterfaceParameters", libvirt_virDomainSetInterfaceParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetInterfaceParameters", libvirt_virDomainGetInterfaceParameters, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; -- 1.7.1

1 0

[libvirt] [PATCH] qemu: Do not fail if detachment succeeded but failed on resetting device
by Osier Yang 18 Jan '12

18 Jan '12

It makes one curious to see error "Failed to detach device" while the device is detached successfully, only because of it failed on resetting the device. And on the other hand, failed on resetting is not the end of world, one could resolve the problem of resetting outside of libvirt, and do reattachment then. --- src/qemu/qemu_hotplug.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4b60839..c3167ea 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2033,11 +2033,11 @@ qemuDomainDetachHostPciDevice(struct qemud_driver *driver, driver->inactivePciHostdevs) == 0) qemuReattachPciDevice(activePci, driver); else - ret = -1; + VIR_WARN("Device is detached, but failed to reset PCI device"); pciFreeDevice(pci); pciFreeDevice(activePci); } else { - ret = -1; + VIR_WARN("Device is detached, but failed to reset PCI device"); } if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) && -- 1.7.7.3

3 2

[libvirt] [PATCH v4] Add new attribute wrpolicy to <driver> element
by Deepak C Shetty 18 Jan '12

18 Jan '12

This introduces new attribute wrpolicy with only supported value as immediate. This will be an optional attribute with no defaults. This helps specify whether to skip the host page cache. When wrpolicy is specified, meaning when wrpolicy=immediate a writeback is explicitly initiated for the dirty pages in the host page cache as part of the guest file write operation. Usage: <filesystem type='mount' accessmode='passthrough'> <driver type='path' wrpolicy='immediate'/> <source dir='/export/to/guest'/> <target dir='mount_tag'/> </filesystem> Currently this only works with type='mount' for the QEMU/KVM driver. Signed-off-by: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com> --- v2: - added writeout as a qemu cap - cosmetic changes in comments - moved to using VIR_ERR_CONFIG_UNSUPPORTED - corrected doc v3: - changed attr name from writeout to wrpolicy - moved attr to be part of driver xml element v4: - implemented review comments given by eric blake against v3 - added wrpolicy testcase docs/formatdomain.html.in | 9 ++++++-- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 27 ++++++++++++++++++++++++- src/conf/domain_conf.h | 10 +++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 12 +++++++++++ tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml | 4 ++-- tests/qemuxml2argvtest.c | 2 +- 11 files changed, 71 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index faf42df..875ac22 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1328,7 +1328,7 @@ <target dir='/'/> </filesystem> <filesystem type='mount' accessmode='passthrough'> - <driver type='path'/> + <driver type='path' wrpolicy='immediate'/> <source dir='/export/to/guest'/> <target dir='/import/from/host'/> <readonly/> @@ -1355,7 +1355,12 @@ sub-element <code>driver</code>, with an attribute <code>type='path'</code> or <code>type='handle'</code> <span class="since">(since - 0.9.7)</span>. + 0.9.7)</span>. The driver block has an optional attribute + <code>wrpolicy</code> that further controls interaction with + the host page cache; omitting the attribute gives default behavior, + while the value <code>immediate</code> means that a host writeback + is immediately triggered for all pages touched during a guest file + write operation <span class="since">(since 0.9.10)</span>. </dd> <dt><code>type='template'</code></dt> <dd> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 243ff93..f72f7d1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1162,6 +1162,11 @@ <value>handle</value> </choice> </attribute> + <optional> + <attribute name="wrpolicy"> + <value>immediate</value> + </attribute> + </optional> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6c42f36..5fa23dc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -265,6 +265,9 @@ VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "mapped", "squash") +VIR_ENUM_IMPL(virDomainFSWrpolicy, VIR_DOMAIN_FS_WRPOLICY_LAST, + "default", + "immediate") VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", @@ -3459,6 +3462,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *source = NULL; char *target = NULL; char *accessmode = NULL; + char *wrpolicy = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3508,6 +3512,7 @@ virDomainFSDefParseXML(xmlNodePtr node, def->readonly = 1; } else if ((fsdriver == NULL) && (xmlStrEqual(cur->name, BAD_CAST "driver"))) { fsdriver = virXMLPropString(cur, "type"); + wrpolicy = virXMLPropString(cur, "wrpolicy"); } } cur = cur->next; @@ -3521,6 +3526,16 @@ virDomainFSDefParseXML(xmlNodePtr node, } } + if (wrpolicy) { + if ((def->wrpolicy = virDomainFSWrpolicyTypeFromString(wrpolicy)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown filesystem write policy '%s'"), wrpolicy); + goto error; + } + } else { + def->wrpolicy = VIR_DOMAIN_FS_WRPOLICY_DEFAULT; + } + if (source == NULL) { virDomainReportError(VIR_ERR_NO_SOURCE, target ? "%s" : NULL, target); @@ -3547,6 +3562,7 @@ cleanup: VIR_FREE(target); VIR_FREE(source); VIR_FREE(accessmode); + VIR_FREE(wrpolicy); return def; @@ -10165,6 +10181,7 @@ virDomainFSDefFormat(virBufferPtr buf, const char *type = virDomainFSTypeToString(def->type); const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); const char *fsdriver = virDomainFSDriverTypeTypeToString(def->fsdriver); + const char *wrpolicy = virDomainFSWrpolicyTypeToString(def->wrpolicy); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -10184,7 +10201,15 @@ virDomainFSDefFormat(virBufferPtr buf, type, accessmode); if (def->fsdriver) { - virBufferAsprintf(buf, " <driver type='%s'/>\n", fsdriver); + virBufferAsprintf(buf, " <driver type='%s'", fsdriver); + + /* Don't generate anything if wrpolicy is set to default */ + if (def->wrpolicy) { + virBufferAsprintf(buf, " wrpolicy='%s'", wrpolicy); + } + + virBufferAddLit(buf, "/>\n"); + } if (def->src) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7c7e93b..ac8e768 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -491,12 +491,21 @@ enum virDomainFSAccessMode { VIR_DOMAIN_FS_ACCESSMODE_LAST }; +/* Filesystem Write policy */ +enum virDomainFSWrpolicy { + VIR_DOMAIN_FS_WRPOLICY_DEFAULT = 0, + VIR_DOMAIN_FS_WRPOLICY_IMMEDIATE, + + VIR_DOMAIN_FS_WRPOLICY_LAST +}; + typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; int fsdriver; int accessmode; + int wrpolicy; /* enum virDomainFSWrpolicy */ char *src; char *dst; unsigned int readonly : 1; @@ -1984,6 +1993,7 @@ VIR_ENUM_DECL(virDomainControllerModelUSB) VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainFSDriverType) VIR_ENUM_DECL(virDomainFSAccessMode) +VIR_ENUM_DECL(virDomainFSWrpolicy) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainNetBackend) VIR_ENUM_DECL(virDomainNetVirtioTxMode) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cfb88f8..3e1ba0c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -313,6 +313,8 @@ virDomainDiskTypeToString; virDomainFSDefFree; virDomainFSTypeFromString; virDomainFSTypeToString; +virDomainFSWrpolicyTypeFromString; +virDomainFSWrpolicyTypeToString; virDomainFindByID; virDomainFindByName; virDomainFindByUUID; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 530bbb1..3069dbe 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -148,6 +148,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "virtio-blk-pci.scsi", "blk-sg-io", "drive-copy-on-read", + "fsdev-writeout", ); struct qemu_feature_flags { @@ -1089,6 +1090,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV); if (strstr(fsdev, "readonly")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); + if (strstr(fsdev, "writeout")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_WRITEOUT); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ee9d5ab..4823aae 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -121,6 +121,7 @@ enum qemuCapsFlags { QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */ QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* support for SG_IO commands, reportedly added in 0.11 */ QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */ + QEMU_CAPS_FSDEV_WRITEOUT = 83, /* -fsdev writeout supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 98824ac..77f2896 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2129,6 +2129,7 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); + const char *wrpolicy = virDomainFSWrpolicyTypeToString(fs->wrpolicy); if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -2161,6 +2162,17 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, goto error; } } + + if (fs->wrpolicy) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT)) { + virBufferAsprintf(&opt, ",writeout=%s", wrpolicy); + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("filesystem writeout not supported")); + goto error; + } + } + virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",path=%s", fs->src); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args index 8579810..f244114 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args @@ -4,10 +4,10 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ /dev/HostVG/QEMUGuest1 -fsdev local,security_model=passthrough,id=fsdev-fs0,\ path=/export/to/guest -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,\ mount_tag=/import/from/host,bus=pci.0,addr=0x3 \ --fsdev local,security_model=mapped,id=fsdev-fs1,\ +-fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,\ path=/export/to/guest2 -device virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,\ mount_tag=/import/from/host2,bus=pci.0,addr=0x4 \ --fsdev handle,id=fsdev-fs2,\ +-fsdev handle,writeout=immediate,id=fsdev-fs2,\ path=/export/to/guest3 -device virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,\ mount_tag=/import/from/host3,bus=pci.0,addr=0x5 \ -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml index 07d7e8a..e31db48 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml @@ -25,12 +25,12 @@ <target dir='/import/from/host'/> </filesystem> <filesystem accessmode='mapped'> - <driver type='path'/> + <driver type='path' wrpolicy='immediate'/> <source dir='/export/to/guest2'/> <target dir='/import/from/host2'/> </filesystem> <filesystem> - <driver type='handle'/> + <driver type='handle' wrpolicy='immediate'/> <source dir='/export/to/guest3'/> <target dir='/import/from/host3'/> </filesystem> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7beaa4b..8feda9e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -631,7 +631,7 @@ mymain(void) DO_TEST("sound-device", false, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_HDA_DUPLEX); DO_TEST("fs9p", false, - QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_FSDEV); + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT); DO_TEST("hostdev-usb-address", false, NONE); DO_TEST("hostdev-usb-address-device", false,

2 2

[libvirt] [RFC PATCH] Add proxy FS (9p) support to libvirt
by M. Mohan Kumar 18 Jan '12

18 Jan '12

From: "M. Mohan Kumar" <mohan(a)in.ibm.com> This patch *) adds new sub element <virtfs-proxy-helper> under <device> element. This sub-element is used to specify the virtfs-proxy-helper binary (part of QEMU) to be executed when proxy FS driver is used. *) invokes proxy_helper binary specified by the <virtfs-proxy-helper> sub-element with passing one of the created socket pair descriptor and adds "-sock_fd" paramter to qemu. Is it okay to add the sub-element "virtfs-proxy-helper" under "devices" element? Proxy helper binary is common for all 9p proxy FS devices, so it can not be placed under "filesystems" element. About Proxy FS driver ====================== Proxy FS driver is added to qemu 9p server to overcome two issues with pass-through security model (needs root privilege) security model. 1) TOCTTOU vulnerability: Following symbolic links in the server could provide access to files beyond 9p export path. 2) Running QEMU with root privilege could be a security issue. Proxy FS uses chroot + socket combination for securing the vulnerability known with following symbolic links. Intention of adding a new filesystem type is to allow qemu to run in non-root mode, but doing privileged operations using socket IO. Proxy helper(a stand alone binary part of qemu) is invoked with root privileges. Proxy helper chroots into 9p export path and creates a socket pair or a named socket based on the command line parameter. Qemu and proxy helper communicate using this socket. QEMU proxy fs driver sends filesystem request to proxy helper and receives the response from it. Proxy helper is designed such a way that it needs only few capabilities related to filesystem operations (such as CAP_DAC_OVERRIDE, CAP_FOWNER, etc) and all other capabilities are dropped (CAP_SYS_CHROOT, etc) Proxy patches http://permalink.gmane.org/gmane.comp.emulators.qemu/128735 Signed-off-by: M. Mohan Kumar <mohan(a)in.ibm.com> --- docs/formatdomain.html.in | 3 +- src/conf/domain_conf.c | 7 ++++- src/conf/domain_conf.h | 4 +- src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 64 ++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 3 +- tests/qemuhelptest.c | 3 +- 8 files changed, 79 insertions(+), 9 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 18b7e22..e398779 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1336,7 +1336,8 @@ This mode also has an optional sub-element <code>driver</code>, with an attribute <code>type='path'</code> - or <code>type='handle'</code> <span class="since">(since + or <code>type='handle'</code> + or <code>type='proxy'</code> <span class="since">(since 0.9.7)</span>. </dd> <dt><code>type='template'</code></dt> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0190a81..694c166 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -250,7 +250,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", "path", - "handle") + "handle", + "proxy") VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", @@ -1465,6 +1466,7 @@ void virDomainDefFree(virDomainDefPtr def) VIR_FREE(def->name); VIR_FREE(def->cpumask); VIR_FREE(def->emulator); + VIR_FREE(def->virtfs_proxy_helper); VIR_FREE(def->description); virBlkioDeviceWeightArrayClear(def->blkio.devices, @@ -7490,6 +7492,9 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, goto error; } + def->virtfs_proxy_helper = + virXPathString("string(./devices/virtfs-proxy-helper[1])", ctxt); + /* analysis of the disk devices */ if ((n = virXPathNodeSet("./devices/disk", ctxt, &nodes)) < 0) { goto error; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 03aa5b6..a7d248a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -450,7 +450,6 @@ struct _virDomainControllerDef { virDomainDeviceInfo info; }; - /* Two types of disk backends */ enum virDomainFSType { VIR_DOMAIN_FS_TYPE_MOUNT, /* Better named 'bind' */ @@ -466,6 +465,7 @@ enum virDomainFSDriverType { VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0, VIR_DOMAIN_FS_DRIVER_TYPE_PATH, VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + VIR_DOMAIN_FS_DRIVER_TYPE_PROXY, VIR_DOMAIN_FS_DRIVER_TYPE_LAST }; @@ -491,7 +491,6 @@ struct _virDomainFSDef { virDomainDeviceInfo info; }; - /* 5 different types of networking config */ enum virDomainNetType { VIR_DOMAIN_NET_TYPE_USER, @@ -1503,6 +1502,7 @@ struct _virDomainDef { void *namespaceData; virDomainXMLNamespace ns; + char *virtfs_proxy_helper; }; enum virDomainTaintFlags { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 43c7578..9c01a3b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,6 +144,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", + "fsdev-proxy", ); struct qemu_feature_flags { @@ -1083,6 +1084,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV); if (strstr(fsdev, "readonly")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); + if (strstr(fsdev, "sock_fd")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_PROXY); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c759baf..e129e35 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -117,6 +117,7 @@ enum qemuCapsFlags { QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ QEMU_CAPS_FSDEV_READONLY =79, /* -fsdev readonly supported */ + QEMU_CAPS_FSDEV_PROXY = 80, /* -fsdev proxy supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f2e9cfa..9ac5a4c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -106,7 +106,8 @@ VIR_ENUM_DECL(qemuDomainFSDriver) VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "local", - "handle"); + "handle", + "proxy"); static void @@ -2080,9 +2081,32 @@ error: return NULL; } +/* + * Invokes the Proxy Helper with one of the socketpair as its parameter + * + */ +static int qemuInvokeProxyHelper(const char *binary, int sock, const char *path) +{ + int ret_val, status; + virCommandPtr cmd; + + cmd = virCommandNewArgList(binary, NULL); + virCommandAddArg(cmd, "-f"); + virCommandAddArgFormat(cmd, "%d", sock); + virCommandAddArg(cmd, "-p"); + virCommandAddArgFormat(cmd, "%s", path); + virCommandTransferFD(cmd, sock); + virCommandDaemonize(cmd); + ret_val = virCommandRun(cmd, &status); + if (ret_val < 0) + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("%s can't execute"), binary); + virCommandFree(cmd); + return ret_val; +} char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps ATTRIBUTE_UNUSED) + virBitmapPtr qemuCaps ATTRIBUTE_UNUSED, int qemuSocket) { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); @@ -2108,6 +2132,10 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, virBufferAddLit(&opt, ",security_model=none"); } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) + virBufferAsprintf(&opt, ",sock_fd=%d", qemuSocket); + virBufferAsprintf(&opt, ",path=%s", fs->src); if (fs->readonly) { @@ -4426,10 +4454,40 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) { for (i = 0 ; i < def->nfss ; i++) { char *optstr; + int sockets[2] = {-1, -1}; virDomainFSDefPtr fs = def->fss[i]; + /* + * If its a proxy FS, we need to create a socket pair + * and invoke proxy_helper + */ + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_PROXY) < 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("proxy helper not supported")); + goto error; + } + if (!def->virtfs_proxy_helper) { + qemuReportError(VIR_ERR_XML_ERROR, "%s", + _("proxy helper not specified")); + goto error; + } + /* create a socket pair */ + if (socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) < 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("socketpair failed")); + goto error; + } + virCommandTransferFD(cmd, sockets[1]); + if (qemuInvokeProxyHelper(def->virtfs_proxy_helper, sockets[0], + fs->src) < 0) { + VIR_FORCE_CLOSE(sockets[0]); + VIR_FORCE_CLOSE(sockets[1]); + goto error; + } + } virCommandAddArg(cmd, "-fsdev"); - if (!(optstr = qemuBuildFSStr(fs, qemuCaps))) + if (!(optstr = qemuBuildFSStr(fs, qemuCaps, sockets[1]))) goto error; virCommandAddArg(cmd, optstr); VIR_FREE(optstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index de61cf3..8e4f335 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -87,7 +87,8 @@ char *qemuBuildDriveStr(virConnectPtr conn, bool bootable, virBitmapPtr qemuCaps); char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps); + virBitmapPtr qemuCaps, + int qemuSocket); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDiskDefPtr disk, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 60155e7..455a7e1 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -648,7 +648,8 @@ mymain(void) QEMU_CAPS_PCI_ROMBAR, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_NO_ACPI, - QEMU_CAPS_FSDEV_READONLY); + QEMU_CAPS_FSDEV_READONLY, + QEMU_CAPS_FSDEV_PROXY); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.6

2 3

[libvirt] [PATCH v2] qemu: Introduce inactive PCI device list
by Osier Yang 18 Jan '12

18 Jan '12

From: root <root(a)hp-dl360g7-01.lab.eng.brq.redhat.com> pciTrySecondaryBusReset checks if there is active device on the same bus, however, qemu driver doesn't maintain an effective list for the inactive devices, and it passes meaningless argment for parameter "inactiveDevs". e.g. (qemuPrepareHostdevPCIDevices) if (!(pcidevs = qemuGetPciHostDeviceList(hostdevs, nhostdevs))) return -1; ...skipped... if (pciResetDevice(dev, driver->activePciHostdevs, pcidevs) < 0) goto reattachdevs; NB, the "pcidevs" used above are extracted from domain def, and thus one won't be able to attach a device of which bus has other device even detached from host (nodedev-detach). To see more details of the problem: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=773667 This patch is to resolve the problem by introduce an inactive PCI device list (just like qemu_driver->activePciHostdevs), and the whole logic is: * Add the device to inactive list when do nodedev-dettach * Remove the device from inactive list when do nodedev-reattach * Remove the device from inactive list when do attach-device (for not managed device) * Add the device to inactive list after detach-device, only if the device is not managed With above, we have sufficient inactive PCI device list, and thus we can use it for pciResetDevice. e.g.(qemuPrepareHostdevPCIDevices) if (pciResetDevice(dev, driver->activePciHostdevs, driver->inactivePciHostdevs) < 0) goto reattachdevs; v1 ~ v2 Fixed a potential crash. --- Got a testing box from Miroslav and tested the patch, it works well. --- src/qemu/qemu_conf.h | 5 +++++ src/qemu/qemu_driver.c | 19 +++++++++++++++---- src/qemu/qemu_hostdev.c | 32 +++++++++++++++++++++++--------- src/util/pci.c | 28 ++++++++++++++++++++++++---- src/util/pci.h | 8 ++++++-- src/xen/xen_driver.c | 4 ++-- 7 files changed, 77 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index d8d7915..3f1b668 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -128,6 +128,11 @@ struct qemud_driver { pciDeviceList *activePciHostdevs; usbDeviceList *activeUsbHostdevs; + /* The device which is not used by both host + * and any guest. + */ + pciDeviceList *inactivePciHostdevs; + virBitmapPtr reservedVNCPorts; virSysinfoDefPtr hostsysinfo; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 712f1fc..47e2380 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -588,6 +588,9 @@ qemudStartup(int privileged) { if ((qemu_driver->activeUsbHostdevs = usbDeviceListNew()) == NULL) goto error; + if ((qemu_driver->inactivePciHostdevs = pciDeviceListNew()) == NULL) + goto error; + if (privileged) { if (chown(qemu_driver->libDir, qemu_driver->user, qemu_driver->group) < 0) { virReportSystemError(errno, @@ -778,6 +781,7 @@ qemudShutdown(void) { qemuDriverLock(qemu_driver); pciDeviceListFree(qemu_driver->activePciHostdevs); + pciDeviceListFree(qemu_driver->inactivePciHostdevs); usbDeviceListFree(qemu_driver->activeUsbHostdevs); virCapabilitiesFree(qemu_driver->caps); @@ -9211,6 +9215,7 @@ qemudNodeDeviceDettach (virNodeDevicePtr dev) pciDevice *pci; unsigned domain, bus, slot, function; int ret = -1; + bool in_inactive_list = false; if (qemudNodeDeviceGetPciInfo(dev, &domain, &bus, &slot, &function) < 0) return -1; @@ -9220,13 +9225,17 @@ qemudNodeDeviceDettach (virNodeDevicePtr dev) return -1; qemuDriverLock(driver); - if (pciDettachDevice(pci, driver->activePciHostdevs) < 0) + in_inactive_list = pciDeviceListFind(driver->inactivePciHostdevs, pci); + + if (pciDettachDevice(pci, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) goto out; ret = 0; out: qemuDriverUnlock(driver); - pciFreeDevice(pci); + if (in_inactive_list) + pciFreeDevice(pci); return ret; } @@ -9248,7 +9257,8 @@ qemudNodeDeviceReAttach (virNodeDevicePtr dev) pciDeviceReAttachInit(pci); qemuDriverLock(driver); - if (pciReAttachDevice(pci, driver->activePciHostdevs) < 0) + if (pciReAttachDevice(pci, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) goto out; ret = 0; @@ -9275,7 +9285,8 @@ qemudNodeDeviceReset (virNodeDevicePtr dev) qemuDriverLock(driver); - if (pciResetDevice(pci, driver->activePciHostdevs, NULL) < 0) + if (pciResetDevice(pci, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) goto out; ret = 0; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index c7adb1d..6141cfe 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -212,7 +212,7 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); if (pciDeviceGetManaged(dev) && - pciDettachDevice(dev, driver->activePciHostdevs) < 0) + pciDettachDevice(dev, driver->activePciHostdevs, NULL) < 0) goto reattachdevs; } @@ -220,7 +220,8 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, * can safely reset them */ for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - if (pciResetDevice(dev, driver->activePciHostdevs, pcidevs) < 0) + if (pciResetDevice(dev, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) goto reattachdevs; } @@ -233,7 +234,13 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, } } - /* Loop 5: Now set the used_by_domain of the device in + /* Loop 5: Now remove the devices from inactive list. */ + for (i = 0; i < pciDeviceListCount(pcidevs); i++) { + pciDevice *dev = pciDeviceListGet(pcidevs, i); + pciDeviceListDel(driver->inactivePciHostdevs, dev); + } + + /* Loop 6: Now set the used_by_domain of the device in * driver->activePciHostdevs as domain name. */ for (i = 0; i < pciDeviceListCount(pcidevs); i++) { @@ -245,7 +252,7 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, pciDeviceSetUsedBy(activeDev, name); } - /* Loop 6: Now set the original states for hostdev def */ + /* Loop 7: Now set the original states for hostdev def */ for (i = 0; i < nhostdevs; i++) { pciDevice *dev; pciDevice *pcidev; @@ -277,7 +284,7 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, pciFreeDevice(dev); } - /* Loop 7: Now steal all the devices from pcidevs */ + /* Loop 8: Now steal all the devices from pcidevs */ while (pciDeviceListCount(pcidevs) > 0) { pciDevice *dev = pciDeviceListGet(pcidevs, 0); pciDeviceListSteal(pcidevs, dev); @@ -298,7 +305,7 @@ inactivedevs: reattachdevs: for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - pciReAttachDevice(dev, driver->activePciHostdevs); + pciReAttachDevice(dev, driver->activePciHostdevs, NULL); } cleanup: @@ -445,8 +452,13 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) { int retries = 100; - if (!pciDeviceGetManaged(dev)) + /* If the device is not managed and was attached to guest + * successfully, it must had be inactive. + */ + if (!pciDeviceGetManaged(dev)) { + pciDeviceListAdd(driver->inactivePciHostdevs, dev); return; + } while (pciWaitForDeviceCleanup(dev, "kvm_assigned_device") && retries) { @@ -454,7 +466,8 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) retries--; } - if (pciReAttachDevice(dev, driver->activePciHostdevs) < 0) { + if (pciReAttachDevice(dev, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to re-attach PCI device: %s"), err ? err->message : _("unknown error")); @@ -503,7 +516,8 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - if (pciResetDevice(dev, driver->activePciHostdevs, pcidevs) < 0) { + if (pciResetDevice(dev, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to reset PCI device: %s"), err ? err->message : _("unknown error")); iff --git a/src/util/pci.c b/src/util/pci.c index 17cde81..633dcd8 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1117,7 +1117,9 @@ cleanup: } int -pciDettachDevice(pciDevice *dev, pciDeviceList *activeDevs) +pciDettachDevice(pciDevice *dev, + pciDeviceList *activeDevs, + pciDeviceList *inactiveDevs) { const char *driver = pciFindStubDriver(); if (!driver) { @@ -1132,11 +1134,22 @@ pciDettachDevice(pciDevice *dev, pciDeviceList *activeDevs) return -1; } - return pciBindDeviceToStub(dev, driver); + if (pciBindDeviceToStub(dev, driver) < 0) + return -1; + + /* Add the dev into list inactiveDevs */ + if (inactiveDevs && !pciDeviceListFind(inactiveDevs, dev)) { + if (pciDeviceListAdd(inactiveDevs, dev) < 0) + return -1; + } + + return 0; } int -pciReAttachDevice(pciDevice *dev, pciDeviceList *activeDevs) +pciReAttachDevice(pciDevice *dev, + pciDeviceList *activeDevs, + pciDeviceList *inactiveDevs) { const char *driver = pciFindStubDriver(); if (!driver) { @@ -1151,7 +1164,14 @@ pciReAttachDevice(pciDevice *dev, pciDeviceList *activeDevs) return -1; } - return pciUnbindDeviceFromStub(dev, driver); + if (pciUnbindDeviceFromStub(dev, driver) < 0) + return -1; + + /* Steal the dev from list inactiveDevs */ + if (inactiveDevs) + pciDeviceListSteal(inactiveDevs, dev); + + return 0; } /* Certain hypervisors (like qemu/kvm) map the PCI bar(s) on diff --git a/src/util/pci.h b/src/util/pci.h index 5493e0a..25b5b66 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -40,8 +40,12 @@ pciDevice *pciGetDevice (unsigned domain, unsigned function); void pciFreeDevice (pciDevice *dev); const char *pciDeviceGetName (pciDevice *dev); -int pciDettachDevice (pciDevice *dev, pciDeviceList *activeDevs); -int pciReAttachDevice (pciDevice *dev, pciDeviceList *activeDevs); +int pciDettachDevice (pciDevice *dev, + pciDeviceList *activeDevs, + pciDeviceList *inactiveDevs); +int pciReAttachDevice (pciDevice *dev, + pciDeviceList *activeDevs, + pciDeviceList *inactiveDevs); int pciResetDevice (pciDevice *dev, pciDeviceList *activeDevs, pciDeviceList *inactiveDevs); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 20671c0..520ec03 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1985,7 +1985,7 @@ xenUnifiedNodeDeviceDettach (virNodeDevicePtr dev) if (!pci) return -1; - if (pciDettachDevice(pci, NULL) < 0) + if (pciDettachDevice(pci, NULL, NULL) < 0) goto out; ret = 0; @@ -2075,7 +2075,7 @@ xenUnifiedNodeDeviceReAttach (virNodeDevicePtr dev) goto out; } - if (pciReAttachDevice(pci, NULL) < 0) + if (pciReAttachDevice(pci, NULL, NULL) < 0) goto out; ret = 0; -- 1.7.1

2 3

[libvirt] [PATCH] remote: avoid memory leak on successful path
by ajia＠redhat.com 18 Jan '12

18 Jan '12

From: Alex Jia <ajia(a)redhat.com> when everything is okay, 'rv' will be 0, however, 'cleanup' lable only free allocated memory with 'rv < 0', so memory leak on successful path. The patch uses new virTypedParameterArrayClear function to free memory instead. * src/remote/remote_driver.c: fix memory leak on remoteDeserializeTypedParameters. * Detected by valgrind: ==31957== 1 bytes in 1 blocks are definitely lost in loss record 1 of 2,097 ==31957== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==31957== by 0x39CF07F6E1: strdup (in /lib64/libc-2.12.so) ==31957== by 0xD84CDA1: remoteDeserializeTypedParameters.clone.0 (remote_driver.c:1404) ==31957== by 0xD84D11B: remoteDomainGetNumaParameters (remote_driver.c:1566) ==31957== by 0xD81EBFA: virDomainGetNumaParameters (libvirt.c:3887) ==31957== by 0xD4F8E25: libvirt_virDomainGetNumaParameters (libvirt-override.c:1127) ==31957== by 0x39E1ADE7F3: PyEval_EvalFrameEx (ceval.c:3794) ==31957== by 0x39E1ADF99E: PyEval_EvalFrameEx (ceval.c:3880) ==31957== by 0x39E1AE0466: PyEval_EvalCodeEx (ceval.c:3044) ==31957== by 0x39E1AE0541: PyEval_EvalCode (ceval.c:545) ==31957== by 0x39E1AFB88B: run_mod (pythonrun.c:1351) ==31957== by 0x39E1AFB95F: PyRun_FileExFlags (pythonrun.c:1337) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/remote/remote_driver.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e28840b..cfbcd0f 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1417,12 +1417,7 @@ remoteDeserializeTypedParameters(remote_typed_param *ret_params_val, rv = 0; cleanup: - if (rv < 0) { - int j; - for (j = 0; j < i; j++) - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + virTypedParameterArrayClear(params, *nparams); return rv; } -- 1.7.1

3 2

[libvirt] [PATCH] qemu: Prohibit reattaching node device if it is in use
by Osier Yang 18 Jan '12

18 Jan '12

It doesn't make sense to reattach a device to host while it's still in use, e.g, by a domain. --- src/qemu/qemu_driver.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 47e2380..c920bfd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9244,6 +9244,7 @@ qemudNodeDeviceReAttach (virNodeDevicePtr dev) { struct qemud_driver *driver = dev->conn->privateData; pciDevice *pci; + pciDevice *other; unsigned domain, bus, slot, function; int ret = -1; @@ -9254,6 +9255,20 @@ qemudNodeDeviceReAttach (virNodeDevicePtr dev) if (!pci) return -1; + other = pciDeviceListFind(driver->activePciHostdevs, pci); + if (other) { + const char *other_name = pciDeviceGetUsedBy(other); + + if (other_name) + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("PCI device %s is still in use by domain %s"), + pciDeviceGetName(pci), other_name); + else + qemuReportError(VIR_ERR_OPERATION_INVALID, + _("PCI device %s is still in use"), + pciDeviceGetName(pci)); + } + pciDeviceReAttachInit(pci); qemuDriverLock(driver); -- 1.7.7.3

2 1

[libvirt] [PATCH] Fix startup of LXC containers with filesystems containing symlinks
by Daniel P. Berrange 17 Jan '12

17 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Given an LXC guest with a root filesystem path of /export/lxc/roots/helloworld/root During startup, we will pivot the root filesystem to end up at /.oldroot/export/lxc/roots/helloworld/root We then try to open /.oldroot/export/lxc/roots/helloworld/root/dev/pts Now consider if '/export/lxc' is an absolute symlink pointing to '/media/lxc'. The kernel will try to open /media/lxc/roots/helloworld/root/dev/pts whereas it should be trying to open /.oldroot//media/lxc/roots/helloworld/root/dev/pts To deal with the fact that the root filesystem can be moved, we need to resolve symlinks in *any* part of the filesystem source path. * src/libvirt_private.syms, src/util/util.c, src/util/util.h: Add virFileResolveAllLinks to resolve all symlinks in a path * src/lxc/lxc_container.c: Resolve all symlinks in filesystem paths during startup --- src/libvirt_private.syms | 1 + src/lxc/lxc_container.c | 23 +++++++++++++++++++++++ src/util/util.c | 43 ++++++++++++++++++++++++++++++++----------- src/util/util.h | 2 ++ 4 files changed, 58 insertions(+), 11 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index faab0e2..f344e73 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1100,6 +1100,7 @@ virFileOpenTty; virFileReadAll; virFileReadLimFD; virFileResolveLink; +virFileResolveAllLinks; virFileSanitizePath; virFileStripSuffix; virFileUnlock; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1e7803a..4e4388b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1111,11 +1111,34 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef) return 0; } + +static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) +{ + char *newroot; + size_t i; + + for (i = 0 ; i < vmDef->nfss ; i++) { + virDomainFSDefPtr fs = vmDef->fss[i]; + if (virFileResolveAllLinks(fs->src, &newroot) < 0) + return -1; + + VIR_DEBUG("Resolved '%s' to %s", fs->src, newroot); + + VIR_FREE(fs->src); + fs->src = newroot; + } + + return 0; +} + static int lxcContainerSetupMounts(virDomainDefPtr vmDef, virDomainFSDefPtr root, char **ttyPaths, size_t nttyPaths) { + if (lxcContainerResolveSymlinks(vmDef) < 0) + return -1; + if (root) return lxcContainerSetupPivotRoot(vmDef, root, ttyPaths, nttyPaths); else diff --git a/src/util/util.c b/src/util/util.c index 6f46d53..8663c4d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -536,16 +536,10 @@ int virFileLinkPointsTo(const char *checkLink, -/* - * Attempt to resolve a symbolic link, returning an - * absolute path where only the last component is guaranteed - * not to be a symlink. - * - * Return 0 if path was not a symbolic, or the link was - * resolved. Return -1 with errno set upon error - */ -int virFileResolveLink(const char *linkpath, - char **resultpath) +static int +virFileResolveLinkHelper(const char *linkpath, + bool intermediatePaths, + char **resultpath) { struct stat st; @@ -554,7 +548,7 @@ int virFileResolveLink(const char *linkpath, /* We don't need the full canonicalization of intermediate * directories, if linkpath is absolute and the basename is * already a non-symlink. */ - if (IS_ABSOLUTE_FILE_NAME(linkpath)) { + if (IS_ABSOLUTE_FILE_NAME(linkpath) && !intermediatePaths) { if (lstat(linkpath, &st) < 0) return -1; @@ -570,6 +564,33 @@ int virFileResolveLink(const char *linkpath, return *resultpath == NULL ? -1 : 0; } +/* + * Attempt to resolve a symbolic link, returning an + * absolute path where only the last component is guaranteed + * not to be a symlink. + * + * Return 0 if path was not a symbolic, or the link was + * resolved. Return -1 with errno set upon error + */ +int virFileResolveLink(const char *linkpath, + char **resultpath) +{ + return virFileResolveLinkHelper(linkpath, false, resultpath); +} + +/* + * Attempt to resolve a symbolic link, returning an + * absolute path where every component is guaranteed + * not to be a symlink. + * + * Return 0 if path was not a symbolic, or the link was + * resolved. Return -1 with errno set upon error + */ +int virFileResolveAllLinks(const char *linkpath, + char **resultpath) +{ + return virFileResolveLinkHelper(linkpath, true, resultpath); +} /* * Check whether the given file is a link. diff --git a/src/util/util.h b/src/util/util.h index c9c785b..977ab6c 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -77,6 +77,8 @@ int virFileLinkPointsTo(const char *checkLink, int virFileResolveLink(const char *linkpath, char **resultpath) ATTRIBUTE_RETURN_CHECK; +int virFileResolveAllLinks(const char *linkpath, + char **resultpath) ATTRIBUTE_RETURN_CHECK; int virFileIsLink(const char *linkpath) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -- 1.7.7.5

2 1

[libvirt] [PATCH] Permission change for systemtap examples.
by Martin Kletzander 17 Jan '12

17 Jan '12

Execute bit on *.stp files in examples/systemtap/ caused dependency when building RPM packages. Disabling execute permission should help the auto dependency resolver to see that systemtap is not needed. --- 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 examples/systemtap/events.stp mode change 100755 => 100644 examples/systemtap/rpc-monitor.stp diff --git a/examples/systemtap/events.stp b/examples/systemtap/events.stp old mode 100755 new mode 100644 diff --git a/examples/systemtap/rpc-monitor.stp b/examples/systemtap/rpc-monitor.stp old mode 100755 new mode 100644 -- 1.7.3.4

3 2

[libvirt] [PATCH] qemu: Don't break domain with 0:0:2.0 assigned to anything but VGA
by Jiri Denemark 17 Jan '12

17 Jan '12

In the past we didn't reserve 0:0:2.0 PCI address if there was no video device assigned to a domain, which made it impossible to add a video device later on. So we fixed it (commit v0.9.0-37-g7b2cac1) by always reserving that address. However, that breaks existing domains without video devices that already have another device assigned to the problematic address. This patch reserves address 0:0:2.0 only in case it was not explicitly assigned to another device, which means libvirt will try to keep this address free and will not automatically assign it new devices. But existing domains for which older libvirt already assigned the address to a non-video device will keep working as they used to work before 0.9.1. Moreover, users who want to create a domain without a video device and use its address for another device may do so by explicitly configuring the PCI address in domain XML. --- src/qemu/qemu_command.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b45f65f..eccbe01 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1206,7 +1206,6 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) int i; bool reservedIDE = false; bool reservedUSB = false; - bool reservedVGA = false; int function; /* Host bridge */ @@ -1287,20 +1286,30 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) } /* If TYPE==PCI, then qemuCollectPCIAddress() function * has already reserved the address, so we must skip */ - reservedVGA = true; } else { def->videos[0]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; def->videos[0]->info.addr.pci.domain = 0; def->videos[0]->info.addr.pci.bus = 0; def->videos[0]->info.addr.pci.slot = 2; def->videos[0]->info.addr.pci.function = 0; + if (qemuDomainPCIAddressReserveSlot(addrs, 2) < 0) + goto error; + } + } else { + virDomainDeviceInfo dev; + memset(&dev, 0, sizeof(dev)); + dev.addr.pci.slot = 2; + + if (qemuDomainPCIAddressCheckSlot(addrs, &dev) < 0) { + VIR_DEBUG("PCI address 0:0:2.0 in use, future addition of a video" + " device will not be possible without manual" + " intervention"); + virResetLastError(); + } else if (qemuDomainPCIAddressReserveSlot(addrs, 2) < 0) { + goto error; } } - if (!reservedVGA - && qemuDomainPCIAddressReserveSlot(addrs, 2) < 0) - goto error; - for (i = 0; i < def->nfss ; i++) { if (def->fss[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) continue; -- 1.7.8.3

2 2

[libvirt] [PATCH] qemuxml2argvtest: Add /usr/bin to PATH
by Michal Privoznik 17 Jan '12

17 Jan '12

On some systems, notably Fedora 16, dirname is located under /usr/bin making our qemuxml2argvtest fail as we default to /bin; --- tests/qemuxml2argvtest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d1834f5..96f538d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -338,7 +338,7 @@ mymain(void) /* Unset or set all envvars here that are copied in qemudBuildCommandLine * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ - setenv("PATH", "/bin", 1); + setenv("PATH", "/bin:/usr/bin", 1); setenv("USER", "test", 1); setenv("LOGNAME", "test", 1); setenv("HOME", "/home/test", 1); -- 1.7.3.4

2 1

[libvirt] [PATCH] Fixed dumxml of <iotune> parameters
by Martin Kletzander 17 Jan '12

17 Jan '12

The output of dumpxml for <iotune> settings was misformatted, this patch just adds missing newlines. --- src/conf/domain_conf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d474551..f84e76d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10079,12 +10079,12 @@ virDomainDiskDefFormat(virBufferPtr buf, } if (def->blkdeviotune.read_iops_sec) { - virBufferAsprintf(buf, " <read_iops_sec>%llu</read_iops_sec>", + virBufferAsprintf(buf, " <read_iops_sec>%llu</read_iops_sec>\n", def->blkdeviotune.read_iops_sec); } if (def->blkdeviotune.write_iops_sec) { - virBufferAsprintf(buf, " <write_iops_sec>%llu</write_iops_sec>", + virBufferAsprintf(buf, " <write_iops_sec>%llu</write_iops_sec>\n", def->blkdeviotune.write_iops_sec); } -- 1.7.3.4

2 1

[libvirt] [PATCH] Remove dmidecode dependancy outside PC arches
by Daniel Veillard 17 Jan '12

17 Jan '12

The new dependancy is only available on ix86, x86_64 and ia64 diff --git a/libvirt.spec.in b/libvirt.spec.in index d06c067..a5bd173 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -346,8 +346,10 @@ Requires: device-mapper %if %{with_cgconfig} Requires: libcgroup %endif +%ifarch i386 i586 i686 x86_64 ia64 # For virConnectGetSysinfo Requires: dmidecode +%endif # For service management %if %{with_systemd} Requires(post): systemd-units -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH v3] Add new attribute wrpolicy to <driver> element
by Deepak C Shetty 17 Jan '12

17 Jan '12

This introduces new attribute wrpolicy with only supported value as immediate. This will be an optional attribute with no defaults. This helps specify whether to skip the host page cache. When wrpolicy is specified, meaning when wrpolicy=immediate a writeback is explicitly initiated for the dirty pages in the host page cache as part of the guest file write operation. Usage: <filesystem type='mount' accessmode='passthrough'> <driver type='path' wrpolicy='immediate'/> <source dir='/export/to/guest'/> <target dir='mount_tag'/> </filesystem> Currently this only works with type='mount' for the QEMU/KVM driver. Signed-off-by: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com> --- v2: - added writeout as a qemu cap - cosmetic changes in comments - moved to using VIR_ERR_CONFIG_UNSUPPORTED - corrected doc v3: - changed attr name from writeout to wrpolicy - moved attr to be part of driver xml element docs/formatdomain.html.in | 12 ++++++++++-- docs/schemas/domaincommon.rng | 7 +++++++ src/conf/domain_conf.c | 27 ++++++++++++++++++++++++++- src/conf/domain_conf.h | 10 ++++++++++ src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 5 +++-- src/qemu/qemu_command.c | 14 ++++++++++++++ 7 files changed, 73 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 18b7e22..fb2bcbc 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1310,7 +1310,7 @@ <target dir='/'/> </filesystem> <filesystem type='mount' accessmode='passthrough'> - <driver type='path'/> + <driver type='path' wrpolicy='immediate'/> <source dir='/export/to/guest'/> <target dir='/import/from/host'/> <readonly/> @@ -1337,7 +1337,15 @@ sub-element <code>driver</code>, with an attribute <code>type='path'</code> or <code>type='handle'</code> <span class="since">(since - 0.9.7)</span>. + 0.9.7). The driver block has an optional attribute + <code>wrpolicy</code> with the only supported value + as <code>immediate</code>. It helps specify whether to skip + the host page cache. When wrpolicy is specified, meaning when + wrpolicy=immediate a writeback is explicitly initiated for the + dirty pages in the host page cache as part of the guest file + write operation. When this attribute is not specified, there + are no defaults, meaning explicit writeback won't be initiated + </span>. </dd> <dt><code>type='template'</code></dt> <dd> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 353faea..810b634 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1142,6 +1142,13 @@ <value>handle</value> </choice> </attribute> + <optional> + <attribute name="wrpolicy"> + <choice> + <value>immediate</value> + </choice> + </attribute> + </optional> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0190a81..98e5866 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -257,6 +257,9 @@ VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "mapped", "squash") +VIR_ENUM_IMPL(virDomainFSWrpolicy, VIR_DOMAIN_FS_WRPOLICY_LAST, + "default", + "immediate") VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "user", @@ -3468,6 +3471,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *source = NULL; char *target = NULL; char *accessmode = NULL; + char *wrpolicy = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3517,6 +3521,7 @@ virDomainFSDefParseXML(xmlNodePtr node, def->readonly = 1; } else if ((fsdriver == NULL) && (xmlStrEqual(cur->name, BAD_CAST "driver"))) { fsdriver = virXMLPropString(cur, "type"); + wrpolicy = virXMLPropString(cur, "wrpolicy"); } } cur = cur->next; @@ -3530,6 +3535,16 @@ virDomainFSDefParseXML(xmlNodePtr node, } } + if (wrpolicy) { + if ((def->wrpolicy = virDomainFSWrpolicyTypeFromString(wrpolicy)) < 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown filesystem write policy '%s'"), wrpolicy); + goto error; + } + } else { + def->wrpolicy = VIR_DOMAIN_FS_WRPOLICY_DEFAULT; + } + if (source == NULL) { virDomainReportError(VIR_ERR_NO_SOURCE, target ? "%s" : NULL, target); @@ -3556,6 +3571,7 @@ cleanup: VIR_FREE(target); VIR_FREE(source); VIR_FREE(accessmode); + VIR_FREE(wrpolicy); return def; @@ -10163,6 +10179,7 @@ virDomainFSDefFormat(virBufferPtr buf, const char *type = virDomainFSTypeToString(def->type); const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); const char *fsdriver = virDomainFSDriverTypeTypeToString(def->fsdriver); + const char *wrpolicy = virDomainFSWrpolicyTypeToString(def->wrpolicy); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -10182,7 +10199,15 @@ virDomainFSDefFormat(virBufferPtr buf, type, accessmode); if (def->fsdriver) { - virBufferAsprintf(buf, " <driver type='%s'/>\n", fsdriver); + virBufferAsprintf(buf, " <driver type='%s'", fsdriver); + + /* Don't generate anything if wrpolicy is set to default */ + if (def->wrpolicy) { + virBufferAsprintf(buf, " wrpolicy='%s'", wrpolicy); + } + + virBufferAddLit(buf,"/>\n"); + } if (def->src) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 03aa5b6..7541fbc 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -479,12 +479,21 @@ enum virDomainFSAccessMode { VIR_DOMAIN_FS_ACCESSMODE_LAST }; +/* Filesystem Write policy */ +enum virDomainFSWrpolicy { + VIR_DOMAIN_FS_WRPOLICY_DEFAULT = 0, + VIR_DOMAIN_FS_WRPOLICY_IMMEDIATE, + + VIR_DOMAIN_FS_WRPOLICY_LAST +}; + typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; int fsdriver; int accessmode; + int wrpolicy; char *src; char *dst; unsigned int readonly : 1; @@ -1974,6 +1983,7 @@ VIR_ENUM_DECL(virDomainControllerModelUSB) VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainFSDriverType) VIR_ENUM_DECL(virDomainFSAccessMode) +VIR_ENUM_DECL(virDomainFSWrpolicy) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainNetBackend) VIR_ENUM_DECL(virDomainNetVirtioTxMode) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 43c7578..2af16f3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,6 +144,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", + "fsdev-writeout", ); struct qemu_feature_flags { @@ -1083,6 +1084,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV); if (strstr(fsdev, "readonly")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); + if (strstr(fsdev, "writeout")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_WRITEOUT); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c759baf..5b2f932 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -113,10 +113,11 @@ enum qemuCapsFlags { QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ - QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ + QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ - QEMU_CAPS_FSDEV_READONLY =79, /* -fsdev readonly supported */ + QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */ + QEMU_CAPS_FSDEV_WRITEOUT = 80, /* -fsdev writeout supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 73f673f..ba0353e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -108,6 +108,10 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "handle"); +VIR_ENUM_DECL(qemuDomainFSWrpolicy) +VIR_ENUM_IMPL(qemuDomainFSWrpolicy, VIR_DOMAIN_FS_WRPOLICY_LAST, + "default", + "immediate"); static void uname_normalize (struct utsname *ut) @@ -2086,6 +2090,7 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); + const char *wrpolicy = qemuDomainFSWrpolicyTypeToString(fs->wrpolicy); if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -2119,6 +2124,15 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, } } + if (fs->wrpolicy != VIR_DOMAIN_FS_WRPOLICY_DEFAULT) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT)) { + virBufferAsprintf(&opt, ",writeout=%s", wrpolicy); + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("filesystem writeout not supported")); + } + } + virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",path=%s", fs->src);

2 5

[libvirt] [PATCH v2 0/6] Enhancements in CPU selection
by Jiri Denemark 17 Jan '12

17 Jan '12

The main goal of this series is to provide an easy way to say that a guest CPU should match host. Details can be found in individual patches. Jiri Denemark (6): tests: Print XML file name in verbose CPU test cpu: Optionally forbid fallback CPU models Add support for cpu mode attribute cpu: Update guest CPU in host-* mode Taint domains configured with cpu mode=host-passthrough qemu: Add support for host CPU modes docs/formatdomain.html.in | 63 +++++- docs/schemas/domaincommon.rng | 37 +++- src/conf/capabilities.c | 2 +- src/conf/cpu_conf.c | 264 +++++++++++++++----- src/conf/cpu_conf.h | 38 +++- src/conf/domain_conf.c | 5 +- src/conf/domain_conf.h | 1 + src/cpu/cpu.c | 2 +- src/cpu/cpu_x86.c | 47 ++++- src/libvirt_private.syms | 3 + src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_capabilities.h | 9 +- src/qemu/qemu_command.c | 96 +++++--- src/qemu/qemu_domain.c | 15 +- tests/cputest.c | 22 ++- tests/cputestdata/x86-baseline-1-result.xml | 4 +- tests/cputestdata/x86-baseline-2-result.xml | 4 +- .../cputestdata/x86-baseline-no-vendor-result.xml | 4 +- .../x86-baseline-some-vendors-result.xml | 4 +- tests/cputestdata/x86-guest-nofallback.xml | 18 ++ .../cputestdata/x86-host+guest,model486-result.xml | 4 +- .../x86-host+guest,models,Penryn-result.xml | 4 +- .../x86-host+guest,models,qemu64-result.xml | 4 +- tests/cputestdata/x86-host+guest,models-result.xml | 4 +- tests/cputestdata/x86-host+guest-result.xml | 4 +- tests/cputestdata/x86-host+guest.xml | 4 +- ...6-host+host+host-model,models,Penryn-result.xml | 19 ++ .../cputestdata/x86-host+host-model-nofallback.xml | 19 ++ tests/cputestdata/x86-host+host-model.xml | 18 ++ tests/cputestdata/x86-host+host-passthrough.xml | 18 ++ tests/cputestdata/x86-host+min.xml | 4 +- .../cputestdata/x86-host+nehalem-force-result.xml | 4 +- tests/cputestdata/x86-host+pentium3.xml | 4 +- .../x86-host+strict-force-extra-result.xml | 4 +- .../x86-host-better+pentium3,core2duo-result.xml | 4 +- .../x86-host-better+pentium3,pentium3-result.xml | 4 +- .../x86-host-better+pentium3-result.xml | 4 +- tests/cputestdata/x86-host-model-nofallback.xml | 4 + tests/cputestdata/x86-host-model.xml | 1 + tests/cputestdata/x86-host-passthrough.xml | 1 + tests/cputestdata/x86-host-worse+guest-result.xml | 4 +- tests/qemuhelptest.c | 21 +- tests/qemuxml2argvdata/qemu-lib.sh | 50 ++++ tests/qemuxml2argvdata/qemu-supported-cpus.sh | 15 ++ tests/qemuxml2argvdata/qemu.sh | 51 +---- tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 2 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 4 + .../qemuxml2argv-cpu-exact2-nofallback.xml | 35 +++ .../qemuxml2argv-cpu-fallback.args | 19 ++ .../qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml | 25 ++ .../qemuxml2argv-cpu-host-model-fallback.args | 19 ++ .../qemuxml2argv-cpu-host-model-fallback.xml | 19 ++ .../qemuxml2argv-cpu-host-model-nofallback.xml | 21 ++ .../qemuxml2argv-cpu-host-model.args | 19 ++ .../qemuxml2argv-cpu-host-model.xml | 19 ++ .../qemuxml2argv-cpu-host-passthrough.args | 19 ++ .../qemuxml2argv-cpu-host-passthrough.xml | 19 ++ .../qemuxml2argv-cpu-nofallback.xml | 25 ++ .../qemuxml2argv-cpu-qemu-host-passthrough.xml | 19 ++ tests/qemuxml2argvtest.c | 91 +++++--- .../qemuxml2xmlout-graphics-spice-timeout.xml | 86 +++++++ tests/qemuxml2xmltest.c | 2 +- tests/testutilsqemu.c | 2 + 63 files changed, 1112 insertions(+), 250 deletions(-) create mode 100644 tests/cputestdata/x86-guest-nofallback.xml create mode 100644 tests/cputestdata/x86-host+host+host-model,models,Penryn-result.xml create mode 100644 tests/cputestdata/x86-host+host-model-nofallback.xml create mode 100644 tests/cputestdata/x86-host+host-model.xml create mode 100644 tests/cputestdata/x86-host+host-passthrough.xml create mode 100644 tests/cputestdata/x86-host-model-nofallback.xml create mode 100644 tests/cputestdata/x86-host-model.xml create mode 100644 tests/cputestdata/x86-host-passthrough.xml create mode 100644 tests/qemuxml2argvdata/qemu-lib.sh create mode 100755 tests/qemuxml2argvdata/qemu-supported-cpus.sh create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml -- 1.7.8.3

2 15

[libvirt] [RFC PATCH 0/6] New API to normalize the device XML
by Osier Yang 17 Jan '12

17 Jan '12

The initial purpose was to fix a regression for detaching device, (introduced by commit ea7182c29). There was a patch posted to resolve the problem: https://www.redhat.com/archives/libvir-list/2011-December/msg00818.html But as Eric suggested, it's not the ideal way to go, we never known how many stuffs like <address> will be involved in future. So new API to invoke the internal parsing functions might be a right way then. However, things are not that simple (an API without internal driver support, invoking the parsing functions directly). As the domain conf is a neccessary argument to parse the device XML. (e.g. for an Input device). Although we can bypass that by modification on virDomainDeviceDefParse, it could be trap as we will parse the device XML in another way which is different with the real parsing. So finally I choosed to implement the driver support for the new API. There might be something I didn't take into consideration, (e.g. Do we need some flags for the XML parsing and formating?). But it can demo the thought good enough. On the other hand, I'm wondering if it's deserved to introduce such an API, comparing it's usage, is it two heavy if we need the internal drivers support for such an API? Any thoughts and feedback is welcomed. [PATCH 1/6] normalize_xml: Define the new API [PATCH 2/6] normalize_xml: Implement the new API [PATCH 3/6] normalize_xml: Wire up the remote protocol [PATCH 4/6] normalize_xml: New internal API to format device XML [PATCH 5/6] normalize_xml: Implement qemu driver support [PATCH 6/6] normalize_xml: New virsh command to normalize device XML Regards, Osier

3 18

[libvirt] [PATCH] Clarify semantics of virDomainMigrate{,ToURI}2
by Jiri Denemark 17 Jan '12

17 Jan '12

Commit 5d784bd6d7b19314b0908aec6b46bfe377aeba42 was a nice attempt to clarify the semantics by requiring domain name from dxml to either match original name or dname. However, setting dxml domain name to dname doesn't really work since destination host needs to know the original domain name to be able to use it in migration cookies. This patch requires domain name in dxml to match the original domain name. The change should be safe and backward compatible since migration would fail just a bit later in the process. --- src/libvirt.c | 4 ++-- src/qemu/qemu_migration.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index a540424..7b8adf7 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5188,8 +5188,8 @@ error: * if @dxml would cause any guest-visible changes. Pass NULL * if no changes are needed to the XML between source and destination. * @dxml cannot be used to rename the domain during migration (use - * @dname for that purpose). Domain name in @dxml must either match the - * original domain name or @dname if it was specified. + * @dname for that purpose). Domain name in @dxml must match the + * original domain name. * * Returns the new domain object if the migration was successful, * or NULL in case of error. Note that the new domain object diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 92d6008..8453a47 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1046,11 +1046,9 @@ char *qemuMigrationBegin(struct qemud_driver *driver, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - if (STRNEQ(def->name, vm->def->name) && - STRNEQ_NULLABLE(def->name, dname)) { + if (STRNEQ(def->name, vm->def->name)) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", - _("target domain name doesn't match source name" - " nor destination name")); + _("target domain name doesn't match source name")); goto cleanup; } -- 1.7.8.3

2 2

[libvirt] [libvirt-glib] Make use of G_PARAM_STATIC_STRINGS everywhere
by Zeeshan Ali (Khattak) 17 Jan '12

17 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 28 +++++++++------------ libvirt-gobject/libvirt-gobject-domain-snapshot.c | 4 +-- libvirt-gobject/libvirt-gobject-domain.c | 8 +---- libvirt-gobject/libvirt-gobject-interface.c | 4 +-- libvirt-gobject/libvirt-gobject-network-filter.c | 4 +-- libvirt-gobject/libvirt-gobject-network.c | 4 +-- libvirt-gobject/libvirt-gobject-node-device.c | 4 +-- libvirt-gobject/libvirt-gobject-secret.c | 4 +-- libvirt-gobject/libvirt-gobject-storage-pool.c | 5 +-- libvirt-gobject/libvirt-gobject-storage-vol.c | 4 +-- libvirt-gobject/libvirt-gobject-stream.c | 4 +-- 11 files changed, 24 insertions(+), 49 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index f0c9ff6..a90581a 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -163,9 +163,18 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property(object_class, + PROP_HANDLE, + g_param_spec_boxed("handle", + "Handle", + "The connection handle", + GVIR_TYPE_CONNECTION_HANDLE, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); signals[VIR_CONNECTION_OPENED] = g_signal_new("connection-opened", G_OBJECT_CLASS_TYPE(object_class), @@ -205,19 +214,6 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) 1, GVIR_TYPE_DOMAIN); - g_object_class_install_property(object_class, - PROP_HANDLE, - g_param_spec_boxed("handle", - "Handle", - "The connection handle", - GVIR_TYPE_CONNECTION_HANDLE, - G_PARAM_READABLE | - G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - g_type_class_add_private(klass, sizeof(GVirConnectionPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index e68321d..950555a 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -126,9 +126,7 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); g_type_class_add_private(klass, sizeof(GVirDomainSnapshotPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 2974bb8..2bc12d9 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -157,9 +157,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, PROP_PERSISTENT, @@ -168,9 +166,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) "If domain is persistent", TRUE, G_PARAM_READABLE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); signals[VIR_STARTED] = g_signal_new("started", G_OBJECT_CLASS_TYPE(object_class), diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index 7e6e9b0..c9950f7 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -125,9 +125,7 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); g_type_class_add_private(klass, sizeof(GVirInterfacePrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index f0fd024..fe1a042 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -142,9 +142,7 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); g_type_class_add_private(klass, sizeof(GVirNetworkFilterPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 847c236..75e010d 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -140,9 +140,7 @@ static void gvir_network_class_init(GVirNetworkClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); g_type_class_add_private(klass, sizeof(GVirNetworkPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index 59fe84b..f8d536e 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -126,9 +126,7 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); g_type_class_add_private(klass, sizeof(GVirNodeDevicePrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index 0c81921..bc5ee3b 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -142,9 +142,7 @@ static void gvir_secret_class_init(GVirSecretClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); g_type_class_add_private(klass, sizeof(GVirSecretPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 4eb8eec..5bd3f0a 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -152,9 +152,8 @@ static void gvir_storage_pool_class_init(GVirStoragePoolClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); + g_type_class_add_private(klass, sizeof(GVirStoragePoolPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 4f62732..5b18877 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -126,9 +126,7 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); g_type_class_add_private(klass, sizeof(GVirStorageVolPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 6b75819..a1039b1 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -247,9 +247,7 @@ static void gvir_stream_class_init(GVirStreamClass *klass) G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_STATIC_STRINGS)); g_type_class_add_private(klass, sizeof(GVirStreamPrivate)); } -- 1.7.7.5

2 3

[libvirt] [PATCH v2] docs: Add missed RNG schema for interface
by Osier Yang 17 Jan '12

17 Jan '12

We support <interface> of type "mcast", "server", and "client", but the RNG schema for them are missed. Attribute "address" is optional for "server" type. And these 3 types support <mac address='MAC'/>, too. --- docs/formatdomain.html.in | 3 + docs/schemas/domaincommon.rng | 53 ++++++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-net-client.args | 5 ++ tests/qemuxml2argvdata/qemuxml2argv-net-client.xml | 29 +++++++++++ tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 5 ++ tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml | 29 +++++++++++ .../qemuxml2argvdata/qemuxml2argv-net-server.args | 5 ++ tests/qemuxml2argvdata/qemuxml2argv-net-server.xml | 29 +++++++++++ tests/qemuxml2argvtest.c | 3 + 9 files changed, 161 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-client.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-client.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-server.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-server.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index faf42df..6b06723 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2189,6 +2189,7 @@ <pre> ... <devices> + <mac address='52:54:00:6d:90:01'> <interface type='mcast'> <source address='230.0.0.1' port='5558'/> </interface> @@ -2210,10 +2211,12 @@ ... <devices> <interface type='server'> + <mac address='52:54:00:22:c9:42'> <source address='192.168.0.1' port='5558'/> </interface> ... <interface type='client'> + <mac address='52:54:00:8b:c9:51'> <source address='192.168.0.1' port='5558'/> </interface> </devices> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 6d265f3..7a23525 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1308,6 +1308,59 @@ <ref name="interface-options"/> </interleave> </group> + <group> + <attribute name="type"> + <choice> + <value>mcast</value> + <value>client</value> + </choice> + </attribute> + <interleave> + <element name="source"> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + <optional> + <element name="mac"> + <attribute name="address"> + <ref name="macAddr"/> + </attribute> + <empty/> + </element> + </optional> + </interleave> + </group> + <group> + <attribute name="type"> + <value>server</value> + </attribute> + <interleave> + <element name="source"> + <optional> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + </optional> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + <optional> + <element name="mac"> + <attribute name="address"> + <ref name="macAddr"/> + </attribute> + <empty/> + </element> + </optional> + </interleave> + </group> </choice> </element> </define> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args new file mode 100644 index 0000000..f8853ac --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\ +macaddr=52:54:00:8c:b9:05,vlan=0 -net socket,connect=192.168.0.1:5558,vlan=0 \ +-serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml new file mode 100644 index 0000000..b4cca6e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <interface type='client'> + <mac address='52:54:00:8c:b9:05'/> + <source address='192.168.0.1' port='5558'/> + </interface> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args new file mode 100644 index 0000000..bb4a042 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\ +macaddr=52:54:00:8c:b9:05,vlan=0 -net socket,mcast=192.0.0.1:5558,vlan=0 \ +-serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml new file mode 100644 index 0000000..a3929a5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <interface type='mcast'> + <mac address='52:54:00:8c:b9:05'/> + <source address='192.0.0.1' port='5558'/> + </interface> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args new file mode 100644 index 0000000..1451e32 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\ +macaddr=52:54:00:8c:b9:05,vlan=0 -net socket,listen=192.168.0.1:5558,vlan=0 \ +-serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml new file mode 100644 index 0000000..eca440d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <interface type='server'> + <mac address='52:54:00:8c:b9:05'/> + <source address='192.168.0.1' port='5558'/> + </interface> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7beaa4b..fd3c9bb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -519,6 +519,9 @@ mymain(void) DO_TEST("net-eth", false, NONE); DO_TEST("net-eth-ifname", false, NONE); DO_TEST("net-eth-names", false, QEMU_CAPS_NET_NAME); + DO_TEST("net-client", false, NONE); + DO_TEST("net-server", false, NONE); + DO_TEST("net-mcast", false, NONE); DO_TEST("serial-vc", false, NONE); DO_TEST("serial-pty", false, NONE); -- 1.7.7.3

2 2

[libvirt] [PATCH] virNetServer: Don't fail if we can't initialize avahi
by Guido Günther 16 Jan '12

16 Jan '12

since libvird won't start otherwise without avahi running. Having avahi compiled in shouldn't force us to have avahi running. --- src/rpc/virnetserver.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f761e6b..ab6d112 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -695,9 +695,8 @@ void virNetServerRun(virNetServerPtr srv) virNetServerLock(srv); #if HAVE_AVAHI - if (srv->mdns && - virNetServerMDNSStart(srv->mdns) < 0) - goto cleanup; + if (srv->mdns) + virNetServerMDNSStart(srv->mdns); #endif if (srv->autoShutdownTimeout && -- 1.7.7.3

3 3

[libvirt] [PATCH 0/4] add virsh domxml-formats
by Eric Blake 16 Jan '12

16 Jan '12

I previously proposed this here: https://www.redhat.com/archives/libvir-list/2011-December/msg00899.html although it's been on my wish list a lot longer than that. Questions: I had the new API take nformats as an int, and return the number of populated slots; should I switch this to take *nformats as a pointer (being both input and output) with a return value of 0, so as to be more consistent with things like virDomainGetMemoryParameters? I'm not very familiar with writing python bindings, at least not without the benefit of copy-and-paste, and I didn't see a good example to copy from. Ultimately, I envision that the python API will be something like virConnect.domainNativeFormats(self, flags), with a return being a python list of strings (where the underlying code calls virConnectDomainNativeFormats twice, once to determine the list size, and once to determine the list contents), but I'm not sure how to go about doing that (I don't know if generator.py can do it, or if it needs an override, or what). So I left the python bindings undone, and would appreciate if someone else can step in and help. Eric Blake (4): native: add virConnectNativeFormats API native: add virsh command domxml-formats native: implement rpc handling of new API native: add driver support daemon/remote.c | 56 ++++++++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 4 ++ python/generator.py | 3 ++ src/driver.h | 6 ++++ src/esx/esx_driver.c | 20 ++++++++++++- src/libvirt.c | 59 ++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/libxl/libxl_driver.c | 22 +++++++++++++- src/qemu/qemu_driver.c | 17 +++++++++++ src/remote/remote_driver.c | 64 +++++++++++++++++++++++++++++++++++++++++- src/remote/remote_protocol.x | 17 ++++++++++- src/remote_protocol-structs | 12 ++++++++ src/xen/xen_driver.c | 27 +++++++++++++++++- tools/virsh.c | 48 +++++++++++++++++++++++++++++++ tools/virsh.pod | 11 ++++++- 15 files changed, 362 insertions(+), 9 deletions(-) -- 1.7.7.5

2 6

[libvirt] [PATCH] build: fix bootstrap on fresh clone
by Eric Blake 16 Jan '12

16 Jan '12

Commit 29db7a0 picked up a gnulib bug, where a change in bootstrap meant that it would fail to run libtoolize on projects, like libvirt, that used the older spelling AM_PROG_LIBTOOL instead of LT_INIT for the sake of building on RHEL 5. Now that gnulib is fixed, we should pick up that fix. * .gnulib: Update to latest, for bootstrap fix. * bootstrap: Resync from gnulib. --- Tested on a fresh clone of libvirt.git in RHEL 5, and pushing under the build-breaker rule. * .gnulib 980097f...dd6b2d7 (8): > bootstrap: cater to autoconf 2.59 > bootstrap: properly check for libtool > Improve support for MSVC 9. > gnupload: we hold the master copy of this script now > Fix module 'random'. > Tests for module 'random'. > New module 'random'. > autoupdate .gnulib | 2 +- bootstrap | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gnulib b/.gnulib index 980097f..dd6b2d7 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 980097f8eca9e08feb2073d06179f53ba46b805e +Subproject commit dd6b2d751b3c6ad417f6a4c48f2adb9d27cc59d2 diff --git a/bootstrap b/bootstrap index 66da981..2a409fc 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-01-06.07; # UTC +scriptversion=2012-01-16.17; # UTC # Bootstrap this package from checked-out sources. @@ -758,7 +758,7 @@ fi # Autoreconf runs aclocal before libtoolize, which causes spurious # warnings if the initial aclocal is confused by the libtoolized # (or worse out-of-date) macro directory. -if grep '^[ ]*LT_INIT' configure.ac >/dev/null; then +if test $use_libtool = 1; then echo "running: $LIBTOOLIZE --copy --install" $LIBTOOLIZE --copy --install fi @@ -820,10 +820,14 @@ find "$m4_base" "$source_base" \ -type l -xtype l -delete > /dev/null 2>&1 # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. +no_recursive= +case $($AUTORECONF --help) in + *--no-recursive*) no_recursive=--no-recursive;; +esac echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ - "$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS" + "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" AUTOPOINT=true LIBTOOLIZE=true \ - $AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \ + $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \ || exit 1 # Get some extra files from gnulib, overriding existing files. -- 1.7.7.5

1 0

[libvirt] cpu models for AMD Bulldozer and Sandy Bridge
by Shahar Havivi 16 Jan '12

16 Jan '12

Hi, what are the cpu models for AMD Bulldozer and Sandy Bridge?

3 3

[libvirt] [PATCH 2/3] docs: Expose alias tag in domain RNG schema
by Osier Yang 16 Jan '12

16 Jan '12

Though <alias> is ignored when defining a domain, it can cause failure if one validates (e.g. virt-xml-validate) the XML dumped from a running domain. This patch expose it in domain RNG schema for all the devices which support it. --- docs/schemas/domaincommon.rng | 64 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 58 insertions(+), 6 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index b34526f..243ff93 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -734,6 +734,9 @@ <ref name="diskIoTune"/> </optional> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </interleave> @@ -1099,6 +1102,9 @@ <ref name="usbmaster"/> </optional> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </element> @@ -1196,6 +1202,9 @@ <define name="filesystemtgt"> <interleave> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> <element name="target"> @@ -1396,6 +1405,9 @@ </element> </optional> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> <optional> @@ -1811,6 +1823,9 @@ </element> </optional> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </element> @@ -1894,6 +1909,9 @@ <ref name="qemucdevTgtDef"/> </optional> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </interleave> @@ -2012,6 +2030,9 @@ </choice> </attribute> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </element> @@ -2037,6 +2058,9 @@ </attribute> </optional> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </element> @@ -2051,6 +2075,9 @@ </choice> </attribute> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </element> @@ -2094,6 +2121,9 @@ <ref name="virtioTarget"/> </choice> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </interleave> @@ -2135,6 +2165,9 @@ </group> </choice> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </element> @@ -2162,6 +2195,9 @@ </attribute> </optional> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </element> @@ -2174,6 +2210,9 @@ </choice> </attribute> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </element> @@ -2190,6 +2229,9 @@ </attribute> <ref name="qemucdevSrcDef"/> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> </element> @@ -2238,6 +2280,9 @@ <ref name="deviceBoot"/> </optional> <optional> + <ref name="alias"/> + </optional> + <optional> <ref name="address"/> </optional> <optional> @@ -2356,12 +2401,6 @@ </attribute> </optional> </define> -  <define name="devices"> <element name="devices"> <interleave> @@ -2970,4 +3009,17 @@ <param name="pattern">(0x)?[0-9a-fA-F]{1,16}</param> </data> </define> + <define name='aliasName'> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_-]+</param> + </data> + </define> + <define name='alias'> + <element name='alias'> + <attribute name='name'> + <ref name='aliasName'/> + </attribute> + </element> + <empty/> + </define> </grammar> -- 1.7.7.3

2 2

[libvirt] [PATCH 1/3] docs: Add readonly to filesystem RNG schema
by Osier Yang 16 Jan '12

16 Jan '12

"<readonly/>" is supported by filesystem XML, and also documented. --- docs/schemas/domaincommon.rng | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 6d265f3..b34526f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1186,6 +1186,11 @@ </choice> </attribute> </optional> + <optional> + <element name='readonly'> + <empty/> + </element> + </optional> </element> </define> <define name="filesystemtgt"> -- 1.7.7.3

2 2

[libvirt] [libvirt-glib] libvirt dependency needs to be bumped
by Nirbheek Chauhan 16 Jan '12

16 Jan '12

Hey guys, It seems libvirt-glib requires VIR_DOMAIN_EVENT_SHUTDOWN which was only added in libvirt-0.9.8[1]. Hence, configure.ac needs LIBVIRT_REQUIRED=0.9.8 otherwise the build fails in make instead of in configure. Thanks! 1. 38527c9ae0d398a996e1e3c0897a104e3ffd1256 in libvirt.git -- ~Nirbheek Chauhan Gentoo GNOME+Mozilla Team

3 2

[libvirt] [PATCH] events: Return the correct number of registered events
by Adam Litke 16 Jan '12

16 Jan '12

Commit d09f6ba5feb655925175dc80122ca2a1e14db2b9 introduced a regression in event registration. virDomainEventCallbackListAddID() will only return a positive integer if the type of event being registered is VIR_DOMAIN_EVENT_ID_LIFECYCLE. For other event types, 0 is always returned on success. This has the unfortunate side effect of not enabling remote event callbacks because remoteDomainEventRegisterAny() uses the return value from the local call to determine if an event callback needs to be registered on the remote end. Make sure virDomainEventCallbackListAddID() returns the callback count for the eventID being registered. Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- src/conf/domain_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 3fd3ed2..0431697 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -434,7 +434,7 @@ virDomainEventCallbackListAddID(virConnectPtr conn, event->callbackID = cbList->nextID++; for (i = 0 ; i < cbList->count ; i++) { - if (cbList->callbacks[i]->eventID == VIR_DOMAIN_EVENT_ID_LIFECYCLE && + if (cbList->callbacks[i]->eventID == eventID && cbList->callbacks[i]->conn == conn && !cbList->callbacks[i]->deleted) ret++; -- 1.7.5.rc1

3 2

[libvirt] [PATCH 3/3] docs: Improve the schema for fs device
by Osier Yang 16 Jan '12

16 Jan '12

<filesystemtgt> is just redundant, as every group uses it; <address> shouldn't be in <filesystemtgt> in case of the meaning could be "filesystemtarget"; The elements <address>, <alias>, <target>, ... should be interleaved. --- docs/schemas/domaincommon.rng | 58 ++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 32 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 243ff93..96330e9 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1123,7 +1123,6 @@ </attribute> <empty/> </element> - <ref name="filesystemtgt"/> </interleave> </group> <group> @@ -1137,7 +1136,6 @@ </attribute> <empty/> </element> - <ref name="filesystemtgt"/> </interleave> </group> <group> @@ -1165,7 +1163,6 @@ <empty/> </element> </optional> - <ref name="filesystemtgt"/> </interleave> </group> <group> @@ -1179,42 +1176,39 @@ </attribute> <empty/> </element> - <ref name="filesystemtgt"/> </interleave> </group> </choice> - <optional> - <attribute name="accessmode"> - <choice> - <value>passthrough</value> - <value>mapped</value> - <value>squash</value> - </choice> - </attribute> - </optional> - <optional> - <element name='readonly'> + <interleave> + <element name="target"> + <attribute name="dir"> + <ref name="absDirPath"/> + </attribute> <empty/> </element> - </optional> + <optional> + <attribute name="accessmode"> + <choice> + <value>passthrough</value> + <value>mapped</value> + <value>squash</value> + </choice> + </attribute> + </optional> + <optional> + <element name='readonly'> + <empty/> + </element> + </optional> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> + </interleave> </element> </define> - <define name="filesystemtgt"> - <interleave> - <optional> - <ref name="alias"/> - </optional> - <optional> - <ref name="address"/> - </optional> - <element name="target"> - <attribute name="dir"> - <ref name="absDirPath"/> - </attribute> - <empty/> - </element> - </interleave> - </define> <!-- An interface description can either be of type bridge in which case it will use a bridging source, or of type ethernet which uses a device -- 1.7.7.3

1 0

[libvirt] [libvirt-glib] Add gvir_config_domain_disk_set_readonly()
by Zeeshan Ali (Khattak) 16 Jan '12

16 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 11 +++++++++++ libvirt-gconfig/libvirt-gconfig-domain-disk.h | 2 ++ libvirt-gconfig/libvirt-gconfig.sym | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index a39bf03..fb4e2b4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -292,3 +292,14 @@ gvir_config_domain_disk_get_target_dev(GVirConfigDomainDisk *disk) return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(disk), "target", "dev"); } + +void +gvir_config_domain_disk_set_readonly(GVirConfigDomainDisk *disk, + gboolean readonly) +{ + if (readonly) { + GVirConfigObject *node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(disk), "readonly"); + g_object_unref(node); + } else + gvir_config_object_delete_child(GVIR_CONFIG_OBJECT(disk), "readonly"); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.h b/libvirt-gconfig/libvirt-gconfig-domain-disk.h index d9d90e5..3359049 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.h @@ -117,6 +117,8 @@ char *gvir_config_domain_disk_get_driver_name(GVirConfigDomainDisk *disk); char *gvir_config_domain_disk_get_driver_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskBus gvir_config_domain_disk_get_target_bus(GVirConfigDomainDisk *disk); char *gvir_config_domain_disk_get_target_dev(GVirConfigDomainDisk *disk); +void gvir_config_domain_disk_set_readonly(GVirConfigDomainDisk *disk, + gboolean readonly); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 7cf3c3d..73fe279 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -80,6 +80,7 @@ LIBVIRT_GCONFIG_0.0.3 { gvir_config_domain_disk_get_target_dev; gvir_config_domain_disk_set_target_dev; gvir_config_domain_disk_get_disk_type; + gvir_config_domain_disk_set_readonly; gvir_config_domain_disk_set_type; gvir_config_domain_filesys_get_type; -- 1.7.7.5

2 1

[libvirt] [PATCH 1/4] Make drive unit attribute optional in the XML schema
by Michael Ellerman 13 Jan '12

13 Jan '12

The "unit" attribute of a drive address is optional in the code, so should also be in the XML schema. Signed-off-by: Michael Ellerman <michael(a)ellerman.id.au> --- docs/schemas/domaincommon.rng | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e93ae77..b9da906 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2307,9 +2307,11 @@ <ref name="driveBus"/> </attribute> </optional> - <attribute name="unit"> - <ref name="driveUnit"/> - </attribute> + <optional> + <attribute name="unit"> + <ref name="driveUnit"/> + </attribute> + </optional> </define> <define name="virtioserialaddress"> <attribute name="controller"> -- 1.7.7.3

2 7

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 13 Jan '12

13 Jan '12

Overall status: failed Start date: Fri Jan 13 2012 Start time: 22:05:02 UTC / 17:05:02 EST Build counter: 1326492302 Build timestamp: 1326492302 URL: http://builder.virt-tools.org/index.html Module: libvirt Status: failed URL: http://builder.virt-tools.org/module-libvirt.html

2 1

[libvirt] [PATCH 0/4] Add ability to store and display notes and description with domains
by Peter Krempa 13 Jan '12

13 Jan '12

This patchset adds ability to store, display and modify comments for domains to help administrators identify and store metadata to domains to allow easy identification. A short description "note" was added as an attribute for the <description> element to hold a shorter description (limited to max 40 characters) to be shown along with lists of domains. A new command is being added to virsh to accomodate work with these new options. Peter Krempa (4): xml: Add attribute to <description> element to hold a short note api: Add api to set domain note and description in runtime qemu: Implement note API in qemu driver virsh: Add support for modifying domain description and notes docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 14 ++- include/libvirt/libvirt.h.in | 15 +++ src/conf/domain_conf.c | 27 ++++- src/conf/domain_conf.h | 1 + src/driver.h | 5 + src/libvirt.c | 47 ++++++++ src/libvirt_public.syms | 5 + src/qemu/qemu_driver.c | 70 ++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 9 ++- tools/virsh.c | 246 +++++++++++++++++++++++++++++++++++++---- tools/virsh.pod | 30 +++++- 13 files changed, 450 insertions(+), 27 deletions(-) -- 1.7.3.4

3 10

[libvirt] [PATCH] virsh domiflist: change output
by Taku Izumi 13 Jan '12

13 Jan '12

When using "virsh domifstat" command or "virsh domiftune" command, we pass an interface name as a parameter, so interface name is important. "virsh domiflist" output should display interface names on the first row. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- tools/virsh.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) Index: libvirt.capability/tools/virsh.c =================================================================== --- libvirt.capability.orig/tools/virsh.c +++ libvirt.capability/tools/virsh.c @@ -2034,8 +2034,8 @@ cmdDomiflist(vshControl *ctl, const vshC if (ninterfaces < 0) goto cleanup; - vshPrint(ctl, "%-10s %-10s %-10s %-11s %s\n", _("Type"), _("Source"), - _("Target"), _("Model"), _("MAC")); + vshPrint(ctl, "%-10s %-10s %-10s %-11s %s\n", _("Interface"), _("Type"), + _("Source"), _("Model"), _("MAC")); vshPrint(ctl, "-------------------------------------------------------\n"); for (i = 0; i < ninterfaces; i++) { @@ -2057,9 +2057,10 @@ cmdDomiflist(vshControl *ctl, const vshC model = virXPathString("string(./model/@type)", ctxt); mac = virXPathString("string(./mac/@address)", ctxt); - vshPrint(ctl, "%-10s %-10s %-10s %-11s %-10s\n", type, - source ? source : "-", + vshPrint(ctl, "%-10s %-10s %-10s %-11s %-10s\n", target ? target : "-", + type, + source ? source : "-", model ? model : "-", mac ? mac : "-");

2 1

[libvirt] [PATCH] export virNetDevGetVirtualFunctions as a private symbol
by Paolo Bonzini 13 Jan '12

13 Jan '12

This avoids a linking error. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- src/libvirt_private.syms | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 27a093c..912f1b4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1196,6 +1196,7 @@ virNetDevSetName; virNetDevSetNamespace; virNetDevSetOnline; virNetDevValidateConfig; +virNetDevGetVirtualFunctions; # virnetdevbandwidth.h -- 1.7.7.1

2 1

[libvirt] [PATCH] qemu: Introduce inactive PCI device list
by Osier Yang 13 Jan '12

13 Jan '12

pciTrySecondaryBusReset checks if there is active device on the same bus, however, qemu driver doesn't maintain an effective list for the inactive devices, and it passes meaningless argment for parameter "inactiveDevs". e.g. (qemuPrepareHostdevPCIDevices) if (!(pcidevs = qemuGetPciHostDeviceList(hostdevs, nhostdevs))) return -1; ...skipped... if (pciResetDevice(dev, driver->activePciHostdevs, pcidevs) < 0) goto reattachdevs; NB, the "pcidevs" used above are extracted from domain def, and thus one won't be able to attach a device of which bus has other device even detached from host (nodedev-detach). To see more details of the problem: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=773667 This patch is to resolve the problem by introduce an inactive PCI device list (just like qemu_driver->activePciHostdevs), and the whole logic is: * Add the device to inactive list when do nodedev-dettach * Remove the device from inactive list when do nodedev-reattach * Remove the device from inactive list when do attach-device (for not managed device) * Add the device to inactive list after detach-device, only if the device is not managed * Don't do any work if the device is managed, as it manages there is no gap in the whole workflow for another guest who wants to With above, we have sufficient inactive PCI device list, and thus we can use it for pciResetDevice. e.g.(qemuPrepareHostdevPCIDevices) if (pciResetDevice(dev, driver->activePciHostdevs, driver->inactivePciHostdevs) < 0) goto reattachdevs; --- src/qemu/qemu_conf.h | 5 +++++ src/qemu/qemu_driver.c | 13 ++++++++++--- src/qemu/qemu_hostdev.c | 31 ++++++++++++++++++++++--------- src/qemu/qemu_hotplug.c | 3 ++- src/util/pci.c | 27 +++++++++++++++++++++++---- src/util/pci.h | 8 ++++++-- src/xen/xen_driver.c | 4 ++-- 7 files changed, 70 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index d8d7915..3f1b668 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -128,6 +128,11 @@ struct qemud_driver { pciDeviceList *activePciHostdevs; usbDeviceList *activeUsbHostdevs; + /* The device which is not used by both host + * and any guest. + */ + pciDeviceList *inactivePciHostdevs; + virBitmapPtr reservedVNCPorts; virSysinfoDefPtr hostsysinfo; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 712f1fc..159911c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -588,6 +588,9 @@ qemudStartup(int privileged) { if ((qemu_driver->activeUsbHostdevs = usbDeviceListNew()) == NULL) goto error; + if ((qemu_driver->inactivePciHostdevs = pciDeviceListNew()) == NULL) + goto error; + if (privileged) { if (chown(qemu_driver->libDir, qemu_driver->user, qemu_driver->group) < 0) { virReportSystemError(errno, @@ -778,6 +781,7 @@ qemudShutdown(void) { qemuDriverLock(qemu_driver); pciDeviceListFree(qemu_driver->activePciHostdevs); + pciDeviceListFree(qemu_driver->inactivePciHostdevs); usbDeviceListFree(qemu_driver->activeUsbHostdevs); virCapabilitiesFree(qemu_driver->caps); @@ -9220,7 +9224,8 @@ qemudNodeDeviceDettach (virNodeDevicePtr dev) return -1; qemuDriverLock(driver); - if (pciDettachDevice(pci, driver->activePciHostdevs) < 0) + if (pciDettachDevice(pci, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) goto out; ret = 0; @@ -9248,7 +9253,8 @@ qemudNodeDeviceReAttach (virNodeDevicePtr dev) pciDeviceReAttachInit(pci); qemuDriverLock(driver); - if (pciReAttachDevice(pci, driver->activePciHostdevs) < 0) + if (pciReAttachDevice(pci, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) goto out; ret = 0; @@ -9275,7 +9281,8 @@ qemudNodeDeviceReset (virNodeDevicePtr dev) qemuDriverLock(driver); - if (pciResetDevice(pci, driver->activePciHostdevs, NULL) < 0) + if (pciResetDevice(pci, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) goto out; ret = 0; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index c7adb1d..82ad9de 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -212,7 +212,7 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); if (pciDeviceGetManaged(dev) && - pciDettachDevice(dev, driver->activePciHostdevs) < 0) + pciDettachDevice(dev, driver->activePciHostdevs, NULL) < 0) goto reattachdevs; } @@ -220,7 +220,8 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, * can safely reset them */ for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - if (pciResetDevice(dev, driver->activePciHostdevs, pcidevs) < 0) + if (pciResetDevice(dev, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) goto reattachdevs; } @@ -233,7 +234,13 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, } } - /* Loop 5: Now set the used_by_domain of the device in + /* Loop 5: Now remove the devices from inactive list. */ + for (i = 0; i < pciDeviceListCount(pcidevs); i++) { + pciDevice *dev = pciDeviceListGet(pcidevs, i); + pciDeviceListDel(driver->inactivePciHostdevs, dev); + } + + /* Loop 6: Now set the used_by_domain of the device in * driver->activePciHostdevs as domain name. */ for (i = 0; i < pciDeviceListCount(pcidevs); i++) { @@ -245,7 +252,7 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, pciDeviceSetUsedBy(activeDev, name); } - /* Loop 6: Now set the original states for hostdev def */ + /* Loop 7: Now set the original states for hostdev def */ for (i = 0; i < nhostdevs; i++) { pciDevice *dev; pciDevice *pcidev; @@ -277,7 +284,7 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, pciFreeDevice(dev); } - /* Loop 7: Now steal all the devices from pcidevs */ + /* Loop 8: Now steal all the devices from pcidevs */ while (pciDeviceListCount(pcidevs) > 0) { pciDevice *dev = pciDeviceListGet(pcidevs, 0); pciDeviceListSteal(pcidevs, dev); @@ -298,7 +305,7 @@ inactivedevs: reattachdevs: for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - pciReAttachDevice(dev, driver->activePciHostdevs); + pciReAttachDevice(dev, driver->activePciHostdevs, NULL); } cleanup: @@ -445,8 +452,13 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) { int retries = 100; - if (!pciDeviceGetManaged(dev)) + /* If the device is not managed and was attached to guest + * successfully, it must had be inactive. + */ + if (!pciDeviceGetManaged(dev)) { + pciDeviceListAdd(driver->inactivePciHostdevs, dev); return; + } while (pciWaitForDeviceCleanup(dev, "kvm_assigned_device") && retries) { @@ -454,7 +466,7 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) retries--; } - if (pciReAttachDevice(dev, driver->activePciHostdevs) < 0) { + if (pciReAttachDevice(dev, driver->activePciHostdevs, NULL) < 0) { virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to re-attach PCI device: %s"), err ? err->message : _("unknown error")); @@ -503,7 +515,8 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - if (pciResetDevice(dev, driver->activePciHostdevs, pcidevs) < 0) { + if (pciResetDevice(dev, driver->activePciHostdevs, + driver->inactivePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to reset PCI device: %s"), err ? err->message : _("unknown error")); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index dc40d2f..6080d38 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2029,7 +2029,8 @@ qemuDomainDetachHostPciDevice(struct qemud_driver *driver, detach->source.subsys.u.pci.function); if (pci) { activePci = pciDeviceListSteal(driver->activePciHostdevs, pci); - if (pciResetDevice(activePci, driver->activePciHostdevs, NULL)) + if (pciResetDevice(activePci, driver->activePciHostdevs, + driver->inactivePciHostdevs)) qemuReattachPciDevice(activePci, driver); else ret = -1; diff --git a/src/util/pci.c b/src/util/pci.c index 17cde81..557bd34 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1117,7 +1117,9 @@ cleanup: } int -pciDettachDevice(pciDevice *dev, pciDeviceList *activeDevs) +pciDettachDevice(pciDevice *dev, + pciDeviceList *activeDevs, + pciDeviceList *inactiveDevs) { const char *driver = pciFindStubDriver(); if (!driver) { @@ -1132,11 +1134,22 @@ pciDettachDevice(pciDevice *dev, pciDeviceList *activeDevs) return -1; } - return pciBindDeviceToStub(dev, driver); + if (pciBindDeviceToStub(dev, driver) < 0) + return -1; + + /* Add the dev into list inactiveDevs */ + if (!pciDeviceListFind(inactiveDevs, dev)) { + if (pciDeviceListAdd(inactiveDevs, dev) < 0) + return -1; + } + + return 0; } int -pciReAttachDevice(pciDevice *dev, pciDeviceList *activeDevs) +pciReAttachDevice(pciDevice *dev, + pciDeviceList *activeDevs, + pciDeviceList *inactiveDevs) { const char *driver = pciFindStubDriver(); if (!driver) { @@ -1151,7 +1164,13 @@ pciReAttachDevice(pciDevice *dev, pciDeviceList *activeDevs) return -1; } - return pciUnbindDeviceFromStub(dev, driver); + if (pciUnbindDeviceFromStub(dev, driver) < 0) + return -1; + + /* Remove the dev from list inactiveDevs */ + pciDeviceListDel(inactiveDevs, dev); + + return 0; } /* Certain hypervisors (like qemu/kvm) map the PCI bar(s) on diff --git a/src/util/pci.h b/src/util/pci.h index 5493e0a..25b5b66 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -40,8 +40,12 @@ pciDevice *pciGetDevice (unsigned domain, unsigned function); void pciFreeDevice (pciDevice *dev); const char *pciDeviceGetName (pciDevice *dev); -int pciDettachDevice (pciDevice *dev, pciDeviceList *activeDevs); -int pciReAttachDevice (pciDevice *dev, pciDeviceList *activeDevs); +int pciDettachDevice (pciDevice *dev, + pciDeviceList *activeDevs, + pciDeviceList *inactiveDevs); +int pciReAttachDevice (pciDevice *dev, + pciDeviceList *activeDevs, + pciDeviceList *inactiveDevs); int pciResetDevice (pciDevice *dev, pciDeviceList *activeDevs, pciDeviceList *inactiveDevs); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 20671c0..520ec03 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1985,7 +1985,7 @@ xenUnifiedNodeDeviceDettach (virNodeDevicePtr dev) if (!pci) return -1; - if (pciDettachDevice(pci, NULL) < 0) + if (pciDettachDevice(pci, NULL, NULL) < 0) goto out; ret = 0; @@ -2075,7 +2075,7 @@ xenUnifiedNodeDeviceReAttach (virNodeDevicePtr dev) goto out; } - if (pciReAttachDevice(pci, NULL) < 0) + if (pciReAttachDevice(pci, NULL, NULL) < 0) goto out; ret = 0; -- 1.7.7.3

1 0

[libvirt] [PATCH v2] virsh: Two new fields for command domblklist
by Osier Yang 13 Jan '12

13 Jan '12

Disk "type" and "device" are generally interesting stuffs the user who wants to known too. To not breaking the scripts which parses the output field, new options "--details" is introduced to output the two introduced fields. --- tools/virsh.c | 32 +++++++++++++++++++++++++++++--- tools/virsh.pod | 19 ++++++++++--------- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 734c55d..6f1acf6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1906,7 +1906,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_domblklist[] = { {"help", N_("list all domain blocks")}, - {"desc", N_("Get the names of block devices for a domain.")}, + {"desc", N_("Get the summary of block devices for a domain.")}, {NULL, NULL} }; @@ -1914,6 +1914,8 @@ static const vshCmdOptDef opts_domblklist[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"inactive", VSH_OT_BOOL, 0, N_("get inactive rather than running configuration")}, + {"details", VSH_OT_BOOL, 0, + N_("additionally display the type and device value")}, {NULL, 0, 0, NULL} }; @@ -1929,10 +1931,13 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) int ndisks; xmlNodePtr *disks = NULL; int i; + bool details = false; if (vshCommandOptBool(cmd, "inactive")) flags |= VIR_DOMAIN_XML_INACTIVE; + details = vshCommandOptBool(cmd, "details"); + if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -1951,14 +1956,27 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) if (ndisks < 0) goto cleanup; - vshPrint(ctl, "%-10s %s\n", _("Target"), _("Source")); + if (details) + vshPrint(ctl, "%-10s %-10s %-10s %s\n", _("Type"), + _("Device"), _("Target"), _("Source")); + else + vshPrint(ctl, "%-10s %s\n", _("Target"), _("Source")); + vshPrint(ctl, "------------------------------------------------\n"); for (i = 0; i < ndisks; i++) { + char *type; + char *device; char *target; char *source; ctxt->node = disks[i]; + + if (details) { + type = virXPathString("string(./@type)", ctxt); + device = virXPathString("string(./@device)", ctxt); + } + target = virXPathString("string(./target/@dev)", ctxt); if (!target) { vshError(ctl, "unable to query block list"); @@ -1968,7 +1986,15 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) "|./source/@dev" "|./source/@dir" "|./source/@name)", ctxt); - vshPrint(ctl, "%-10s %s\n", target, source ? source : "-"); + if (details) { + vshPrint(ctl, "%-10s %-10s %-10s %s\n", type, device, + target, source ? source : "-"); + VIR_FREE(type); + VIR_FREE(device); + } else { + vshPrint(ctl, "%-10s %s\n", target, source ? source : "-"); + } + VIR_FREE(target); VIR_FREE(source); } diff --git a/tools/virsh.pod b/tools/virsh.pod index d9ca46c..9fd786d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -512,15 +512,16 @@ to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to I<domain> (see also B<domblklist> for listing these names). -=item B<domblklist> I<domain> [I<--inactive>] - -Print a table showing the names of all block devices associated with -I<domain>, as well as the path to the source of each device. If -I<--inactive> is specified, query the block devices that will be used -on the next boot, rather than those currently in use by a running -domain. Other contexts that require a block device name (such as -I<domblkinfo> or I<snapshot-create> for disk snapshots) will accept -either target or unique source names printed by this command. +=item B<domblklist> I<domain> [I<--inactive>] [I<--details>] + +Print a table showing the brief information of all block devices +associated with I<domain>. If I<--inactive> is specified, query the +block devices that will be used on the next boot, rather than those +currently in use by a running domain. If I<--details> is specified, +disk type and device value will be printed additionally. Other +contexts that require a block device name (such as I<domblkinfo> +or I<snapshot-create> for disk snapshots) will accept either target +or unique source names printed by this command. =item B<domiflist> I<domain> [I<--inactive>] -- 1.7.7.3

2 2

[libvirt] [PATCH v2] qemu: Support copy on read for disk
by Osier Yang 13 Jan '12

13 Jan '12

The new introduced optional attribute "copy_on_read</code> controls wether to copy read backing file into the image file. The value can be either "on" or "off". Copy-on-read avoids accessing the same backing file sectors repeatedly and is useful when the backing file is over a slow network. By default copy-on-read is off. --- docs/formatdomain.html.in | 9 ++++ docs/schemas/domaincommon.rng | 11 ++++ src/conf/domain_conf.c | 24 +++++++++- src/conf/domain_conf.h | 10 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++++ tests/qemuhelptest.c | 3 +- .../qemuxml2argv-disk-copy_on_read.args | 11 ++++ .../qemuxml2argv-disk-copy_on_read.xml | 50 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ 12 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 42e23a1..3a42ebb 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1202,6 +1202,15 @@ <b>In general you should leave this option alone, unless you are very certain you know what you are doing.</b> </li> + <li> + The optional <code>copy_on_read</code> attribute controls + wether to copy read backing file into the image file. The + value can be either "on" or "off". + Copy-on-read avoids accessing the same backing file sectors + repeatedly and is useful when the backing file is over a slow + network. By default copy-on-read is off. + <span class='since'>Since 0.9.9 (QEMU and KVM only)</span> + </li> </ul> </dd> <dt><code>boot</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e93ae77..fdcbc28 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -958,6 +958,9 @@ <optional> <ref name="event_idx"/> </optional> + <optional> + <ref name="copy_on_read"/> + </optional> <empty/> </element> </define> @@ -1025,6 +1028,14 @@ </choice> </attribute> </define> + <define name="copy_on_read"> + <attribute name='copy_on_read'> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </define> <define name="controller"> <element name="controller"> <choice> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 180dd2b..c70faee 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -209,6 +209,11 @@ VIR_ENUM_IMPL(virDomainVirtioEventIdx, VIR_DOMAIN_VIRTIO_EVENT_IDX_LAST, "on", "off") +VIR_ENUM_IMPL(virDomainDiskCopyOnRead, VIR_DOMAIN_DISK_COPY_ON_READ_LAST, + "default", + "on", + "off") + VIR_ENUM_IMPL(virDomainDiskSnapshot, VIR_DOMAIN_DISK_SNAPSHOT_LAST, "default", "no", @@ -2783,6 +2788,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *iotag = NULL; char *ioeventfd = NULL; char *event_idx = NULL; + char *copy_on_read = NULL; char *devaddr = NULL; virStorageEncryptionPtr encryption = NULL; char *serial = NULL; @@ -2911,6 +2917,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, iotag = virXMLPropString(cur, "io"); ioeventfd = virXMLPropString(cur, "ioeventfd"); event_idx = virXMLPropString(cur, "event_idx"); + copy_on_read = virXMLPropString(cur, "copy_on_read"); } else if (xmlStrEqual(cur->name, BAD_CAST "auth")) { authUsername = virXMLPropString(cur, "username"); if (authUsername == NULL) { @@ -3226,6 +3233,17 @@ virDomainDiskDefParseXML(virCapsPtr caps, def->event_idx = idx; } + if (copy_on_read) { + int cor; + if ((cor = virDomainDiskCopyOnReadTypeFromString(copy_on_read)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk copy_on_read mode '%s'"), + copy_on_read); + goto error; + } + def->copy_on_read = cor; + } + if (devaddr) { if (virDomainParseLegacyDeviceAddress(devaddr, &def->info.addr.pci) < 0) { @@ -3319,6 +3337,7 @@ cleanup: VIR_FREE(iotag); VIR_FREE(ioeventfd); VIR_FREE(event_idx); + VIR_FREE(copy_on_read); VIR_FREE(devaddr); VIR_FREE(serial); virStorageEncryptionFree(encryption); @@ -9870,6 +9889,7 @@ virDomainDiskDefFormat(virBufferPtr buf, const char *iomode = virDomainDiskIoTypeToString(def->iomode); const char *ioeventfd = virDomainIoEventFdTypeToString(def->ioeventfd); const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx); + const char *copy_on_read = virDomainVirtioEventIdxTypeToString(def->copy_on_read); const char *startupPolicy = virDomainStartupPolicyTypeToString(def->startupPolicy); char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -9910,7 +9930,7 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); if (def->driverName || def->driverType || def->cachemode || - def->ioeventfd || def->event_idx) { + def->ioeventfd || def->event_idx || def->copy_on_read) { virBufferAddLit(buf, " <driver"); if (def->driverName) virBufferAsprintf(buf, " name='%s'", def->driverName); @@ -9928,6 +9948,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " ioeventfd='%s'", ioeventfd); if (def->event_idx) virBufferAsprintf(buf, " event_idx='%s'", event_idx); + if (def->copy_on_read) + virBufferAsprintf(buf, " copy_on_read='%s'", copy_on_read); virBufferAddLit(buf, "/>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3d5d4f8..bac5a87 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -308,6 +308,14 @@ enum virDomainVirtioEventIdx { VIR_DOMAIN_VIRTIO_EVENT_IDX_LAST }; +enum virDomainDiskCopyOnRead { + VIR_DOMAIN_DISK_COPY_ON_READ_DEFAULT = 0, + VIR_DOMAIN_DISK_COPY_ON_READ_ON, + VIR_DOMAIN_DISK_COPY_ON_READ_OFF, + + VIR_DOMAIN_DISK_COPY_ON_READ_LAST +}; + enum virDomainDiskSnapshot { VIR_DOMAIN_DISK_SNAPSHOT_DEFAULT = 0, VIR_DOMAIN_DISK_SNAPSHOT_NO, @@ -384,6 +392,7 @@ struct _virDomainDiskDef { int iomode; int ioeventfd; int event_idx; + int copy_on_read; int snapshot; /* enum virDomainDiskSnapshot */ int startupPolicy; /* enum virDomainStartupPolicy */ unsigned int readonly : 1; @@ -1969,6 +1978,7 @@ VIR_ENUM_DECL(virDomainDiskSecretType) VIR_ENUM_DECL(virDomainDiskSnapshot) VIR_ENUM_DECL(virDomainIoEventFd) VIR_ENUM_DECL(virDomainVirtioEventIdx) +VIR_ENUM_DECL(virDomainDiskCopyOnRead) VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainControllerModelSCSI) VIR_ENUM_DECL(virDomainControllerModelUSB) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ca4beb1..27a093c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -290,6 +290,8 @@ virDomainDeviceTypeToString; virDomainDiskBusTypeToString; virDomainDiskCacheTypeFromString; virDomainDiskCacheTypeToString; +virDomainDiskCopyOnReadTypeFromString; +virDomainDiskCopyOnReadTypeToString; virDomainDiskDefAssignAddress; virDomainDiskDefForeachPath; virDomainDiskDefFree; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6842cfe..530bbb1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -147,6 +147,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "virtio-blk-pci.scsi", "blk-sg-io", + "drive-copy-on-read", ); struct qemu_feature_flags { @@ -1026,6 +1027,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_DRIVE_READONLY); if (strstr(help, "aio=threads|native")) qemuCapsSet(flags, QEMU_CAPS_DRIVE_AIO); + if (strstr(help, "copy-on-read=on|off")) + qemuCapsSet(flags, QEMU_CAPS_DRIVE_COPY_ON_READ); } if ((p = strstr(help, "-vga")) && !strstr(help, "-std-vga")) { const char *nl = strstr(p, "\n"); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index d47177c..ee9d5ab 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -120,6 +120,7 @@ enum qemuCapsFlags { QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */ QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* support for SG_IO commands, reportedly added in 0.11 */ + QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 16ffb4c..ee51965 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1929,6 +1929,17 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, virBufferAddLit(&opt, ",cache=off"); } + if (disk->copy_on_read) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ)) { + virBufferAsprintf(&opt, ",copy-on-read=%s", + virDomainDiskCopyOnReadTypeToString(disk->copy_on_read)); + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("copy_on_read is not supported by this QEMU binary")); + goto error; + } + } + if (qemuCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON)) { const char *wpolicy = NULL, *rpolicy = NULL; diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 1ef0d9b..2b08af9 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -592,7 +592,8 @@ mymain(void) QEMU_CAPS_PCI_ROMBAR, QEMU_CAPS_NO_ACPI, QEMU_CAPS_VIRTIO_BLK_SCSI, - QEMU_CAPS_VIRTIO_BLK_SG_IO); + QEMU_CAPS_VIRTIO_BLK_SG_IO, + QEMU_CAPS_DRIVE_COPY_ON_READ); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args new file mode 100644 index 0000000..2ca586d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args @@ -0,0 +1,11 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ +-boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,copy-on-read=on \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \ +-net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml new file mode 100644 index 0000000..433c641 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml @@ -0,0 +1,50 @@ +<domain type='qemu'> + <name>test</name> + <memory>1048576</memory> + <vcpu>1</vcpu> + <os> + <type arch='x86_64' machine='pc-0.13'>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' copy_on_read='on'/> + <source file='/var/lib/libvirt/images/f14.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' unit='0'/> + </disk> + <interface type='user'> + <mac address='52:54:00:e5:48:58'/> + <model type='virtio'/> + <driver name='vhost' txmode='iothread'/> + </interface> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </controller> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <graphics type='vnc' port='5091' autoport='no' listen='127.0.0.1'/> + <video> + <model type='vga' vram='9216' heads='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d87654c..30bea37 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -439,6 +439,10 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); + DO_TEST("disk-copy_on_read", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_COPY_ON_READ, + QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE, + QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); DO_TEST("disk-snapshot", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("event_idx", false, -- 1.7.7.3

2 2

[libvirt] [PATCH] build: silence some compiler warnings from gnulib
by Eric Blake 12 Jan '12

12 Jan '12

Gnulib claims that there are some classes of warnings that are worth enabling during development, but where silencing those warnings causes code bloat that is not necessary in an optimized build. The code bloat to silence the warnings is only enabled by -Dlint. Follow the lead of coreutils in setting up -Dlint whenever full warnings are requested. * m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): Add -Dlint, and move _FORTIFY_SOURCE to config.h instead of CFLAGS. --- In particular, see this gnulib thread, where Dan Berrange complained about a warning present on a mingw cross-compile: https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00184.html m4/virt-compile-warnings.m4 | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index ba388aa..3a428c3 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -100,8 +100,13 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ gl_WARN_ADD([-Wframe-larger-than=4096]) dnl gl_WARN_ADD([-Wframe-larger-than=256]) + # Silence certain warnings in gnulib, and use improved glibc headers + AC_DEFINE([lint], [1], + [Define to 1 if the compiler is checking for lint.]) + AC_DEFINE([_FORTIFY_SOURCE], [2], + [enable compile-time and run-time bounds-checking, and some warnings]) + # Extra special flags - gl_WARN_ADD([-Wp,-D_FORTIFY_SOURCE=2]) dnl -fstack-protector stuff passes gl_WARN_ADD with gcc dnl on Mingw32, but fails when actually used case $host in -- 1.7.7.5

1 0

[libvirt] [PATCH v2 1/1] Added check for maximum number of vcpus exceeding topology limit
by Martin Kletzander 12 Jan '12

12 Jan '12

Earlier, when the number of vcpus was greater than the topology allowed, libvirt didn't raise an error and continued, resulting in running qemu with parameters making no sense. Even though qemu did not report any error itself, the number of vcpus was set to maximum allowed by the topology. --- v2: - Added check for topology specification src/conf/domain_conf.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 180dd2b..5e36270 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8010,6 +8010,14 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (def->cpu == NULL) goto error; + if (def->cpu->sockets && + def->maxvcpus > + def->cpu->sockets * def->cpu->cores * def->cpu->threads) { + virDomainReportError(VIR_ERR_XML_DETAIL, "%s", + _("Maximum CPUs greater than topology limit")); + goto error; + } + if (def->cpu->cells_cpus > def->maxvcpus) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Number of CPUs in <numa> exceeds the" -- 1.7.3.4

2 1

[libvirt] [PATCH] build: update to latest gnulib
by Eric Blake 12 Jan '12

12 Jan '12

Pick up recent gnulib improvements. * .gnulib: Update to latest. * bootstrap: Resync. * bootstrap.conf (gnulib_tool_option_extras): Adjust to bootstrap changes. * gnulib/lib/Makefile.am: Likewise. --- I'm not sure that we are desparate for any of these patches, so much as it's nice to re-sync now that 0.9.9 is out. * .gnulib 6b93d00...8bb68d3 (128): > strptime: silence gcc warnings > inet_ntop: silence gcc warning > getloadavg test: skip the test on GNU/Linux without /proc mounted > regex: Avoid link error on MSVC 9. > doc: Mention --with-tests option. > users.txt: order package names lexicographically. > maint.mk: fix description in comment > ignore-value: remove deprecated ignore_ptr function > test-init.sh: avoid a subshell > setlocale tests: Avoid test failure on Solaris 11 2011-11. > posix_spawn_file_actions_addopen: Work around Solaris 11 2011-11 bug. > posix_spawn_file_actions_adddup2: Work around Solaris 11 2011-11 bug. > posix_spawn_file_actions_addclose: Work around Solaris 11 2011-11 bug. > doc: Update for Solaris 11 2011-11. > mktime: Avoid compilation error on Solaris 11. > doc: Small fix. > autoupdate > Add lgpl-3.0 module. > select.c: indent with spaces, not TABs > autoupdate > Add ChangeLog entries for last 3 commits. > quotearg: do not use grave accent for left quote > quotearg: fall back to Unicode single quotes in UTF-8 and GB-18030 locales > quotearg: fix Wikipedia link > Fix for mingw with MSVC9. > Talk about "native Windows API", not "Woe32". > argp: Avoid crash if translator uses % characters in a translation. > doc: add ChangeLog entry for previous change > doc: C11 and C++11 are now official > uc-is-grapheme-break tests: Tweak. > test-init.sh: correct the test for diff -u > doc: fix minor quoting issues, mostly with ` > In commentary, do not use ` to quote. > Use ', not `, for quoting output. > strtoimax: Don't force a replacement on systems where intmax_t is int. > doc: Mention NetBSD bugs. > strtoumax tests: Enhance tests. > strtoimax: Work around AIX 5.1 bug. > inttypes: Modernize. > init.sh: don't waste a subshell just to redirect stderr > test-init.sh: avoid failure on HP-UX 11.00 > Tests for module 'strtoull'. > Tests for module 'strtoll'. > Tests for module 'strtoul'. > Tests for module 'strtol'. > update from texinfo > autoupdate > test-init.sh: accommodate Solaris 5.10's different diff -u output > test-posixtm: don't assume signed integer wraparound > Spell out "Windows 9x" and "Windows XP". > test-vc-list-files-cvs.sh: remove obsolete comment > autoupdate > update from texinfo > Talk about "native Windows API", not "Win32". > isatty: Support for MSVC 9. > maint.mk: remove temporary transition aid from over 1.5 years ago > init.sh: do not try to accommodate compare arguments starting with "-" > Enhance tests for module 'isatty'. > New module 'isatty'. > canonicalize: Tweak 2011-12-29 commit. > gitlog-to-changelog: describe input syntax in --help output > gitlog-to-changelog: fix typo in --help: show backslash before email @ > gitlog-to-changelog: don't malfunction when name contains %-directive > gitlog-to-changelog: Copyright-paperwork-exempt: yes == (tiny change) > test-framework-sh: init.sh: fix "make dist" failure > autoupdate > maint: update all copyright year number ranges > version-etc: update copyright year reported by --version > canonicalize: only stat() when required > doc: cover st_ino issues once; add OpenVMS etc. > same-inode: port to OpenVMS > canonicalize: fix references to stat() and lstat() > autoupdate > gitlog-to-changelog: remove a little duplication > canonicalize: add support for not resolving symlinks > autoupdate > update from texinfo > gitlog-to-changelog: do not clump multi-paragraph entries > update from texinfo > announce-gen: fix `cmd' typo in diagnostic > update from texinfo > autoupdate > test-framework-sh: distribute init.sh > autoupdate > maint: remove explicit Files: tests/init.sh; depend on test-framework-sh > test-framework-sh: add minimal tests of init.sh's compare function > test-framework-sh: new module > init.sh: do not emit simulated diff output to stderr > .gitignore: ignore gnulib.dvi and regex.info > init.sh: correct previous change > correct previous ChangeLog entry: s/set -x/set -e/ > init.sh: avoid unwarranted test failure when using "set -x" > bootstrap: fix it to honor $ACLOCAL_FLAGS once again > bootstrap: remove some now-unneeded code > ftoastr: fix typo > README-release: fix punctuation > bootstrap: correct the recent buildreq change > build: let bootstrap resort to wget for downloading .po files > * m4/stdint.m4 (gl_STDINT_H): Finish up previous change. > stdint: don't assume C++11 when compiling with g++ > alloca: protect comment from gnulib-tool > ChangeLog: fix encoding typo > localcharset: Use an absolute path in TESTS_ENVIRONMENT. > strftime-tests: also test nanoseconds > inttypes, stdint: add C++11 support > Fix ChangeLog typo in previous commit. > nonblocking tests: Fix test failure on Linux/MIPS. > argmatch: don't hard-code `' when listing valid option arguments > autoupdate > autoupdate > bootstrap: detect tools required by gnulib-tool > sethostname: Port to Windows platforms. > tests: Avoid spurious error message on platforms without mktemp program. > sethostname: Fix documentation. > gnulib-tool: Verify that the License field is present and non-empty. > sethostname tests: Fix link error on mingw. > sethostname tests: Fix compilation error on mingw. > sethostname tests: Avoid a gcc warning. > Tweak last commit. > Add a test suite for the sethostname module. > Tweak last commit. > Integrate the sethostname module into unistd > Tweak last commit. > Add a new sethostname module > Tweak last commit. > Split the HOST_NAME_MAX detection into a separate m4 macro > Fix module descriptions syntax. > stdalign: port to Clang 3.0 .gnulib | 2 +- bootstrap | 240 +++++++++++++++--------------------------------- bootstrap.conf | 3 +- gnulib/lib/Makefile.am | 11 ++- 4 files changed, 89 insertions(+), 167 deletions(-) diff --git a/.gnulib b/.gnulib index 6b93d00..8bb68d3 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 6b93d00f5410ec183e3a70ebf8e418e3b1bb0191 +Subproject commit 8bb68d37569145a772000ce8db87397529f5b3cf diff --git a/bootstrap b/bootstrap index f76db9a..66da981 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2011-08-11.17; # UTC +scriptversion=2012-01-06.07; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2011 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,10 +38,6 @@ export LC_ALL local_gl_dir=gl -# Temporary directory names. -bt='._bootmp' -bt_regex=`echo "$bt"| sed 's/\./[.]/g'` -bt2=${bt}2 me=$0 usage() { @@ -88,6 +84,9 @@ gnulib_modules= # Any gnulib files needed that are not in modules. gnulib_files= +: ${AUTOPOINT=autopoint} +: ${AUTORECONF=autoreconf} + # A function to be called to edit gnulib.mk right after it's created. # Override it via your own definition in bootstrap.conf. gnulib_mk_hook() { :; } @@ -105,6 +104,11 @@ po_download_command_format=\ "rsync --delete --exclude '*.s1' -Lrtvz \ 'translationproject.org::tp/latest/%s/' '%s'" +# Fallback for downloading .po files (if rsync fails). +po_download_command_format2=\ +"wget --mirror -nd -q -np -A.po -P '%s' \ + http://translationproject.org/latest/%s/" + extract_package_name=' /^AC_INIT(/{ /.*,.*,.*, */{ @@ -312,8 +316,8 @@ insert_vc_ignore() { pattern="$2" case $vc_ignore_file in *.gitignore) - # A .gitignore entry that does not start with `/' applies - # recursively to subdirectories, so prepend `/' to every + # A .gitignore entry that does not start with '/' applies + # recursively to subdirectories, so prepend '/' to every # .gitignore entry. pattern=`echo "$pattern" | sed s,^,/,`;; esac @@ -473,6 +477,32 @@ if test $use_libtool = 1; then find_tool LIBTOOLIZE glibtoolize libtoolize fi +# gnulib-tool requires at least automake and autoconf. +# If either is not listed, add it (with minimum version) as a prerequisite. +case $buildreq in + *automake*) ;; + *) buildreq="automake 1.9 +$buildreq" ;; +esac +case $buildreq in + *autoconf*) ;; + *) buildreq="autoconf 2.59 +$buildreq" ;; +esac + +# When we can deduce that gnulib-tool will require patch, +# and when patch is not already listed as a prerequisite, add it, too. +if test ! -d "$local_gl_dir" \ + || find "$local_gl_dir" -name '*.diff' -exec false {} +; then + : +else + case $buildreq in + *patch*) ;; + *) buildreq="patch - +$buildreq" ;; + esac +fi + if ! printf "$buildreq" | check_versions; then echo >&2 if test -f README-prereq; then @@ -583,6 +613,9 @@ download_po_files() { domain=$2 echo "$me: getting translations into $subdir for $domain..." cmd=`printf "$po_download_command_format" "$domain" "$subdir"` + eval "$cmd" && return + # Fallback to HTTP. + cmd=`printf "$po_download_command_format2" "$subdir" "$domain"` eval "$cmd" } @@ -703,56 +736,32 @@ symlink_to_dir() } } -cp_mark_as_generated() -{ - cp_src=$1 - cp_dst=$2 +# NOTE: we have to be careful to run both autopoint and libtoolize +# before gnulib-tool, since gnulib-tool is likely to provide newer +# versions of files "installed" by these two programs. +# Then, *after* gnulib-tool (see below), we have to be careful to +# run autoreconf in such a way that it does not run either of these +# two just-pre-run programs. - if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then - symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst" - elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then - symlink_to_dir $local_gl_dir "$cp_dst" - else - case $cp_dst in - *.[ch]) c1='/* '; c2=' */';; - *.texi) c1='@c '; c2= ;; - *.m4|*/Make*|Make*) c1='# ' ; c2= ;; - *) c1= ; c2= ;; - esac +# Import from gettext. +with_gettext=yes +grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ + with_gettext=no - # If the destination directory doesn't exist, create it. - # This is required at least for "lib/uniwidth/cjk.h". - dst_dir=`dirname "$cp_dst"` - test -d "$dst_dir" || mkdir -p "$dst_dir" - - if test -z "$c1"; then - cmp -s "$cp_src" "$cp_dst" || { - # Copy the file first to get proper permissions if it - # doesn't already exist. Then overwrite the copy. - echo "$me: cp -f $cp_src $cp_dst" && - rm -f "$cp_dst" && - cp "$cp_src" "$cp_dst-t" && - sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" && - mv -f "$cp_dst-t" "$cp_dst" - } - else - # Copy the file first to get proper permissions if it - # doesn't already exist. Then overwrite the copy. - cp "$cp_src" "$cp_dst-t" && - ( - echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" && - echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" && - sed "s!$bt_regex/!!g" "$cp_src" - ) > $cp_dst-t && - if cmp -s "$cp_dst-t" "$cp_dst"; then - rm -f "$cp_dst-t" - else - echo "$me: cp $cp_src $cp_dst # with edits" && - mv -f "$cp_dst-t" "$cp_dst" - fi - fi - fi -} +if test $with_gettext = yes; then + # Released autopoint has the tendency to install macros that have been + # obsoleted in current gnulib, so run this before gnulib-tool. + echo "$0: $AUTOPOINT --force" + $AUTOPOINT --force || exit +fi + +# Autoreconf runs aclocal before libtoolize, which causes spurious +# warnings if the initial aclocal is confused by the libtoolized +# (or worse out-of-date) macro directory. +if grep '^[ ]*LT_INIT' configure.ac >/dev/null; then + echo "running: $LIBTOOLIZE --copy --install" + $LIBTOOLIZE --copy --install +fi version_controlled_file() { dir=$1 @@ -771,83 +780,17 @@ version_controlled_file() { test $found = yes } -slurp() { - for dir in . `(cd $1 && find * -type d -print)`; do - copied= - sep= - for file in `ls -a $1/$dir`; do - case $file in - .|..) continue;; - # FIXME: should all file names starting with "." be ignored? - .*) continue;; - esac - test -d $1/$dir/$file && continue - for excluded_file in $excluded_files; do - test "$dir/$file" = "$excluded_file" && continue 2 - done - if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then - copied=$copied${sep}$gnulib_mk; sep=$nl - remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g" - sed "$remove_intl" $1/$dir/$file | - cmp - $dir/$gnulib_mk > /dev/null || { - echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." && - rm -f $dir/$gnulib_mk && - sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk && - gnulib_mk_hook $dir/$gnulib_mk - } - elif { test "${2+set}" = set && test -r $2/$dir/$file; } || - version_controlled_file $dir $file; then - echo "$me: $dir/$file overrides $1/$dir/$file" - else - copied=$copied$sep$file; sep=$nl - cp_mark_as_generated $1/$dir/$file $dir/$file - fi || exit - done - - for dot_ig in x $vc_ignore; do - test $dot_ig = x && continue - ig=$dir/$dot_ig - if test -n "$copied"; then - insert_vc_ignore $ig "$copied" - # If an ignored file name ends with .in.h, then also add - # the name with just ".h". Many gnulib headers are generated, - # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc. - # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed - f=`echo "$copied" | - sed ' - s/\.in\.h$/.h/ - s/\.sin$/.sed/ - s/\.y$/.c/ - s/\.gperf$/.h/ - ' - ` - insert_vc_ignore $ig "$f" - - # For files like sys_stat.in.h and sys_time.in.h, record as - # ignorable the directory we might eventually create: sys/. - f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'` - insert_vc_ignore $ig "$f" - fi - done - done -} - - -# Create boot temporary directories to import from gnulib and gettext. -rm -fr $bt $bt2 && -mkdir $bt $bt2 || exit - # Import from gnulib. gnulib_tool_options="\ --import\ --no-changelog\ - --aux-dir $bt/$build_aux\ - --doc-base $bt/$doc_base\ + --aux-dir $build_aux\ + --doc-base $doc_base\ --lib $gnulib_name\ - --m4-base $bt/$m4_base/\ - --source-base $bt/$source_base/\ - --tests-base $bt/$tests_base\ + --m4-base $m4_base/\ + --source-base $source_base/\ + --tests-base $tests_base\ --local-dir $local_gl_dir\ $gnulib_tool_option_extras\ " @@ -859,26 +802,11 @@ if test $use_libtool = 1; then fi echo "$0: $gnulib_tool $gnulib_tool_options --import ..." $gnulib_tool $gnulib_tool_options --import $gnulib_modules && -slurp $bt || exit for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file || exit done - -# Import from gettext. -with_gettext=yes -grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ - with_gettext=no - -if test $with_gettext = yes; then - echo "$0: (cd $bt2; ${AUTOPOINT-autopoint}) ..." - cp configure.ac $bt2 && - (cd $bt2 && ${AUTOPOINT-autopoint} && rm configure.ac) && - slurp $bt2 $bt || exit -fi -rm -fr $bt $bt2 || exit - # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. # The following requires GNU find 4.2.3 or newer. Considering the usual @@ -891,28 +819,12 @@ find "$m4_base" "$source_base" \ -depth $ -name '*.m4' -o -name '*.[ch]' $ \ -type l -xtype l -delete > /dev/null 2>&1 -# Reconfigure, getting other files. - -# Skip autoheader if it's not needed. -grep -E '^[ ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null || - AUTOHEADER=true - -for command in \ - libtool \ - "${ACLOCAL-aclocal} --force -I '$m4_base' $ACLOCAL_FLAGS" \ - "${AUTOCONF-autoconf} --force" \ - "${AUTOHEADER-autoheader} --force" \ - "${AUTOMAKE-automake} --add-missing --copy --force-missing" -do - if test "$command" = libtool; then - test $use_libtool = 0 \ - && continue - command="${LIBTOOLIZE-libtoolize} -c -f" - fi - echo "$0: $command ..." - eval "$command" || exit -done - +# Tell autoreconf not to invoke autopoint or libtoolize; they were run above. +echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ + "$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS" +AUTOPOINT=true LIBTOOLIZE=true \ + $AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \ + || exit 1 # Get some extra files from gnulib, overriding existing files. for file in $gnulib_extra_files; do diff --git a/bootstrap.conf b/bootstrap.conf index c352718..04c7645 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2010-2011 Red Hat, Inc. +# Copyright (C) 2010-2012 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 @@ -171,6 +171,7 @@ tests_base=gnulib/tests gnulib_tool_option_extras="\ --lgpl=2\ --with-tests\ + --makefile-name=gnulib.mk\ --avoid=pt_chown\ " local_gl_dir=gnulib/local diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am index 3445c6d..7ec8648 100644 --- a/gnulib/lib/Makefile.am +++ b/gnulib/lib/Makefile.am @@ -1,8 +1,17 @@ ## Makefile for gnulib/lib -*-Makefile-*- -## Copyright (C) 2011 Red Hat, Inc. +## Copyright (C) 2011-2012 Red Hat, Inc. ## See COPYING.LIB for the License of this software +# Initialize variables, so gnulib.mk can append to them +BUILT_SOURCES = +CLEANFILES = +EXTRA_DIST = +MOSTLYCLEANDIRS = +MOSTLYCLEANFILES = +SUFFIXES = +noinst_LTLIBRARIES = + include gnulib.mk INCLUDES = $(GETTEXT_CPPFLAGS) -- 1.7.7.5

2 2

[libvirt] ANNOUNCE: Release of libvirt-sandbox version 0.0.2
by Daniel P. Berrange 12 Jan '12

12 Jan '12

I pleased to announce the first public release of libvirt-sandbox, version 0.0.2 is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. The first release is able to run simple command line based programs. While there is some GUI support, this is mostly unreliable / non-functional at this point in time, future releases will address this properly. Some examples $ virt-sandbox -c qemu:///session /bin/date Thu Jan 12 22:30:03 GMT 2012 $ virt-sandbox -c qemu:///session /bin/cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 6 model : 2 model name : QEMU Virtual CPU version 1.0 stepping : 3 cpu MHz : 2793.084 cache size : 4096 KB fpu : yes fpu_exception : yes cpuid level : 4 wp : yes flags : fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm up rep_good nopl pni cx16 hypervisor lahf_lm bogomips : 5586.16 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: $ ./bin/virt-sandbox -c lxc:/// /bin/sh sh-4.2$ ps -axuwf USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND root 1 0.0 0.0 165436 3756 pts/0 Ss+ 22:31 0:00 libvirt-sandbox-init-lxc berrange 24 0.0 0.1 167680 4688 pts/0 S+ 22:31 0:00 libvirt-sandbox-init-common berrange 47 0.0 0.0 13852 1608 pts/1 Ss 22:31 0:00 \_ /bin/sh berrange 48 0.0 0.0 13124 996 pts/1 R+ 22:31 0:00 \_ ps -axuwf Watch this space, there is much more interesting functionality in this space that will be arriving soon... Feedback / patches / etc should be directed to the main libvirt development mailing list. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] uuid: fix off-by-one
by Eric Blake 12 Jan '12

12 Jan '12

Detected by Coverity. Although unlikely, if we are ever started with stdin closed, we could reach a situation where we open a uuid file but then fail to close it, making that file the new stdin for the rest of the process. * src/util/uuid.c (getDMISystemUUID): Allow for stdin. --- src/util/uuid.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/uuid.c b/src/util/uuid.c index 823a2b9..15ba5af 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Red Hat, Inc. + * Copyright (C) 2007-2012 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 @@ -236,7 +236,7 @@ getDMISystemUUID(char *uuid, int len) while (paths[i]) { int fd = open(paths[i], O_RDONLY); - if (fd > 0) { + if (fd >= 0) { if (saferead(fd, uuid, len) == len) { VIR_FORCE_CLOSE(fd); return 0; -- 1.7.7.5

2 2

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 12 Jan '12

12 Jan '12

Overall status: failed Start date: Thu Jan 12 2012 Start time: 18:05:01 UTC / 13:05:01 EST Build counter: 1326391501 Build timestamp: 1326391501 URL: http://builder.virt-tools.org/index.html Module: libvirt Status: failed URL: http://builder.virt-tools.org/module-libvirt.html

2 1

[libvirt] ANNOUNCE: libvirt-glib release 0.0.4
by Daniel P. Berrange 12 Jan '12

12 Jan '12

I am pleased to announce that a new release of the libvirt-glib package, version 0.0.4 is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Add support for configuring sound, serial, parallel and channel devices - Add support for newer libvirt shutdown event - Add support for setting SPICE/VNC passwords - Fix storage pool annotations - Improve docs for memory APIs - Fix problem with duplicated attributes - Many internal XML helper API cleanups/additions - Add API for retrieving list of all devices - Fix mixup between g_new0/g_slice_free - Change namespace for GVirConfig APIs (breaks ABI and API) - New APIs for save/suspend libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable, for the first few releases, we are *NOT* guaranteeing that libvirt-glib libraries are API/ABI stable. ABI stability will only be guaranteed once the bulk of the APIs have been fleshed out and proved in non-trivial application usage. We anticipate this will be within the next 6 months in order to line up with Fedora 17. Follow up comments about libvirt-glib should be directed to the regular libvir-list redhat com development list. Thanks to all the people involved in contributing to this release. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] Rsync keymaps.csv file with GTK-VNC
by Daniel P. Berrange 12 Jan '12

12 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushing under trivial rule --- src/util/keymaps.csv | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/keymaps.csv b/src/util/keymaps.csv index c447f46..98c723b 100644 --- a/src/util/keymaps.csv +++ b/src/util/keymaps.csv @@ -42,6 +42,7 @@ KEY_L,38,ANSI_L,0x25,38,75,75,38,38,15,VK_L,0x4c,38,38 KEY_SEMICOLON,39,ANSI_Semicolon,0x29,39,76,76,39,39,51,VK_OEM_1,0xba,39,39 KEY_APOSTROPHE,40,ANSI_Quote,0x27,40,82,82,40,40,52,VK_OEM_2,0xbf,40,40 KEY_GRAVE,41,ANSI_Grave,0x32,41,14,14,41,41,53,VK_OEM_3,0xc0,41,41 +KEY_SHIFT,42,Shift,0x38,42,18,18,42,42,225,VK_SHIFT,0x10,42,42 KEY_LEFTSHIFT,42,Shift,0x38,42,18,18,42,42,225,VK_LSHIFT,0xa0,42,42 KEY_BACKSLASH,43,ANSI_Backslash,0x2a,43,93,93,43,43,50,VK_OEM_5,0xdc,43,43 KEY_Z,44,ANSI_Z,0x6,44,26,26,44,44,29,VK_Z,0x5a,44,44 -- 1.7.7.5

2 3

[libvirt] [PATCH] qemu: eliminate "Ignoring open failure" message when using root-squash NFS
by Laine Stump 12 Jan '12

12 Jan '12

This eliminates the warning message reported in: https://bugzilla.redhat.com/show_bug.cgi?id=624447 It was caused by a failure to open an image file that is not accessible by root (the uid libvirtd is running as) because it's on a root-squash NFS share, owned by a different user, with permissions of 660 (or maybe 600). The solution is to re-try the open using virFileOpenAs() when appropriate. The codepath that generates the error is during qemuSetupDiskCGroup(), but the actual open() is in a lower-level generic function called from many places (virDomainDiskDefForeachPath), so some other pieces of the code were touched just to add dummy (or possibly useful) uid and gid arguments. Eliminating this warning message has the nice side effect that the requested opearation may even succeed (which in this case isn't necessary, but shouldn't hurt anything either). --- src/conf/domain_conf.c | 13 ++++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_cgroup.c | 2 ++ src/security/security_dac.c | 1 + src/security/security_selinux.c | 7 +++++++ src/security/virt-aa-helper.c | 6 +++++- 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 180dd2b..2b7ec91 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13370,6 +13370,7 @@ done: int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, bool allowProbing, bool ignoreOpenFailure, + uid_t uid, gid_t gid, virDomainDiskDefPathIterator iter, void *opaque) { @@ -13425,8 +13426,18 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, disk->src); goto cleanup; } + fd = open(path, O_RDONLY); + if ((fd < 0) && (errno == EACCES || errno == EPERM) && + (uid > 0 || gid > 0)) { + fd = virFileOpenAs(path, O_RDONLY, 0, uid, gid, VIR_FILE_OPEN_AS_UID); + if (fd < 0) { + /* open() and virFileOpenAs() have different semantics */ + errno = -fd; + fd = -1; + } + } - if ((fd = open(path, O_RDONLY)) < 0) { + if (fd < 0) { if (ignoreOpenFailure) { char ebuf[1024]; VIR_WARN("Ignoring open failure on %s: %s", path, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3d5d4f8..2ea7861 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1935,6 +1935,7 @@ typedef int (*virDomainDiskDefPathIterator)(virDomainDiskDefPtr disk, int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, bool allowProbing, bool ignoreOpenFailure, + uid_t uid, gid_t gid, virDomainDiskDefPathIterator iter, void *opaque); diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 2d970d6..a07b6cd 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -96,6 +96,7 @@ int qemuSetupDiskCgroup(struct qemud_driver *driver, return virDomainDiskDefForeachPath(disk, driver->allowDiskFormatProbing, true, + driver->user, driver->group, qemuSetupDiskPathAllow, &data); } @@ -137,6 +138,7 @@ int qemuTeardownDiskCgroup(struct qemud_driver *driver, return virDomainDiskDefForeachPath(disk, driver->allowDiskFormatProbing, true, + driver->user, driver->group, qemuTeardownDiskPathDeny, &data); } diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 2fb4a14..3e1a72f 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -186,6 +186,7 @@ virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr, return virDomainDiskDefForeachPath(disk, virSecurityManagerGetAllowDiskFormatProbing(mgr), false, + priv->user, priv->group, virSecurityDACSetSecurityFileLabel, mgr); } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index c2dceca..8c8e4f8 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -670,9 +670,16 @@ SELinuxSetSecurityImageLabel(virSecurityManagerPtr mgr, if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) return 0; + /* XXX On one hand, it would be nice to have the driver's uid:gid + * here so we could retry opens with it. On the other hand, it + * probably doesn't matter because in practice that's only useful + * for files on root-squashed NFS shares, and NFS doesn't properly + * support selinux anyway. + */ return virDomainDiskDefForeachPath(disk, allowDiskFormatProbing, true, + -1, -1, /* current process uid:gid */ SELinuxSetSecurityFileLabel, secdef); } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 4561bb9..015ef2f 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -909,10 +909,14 @@ get_files(vahControl * ctl) /* XXX passing ignoreOpenFailure = true to get back to the behavior * from before using virDomainDiskDefForeachPath. actually we should * be passing ignoreOpenFailure = false and handle open errors more - * careful than just ignoring them */ + * careful than just ignoring them. + * XXX2 - if we knew the qemu user:group here we could send it in + * so that the open could be re-tried as that user:group. + */ int ret = virDomainDiskDefForeachPath(ctl->def->disks[i], ctl->allowDiskFormatProbing, true, + -1, -1 /* current uid:gid */ add_file_path, &buf); if (ret != 0) -- 1.7.7.5

2 3

[libvirt] [PATCH] Re-write LXC controller end-of-file I/O handling yet again
by Daniel P. Berrange 12 Jan '12

12 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently the LXC controller attempts to deal with EOF on a tty by spawning a thread todo a edge triggered epoll_wait(). This avoids the normal event loop spinning on POLLHUP. There is a subtle mistake though - even after seeing POLLHUP on a master PTY, it is still perfectly possible & valid to write data to the PTY. There is a buffer that can be filled with data, even when no client is present. The second mistake is that the epoll_wait() thread was not looking for the EPOLLOUT condition, so when a new client connects to the LXC console, it had to explicitly send a character before any queued output would appear. Finally, there was in fact no need to spawn a new thread to deal with epoll_wait(). The epoll file descriptor itself can be poll()'d on normally. This patch attempts to deal with all these problems. - The blocking epoll_wait() thread is replaced by a poll on the epoll file descriptor which then does a non-blocking epoll_wait() to handle events - Even if POLLHUP is seen, we continue trying to write any pending output until getting EAGAIN from write. - Once write returns EAGAIN, we modify the epoll event mask to also look for EPOLLOUT * src/lxc/lxc_controller.c: Avoid stalled I/O upon connected to an LXC console --- src/lxc/lxc_controller.c | 210 +++++++++++++++++++++++++++++++++------------- 1 files changed, 152 insertions(+), 58 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index bb936ee..7988e79 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -736,9 +736,17 @@ struct lxcConsole { int hostWatch; int hostFd; /* PTY FD in the host OS */ bool hostClosed; + int hostEpoll; + bool hostBlocking; + int contWatch; int contFd; /* PTY FD in the container */ bool contClosed; + int contEpoll; + bool contBlocking; + + int epollWatch; + int epollFd; /* epoll FD for dealing with EOF */ size_t fromHostLen; char fromHostBuf[1024]; @@ -834,102 +842,148 @@ static void lxcConsoleUpdateWatch(struct lxcConsole *console) int hostEvents = 0; int contEvents = 0; - if (!console->hostClosed) { + if (!console->hostClosed || (!console->hostBlocking && console->fromContLen)) { if (console->fromHostLen < sizeof(console->fromHostBuf)) hostEvents |= VIR_EVENT_HANDLE_READABLE; if (console->fromContLen) hostEvents |= VIR_EVENT_HANDLE_WRITABLE; } - if (!console->contClosed) { + if (!console->contClosed || (!console->contBlocking && console->fromHostLen)) { if (console->fromContLen < sizeof(console->fromContBuf)) contEvents |= VIR_EVENT_HANDLE_READABLE; if (console->fromHostLen) contEvents |= VIR_EVENT_HANDLE_WRITABLE; } + VIR_DEBUG("Container watch %d=%d host watch %d=%d", + console->contWatch, contEvents, + console->hostWatch, hostEvents); virEventUpdateHandle(console->contWatch, contEvents); virEventUpdateHandle(console->hostWatch, hostEvents); -} + if (console->hostClosed) { + int events = EPOLLIN | EPOLLET; + if (console->hostBlocking) + events |= EPOLLOUT; -struct lxcConsoleEOFData { - struct lxcConsole *console; - int fd; -}; - + if (events != console->hostEpoll) { + struct epoll_event event; + int action = EPOLL_CTL_ADD; + if (console->hostEpoll) + action = EPOLL_CTL_MOD; -static void lxcConsoleEOFThread(void *opaque) -{ - struct lxcConsoleEOFData *data = opaque; - int ret; - int epollfd = -1; - struct epoll_event event; + VIR_DEBUG("newHostEvents=%x oldHostEvents=%x", events, console->hostEpoll); - if ((epollfd = epoll_create(2)) < 0) { - virReportSystemError(errno, "%s", - _("Unable to create epoll fd")); - goto cleanup; + event.events = events; + event.data.fd = console->hostFd; + if (epoll_ctl(console->epollFd, action, console->hostFd, &event) < 0) { + VIR_DEBUG(":fail"); + virReportSystemError(errno, "%s", + _("Unable to add epoll fd")); + quit = true; + goto cleanup; + } + console->hostEpoll = events; + VIR_DEBUG("newHostEvents=%x oldHostEvents=%x", events, console->hostEpoll); + } + } else if (console->hostEpoll) { + VIR_DEBUG("Stop epoll oldContEvents=%x", console->hostEpoll); + if (epoll_ctl(console->epollFd, EPOLL_CTL_DEL, console->hostFd, NULL) < 0) { + virReportSystemError(errno, "%s", + _("Unable to add epoll fd")); + VIR_DEBUG(":fail"); + quit = true; + goto cleanup; + } + console->hostEpoll = 0; } - event.events = EPOLLIN | EPOLLET; - event.data.fd = data->fd; - if (epoll_ctl(epollfd, EPOLL_CTL_ADD, data->fd, &event) < 0) { - virReportSystemError(errno, "%s", - _("Unable to add epoll fd")); - goto cleanup; + if (console->contClosed) { + int events = EPOLLIN | EPOLLET; + if (console->contBlocking) + events |= EPOLLOUT; + + if (events != console->contEpoll) { + struct epoll_event event; + int action = EPOLL_CTL_ADD; + if (console->contEpoll) + action = EPOLL_CTL_MOD; + + VIR_DEBUG("newContEvents=%x oldContEvents=%x", events, console->contEpoll); + + event.events = events; + event.data.fd = console->contFd; + if (epoll_ctl(console->epollFd, action, console->contFd, &event) < 0) { + virReportSystemError(errno, "%s", + _("Unable to add epoll fd")); + VIR_DEBUG(":fail"); + quit = true; + goto cleanup; + } + console->contEpoll = events; + VIR_DEBUG("newHostEvents=%x oldHostEvents=%x", events, console->contEpoll); + } + } else if (console->contEpoll) { + VIR_DEBUG("Stop epoll oldContEvents=%x", console->contEpoll); + if (epoll_ctl(console->epollFd, EPOLL_CTL_DEL, console->contFd, NULL) < 0) { + virReportSystemError(errno, "%s", + _("Unable to add epoll fd")); + VIR_DEBUG(":fail"); + quit = true; + goto cleanup; + } + console->contEpoll = 0; } +cleanup: + return; +} + - for (;;) { - ret = epoll_wait(epollfd, &event, 1, -1); +static void lxcEpollIO(int watch, int fd, int events, void *opaque) +{ + struct lxcConsole *console = opaque; + + virMutexLock(&lock); + VIR_DEBUG("IO event watch=%d fd=%d events=%d fromHost=%zu fromcont=%zu", + watch, fd, events, + console->fromHostLen, + console->fromContLen); + + while (1) { + struct epoll_event event; + int ret; + ret = epoll_wait(console->epollFd, &event, 1, 0); if (ret < 0) { if (ret == EINTR) continue; virReportSystemError(errno, "%s", _("Unable to wait on epoll")); - virMutexLock(&lock); quit = true; - virMutexUnlock(&lock); goto cleanup; } + if (ret == 0) + break; + + VIR_DEBUG("fd=%d hostFd=%d contFd=%d hostEpoll=%x contEpoll=%x", + event.data.fd, console->hostFd, console->contFd, + console->hostEpoll, console->contEpoll); + /* If we get HUP+dead PID, we just re-enable the main loop * which will see the PID has died and exit */ if ((event.events & EPOLLIN)) { - virMutexLock(&lock); - if (event.data.fd == data->console->hostFd) { - data->console->hostClosed = false; + if (event.data.fd == console->hostFd) { + console->hostClosed = false; } else { - data->console->contClosed = false; + console->contClosed = false; } - lxcConsoleUpdateWatch(data->console); - virMutexUnlock(&lock); + lxcConsoleUpdateWatch(console); break; } } cleanup: - VIR_FORCE_CLOSE(epollfd); - VIR_FREE(data); -} - -static int lxcCheckEOF(struct lxcConsole *console, int fd) -{ - struct lxcConsoleEOFData *data; - virThread thread; - - if (VIR_ALLOC(data) < 0) { - virReportOOMError(); - return -1; - } - - data->console = console; - data->fd = fd; - - if (virThreadCreate(&thread, false, lxcConsoleEOFThread, data) < 0) { - VIR_FREE(data); - return -1; - } - return 0; + virMutexUnlock(&lock); } static void lxcConsoleIO(int watch, int fd, int events, void *opaque) @@ -937,6 +991,10 @@ static void lxcConsoleIO(int watch, int fd, int events, void *opaque) struct lxcConsole *console = opaque; virMutexLock(&lock); + VIR_DEBUG("IO event watch=%d fd=%d events=%d fromHost=%zu fromcont=%zu", + watch, fd, events, + console->fromHostLen, + console->fromContLen); if (events & VIR_EVENT_HANDLE_READABLE) { char *buf; size_t *len; @@ -993,6 +1051,10 @@ static void lxcConsoleIO(int watch, int fd, int events, void *opaque) *len -= done; } else { VIR_DEBUG("Write fd %d done %d errno %d", fd, (int)done, errno); + if (watch == console->hostWatch) + console->hostBlocking = true; + else + console->contBlocking = true; } } @@ -1003,8 +1065,6 @@ static void lxcConsoleIO(int watch, int fd, int events, void *opaque) console->contClosed = true; } VIR_DEBUG("Got EOF on %d %d", watch, fd); - if (lxcCheckEOF(console, fd) < 0) - goto error; } lxcConsoleUpdateWatch(console); @@ -1103,9 +1163,32 @@ static int lxcControllerMain(int serverFd, } for (i = 0 ; i < nFds ; i++) { + consoles[i].epollFd = -1; + consoles[i].epollFd = -1; + consoles[i].hostWatch = -1; + consoles[i].contWatch = -1; + } + + for (i = 0 ; i < nFds ; i++) { consoles[i].hostFd = hostFds[i]; consoles[i].contFd = contFds[i]; + if ((consoles[i].epollFd = epoll_create(2)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to create epoll fd")); + goto cleanup; + } + + if ((consoles[i].epollWatch = virEventAddHandle(consoles[i].epollFd, + VIR_EVENT_HANDLE_READABLE, + lxcEpollIO, + &consoles[i], + NULL)) < 0) { + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to watch epoll FD")); + goto cleanup; + } + if ((consoles[i].hostWatch = virEventAddHandle(consoles[i].hostFd, VIR_EVENT_HANDLE_READABLE, lxcConsoleIO, @@ -1146,6 +1229,17 @@ cleanup: cleanup2: VIR_FORCE_CLOSE(monitor.serverFd); VIR_FORCE_CLOSE(monitor.clientFd); + + for (i = 0 ; i < nFds ; i++) { + if (consoles[i].epollWatch != -1) + virEventRemoveHandle(consoles[i].epollWatch); + VIR_FORCE_CLOSE(consoles[i].epollFd); + if (consoles[i].contWatch != -1) + virEventRemoveHandle(consoles[i].contWatch); + if (consoles[i].hostWatch != -1) + virEventRemoveHandle(consoles[i].hostWatch); + } + VIR_FREE(consoles); return rc; } -- 1.7.7.5

2 2

[libvirt] [PATCH libvirt-glib] Support setting target attributes for console & channel devices
by Daniel P. Berrange 12 Jan '12

12 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- libvirt-gconfig/libvirt-gconfig-domain-channel.c | 23 ++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-channel.h | 11 ++++++++++ libvirt-gconfig/libvirt-gconfig-domain-console.c | 12 +++++++++++ libvirt-gconfig/libvirt-gconfig-domain-console.h | 12 +++++++++++ libvirt-gconfig/libvirt-gconfig-object-private.h | 5 ++++ libvirt-gconfig/libvirt-gconfig-object.c | 15 ++++++++++++++ libvirt-gconfig/libvirt-gconfig.sym | 5 ++++ 7 files changed, 83 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-channel.c b/libvirt-gconfig/libvirt-gconfig-domain-channel.c index 02f8fe7..a4f9527 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-channel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-channel.c @@ -23,6 +23,7 @@ #include <config.h> #include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" #define GVIR_CONFIG_DOMAIN_CHANNEL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_CHANNEL, GVirConfigDomainChannelPrivate)) @@ -68,3 +69,25 @@ GVirConfigDomainChannel *gvir_config_domain_channel_new_from_xml(const gchar *xm return NULL; return GVIR_CONFIG_DOMAIN_CHANNEL(object); } + + +void gvir_config_domain_channel_set_target_type(GVirConfigDomainChannel *channel, + GVirConfigDomainChannelTargetType type) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_CHANNEL(channel)); + + gvir_config_object_add_child_with_attribute_enum(GVIR_CONFIG_OBJECT(channel), + "target", "type", + GVIR_CONFIG_TYPE_DOMAIN_CHANNEL_TARGET_TYPE, + type); +} + + +void gvir_config_domain_channel_set_target_name(GVirConfigDomainChannel *channel, + const gchar *name) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_CHANNEL(channel)); + + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(channel), + "target", "name", name); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-channel.h b/libvirt-gconfig/libvirt-gconfig-domain-channel.h index 0e48bcf..a8a3020 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-channel.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-channel.h @@ -56,12 +56,23 @@ struct _GVirConfigDomainChannelClass gpointer padding[20]; }; +typedef enum { + GVIR_CONFIG_DOMAIN_CONSOLE_TARGET_GUESTFWD, + GVIR_CONFIG_DOMAIN_CHANNEL_TARGET_VIRTIO, +} GVirConfigDomainChannelTargetType; + GType gvir_config_domain_channel_get_type(void); GVirConfigDomainChannel *gvir_config_domain_channel_new(void); GVirConfigDomainChannel *gvir_config_domain_channel_new_from_xml(const gchar *xml, GError **error); +void gvir_config_domain_channel_set_target_type(GVirConfigDomainChannel *channel, + GVirConfigDomainChannelTargetType type); +void gvir_config_domain_channel_set_target_name(GVirConfigDomainChannel *channel, + const gchar *name); + + G_END_DECLS #endif /* __LIBVIRT_GCONFIG_DOMAIN_CHANNEL_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-console.c b/libvirt-gconfig/libvirt-gconfig-domain-console.c index 03ee1a7..db97322 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-console.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-console.c @@ -23,6 +23,7 @@ #include <config.h> #include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" #define GVIR_CONFIG_DOMAIN_CONSOLE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_CONSOLE, GVirConfigDomainConsolePrivate)) @@ -68,3 +69,14 @@ GVirConfigDomainConsole *gvir_config_domain_console_new_from_xml(const gchar *xm return NULL; return GVIR_CONFIG_DOMAIN_CONSOLE(object); } + +void gvir_config_domain_console_set_target_type(GVirConfigDomainConsole *console, + GVirConfigDomainConsoleTargetType type) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_CONSOLE(console)); + + gvir_config_object_add_child_with_attribute_enum(GVIR_CONFIG_OBJECT(console), + "target", "type", + GVIR_CONFIG_TYPE_DOMAIN_CONSOLE_TARGET_TYPE, + type); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-console.h b/libvirt-gconfig/libvirt-gconfig-domain-console.h index 00e142a..1c735e9 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-console.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-console.h @@ -57,11 +57,23 @@ struct _GVirConfigDomainConsoleClass }; +typedef enum { + GVIR_CONFIG_DOMAIN_CONSOLE_TARGET_XEN, + GVIR_CONFIG_DOMAIN_CONSOLE_TARGET_SERIAL, + GVIR_CONFIG_DOMAIN_CONSOLE_TARGET_UML, + GVIR_CONFIG_DOMAIN_CONSOLE_TARGET_VIRTIO, + GVIR_CONFIG_DOMAIN_CONSOLE_TARGET_LXC, + GVIR_CONFIG_DOMAIN_CONSOLE_TARGET_OPENVZ, +} GVirConfigDomainConsoleTargetType; + GType gvir_config_domain_console_get_type(void); GVirConfigDomainConsole *gvir_config_domain_console_new(void); GVirConfigDomainConsole *gvir_config_domain_console_new_from_xml(const gchar *xml, GError **error); +void gvir_config_domain_console_set_target_type(GVirConfigDomainConsole *console, + GVirConfigDomainConsoleTargetType type); + G_END_DECLS #endif /* __LIBVIRT_GCONFIG_DOMAIN_CONSOLE_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-object-private.h b/libvirt-gconfig/libvirt-gconfig-object-private.h index 0c0c44f..6d01e26 100644 --- a/libvirt-gconfig/libvirt-gconfig-object-private.h +++ b/libvirt-gconfig/libvirt-gconfig-object-private.h @@ -59,6 +59,11 @@ void gvir_config_object_add_child_with_attribute(GVirConfigObject *object, const char *child_name, const char *attr_name, const char *attr_value); +void gvir_config_object_add_child_with_attribute_enum(GVirConfigObject *object, + const char *child_name, + const char *attr_name, + GType attr_type, + unsigned int attr_value); GVirConfigObject *gvir_config_object_replace_child(GVirConfigObject *object, const char *child_name); void gvir_config_object_replace_child_with_attribute(GVirConfigObject *object, diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index a3b7109..5645490 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -419,6 +419,21 @@ gvir_config_object_add_child_with_attribute(GVirConfigObject *object, g_object_unref(G_OBJECT(child)); } + +void gvir_config_object_add_child_with_attribute_enum(GVirConfigObject *object, + const char *child_name, + const char *attr_name, + GType attr_type, + unsigned int attr_value) +{ + GVirConfigObject *child; + + child = gvir_config_object_add_child(object, child_name); + gvir_config_object_set_attribute_with_type(child, attr_name, attr_type, attr_value, NULL); + g_object_unref(G_OBJECT(child)); +} + + G_GNUC_INTERNAL GVirConfigObject * gvir_config_object_replace_child(GVirConfigObject *object, const char *child_name) diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 7cf3c3d..1c11729 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -33,6 +33,9 @@ LIBVIRT_GCONFIG_0.0.3 { gvir_config_domain_channel_get_type; gvir_config_domain_channel_new; gvir_config_domain_channel_new_from_xml; + gvir_config_domain_channel_set_target_type; + gvir_config_domain_channel_set_target_name; + gvir_config_domain_channel_target_type_get_type; gvir_config_domain_chardev_get_type; gvir_config_domain_chardev_set_source; @@ -55,6 +58,8 @@ LIBVIRT_GCONFIG_0.0.3 { gvir_config_domain_console_get_type; gvir_config_domain_console_new; gvir_config_domain_console_new_from_xml; + gvir_config_domain_console_set_target_type; + gvir_config_domain_console_target_type_get_type; gvir_config_domain_device_get_type; -- 1.7.7.5

2 2

[libvirt] Using virtEvents in macvtap setup code
by Dirk Herrendoerfer 12 Jan '12

12 Jan '12

Hi all, I'm trying to get libvirt to re-associate lost connections when a vepa connection is lost due to a switch error, or lldpad restart. My take was to use the virtEvent infrastructure to poll for messages on a netlink socket and then restart the association if the message indicates that a link came back up. I ran into a problem, that if I start the polling netlink event from the daemon thread I would get the file events an the netlink messages, but I cannot configure the event handler because the rpc client threads and the daemon do not share the same address space. Is there a way to get file events in the VMs setup code so I can register a callback at VM initialization time to receive netlink messages and restart association if needed ? Best regards, D.Herrendoerfer <herrend at de dot ibm dot com > <d.herrendoerfer at herrendoerfer dot name>

4 4

[libvirt] [libvirt-glib] Add API to check if domain is persistent
by Zeeshan Ali (Khattak) 12 Jan '12

12 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Add a predicate and property to check if domain is persistent or not. --- libvirt-gobject/libvirt-gobject-domain.c | 29 +++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 1 + libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 967ff67..2974bb8 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -45,6 +45,7 @@ G_DEFINE_TYPE(GVirDomain, gvir_domain, G_TYPE_OBJECT); enum { PROP_0, PROP_HANDLE, + PROP_PERSISTENT, }; enum { @@ -80,6 +81,10 @@ static void gvir_domain_get_property(GObject *object, g_value_set_boxed(value, priv->handle); break; + case PROP_PERSISTENT: + g_value_set_boolean(value, gvir_domain_get_persistent (conn)); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); } @@ -156,6 +161,17 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); + g_object_class_install_property(object_class, + PROP_PERSISTENT, + g_param_spec_boolean("persistent", + "Persistent", + "If domain is persistent", + TRUE, + G_PARAM_READABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + signals[VIR_STARTED] = g_signal_new("started", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | @@ -821,3 +837,16 @@ gboolean gvir_domain_save_finish (GVirDomain *dom, return TRUE; } + +/** + * gvir_domain_get_persistent: + * @dom: the domain + * + * Returns: TRUE if domain is persistent, FALSE otherwise. + */ +gboolean gvir_domain_get_persistent(GVirDomain *dom) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + + return virDomainIsPersistent(dom->priv->handle); +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index a3649cd..20388f2 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -166,6 +166,7 @@ void gvir_domain_save_async (GVirDomain *dom, gboolean gvir_domain_save_finish (GVirDomain *dom, GAsyncResult *result, GError **err); +gboolean gvir_domain_get_persistent(GVirDomain *dom); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 0e0f34d..4c98c93 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -63,6 +63,7 @@ LIBVIRT_GOBJECT_0.0.3 { gvir_domain_get_config; gvir_domain_set_config; gvir_domain_get_info; + gvir_domain_get_persistent; gvir_domain_screenshot; gvir_domain_snapshot_get_type; -- 1.7.7.5

3 2

[libvirt] [libvirt-glib] Add gvir_domain_get_persistent()
by Zeeshan Ali (Khattak) 12 Jan '12

12 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> A predicate to check if domain is persistent or not. --- libvirt-gobject/libvirt-gobject-domain.c | 13 +++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 1 + libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 967ff67..e3d6a46 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -821,3 +821,16 @@ gboolean gvir_domain_save_finish (GVirDomain *dom, return TRUE; } + +/** + * gvir_domain_get_persistent: + * @dom: the domain + * + * Returns: TRUE if domain is persistent, FALSE otherwise. + */ +gboolean gvir_domain_get_persistent(GVirDomain *dom) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + + return virDomainIsPersistent(dom->priv->handle); +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index a3649cd..20388f2 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -166,6 +166,7 @@ void gvir_domain_save_async (GVirDomain *dom, gboolean gvir_domain_save_finish (GVirDomain *dom, GAsyncResult *result, GError **err); +gboolean gvir_domain_get_persistent(GVirDomain *dom); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 0e0f34d..4c98c93 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -63,6 +63,7 @@ LIBVIRT_GOBJECT_0.0.3 { gvir_domain_get_config; gvir_domain_set_config; gvir_domain_get_info; + gvir_domain_get_persistent; gvir_domain_screenshot; gvir_domain_snapshot_get_type; -- 1.7.7.5

1 1

[libvirt] Need your help
by Alex Jia 12 Jan '12

12 Jan '12

Hi all, I want to use the utility library in the python directory such as VIR_FREE, virTypedParameterArrayClear, or anything else from util, I studied daemon/Makefile.am then changed python/Makefile.am, for instance, to append '-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \', '-I$(top_srcdir)/src -I../src \' and '-I$(top_srcdir)/src/util \' into 'INCLUDES' section in python/Makefile.am, moreover, including util.h and memory.h in libvirt-override.c. However, I got many compilation warnings and errors, it seems my change is overwriting previous header file path. I wonder how to avoid this, could you give me some advice? Thanks in advance, Alex

1 1

[libvirt] [PATCH v2] Allow 10 chars for domain IDs & 30 chars for names in virsh list
by Daniel P. Berrange 12 Jan '12

12 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Domain IDs are at least 16 bits for most hypervisors, theoretically event 32-bits. 3 characters is clearly too small an alignment. Increase alignment to 10 characters to allow 32-bit domain IDs to display cleanly. Commonly seen with LXC where domain IDs are the process IDs by default. Also increase the 'name' field from 20 to 30 characters to cope with longer guest names which are quite common In v2: - Increase size to 10 chars - Left align ID values - Also increase name field to 30 - Increase number of '-' to compensate --- tools/virsh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f4c0063..9da906e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -944,8 +944,8 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) qsort(&names[0], maxname, sizeof(char*), namesorter); } } - vshPrintExtra(ctl, "%3s %-20s %s\n", _("Id"), _("Name"), _("State")); - vshPrintExtra(ctl, "----------------------------------\n"); + vshPrintExtra(ctl, " %-10s %-30s %s\n", _("Id"), _("Name"), _("State")); + vshPrintExtra(ctl, "----------------------------------------------------\n"); for (i = 0; i < maxid; i++) { virDomainPtr dom = virDomainLookupByID(ctl->conn, ids[i]); @@ -954,7 +954,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (!dom) continue; - vshPrint(ctl, "%3d %-20s %s\n", + vshPrint(ctl, " %-10d %-30s %s\n", virDomainGetID(dom), virDomainGetName(dom), _(vshDomainStateToString(vshDomainState(ctl, dom, NULL)))); @@ -974,7 +974,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virDomainHasManagedSaveImage(dom, 0) > 0) state = -2; - vshPrint(ctl, "%3s %-20s %s\n", + vshPrint(ctl, " %-10s %-30s %s\n", "-", names[i], state == -2 ? _("saved") : _(vshDomainStateToString(state))); -- 1.7.7.5

3 3

[libvirt] [PATCH v2 0/6] Allow minimal bandwidth guarantee
by Michal Privoznik 12 Jan '12

12 Jan '12

Since 0.9.4 release libvirt supports setting some QoS attributes on virtual bridges and/or virtual interfaces. Average and peak rate, namely. It lacks minimal guaranteed bandwidth aka 'floor' attribute, though. This patch set tries to fill that hole. However, there are some things you want to know before diving into individual patches: 1) Hierarchical shaping The whole magic hidden in here: Classes [1] can have multiple children and form a tree. A class can borrow unused bandwidth from other sibling classes up to its 'ceil'. This is done in kernel, though. Classes does not share any info among interfaces. Therefore we need to group traffic from domain interfaces so it goes over one point (a bridge). It is now obvious why this functionality is limited to VIR_DOMAIN_NET_TYPE_NETWORK only as the other bridged network type (VIR_DOMAIN_NET_TYPE_BRIDGE:) is meant to be not managed or touched by libvirt at all. This patches build that tree of classes. On network startup, a root class with one child class are created. This child is supposed to be catchment for all interfaces which will ever be plugged and don't have any 'floor'. Once we have network prepared, an interface may be plugged in. That means on a domain startup, as we create virtual devices for a domain and plug them into a bridge, we can create separate class for created interface (if it is needed = has 'floor' set). Class are distinguished by u_int16 identifier which: - needs to be unique among one bridge, obviously - we want to keep, and pass on interface unplugging 2) Network status file Because of the class ID I am mentioning above, I found myself in need of saving next free class ID among with network, so it survives daemon reboots. That's what 5th patch does actually. On interface plug event an unique class ID is taken and on successful QoS set it is stored into an interface. Having said that, domain status XML was extended to keep pair <interface alias; class id> 3) Tying interface traffic with class is done via filter [2]. Filters direct packets into a classes during which packet undergoes examination. Such filter is caller classifier. For example, filter classify packets based on their marks, src/dest ip address, port, etc. And here comes another magic trick. But not so nice as the first one. Libvirt does not know anything about guest (interface) ip address(es). The only thing that libvirt knows for sure is MAC address. But for some reason, filters refuse to use ebtables marks even if iptables marks works well. Filters, however does not support classifying by MAC address. Well, not directly. u32 filter can match any part of a packet at any offset. Offset 0 is start of IP header. And offsets can be negative :) 1: http://tldp.org/HOWTO/Traffic-Control-HOWTO/components.html#c-class 2: http://tldp.org/HOWTO/Traffic-Control-HOWTO/components.html#c-filter diff to v1: -rebased & resolved minor conflicts Michal Privoznik (6): bandwidth: add new 'floor' attribute bandwidth: Create hierarchical shaping classes bandwidth: Create (un)plug functions bandwidth: Create network (un)plug functions network: Create status files domain: Keep assigned class_id in domstatus XML daemon/libvirtd.c | 3 + docs/formatdomain.html.in | 21 +++- docs/schemas/networkcommon.rng | 5 + po/POTFILES.in | 1 + src/conf/domain_conf.c | 10 +- src/conf/domain_conf.h | 1 + src/conf/netdev_bandwidth_conf.c | 81 +++++++++++--- src/conf/netdev_bandwidth_conf.h | 3 +- src/conf/network_conf.c | 224 ++++++++++++++++++++++++++++++++------ src/conf/network_conf.h | 9 ++ src/libvirt_network.syms | 2 + src/libvirt_private.syms | 2 + src/lxc/lxc_driver.c | 3 +- src/network/bridge_driver.c | 109 +++++++++++++++++-- src/network/bridge_driver.h | 7 + src/qemu/qemu_command.c | 20 +++- src/qemu/qemu_domain.c | 66 ++++++++++- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 12 ++ src/util/virnetdevbandwidth.c | 205 +++++++++++++++++++++++++++++++++- src/util/virnetdevbandwidth.h | 19 +++- src/util/virnetdevmacvlan.c | 2 +- 22 files changed, 714 insertions(+), 93 deletions(-) -- 1.7.3.4

1 6

[libvirt] RFC: Compiling out SSL support
by Mikhail Gusarov 12 Jan '12

12 Jan '12

Hi. Attached is the RFC version of patch (against old version of libvirt) which compiles out support for SSL encryption on libvirt connections. It is meant only to provoke a discussion whether such option is deemed acceptable to libvirt, or it would be a complete waste of time to rebase this patch to current git and improve it by disabling other SSL-related functionality. The motivation behind the change: making possible to configure libvirt to rely on absolute minimum of other libraries. Resulting configuration ought to connect to local libvirt daemon through Unix sockets. -- Mikhail Gusarov Software Engineer CFEngine AS Nydalsveien 33 0484 Oslo

2 1

[libvirt] [PATCH] Allow 5 characters for domain IDs
by Daniel P. Berrange 12 Jan '12

12 Jan '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Domain IDs are at least 16 bits for most hypervisors, theoretically event 32-bits. 3 characters is clearly too small an alignment. Increase alignment to 5 characters to allow 16-bit domain IDs to display cleanly. Commonly seen with LXC where domain IDs are the process IDs by default --- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f4c0063..e3aca32 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -944,7 +944,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) qsort(&names[0], maxname, sizeof(char*), namesorter); } } - vshPrintExtra(ctl, "%3s %-20s %s\n", _("Id"), _("Name"), _("State")); + vshPrintExtra(ctl, "%5s %-20s %s\n", _("Id"), _("Name"), _("State")); vshPrintExtra(ctl, "----------------------------------\n"); for (i = 0; i < maxid; i++) { @@ -954,7 +954,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (!dom) continue; - vshPrint(ctl, "%3d %-20s %s\n", + vshPrint(ctl, "%5d %-20s %s\n", virDomainGetID(dom), virDomainGetName(dom), _(vshDomainStateToString(vshDomainState(ctl, dom, NULL)))); @@ -974,7 +974,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virDomainHasManagedSaveImage(dom, 0) > 0) state = -2; - vshPrint(ctl, "%3s %-20s %s\n", + vshPrint(ctl, "%5s %-20s %s\n", "-", names[i], state == -2 ? _("saved") : _(vshDomainStateToString(state))); -- 1.7.7.5

2 2

[libvirt] [PATCH] stream: Check for stream EOF
by Michal Privoznik 12 Jan '12

12 Jan '12

If client stream does not have any data to sink and neither received EOF, a dummy packet is sent to the daemon signalising client is ready to sink some data. However, after we added event loop to client a race may occur: Thread 1 calls virNetClientStreamRecvPacket and since no data are cached nor stream has EOF, it decides to send dummy packet to server which will sent some data in turn. However, during this decision and actual message exchange with server - Thread 2 receives last stream data from server. Therefore an EOF is set on stream and if there is a call waiting (which is not yet) it is woken up. However, Thread 1 haven't sent anything so far, so there is no call to be woken up. So this thread sent dummy packet to daemon, which ignores that as no stream is associated with such packet and therefore no reply will ever come. --- To get better image, here are logs: http://pastebin.com/BQEbu8Zh - on line 18 we decide to send dummy packet - on line 21 we enqueue EOF packet but there is no call to wake up yet - on line 24/26 the dummy packet is sent src/rpc/virnetclient.c | 37 ++++++++++++++++++++++++++++++++++--- src/rpc/virnetclient.h | 3 +++ src/rpc/virnetclientstream.c | 7 ++++++- src/rpc/virnetclientstream.h | 1 + 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 469c6a5..3ea1a8f 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1672,6 +1672,7 @@ done: */ static int virNetClientSendInternal(virNetClientPtr client, virNetMessagePtr msg, + virNetClientStreamPtr st, bool expectReply, bool nonBlock) { @@ -1711,6 +1712,15 @@ static int virNetClientSendInternal(virNetClientPtr client, goto cleanup; } + /* Other thread might have already received + * stream EOF so we don't want sent anything. + * Server won't respond anyway. + */ + if (virNetClientStreamEOF(st)) { + ret = 0; + goto cleanup; + } + if (virCondInit(&call->cond) < 0) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize condition variable")); @@ -1757,7 +1767,7 @@ cleanup: int virNetClientSendWithReply(virNetClientPtr client, virNetMessagePtr msg) { - int ret = virNetClientSendInternal(client, msg, true, false); + int ret = virNetClientSendInternal(client, msg, NULL, true, false); if (ret < 0) return -1; return 0; @@ -1777,7 +1787,7 @@ int virNetClientSendWithReply(virNetClientPtr client, int virNetClientSendNoReply(virNetClientPtr client, virNetMessagePtr msg) { - int ret = virNetClientSendInternal(client, msg, false, false); + int ret = virNetClientSendInternal(client, msg, NULL, false, false); if (ret < 0) return -1; return 0; @@ -1796,5 +1806,26 @@ int virNetClientSendNoReply(virNetClientPtr client, int virNetClientSendNonBlock(virNetClientPtr client, virNetMessagePtr msg) { - return virNetClientSendInternal(client, msg, false, true); + return virNetClientSendInternal(client, msg, NULL, false, true); +} + +/* + * @msg: a message allocated on heap or stack + * + * Send a message synchronously, and wait for the reply synchronously + * + * The caller is responsible for free'ing @msg if it was allocated + * on the heap + * + * Returns 0 on success, -1 on failure + */ +int virNetClientSendWithReplyStream(virNetClientPtr client, + virNetMessagePtr msg, + virNetClientStreamPtr st) +{ + int ret = virNetClientSendInternal(client, msg, st, true, false); + if (ret < 0) + return -1; + return 0; } + diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 61d51e1..7c30d2b 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -76,6 +76,9 @@ int virNetClientSendNoReply(virNetClientPtr client, int virNetClientSendNonBlock(virNetClientPtr client, virNetMessagePtr msg); +int virNetClientSendWithReplyStream(virNetClientPtr client, + virNetMessagePtr msg, + virNetClientStreamPtr st); # ifdef HAVE_SASL void virNetClientSetSASLSession(virNetClientPtr client, diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index a4292e7..0b3e4f5 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -408,7 +408,7 @@ int virNetClientStreamRecvPacket(virNetClientStreamPtr st, VIR_DEBUG("Dummy packet to wait for stream data"); virMutexUnlock(&st->lock); - ret = virNetClientSendWithReply(client, msg); + ret = virNetClientSendWithReplyStream(client, msg, st); virMutexLock(&st->lock); virNetMessageFree(msg); @@ -530,3 +530,8 @@ cleanup: virMutexUnlock(&st->lock); return ret; } + +bool virNetClientStreamEOF(virNetClientStreamPtr st) +{ + return st ? st->incomingEOF : false; +} diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h index 6c8d538..07a335a 100644 --- a/src/rpc/virnetclientstream.h +++ b/src/rpc/virnetclientstream.h @@ -72,5 +72,6 @@ int virNetClientStreamEventUpdateCallback(virNetClientStreamPtr st, int events); int virNetClientStreamEventRemoveCallback(virNetClientStreamPtr st); +bool virNetClientStreamEOF(virNetClientStreamPtr st); #endif /* __VIR_NET_CLIENT_STREAM_H__ */ -- 1.7.3.4

2 4

[libvirt] [PATCH 0/5 v3] Interface pools and passthrough mode
by Shradha Shah 12 Jan '12

12 Jan '12

Interface Pools and Passthrough mode: Current Method: The passthrough mode uses a macvtap direct connection to connect each guest to the network. The physical interface to be used is picked from among those listed in <interface> sub elements of the <forward> element. The current specification for <forward> extends to allow 0 or more <interface> sub-elements: Example: <forward mode='passthrough' dev='eth10'/> <interface dev='eth10'/> <interface dev='eth12'/> <interface dev='eth18'/> <interface dev='eth20'/> </forward> However with an ethernet card with 64 VF's or more, the above method gets tedious on the system. On the other hand, just parameterizing a string (eth%d) is inadequate, eg, when there are multiple non-contiguous ranges. Proposed Method: The 4 patches provided: i) Introduce a new element 'pf' to implicitly create an interface pool of all the Virtual Functions attached to the specified Physical Function. ii) Modify the networkAllocateActualDevice, networkNotifyActualDevice and networkReleaseActualDevice API to use the above mentioned interface pool in the passthrough mode. iii) Allow virsh net-dumpxml to use an option --inactive to differentiate between explicit and implicit interface pools Hence Libvirt will now support both the methods mentioned below: * Explicit interface list. App inputs: <forward mode='passthrough'> <interface dev='eth10'/> <interface dev='eth11'/> <interface dev='eth12'/> <interface dev='eth13'/> </forward> libvirt does not change XML * Automatically interface list from PF. App inputs: <forward mode='passthrough'> <pf dev='eth0'/> </forward> libvirt expands XML to be <forward mode='passthrough'> <pf dev='eth0'/> <interface dev='eth10'/> <interface dev='eth11'/> <interface dev='eth12'/> <interface dev='eth13'/> </forward> In the above case we need to differentiate between the implicit and explicit interface pool, which can be done by comparing the dumpxml from active and inactive domains. This will need the addition of the flag VIR_NETWORK_XML_INACTIVE to virNetworkGetXMLDesc(). This patch series supports the use of option --inactive with virsh net-dumpxml. Shradha Shah (5): Added function pciSysfsFile to enable access to the PCI SYSFS files. Added Function virNetDevGetVirtualFunctions Adding the element pf to network xml. Functionality to implicitly get interface pool from SR-IOV PF. Added new option to virsh net-dumpxml called --inactive docs/schemas/network.rng | 7 +++ include/libvirt/libvirt.h.in | 4 ++ src/conf/network_conf.c | 79 +++++++++++++++++++++++++++++++--- src/conf/network_conf.h | 5 ++- src/network/bridge_driver.c | 97 ++++++++++++++++++++++++++++++++--------- src/test/test_driver.c | 2 +- src/util/pci.c | 39 +++++++++++++++++ src/util/pci.h | 7 +++ src/util/virnetdev.c | 83 ++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 6 +++ src/vbox/vbox_tmpl.c | 2 +- tests/networkxml2xmltest.c | 2 +- tools/virsh.c | 13 +++++- 13 files changed, 311 insertions(+), 35 deletions(-) -- 1.7.4.4

3 21

[libvirt] [PATCH] docs: Add missed RNG schema for interface
by Osier Yang 12 Jan '12

12 Jan '12

We support <interface> of type "mcast", "server", and "client", but the RNG schema for them are missed. --- docs/schemas/domaincommon.rng | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e93ae77..2caa781 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1295,6 +1295,50 @@ <ref name="interface-options"/> </interleave> </group> + <group> + <attribute name="type"> + <value>mcast</value> + </attribute> + <element name="source"> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + </group> + <group> + <attribute name="type"> + <value>client</value> + </attribute> + <element name="source"> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + </group> + <group> + <attribute name="type"> + <value>server</value> + </attribute> + <element name="source"> + <optional> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + </optional> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + </group> </choice> </element> </define> -- 1.7.7.3

3 4

[libvirt] [PATCH] virsh: New command print summary of all virtual interfaces
by Osier Yang 12 Jan '12

12 Jan '12

Just like command "domblklist", the command extracts "type", "source", "target", "model", and "MAC" of all virtual interfaces from domain XML (live or persistent). --- tools/virsh.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 9 +++++ 2 files changed, 107 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index fb940b8..3af2fd7 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1984,6 +1984,103 @@ cleanup: } /* + * "domiflist" command + */ +static const vshCmdInfo info_domiflist[] = { + {"help", N_("list all domain virtual interfaces")}, + {"desc", N_("Get the summary of virtual interfaces for a domain.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_domiflist[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"inactive", VSH_OT_BOOL, 0, + N_("get inactive rather than running configuration")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdDomiflist(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + bool ret = false; + unsigned int flags = 0; + char *xml = NULL; + xmlDocPtr xmldoc = NULL; + xmlXPathContextPtr ctxt = NULL; + int ninterfaces; + xmlNodePtr *interfaces = NULL; + int i; + + if (vshCommandOptBool(cmd, "inactive")) + flags |= VIR_DOMAIN_XML_INACTIVE; + + if (!vshConnectionUsability(ctl, ctl->conn)) + return false; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + xml = virDomainGetXMLDesc(dom, flags); + if (!xml) + goto cleanup; + + xmldoc = virXMLParseStringCtxt(xml, _("(domain_definition)"), &ctxt); + if (!xmldoc) + goto cleanup; + + ninterfaces = virXPathNodeSet("./devices/interface", ctxt, &interfaces); + if (ninterfaces < 0) + goto cleanup; + + vshPrint(ctl, "%-10s %-10s %-10s %-11s %s\n", _("Type"), _("Source"), + _("Target"), _("Model"), _("MAC")); + vshPrint(ctl, "-------------------------------------------------------\n"); + + for (i = 0; i < ninterfaces; i++) { + char *type = NULL; + char *source = NULL; + char *target = NULL; + char *model = NULL; + char *mac = NULL; + + ctxt->node = interfaces[i]; + type = virXPathString("string(./@type)", ctxt); + + source = virXPathString("string(./source/@bridge" + "|./source/@dev" + "|./source/@network" + "|./source/@name)", ctxt); + + target = virXPathString("string(./target/@dev)", ctxt); + model = virXPathString("string(./model/@type)", ctxt); + mac = virXPathString("string(./mac/@address)", ctxt); + + vshPrint(ctl, "%-10s %-10s %-10s %-11s %-10s\n", type, + source ? source : "-", + target ? target : "-", + model ? model : "-", + mac ? mac : "-"); + + VIR_FREE(type); + VIR_FREE(source); + VIR_FREE(target); + VIR_FREE(model); + VIR_FREE(mac); + } + + ret = true; + +cleanup: + VIR_FREE(interfaces); + virDomainFree(dom); + VIR_FREE(xml); + xmlFreeDoc(xmldoc); + xmlXPathFreeContext(ctxt); + return ret; +} + +/* * "suspend" command */ static const vshCmdInfo info_suspend[] = { @@ -15595,6 +15692,7 @@ static const vshCmdDef domMonitoringCmds[] = { {"domblkstat", cmdDomblkstat, opts_domblkstat, info_domblkstat, 0}, {"domcontrol", cmdDomControl, opts_domcontrol, info_domcontrol, 0}, {"domif-getlink", cmdDomIfGetLink, opts_domif_getlink, info_domif_getlink, 0}, + {"domiflist", cmdDomiflist, opts_domiflist, info_domiflist, 0}, {"domifstat", cmdDomIfstat, opts_domifstat, info_domifstat, 0}, {"dominfo", cmdDominfo, opts_dominfo, info_dominfo, 0}, {"dommemstat", cmdDomMemStat, opts_dommemstat, info_dommemstat, 0}, diff --git a/tools/virsh.pod b/tools/virsh.pod index 1abf448..bae6a13 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -522,6 +522,15 @@ domain. Other contexts that require a block device name (such as I<domblkinfo> or I<snapshot-create> for disk snapshots) will accept either target or unique source names printed by this command. +=item B<domiflist> I<domain> [I<--inactive>] + +Print a table showing the brief information of all virtual interfaces +associated with I<domain>. If I<--inactive> is specified, query the +virtual interfaces that will be used on the next boot, rather than those +currently in use by a running domain. Other contexts that require a MAC +address of virtual interface (such as I<detach-interface> or +I<domif-setlink>) will accept the MAC address printed by this command. + =item B<blockpull> I<domain> I<path> [I<bandwidth>] Populate a disk from its backing image. Once all data from its backing -- 1.7.7.3

2 2

[libvirt] [PATCH v2] Do not generate security_model when fs driver is anything but 'path'
by Deepak C Shetty 12 Jan '12

12 Jan '12

QEMU does not support security_model for anything but 'path' fs driver type. Currently in libvirt, when security_model ( accessmode attribute) is not specified it auto-generates it irrespective of the fs driver type, which can result in a qemu error for drivers other than path. This patch ensures that the qemu cmdline is correctly generated by taking into account the fs driver type. Signed-off-by: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com> --- v2: - removed xml accessmode changes as suggested by dan. - every fs driver having a default accessmode always, retained. src/qemu/qemu_command.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ea1b763..e3a509a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2098,13 +2098,24 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, } virBufferAdd(&opt, driver, -1); - if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_MAPPED) { - virBufferAddLit(&opt, ",security_model=mapped"); - } else if(fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { - virBufferAddLit(&opt, ",security_model=passthrough"); - } else if(fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_SQUASH) { - virBufferAddLit(&opt, ",security_model=none"); + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH || + fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) { + if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_MAPPED) { + virBufferAddLit(&opt, ",security_model=mapped"); + } else if(fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { + virBufferAddLit(&opt, ",security_model=passthrough"); + } else if(fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_SQUASH) { + virBufferAddLit(&opt, ",security_model=none"); + } + } else { + /* For other fs drivers, default(passthru) should always */ + /* be supported */ + if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only supports passthrough accessmode")); + } } + virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",path=%s", fs->src);

3 5

[libvirt] [PATCH] Revert "virsh: Increase device-detach intelligence"
by Osier Yang 12 Jan '12

12 Jan '12

This reverts commit ea7182c29f185e7c1527b10fbe16dc4ba1f45a88. Conflicts are resolved. This is a temporary reverting for it introduces regression of device detaching (any device XML doesn't uses the same order as libvirt generates, or has uses decimal for some attrs (e.g. "slot") will cause the failure, as virsh compares the XML simply earlier before internal parsing). We could take the patch back when the new API for normalizing XML is ready. --- tools/virsh.c | 292 +++----------------------------------------------------- 1 files changed, 16 insertions(+), 276 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 04c1f6e..fb940b8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -60,7 +60,6 @@ #include "command.h" #include "virkeycode.h" #include "virnetdevbandwidth.h" -#include "util/bitmap.h" #include "conf/domain_conf.h" static char *progname; @@ -12571,251 +12570,6 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) return true; } -/** - * Check if n1 is superset of n2, meaning n1 contains all elements and - * attributes as n2 at least. Including children. - * @n1 first node - * @n2 second node - * returns true in case n1 covers n2, false otherwise. - */ -static bool -vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) -{ - xmlNodePtr child1, child2; - xmlAttrPtr attr; - char *prop1, *prop2; - bool found; - bool visited; - bool ret = false; - long n1_child_size, n2_child_size, n1_iter; - virBitmapPtr bitmap; - - if (!n1 && !n2) - return true; - - if (!n1 || !n2) - return false; - - if (!xmlStrEqual(n1->name, n2->name)) - return false; - - /* Iterate over n2 attributes and check if n1 contains them*/ - attr = n2->properties; - while (attr) { - if (attr->type == XML_ATTRIBUTE_NODE) { - prop1 = virXMLPropString(n1, (const char *) attr->name); - prop2 = virXMLPropString(n2, (const char *) attr->name); - if (STRNEQ_NULLABLE(prop1, prop2)) { - xmlFree(prop1); - xmlFree(prop2); - return false; - } - xmlFree(prop1); - xmlFree(prop2); - } - attr = attr->next; - } - - n1_child_size = virXMLChildElementCount(n1); - n2_child_size = virXMLChildElementCount(n2); - if (n1_child_size < 0 || n2_child_size < 0 || - n1_child_size < n2_child_size) - return false; - - if (n1_child_size == 0 && n2_child_size == 0) - return true; - - if (!(bitmap = virBitmapAlloc(n1_child_size))) { - virReportOOMError(); - return false; - } - - child2 = n2->children; - while (child2) { - if (child2->type != XML_ELEMENT_NODE) { - child2 = child2->next; - continue; - } - - child1 = n1->children; - n1_iter = 0; - found = false; - while (child1) { - if (child1->type != XML_ELEMENT_NODE) { - child1 = child1->next; - continue; - } - - if (virBitmapGetBit(bitmap, n1_iter, &visited) < 0) { - vshError(NULL, "%s", _("Bad child elements counting.")); - goto cleanup; - } - - if (visited) { - child1 = child1->next; - n1_iter++; - continue; - } - - if (xmlStrEqual(child1->name, child2->name)) { - found = true; - if (virBitmapSetBit(bitmap, n1_iter) < 0) { - vshError(NULL, "%s", _("Bad child elements counting.")); - goto cleanup; - } - - if (!vshNodeIsSuperset(child1, child2)) - goto cleanup; - - break; - } - - child1 = child1->next; - n1_iter++; - } - - if (!found) - goto cleanup; - - child2 = child2->next; - } - - ret = true; - -cleanup: - virBitmapFree(bitmap); - return ret; -} - -/** - * vshCompleteXMLFromDomain: - * @ctl vshControl for error messages printing - * @dom domain - * @oldXML device XML before - * @newXML and after completion - * - * For given domain and (probably incomplete) device XML specification try to - * find such device in domain and complete missing parts. This is however - * possible only when given device XML is sufficiently precise so it addresses - * only one device. - * - * Returns -2 when no such device exists in domain, -3 when given XML selects many - * (is too ambiguous), 0 in case of success. Otherwise returns -1. @newXML - * is touched only in case of success. - */ -static int -vshCompleteXMLFromDomain(vshControl *ctl, virDomainPtr dom, char *oldXML, - char **newXML) -{ - int funcRet = -1; - char *domXML = NULL; - xmlDocPtr domDoc = NULL, devDoc = NULL; - xmlNodePtr node = NULL; - xmlXPathContextPtr domCtxt = NULL, devCtxt = NULL; - xmlNodePtr *devices = NULL; - xmlSaveCtxtPtr sctxt = NULL; - int devices_size; - char *xpath = NULL; - xmlBufferPtr buf = NULL; - int i = 0; - int indx = -1; - - if (!(domXML = virDomainGetXMLDesc(dom, 0))) { - vshError(ctl, _("couldn't get XML description of domain %s"), - virDomainGetName(dom)); - goto cleanup; - } - - domDoc = virXMLParseStringCtxt(domXML, _("(domain_definition)"), &domCtxt); - if (!domDoc) { - vshError(ctl, _("Failed to parse domain definition xml")); - goto cleanup; - } - - devDoc = virXMLParseStringCtxt(oldXML, _("(device_definition)"), &devCtxt); - if (!devDoc) { - vshError(ctl, _("Failed to parse device definition xml")); - goto cleanup; - } - - node = xmlDocGetRootElement(devDoc); - - buf = xmlBufferCreate(); - if (!buf) { - vshError(ctl, "%s", _("out of memory")); - goto cleanup; - } - - /* Get all possible devices */ - virAsprintf(&xpath, "/domain/devices/%s", node->name); - if (!xpath) { - virReportOOMError(); - goto cleanup; - } - devices_size = virXPathNodeSet(xpath, domCtxt, &devices); - - if (devices_size < 0) { - /* error */ - vshError(ctl, "%s", _("error when selecting nodes")); - goto cleanup; - } else if (devices_size == 0) { - /* no such device */ - funcRet = -2; - goto cleanup; - } - - /* and refine */ - for (i = 0; i < devices_size; i++) { - if (vshNodeIsSuperset(devices[i], node)) { - if (indx >= 0) { - funcRet = -3; /* ambiguous */ - goto cleanup; - } - indx = i; - } - } - - if (indx < 0) { - funcRet = -2; /* no such device */ - goto cleanup; - } - - vshDebug(ctl, VSH_ERR_DEBUG, "Found device at pos %d\n", indx); - - if (newXML) { - sctxt = xmlSaveToBuffer(buf, NULL, 0); - if (!sctxt) { - vshError(ctl, "%s", _("failed to create document saving context")); - goto cleanup; - } - - xmlSaveTree(sctxt, devices[indx]); - xmlSaveClose(sctxt); - *newXML = (char *) xmlBufferContent(buf); - if (!*newXML) { - virReportOOMError(); - goto cleanup; - } - buf->content = NULL; - } - - vshDebug(ctl, VSH_ERR_DEBUG, "Old xml:\n%s\nNew xml:\n%s\n", oldXML, - newXML ? NULLSTR(*newXML) : "(null)"); - - funcRet = 0; - -cleanup: - xmlBufferFree(buf); - VIR_FREE(devices); - xmlXPathFreeContext(devCtxt); - xmlXPathFreeContext(domCtxt); - xmlFreeDoc(devDoc); - xmlFreeDoc(domDoc); - VIR_FREE(domXML); - VIR_FREE(xpath); - return funcRet; -} - /* * "detach-device" command */ @@ -12835,11 +12589,10 @@ static const vshCmdOptDef opts_detach_device[] = { static bool cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom = NULL; + virDomainPtr dom; const char *from = NULL; - char *buffer = NULL, *new_buffer = NULL; + char *buffer; int ret; - bool funcRet = false; unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -12848,50 +12601,37 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) - goto cleanup; + if (vshCommandOptString(cmd, "file", &from) <= 0) { + virDomainFree(dom); + return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) { virshReportError(ctl); - goto cleanup; - } - - ret = vshCompleteXMLFromDomain(ctl, dom, buffer, &new_buffer); - if (ret < 0) { - if (ret == -2) { - vshError(ctl, _("no such device in %s"), virDomainGetName(dom)); - } else if (ret == -3) { - vshError(ctl, "%s", _("given XML selects too many devices. " - "Please, be more specific")); - } else { - /* vshCompleteXMLFromDomain() already printed error message, - * so nothing to do here. */ - } - goto cleanup; + virDomainFree(dom); + return false; } if (vshCommandOptBool(cmd, "persistent")) { flags = VIR_DOMAIN_AFFECT_CONFIG; if (virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; - ret = virDomainDetachDeviceFlags(dom, new_buffer, flags); + ret = virDomainDetachDeviceFlags(dom, buffer, flags); } else { - ret = virDomainDetachDevice(dom, new_buffer); + ret = virDomainDetachDevice(dom, buffer); } + VIR_FREE(buffer); if (ret < 0) { vshError(ctl, _("Failed to detach device from %s"), from); - goto cleanup; + virDomainFree(dom); + return false; + } else { + vshPrint(ctl, "%s", _("Device detached successfully\n")); } - vshPrint(ctl, "%s", _("Device detached successfully\n")); - funcRet = true; - -cleanup: - VIR_FREE(new_buffer); - VIR_FREE(buffer); virDomainFree(dom); - return funcRet; + return true; } -- 1.7.7.3

2 2