- Devel - libvirt List Archives

[libvirt] [PATCH v4 0/7] Support of auto-dump on watchdog event in libvirtd
by Hu Tao 02 Dec '10

02 Dec '10

This patch series adds a new watchdog action `dump' which lets libvirtd can do auto-dump when receiving a watchdog event from qemu guest. In order to make the function work, there must be a watchdog device added to guest, and guest must have a watchdog daemon running, for example, /etc/init.d/watchdog start or auto-started on boot. Changes: v4: - getCompressionType returns type of enum qemud_save_formats rather than int - use virThread api in thread pool - fix an error that qemuDomainObjBeginJobWithDriver() get lost in qemuDomainCoreDump() v3: - let default auto-dump dir be /var/lib/libvirt/qemu/dump Hu Tao (7): bug: local var referenced in another thread Add a threadpool implementation Fall back to QEMUD_SAVE_FORMAT_RAW if compression method fails. Add a new function doCoreDump Add a watchdog action `dump' Using threadpool API to manage qemud worker Add me to AUTHORS to make `make syntax-check' happy AUTHORS | 1 + cfg.mk | 3 +- daemon/libvirtd.c | 168 +++++------------------------ daemon/libvirtd.h | 4 + po/af.po | 14 ++-- po/am.po | 14 ++-- po/ar.po | 14 ++-- po/as.po | 14 ++-- po/be.po | 14 ++-- po/bg.po | 18 ++-- po/bn.po | 14 ++-- po/bn_IN.po | 18 ++-- po/bs.po | 14 ++-- po/ca.po | 42 ++++---- po/cs.po | 14 ++-- po/cy.po | 14 ++-- po/da.po | 14 ++-- po/de.po | 22 ++-- po/el.po | 22 ++-- po/en_GB.po | 14 ++-- po/es.po | 54 +++++----- po/et.po | 14 ++-- po/eu_ES.po | 14 ++-- po/fa.po | 14 ++-- po/fi.po | 14 ++-- po/fr.po | 94 ++++++++-------- po/gl.po | 14 ++-- po/gu.po | 14 ++-- po/he.po | 14 ++-- po/hi.po | 14 ++-- po/hr.po | 18 ++-- po/hu.po | 14 ++-- po/hy.po | 14 ++-- po/id.po | 14 ++-- po/is.po | 14 ++-- po/it.po | 54 +++++----- po/ja.po | 18 ++-- po/ka.po | 14 ++-- po/kn.po | 14 ++-- po/ko.po | 14 ++-- po/ku.po | 14 ++-- src/Makefile.am | 3 +- src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu.conf | 5 + src/qemu/qemu_conf.c | 16 +++- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_driver.c | 259 ++++++++++++++++++++++++++++++++------------ src/util/threadpool.c | 175 ++++++++++++++++++++++++++++++ src/util/threadpool.h | 62 +++++++++++ src/util/threads-pthread.c | 13 ++- 51 files changed, 868 insertions(+), 586 deletions(-) create mode 100644 src/util/threadpool.c create mode 100644 src/util/threadpool.h -- 1.7.3 -- Thanks, Hu Tao

2 10

[libvirt] [PATCH] maint: update .gitignore
by Eric Blake 02 Dec '10

02 Dec '10

