- Devel - libvirt List Archives

[libvirt] [PATCH 6/7] Add sysinfo/smbios support to the QEmu driver
by Daniel Veillard 03 Nov '10

03 Nov '10

The patch is based on the possiblity in the QEmu command line to add -smbios options allowing to override the default values picked by QEmu. We need to detect this first from QEmu help output. If the domain is defined with smbios to be inherited from host then we pass the values coming from the Host own SMBIOS, but if the domain is defined with smbios to come from sysinfo, we use the ones coming from the domain definition. * src/qemu/qemu_conf.h: add the QEMUD_CMD_FLAG_SMBIOS_TYPE enum value * src/qemu/qemu_conf.c: scan the help output for the smbios support, and if available add support based on the domain definitions, and host data * tests/qemuhelptest.c: add the new enum in the outputs Signed-off-by: Daniel Veillard <veillard(a)redhat.com> --- src/qemu/qemu_conf.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 3 +- tests/qemuhelptest.c | 15 ++++-- 3 files changed, 129 insertions(+), 6 deletions(-)

2 2

[libvirt] [PATCH 4/7] Add a sysinfo util module and read host info API
by Daniel Veillard 03 Nov '10

03 Nov '10

Move existing routines about virSysinfoDef to an util module, add a new entry point virSysinfoRead() to read the host values with dmidecode * src/conf/domain_conf.c src/conf/domain_conf.h src/util/sysinfo.c src/util/sysinfo.h: move to a new module, add virSysinfoRead() * src/Makefile.am: handle the new module build * src/libvirt_private.syms: new internal symbols * include/libvirt/virterror.h src/util/virterror.c: defined a new error code for that module Signed-off-by: Daniel Veillard <veillard(a)redhat.com> --- include/libvirt/virterror.h | 3 +- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 19 ---- src/conf/domain_conf.h | 25 +---- src/libvirt_private.syms | 5 + src/util/sysinfo.c | 250 +++++++++++++++++++++++++++++++++++++++++++ src/util/sysinfo.h | 58 ++++++++++ src/util/virterror.c | 3 + 9 files changed, 321 insertions(+), 44 deletions(-) create mode 100644 src/util/sysinfo.c create mode 100644 src/util/sysinfo.h

2 2

[libvirt] [PATCH 2/7] Sysinfo parsing and saving to/from configuration files
by Daniel Veillard 03 Nov '10

03 Nov '10

* src/conf/domain_conf.h: defines a new internal type added to the domain structure * src/conf/domain_conf.c: parsing and serialization of that new type Signed-off-by: Daniel Veillard <veillard(a)redhat.com> --- src/conf/domain_conf.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 26 +++++++ 2 files changed, 217 insertions(+), 1 deletions(-)

2 2

[libvirt] [PATCH] macvtap: libvirtd forgot macvtap device name during a shutdown/restart cycle
by Stefan Berger 03 Nov '10

03 Nov '10

During a shutdown/restart cycle libvirtd forgot the macvtap device name that it had created on behalf of a VM so that a stale macvtap device remained on the host when the VM terminated. Libvirtd has to actively tear down a macvtap device and it uses its name for identifying which device to tear down. The solution is to not blank out the <target dev='...'/> completely, but only blank it out on VMs that are not active. So, if a VM is active, the device name makes it into the XML and is also being parsed. If a VM is not active, the device name is discarded. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/domain_conf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -2343,7 +2343,8 @@ virDomainNetDefParseXML(virCapsPtr caps, def->data.direct.linkdev = dev; dev = NULL; - VIR_FREE(ifname); + if ((flags & VIR_DOMAIN_XML_INACTIVE)) + VIR_FREE(ifname); break; @@ -5801,6 +5802,8 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); virVirtualPortProfileFormat(buf, &def->data.direct.virtPortProfile, " "); + if ((flags & VIR_DOMAIN_XML_INACTIVE)) + VIR_FREE(def->ifname); break; case VIR_DOMAIN_NET_TYPE_USER:

2 6

[libvirt] [PATCH 1/7] Sysinfo extension to relax-ng schemas
by Daniel Veillard 03 Nov '10

03 Nov '10

Currently includes a subset of the SMBIOS strings set Signed-off-by: Daniel Veillard <veillard(a)redhat.com> --- docs/schemas/domain.rng | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-)

2 2

[libvirt] Revamped Smbios/Sysinfo support
by Daniel Veillard 03 Nov '10

03 Nov '10

This patch set implements a new way to store system informations and pass them to the domain, it's modelled on the SMBIOS support in hypervisors and allow to override those informations in domains: The simplest is the use of: <smbios mode="host"/> in which case the domain will try to inherit those values from the Host own values, the classical use case is the use of OEM'ed Windows versions where one need to export SMBIOS informations from the host to the guest. But the <sysinfo> construct allows to define those informations, for example: <sysinfo type="smbios"> <bios> <entry name="vendor">QEmu/KVM</entry> <entry name="version">0.13</entry> </bios> <system> <entry name="manufacturer">Fedora</entry> <entry name="product">Virt-Manager</entry> <entry name="version">0.8.2-3.fc14</entry> <entry name="serial">32dfcb37-5af1-552b-357c-be8c3aa38310</entry> <entry name="uuid">c7a5fdbd-edaf-9455-926a-d65c16db1809</entry> </system> </sysinfo> <smbios mode="sysinfo"/> In that case libvirt hypervisor driver will try to set up those values in the domain emulation. The patch set attached implement those modes for QEmu, and based on our previous reviews with Matthias the first mode should be implementable in the ESX driver (for just a couple of settings though) and the VirtualBox driver should be abble to implement both if we understood correctly, Daniel

2 3

[libvirt] [PATCH 7/7] Add a new test for sysinfo and smbios handling
by Daniel Veillard 03 Nov '10

03 Nov '10

Signed-off-by: Daniel Veillard <veillard(a)redhat.com> --- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 39 +++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 3 files changed, 42 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smbios.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smbios.xml

