- Devel - libvirt List Archives

[libvirt] [RFC 0/5]: Fix up iSCSI handling (again)
by Chris Lalancette 12 Jun '08

12 Jun '08

All, I've been sitting on this for way too long, so I'm sending these patches out for some initial review while I continue to test them. The following 5 patches rework the iSCSI LUN scanning again. The aim here is to: 1) Do minor cleanup of the existing code 2) Fix a bug where we aren't properly finding the LUNs on pre 2.6.24 kernels 3) Fix a bug seen in oVirt where we race between libvirtd scanning the sysfs path and udev actually making the sysfs path in the first place 4) Further lessen our dependence on direct calls to iscsiadm, in case they change the output in the future. I've started testing this patchset against a variety of Fedora's, old and new. Anything older than FC-6 is a lost cause; either it doesn't have iSCSI stuff (FC-1 through FC-4), or the iscsi stuff it has is so radically different that it's basically a different commandset (RHEL-4 and FC-5). In some light testing, though, this patchset seems to work on FC-6, F-7, F-8, and F-9 (RHEL-5 still to be tested). As Dan mentioned earlier, I have collected output from the relevant iscsiadm commands so that we can build our own fake iscsiadm in tests; I'll be working on that test as well as continuing to test these patches against live iSCSI targets. Note that this patchset is not to be applied yet; I've only lightly tested it so far. I'd just like to see what people think about all of this. Chris Lalancette

1 0

[libvirt] PATCH: Fix misc compile warnings
by Daniel P. Berrange 12 Jun '08

12 Jun '08

Enabling a bunch of non-default configure options shows some compiler warnings. This patch fixes them Daniel Index: src/lxc_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/lxc_driver.c,v retrieving revision 1.11 diff -u -p -r1.11 lxc_driver.c --- src/lxc_driver.c 9 Jun 2008 22:51:32 -0000 1.11 +++ src/lxc_driver.c 12 Jun 2008 11:19:09 -0000 @@ -1202,6 +1202,8 @@ static virDriver lxcDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainBlockPeek */ + NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ NULL, /* getFreeMemory */ }; Index: src/openvz_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/openvz_conf.c,v retrieving revision 1.24 diff -u -p -r1.24 openvz_conf.c --- src/openvz_conf.c 6 Jun 2008 11:09:57 -0000 1.24 +++ src/openvz_conf.c 12 Jun 2008 11:19:09 -0000 @@ -41,13 +41,14 @@ #include <unistd.h> #include <limits.h> #include <errno.h> +#include <string.h> #include <libxml/parser.h> #include <libxml/tree.h> #include <libxml/xpath.h> #include <libxml/uri.h> -#include "libvirt/virterror.h" +#include "internal.h" #include "openvz_driver.h" #include "openvz_conf.h" @@ -55,8 +56,6 @@ #include "buf.h" #include "memory.h" -#include <string.h> - static char *openvzLocateConfDir(void); static void error (virConnectPtr conn, virErrorNumber code, const char *info); static struct openvz_vm_def *openvzParseXML(virConnectPtr conn, xmlDocPtr xml); Index: src/openvz_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/openvz_driver.c,v retrieving revision 1.21 diff -u -p -r1.21 openvz_driver.c --- src/openvz_driver.c 6 Jun 2008 11:09:57 -0000 1.21 +++ src/openvz_driver.c 12 Jun 2008 11:19:09 -0000 @@ -761,6 +761,8 @@ static virDriver openvzDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainBlockPeek */ + NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ NULL, /* nodeGetFreeMemory */ }; @@ -770,6 +772,7 @@ static virStateDriver openvzStateDriver openvzShutdown, openvzReload, openvzActive, + NULL, /* sigHandler */ }; int openvzRegister(void) { Index: tests/testutils.c =================================================================== RCS file: /data/cvs/libvirt/tests/testutils.c,v retrieving revision 1.16 diff -u -p -r1.16 testutils.c --- tests/testutils.c 29 May 2008 19:41:40 -0000 1.16 +++ tests/testutils.c 12 Jun 2008 11:19:09 -0000 @@ -329,10 +329,7 @@ int virtTestMain(int argc, int oomCount; if ((debugStr = getenv("VIR_TEST_DEBUG")) != NULL) { - if (virStrToLong_i(debugStr, NULL, 10, &testDebug) < 0) - testDebug = 0; - - if (testDebug < 0) + if (virStrToLong_ui(debugStr, NULL, 10, &testDebug) < 0) testDebug = 0; } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 2