* .gitignore: Ignore recent built file, sort. --- Pushing under the trivial rule. Noticed after a clean bootstrap. .gitignore | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 12ae5e3..5518d2d 100644 --- a/.gitignore +++ b/.gitignore @@ -50,10 +50,12 @@ /po/ /proxy/ /tests/*.log +/tests/cputest /tests/nwfilterxml2xmltest /update.log Makefile Makefile.in +TAGS coverage cscope.files cscope.out @@ -61,4 +63,3 @@ results.log stamp-h stamp-h.in stamp-h1 -TAGS -- 1.7.1

1 0

[libvirt] [PATCH] OpenVZ: drop fd leakage
by Guido Günther 01 Dec '10

01 Dec '10

Drop unused (and unclosed) errfd and close outfd on exit. Otherwise polling the running domains with virt-manager let's us quickly run out of fds. O.k. to apply? Cheers, -- Guido

2 2

[libvirt] [PATCH] qemu: Use macro for max and min vnc port instead of number
by Osier Yang 01 Dec '10

01 Dec '10

* src/qemu/qemu_driver.c (though MACROS QEMU_VNC_PORT_MAX, and QEMU_VNC_PORT_MIN are defined at the beginning, numbers (65535, 5900) are still used, replace them) --- src/qemu/qemu_driver.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fcb90a3..f733482 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2964,7 +2964,7 @@ static int qemudNextFreePort(struct qemud_driver *driver, int startPort) { int i; - for (i = startPort ; i < 65535 ; i++) { + for (i = startPort ; i < QEMU_VNC_PORT_MAX; i++) { int fd; int reuse = 1; struct sockaddr_in addr; @@ -3939,7 +3939,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (vm->def->ngraphics == 1) { if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && vm->def->graphics[0]->data.vnc.autoport) { - int port = qemudNextFreePort(driver, 5900); + int port = qemudNextFreePort(driver, QEMU_VNC_PORT_MIN); if (port < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to find an unused VNC port")); @@ -3948,7 +3948,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, vm->def->graphics[0]->data.vnc.port = port; } else if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && vm->def->graphics[0]->data.spice.autoport) { - int port = qemudNextFreePort(driver, 5900); + int port = qemudNextFreePort(driver, QEMU_VNC_PORT_MIN); int tlsPort = -1; if (port < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -7380,7 +7380,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, for (i = 0 ; i < def->ngraphics ; i++) { if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && def->graphics[i]->data.vnc.autoport) - def->graphics[i]->data.vnc.port = 5900; + def->graphics[i]->data.vnc.port = QEMU_VNC_PORT_MIN; } emulator = def->emulator; -- 1.7.3.2

2 1

[libvirt] [PATCH] Fix warning when macvtap support is disabled
by Jean-Baptiste Rouault 01 Dec '10

01 Dec '10

--- src/qemu/qemu_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b0343c6..7cd0603 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1689,6 +1689,7 @@ qemudPhysIfaceConnect(virConnectPtr conn, (void)qemuCmdFlags; (void)driver; (void)vmuuid; + (void)vmop; qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No support for macvtap device")); rc = -1; -- 1.7.0.4

3 2

[libvirt] [PATCH] qemu: Fix typo in qemuTeardownDiskPathDeny
by Osier Yang 01 Dec '10

01 Dec '10

typo in error message, it should be by copy-a-paste from "qemuSetupDiskPathAllow". * src/qemu/qemu_driver.c (qemuTeardownDiskPathDeny) --- 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 fcb90a3..5d90e59 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3401,7 +3401,7 @@ static int qemuTeardownDiskPathDeny(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED, VIR_DEBUG("Ignoring EACCES for %s", path); } else { virReportSystemError(-rc, - _("Unable to allow access for disk path %s"), + _("Unable to deny access for disk path %s"), path); return -1; } -- 1.7.3.2

2 1

[libvirt] [PATCH] virsh: update help for "virsh help help"
by Osier Yang 01 Dec '10

01 Dec '10

As virsh help supports both command and command group now, update "cmdHelp" to print consite help, (this patch is increment of "7829052757953023b0826e0293ffe18ed4ab89e9"). And also remove redundant empty line in "vshUsage". * tools/virsh.c --- tools/virsh.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 010e345..6a9aba2 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -562,13 +562,15 @@ vshReconnect(vshControl *ctl) { */ static const vshCmdInfo info_help[] = { {"help", N_("print help")}, - {"desc", N_("Prints global help or command specific help.")}, + {"desc", N_("Prints global help, command specific help, or help for a\n" + " group of related commands")}, {NULL, NULL} }; static const vshCmdOptDef opts_help[] = { - {"command", VSH_OT_DATA, 0, N_("name of command")}, + {"command", VSH_OT_DATA, 0, N_("Prints global help or command specific help.")}, + {"group", VSH_OT_DATA, 0, N_("Prints global help or help for a group of related commands.")}, {NULL, 0, 0, NULL} }; @@ -577,7 +579,12 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) { const vshCmdDef *c; const vshCmdGrp *g; - const char *name = vshCommandOptString(cmd, "command", NULL); + const char *name; + + name = vshCommandOptString(cmd, "command", NULL); + + if (!name) + name = vshCommandOptString(cmd, "group", NULL); if (!name) { const vshCmdGrp *grp; @@ -596,8 +603,8 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "\n"); } - return TRUE; - } + return TRUE; + } if ((c = vshCmddefSearch(name))) { return vshCmddefHelp(ctl, name); @@ -11694,7 +11701,7 @@ vshUsage(void) " -q | --quiet quiet mode\n" " -t | --timing print timing information\n" " -l | --log <file> output logging to file\n" - " -v | --version[=short] program version\n\n" + " -v | --version[=short] program version\n" " -V | --version=long version and full options\n\n" " commands (non interactive mode):\n\n"), progname, progname); -- 1.7.3.2

