- Devel - libvirt List Archives

[libvirt] [PATCH] Fix configure check for SASL
by Matthias Bolte 22 Dec '09

22 Dec '09

The option --with-sasl defaults to 'check', but an inverted test logic lets the SASL check fail with an error instead of disabling SASL. Fix the test logic so SASL support gets disabled if SASL is missing and --with-sasl is set to check. --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index a86b8ca..c401111 100644 --- a/configure.in +++ b/configure.in @@ -613,7 +613,7 @@ if test "x$with_sasl" != "xno"; then CFLAGS="$CFLAGS $SASL_CFLAGS" LIBS="$LIBS $SASL_LIBS" AC_CHECK_HEADER([sasl/sasl.h],[],[ - if test "x$with_sasl" != "xcheck" ; then + if test "x$with_sasl" = "xcheck" ; then with_sasl=no else fail=1 -- 1.6.0.4

2 1

[libvirt] [PATCH] Fix GnuTLS pkg-config check
by Matthias Bolte 22 Dec '09

22 Dec '09

The testlogic for $PKG_CONFIG was inverted, checking for an empty string before using PKG_CHECK_MODULES. Use -x instead of -z and add an else branch to the if checking for $GNUTLS_FOUND = no to add -lgcrypt in case the GnuTLS libraries are detected by pkg-config. --- configure.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 81548b8..a86b8ca 100644 --- a/configure.in +++ b/configure.in @@ -555,7 +555,7 @@ dnl GnuTLS library GNUTLS_CFLAGS= GNUTLS_LIBS= GNUTLS_FOUND=no -if test -z "$PKG_CONFIG" ; then +if test -x "$PKG_CONFIG" ; then PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, [GNUTLS_FOUND=yes], [GNUTLS_FOUND=no]) fi @@ -572,6 +572,8 @@ if test "$GNUTLS_FOUND" = "no"; then dnl it explicitly for the calls to gcry_control/check_version GNUTLS_LIBS="$LIBS -lgcrypt" LIBS="$old_libs" +else + GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt" fi AC_SUBST([GNUTLS_CFLAGS]) -- 1.6.0.4

3 2

[libvirt] [PATCH] Define ATTRIBUTE_SENTINEL for GCC < 4.0 too
by Matthias Bolte 22 Dec '09

22 Dec '09

ATTRIBUTE_SENTINEL was defined for GCC >= 4.0 only, resulting in compile errors when using GCC < 4.0. --- src/internal.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/internal.h b/src/internal.h index 09c19ea..5ca1fa3 100644 --- a/src/internal.h +++ b/src/internal.h @@ -100,6 +100,8 @@ #ifndef ATTRIBUTE_SENTINEL #if __GNUC_PREREQ (4, 0) #define ATTRIBUTE_SENTINEL __attribute__((__sentinel__)) +#else +#define ATTRIBUTE_SENTINEL #endif #endif -- 1.6.0.4

4 3

[libvirt] [PATCH] Disable JSON mode monitor until QEMU is more mature
by Daniel P. Berrange 21 Dec '09

21 Dec '09

* src/qemu/qemu_conf.h: Remove QEMU_CMD_FLAG_0_12 and just leave the lone JSON flag * src/qemu/qemu_conf.c: Enable JSON on QEMU 0.13 or later, but leave it disabled for now --- src/qemu/qemu_conf.c | 8 ++++++-- src/qemu/qemu_conf.h | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 36bf9a2..0e66dd7 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1146,8 +1146,12 @@ static unsigned int qemudComputeCmdFlags(const char *help, if (version >= 10000) flags |= QEMUD_CMD_FLAG_0_10; - if (version >= 12000) - flags |= QEMUD_CMD_FLAG_0_12; + /* Keep disabled till we're actually ready to turn on JSON mode + * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */ +#if 0 + if (version >= 13000) + flags |= QEMUD_CMD_FLAG_MONITOR_JSON; +#endif return flags; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index e958850..209cd31 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -76,8 +76,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_MIGRATE_QEMU_UNIX = (1 << 21), /* Does qemu support unix domain sockets for migration? */ QEMUD_CMD_FLAG_CHARDEV = (1 << 22), /* Is the new -chardev arg available */ QEMUD_CMD_FLAG_ENABLE_KVM = (1 << 23), /* Is the -enable-kvm flag available to "enable KVM full virtualization support" */ - QEMUD_CMD_FLAG_0_12 = (1 << 24), - QEMUD_CMD_FLAG_MONITOR_JSON = QEMUD_CMD_FLAG_0_12, /* JSON mode for monitor */ + QEMUD_CMD_FLAG_MONITOR_JSON = (1 << 24), /* JSON mode for monitor */ }; /* Main driver state */ -- 1.6.5.2

2 1

[libvirt] [PATCH] Add cpu_map.xml to libvirt.spec
by Jiri Denemark 21 Dec '09

21 Dec '09

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index dd067ad..e1d4e53 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -687,6 +687,8 @@ fi %{_datadir}/libvirt/networks/default.xml %endif +%{_datadir}/libvirt/cpu_map.xml + %dir %{_localstatedir}/run/libvirt/ %dir %{_localstatedir}/lib/libvirt/ -- 1.6.6.rc4

2 1

[libvirt] [PATCH]: Make Xen VT-d PCI attach/detach work
by Chris Lalancette 21 Dec '09

21 Dec '09

All, The Xen code for making HVM VT-d PCI passthrough attach and detach is currently not properly working. There are 2 problems: 1) In xenDaemonAttachDevice(), we were always trying to reconfigure a PCI passthrough device, even the first time we added it. This was because the code in virDomainXMLDevID() was not checking xenstore for the existence of the device, and always returning 0 (meaning that the device already existed). 2) In xenDaemonDetachDevice(), we were trying to use "device_destroy" to detach a PCI device. While you would think that is the right method to call, it's actually wrong for PCI devices. In particular, in upstream Xen (and soon in RHEL-5 Xen), device_configure is actually used to destroy a PCI device. The attached patch fixes both of these problems. To fix the attach problem I add a lookup into xenstore to see if the device we are trying to attach already exists. To fix the detach problem I change it so that for PCI detach (only), we use device_configure with the appropriate sxpr to do the detachment. Tested by me on RHEL-5 on a VT-d capable machine, and, in combination with the RHEL-5 xen patch, fixes the problem for me in testing. (note: this solves https://bugzilla.redhat.com/show_bug.cgi?id=546671) Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

