- Devel - libvirt List Archives

[libvirt] Virt Tools Blog Planet (RSS feed aggregator)
by Daniel P. Berrange 14 Jun '11

14 Jun '11

The virt-tools.org website, launched last year, provides tutorials, videos, documentation, online help and roadmaps relevant to libvirt, libguestfs, gtk-vnc, spice, other related libraries, and tools or applications like virt-manager & virt-install. The site goal is to inform & assist end users, system administrators & application developers who wish to learn about the capabilities of the virt tools stack. The focus of most content is the, state of the art, Linux native KVM hypervisor, but writing about using other hypervisors using virt tools is also welcome. Today we are launching a new part of the site, the Blog Planet, to aggregate feeds from people working on virt tools related projects: http://planet.virt-tools.org/index.html The site is seeded with a mere 2 blogs thus far, and so we are looking for content from other people working on libvirt, libguestfs, gtk-vnc, spice, and any other infrastructure/tools which integrate with them. The aim is for the Blog Planet to contain content directly useful to end users, system administrators and application developers. To that end, it is desirable if your blog feed can be filtered to just include content directly related to virt tools. Any wordpress users can trivially do this by assigning either categories or tags to their posts, which the provide dedicated RSS feeds; other blog software hopefully has similar capabilities. To be included on the planet, send (off-list) your RSS feed URL and a Hackergotchi face icon (upto an absolute max of 96x96 pixels in size). 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 1/2] qemu: Scrape stdout for virtio console pty
by Cole Robinson 14 Jun '11

14 Jun '11

Currently we forget to do this and have to fallback to info chardev (which also fails, see following patch) Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_process.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1efe024..349c25a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -989,6 +989,16 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, } } + if (vm->def->console) { + virDomainChrDefPtr chr = vm->def->console; + if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY && + chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) { + if ((ret = qemuProcessExtractTTYPath(output, &offset, + &chr->source.data.file.path)) != 0) + return ret; + } + } + return 0; } -- 1.7.4.4

2 4

[libvirt] [PATCH] Add support for network filter code in LXC driver
by Daniel P. Berrange 14 Jun '11

14 Jun '11

The LXC driver networking uses veth device pairs. These can be easily hooked into the network filtering code. * src/lxc/lxc_driver.c: Add calls to setup/teardown nwfilter --- src/lxc/lxc_driver.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8eb87a2..4d14466 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -52,7 +52,7 @@ #include "hooks.h" #include "files.h" #include "fdstream.h" - +#include "domain_nwfilter.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -1027,6 +1027,8 @@ static void lxcVmCleanup(lxc_driver_t *driver, vethDelete(vm->def->nets[i]->ifname); } + virDomainConfVMNWFilterTeardown(vm); + if (driver->cgroup && virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) == 0) { virCgroupRemove(cgroup); @@ -1146,6 +1148,10 @@ static int lxcSetupInterfaces(virConnectPtr conn, if (vethInterfaceUpOrDown(parentVeth, 1) < 0) goto error_exit; + + if (def->nets[i]->filter && + virDomainConfNWFilterInstantiate(conn, def->nets[i]) < 0) + goto error_exit; } rc = 0; @@ -1538,8 +1544,10 @@ cleanup: vethDelete(veths[i]); VIR_FREE(veths[i]); } - if (rc != 0) + if (rc != 0) { VIR_FORCE_CLOSE(priv->monitor); + virDomainConfVMNWFilterTeardown(vm); + } VIR_FORCE_CLOSE(parentTty); VIR_FREE(logfile); return rc; -- 1.7.4.4

3 3

[libvirt] [PATCH 2/2] Try stdin for input when no file is specified
by Michael Williams 14 Jun '11

14 Jun '11