3 2

[libvirt] [PATCH] Fix undefined symbol error when macvtap support is disabled
by Matthias Bolte 01 Dec '10

01 Dec '10

Use macvtap specific functions depending on WITH_MACVTAP. Use #if instead of #ifdef to check for WITH_MACVTAP, because WITH_MACVTAP is always defined with value 0 or 1. Also export virVMOperationType{To|From}String unconditional, because they are used unconditional in the domain config code. --- src/libvirt_macvtap.syms | 5 +++-- src/libvirt_private.syms | 5 +++++ src/qemu/qemu_driver.c | 4 ++++ src/util/macvtap.h | 19 +++++++++---------- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/libvirt_macvtap.syms b/src/libvirt_macvtap.syms index 107b7da..b48565b 100644 --- a/src/libvirt_macvtap.syms +++ b/src/libvirt_macvtap.syms @@ -1,9 +1,10 @@ # +# These symbols are dependent on WITH_MACVTAP. +# + # macvtap.h delMacvtap; openMacvtapTap; -virVMOperationTypeFromString; -virVMOperationTypeToString; vpAssociatePortProfileId; vpDisassociatePortProfileId; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 310d8f4..3c1c823 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -504,6 +504,11 @@ virLogStartup; virLogUnlock; +# macvtap.h +virVMOperationTypeFromString; +virVMOperationTypeToString; + + # memory.h virAlloc; virAllocN; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fcb90a3..aa3478f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11879,6 +11879,7 @@ cleanup: return ret; } +#if WITH_MACVTAP static void qemudVPAssociatePortProfiles(virDomainDefPtr def) { int i; @@ -11913,6 +11914,7 @@ err_exit: } } } +#endif /* WITH_MACVTAP */ /* Finish is the third and final step, and it runs on the destination host. */ static virDomainPtr @@ -11974,7 +11976,9 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, goto cleanup; } +#if WITH_MACVTAP qemudVPAssociatePortProfiles(vm->def); +#endif /* WITH_MACVTAP */ if (flags & VIR_MIGRATE_PERSIST_DEST) { if (vm->persistent) diff --git a/src/util/macvtap.h b/src/util/macvtap.h index 389d1fd..3ae2c24 100644 --- a/src/util/macvtap.h +++ b/src/util/macvtap.h @@ -57,11 +57,6 @@ struct _virVirtualPortProfileParams { } u; }; - -# if defined(WITH_MACVTAP) - -# include "internal.h" - enum virVMOperationType { VIR_VM_OP_CREATE, VIR_VM_OP_SAVE, @@ -75,6 +70,10 @@ enum virVMOperationType { VIR_VM_OP_LAST }; +# if WITH_MACVTAP + +# include "internal.h" + int openMacvtapTap(const char *ifname, const unsigned char *macaddress, const char *linkdev, @@ -90,11 +89,9 @@ void delMacvtap(const char *ifname, const char *linkdev, virVirtualPortProfileParamsPtr virtPortProfile); -# endif /* WITH_MACVTAP */ - -# define MACVTAP_MODE_PRIVATE_STR "private" -# define MACVTAP_MODE_VEPA_STR "vepa" -# define MACVTAP_MODE_BRIDGE_STR "bridge" +# define MACVTAP_MODE_PRIVATE_STR "private" +# define MACVTAP_MODE_VEPA_STR "vepa" +# define MACVTAP_MODE_BRIDGE_STR "bridge" int vpAssociatePortProfileId(const char *macvtap_ifname, const unsigned char *macvtap_macaddr, @@ -109,6 +106,8 @@ int vpDisassociatePortProfileId(const char *macvtap_ifname, const virVirtualPortProfileParamsPtr virtPort, enum virVMOperationType vmOp); +# endif /* WITH_MACVTAP */ + VIR_ENUM_DECL(virVirtualPort) VIR_ENUM_DECL(virVMOperation) -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix flaw in thread creation APIs
by Daniel P. Berrange 01 Dec '10

