- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] Fix tunnelled migration
by Jiri Denemark 26 Apr '12

26 Apr '12

All bugs fixed by the following patches were spotted while testing tunnelled migration. However, the first three of them may also be hit in other scenarios. Jiri Denemark (4): qemu: Preserve original error during migration rpc: Discard non-blocking calls only when necessary qemu: Fix detection of failed migration qemu: Avoid bogus error at the end of tunnelled migration src/qemu/qemu_migration.c | 171 +++++++++++++++++++++++++++++++++++++-------- src/rpc/virnetclient.c | 21 +++--- 2 files changed, 151 insertions(+), 41 deletions(-) -- 1.7.8.5

2 9

[libvirt] [PATCHv3] keepalive: Add ability to disable keepalive messages
by Peter Krempa 26 Apr '12

26 Apr '12

The docs for virConnectSetKeepAlive() advertise that this function should be able to disable keepalives on negative or zero interval time. This patch removes the check that prohibited this and adds code to disable keepalives on negative/zero interval. * src/libvirt.c: virConnectSetKeepAlive(): - remove check for negative values * src/rpc/virnetclient.c * src/rpc/virnetclient.h: - add virNetClientKeepAliveStop() to disable keepalive messages * src/remote/remote_driver.c: remoteSetKeepAlive(): -add ability to disable keepalives --- Diff to v2: - fixed whitespace - added a note that disabling client keepalives does actualy not influence keepalives sent by the daemon src/libvirt.c | 10 ++++------ src/probes.d | 2 +- src/remote/remote_driver.c | 7 ++++++- src/rpc/virkeepalive.c | 36 ++++++++++++++++++++++++++---------- src/rpc/virkeepalive.h | 1 + src/rpc/virnetclient.c | 8 ++++++++ src/rpc/virnetclient.h | 2 ++ 7 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index af42d3b..b01ebba 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18433,6 +18433,10 @@ error: * messages. Failure to do so may result in connections being closed * unexpectedly. * + * Note: This API function controls only keepalive messages sent by the client. + * If the server is configured to use keepalive you still need to run the event + * loop to respond to them, even if you disable keepalives by this function. + * * Returns -1 on error, 0 on success, 1 when remote party doesn't support * keepalive messages. */ @@ -18452,12 +18456,6 @@ int virConnectSetKeepAlive(virConnectPtr conn, return -1; } - if (interval <= 0) { - virLibConnError(VIR_ERR_INVALID_ARG, - _("negative or zero interval make no sense")); - goto error; - } - if (conn->driver->setKeepAlive) { ret = conn->driver->setKeepAlive(conn, interval, count); if (ret < 0) diff --git a/src/probes.d b/src/probes.d index 9d70cc9..e56dc3e 100644 --- a/src/probes.d +++ b/src/probes.d @@ -78,7 +78,7 @@ provider libvirt { probe rpc_keepalive_ref(void *ka, void *client, int refs); probe rpc_keepalive_free(void *ka, void *client, int refs); probe rpc_keepalive_start(void *ka, void *client, int interval, int count); - probe rpc_keepalive_stop(void *ka, void *client); + probe rpc_keepalive_stop(void *ka, void *client, bool all); probe rpc_keepalive_send(void *ka, void *client, int prog, int vers, int proc); probe rpc_keepalive_received(void *ka, void *client, int prog, int vers, int proc); probe rpc_keepalive_timeout(void *ka, void *client, int coundToDeath, int idle); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index af46384..7863b73 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4631,7 +4631,12 @@ remoteSetKeepAlive(virConnectPtr conn, int interval, unsigned int count) goto cleanup; } - ret = virNetClientKeepAliveStart(priv->client, interval, count); + if (interval > 0) { + ret = virNetClientKeepAliveStart(priv->client, interval, count); + } else { + virNetClientKeepAliveStop(priv->client); + ret = 0; + } cleanup: remoteDriverUnlock(priv); diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 06b8e63..a5c2b1a 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -372,32 +372,48 @@ cleanup: } -void -virKeepAliveStop(virKeepAlivePtr ka) +static void +virKeepAliveStopInternal(virKeepAlivePtr ka, bool all) { virKeepAliveLock(ka); PROBE(RPC_KEEPALIVE_STOP, - "ka=%p client=%p", - ka, ka->client); + "ka=%p client=%p all=%d", + ka, ka->client, all); if (ka->timer > 0) { virEventRemoveTimeout(ka->timer); ka->timer = -1; } - if (ka->responseTimer > 0) { - virEventRemoveTimeout(ka->responseTimer); - ka->responseTimer = -1; - } + if (all) { + if (ka->responseTimer > 0) { + virEventRemoveTimeout(ka->responseTimer); + ka->responseTimer = -1; + } - virNetMessageFree(ka->response); - ka->response = NULL; + virNetMessageFree(ka->response); + ka->response = NULL; + } virKeepAliveUnlock(ka); } +void +virKeepAliveStop(virKeepAlivePtr ka) +{ + virKeepAliveStopInternal(ka, true); +} + + +void +virKeepAliveStopSending(virKeepAlivePtr ka) +{ + virKeepAliveStopInternal(ka, false); +} + + bool virKeepAliveCheckMessage(virKeepAlivePtr ka, virNetMessagePtr msg) diff --git a/src/rpc/virkeepalive.h b/src/rpc/virkeepalive.h index f1654eb..af9e722 100644 --- a/src/rpc/virkeepalive.h +++ b/src/rpc/virkeepalive.h @@ -49,6 +49,7 @@ int virKeepAliveStart(virKeepAlivePtr ka, int interval, unsigned int count); void virKeepAliveStop(virKeepAlivePtr ka); +void virKeepAliveStopSending(virKeepAlivePtr ka); bool virKeepAliveCheckMessage(virKeepAlivePtr ka, virNetMessagePtr msg); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 33b7701..d88288d 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -248,6 +248,14 @@ virNetClientKeepAliveStart(virNetClientPtr client, return ret; } +void +virNetClientKeepAliveStop(virNetClientPtr client) +{ + virNetClientLock(client); + virKeepAliveStopSending(client->keepalive); + virNetClientUnlock(client); +} + static void virNetClientKeepAliveDeadCB(void *opaque) { diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 7c30d2b..13b4f96 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -104,4 +104,6 @@ int virNetClientKeepAliveStart(virNetClientPtr client, int interval, unsigned int count); +void virNetClientKeepAliveStop(virNetClientPtr client); + #endif /* __VIR_NET_CLIENT_H__ */ -- 1.7.3.4