Modify virFileReadAll to check for redirected stdin input when no file is specified. This means that not every file argument needs to be required. Signed-off-by: Michael Williams <mspacex(a)gmail.com> --- src/util/util.c | 10 +++++- tools/virsh.c | 99 +++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 72 insertions(+), 37 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 554d68e..84b3ae5 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -445,7 +445,15 @@ int virFileReadAll(const char *path, int maxlen, char **buf) { int fd; - if (strcmp(path,"-") == 0) + if (!path) { + if (isatty(fileno(stdin))) { + virReportSystemError(EINVAL, "%s", _("Missing <file> argument")); + return -1; + } else + path = "-"; + } + + if (strcmp(path,"-") == 0) fd = fileno(stdin); else fd = open(path, O_RDONLY); diff --git a/tools/virsh.c b/tools/virsh.c index 76478dc..5b90b72 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1248,7 +1248,7 @@ static const vshCmdInfo info_create[] = { }; static const vshCmdOptDef opts_create[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML domain description")}, + {"file", VSH_OT_DATA, 0, N_("file containing an XML domain description")}, #ifndef WIN32 {"console", VSH_OT_BOOL, 0, N_("attach to console after creation")}, #endif @@ -1271,8 +1271,10 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -1308,7 +1310,7 @@ static const vshCmdInfo info_define[] = { }; static const vshCmdOptDef opts_define[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML domain description")}, + {"file", VSH_OT_DATA, 0, N_("file containing an XML domain description")}, {NULL, 0, 0, NULL} }; @@ -1323,8 +1325,10 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -3801,7 +3805,7 @@ static const vshCmdInfo info_domxmlfromnative[] = { static const vshCmdOptDef opts_domxmlfromnative[] = { {"format", VSH_OT_DATA, VSH_OFLAG_REQ, N_("source config data format")}, - {"config", VSH_OT_DATA, VSH_OFLAG_REQ, N_("config data file to import from")}, + {"config", VSH_OT_DATA, 0, N_("config data file to import from")}, {NULL, 0, 0, NULL} }; @@ -3847,7 +3851,7 @@ static const vshCmdInfo info_domxmltonative[] = { static const vshCmdOptDef opts_domxmltonative[] = { {"format", VSH_OT_DATA, VSH_OFLAG_REQ, N_("target config data type format")}, - {"xml", VSH_OT_DATA, VSH_OFLAG_REQ, N_("xml data file to export from")}, + {"xml", VSH_OT_DATA, 0, N_("xml data file to export from")}, {NULL, 0, 0, NULL} }; @@ -4447,8 +4451,10 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -4478,7 +4484,7 @@ static const vshCmdInfo info_network_define[] = { }; static const vshCmdOptDef opts_network_define[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML network description")}, + {"file", VSH_OT_DATA, 0, N_("file containing an XML network description")}, {NULL, 0, 0, NULL} }; @@ -5249,7 +5255,7 @@ static const vshCmdInfo info_interface_define[] = { }; static const vshCmdOptDef opts_interface_define[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML interface description")}, + {"file", VSH_OT_DATA, 0, N_("file containing an XML interface description")}, {NULL, 0, 0, NULL} }; @@ -5264,8 +5270,10 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -5494,7 +5502,7 @@ static const vshCmdInfo info_nwfilter_define[] = { }; static const vshCmdOptDef opts_nwfilter_define[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML network filter description")}, + {"file", VSH_OT_DATA, 0, N_("file containing an XML network filter description")}, {NULL, 0, 0, NULL} }; @@ -5509,8 +5517,10 @@ cmdNWFilterDefine(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -5832,7 +5842,7 @@ static const vshCmdInfo info_pool_create[] = { }; static const vshCmdOptDef opts_pool_create[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, + {"file", VSH_OT_DATA, 0, N_("file containing an XML pool description")}, {NULL, 0, 0, NULL} }; @@ -5848,8 +5858,10 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -5882,7 +5894,7 @@ static const vshCmdInfo info_node_device_create[] = { }; static const vshCmdOptDef opts_node_device_create[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, + {"file", VSH_OT_DATA, 0, N_("file containing an XML description of the device")}, {NULL, 0, 0, NULL} }; @@ -5898,8 +5910,10 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -6092,7 +6106,7 @@ static const vshCmdInfo info_pool_define[] = { }; static const vshCmdOptDef opts_pool_define[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML pool description")}, + {"file", VSH_OT_DATA, 0, N_("file containing an XML pool description")}, {NULL, 0, 0, NULL} }; @@ -6107,8 +6121,10 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -7338,7 +7354,7 @@ static const vshCmdInfo info_vol_create[] = { static const vshCmdOptDef opts_vol_create[] = { {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name")}, - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML vol description")}, + {"file", VSH_OT_DATA, 0, N_("file containing an XML vol description")}, {NULL, 0, 0, NULL} }; @@ -7358,7 +7374,8 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) VSH_BYNAME))) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) { + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); virStoragePoolFree(pool); return false; } @@ -7395,7 +7412,7 @@ static const vshCmdInfo info_vol_create_from[] = { static const vshCmdOptDef opts_vol_create_from[] = { {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name")}, - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML vol description")}, + {"file", VSH_OT_DATA, 0, N_("file containing an XML vol description")}, {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("input vol name or key")}, {"inputpool", VSH_OT_STRING, 0, N_("pool name or uuid of the input volume's pool")}, {NULL, 0, 0, NULL} @@ -7416,7 +7433,8 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) if (!(pool = vshCommandOptPoolBy(ctl, cmd, "pool", NULL, VSH_BYNAME))) goto cleanup; - if (vshCommandOptString(cmd, "file", &from) <= 0) { + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); goto cleanup; } @@ -7570,7 +7588,7 @@ static const vshCmdInfo info_vol_upload[] = { static const vshCmdOptDef opts_vol_upload[] = { {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")}, - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file")}, + {"file", VSH_OT_DATA, 0, N_("file")}, {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")}, {"offset", VSH_OT_INT, 0, N_("volume offset to upload to") }, {"length", VSH_OT_INT, 0, N_("amount of data to upload") }, @@ -7670,7 +7688,7 @@ static const vshCmdInfo info_vol_download[] = { static const vshCmdOptDef opts_vol_download[] = { {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")}, - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file")}, + {"file", VSH_OT_DATA, 0, N_("file")}, {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")}, {"offset", VSH_OT_INT, 0, N_("volume offset to download from") }, {"length", VSH_OT_INT, 0, N_("amount of data to download") }, @@ -8380,7 +8398,7 @@ static const vshCmdInfo info_secret_define[] = { }; static const vshCmdOptDef opts_secret_define[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing secret attributes in XML")}, + {"file", VSH_OT_DATA, 0, N_("file containing secret attributes in XML")}, {NULL, 0, 0, NULL} }; @@ -8395,8 +8413,10 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -9325,7 +9345,7 @@ static const vshCmdInfo info_attach_device[] = { static const vshCmdOptDef opts_attach_device[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("XML file")}, + {"file", VSH_OT_DATA, 0, N_("XML file")}, {"persistent", VSH_OT_BOOL, 0, N_("persist device attachment")}, {NULL, 0, 0, NULL} }; @@ -9345,7 +9365,8 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) { + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); virDomainFree(dom); return false; } @@ -9390,7 +9411,7 @@ static const vshCmdInfo info_detach_device[] = { static const vshCmdOptDef opts_detach_device[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("XML file")}, + {"file", VSH_OT_DATA, 0, N_("XML file")}, {"persistent", VSH_OT_BOOL, 0, N_("persist device detachment")}, {NULL, 0, 0, NULL} }; @@ -9410,7 +9431,8 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) { + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); virDomainFree(dom); return false; } @@ -9455,7 +9477,7 @@ static const vshCmdInfo info_update_device[] = { static const vshCmdOptDef opts_update_device[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("XML file")}, + {"file", VSH_OT_DATA, 0, N_("XML file")}, {"persistent", VSH_OT_BOOL, 0, N_("persist device update")}, {"force", VSH_OT_BOOL, 0, N_("force device update")}, {NULL, 0, 0, NULL} @@ -9476,7 +9498,8 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) { + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); virDomainFree(dom); return false; } @@ -10042,7 +10065,7 @@ static const vshCmdInfo info_cpu_compare[] = { }; static const vshCmdOptDef opts_cpu_compare[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML CPU description")}, + {"file", VSH_OT_DATA, 0, N_("file containing an XML CPU description")}, {NULL, 0, 0, NULL} }; @@ -10057,8 +10080,10 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; @@ -10104,7 +10129,7 @@ static const vshCmdInfo info_cpu_baseline[] = { }; static const vshCmdOptDef opts_cpu_baseline[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing XML CPU descriptions")}, + {"file", VSH_OT_DATA, 0, N_("file containing XML CPU descriptions")}, {NULL, 0, 0, NULL} }; @@ -10128,8 +10153,10 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) + if (vshCommandOptString(cmd, "file", &from) < 0) { + vshError(ctl, "%s", _("malformed xml argument")); return false; + } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; -- 1.7.3.4

2 3

[libvirt] [PATCH v4 0/5] Add TXT record and hosts support for DNS service and dnsmasq command-line regression testing
by Michal Novotny 14 Jun '11

14 Jun '11

Hi, this is the patch to introduce the TXT record and DNS hosts support for the DNS service on the virtual network. This can be defined using the txt-record subelement in the dns element of the network XML description. The definition of TXT record names containing spaces is rejected with the error message that TXT record names in DNS doesn't support spaces. Also, regression testing for the dnsmasq command line has been added to test whether the dnsmasq command-line is correct or not. The new XML definition syntax is: <dns> <txt name="example" value="example value" /> <host ip='192.168.122.1'> <hostname>gateway</hostname> <hostname>host</hostname> </host> </dns> Where multiple host elements can be defined to put the aliases. The <dns> element have to be present on the <ip> level, i.e. one level upper than it was in version 2 of the patch since the definition affects all the IP addresses on the network. The patch series has been tested for the configuration and it was working fine and also RelaxNG schema with the tests have been both altered to add test cases to test those patches. This is the new version for latest libvirt codebase so please review the patchset. Thanks, Michal Signed-off-by: Michal Novotny <minovotn(a)redhat.com> Michal Novotny (5): Add TXT record support for virtual DNS service Network: Add regression tests for the command-line arguments Network: Move dnsmasqContext creation to networkSaveDnsmasqHostsfile() Network: Add additional hosts internal infrastructure Network: Add support for DNS hosts definition to the network XML docs/formatnetwork.html.in | 31 +++ docs/schemas/network.rng | 21 ++ src/Makefile.am | 11 +- src/conf/network_conf.c | 212 +++++++++++++++ src/conf/network_conf.h | 25 ++ src/libvirt_network.syms | 6 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 118 ++++++--- src/network/bridge_driver.h | 3 + src/util/dnsmasq.c | 285 ++++++++++++++++++-- src/util/dnsmasq.h | 22 ++- tests/Makefile.am | 10 + tests/networkxml2argvdata/isolated-network.argv | 1 + tests/networkxml2argvdata/isolated-network.xml | 11 + .../nat-network-dns-txt-record.argv | 1 + .../nat-network-dns-txt-record.xml | 24 ++ tests/networkxml2argvdata/nat-network.argv | 1 + tests/networkxml2argvdata/nat-network.xml | 21 ++ tests/networkxml2argvdata/netboot-network.argv | 1 + tests/networkxml2argvdata/netboot-network.xml | 14 + .../networkxml2argvdata/netboot-proxy-network.argv | 1 + .../networkxml2argvdata/netboot-proxy-network.xml | 13 + tests/networkxml2argvdata/routed-network.argv | 1 + tests/networkxml2argvdata/routed-network.xml | 9 + tests/networkxml2argvtest.c | 100 +++++++ .../nat-network-dns-txt-record.xml | 24 ++ .../nat-network-dns-txt-record.xml | 24 ++ tests/networkxml2xmltest.c | 2 + 28 files changed, 941 insertions(+), 52 deletions(-) create mode 100644 src/libvirt_network.syms create mode 100644 tests/networkxml2argvdata/isolated-network.argv create mode 100644 tests/networkxml2argvdata/isolated-network.xml create mode 100644 tests/networkxml2argvdata/nat-network-dns-txt-record.argv create mode 100644 tests/networkxml2argvdata/nat-network-dns-txt-record.xml create mode 100644 tests/networkxml2argvdata/nat-network.argv create mode 100644 tests/networkxml2argvdata/nat-network.xml create mode 100644 tests/networkxml2argvdata/netboot-network.argv create mode 100644 tests/networkxml2argvdata/netboot-network.xml create mode 100644 tests/networkxml2argvdata/netboot-proxy-network.argv create mode 100644 tests/networkxml2argvdata/netboot-proxy-network.xml create mode 100644 tests/networkxml2argvdata/routed-network.argv create mode 100644 tests/networkxml2argvdata/routed-network.xml create mode 100644 tests/networkxml2argvtest.c create mode 100644 tests/networkxml2xmlin/nat-network-dns-txt-record.xml create mode 100644 tests/networkxml2xmlout/nat-network-dns-txt-record.xml -- 1.7.3.2

4 16

[libvirt] Test failures
by Guido Günther 14 Jun '11

14 Jun '11

Hi, I'm seeing spurious test failures of test-nonblocking-pipe.sh on several of Debian's autobuilders, e.g.: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=mipsel&ver=0.9.… Since I can't reproduce this locally I wonder if somebody else is seeing this? Cheers, -- Guido

2 1

[libvirt] RFC (v2): Add virDomainBlockPull API family to libvirt
by Adam Litke 14 Jun '11

14 Jun '11

Changes since V1: - Rebased to incorporate changes to generator and removal of static driver structure initializers - Other small fixups suggested by Matthias Bolte To help speed the provisioning process for large domains, new QED disks are created with backing to a template image. These disks are configured with copy on read such that blocks that are read from the backing file are copied to the new disk. This reduces I/O over a potentially costly path to the backing image. In such a configuration, there is a desire to remove the dependency on the backing image as the domain runs. To accomplish this, qemu will provide an interface to perform sequential copy on read operations during normal VM operation. Once all data has been copied, the disk image's link to the backing file is removed. The virDomainBlockPull API family brings this functionality to libvirt. virDomainBlockPullAll() instructs the hypervisor to stream the entire device in the background. Progress of this operation can be checked with the function virDomainBlockPullInfo(). An ongoing stream can be cancelled with virDomainBlockPullAbort(). If a more controlled IO rate is desired, virDomainBlockPull() can be used to perform a single increment of IO. Subsequent calls to this function will automatically stream the appropriate next increment until the disk has been fully populated. An event (VIR_DOMAIN_EVENT_ID_BLOCK_PULL) will be emitted when a disk has been fully populated or if a BlockPullAll() operation was terminated due to an error. This event is useful to avoid polling on virDomainBlockPullInfo() for completion and could also be used by the security driver to revoke access to the backing file when it is no longer needed. Note: I am sending this series out now (even though image streaming is not quite committed to qemu upstream) because I want to start the review process. At this stage, I expect only minor changes to the qemu implementation. make check: PASS make syntax-check: PASS make -C tests valgrind: PASS I am testing this API with Python Unittest (see the last patch). [PATCH 1/8] Add new API virDomainBlockPull* to headers [PATCH 2/8] virDomainBlockPull: Implement the main entry points [PATCH 3/8] Add virDomainBlockPull support to the remote driver [PATCH 4/8] Implement virDomainBlockPull for the qemu driver [PATCH 5/8] Enable the virDomainBlockPull API in virsh [PATCH 6/8] Enable virDomainBlockPull in the python API. [PATCH 7/8] Asynchronous event for BlockPull completion [PATCH 8/8] test: Python Unittests for DomainBlockPull API

2 11

[libvirt] [PATCH v2] virsh: Add daemon version reporting
by Michal Prívozník 14 Jun '11

14 Jun '11

From: Michal Privoznik <mprivozn(a)redhat.com> 'virsh version' might report against which version of libvirtd is running. --- diff to v1: - added 'daemon' switch - don't fail when no deamon version is available tools/virsh.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 123781f..56405c0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8658,6 +8658,10 @@ static const vshCmdInfo info_version[] = { {NULL, NULL} }; +static const vshCmdOptDef opts_version[] = { + {"daemon", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("report daemon version too")}, + {NULL, 0, 0, NULL} +}; static bool cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) @@ -8667,6 +8671,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) unsigned long libVersion; unsigned long includeVersion; unsigned long apiVersion; + unsigned long daemonVersion; int ret; unsigned int major; unsigned int minor; @@ -8725,6 +8730,21 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, _("Running hypervisor: %s %d.%d.%d\n"), hvType, major, minor, rel); } + + if (vshCommandOptBool(cmd, "daemon")) { + ret = virConnectGetLibVersion(ctl->conn, &daemonVersion); + if (ret < 0) { + vshError(ctl, "%s", _("failed to get the daemon version")); + } else { + major = daemonVersion / 1000000; + daemonVersion %= 1000000; + minor = daemonVersion / 1000; + rel = daemonVersion % 1000; + vshPrint(ctl, _("Running against daemon: %d.%d.%d\n"), + major, minor, rel); + } + } + return true; } @@ -11148,7 +11168,7 @@ static const vshCmdDef domManagementCmds[] = { {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount, 0}, {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo, 0}, {"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin, 0}, - {"version", cmdVersion, NULL, info_version, 0}, + {"version", cmdVersion, opts_version, info_version, 0}, {"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay, 0}, {NULL, NULL, NULL, NULL, 0} }; -- 1.7.5.rc3

3 2

[libvirt] [PATCH] Split out dlopen detection
by Guido Günther 14 Jun '11

14 Jun '11

since it's needed for the lock manager too. Fixes linking on non intel architectures. See e.g. https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=mips&ver=0.9.2-… O.k. to apply? Cheers, -- Guido --- configure.ac | 44 ++++++++++++++++++++++++++------------------ src/Makefile.am | 2 ++ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 985b8c2..ca6ba67 100644 --- a/configure.ac +++ b/configure.ac @@ -2130,6 +2130,28 @@ esac AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != ""]) +# Check for dlopen needed for the locking manager and driver-modules +DLOPEN_CFLAGS= +DLOPEN_LIBS= +old_cflags="$CFLAGS" +old_libs="$LIBS" +have_dlopen="yes" +AC_CHECK_HEADER([dlfcn.h],[],[have_dlopen="no"]) +AC_SEARCH_LIBS([dlopen], [dl], [], [have_dlopen="no"]) +CFLAGS="$old_cflags" +LIBS="$old_libs" + +if test "$have_dlopen" != "no"; then + case $ac_cv_search_dlopen in + no*) DLOPEN_LIBS= ;; + *) DLOPEN_LIBS=$ac_cv_search_dlopen ;; + esac +fi +AM_CONDITIONAL([HAVE_DLOPEN], [test "$have_dlopen" != "no"]) +AC_SUBST([DLOPEN_CFLAGS]) +AC_SUBST([DLOPEN_LIBS]) + + dnl Driver-Modules library AC_ARG_WITH([driver-modules], AC_HELP_STRING([--with-driver-modules], [build drivers as loadable modules @<:@default=no@:>@]), @@ -2137,30 +2159,16 @@ AC_ARG_WITH([driver-modules], [with_driver_modules=no]) DRIVER_MODULE_CFLAGS= -DRIVER_MODULE_LIBS= if test "x$with_driver_modules" = "xyes" ; then - old_cflags="$CFLAGS" - old_libs="$LIBS" - fail=0 - AC_CHECK_HEADER([dlfcn.h],[],[fail=1]) - AC_SEARCH_LIBS([dlopen], [dl], [], [fail=1]) - test $fail = 1 && + test $have_dlopen != "yes" && AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driver modules]) - - CFLAGS="$old_cflags" - LIBS="$old_libs" fi if test "$with_driver_modules" = "yes"; then DRIVER_MODULE_CFLAGS="-export-dynamic" - case $ac_cv_search_dlopen in - no*) DRIVER_MODULE_LIBS= ;; - *) DRIVER_MODULE_LIBS=$ac_cv_search_dlopen ;; - esac AC_DEFINE_UNQUOTED([WITH_DRIVER_MODULES], 1, [whether to build drivers as modules]) fi AM_CONDITIONAL([WITH_DRIVER_MODULES], [test "$with_driver_modules" != "no"]) AC_SUBST([DRIVER_MODULE_CFLAGS]) -AC_SUBST([DRIVER_MODULE_LIBS]) # Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether @@ -2457,10 +2465,10 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([ SELinux: $with_secdriver_selinux]) AC_MSG_NOTICE([AppArmor: $with_secdriver_apparmor]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Driver Loadable Modules]) +AC_MSG_NOTICE([Driver Loadable Modules / Dlopen]) AC_MSG_NOTICE([]) -if test "$with_driver_modules" != "no" ; then -AC_MSG_NOTICE([ dlopen: $DRIVER_MODULE_CFLAGS $DRIVER_MODULE_LIBS]) +if test "$have_dlopen" != "no" ; then +AC_MSG_NOTICE([ dlopen: $DRIVER_MODULE_CFLAGS $DLOPEN_CFLAGS $DLOPEN_LIBS]) else AC_MSG_NOTICE([ dlopen: no]) fi diff --git a/src/Makefile.am b/src/Makefile.am index 3612a24..a6d6a1e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ INCLUDES = \ -I@top_srcdir@/src/util \ -I@top_srcdir@/include \ $(DRIVER_MODULE_CFLAGS) \ + $(DLOPEN_CFLAGS) \ $(LIBXML_CFLAGS) \ $(WARN_CFLAGS) \ $(LOCK_CHECKING_CFLAGS) \ @@ -1141,6 +1142,7 @@ libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \ libvirt_la_BUILT_LIBADD += ../gnulib/lib/libgnu.la libvirt_la_LIBADD += $(LIBXML_LIBS) \ $(DRIVER_MODULE_LIBS) \ + $(DLOPEN_LIBS) \ $(CYGWIN_EXTRA_LIBADD) libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) # Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we -- 1.7.5.3

2 2

[libvirt] [PATCH] nodeinfo: remove superflous braces
by Guido Günther 14 Jun '11

14 Jun '11

that break compilation on non intel architectures: mips: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=mips&ver=0.9.2-… powerpc: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=powerpc&ver=0.9… s390: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=s390&ver=0.9.2-… sparc: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=sparc&ver=0.9.2… O.k. to apply? Cheers, -- Guido --- src/nodeinfo.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index f55c83e..1fe6ec9 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -248,7 +248,6 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, && (*p == '\0' || c_isspace(*p)) && id > nodeinfo->cores) nodeinfo->cores = id; - } # elif defined(__powerpc__) || \ defined(__powerpc64__) } else if (STRPREFIX(buf, "clock")) { @@ -266,7 +265,6 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, /* Accept trailing fractional part. */ && (*p == '\0' || *p == '.' || c_isspace(*p))) nodeinfo->mhz = ui; - } # elif defined(__s390__) || \ defined(__s390x__) } else if (STRPREFIX(buf, "# processors")) { @@ -289,10 +287,10 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, * and parsed in next iteration, because it is not in expected * format and thus lead to error. */ break; - } # else # warning Parser for /proc/cpuinfo needs to be adapted for your architecture # endif + } } if (!nodeinfo->cpus) { -- 1.7.5.3

2 2