2 1

Re: [libvirt] Author: Adam Litke <agl@us.ibm.com>
by Daniel Veillard 21 Dec '09

21 Dec '09

On Mon, Dec 21, 2009 at 09:21:43AM -0500, Adam Litke wrote: > virsh: Document the dommemstat command in the virsh man page > > Provide a basic mention of the dommemstat command in the virsh man page. At > first I thought it would be handy to describe the stats and their semantics, > but the rest of the man page does not go into that kind of detail so I have > omitted it here. In any case it is documented in the libvirt API. > > Signed-off-by: Adam Litke <agl(a)us.ibm.com> > To: Daniel Veillard <veillard(a)redhat.com> > Cc: libvir-list(a)redhat.com > > diff --git a/tools/virsh.pod b/tools/virsh.pod > index 3830464..ee8cc11 100644 > --- a/tools/virsh.pod > +++ b/tools/virsh.pod > @@ -257,6 +257,10 @@ Get device block stats for a running domain. > > Get network interface stats for a running domain. > > +=item B<dommemstat> I<domain> > + > +Get memory stats for a running domain. > + > =item B<dominfo> I<domain-id> > > Returns basic information about the domain. Okay, thanks ! applied :-) Daniel -- 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/

1 0

[libvirt] [PATCH 1/6] domMemoryStats: Add domainMemoryStats method to struct _virDriver
by Adam Litke 21 Dec '09

21 Dec '09