[libvirt] PATCH: Fix call to save iptables rules
by Daniel P. Berrange 12 Jun '08

12 Jun '08

When the virtual network forwarding support was introduced, the refactoring appears to have caused the call to save iptables rules to be left out. This patch fixes it. Daniel. Index: src/qemu_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_driver.c,v retrieving revision 1.86 diff -u -p -r1.86 qemu_driver.c --- src/qemu_driver.c 12 Jun 2008 08:55:13 -0000 1.86 +++ src/qemu_driver.c 12 Jun 2008 11:18:58 -0000 @@ -1259,7 +1259,7 @@ qemudAddIptablesRules(virConnectPtr conn if (!driver->iptables && !(driver->iptables = iptablesContextNew())) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "%s", _("failed to allocate space for IP tables support")); - return 1; + return 0; } @@ -1319,23 +1319,22 @@ qemudAddIptablesRules(virConnectPtr conn } - /* The remaining rules are only needed for IP forwarding */ - if (!network->def->forward) { - iptablesSaveRules(driver->iptables); - return 1; + if (network->def->forward) { + /* If masquerading is enabled, set up the rules*/ + if (network->def->forwardMode == QEMUD_NET_FORWARD_NAT && + !qemudAddMasqueradingIptablesRules(conn, driver, network)) + goto err8; + /* else if routing is enabled, set up the rules*/ + else if (network->def->forwardMode == QEMUD_NET_FORWARD_ROUTE && + !qemudAddRoutingIptablesRules(conn, driver, network)) + goto err8; } - /* If masquerading is enabled, set up the rules*/ - if (network->def->forwardMode == QEMUD_NET_FORWARD_NAT) { - if (qemudAddMasqueradingIptablesRules(conn, driver, network)) - return 1; - } - /* else if routing is enabled, set up the rules*/ - else if (network->def->forwardMode == QEMUD_NET_FORWARD_ROUTE) { - if (qemudAddRoutingIptablesRules(conn, driver, network)) - return 1; - } + iptablesSaveRules(driver->iptables); + + return 1; + err8: iptablesRemoveForwardAllowCross(driver->iptables, network->bridge); err7: -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 2

[libvirt] qemudDomainSetMemory() / qemudDomainSetVcpus() error codes
by Kaitlin Rupert 11 Jun '08

11 Jun '08

Hello, I noticed qemudDomainSetMemory() / qemudDomainSetVcpus() use the VIR_ERR_INTERNAL_ERROR error code when the caller attempts to set the mem/vcpus of an active domain. In this case, returning something like VIR_ERR_NO_SUPPORT would indicate that this is an invalid call - which would distinguish the error from a failure that occurred during the call. Is it possible to use such a return code to indicate what is supported by QEMU/KVM and what isn't? Thanks! -- Kaitlin Rupert IBM Linux Technology Center kaitlin(a)linux.vnet.ibm.com

3 3

[libvirt] [PATCH] Fix storage pool autostart python binding
by Cole Robinson 11 Jun '08

11 Jun '08

The attached patch fixes a few issues with the storage api python bindings. The pool GetAutostart is now generated as intended. Also the libvirtError class now accepts the pool or vol object passed to it when a command fails. Thanks, Cole diff --git a/python/libvir.py b/python/libvir.py index 3a38898..784152a 100644 --- a/python/libvir.py +++ b/python/libvir.py @@ -15,13 +15,17 @@ import types # The root of all libvirt errors. class libvirtError(Exception): - def __init__(self, msg, conn=None, dom=None, net=None): + def __init__(self, msg, conn=None, dom=None, net=None, pool=None, vol=None): Exception.__init__(self, msg) if dom is not None: conn = dom._conn elif net is not None: conn = net._conn + elif pool is not None: + conn = pool._conn + elif vol is not None: + conn = vol._conn if conn is None: self.err = virGetLastError() diff --git a/python/libvirt-python-api.xml b/python/libvirt-python-api.xml index da643d7..f3b82fc 100644 --- a/python/libvirt-python-api.xml +++ b/python/libvirt-python-api.xml @@ -83,6 +83,11 @@ <return type='int' info='the autostart flag, or None in case of error'/> <arg name='domain' type='virDomainPtr' info='a network object'/> </function> + <function name='virStoragePoolGetAutostart' file='python'> + <info>Extract the autostart flag for a storage pool</info> + <return type='int' info='the autostart flag, or None in case of error'/> + <arg name='pool' type='virStoragePoolPtr' info='a storage pool object'/> + </function> <function name='virDomainBlockStats' file='python'> <info>Extracts block device statistics for a domain</info> <return type='virDomainBlockStats' info='a tuple of statistics'/>

2 1

[libvirt] Release?
by Richard W.M. Jones 10 Jun '08

10 Jun '08

I've just had a chat with Daniel about whether it's time for a new release of libvirt. My own primary focus is getting the virDomain*Peek APIs into a released version so I can use them from Fedora. libvirt 0.4.2 was released on 8th Apr 2008. I just scanned the changelog and there's a pretty long list of new features: - Support for serial and parallel devices in Xend - Network interface model in QEMU network devs - SetVcpus, DomainGetMaxVcpus, VCPU pinning in QEMU - Disk "bus"es - Support for Xenner - Deprecate conn/dom/net fields in virterror - HTML documentation completely restructured - MinGW fixes - Memory leaks plugged - Added HACKING file and lots of work on unifying syntax and methods used in the code base to a single standard - Lots of LXR changes - virDomain*Peek APIs - and of course many bug fixes So is it time for a release? Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

6 14

[libvirt] [PATCH] Fix enabling storage driver
by Cole Robinson 10 Jun '08

10 Jun '08

As of a couple weeks ago, the storage driver is only registered if the WITH_LIBVIRTD macro is defined. The configure option --with-libvirtd actually wasn't defining this macro. The attached patch fixes this. Thanks, Cole diff --git a/configure.in b/configure.in index 47633b0..64c6013 100644 --- a/configure.in +++ b/configure.in @@ -257,6 +257,10 @@ if test "$with_remote" = "yes" ; then LIBVIRT_FEATURES="$LIBVIRT_FEATURES -DWITH_REMOTE" fi +if test "$with_libvirtd" = "yes" ; then + LIBVIRT_FEATURES="$LIBVIRT_FEATURES -DWITH_LIBVIRTD" +fi + if test "$with_xen" = "yes" ; then dnl search for the Xen store library AC_SEARCH_LIBS(xs_read, [xenstore],

3 2

[libvirt] [PATCH] Fix UUIDString for python bindings
by Cole Robinson 10 Jun '08

10 Jun '08

The attached patch fixes a few issues in the python bindings. First, UUIDString has, to my understanding, never worked. It expected to be passed a buffer to fill with the uuid, which through my tests isn't realistically doable from python. I added custom bindings to fix this, and it now works as expected, taking no arguments and returning a string. UUID for a storage pool wasn't being generated with its custom function, so it too was broken. This is also fixed. I also removed some stale entries for virStorageVol UUID functions from generator.py which were probably just carried along from an old version of the storage api patches (storage volumes don't use UUID). Thanks, Cole diff --git a/python/generator.py b/python/generator.py index 68a7203..1514c02 100755 --- a/python/generator.py +++ b/python/generator.py @@ -291,8 +291,10 @@ skip_impl = ( 'virDomainGetInfo', 'virNodeGetInfo', 'virDomainGetUUID', + 'virDomainGetUUIDString', 'virDomainLookupByUUID', 'virNetworkGetUUID', + 'virNetworkGetUUIDString', 'virNetworkLookupByUUID', 'virDomainGetAutostart', 'virNetworkGetAutostart', @@ -305,9 +307,8 @@ skip_impl = ( 'virDomainGetVcpus', 'virDomainPinVcpu', 'virStoragePoolGetUUID', + 'virStoragePoolGetUUIDString', 'virStoragePoolLookupByUUID', - 'virStorageVolGetUUID', - 'virStorageVolLookupByUUID', 'virStoragePoolGetInfo', 'virStorageVolGetInfo', 'virStoragePoolGetAutostart', diff --git a/python/libvir.c b/python/libvir.c index 8258cc2..9cc0c81 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -864,6 +864,33 @@ libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { } static PyObject * +libvirt_virDomainGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virDomainPtr dom; + PyObject *pyobj_dom; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetUUIDString", + &pyobj_dom)) + return(NULL); + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + if (dom == NULL) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainGetUUIDString(dom, &uuidstr[0]); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + py_retval = PyString_FromString((char *) &uuidstr[0]); + return(py_retval); +} + +static PyObject * libvirt_virDomainLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; virDomainPtr c_retval; @@ -997,6 +1024,33 @@ libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { } static PyObject * +libvirt_virNetworkGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virNetworkPtr net; + PyObject *pyobj_net; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"O:virNetworkGetUUIDString", + &pyobj_net)) + return(NULL); + net = (virNetworkPtr) PyvirNetwork_Get(pyobj_net); + + if (net == NULL) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virNetworkGetUUIDString(net, &uuidstr[0]); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + py_retval = PyString_FromString((char *) &uuidstr[0]); + return(py_retval); +} + +static PyObject * libvirt_virNetworkLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; virNetworkPtr c_retval; @@ -1363,6 +1417,31 @@ libvirt_virStoragePoolGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return(py_retval); } +static PyObject * +libvirt_virStoragePoolGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virStoragePoolPtr pool; + PyObject *pyobj_pool; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"O:virStoragePoolGetUUIDString", &pyobj_pool)) + return(NULL); + pool = (virStoragePoolPtr) PyvirStoragePool_Get(pyobj_pool); + + if (pool == NULL) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virStoragePoolGetUUIDString(pool, &uuidstr[0]); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + py_retval = PyString_FromString((char *) &uuidstr[0]); + return(py_retval); +} static PyObject * libvirt_virStoragePoolLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { @@ -1403,6 +1482,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetInfo", libvirt_virDomainGetInfo, METH_VARARGS, NULL}, {(char *) "virNodeGetInfo", libvirt_virNodeGetInfo, METH_VARARGS, NULL}, {(char *) "virDomainGetUUID", libvirt_virDomainGetUUID, METH_VARARGS, NULL}, + {(char *) "virDomainGetUUIDString", libvirt_virDomainGetUUIDString, METH_VARARGS, NULL}, {(char *) "virDomainLookupByUUID", libvirt_virDomainLookupByUUID, METH_VARARGS, NULL}, {(char *) "virRegisterErrorHandler", libvirt_virRegisterErrorHandler, METH_VARARGS, NULL}, {(char *) "virGetLastError", libvirt_virGetLastError, METH_VARARGS, NULL}, @@ -1410,6 +1490,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectListNetworks", libvirt_virConnectListNetworks, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedNetworks", libvirt_virConnectListDefinedNetworks, METH_VARARGS, NULL}, {(char *) "virNetworkGetUUID", libvirt_virNetworkGetUUID, METH_VARARGS, NULL}, + {(char *) "virNetworkGetUUIDString", libvirt_virNetworkGetUUIDString, METH_VARARGS, NULL}, {(char *) "virNetworkLookupByUUID", libvirt_virNetworkLookupByUUID, METH_VARARGS, NULL}, {(char *) "virDomainGetAutostart", libvirt_virDomainGetAutostart, METH_VARARGS, NULL}, {(char *) "virNetworkGetAutostart", libvirt_virNetworkGetAutostart, METH_VARARGS, NULL}, @@ -1428,6 +1509,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virStoragePoolGetInfo", libvirt_virStoragePoolGetInfo, METH_VARARGS, NULL}, {(char *) "virStorageVolGetInfo", libvirt_virStorageVolGetInfo, METH_VARARGS, NULL}, {(char *) "virStoragePoolGetUUID", libvirt_virStoragePoolGetUUID, METH_VARARGS, NULL}, + {(char *) "virStoragePoolGetUUIDString", libvirt_virStoragePoolGetUUIDString, METH_VARARGS, NULL}, {(char *) "virStoragePoolLookupByUUID", libvirt_virStoragePoolLookupByUUID, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; diff --git a/python/libvirt-python-api.xml b/python/libvirt-python-api.xml index f415c50..da643d7 100644 --- a/python/libvirt-python-api.xml +++ b/python/libvirt-python-api.xml @@ -48,11 +48,31 @@ <return type='char *' info='the 16 bytes string or None in case of error'/> <arg name='domain' type='virDomainPtr' info='a domain object'/> </function> + <function name='virDomainGetUUIDString' file='python'> + <info>Fetch globally unique ID of the domain as a string.</info> + <return type='char *' info='the UUID string or None in case of error'/> + <arg name='pool' type='virDomainPtr' info='a domain object'/> + </function> <function name='virNetworkGetUUID' file='python'> <info>Extract the UUID unique Identifier of a network.</info> <return type='char *' info='the 16 bytes string or None in case of error'/> <arg name='domain' type='virNetworkPtr' info='a network object'/> </function> + <function name='virNetworkGetUUIDString' file='python'> + <info>Fetch globally unique ID of the network as a string.</info> + <return type='char *' info='the UUID string or None in case of error'/> + <arg name='net' type='virNetworkPtr' info='a network object'/> + </function> + <function name='virStoragePoolGetUUID' file='python'> + <info>Extract the UUID unique Identifier of a storage pool.</info> + <return type='char *' info='the 16 bytes string or None in case of error'/> + <arg name='pool' type='virStoragePoolPtr' info='a storage pool object'/> + </function> + <function name='virStoragePoolGetUUIDString' file='python'> + <info>Fetch globally unique ID of the storage pool as a string.</info> + <return type='char *' info='the UUID string or None in case of error'/> + <arg name='pool' type='virStoragePoolPtr' info='a storage pool object'/> + </function> <function name='virNetworkGetAutostart' file='python'> <info>Extract the autostart flag for a network.</info> <return type='int' info='the autostart flag, or None in case of error'/>

3 2

[libvirt] [PATCH] virDomainMemoryPeek - peek into guest memory
by Richard W.M. Jones 10 Jun '08

10 Jun '08

This patch implements virDomainMemoryPeek, which allows callers to peek into guest (virtual) memory. Currently the patch contains a QEMU driver and remote support. There's also a big comment in the source describing how to do Xen. Obviously the use case for this is virt-mem: http://et.redhat.com/~rjones/virt-mem/ Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 59 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

4 10

[libvirt] [PATCH] lxc: new tty for container
by Dave Leskovec 10 Jun '08

10 Jun '08

The lxc driver xml parser treats the console element as input when it should be output only. This obviously causes problems when anything other than /dev/ptmx is specified or when a container is shutdown and then restarted without redefining it (so that the console field is reset). This patch treats the console element as output only and always creates a new device when starting a container. Also fixed up a string overflow when storing the device name. Thanks! -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

3 3