2 2

[libvirt] [PATCH] build: fix bootstrap on RHEL
by Eric Blake 26 Apr '12

26 Apr '12

Commit 8fe455fd364cd7462e02170084c45a58ee302cc3 tried to work around a regression introduced in upstream gnulib that requires gettext 0.18 or newer on all projects using bootstrap, by making libvirt require gettext 0.18. But this fails on RHEL 6.2, which still ships gettext 0.17. Revert that change, and instead, import the latest round of gnulib updates that fix that problem properly. If you have already built in the window where libvirt required 0.18, be aware that incremental updates may run into problems: this is because 'autopoint --force' will not downgrade m4/po.m4 back to an older version, but it must be downgraded back to 0.17 levels to work with this patch. You may either manually remove that file then rerun bootstrap, or it may prove easier to just clean up all non-git files to start from a clean slate. * bootstrap.conf: Revert minimum gettext back to 0.17. * configure.ac: Likewise. * .gnulib: Update to latest, for bootstrap fixes. * bootstrap: Resync from gnulib. --- Pushing under the build-breaker rule (and this took me a lot longer than I wanted, but I'm happy with the solution). * .gnulib f15a17d...bb2f564 (6): > bootstrap: only force latest Makefile.in.in for gettext module > doc: Mention reason for replacement on glibc/Linux systems. > pwrite: Don't replace on all platforms. > rint* tests: Avoid gcc warnings. > users.txt: Update. > Large File Support for native Windows platforms. .gnulib | 2 +- bootstrap | 12 ++++++++++-- bootstrap.conf | 2 +- configure.ac | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gnulib b/.gnulib index f15a17d..bb2f564 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit f15a17dc1f5d2b1fc8a423795c54b211552c0483 +Subproject commit bb2f5640d5379c5b4eec2d62341413bbab1aa308 diff --git a/bootstrap b/bootstrap index 5aa73cc..6b45868 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-04-19.22; # UTC +scriptversion=2012-04-25.17; # UTC # Bootstrap this package from checked-out sources. @@ -873,7 +873,15 @@ if test $with_gettext = yes; then } ' po/Makevars.template >po/Makevars || exit 1 - cat $GNULIB_SRCDIR/build-aux/po/Makefile.in.in > po/Makefile.in.in || exit 1 + # If the 'gettext' module is in use, grab the latest Makefile.in.in. + # If only the 'gettext-h' module is in use, assume autopoint already + # put the correct version of this file into place. + case $gnulib_modules in + *gettext-h*) ;; + *gettext*) + cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in || exit 1 + ;; + esac if test -d runtime-po; then # Similarly for runtime-po/Makevars, but not quite the same. diff --git a/bootstrap.conf b/bootstrap.conf index 56911e0..c6620e5 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -195,7 +195,7 @@ buildreq="\ autoconf 2.59 automake 1.9.6 autopoint - -gettext 0.18 +gettext 0.17 git 1.5.5 gzip - libtool - diff --git a/configure.ac b/configure.ac index 5936d31..89fe818 100644 --- a/configure.ac +++ b/configure.ac @@ -2300,7 +2300,7 @@ dnl compute the difference between save_CPPFLAGS and CPPFLAGS and append it dnl to INCLUDES in order to preserve changes made by gettext but in a place dnl that does not break the build save_CPPFLAGS="$CPPFLAGS" -AM_GNU_GETTEXT_VERSION([0.18]) +AM_GNU_GETTEXT_VERSION([0.17]) AM_GNU_GETTEXT([external]) GETTEXT_CPPFLAGS= if test "x$save_CPPFLAGS" != "x$CPPFLAGS"; then -- 1.7.7.6

1 0

[libvirt] More SR-IOV VF support needed (IFLA_VF_VLAN/IFLA_VF_SPOOFCHK)
by Dax Kelson 26 Apr '12

26 Apr '12

Hi guys, I have some brand new hardware with a Intel X540-AT2 10Gbe NIC. I see that 0.9.11 added <interface type='hostdev'> with the ability define a MAC address to address the randomly generated MAC address issue. Thank you! I believe that additional functionality is needed in two areas, namely support for transparent VLAN tagging and the ability to disable MAC spoof checking within the NIC's embedded switch. With transparent VLAN tagging (IFLA_VF_VLAN), the PF transparently tags all traffic from the VF with a configured VLAN ID and strips the VLAN tag from traffic going to the VM. The VM is not aware of the VLAN tag. Disabling of the MAC spoof check (IFLA_VF_SPOOFCHK) allows the VM to be able to do NIC bonding of two VFs. These two features correspond to the following commands: ip link set em<X> vf <n> vlan <VLAN> ip link set em<X> vf <n> spoofchk [on|off] (note, requires iproute2 v3.3.0) As far as XML format, how about something like: <devices> <interface type='hostdev'> <source> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </source> <mac address='52:54:00:6d:90:02'> <vlan id='241'> <disablespoofchk/> </interface> </devices> Comments? Dax Kelson Guru Labs

1 0

[libvirt] [PATCHv2] keepalive: Add ability to disable keepalive messages
by Peter Krempa 25 Apr '12

25 Apr '12

The docs for virConnectSetKeepAlive() advertise that this function should be able to disable keepalives on negative or zero interval time. This patch removes the check that prohibited this and adds code to disable keepalives on negative/zero interval. * src/libvirt.c: virConnectSetKeepAlive(): - remove check for negative values * src/rpc/virnetclient.c * src/rpc/virnetclient.h: - add virNetClientKeepAliveStop() to disable keepalive messages * src/remote/remote_driver.c: remoteSetKeepAlive(): -add ability to disable keepalives --- Diff to v1: - added virKeepAliveStopSending() that does not unregister the timer needed to handle server keepalives - moved implementation of virKeepAliveStop() to virKeepAliveStopInternal() - added usage of the new function on the apropriate place - modified systemtap definitions to accomodate new argument src/libvirt.c | 6 ------ src/probes.d | 2 +- src/remote/remote_driver.c | 7 ++++++- src/rpc/virkeepalive.c | 38 ++++++++++++++++++++++++++++---------- src/rpc/virkeepalive.h | 1 + src/rpc/virnetclient.c | 8 ++++++++ src/rpc/virnetclient.h | 2 ++ 7 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index af42d3b..3f043e1 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18452,12 +18452,6 @@ int virConnectSetKeepAlive(virConnectPtr conn, return -1; } - if (interval <= 0) { - virLibConnError(VIR_ERR_INVALID_ARG, - _("negative or zero interval make no sense")); - goto error; - } - if (conn->driver->setKeepAlive) { ret = conn->driver->setKeepAlive(conn, interval, count); if (ret < 0) diff --git a/src/probes.d b/src/probes.d index 9d70cc9..e56dc3e 100644 --- a/src/probes.d +++ b/src/probes.d @@ -78,7 +78,7 @@ provider libvirt { probe rpc_keepalive_ref(void *ka, void *client, int refs); probe rpc_keepalive_free(void *ka, void *client, int refs); probe rpc_keepalive_start(void *ka, void *client, int interval, int count); - probe rpc_keepalive_stop(void *ka, void *client); + probe rpc_keepalive_stop(void *ka, void *client, bool all); probe rpc_keepalive_send(void *ka, void *client, int prog, int vers, int proc); probe rpc_keepalive_received(void *ka, void *client, int prog, int vers, int proc); probe rpc_keepalive_timeout(void *ka, void *client, int coundToDeath, int idle); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index af46384..7863b73 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4631,7 +4631,12 @@ remoteSetKeepAlive(virConnectPtr conn, int interval, unsigned int count) goto cleanup; } - ret = virNetClientKeepAliveStart(priv->client, interval, count); + if (interval > 0) { + ret = virNetClientKeepAliveStart(priv->client, interval, count); + } else { + virNetClientKeepAliveStop(priv->client); + ret = 0; + } cleanup: remoteDriverUnlock(priv); diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 06b8e63..345c69d 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -372,32 +372,50 @@ cleanup: } -void -virKeepAliveStop(virKeepAlivePtr ka) +static void +virKeepAliveStopInternal(virKeepAlivePtr ka, bool all) { virKeepAliveLock(ka); PROBE(RPC_KEEPALIVE_STOP, - "ka=%p client=%p", - ka, ka->client); + "ka=%p client=%p all=%d", + ka, ka->client, all); if (ka->timer > 0) { virEventRemoveTimeout(ka->timer); ka->timer = -1; } - if (ka->responseTimer > 0) { - virEventRemoveTimeout(ka->responseTimer); - ka->responseTimer = -1; - } + if (all) + { + + if (ka->responseTimer > 0) { + virEventRemoveTimeout(ka->responseTimer); + ka->responseTimer = -1; + } - virNetMessageFree(ka->response); - ka->response = NULL; + virNetMessageFree(ka->response); + ka->response = NULL; + } virKeepAliveUnlock(ka); } +void +virKeepAliveStop(virKeepAlivePtr ka) +{ + virKeepAliveStopInternal(ka, true); +} + + +void +virKeepAliveStopSending(virKeepAlivePtr ka) +{ + virKeepAliveStopInternal(ka, false); +} + + bool virKeepAliveCheckMessage(virKeepAlivePtr ka, virNetMessagePtr msg) diff --git a/src/rpc/virkeepalive.h b/src/rpc/virkeepalive.h index f1654eb..af9e722 100644 --- a/src/rpc/virkeepalive.h +++ b/src/rpc/virkeepalive.h @@ -49,6 +49,7 @@ int virKeepAliveStart(virKeepAlivePtr ka, int interval, unsigned int count); void virKeepAliveStop(virKeepAlivePtr ka); +void virKeepAliveStopSending(virKeepAlivePtr ka); bool virKeepAliveCheckMessage(virKeepAlivePtr ka, virNetMessagePtr msg); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 33b7701..d88288d 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -248,6 +248,14 @@ virNetClientKeepAliveStart(virNetClientPtr client, return ret; } +void +virNetClientKeepAliveStop(virNetClientPtr client) +{ + virNetClientLock(client); + virKeepAliveStopSending(client->keepalive); + virNetClientUnlock(client); +} + static void virNetClientKeepAliveDeadCB(void *opaque) { diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 7c30d2b..13b4f96 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -104,4 +104,6 @@ int virNetClientKeepAliveStart(virNetClientPtr client, int interval, unsigned int count); +void virNetClientKeepAliveStop(virNetClientPtr client); + #endif /* __VIR_NET_CLIENT_H__ */ -- 1.7.3.4

1 1

[libvirt] [PATCH] virNetDevMacVLanVPortProfileRegisterCallback: Fix segfault
by Michal Privoznik 25 Apr '12

25 Apr '12

Currently, we are calling memcpy(virtPortProfile, ...) unconditionally. Which means if virtPortProfile is NULL we SIGSEGV. Therefore, add check to call memcpy() conditionally. (gdb) bt #0 virNetDevMacVLanVPortProfileRegisterCallback (ifname=0x7ffff3f1ee60 "macvtap0", macaddress=0x7fffe8096e34 "RT", linkdev=0x7fffe8098b90 "eth0", vmuuid=0x7fffe8099558 "l\220*\237u`\326\213\325\227F\f-B\bD0g\t\350\377\177", virtPortProfile=0x0, vmOp=VIR_NETDEV_VPORT_PROFILE_OP_CREATE) at /usr/include/bits/string3.h:52 #1 0x00007ffff7782446 in virNetDevMacVLanCreateWithVPortProfile (tgifname=<optimized out>, macaddress=0x7fffe8096e34 "RT", linkdev=0x7fffe8098b90 "eth0", mode=<optimized out>, withTap=true, vnet_hdr=0, vmuuid=0x7fffe8099558 "l\220*\237u`\326\213\325\227F\f-B\bD0g\t\350\377\177", virtPortProfile=0x0, res_ifname=0x7ffff3f1ef00, vmOp=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, stateDir=0x7fffe800d900 "/var/run/libvirt/qemu", bandwidth=0x0) at util/virnetdevmacvlan.c:954 #2 0x00000000004738d4 in qemuPhysIfaceConnect () #3 0x000000000047e5f3 in qemuBuildCommandLine () #4 0x000000000049a404 in qemuProcessStart () #5 0x0000000000468ac9 in qemuDomainObjStart () #6 0x0000000000469112 in qemuDomainStartWithFlags () #7 0x00007ffff77ef0c6 in virDomainCreate (domain=0x768cb0) at libvirt.c:8162 #8 0x000000000043e158 in remoteDispatchDomainCreateHelper () #9 0x00007ffff783d835 in virNetServerProgramDispatchCall (msg=0x7fffe80cbe50, client=0x7699d0, server=0x7658a0, prog=0x770ab0) at rpc/virnetserverprogram.c:416 #10 virNetServerProgramDispatch (prog=0x770ab0, server=0x7658a0, client=0x7699d0, msg=0x7fffe80cbe50) at rpc/virnetserverprogram.c:289 #11 0x00007ffff7839961 in virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x7658a0) at rpc/virnetserver.c:161 #12 0x00007ffff776c1ce in virThreadPoolWorker (opaque=<optimized out>) at util/threadpool.c:144 #13 0x00007ffff776b876 in virThreadHelper (data=<optimized out>) at util/threads-pthread.c:161 #14 0x00007ffff74f0e2c in start_thread () from /lib64/libpthread.so.0 #15 0x00007ffff723766d in clone () from /lib64/libc.so.6 --- src/util/virnetdevmacvlan.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 879d846..c2fd6d0 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -769,9 +769,11 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, goto memory_error; if ((calld->cr_ifname = strdup(ifname)) == NULL) goto memory_error; - if (VIR_ALLOC(calld->virtPortProfile) < 0) - goto memory_error; - memcpy(calld->virtPortProfile, virtPortProfile, sizeof(*virtPortProfile)); + if (virtPortProfile) { + if (VIR_ALLOC(calld->virtPortProfile) < 0) + goto memory_error; + memcpy(calld->virtPortProfile, virtPortProfile, sizeof(*virtPortProfile)); + } if (VIR_ALLOC_N(calld->macaddress, VIR_MAC_BUFLEN) < 0) goto memory_error; memcpy(calld->macaddress, macaddress, VIR_MAC_BUFLEN); -- 1.7.8.5

4 5

[libvirt] [PATCH] macvtap: use embedded buffers for MAC address and UUID
by Stefan Berger 25 Apr '12

25 Apr '12

Use embedded buffers for the MAC addresses and the VM's UUID. --- src/util/virnetdevmacvlan.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) Index: libvirt-acl/src/util/virnetdevmacvlan.c =================================================================== --- libvirt-acl.orig/src/util/virnetdevmacvlan.c +++ libvirt-acl/src/util/virnetdevmacvlan.c @@ -435,10 +435,10 @@ static const uint32_t modeMap[VIR_NETDEV struct virNetlinkCallbackData { char *cr_ifname; virNetDevVPortProfilePtr virtPortProfile; - unsigned char *macaddress; + unsigned char macaddress[VIR_UUID_BUFLEN]; char *linkdev; int vf; - unsigned char *vmuuid; + unsigned char vmuuid[VIR_UUID_BUFLEN]; enum virNetDevVPortProfileOp vmOp; unsigned int linkState; }; @@ -728,9 +728,7 @@ virNetlinkCallbackDataFree(virNetlinkCal if (calld) { VIR_FREE(calld->cr_ifname); VIR_FREE(calld->virtPortProfile); - VIR_FREE(calld->macaddress); VIR_FREE(calld->linkdev); - VIR_FREE(calld->vmuuid); } VIR_FREE(calld); } @@ -772,14 +770,10 @@ virNetDevMacVLanVPortProfileRegisterCall if (VIR_ALLOC(calld->virtPortProfile) < 0) goto memory_error; memcpy(calld->virtPortProfile, virtPortProfile, sizeof(*virtPortProfile)); - if (VIR_ALLOC_N(calld->macaddress, VIR_MAC_BUFLEN) < 0) - goto memory_error; - memcpy(calld->macaddress, macaddress, VIR_MAC_BUFLEN); + memcpy(calld->macaddress, macaddress, sizeof(calld->macaddress)); if ((calld->linkdev = strdup(linkdev)) == NULL) goto memory_error; - if (VIR_ALLOC_N(calld->vmuuid, VIR_UUID_BUFLEN) < 0) - goto memory_error; - memcpy(calld->vmuuid, vmuuid, VIR_UUID_BUFLEN); + memcpy(calld->vmuuid, vmuuid, sizeof(calld->vmuuid)); calld->vmOp = vmOp;

2 2

[libvirt] [test-API] add docs files TESTCASE.py and TESTCASES.conf
by Guannan Ren 25 Apr '12

25 Apr '12

*docs/TESTCASE.py: an template of testcase.py *docs/TESTCASES.conf: an template of testcase config file with simple explanation --- docs/TESTCASE.py | 45 ++++++++++++++++++++++++++++++++ docs/TESTCASES.conf | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 0 deletions(-) create mode 100644 docs/TESTCASE.py create mode 100644 docs/TESTCASES.conf diff --git a/docs/TESTCASE.py b/docs/TESTCASE.py new file mode 100644 index 0000000..48adb56 --- /dev/null +++ b/docs/TESTCASE.py @@ -0,0 +1,45 @@ +#! /usr/bin/env python +# How to write a new testcase + +# If testcase wants to use the connection object offered +# by the framework or share variables between testcases +# import sharedmod module. +import sharedmod + +# List parameters supported by the testcase in the two +# global tuple variables with a ',' at the end of last element. +# Both of them are mandatory. +required_params = ('option1', 'option2',) +optional_params = () + +# The check function is optional. This is for some testcases that +# need to check whether specific hardware is present on box or +# testing environment is good before testing. +# Return value 0 means check pass, 1 means to skip the +# testcase during running. +def TESTCASE_check(params): + logger = params['logger'] + ... + return 0 + +# This is the main testing function, The function name must be +# the same as the file name of the testcase. params['logger'] is +# provided by framework for logging. +# Return value 0 means the success of testing, 1 means testing failure. +# It is mandatory. +def TESTCASE(params): + logger = params['logger'] + ... + return 0 + +# The clean function is optional. This is for testcases that dirtied +# testing environment after executed. If keyword 'clean' is set +# just below the testcase in testcase config file, the clean function +# defined in the testcase.py will be invoked by framework to do the +# cleaning job. +# Return value is optional too, 1 means clean failure, but will not +# stop the run of testing. +def TESTCASE_clean(params): + logger = params['logger'] + ... + return 0 diff --git a/docs/TESTCASES.conf b/docs/TESTCASES.conf new file mode 100644 index 0000000..1ca351b --- /dev/null +++ b/docs/TESTCASES.conf @@ -0,0 +1,70 @@ +# single line comments looks like this + +/* + Multiline comments look like this. + The lines enclosed by the C style comments will + be skipped by parser.py +*/ + +############################################################### +# Indentation: +# An indent level is four spaces, do not use tabs to indent. +# + +# .----------- testcase: The first line contains the module name and the test case name separated by a colon and is not indented. +# | +domain:undefine + +# .-------- options: Indent options by an indent level(four spaces) +# | + guestname + +# .---- value: Indent Values by two indent levels(eight spaces) +# | + fedoraVM + +################################################################ +# +# Keywords: 'clean', 'times', 'sleep', '{start_loop, end_loop}' +# + +# 'clean': invoke the clean function in previous testcase +clean + +# 'times': repeat testcase 'repos/domain/install_linux_cdrom.py' N times +domain:install_linux_cdrom times 2 + guestname + fedoraVM + memory + 1024 + vcpu + 1 + +# 'sleep 5': pause the run of testing for N seconds. +sleep 5 + +# The pair of 'start_loop' and 'end_loop' will +# run the testcases between them N loops +domain:start start_loop + guestname + fedoraVM + +domain:destroy end_loop 3 + guestname + fedoraVM + +################################################################ +# +# Options: 'times', 'cleanup' +# always be the last line of testcase config file +# + +# .---------------------- repeat the above testcases n more times. +# | .-------------- invoke the clean function in all of above testcases +# | | +options times=2 cleanup=enable + +# python libvirt-test-api.py -t repos/domain/undefine.py repos/domain/install_linux_cdrom.py \ +# repos/domain/start.py repos/domain/destroy.py +# +# The command generates a template of tescase file like above -- 1.7.7.5

1 1

[libvirt] [test-API PATCH] use global variable domain_cache_folder to as cache folder for guest install
by Guannan Ren 25 Apr '12

25 Apr '12

--- global.cfg | 15 +++++++++------ repos/domain/install_linux_cdrom.py | 22 ++++++++++------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/global.cfg b/global.cfg index 6cfdcac..7b7b7cb 100644 --- a/global.cfg +++ b/global.cfg @@ -142,6 +143,8 @@ defaultnic = virtio static_uuid = 05867c1a-afeb-300e-e55e-2673391ae080 # path to a disk image containing a preinstalled guest for testing testfullimagepath = /var/lib/libvirt/images/f14.img +# path to store temporary iso and kickstart file +domain_cache_folder = /var/cache/libvirt-test-api ################################################################ # diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py index 60d12a7..f70ebc3 100644 --- a/repos/domain/install_linux_cdrom.py +++ b/repos/domain/install_linux_cdrom.py @@ -36,18 +36,16 @@ VM_STAT = "virsh --quiet list --all| grep \"\\b%s\\b\"|grep off" VM_DESTROY = "virsh destroy %s" VM_UNDEFINE = "virsh undefine %s" -BOOT_DIR = "/var/lib/libvirt/boot/" HOME_PATH = os.getcwd() -def prepare_cdrom(*args): +def prepare_cdrom(ostree, ks, guestname, cache_folder, logger): """ to customize boot.iso file to add kickstart file into it for automatic guest installation """ - ostree, ks, guestname, logger = args ks_name = os.path.basename(ks) - new_dir = os.path.join(HOME_PATH, guestname) - logger.info("creating a new folder for customizing custom.iso file in it") + new_dir = os.path.join(cache_folder, guestname) + logger.info("creating a workshop folder for customizing custom.iso file") if os.path.exists(new_dir): logger.info("the folder exists, remove it") @@ -68,7 +66,7 @@ def prepare_cdrom(*args): shutil.copy('utils/ksiso.sh', new_dir) src_path = os.getcwd() - logger.info("enter into the workshop folder: %s" % new_dir) + logger.debug("enter folder: %s" % new_dir) os.chdir(new_dir) shell_cmd = 'sh ksiso.sh %s' % ks_name @@ -76,8 +74,8 @@ def prepare_cdrom(*args): (status, text) = commands.getstatusoutput(shell_cmd) logger.debug(text) - logger.info("make custom.iso file, change to original directory: %s" % - src_path) + + logger.debug("go back to original directory: %s" % src_path) os.chdir(src_path) def prepare_boot_guest(domobj, xmlstr, guestname, installtype, logger): @@ -194,13 +192,13 @@ def install_linux_cdrom(params): logger.debug('kisckstart file: \n %s' % ks) logger.info('prepare installation...') + cache_folder = envparser.get_value("variables", "domain_cache_folder") - bootcd = '%s/custom.iso' % \ - (os.path.join(HOME_PATH, guestname)) - logger.debug("the bootcd path is %s" % bootcd) logger.info("begin to customize the custom.iso file") - prepare_cdrom(ostree, ks, guestname, logger) + prepare_cdrom(ostree, ks, guestname, cache_folder, logger) + bootcd = '%s/custom.iso' % \ + (os.path.join(cache_folder, guestname)) xmlstr = xmlstr.replace('CUSTOMISO', bootcd) logger.debug('dump installation guest xml:\n%s' % xmlstr) -- 1.7.7.5

1 0

[libvirt] [test-API PATCH 0/4] problems fixed during testcase run
by Guannan Ren 25 Apr '12

25 Apr '12

I ran a loop of existing testcases to ensure the cleanup that we did these days is neat and successful. The four patches is the final update. first, update testcase config files in cases folder to use new params of testcases. second, Fix a framework bug. third, add missing modules. fourth, final testcases cleanup.

3 21