01 Dec '10

The arguments passed to the thread function must be allocated on the heap, rather than the stack, since it is possible for the spawning thread to continue before the new thread runs at all. In such a case, it is possible that the area of stack where the thread args were stored is overwritten. * src/util/threads-pthread.c, src/util/threads-win32.c: Allocate thread arguments on the heap --- src/util/threads-pthread.c | 15 +++++++++++++-- src/util/threads-win32.c | 17 ++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c index 02070ae..bff4979 100644 --- a/src/util/threads-pthread.c +++ b/src/util/threads-pthread.c @@ -26,6 +26,8 @@ # include <sys/syscall.h> #endif +#include "memory.h" + /* Nothing special required for pthreads */ int virThreadInitialize(void) @@ -143,6 +145,7 @@ static void *virThreadHelper(void *data) { struct virThreadArgs *args = data; args->func(args->opaque); + VIR_FREE(args); return NULL; } @@ -151,17 +154,25 @@ int virThreadCreate(virThreadPtr thread, virThreadFunc func, void *opaque) { - struct virThreadArgs args = { func, opaque }; + struct virThreadArgs *args; pthread_attr_t attr; pthread_attr_init(&attr); + if (VIR_ALLOC(args) < 0) + return -1; + + args->func = func; + args->opaque = opaque; + if (!joinable) pthread_attr_setdetachstate(&attr, 1); - int ret = pthread_create(&thread->thread, &attr, virThreadHelper, &args); + int ret = pthread_create(&thread->thread, &attr, virThreadHelper, args); if (ret != 0) { + VIR_FREE(args); errno = ret; return -1; } + /* New thread owns 'args' in success case, so don't free */ return 0; } diff --git a/src/util/threads-win32.c b/src/util/threads-win32.c index 33be4cf..436b3bd 100644 --- a/src/util/threads-win32.c +++ b/src/util/threads-win32.c @@ -230,6 +230,8 @@ static void virThreadHelperDaemon(void *data) TlsSetValue(selfkey, NULL); CloseHandle(self.thread); + + VIR_FREE(args); } static unsigned int __stdcall virThreadHelperJoinable(void *data) @@ -249,6 +251,8 @@ static unsigned int __stdcall virThreadHelperJoinable(void *data) TlsSetValue(selfkey, NULL); CloseHandle(self.thread); + + VIR_FREE(args); return 0; } @@ -257,17 +261,24 @@ int virThreadCreate(virThreadPtr thread, virThreadFunc func, void *opaque) { - struct virThreadArgs args = { func, opaque }; + struct virThreadArgs *args; + + if (VIR_ALLOC(args) < 0) + return -1; + + args->func = func; + args->opaque = opaque; + thread->joinable = joinable; if (joinable) { thread->thread = (HANDLE)_beginthreadex(NULL, 0, virThreadHelperJoinable, - &args, 0, NULL); + args, 0, NULL); if (thread->thread == 0) return -1; } else { thread->thread = (HANDLE)_beginthread(virThreadHelperDaemon, - 0, &args); + 0, args); if (thread->thread == (HANDLE)-1L) return -1; } -- 1.7.2.3

2 1

[libvirt] Link error since commit c2b3827
by Jean-Baptiste Rouault 01 Dec '10

01 Dec '10

I get the following link error since commit c2b3827 : make[3]: Entering directory `/home/jb/Devel/libvirt/daemon' CCLD libvirtd ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_driver.o): In function `qemudVPAssociatePortProfiles': /home/jb/Devel/libvirt/src/qemu/qemu_driver.c:11891: undefined reference to `vpAssociatePortProfileId' /home/jb/Devel/libvirt/src/qemu/qemu_driver.c:11908: undefined reference to `vpDisassociatePortProfileId' Macvtap support is disabled and these 2 functions come from macvtap.h. Regards, -- Jean-Baptiste ROUAULT Ingénieur R&D - Diateam : Architectes de l'information Phone : +33 (0)9 53 16 02 70 Fax : +33 (0)2 98 050 051

2 1