2 1

[libvirt] [PATCH 5/7] Read the host sysinfo for the QEmu driver
by Daniel Veillard 03 Nov '10

03 Nov '10

Read and store the data when initializing the driver. Signed-off-by: Daniel Veillard <veillard(a)redhat.com> --- src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_driver.c | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-)

2 1

[libvirt] [PATCH 3/7] Add smbios element to schema and configuration
by Daniel Veillard 03 Nov '10

03 Nov '10

the element has a mode attribute allowing only 3 values: - emulate: use the smbios emulation from the hypervisor - host: try to use the smbios values from the node - sysinfo: grab the values from the <sysinfo> fields * docs/schemas/domain.rng: extend the schemas * src/conf/domain_conf.h: add the flag to the domain config * src/conf/domain_conf.h: parse and serialize the smbios if present Signed-off-by: Daniel Veillard <veillard(a)redhat.com> --- docs/schemas/domain.rng | 16 ++++++++++++++++ src/conf/domain_conf.c | 17 +++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-)

2 1

[libvirt] Allow nbd-backed disk images?
by Adam Litke 03 Nov '10

03 Nov '10

I am trying to use a qcow image with libvirt where the backing 'file' is a qemu-nbd server. Unfortunately the security code assumes that backingStore is always a real file so something like 'nbd:0:3333' is rejected because a file with that name cannot be accessed. A simple patch like the following works around the problem -- are there any suggestions on how to do this properly? Note that I am not worried about directly using nbd images. That would require a new disk type with XML markup, etc. I only want it to be permitted as a backingStore. diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 6f48b10..7c0ea9a 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -292,6 +292,13 @@ qcowXGetBackingStore(char **res, return BACKING_STORE_INVALID; if (size + 1 == 0) return BACKING_STORE_INVALID; + + /* Short-circuit nbd backing files */ + if (size >= 4 && STRPREFIX((const char *)(buf + offset), "nbd:")) { + return BACKING_STORE_OK; + } + if (VIR_ALLOC_N(*res, size + 1) < 0) { virReportOOMError(); return BACKING_STORE_ERROR; -- Thanks, Adam

2 1

[libvirt] [PATCH v2] macvtap: libvirtd forgot macvtap device name during a shutdown/restart cycle
by Stefan Berger 03 Nov '10

03 Nov '10

V2: - removed change from virDomainNetDefFormat. The reported problem also does not occur. During a shutdown/restart cycle libvirtd forgot the macvtap device name that it had created on behalf of a VM so that a stale macvtap device remained on the host when the VM terminated. Libvirtd has to actively tear down a macvtap device and it uses its name for identifying which device to tear down. The solution is to not blank out the <target dev='...'/> completely, but only blank it out on VMs that are not active. So, if a VM is active, the device name makes it into the XML and is also being parsed. If a VM is not active, the device name is discarded. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/domain_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -2343,7 +2343,8 @@ virDomainNetDefParseXML(virCapsPtr caps, def->data.direct.linkdev = dev; dev = NULL; - VIR_FREE(ifname); + if ((flags & VIR_DOMAIN_XML_INACTIVE)) + VIR_FREE(ifname); break;

2 2

[libvirt] [PATCH] tests: fix daemon-conf testing failure
by Osier Yang 03 Nov '10

03 Nov '10

libvirtd.conf uses "libvirt" as the value of "unix_sock_group", however, group "libvirt" may not exist on system, in this case the case will always be failed, which will cause 'make check' , and 'make rpm' always be failed further more. As a solution, replace "libvirt" with "root" in "tmp.conf". * tests/daemon-conf --- tests/daemon-conf | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tests/daemon-conf b/tests/daemon-conf index 6c91d96..225f84c 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -25,6 +25,9 @@ grep -v '\"PARAMETER = VALUE\"' "$conf" | grep '[a-z_] *= *[^ ]' | grep -vE '^ # Start with the sample libvirtd.conf file, uncommenting all real directives. sed -n 's/^#$[^ #]$/\1/p' "$conf" > tmp.conf +sed -e 's/^$unix_sock_group =$.*/\1 "root"/g' tmp.conf > k +mv k tmp.conf + # Iterate through that list of directives, corrupting one RHS at a # time and running libvirtd with the resulting config. Each libvirtd # invocation must fail. -- 1.7.2.3

4 4

[libvirt] PCI/USB devices documentation
by Zdenek Styblik 03 Nov '10

03 Nov '10

Hello, so far unsuccessfully, I'm trying to attach PCI/USB devices to Guests (via virt-manager, soon via virsh because - whatever :]). Anyway, there is <hostdev managed='yes'> where I'm wondering what 'managed' means, because it's not documented here[1]. Is it a bug or is it documented elsewhere? btw also, 'Node devices XML format'[2] page is empty Thanks, Zdenek References: --- [1] http://libvirt.org/formatdomain.html#elementsUSB [2] http://libvirt.org/formatnode.html PS: I haven't forgotten about Slackware SSH how-to, but- *sigh* I promise! -- Zdenek Styblik Net/Linux admin OS TurnovFree.net email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net

3 4

[libvirt] [PATCH] Fix virPipeReadUntilEOF on more than 1024 bytes of data
by Daniel Veillard 03 Nov '10

03 Nov '10

This is a bug I found while testing the smbios support, it uses virPipeReadUntilEOF to read the stdout of the exec'ed dmidecode process and this failed to capture the full output. It read only 1024 bytes. The problem is that this is based on a poll loop, and in the loop we read at most 1024 bytes per filedescriptor, but we also note in the loop if poll indicates that the process won't output more than that on that fd by setting finished[i] = 1. The simplest way is that if we read a full buffer make sure finished[i] is still 0 because we will need another pass in the loop. Daniel diff --git a/src/util/util.c b/src/util/util.c index f7c7d32..a059675 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -984,6 +984,9 @@ virPipeReadUntilEOF(int outfd, int errfd, got = read(fds[i].fd, data, sizeof(data)); + if (got == sizeof(data)) + finished[i] = 0; + if (got == 0) { finished[i] = 1; continue; -- 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] Changing the default for qcow2 creation
by Matthew Booth 03 Nov '10

03 Nov '10

I've recently been investigating a severe performance issue I noticed when writing to a qcow2-backed image. When virt-v2v is doing a format conversion from raw to qcow2, it does the following: 1. Create a new qcow2 image 2. Launch a libguestfs appliance (kvm) using the new image 3. Write the source raw data to the appliance's block device I noticed that the same process writing to a raw image rather than a qcow2 image was adequately fast, and decided to do some testing. I've attached my simple test program.[1] It does the following: 1. Start an appliance with test.img as a disk. 2. Format test.img with ext2. 3. Create a file /test 4. Write 256M of data to /test in 2M chunks Only step 4 is timed. I ran the program against test.img prepared in 4 different ways: 1. A sparse raw file: 15.3 seconds truncate --size 300M test.img 2. A preallocated raw file: 14.8 seconds fallocate -l 300M test.img 3. A sparse qcow2 file: 223.0 seconds qemu-img create -f qcow2 test.img 300M 4. A metadata preallocated qcow2 file: 14.5 seconds qemu-img create -f qcow2 -o preallocated=metadata test.img 300M With the exception of (3), I ran the test 3 times and took the middle time rounded to 1DP. I saw about 5-10% variation. I only ran the test against (3) once. The precise ordering of 1, 2 and 4 is surprising, but given the variation probably not that interesting: they're all about the same. The interesting thing is that the overhead of qcow2 metadata creation during the test seems to account for a 15x performance penalty. I had a cursory look at metadata preallocation, which I hadn't been aware of before today. Creating a qcow2 image of any size with no preallocation results in a 136k file. If you preallocate the metadata, a sparse file is created large enough to accomodate the entire image, with >136k actually used. In the above 300M case this is 204k. On a slightly more practical 20G image, 3.3M is preallocated. It's also worth noting that the image takes considerably longer to create. On my laptop, creation without preallocation is 'instantaneous' at any size. With preallocation, a 20G image takes 6 seconds to create, and a 100G image takes 26 seconds. libvirt's qemu driver doesn't currently preallocate qcow2 metadata when creating a new image. Given the tiny disk space overhead of the metadata (0.02%) and the small processing overhead of pre-creation relative to subsequent creation on-the-fly, I suggest that the libvirt qemu driver is updated to pre-allocate metadata by default. Thoughts? Matt [1] Note that I'm running this against libguestfs from git, which uses virtio-serial rather than usermode networking for appliance<->host communication. This change alone improved the performance of this test by about 10x. If your numbers don't match mine, that's probably why. I don't know off the top of my head if this change has made it into F14 yet. It's definitely not in F13. -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490

5 6

[libvirt] New PHP bindings
by Arnar Mar Sig 03 Nov '10

03 Nov '10

Hi There are few PHP libvirt bindings out there, but all I found are procedural based and incomplete. To address this I created another binding that is OO based and in large part generated from libvirt-api.xml. The extension already supports most of the API, split into 6 classes: virConnect, virDomain, virInterface, virNetwork, virStoragePool, and virStorageVol. Snapshot of the current code can be found at: http://libvirt-debian.vm.antab.is/files/php-libvirt.tar.bz2 Or using svn from: http://svn.antab.is/php-libvirt/trunk Build instructions are in the README file. Documents can be found at http://libvirt-debian.vm.antab.is/ NOTE: Most of the docs are copied from libvirt. It has mostly been tested with libvirt test backend and PHP unit tests (phpt) are used to test, covering about 40% of basic usage. It is by no means complete and missing some functionality like classmaps (So virConnect::domainLookupBy* can return user defined class extended from virDomain) and probably leaks memory. I would appreciate any input and comments. Thanks Arnar Mar Sig

3 7

[libvirt] [PATCH 00/10] Allow access to text console with virStream APIs (v2)
by Daniel P. Berrange 02 Nov '10

02 Nov '10

2 29

[libvirt] [PATCH] xen: work with ia64 MAX_VIRT_CPUS of 64
by Eric Blake 02 Nov '10

02 Nov '10

* src/xen/xen_hypervisor.c (MAX_VIRT_CPUS): Move... * src/xen/xen_driver.h (MAX_VIRT_CPUS): ...so all xen code can see same value. * src/xen/xend_internal.c (sexpr_to_xend_domain_info) (xenDaemonDomainGetVcpusFlags, xenDaemonParseSxpr) (xenDaemonFormatSxpr): Work if MAX_VIRT_CPUS is 64 on a platform where long is 64-bits. * src/xen/xm_internal.c (xenXMDomainConfigParse) (xenXMDomainConfigFormat): Likewise. --- On at least the xen/stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git we have the case where MAX_VIRT_CPUS is 32 for x86 but 64 for ia64. That branch does not have XEN_LEGACY_MAX_VCPUS. But according to our comments, other branches had only XEN_LEGACY_MAX_VCPUS, which means that xm_internal.c would fail to compile without this patch, when targetting xen headers that lack MAX_VIRT_CPUS. src/xen/xen_driver.h | 8 ++++++++ src/xen/xen_hypervisor.c | 8 -------- src/xen/xend_internal.c | 17 +++++++++-------- src/xen/xm_internal.c | 9 +++++---- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h index 53f97d4..16d22f1 100644 --- a/src/xen/xen_driver.h +++ b/src/xen/xen_driver.h @@ -29,6 +29,14 @@ # include <winsock2.h> # endif +/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public + * headers. Its semantic was retained with XEN_LEGACY_MAX_VCPUS. + * Ensure MAX_VIRT_CPUS is defined accordingly. + */ +# if !defined(MAX_VIRT_CPUS) && defined(XEN_LEGACY_MAX_VCPUS) +# define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS +# endif + extern int xenRegister (void); # define XEN_UNIFIED_HYPERVISOR_OFFSET 0 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 3797865..ec726fe 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -109,14 +109,6 @@ typedef privcmd_hypercall_t hypercall_t; # define SYS_IFACE_MIN_VERS_NUMA 4 #endif -/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public - * headers. Its semanitc was retained with XEN_LEGACY_MAX_VCPUS. - * Ensure MAX_VIRT_CPUS is defined accordingly. - */ -#if !defined(MAX_VIRT_CPUS) && defined(XEN_LEGACY_MAX_VCPUS) -# define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS -#endif - static int xen_ioctl_hypercall_cmd = 0; static int initialized = 0; static int in_init = 0; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 974e96b..614c036 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2192,7 +2192,7 @@ xenDaemonParseSxpr(virConnectPtr conn, } def->maxvcpus = sexpr_int(root, "domain/vcpus"); - def->vcpus = count_one_bits(sexpr_int(root, "domain/vcpu_avail")); + def->vcpus = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail")); if (!def->vcpus || def->maxvcpus < def->vcpus) def->vcpus = def->maxvcpus; @@ -2468,7 +2468,7 @@ sexpr_to_xend_domain_info(virDomainPtr domain, const struct sexpr *root, } info->cpuTime = sexpr_float(root, "domain/cpu_time") * 1000000000; vcpus = sexpr_int(root, "domain/vcpus"); - info->nrVirtCpu = count_one_bits(sexpr_int(root, "domain/vcpu_avail")); + info->nrVirtCpu = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail")); if (!info->nrVirtCpu || vcpus < info->nrVirtCpu) info->nrVirtCpu = vcpus; @@ -3706,7 +3706,7 @@ xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) ret = sexpr_int(root, "domain/vcpus"); if (!(flags & VIR_DOMAIN_VCPU_MAXIMUM)) { - int vcpus = count_one_bits(sexpr_int(root, "domain/vcpu_avail")); + int vcpus = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail")); if (vcpus) ret = MIN(vcpus, ret); } @@ -5770,10 +5770,11 @@ xenDaemonFormatSxpr(virConnectPtr conn, virBufferVSprintf(&buf, "(memory %lu)(maxmem %lu)", def->mem.cur_balloon/1024, def->mem.max_balloon/1024); virBufferVSprintf(&buf, "(vcpus %u)", def->maxvcpus); - /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is 32. */ - verify(MAX_VIRT_CPUS <= sizeof(1U) * CHAR_BIT); + /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is + either 32, or 64 on a platform where long is big enough. */ + verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); if (def->vcpus < def->maxvcpus) - virBufferVSprintf(&buf, "(vcpu_avail %u)", (1U << def->vcpus) - 1); + virBufferVSprintf(&buf, "(vcpu_avail %lu)", (1UL << def->vcpus) - 1); if (def->cpumask) { char *ranges = virDomainCpuSetFormat(def->cpumask, def->cpumasklen); @@ -5870,8 +5871,8 @@ xenDaemonFormatSxpr(virConnectPtr conn, virBufferVSprintf(&buf, "(vcpus %u)", def->maxvcpus); if (def->vcpus < def->maxvcpus) - virBufferVSprintf(&buf, "(vcpu_avail %u)", - (1U << def->vcpus) - 1); + virBufferVSprintf(&buf, "(vcpu_avail %lu)", + (1UL << def->vcpus) - 1); for (i = 0 ; i < def->os.nBootDevs ; i++) { switch (def->os.bootDevs[i]) { diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index f80e252..6c5df0f 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -776,7 +776,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { def->maxvcpus = count; if (xenXMConfigGetULong(conf, "vcpu_avail", &count, -1) < 0) goto cleanup; - def->vcpus = MIN(count_one_bits(count), def->maxvcpus); + def->vcpus = MIN(count_one_bits_l(count), def->maxvcpus); if (xenXMConfigGetString(conf, "cpus", &str, NULL) < 0) goto cleanup; @@ -2336,10 +2336,11 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, if (xenXMConfigSetInt(conf, "vcpus", def->maxvcpus) < 0) goto no_memory; - /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is 32. */ - verify(MAX_VIRT_CPUS <= sizeof(1U) * CHAR_BIT); + /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is + either 32, or 64 on a platform where long is big enough. */ + verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); if (def->vcpus < def->maxvcpus && - xenXMConfigSetInt(conf, "vcpu_avail", (1U << def->vcpus) - 1) < 0) + xenXMConfigSetInt(conf, "vcpu_avail", (1UL << def->vcpus) - 1) < 0) goto no_memory; if ((def->cpumask != NULL) && -- 1.7.2.3

5 12

[libvirt] could no query memory balloon allocation
by Marc Haber 02 Nov '10

02 Nov '10

Hi, I am playing around with libvirt and KVM on a Debian sid system (with a self-built kernel 2.6.36, 64bit kernel and 32bit userland). I have pulled libvirt 0.8.4 from experimental. When I try staring a VM using virtu-manager, I get the error message "Error starting domain: operation failed: could not query memory balloon allocation". This is probably some weird timing issue - when I have an strace attached to the libvirtd, everything is fine. In the #kvm IRC channel, people have told me that there may be an issue between some kernel versions and some libvirt versions, but neither the list archives nor the git changelog of 0.8.5 indicate such an issue (and #virt on oftc is quiet as usual). Can anybody explain what is going on on my system and what I could do to work around the issue? Greetings Marc -- ----------------------------------------------------------------------------- Marc Haber | "I don't trust Computers. They | Mailadresse im Header Mannheim, Germany | lose things." Winona Ryder | Fon: *49 621 72739834 Nordisch by Nature | How to make an American Quilt | Fax: *49 3221 2323190

1 0

[libvirt] [PATCH] Fix build with polkit 0
by Jim Fehlig 02 Nov '10

02 Nov '10

Commit e8066d53 broke the build with polkit0: remote.c: In function 'remoteDispatchAuthPolkit': remote.c:4177: error: 'rv' undeclared (first use in this function) Add missing identifier. --- daemon/remote.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 886d53d..3cf3886 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4152,6 +4152,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, DBusError err; const char *action; char ident[100]; + int rv; memset(ident, 0, sizeof ident); -- 1.6.0.2

2 2

[libvirt] how to attach PCI/USB device
by Zdenek Styblik 02 Nov '10

02 Nov '10

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello list and its users, as subject suggests, I'm trying to attach PCI/USB devices to Guest(VM). A-and, it doesn't work. But I swear I had it before(somewhat in the beginnings). I'm using virt-managers to add/attach devices. I've failed to attach PCI device, but it "does not" matter right now. I can attach USB devices, but they are not in VM. I've tried to attach USB HUB as well and what not - nothing. So, could somebody please tell me, how to debug it? Could it be somehow connected with qemu-kvm running 'root-less'? libvirt-0.8.4 and 0.8.5. Thank you all and nice whatever-timezone-you-are-in, Zdenek - -- Zdenek Styblik Net/Linux admin OS TurnovFree.net email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAkzPCuQACgkQ8MreUbSH7imBMACcCW+DQ4lwNmcPiM9kXNjbHIWD o68An3RwjHN98zlQumJsCGbnG5Xie0WB =4ZBd -----END PGP SIGNATURE-----

3 6

[libvirt] libvirtd: how to react on qemu watchdog events
by Hu Tao 02 Nov '10

02 Nov '10

Hi, I'm currently seeking a way to monitor qemu watchdog events and do somthing based on these events. Although there is a good example at libvirt-source/examples/domain-events/events-c/event-test.c to start with, and I did achieve my goal by little modification of the example, but it ran as a libvirt client. How can I make libvirtd monitor the events and react on them? Thanks a lot!

2 1

[libvirt] [PATCH] Fix several warnings about a non-literal format string
by Jiri Denemark 02 Nov '10

02 Nov '10

They only popped up during --disable-nls build. Without this configure option, gcc wasn't able to detect them. --- I already pushed this since it's both trivial and build-breaking. src/esx/esx_vmx.c | 2 +- src/util/iptables.c | 2 +- src/util/network.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 0a26614..36818df 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -2611,7 +2611,7 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, /* def:maxvcpus -> vmx:numvcpus */ if (def->vcpus != def->maxvcpus) { - ESX_ERROR(VIR_ERR_CONFIG_UNSUPPORTED, + ESX_ERROR(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("No support for domain XML entry 'vcpu' attribute " "'current'")); goto cleanup; diff --git a/src/util/iptables.c b/src/util/iptables.c index fc656b9..fe78d1c 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -334,7 +334,7 @@ static char *iptablesFormatNetwork(virSocketAddr *netaddr, if (!VIR_SOCKET_IS_FAMILY(netaddr, AF_INET) || !VIR_SOCKET_IS_FAMILY(netmask, AF_INET)) { - iptablesError(VIR_ERR_CONFIG_UNSUPPORTED, + iptablesError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only IPv4 addresses can be used with iptables")); return NULL; } diff --git a/src/util/network.c b/src/util/network.c index 81ac228..1abe78b 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -80,7 +80,7 @@ virSocketParseAddr(const char *val, virSocketAddrPtr addr, int family) { int err; if (val == NULL) { - virSocketError(VIR_ERR_INVALID_ARG, _("Missing address")); + virSocketError(VIR_ERR_INVALID_ARG, "%s", _("Missing address")); return -1; } @@ -173,7 +173,7 @@ virSocketFormatAddrFull(virSocketAddrPtr addr, int err; if (addr == NULL) { - virSocketError(VIR_ERR_INVALID_ARG, _("Missing address")); + virSocketError(VIR_ERR_INVALID_ARG, "%s", _("Missing address")); return NULL; } -- 1.7.3.2

1 0

Re: [libvirt] SPAM-LOW: Re: Re: Node.GetInfo error
by arnaud.champion＠devatom.fr 02 Nov '10

02 Nov '10

?:S I'm far away from a git expert :S Maybe anyone on the list can help us ? Arnaud From: 黄亮 Sent: Monday, November 01, 2010 2:42 PM To: arnaud.champion(a)devatom.fr Subject: Re: Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error Hi Arnaud, I tried GitExtension, but while applying patch, it returns "Patch format detection failed. " Should I change some settings or is there something not right in the patch file? Regards 2010-11-01 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-11-01 16:55:51 收件人：黄亮抄送： libvir-list(a)redhat.com 主题： Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error Ok, if you are under windows (like me), use GitExtension (http://sourceforge.net/projects/gitextensions/) It works, not perfect, but it works. Arnaud From: 黄亮 Sent: Monday, November 01, 2010 9:52 AM To: arnaud.champion(a)devatom.fr Subject: Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error Hi Arnaud, The NodeInfoStructure you sent to me yesterday works, thank you. I saw your patch file, should I manually apply it to the source code or is there some tools I can use to automatically apply the changes? Regards 2010-11-01 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-11-01 16:37:17 收件人：黄亮抄送： libvir-list 主题： Re: SPAM-LOW: Re: Re: Node.GetInfo error Hi, I think the solution is in the last patches I have send (which are not yet in the git). Have you tried the NodeInfoStructure I have sended yesterday ? Arnaud From: 黄亮 Sent: Monday, November 01, 2010 3:01 AM To: arnaud.champion(a)devatom.fr Cc: libvir-list Subject: SPAM-LOW: Re: Re: Node.GetInfo error HI, I tried Errors.Error err = Errors.GetLastError(); MessageBox.Show(err.Message); But IDE shows compilation errors that there is no "Error" defination in "Errors", and "Errors.GetLastError()" returns int. I made a guess that maybe it was like this: Error err = Errors.SaveLastError(); MessageBox.Show("Get Info error: " + err.Message); It can be compiled but "err.Message" has nothing in it. Did I make a wrong assumption? Regards 2010-11-01 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-10-31 16:48:15 收件人：黄亮抄送： libvir-list(a)redhat.com 主题： Re: Node.GetInfo error Ok, at first GetLastError return an Error object. So you should anything like : Errors.Error err = Errors.GetLastError(); MessageBox.Show(err.Message); For the NodeInfo structure, I think the problem is the same that was for DomainInfo, I'll check marshaling. Then respond you with the correct infos. Arnaud PS : can you also put libvirt-list(a)redhat.com in copy of your mails, to keep everyone in the loop ? From: 黄亮 Sent: Sunday, October 31, 2010 8:20 AM To: arnaud.champion Subject: Node.GetInfo error Hi, Sorry for disturbing again. But I get error while using Node.GetInfo. Code: NodeInfo aNodeInfo = new NodeInfo(); if (Node.GetInfo(con, aNodeInfo) < 0) { //MessageBox.Show("Node Info Error"); MessageBox.Show(Errors.GetLastError().ToString()); return 0f; } I'm sure con != IntPtr.Zero. I tried to use Errors.GetLastError(), it returns int. But I don't know what to do with it. So, any suggestions ? Thanks Regards 2010-10-31 -------------------------------------------------------------------------------- Lancer __________ Information from ESET Smart Security, version of virus signature database 5577 (20101030) __________ The message was checked by ESET Smart Security. http://www.eset.com __________ Information from ESET Smart Security, version of virus signature database 5580 (20101031) __________ The message was checked by ESET Smart Security. http://www.eset.com

5 7

[libvirt] [PATCH] [TCK] network: create networks and check for exected results
by Stefan Berger 02 Nov '10

02 Nov '10

Derived from the nwfilter test program, this one works with libvirt's networks. It creates networks from provided xml files and checks for expected configuration in iptables, running processes and virsh output using provided data files with commands to execute and the expected results for after creating the network and after tearing it down (*.post.dat). 3 tests are currently not passing due to a bug in libvirt... Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- Build.PL | 2 scripts/networks/100-apply-verify-host.t | 10 scripts/networks/networkApplyTest.sh | 343 +++++++++++++ scripts/networks/networkxml2hostout/tck-testnet-1.dat | 11 scripts/networks/networkxml2hostout/tck-testnet-1.post.dat | 4 scripts/networks/networkxml2hostout/tck-testnet-2.dat | 8 scripts/networks/networkxml2hostout/tck-testnet-2.post.dat | 4 scripts/networks/networkxml2xmlin/tck-testnet-1.xml | 12 scripts/networks/networkxml2xmlin/tck-testnet-2.xml | 12 9 files changed, 405 insertions(+), 1 deletion(-) Index: libvirt-tck/scripts/networks/networkApplyTest.sh =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkApplyTest.sh @@ -0,0 +1,343 @@ +#!/bin/bash + +VIRSH=virsh + +uri= +if [ "x${LIBVIRT_TCK_CONFIG}x" != "xx" ]; then + uri_exp=`cat ${LIBVIRT_TCK_CONFIG} | grep "^uri\s*=" | sed -e 's/uri\s*=\s*//' | tail -n 1` + if [ "x${uri_exp}x" != "xx" ]; then + eval "uri=${uri_exp}" + fi + if [ "x${uri}x" == "xx" ]; then + uri="qemu:///system" + fi +else + uri="qemu:///system" +fi +LIBVIRT_URI=${uri} + + +FLAG_WAIT="$((1<<0))" +FLAG_VERBOSE="$((1<<2))" +FLAG_LIBVIRT_TEST="$((1<<3))" +FLAG_TAP_TEST="$((1<<4))" +FLAG_FORCE_CLEAN="$((1<<5))" + +failctr=0 +passctr=0 +attachfailctr=0 +attachctr=0 + +TAP_FAIL_LIST="" +TAP_FAIL_CTR=0 +TAP_TOT_CTR=0 + +function usage() { + local cmd="$0" +cat <<EOF +Usage: ${cmd} [--help|-h|-?] [--noattach] [--wait] [--verbose] + [--libvirt-test] [--tap-test] + +Options: + --help,-h,-? : Display this help screen. + --wait : Wait for the user to press the enter key once an error + was detected + --verbose : Verbose output + --libvirt-test : Use the libvirt test output format + --tap-test : TAP format output + --force : Allow the automatic cleaning of VMs and networks + previously created by the TCK test suite + +This test creates libvirt 'networks' and checks for expected results +(iptables, running processes (dnsmasq)) using provided xml and data +file respectively. +EOF +} + + +function tap_fail() { + echo "not ok $1 - ${2:0:66}" + TAP_FAIL_LIST+="$1 " + ((TAP_FAIL_CTR++)) + ((TAP_TOT_CTR++)) +} + +function tap_pass() { + echo "ok $1 - ${2:0:70}" + ((TAP_TOT_CTR++)) +} + +function tap_final() { + local okay + + [ -n "${TAP_FAIL_LIST}" ] && echo "FAILED tests ${TAP_FAIL_LIST}" + + okay=`echo "($TAP_TOT_CTR-$TAP_FAIL_CTR)*100/$TAP_TOT_CTR" | bc -l` + echo "Failed ${TAP_FAIL_CTR}/${TAP_TOT_CTR} tests, ${okay:0:5}% okay" +} + +# A wrapper for mktemp in case it does not exist +# Echos the name of a temporary file. +function mktmpfile() { + local tmp + type -P mktemp > /dev/null + if [ $? -eq 0 ]; then + tmp=$(mktemp -t nwfvmtest.XXXXXX) + echo ${tmp} + else + while :; do + tmp="/tmp/nwfvmtest.${RANDOM}" + if [ ! -f ${tmp} ]; then + touch ${tmp} + chmod 666 ${tmp} + echo ${tmp} + break + fi + done + fi + return 0 +} + + +function checkExpectedOutput() { + local xmlfile="$1" + local datafile="$2" + local flags="$3" + local skipregex="$4" + local cmd line tmpfile tmpfile2 skip + + tmpfile=`mktmpfile` + tmpfile2=`mktmpfile` + + exec 4<${datafile} + + read <&4 + line="${REPLY}" + + while [ "x${line}x" != "xx" ]; do + cmd=`echo ${line##\#}` + + skip=0 + if [ "x${skipregex}x" != "xx" ]; then + skip=`echo ${cmd} | grep -c -E ${skipregex}` + fi + + eval ${cmd} 2>&1 | tee ${tmpfile} 1>/dev/null + + rm ${tmpfile2} 2>/dev/null + touch ${tmpfile2} + + while [ 1 ]; do + read <&4 + line="${REPLY}" + + if [ "${line:0:1}" == "#" ] || [ "x${line}x" == "xx" ]; then + + if [ ${skip} -ne 0 ]; then + break + fi + + diff ${tmpfile} ${tmpfile2} >/dev/null + + if [ $? -ne 0 ]; then + if [ $((flags & FLAG_VERBOSE)) -ne 0 ]; then + echo "FAIL ${xmlfile} : ${cmd}" + diff ${tmpfile} ${tmpfile2} + fi + ((failctr++)) + if [ $((flags & FLAG_WAIT)) -ne 0 ]; then + echo "tmp files: $tmpfile, $tmpfile2" + echo "Press enter" + read + fi + [ $((flags & FLAG_LIBVIRT_TEST)) -ne 0 ] && \ + test_result $((passctr+failctr)) "" 1 + [ $((flags & FLAG_TAP_TEST)) -ne 0 ] && \ + tap_fail $((passctr+failctr)) "${xmlfile} : ${cmd}" + else + ((passctr++)) + [ $((flags & FLAG_VERBOSE)) -ne 0 ] && \ + echo "PASS ${xmlfile} : ${cmd}" + [ $((flags & FLAG_LIBVIRT_TEST)) -ne 0 ] && \ + test_result $((passctr+failctr)) "" 0 + [ $((flags & FLAG_TAP_TEST)) -ne 0 ] && \ + tap_pass $((passctr+failctr)) "${xmlfile} : ${cmd}" + fi + + break + + fi + echo "${line}" >> ${tmpfile2} + done + done + + exec 4>&- + + rm -rf "${tmpfile}" "${tmpfile2}" 2>/dev/null +} + + +function doTest() { + local xmlfile="$1" + local datafile="$2" + local postdatafile="$3" + local flags="$4" + local netname + + if [ ! -r "${xmlfile}" ]; then + echo "FAIL : Cannot access filter XML file ${xmlfile}." + return 1 + fi + + netname=`cat "${xmlfile}" | sed -n 's/.*<name>$[[:print:]]*$<.*/\1/p'` + + ${VIRSH} net-create "${xmlfile}" > /dev/null + + checkExpectedOutput "${xmlfile}" "${datafile}" "${flags}" "" + + ${VIRSH} net-destroy "${netname}" > /dev/null + + if [ -r ${postdatafile} ]; then + checkExpectedOutput "${xmlfile}" "${postdatafile}" "${flags}" "" + fi + + return 0 +} + + +function runTests() { + local xmldir="$1" + local hostoutdir="$2" + local flags="$3" + local datafiles f c + local tap_total=0 ctr=0 + + pushd ${PWD} > /dev/null + cd ${hostoutdir} + datafiles=`ls *.dat` + popd > /dev/null + + if [ $((flags & FLAG_TAP_TEST)) -ne 0 ]; then + # Need to count the number of total tests + for fil in ${datafiles}; do + c=$(grep -c "^#" ${hostoutdir}/${fil}) + ((tap_total+=c)) + ((ctr++)) + done + echo "1..${tap_total}" + fi + + for fil in `echo "${datafiles}" | grep -v "\.post\.dat$"`; do + f=${fil%%.dat} + doTest "${xmldir}/${f}.xml" "${hostoutdir}/${fil}" \ + "${hostoutdir}/${f}.post.dat" "${flags}" + done + + if [ $((flags & FLAG_LIBVIRT_TEST)) -ne 0 ]; then + test_final $((passctr+failctr)) $failctr + elif [ $((flags & FLAG_TAP_TEST)) -ne 0 ]; then + tap_final + else + echo "" + echo "Summary: ${failctr} failures, ${passctr} passes," + if [ ${attachctr} -ne 0 ]; then + echo " ${attachfailctr} interface attachment failures with ${attachctr} attempts" + fi + fi +} + + +function main() { + local prgname="$0" + local vm1 vm2 + local xmldir="networkxml2xmlin" + local hostoutdir="networkxml2hostout" + local res rc + local flags + + while [ $# -ne 0 ]; do + case "$1" in + --help|-h|-\?) usage ${prgname}; exit 0;; + --wait) ((flags |= FLAG_WAIT ));; + --verbose) ((flags |= FLAG_VERBOSE ));; + --libvirt-test) ((flags |= FLAG_LIBVIRT_TEST ));; + --tap-test) ((flags |= FLAG_TAP_TEST ));; + --force) ((flags |= FLAG_FORCE_CLEAN ));; + *) usage ${prgname}; exit 1;; + esac + shift 1 + done + + if [ `uname` != "Linux" ]; then + if [ $((flags & FLAG_TAP_TEST)) -ne 0 ]; then + echo "1..0 # Skipped: Only valid on Linux hosts" + else + echo "This script will only run on Linux." + fi + exit 1; + fi + + if [ $((flags & FLAG_TAP_TEST)) -ne 0 ]; then + if [ "${LIBVIRT_URI}" != "qemu:///system" ]; then + echo "1..0 # Skipped: Only valid for Qemu system driver" + exit 0 + fi + + for name in `virsh list | awk '{print $2}'` + do + case ${name} in + tck*) + if [ "x${LIBVIRT_TCK_AUTOCLEAN}" == "x1" -o \ + $((flags & FLAG_FORCE_CLEAN)) -ne 0 ]; then + res=$(virsh destroy ${name} 2>&1) + res=$(virsh undefine ${name} 2>&1) + if [ $? -ne 0 ]; then + echo "Bail out! Could not undefine VM ${name}: ${res}" + exit 0 + fi + else + echo "Bail out! TCK VMs from previous tests still exist, use --force to clean" + exit 1 + fi + esac + done + + for name in `virsh net-list | sed -n '3,$p'` + do + case ${name} in + tck*) + if [ "x${LIBVIRT_TCK_AUTOCLEAN}" == "x1" -o \ + $((flags & FLAG_FORCE_CLEAN)) -ne 0 ]; then + res=$(virsh net-destroy ${name} 2>&1) + rc=$? + res=$(virsh net-undefine ${name} 2>&1) + if [ $rc -ne 0 -a $? -ne 0 ]; then + echo "Bail out! Could not destroy/undefine network ${name}: ${res}" + exit 1 + fi + else + echo "Bail out! Network ${name} already exists, use --force to clean" + exit 1 + fi + esac + done + fi + + if [ $((flags & FLAG_LIBVIRT_TEST)) -ne 0 ]; then + pushd ${PWD} > /dev/null + . test-lib.sh + if [ $? -ne 0 ]; then + exit 1 + fi + test_intro $this_test + popd > /dev/null + fi + + res=$(${VIRSH} capabilities 2>&1) + + runTests "${xmldir}" "${hostoutdir}" "${flags}" + + return 0 +} + +main "$@" Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -0,0 +1,11 @@ +#iptables -t nat -L -n | grep 10.1.2 +MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 +MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 +MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 +#iptables -n -L FORWARD | grep 10.1.2 +ACCEPT all -- anywhere 10.1.2.0/24 state RELATED,ESTABLISHED +ACCEPT all -- 10.1.2.0/24 anywhere +#ps aux | grep dnsmasq | grep 10.1.2 | sed -n 's/.*\$dnsmasq[[:print:]*]\$/\\1/p' +dnsmasq --strict-order --bind-interfaces --pid-file=/var/run/libvirt/network/tck-testnet.pid --conf-file= --listen-address 10.1.2.1 --except-interface lo --dhcp-range 10.1.2.2,10.1.2.254 --dhcp-lease-max=253 --dhcp-no-override +#virsh net-list | grep tck-testnet +tck-testnet active no Index: libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-1.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-1.xml @@ -0,0 +1,12 @@ +<network> + <name>tck-testnet</name> + <uuid>aadc8920-502a-4774-ac2b-cd382a204d06</uuid> + <forward mode='nat'/> + <bridge name='testbr' stp='on' delay='0' /> + <ip address='10.1.2.1' netmask='255.255.255.0'> + <dhcp> + <range start='10.1.2.2' end='10.1.2.254' /> + </dhcp> + </ip> +</network> + Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -0,0 +1,8 @@ +#iptables -L FORWARD | grep 10.1.2 +ACCEPT all -- anywhere 10.1.2.0/24 +ACCEPT all -- 10.1.2.0/24 anywhere +#iptables -t nat -L | grep 10.1.2 +#ps aux | grep dnsmasq | grep 10.1.2 | sed -n 's/.*\$dnsmasq[[:print:]*]\$/\\1/p' +dnsmasq --strict-order --bind-interfaces --pid-file=/var/run/libvirt/network/tck-testnet.pid --conf-file= --listen-address 10.1.2.1 --except-interface lo --dhcp-range 10.1.2.2,10.1.2.254 --dhcp-lease-max=253 --dhcp-no-override +#virsh net-list | grep tck-testnet +tck-testnet active no Index: libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-2.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-2.xml @@ -0,0 +1,12 @@ +<network> + <name>tck-testnet</name> + <uuid>aadc8920-502a-4774-ac2b-cd382a204d06</uuid> + <forward mode='route'/> + <bridge name='testbr' stp='on' delay='0' /> + <ip address='10.1.2.1' netmask='255.255.255.0'> + <dhcp> + <range start='10.1.2.2' end='10.1.2.254' /> + </dhcp> + </ip> +</network> + Index: libvirt-tck/scripts/networks/100-apply-verify-host.t =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/100-apply-verify-host.t @@ -0,0 +1,10 @@ +#!/bin/bash + +pwd=$(dirname $0) + +pushd ${PWD} > /dev/null + +cd ${pwd} +bash ./networkApplyTest.sh --tap-test + +popd > /dev/null Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat @@ -0,0 +1,4 @@ +#iptables -t nat -L -n | grep 10.1.2 +#iptables -n -L FORWARD | grep 10.1.2 +#ps aux | grep dnsmasq | grep 10.1.2 | sed -n 's/.*\$dnsmasq[[:print:]*]\$/\\1/p' +#virsh net-list | grep tck-testnet Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat @@ -0,0 +1,4 @@ +#iptables -t nat -L -n | grep 10.1.2 +#iptables -n -L FORWARD | grep 10.1.2 +#ps aux | grep dnsmasq | grep 10.1.2 | sed -n 's/.*\$dnsmasq[[:print:]*]\$/\\1/p' +#virsh net-list | grep tck-testnet Index: libvirt-tck/Build.PL =================================================================== --- libvirt-tck.orig/Build.PL +++ libvirt-tck/Build.PL @@ -29,7 +29,7 @@ sub process_pkgdata_files { my $name = $File::Find::name; if (-d) { $tck_dirs{$name} = []; - } elsif (-f && (/\.t$/ || /\.sh$/ || /\.fwall$/ || /\.xml$/)) { + } elsif (-f && /\.(t|sh|fwall|xml|dat)$/) { push @{$tck_dirs{$dir}}, $name; } };

3 8