Set up the types for the domainMemoryStats function and insert it into the virDriver structure definition. Because of static initializers, update every driver and set the new field to NULL. Note: The changes in python/* are to fix compiler errors. The actual python binding is implemented in a later patch. Signed-off-by: Adam Litke <agl(a)us.ibm.com> To: Daniel Veillard <veillard(a)redhat.com> Cc: Daniel P. Berrange <berrange(a)redhat.com> Cc: libvirt list <libvir-list(a)redhat.com> --- include/libvirt/libvirt.h.in | 53 ++++++++++++++++++++++++++++++++++++++++++ python/generator.py | 4 ++- src/driver.h | 7 +++++ src/esx/esx_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/opennebula/one_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 1 + src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/vbox/vbox_tmpl.c | 1 + src/xen/xen_driver.c | 1 + 14 files changed, 74 insertions(+), 1 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 6c3aded..820bf98 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -333,6 +333,55 @@ struct _virDomainInterfaceStats { */ typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr; +/** + * Memory Statistics Tags: + */ +typedef enum { + /* The total amount of data read from swap space (in kB). */ + VIR_DOMAIN_MEMORY_STAT_SWAP_IN = 0, + /* The total amount of memory written out to swap space (in kB). */ + VIR_DOMAIN_MEMORY_STAT_SWAP_OUT = 1, + + /* + * Page faults occur when a process makes a valid access to virtual memory + * that is not available. When servicing the page fault, if disk IO is + * required, it is considered a major fault. If not, it is a minor fault. + * These are expressed as the number of faults that have occurred. + */ + VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT = 2, + VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT = 3, + + /* + * The amount of memory left completely unused by the system. Memory that + * is available but used for reclaimable caches should NOT be reported as + * free. This value is expressed in kB. + */ + VIR_DOMAIN_MEMORY_STAT_UNUSED = 4, + + /* + * The total amount of usable memory as seen by the domain. This value + * may be less than the amount of memory assigned to the domain if a + * balloon driver is in use or if the guest OS does not initialize all + * assigned pages. This value is expressed in kB. + */ + VIR_DOMAIN_MEMORY_STAT_AVAILABLE = 5, + + /* + * The number of statistics supported by this version of the interface. + * To add new statistics, add them to the enum and increase this value. + */ + VIR_DOMAIN_MEMORY_STAT_NR = 6, +} virDomainMemoryStatTags; + +typedef struct _virDomainMemoryStat virDomainMemoryStatStruct; + +struct _virDomainMemoryStat { + int tag; + unsigned long long val; +}; + +typedef virDomainMemoryStatStruct *virDomainMemoryStatPtr; + /* Domain core dump flags. */ typedef enum { @@ -644,6 +693,10 @@ int virDomainInterfaceStats (virDomainPtr dom, const char *path, virDomainInterfaceStatsPtr stats, size_t size); +int virDomainMemoryStats (virDomainPtr dom, + virDomainMemoryStatPtr stats, + unsigned int nr_stats, + unsigned int flags); int virDomainBlockPeek (virDomainPtr dom, const char *path, unsigned long long offset, diff --git a/python/generator.py b/python/generator.py index 3fd7f90..06f1ff4 100755 --- a/python/generator.py +++ b/python/generator.py @@ -160,7 +160,8 @@ def enum(type, name, value): functions_failed = [] functions_skipped = [ - "virConnectListDomains" + "virConnectListDomains", + "virDomainMemoryStats" ] skipped_modules = { @@ -170,6 +171,7 @@ skipped_types = { # 'int *': "usually a return type", 'virConnectDomainEventCallback': "No function types in python", 'virEventAddHandleFunc': "No function types in python", + 'virDomainMemoryStatPtr': "Not implemented yet", } ####################################################################### diff --git a/src/driver.h b/src/driver.h index 09ce8e2..6193e47 100644 --- a/src/driver.h +++ b/src/driver.h @@ -229,6 +229,12 @@ typedef int struct _virDomainInterfaceStats *stats); typedef int + (*virDrvDomainMemoryStats) + (virDomainPtr domain, + struct _virDomainMemoryStat *stats, + unsigned int nr_stats); + +typedef int (*virDrvDomainBlockPeek) (virDomainPtr domain, const char *path, @@ -419,6 +425,7 @@ struct _virDriver { virDrvDomainMigrateFinish domainMigrateFinish; virDrvDomainBlockStats domainBlockStats; virDrvDomainInterfaceStats domainInterfaceStats; + virDrvDomainMemoryStats domainMemoryStats; virDrvDomainBlockPeek domainBlockPeek; virDrvDomainMemoryPeek domainMemoryPeek; virDrvNodeGetCellsFreeMemory nodeGetCellsFreeMemory; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index ea464a3..2626162 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3412,6 +3412,7 @@ static virDriver esxDriver = { esxDomainMigrateFinish, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c8e2dca..ff998c7 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2438,6 +2438,7 @@ static virDriver lxcDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ lxcDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index a30c110..a4ad31e 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -765,6 +765,7 @@ static virDriver oneDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 1c0fccc..7acce5b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1517,6 +1517,7 @@ static virDriver openvzDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index c4fcfed..07adccb 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1633,6 +1633,7 @@ virDriver phypDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9ef6c35..1ddc23e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7907,6 +7907,7 @@ static virDriver qemuDriver = { NULL, /* domainMigrateFinish */ qemudDomainBlockStats, /* domainBlockStats */ qemudDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ qemudDomainBlockPeek, /* domainBlockPeek */ qemudDomainMemoryPeek, /* domainMemoryPeek */ nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 77962fe..5d32d3b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8814,6 +8814,7 @@ static virDriver remote_driver = { remoteDomainMigrateFinish, /* domainMigrateFinish */ remoteDomainBlockStats, /* domainBlockStats */ remoteDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ remoteDomainBlockPeek, /* domainBlockPeek */ remoteDomainMemoryPeek, /* domainMemoryPeek */ remoteNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 7db9a4c..21ea491 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5220,6 +5220,7 @@ static virDriver testDriver = { NULL, /* domainMigrateFinish */ testDomainBlockStats, /* domainBlockStats */ testDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ testNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 48ef103..035ed0c 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1906,6 +1906,7 @@ static virDriver umlDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ umlDomainBlockPeek, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d6b681c..e2e1ce6 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -7028,6 +7028,7 @@ virDriver NAME(Driver) = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index ed94bed..e952610 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1844,6 +1844,7 @@ static virDriver xenUnifiedDriver = { xenUnifiedDomainMigrateFinish, /* domainMigrateFinish */ xenUnifiedDomainBlockStats, /* domainBlockStats */ xenUnifiedDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ xenUnifiedDomainBlockPeek, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ xenUnifiedNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ -- 1.6.5

4 8

[libvirt] [PATCH] Fix typo in qemudDomainAttachHostPciDevice()
by Jiri Denemark 21 Dec '09

21 Dec '09

The 'if' statement is supposed to check return value of pci = pciGetDevice(conn, ...); Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 890aa84..60dea9c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5290,7 +5290,7 @@ static int qemudDomainAttachHostPciDevice(virConnectPtr conn, hostdev->source.subsys.u.pci.bus, hostdev->source.subsys.u.pci.slot, hostdev->source.subsys.u.pci.function); - if (!dev) + if (!pci) return -1; if ((hostdev->managed && pciDettachDevice(conn, pci) < 0) || -- 1.6.6.rc4

2 1

[libvirt] Executing scripts when bridge interface becomes available
by Felix Schwarz 20 Dec '09

20 Dec '09

Hi, I'm using libvirt on a CentOS 5.4 host (so my libvirt is quite old) with a routed setup. My configuration is easy and works reliable as far as I can tell now. As far as I know, I have to add routes manually (so that the host knows which IPs need to be routed to the virbr1). My ip command looks like this: /sbin/ip route add <guest ip> dev virbr1 scope link Currently I have really problems finding the right spot where I should configure the routes and it looks like libvirt does not offer any support for that. 1. I can add the route when my network comes up because virbr1 is not available at that time. 2. If I switch my vm to the 'ethernet' interface, I can use a custom script but then I have to do all the network setup myself which looks like overkill and time-consuming (as I have to rebuild things that libvirt already does perfectly). I just want to add some routes... To me the perfect solution would be either: a) have start/stop scripts defined in the network configuration b) have start/stop scripts defined in the vm configuration - Does libvirt 0.7 offer things like that? (I could not find something in the documentation) - Is there an obvious way that I missed when it comes to route configuration? fs

1 0