- Devel - libvirt List Archives

[libvirt] make syntax-check -> make: *** [sc_check_author_list] Error 1 on libvirt-0.8.5
by Kenneth Nagin 05 Dec '10

05 Dec '10

I am receiving syntax error when compiling libvirt-0.8.5. However, make without syntax-check completes successfully. These are details of the failure. :~/LIBVIRT/libvirt-0.8.5$ make syntax-check GFDL_version 1.74 GFDL_version TAB_in_indentation 0.04 TAB_in_indentation Wundef_boolean 0.03 Wundef_boolean avoid_ctype_macros 0.19 avoid_ctype_macros avoid_if_before_free 9.42 avoid_if_before_free avoid_write 0.04 avoid_write cast_of_argument_to_free 0.17 cast_of_argument_to_free cast_of_x_alloc_return_value 0.16 cast_of_x_alloc_return_value changelog 0.02 changelog check_author_list %aE maint.mk: committer(s) not listed in AUTHORS make: *** [sc_check_author_list] Error 1 Best Regards, Kenneth Nagin

3 6

[libvirt] [PATCH] qemu: Don't try to set input FD to -1
by Matthias Bolte 05 Dec '10

05 Dec '10

--- src/qemu/qemu_driver.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 54e9dcb..1b86b5e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4091,7 +4091,10 @@ static int qemudStartVMDaemon(virConnectPtr conn, VIR_WARN("Executing %s", vm->def->emulator); virCommandSetPreExecHook(cmd, qemudSecurityHook, &hookData); - virCommandSetInputFD(cmd, stdin_fd); + + if (stdin_fd != -1) + virCommandSetInputFD(cmd, stdin_fd); + virCommandSetOutputFD(cmd, &logfile); virCommandSetErrorFD(cmd, &logfile); virCommandNonblockingFDs(cmd); -- 1.7.0.4

2 2

[libvirt] Segfault in virCommandRun when trying to start a QEMU guest
by Matthias Bolte 05 Dec '10

05 Dec '10

In qemudStartVMDaemon in/out/err for the virCommand are set based on FDs this results in a segfault in virCommandRun here VIR_DEBUG("Result stdout: '%s' stderr: '%s'", NULLSTR(*cmd->outbuf), NULLSTR(*cmd->errbuf)); as cmd->outbuf and cmd->errbuf are NULL. The two if blocks before that setup cmd->outbuf and cmd->errbuf in case the caller didn't request output capturing aren't executed because the caller requested to capture the output to FDs. /* If caller hasn't requested capture of stdout/err, then capture * it ourselves so we can log it. */ if (!cmd->outfdptr) { cmd->outfdptr = &cmd->outfd; cmd->outbuf = &outbuf; } if (!cmd->errfdptr) { cmd->errfdptr = &cmd->errfd; cmd->errbuf = &errbuf; } In the case the caller requested to capture the output to FDs there is no capturing to cmd->outbuf and cmd->errbuf and they stay NULL. When I remove that offending VIR_DEBUG line everything works fine. Also this case of FD only usage is not yet covered in the command API test cases. Matthias

1 0

[libvirt] [PATCH] Create file in virFileWriteStr() if it doesn't exist
by Jean-Baptiste Rouault 04 Dec '10

04 Dec '10

This patch adds a virFileWriteStrEx() function with a third parameter to set the created file permissions. virFileWriteStr() calls this new function with a default value for the mode parameter. --- src/util/util.c | 11 ++++++++--- src/util/util.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index a2582aa..82ca9b3 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1123,14 +1123,19 @@ int virFileReadAll(const char *path, int maxlen, char **buf) return len; } -/* Truncate @path and write @str to it. +int virFileWriteStr(const char *path, const char *str) +{ + return virFileWriteStrEx(path, str, S_IRUSR|S_IWUSR); +} + +/* Truncate or create @path and write @str to it. Return 0 for success, nonzero for failure. Be careful to preserve any errno value upon failure. */ -int virFileWriteStr(const char *path, const char *str) +int virFileWriteStrEx(const char *path, const char *str, mode_t mode) { int fd; - if ((fd = open(path, O_WRONLY|O_TRUNC)) == -1) + if ((fd = open(path, O_WRONLY|O_TRUNC|O_CREAT, mode)) == -1) return -1; if (safewrite(fd, str, strlen(str)) < 0) { diff --git a/src/util/util.h b/src/util/util.h index a240d87..18ef693 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -96,6 +96,7 @@ int virFileReadLimFD(int fd, int maxlen, char **buf) ATTRIBUTE_RETURN_CHECK; int virFileReadAll(const char *path, int maxlen, char **buf) ATTRIBUTE_RETURN_CHECK; +int virFileWriteStrEx(const char *path, const char *str, mode_t mode) ATTRIBUTE_RETURN_CHECK; int virFileWriteStr(const char *path, const char *str) ATTRIBUTE_RETURN_CHECK; int virFileMatchesNameSuffix(const char *file, -- 1.7.0.4

3 6

[libvirt] [PATCH 0/2] smbios fixes
by Eric Blake 04 Dec '10

04 Dec '10

In testing <smbios mode='host'/>, I noticed a couple of problems. First, qemu rejected the command line we gave it (invalid UUID); ifixingthat showed that all other arguments were being given literal "" which then made the guest smbios differ from the host. Second, the qemu option -smbios type=1,family=string wasn't supported, which lead to a spurious difference between host and guest. Meanwhile, qemu has a bug where '-smbios type=1,uuid=uuid' must parse as a valid uuid, but is otherwise ignored. The current qemu.git code base _only_ sets smbios uuid from the '-uuid uuid' argument. I've filed a bug against the qemu folks asking whether this is intended (in which case we have to modify libvirt to change the -uuid argument it outputs when smbios is specified), or an oversight (hopefully the latter, since it's still nice to correlate /var/log/libvirt/qemu/....log with the XML uuid even when that differs from the smbios uuid presented to the guest.) Eric Blake (2): qemu: avoid adding "" in smbios arguments smbios: support system family docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 9 +++++++- src/qemu/qemu_conf.c | 26 +++++++++++++--------- src/util/sysinfo.c | 7 ++++++ src/util/sysinfo.h | 1 + tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 2 + 7 files changed, 35 insertions(+), 13 deletions(-)

3 13

[libvirt] [PATCH] virsh: Remove redundant optional option for cmdHelp
by Osier Yang 04 Dec '10

04 Dec '10

Remove the optional option "group", as cmdHelp should accepts only one option, and rename option "command" as "command-or-group", ("virsh help" supports both command and command group now, and user nealy uses the options, so it doesn't matter much for it being longer, :-) * tools/virsh.c --- tools/virsh.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 31de80f..c2d717f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -569,8 +569,7 @@ static const vshCmdInfo info_help[] = { }; static const vshCmdOptDef opts_help[] = { - {"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.")}, + {"command-or-group", VSH_OT_DATA, 0, N_("Prints global help, command specific help, or help for a group of related commands")}, {NULL, 0, 0, NULL} }; @@ -581,10 +580,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) const vshCmdGrp *g; const char *name; - name = vshCommandOptString(cmd, "command", NULL); - - if (!name) - name = vshCommandOptString(cmd, "group", NULL); + name = vshCommandOptString(cmd, "command-or-group", NULL); if (!name) { const vshCmdGrp *grp; -- 1.7.3.2

3 11

[libvirt] [PATCH] tests: Fix commandtest in VPATH build
by Jiri Denemark 03 Dec '10

03 Dec '10

--- tests/commandtest.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index ace2f33..31adeea 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -509,9 +509,12 @@ cleanup: * Only stdin/out/err open */ static int test15(const void *unused ATTRIBUTE_UNUSED) { + char *cwd = NULL; virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); - virCommandSetWorkingDirectory(cmd, abs_builddir "/commanddata"); + if (virAsprintf(&cwd, "%s/commanddata", abs_srcdir) < 0) + return -1; + virCommandSetWorkingDirectory(cmd, cwd); if (virCommandRun(cmd, NULL) < 0) { virErrorPtr err = virGetLastError(); @@ -519,6 +522,7 @@ static int test15(const void *unused ATTRIBUTE_UNUSED) { return -1; } + VIR_FREE(cwd); virCommandFree(cmd); return checkoutput("test15"); -- 1.7.3.2

2 1

[libvirt] [PATCH] man pages: update the description for the virsh help command
by Justin Clift 03 Dec '10

03 Dec '10

Now includes information on keyword usage, and provides examples. --- tools/virsh.pod | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index c97786a..66654a7 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -115,10 +115,41 @@ The following commands are generic i.e. not specific to a domain. =over 4 -=item B<help> optional I<command> +=item B<help> optional I<--command> I<command> | I<group-keyword> -This prints a small synopsis about all commands available for B<virsh> -B<help> I<command> will print out a detailed help message on that command. +This lists each of the virsh commands. When used without options, all +commands are listed, one per line, grouped into related categories, +displaying the keyword for each group. + +To display only commands for a specific group, give the keyword for that +group as an option. For example: + + virsh # help host + + Host and Hypervisor (help keyword 'host'): + capabilities capabilities + connect (re)connect to hypervisor + freecell NUMA free memory + hostname print the hypervisor hostname + qemu-monitor-command Qemu Monitor Command + uri print the hypervisor canonical URI + +To display detailed information for a specific command, give its name as the +option instead. For example: + + virsh # help list + NAME + list - list domains + + SYNOPSIS + list [--inactive] [--all] + + DESCRIPTION + Returns list of domains. + + OPTIONS + --inactive list inactive domains + --all list inactive & active domains =item B<quit>, B<exit> -- 1.7.3.2

3 4

[libvirt] [PATCH v5 0/4] Support of auto-dump on watchdog event in libvirtd
by Hu Tao 03 Dec '10

03 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: v5: - qemu_driver is passed into threadpool as opaque parameter rather than visit the global qemu_driver in worker function - same situation as above of server in libvirtd.c - also list auto_dump_path in src/qemu/libvirtd_qemu.aug and src/qemu/test_libvirtd_qemu.aug - check return value of qemuDomainObjEndJob for safety v4: - updated threadpool to follow libvirt naming style, use appropriate internals APIs, and hide the struct definitions from the header (by Daniel) - fix an error that qemuDomainObjBeginJobWithDriver() get lost in qemuDomainCoreDump() - use thread pool in libvirtd (qemud worker) v3: - let default auto-dump dir be /var/lib/libvirt/qemu/dump Hu Tao (4): threadpool impl Add a new function doCoreDump Add a watchdog action `dump' Using threadpool API to manage qemud worker cfg.mk | 1 + daemon/libvirtd.c | 172 +++++------------------------ daemon/libvirtd.h | 2 + src/Makefile.am | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 6 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 5 + src/qemu/qemu_conf.c | 16 +++- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_driver.c | 228 ++++++++++++++++++++++++++++---------- src/qemu/test_libvirtd_qemu.aug | 2 + src/util/threadpool.c | 231 +++++++++++++++++++++++++++++++++++++++ src/util/threadpool.h | 48 ++++++++ 15 files changed, 518 insertions(+), 202 deletions(-) create mode 100644 src/util/threadpool.c create mode 100644 src/util/threadpool.h -- 1.7.3 -- Thanks, Hu Tao

1 4

[libvirt] [PATCH] virsh: move two commands from domain group to storage pool group
by Osier Yang 03 Dec '10

03 Dec '10

* tools/virsh.c (find-storage-pool-sources-as and find-storage-pool-sources should't be in command group "Domain Management", move them to group "Storage Pool". --- tools/virsh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6a9aba2..8d84394 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -9957,10 +9957,6 @@ static const vshCmdDef domManagementCmds[] = { {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml}, {"echo", cmdEcho, opts_echo, info_echo}, {"edit", cmdEdit, opts_edit, info_edit}, - {"find-storage-pool-sources-as", cmdPoolDiscoverSourcesAs, - opts_find_storage_pool_sources_as, info_find_storage_pool_sources_as}, - {"find-storage-pool-sources", cmdPoolDiscoverSources, - opts_find_storage_pool_sources, info_find_storage_pool_sources}, {"freecell", cmdFreecell, opts_freecell, info_freecell}, {"hostname", cmdHostname, NULL, info_hostname}, {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave}, @@ -10003,6 +9999,10 @@ static const vshCmdDef domMonitoringCmds[] = { }; static const vshCmdDef storagePoolCmds[] = { + {"find-storage-pool-sources-as", cmdPoolDiscoverSourcesAs, + opts_find_storage_pool_sources_as, info_find_storage_pool_sources_as}, + {"find-storage-pool-sources", cmdPoolDiscoverSources, + opts_find_storage_pool_sources, info_find_storage_pool_sources}, {"pool-autostart", cmdPoolAutostart, opts_pool_autostart, info_pool_autostart}, {"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build}, {"pool-create-as", cmdPoolCreateAs, opts_pool_X_as, info_pool_create_as}, -- 1.7.3.2

3 2

[libvirt] [PATCHv2 0/8] virCommand: next round
by Eric Blake 03 Dec '10

03 Dec '10

This should address some of the review comments from the first round (https://www.redhat.com/archives/libvir-list/2010-November/msg00803.html) Daniel P. Berrange (5): Introduce new APIs for spawning processes virCommand: docs for usage of new command APIs Port hooks and iptables code to new command execution APIs uml: convert to virCommand Remove bogus includes Eric Blake (3): util: add virVasprintf util: fix saferead type qemu: convert to virCommand .x-sc_avoid_write | 1 + .x-sc_prohibit_asprintf | 4 +- cfg.mk | 3 +- docs/Makefile.am | 11 +- docs/internals.html.in | 9 + docs/internals/command.html.in | 550 +++++++++++++++++++ docs/sitemap.html.in | 4 + docs/subsite.xsl | 25 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 1 - src/libvirt_private.syms | 36 ++ src/qemu/qemu_conf.c | 710 ++++++++++--------------- src/qemu/qemu_conf.h | 10 +- src/qemu/qemu_driver.c | 190 ++------ src/uml/uml_conf.c | 163 ++----- src/uml/uml_conf.h | 10 +- src/uml/uml_driver.c | 68 +-- src/util/command.c | 1138 ++++++++++++++++++++++++++++++++++++++++ src/util/command.h | 260 +++++++++ src/util/hooks.c | 217 +-------- src/util/iptables.c | 73 +--- src/util/util.c | 85 ++-- src/util/util.h | 8 +- src/util/virtaudit.c | 2 +- tests/.gitignore | 4 + tests/Makefile.am | 18 +- tests/commanddata/test10.log | 14 + tests/commanddata/test11.log | 14 + tests/commanddata/test12.log | 12 + tests/commanddata/test13.log | 12 + tests/commanddata/test14.log | 12 + tests/commanddata/test15.log | 12 + tests/commanddata/test16.log | 1 + tests/commanddata/test2.log | 12 + tests/commanddata/test3.log | 14 + tests/commanddata/test4.log | 12 + tests/commanddata/test5.log | 10 + tests/commanddata/test6.log | 6 + tests/commanddata/test7.log | 11 + tests/commanddata/test8.log | 7 + tests/commanddata/test9.log | 18 + tests/commandhelper.c | 137 +++++ tests/commandtest.c | 630 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 68 +-- 45 files changed, 3461 insertions(+), 1143 deletions(-) create mode 100644 docs/internals/command.html.in create mode 100644 docs/subsite.xsl create mode 100644 src/util/command.c create mode 100644 src/util/command.h create mode 100644 tests/commanddata/test10.log create mode 100644 tests/commanddata/test11.log create mode 100644 tests/commanddata/test12.log create mode 100644 tests/commanddata/test13.log create mode 100644 tests/commanddata/test14.log create mode 100644 tests/commanddata/test15.log create mode 100644 tests/commanddata/test16.log create mode 100644 tests/commanddata/test2.log create mode 100644 tests/commanddata/test3.log create mode 100644 tests/commanddata/test4.log create mode 100644 tests/commanddata/test5.log create mode 100644 tests/commanddata/test6.log create mode 100644 tests/commanddata/test7.log create mode 100644 tests/commanddata/test8.log create mode 100644 tests/commanddata/test9.log create mode 100644 tests/commandhelper.c create mode 100644 tests/commandtest.c -- 1.7.3.2

3 27

[libvirt] GNU awk vs BSD awk?
by Justin Clift 02 Dec '10

02 Dec '10

Hi Eric, One of the OSX Homebrew guys, CC'd, has asked (casually) whether our dependency on GNU awk is very deeply ingrained, or if we could be convinced to allow usage of other make's instead (ie BSD). Figured I'd ask you directly, as you'd probably best know whether it's an easy thing to address or not? Any idea? Regards and best wishes, Justin Clift

3 4

[libvirt] [PATCH v3 0/5] 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 from v2: - let default auto-dump dir be /var/lib/libvirt/qemu/dump Hu Tao (5): 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' Add me to AUTHORS to make `make syntax-check' happy AUTHORS | 1 + 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 | 13 +++- src/qemu/qemu_conf.h | 4 + src/qemu/qemu_driver.c | 235 ++++++++++++++++++++++++++++++++++-------------- src/util/threadpool.c | 140 ++++++++++++++++++++++++++++ src/util/threadpool.h | 35 +++++++ 10 files changed, 367 insertions(+), 71 deletions(-) create mode 100644 src/util/threadpool.c create mode 100644 src/util/threadpool.h -- 1.7.3 -- Thanks, Hu Tao

3 14

[libvirt] [PATCH 0/2] Add tests for CPU selection in qemu driver
by Jiri Denemark 02 Dec '10

02 Dec '10

Some more CPU tests that can make use of recently introduced cpuMapOverride(). Jiri Denemark (2): tests: Support for faking emulator in qemuxml2argv tests: Add tests for CPU selection in qemu driver tests/qemuxml2argvdata/qemu.sh | 64 ++++++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 28 +++++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 35 +++++++++++ .../qemuxml2argv-cpu-minimum1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml | 21 +++++++ .../qemuxml2argv-cpu-minimum2.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 25 ++++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 38 ++++++++++++ .../qemuxml2argv-cpu-topology1.args | 1 + .../qemuxml2argv-cpu-topology1.xml | 21 +++++++ .../qemuxml2argv-cpu-topology2.args | 1 + .../qemuxml2argv-cpu-topology2.xml | 22 +++++++ .../qemuxml2argv-cpu-topology3.args | 1 + .../qemuxml2argv-cpu-topology3.xml | 21 +++++++ tests/qemuxml2argvtest.c | 38 ++++++++++++ 18 files changed, 321 insertions(+), 0 deletions(-) create mode 100755 tests/qemuxml2argvdata/qemu.sh create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml -- 1.7.3.2

2 5

[libvirt] [PATCH] schemas: Fix cpu element schema
by Jiri Denemark 02 Dec '10

02 Dec '10

Both vendor and topology elements are optional. --- docs/schemas/domain.rng | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fb44335..08ebefb 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1745,6 +1745,8 @@ <ref name="cpuModel"/> <optional> <ref name="cpuVendor"/> + </optional> + <optional> <ref name="cpuTopology"/> </optional> <zeroOrMore> -- 1.7.3.2

2 4

[libvirt] [PATCH] virsh: Remove using phy as default disk driver in cmdAttachDisk
by Osier Yang 02 Dec '10

02 Dec '10

* tools/virsh.c (virsh shouldn't use 'phy' as the disk driver if user doesn't specify "--driver", it causes bugs, as not all of hypervisor driver supports 'phy', and actually hypervisor should known the correct default disk driver and subdriver, so remove it) --- tools/virsh.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6a9aba2..5b5c5ee 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8668,11 +8668,16 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferVSprintf(&buf, " device='%s'", type); virBufferAddLit(&buf, ">\n"); - virBufferVSprintf(&buf, " <driver name='%s'", - (driver) ? driver : "phy"); + if (driver || subdriver) + virBufferVSprintf(&buf, " <driver "); + + if (driver) + virBufferVSprintf(&buf, " name='%s'", driver); if (subdriver) virBufferVSprintf(&buf, " type='%s'", subdriver); - virBufferAddLit(&buf, "/>\n"); + + if (driver || subdriver) + virBufferAddLit(&buf, "/>\n"); virBufferVSprintf(&buf, " <source %s='%s'/>\n", (isFile) ? "file" : "dev", -- 1.7.3.2

2 1

[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