- Devel - libvirt List Archives

[Libvir] [PATCH] Sync Makefile rules from coreutils.
by Jim Meyering 20 Mar '08

20 Mar '08

This change is a net no-op for "make all" builds. For "make syntax-check", it adds the getopt.h check, and... It includes name-space clean-up and VPATH "make distcheck" support in GNUmakefile, and factoring and renaming changes in Makefile.maint. Sync Makefile rules from coreutils. * Makefile.maint: Merge. * GNUmakefile: Update from coreutils. --- GNUmakefile | 8 ++- Makefile.maint | 159 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 85 insertions(+), 82 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 9eefe40..157f432 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -4,7 +4,7 @@ # It is necessary if you want to build targets usually of interest # only to the maintainer. -# Copyright (C) 2001, 2003, 2006-2007 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-2008 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,11 +29,11 @@ else SHELL = sh endif -have-Makefile := $(shell test -f Makefile && echo yes) +_have-Makefile := $(shell test -f Makefile && echo yes) # If the user runs GNU make but has not yet run ./configure, # give them a diagnostic. -ifeq ($(have-Makefile),yes) +ifeq ($(_have-Makefile),yes) # Make tar archive easier to reproduce. export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner @@ -50,6 +50,8 @@ all: @echo "You must run ./configure before running \`make'." 1>&2 @exit 1 +check dist distcheck install: all + endif # Tell version 3.79 and up of GNU make to not build goals in this diff --git a/Makefile.maint b/Makefile.maint index 92cdf29..3a838c5 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -8,25 +8,23 @@ gzip_rsyncable := \ $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null && echo --rsyncable) GZIP_ENV = '--no-name --best $(gzip_rsyncable)' -CVS_LIST = build-aux/vc-list-files +VC_LIST = build-aux/vc-list-files -CVS_LIST_EXCEPT = \ -$(CVS_LIST) | if test -f .x-$@; then grep -vEf .x-$@; else grep -v ChangeLog; fi +VC_LIST_EXCEPT = \ + $(VC_LIST) | if test -f .x-$@; then grep -vEf .x-$@; else grep -v ChangeLog; fi # Prevent programs like 'sort' from considering distinct strings to be equal. # Doing it here saves us from having to set LC_ALL elsewhere in this file. export LC_ALL = C # Collect the names of rules starting with `sc_'. -syntax-check-rules := $(shell sed -n 's/^$sc_[a-zA-Z0-9_-]*$:.*/\1/p' $(ME)) +syntax-check-rules := $(shell sed -n 's/^$sc_[a-zA-Z0-9_-]*$:.*/\1/p' \ + $(srcdir)/$(ME)) .PHONY: $(syntax-check-rules) -# Checks that don't require cvs. -# Run `changelog-check' last, as previous test may reveal problems requiring -# new ChangeLog entries. local-checks-available = \ po-check copyright-check m4-check author_mark_check \ - changelog-check patch-check strftime-check $(syntax-check-rules) \ + patch-check strftime-check $(syntax-check-rules) \ makefile_path_separator_check \ makefile-check check-AUTHORS .PHONY: $(local-checks-available) @@ -34,23 +32,29 @@ local-checks-available = \ local-check := $(filter-out $(local-checks-to-skip), $(local-checks-available)) syntax-check: $(local-check) +# @grep -nE '# *include <(limits|std(def|arg|bool))\.h>' \ +# $$(find -type f -name '*.[chly]') && \ +# { echo '$(ME): found conditional include' 1>&2; \ +# exit 1; } || : -## --------------- ## -## Sanity checks. ## -## --------------- ## +# grep -nE '^# *include <(string|stdlib)\.h>' \ +# $(srcdir)/{lib,src}/*.[chy] && \ +# { echo '$(ME): FIXME' 1>&2; \ +# exit 1; } || : +# FIXME: don't allow `#include .strings\.h' anywhere sc_avoid_if_before_free: @$(srcdir)/build-aux/useless-if-before-free \ $(useless_free_options) \ - $$($(CVS_LIST_EXCEPT)) && \ + $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found useless "if" before "free" above' 1>&2; \ exit 1; } || : # Avoid uses of write(2). Either switch to streams (fwrite), or use # the safewrite wrapper. sc_avoid_write: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ - grep '\<write *(' $$($(CVS_LIST_EXCEPT) | grep '\.c$$') && \ + @if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + grep '\<write *(' $$($(VC_LIST_EXCEPT) | grep '\.c$$') && \ { echo "$(ME): the above files use write;" \ " consider using the safewrite wrapper instead" \ 1>&2; exit 1; } || :; \ @@ -58,22 +62,22 @@ sc_avoid_write: fi sc_cast_of_argument_to_free: - @grep -nE '\<free $\(' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\<free \(\(' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast free argument' 1>&2; \ exit 1; } || : sc_cast_of_x_alloc_return_value: - @grep -nE '\*$ *x(m|c|re)alloc\>' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\*\) *x(m|c|re)alloc\>' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast x*alloc return value' 1>&2; \ exit 1; } || : sc_cast_of_alloca_return_value: - @grep -nE '\*\) *alloca\>' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\*\) *alloca\>' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast alloca return value' 1>&2; \ exit 1; } || : sc_space_tab: - @grep -n '[ ] ' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '[ ] ' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found SPACE-TAB sequence; remove the SPACE' \ 1>&2; exit 1; } || : @@ -81,14 +85,14 @@ sc_space_tab: # They provide no error checking mechanism. # Instead, use strto* functions. sc_prohibit_atoi_atof: - @grep -nE '\<([fs]?scanf|ato([filq]|ll))\>' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\<([fs]?scanf|ato([filq]|ll))\>' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): do not use *scan''f, ato''f, ato''i, ato''l, ato''ll, ato''q, or ss''canf' \ 1>&2; exit 1; } || : # Use STREQ rather than comparing strcmp == 0, or != 0. sc_prohibit_strcmp: - @grep -nE '! *str''cmp $|\<str''cmp \([^)]+$ *==' \ - $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '! *str''cmp $|\<str''cmp \([^)]+$ *==' \ + $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): use STREQ in place of the above uses of str''cmp' \ 1>&2; exit 1; } || : @@ -101,66 +105,61 @@ sc_error_exit_success: exit 1; } || : sc_file_system: - @grep -ni 'file''system' $$($(CVS_LIST_EXCEPT)) && \ + @grep -ni 'file''system' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found use of "file''system";' \ 'rewrite to use "file system"' 1>&2; \ exit 1; } || : sc_no_have_config_h: - @grep -n '^# *if.*HAVE''_CONFIG_H' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '^# *if.*HAVE''_CONFIG_H' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found use of HAVE''_CONFIG_H; remove' \ 1>&2; exit 1; } || : # Nearly all .c files must include <config.h>. sc_require_config_h: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + @if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ grep -L '^# *include <config\.h>' \ - $$($(CVS_LIST_EXCEPT) | grep '\.c$$') \ + $$($(VC_LIST_EXCEPT) | grep '\.c$$') \ | grep . && \ { echo '$(ME): the above files do not include <config.h>' \ 1>&2; exit 1; } || :; \ else :; \ fi +# To use this "command" macro, you must first define two shell variables: +# h: the header, enclosed in <> or "" +# re: a regular expression that matches IFF something provided by $h is used. +define _header_without_use + h_esc=`echo "$$h"|sed 's/\./\\./'`; \ + if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + files=$$(grep -l '^# *include '"$$h_esc" \ + $$($(VC_LIST_EXCEPT) | grep '\.c$$')) && \ + grep -LE "$$re" $$files | grep . && \ + { echo "$(ME): the above files include $$h but don't use it" \ + 1>&2; exit 1; } || :; \ + else :; \ + fi +endef + # Prohibit the inclusion of assert.h without an actual use of assert. sc_prohibit_assert_without_use: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ - files=$$(grep -l '# *include <assert\.h>' \ - $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \ - grep -L '\<assert (' $$files \ - | grep . && \ - { echo "$(ME): the above files include <assert.h> but don't use it" \ - 1>&2; exit 1; } || :; \ - else :; \ - fi + @h='<assert.h>' re='\<assert *\(' $(_header_without_use) + +# Prohibit the inclusion of getopt.h without an actual use. +sc_prohibit_getopt_without_use: + @h='<getopt.h>' re='\<getopt(_long)? *\(' $(_header_without_use) # Don't include quotearg.h unless you use one of its functions. sc_prohibit_quotearg_without_use: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ - files=$$(grep -l '# *include "quotearg\.h"' \ - $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \ - grep -LE '\<quotearg(_[^ ]+)? \(' $$files \ - | grep . && \ - { echo "$(ME): the above files include "quotearg.h" but don't use it" \ - 1>&2; exit 1; } || :; \ - else :; \ - fi + @h='"quotearg.h"' re='\<quotearg(_[^ ]+)? *\(' $(_header_without_use) # Don't include quote.h unless you use one of its functions. sc_prohibit_quote_without_use: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ - files=$$(grep -l '# *include "quote\.h"' \ - $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \ - grep -LE '\<quote(_n)? \(' $$files \ - | grep . && \ - { echo "$(ME): the above files include "quote.h" but don't use it" \ - 1>&2; exit 1; } || :; \ - else :; \ - fi + @h='"quote.h"' re='\<quote(_n)? *$' $(_header_without_use) sc_obsolete_symbols: @grep -nE '\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \ - $$($(CVS_LIST_EXCEPT)) && \ + $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): do not use HAVE''_FCNTL_H or O''_NDELAY' \ 1>&2; exit 1; } || : @@ -194,7 +193,7 @@ endif # Make sure that none are inadvertently reintroduced. sc_prohibit_jm_in_m4: @grep -nE 'jm_[A-Z]' \ - $$($(CVS_LIST) m4 |grep '\.m4$$'; echo /dev/null) && \ + $$($(VC_LIST) m4 |grep '\.m4$$'; echo /dev/null) && \ { echo '$(ME): do not use jm_ in m4 macro names' \ 1>&2; exit 1; } || : @@ -202,8 +201,8 @@ sc_root_tests: @if test -d tests \ && grep check-root tests/Makefile.am>/dev/null 2>&1; then \ t1=sc-root.expected; t2=sc-root.actual; \ - grep -nl '^PRIV_CHECK_ARG=require-root' \ - $$($(CVS_LIST) tests) |sed s,tests,., |sort > $$t1; \ + grep -nl '^require_root_$$' \ + $$($(VC_LIST) tests) |sed s,tests,., |sort > $$t1; \ sed -n 's, cd \([^ ]*$ .*MAKE..check TESTS=$.*$,./\1/\2,p' \ $(srcdir)/tests/Makefile.am |sort > $$t2; \ diff -u $$t1 $$t2 || diff=1; \ @@ -242,7 +241,7 @@ headers_with_interesting_macro_defs = \ sc_always_defined_macros: .re-defmac @if test -f $(srcdir)/src/system.h; then \ trap 'rc=$$?; rm -f .re-defmac; exit $$rc' 0 1 2 3 15; \ - grep -f .re-defmac $$($(CVS_LIST)) \ + grep -f .re-defmac $$($(VC_LIST)) \ && { echo '$(ME): define the above via some gnulib .h file' \ 1>&2; exit 1; } || :; \ fi @@ -262,7 +261,7 @@ sc_system_h_headers: .re-list @if test -f $(srcdir)/src/system.h; then \ trap 'rc=$$?; rm -f .re-list; exit $$rc' 0 1 2 3 15; \ grep -nE -f .re-list \ - $$($(CVS_LIST) src | \ + $$($(VC_LIST) src | \ grep -Ev '((copy|system)\.h|parse-gram\.c)$$') \ && { echo '$(ME): the above are already included via system.h'\ 1>&2; exit 1; } || :; \ @@ -271,12 +270,12 @@ sc_system_h_headers: .re-list sc_sun_os_names: @grep -nEi \ 'solaris[^[:alnum:]]*2\.(7|8|9|[1-9][0-9])|sunos[^[:alnum:]][6-9]' \ - $$($(CVS_LIST_EXCEPT)) && \ + $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found misuse of Sun OS version numbers' 1>&2; \ exit 1; } || : sc_the_the: - @grep -ni '\<the ''the\>' $$($(CVS_LIST_EXCEPT)) && \ + @grep -ni '\<the ''the\>' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found use of "the ''the";' 1>&2; \ exit 1; } || : @@ -284,7 +283,7 @@ sc_tight_scope: $(MAKE) -C src $@ sc_trailing_blank: - @grep -n '[ ]$$' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '[ ]$$' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found trailing blank(s)' \ 1>&2; exit 1; } || : @@ -294,7 +293,7 @@ sc_trailing_blank: longopt_re = --[a-z][0-9A-Za-z-]*(\[?=[0-9A-Za-z-]*\]?)? sc_two_space_separator_in_usage: @grep -nE '^ *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$' \ - $$($(CVS_LIST_EXCEPT)) && \ + $$($(VC_LIST_EXCEPT)) && \ { echo "$(ME): help2man requires at least two spaces between"; \ echo "$(ME): an option and its description"; \ 1>&2; exit 1; } || : @@ -309,32 +308,32 @@ err_func_re = \ # "%s", _("no storage vol w..." sc_unmarked_diagnostics: @grep -nE \ - '\<(vshError|error) \([^"]*"[^"]*[a-z]{3}' $$($(CVS_LIST_EXCEPT)) \ + '\<(vshError|error) \([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT)) \ | grep -v '_''(' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : - @{ grep -nE '\<$(err_func_re) *\(.*;$$' $$($(CVS_LIST_EXCEPT)); \ - grep -A1 -nE '\<$(err_func_re) *\(.*,$$' $$($(CVS_LIST_EXCEPT)); } \ + @{ grep -nE '\<$(err_func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT)); \ + grep -A1 -nE '\<$(err_func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \ | sed 's/_("[^"][^"]*"//;s/[ ]"%s"//' \ | grep '[ ]"' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : sc_prohibit_virBufferAdd_with_string_literal: - @grep -nE '\<virBufferAdd *\([^,]+, *"[^"]' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\<virBufferAdd *\([^,]+, *"[^"]' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): use virBufferAddLit, not virBufferAdd,' \ 'with a string literal' 1>&2; exit 1; } || : # Avoid useless parentheses like those in this example: # #if defined (SYMBOL) || defined (SYM2) sc_useless_cpp_parens: - @grep -n '^# *if .*defined *(' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '^# *if .*defined *(' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found useless parentheses in cpp directive' \ 1>&2; exit 1; } || : # Require the latest GPL. sc_GPL_version: - @grep -n 'either ''version [^3]' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n 'either ''version [^3]' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): GPL vN, N!=3' 1>&2; exit 1; } || : # Ensure that the c99-to-c89 patch applies cleanly. @@ -410,12 +409,16 @@ po-check: grep -E -v '^(#|$$)' po/POTFILES.in \ | grep -v '^src/false\.c$$' | sort > $@-1; \ files=; \ - for file in $$($(CVS_LIST_EXCEPT)); do \ + for file in $$($(VC_LIST_EXCEPT)); do \ + case $$file in \ + djgpp/* | man/*) continue;; \ + */c99-to-c89.diff) continue;; \ + esac; \ case $$file in \ *.[ch]) \ base=`expr " $$file" : ' $.*$\..'`; \ { test -f $$base.l || test -f $$base.y; } && continue;; \ - *) continue;; \ + *) continue;; \ esac; \ files="$$files $$file"; \ done; \ @@ -447,16 +450,14 @@ makefile_path_separator_check: # Check that `make alpha' will not fail at the end of the process. writable-files: if test -d $(release_archive_dir); then :; else \ - mkdir $(release_archive_dir); \ + for file in $(distdir).tar.gz \ + $(release_archive_dir)/$(distdir).tar.gz; do \ + test -e $$file || continue; \ + test -w $$file \ + || { echo ERROR: $$file is not writable; fail=1; }; \ + done; \ + test "$$fail" && exit 1 || : fi - for file in $(distdir).tar.gz $(xd-delta) \ - $(release_archive_dir)/$(distdir).tar.gz \ - $(release_archive_dir)/$(xd-delta); do \ - test -e $$file || continue; \ - test -w $$file \ - || { echo ERROR: $$file is not writable; fail=1; }; \ - done; \ - test "$$fail" && exit 1 || : v_etc_file = lib/version-etc.c sample-test = tests/sample-test -- 1.5.4.4.482.g16f99

2 1

[Libvir] Announcement : Enomalism 2.0 Alpha Released
by Reuven Cohen 19 Mar '08

19 Mar '08

This is an general announcement of the release of Enomalism 2.0 (Alpha) Now Available for Download. -- Enomaly, Inc. is pleased to announce the Alpha release of the Enomalism Elastic Computing Platform. The Enomalism v2.0 Alpha has been completely redeveloped from the ground up and further builds on the concept of " Elastic / Cloud Computing". The platform extensively uses libvirt to manage several virtual environments including Amazon EC2 (Elastic Compute Cloud). Over the coming weeks there will be ongoing developments as we continue to improve the application. We hope to move to a stable "BETA" within a couple weeks. The current release is considered "Alpha" and should be used at your own risk. New Enomalism Features include: * Web Services API - RESTful * Automated VM Deployment with Elastic Valet * Multi-Server Support * Virtual Cluster Engine * Extensible system monitoring integration * Flexible business process management with SOA (jBPM) * Integrated appliance / module repository * Extended User / Group Management * Elastic Dashboard / Portal Framework * System Metering (Utility / Chargeback) * Increased Virtual Machine / Hypervisor Support o Xen, KVM, Qemu, OpenVZ, Amazon EC2 * (Ec2 Module) * Support for installation in Linux & Windows * New Open Source License (AGPL) For installation Documentation and core distribution download, please visit http://trac.enomalism.com/enomalism/ BETA TESTERS We are currently seeking BETA testers to assist with the following tasks * Interface Debugging CSS, JS (IE7,Firefox) * Platform Testing (Linux,Windows,BSD,OSX) * Cluster Testing * Amazon EC2 Testing * Repository / Appliance Testing * Module Testing * User Management Testing * REST API Testing * Anything else that needs fixing. If you are interested in lending a hand, please visit the Enomalism forums at http://www.enomalism.com/resources/community-center/ Reuven Cohen Chief Technologist, Enomaly Inc. www.enomaly.com :: 212 203 4734 x 1

1 0

[Libvir] [PATCH] * qemud/remote.c: Don't include <getopt.h>. Not used.
by Jim Meyering 19 Mar '08

19 Mar '08

I had a few in-progress changes from a week or two ago, and am clearing the decks. I added a new build-checking rule (coming separately) and it exposed an unnecessary include: * qemud/remote.c: Don't include <getopt.h>. Not used. diff --git a/qemud/remote.c b/qemud/remote.c index 85df9cd..c7db5fa 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -41,7 +41,6 @@ #include <syslog.h> #include <string.h> #include <errno.h> -#include <getopt.h> #include <ctype.h> #include <fnmatch.h> -- 1.5.4.4.482.g16f99

3 8

[Libvir] [PATCH] Implement memory operations for qemu driver
by Cole Robinson 19 Mar '08

19 Mar '08

The attached patch implements the following operations for the qemu driver: virDomainGetMaxMemory virDomainSetMaxMemory virDomainSetMemory A few questions/comments: 1) I changed maxmem and memory in the qemu_vm_def struct to unsigned long to match the public api for memory values. Seems to work, but not sure if there are any undesirable side effects to this. 2) Should SetMaxMem be able to be called on a running guest? This code allows it, since maxmem is basically a metavalue that doesn't directly affect a guest. 3) Should maxmem be able to be set lower than the currently allocated mem? This code does not allow this. If this changed, would also need to take into account how we would handle this if we can change the maxmem while the guest is running. After rethinking, we probably should be able to do this, but I haven't changed the code. Thanks, Cole diff --git a/src/qemu_conf.c b/src/qemu_conf.c index a196bb8..f6ae06b 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1650,7 +1650,7 @@ int qemudBuildCommandLine(virConnectPtr conn, (vm->def->graphicsType == QEMUD_GRAPHICS_SDL ? 0 : 1)) + /* graphics */ (vm->migrateFrom[0] ? 3 : 0); /* migrateFrom */ - snprintf(memory, sizeof(memory), "%d", vm->def->memory/1024); + snprintf(memory, sizeof(memory), "%lu", vm->def->memory/1024); snprintf(vcpus, sizeof(vcpus), "%d", vm->def->vcpus); if (!(*argv = malloc(sizeof(**argv) * (len+1)))) @@ -2820,9 +2820,9 @@ char *qemudGenerateXML(virConnectPtr conn, virUUIDFormat(uuid, uuidstr); if (virBufferVSprintf(buf, " <uuid>%s</uuid>\n", uuidstr) < 0) goto no_memory; - if (virBufferVSprintf(buf, " <memory>%d</memory>\n", def->maxmem) < 0) + if (virBufferVSprintf(buf, " <memory>%lu</memory>\n", def->maxmem) < 0) goto no_memory; - if (virBufferVSprintf(buf, " <currentMemory>%d</currentMemory>\n", def->memory) < 0) + if (virBufferVSprintf(buf, " <currentMemory>%lu</currentMemory>\n", def->memory) < 0) goto no_memory; if (virBufferVSprintf(buf, " <vcpu>%d</vcpu>\n", def->vcpus) < 0) goto no_memory; diff --git a/src/qemu_conf.h b/src/qemu_conf.h index 12aa6ae..c1aae75 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -193,8 +193,8 @@ struct qemud_vm_def { unsigned char uuid[VIR_UUID_BUFLEN]; char name[QEMUD_MAX_NAME_LEN]; - int memory; - int maxmem; + unsigned long memory; + unsigned long maxmem; int vcpus; int noReboot; diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 2b4c2a6..215f4c4 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1765,6 +1765,66 @@ static char *qemudDomainGetOSType(virDomainPtr dom) { return type; } +/* Returns max memory in kb, 0 if error */ +static unsigned long qemudDomainGetMaxMemory(virDomainPtr dom) { + struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; + struct qemud_vm *vm = qemudFindVMByUUID(driver, dom->uuid); + + if (!vm) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid '%s'", dom->uuid); + return 0; + } + + return vm->def->maxmem; +} + +static int qemudDomainSetMaxMemory(virDomainPtr dom, unsigned long memory) { + struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; + struct qemud_vm *vm = qemudFindVMByUUID(driver, dom->uuid); + + if (!vm) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid '%s'", dom->uuid); + return -1; + } + + if (memory < vm->def->maxmem) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, + "cannot set max memory lower than current memory"); + return -1; + } + + vm->def->maxmem = memory; + return 0; +} + +static int qemudDomainSetMemory(virDomainPtr dom, unsigned long memory) { + struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; + struct qemud_vm *vm = qemudFindVMByUUID(driver, dom->uuid); + + if (!vm) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid '%s'", dom->uuid); + return -1; + } + + if (qemudIsActiveVM(vm)) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + "cannot set memory of an active domain"); + return -1; + } + + if (memory > vm->def->maxmem) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, + "cannot set memory higher than max memory"); + return -1; + } + + vm->def->memory = memory; + return 0; +} + static int qemudDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; @@ -2886,9 +2946,9 @@ static virDriver qemuDriver = { NULL, /* domainReboot */ qemudDomainDestroy, /* domainDestroy */ qemudDomainGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ + qemudDomainGetMaxMemory, /* domainGetMaxMemory */ + qemudDomainSetMaxMemory, /* domainSetMaxMemory */ + qemudDomainSetMemory, /* domainSetMemory */ qemudDomainGetInfo, /* domainGetInfo */ qemudDomainSave, /* domainSave */ qemudDomainRestore, /* domainRestore */

4 8

Re: [Libvir] Accessing qemu from windows
by Richard W.M. Jones 19 Mar '08

19 Mar '08

On Wed, Mar 19, 2008 at 03:14:44PM +0200, Gabriel Kaufmann wrote: > Hi, > Sorry for my late reply, I was having technical problems with the machine that has the KVM installed in. > > I run libvirtd with the --verbose flag, but I still receive the same message with no extra details libvirtd prints nothing extra at all? Can you follow up with the full output of libvirtd. Also please send messages to the list. Thanks, 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

1 0

[libvir] How to seek a running QEMU instance
by Anton Protopopov 19 Mar '08

19 Mar '08

Hi, I have the following question. How can virsh (or, more accurately, libvirt) detect a running QEMU vm, when latter was already started? For example, I have got the following: [aspsk@localhost Server-4.0.1]$ qemu -hda Server-4.0.1.img -m 256 & [1] 12001 [aspsk@localhost Server-4.0.1]$ Could not configure '/dev/rtc' to have a 1024 Hz timer. This is not a fatal error, but for better emulation accuracy either use a 2.6 host Linux kernel or type 'echo 1024 > /proc/sys/dev/rtc/max-user-freq' as root. Could not open '/dev/kqemu' - QEMU acceleration layer not activated: No such file or directory Could not open '/dev/qvm86' - QEMU acceleration layer not activated: No such file or directory [aspsk@localhost Server-4.0.1]$ sudo virsh -c qemu:///system list --all Id Name State ---------------------------------- [aspsk@localhost Server-4.0.1]$ A.

3 4

[Libvir] persistent guests (save guest at shutdown and reload it at boot)
by Matthias Pfafferodt 17 Mar '08

17 Mar '08

Hello, I added the following entry to the libvirt bugzilla (Bugzilla Bug 437204). Daniel Veillard ask me to post this to the list for discussion. Description of problem: libvirt can save and restore guests. It is also possible to autostart guest at boot time. I miss a similar option: 'persistent' booting the host: * the guest is restored if there is a saved version * else it is booted shutdown of the host * the guest is saved The xendomain script does something like this. There the 'autostart' option checks if the domain was saved. If it was this domain is restored else it is created. At shutdown of the dom0 all running domU's are saved. Matthias Pfafferodt

2 2

[Libvir] PATCH: Fix dir/fs storage pool when SELinux is disabled
by Daniel P. Berrange 17 Mar '08

17 Mar '08

When SELinux is disabled fgetfilecon() may well return -1, if a file has no extended attribute with security context data. This causes the storage pool to skip that file. The fix is to check whether errno is ENODATA and treat that as an expected error case & ignore it. Dan. Index: src/storage_backend.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend.c,v retrieving revision 1.8 diff -u -p -r1.8 storage_backend.c --- src/storage_backend.c 27 Feb 2008 10:37:19 -0000 1.8 +++ src/storage_backend.c 14 Mar 2008 21:21:05 -0000 @@ -240,17 +240,22 @@ virStorageBackendUpdateVolInfoFD(virConn #if HAVE_SELINUX if (fgetfilecon(fd, &filecon) == -1) { - virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot get file context of %s: %s"), - vol->target.path, strerror(errno)); - return -1; - } - vol->target.perms.label = strdup(filecon); - if (vol->target.perms.label == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("context")); - return -1; + if (errno != ENODATA) { + virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot get file context of %s: %s"), + vol->target.path, strerror(errno)); + return -1; + } else { + vol->target.perms.label = NULL; + } + } else { + vol->target.perms.label = strdup(filecon); + if (vol->target.perms.label == NULL) { + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("context")); + return -1; + } + freecon(filecon); } - freecon(filecon); #else vol->target.perms.label = NULL; #endif -- |: Red Hat, Engineering, Boston -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 4

[Libvir] PATCH: Fix xen unified driver open logic
by Daniel P. Berrange 17 Mar '08

17 Mar '08

When adding PolicyKit support we disabled the proxy driver, but did not correctly fix up the Xen unified driver. The result is that it is still trying to run the proxy setuid helper which doesn't exist and thus it fails the open operation before the remote driver gets the opportunity to process the URI. I attempted to fix this by just disabling the proxy driver in the unified driver, but came to the conclusion the logic of the current code is just not flexible enough for what we need to be able todo these days. THe core problem is the 'for(;;)' loop iterating over the drivers - it already has several special cases in the loop body to skip drivers, or ignore errors and adding more special cases is making my mind hurt trying to trace the logic. So I have removed the loop, and encode the desired logic explicitly. The diff a little unpleasant to read, so to summarize the logic is thus: - If root only, try open the hypervisor driver -> Failure to open is fatal, do not try other drivers - Try to open the XenD driver - If XenD suceeds -> If XenD < 3.0.4, then open the XM driver for inactive domains -> Try to open the XS driver => Failure to open is fatal if root - Else XenD fails ->.If proxy is compiled in, try to open proxy => Failure to open is fatal This should result in one of the following combinations of drivers being activated: root: (HV + XenD + XS) root: (HV + XenD + XS + XM) non-root: (XenD) non-root: (XenD + XS) non-root: (proxy) If non-root, and the proxy is not compiled in, we'll hand off to the remote driver. Any other scenario will result in an explicit fail. Dan. ? docs/apibuild.pyc Index: configure.in =================================================================== RCS file: /data/cvs/libvirt/configure.in,v retrieving revision 1.133 diff -u -p -r1.133 configure.in --- configure.in 3 Mar 2008 14:42:37 -0000 1.133 +++ configure.in 10 Mar 2008 18:59:23 -0000 @@ -873,6 +873,9 @@ fi AC_MSG_RESULT([$with_xen_proxy]) AM_CONDITIONAL(WITH_PROXY,[test "$with_xen_proxy" = "yes"]) +if test "$with_xen_proxy" = "yes"; then + AC_DEFINE(WITH_PROXY, 1, [Whether Xen proxy is enabled]) +fi dnl Enable building libvirtd? AM_CONDITIONAL(WITH_LIBVIRTD,[test "x$with_libvirtd" = "xyes"]) Index: src/remote_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/remote_internal.c,v retrieving revision 1.61 diff -u -p -r1.61 remote_internal.c --- src/remote_internal.c 26 Feb 2008 07:05:18 -0000 1.61 +++ src/remote_internal.c 10 Mar 2008 18:59:24 -0000 @@ -835,6 +835,14 @@ remoteOpen (virConnectPtr conn, } } #endif +#if WITH_XEN + if (uri && + uri->scheme && STREQ (uri->scheme, "xen") && + (!uri->server || STREQ (uri->server, "")) && + (!uri->path || STREQ(uri->path, "/"))) { + rflags |= VIR_DRV_OPEN_REMOTE_UNIX; + } +#endif priv->magic = DEAD; priv->sock = -1; Index: src/xen_unified.c =================================================================== RCS file: /data/cvs/libvirt/src/xen_unified.c,v retrieving revision 1.38 diff -u -p -r1.38 xen_unified.c --- src/xen_unified.c 27 Feb 2008 10:37:19 -0000 1.38 +++ src/xen_unified.c 10 Mar 2008 18:59:24 -0000 @@ -42,6 +42,7 @@ #include "util.h" #define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt,__VA_ARGS__) +#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg) static int xenUnifiedNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info); @@ -239,7 +242,7 @@ xenUnifiedProbe (void) static int xenUnifiedOpen (virConnectPtr conn, xmlURIPtr uri, virConnectAuthPtr auth, int flags) { - int i, j; + int i; xenUnifiedPrivatePtr priv; /* Refuse any scheme which isn't "xen://" or "http://". */ @@ -276,41 +279,69 @@ xenUnifiedOpen (virConnectPtr conn, xmlU priv->xshandle = NULL; priv->proxy = -1; - for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) { - priv->opened[i] = 0; - /* Only use XM driver for Xen <= 3.0.3 (ie xendConfigVersion <= 2) */ - if (drivers[i] == &xenXMDriver && - priv->xendConfigVersion > 2) - continue; - - /* Ignore proxy for root */ - if (i == XEN_UNIFIED_PROXY_OFFSET && getuid() == 0) - continue; - - if (drivers[i]->open) { - DEBUG("trying Xen sub-driver %d", i); - if (drivers[i]->open (conn, uri, auth, flags) == VIR_DRV_OPEN_SUCCESS) - priv->opened[i] = 1; - DEBUG("Xen sub-driver %d open %s\n", - i, priv->opened[i] ? "ok" : "failed"); - } + /* Hypervisor is only run as root & required to succeed */ + if (getuid() == 0) { + DEBUG0("Trying hypervisor sub-driver"); + if (drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->open(conn, uri, auth, flags) != + VIR_DRV_OPEN_SUCCESS) + goto fail; + + priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] = 1; + } - /* If as root, then all drivers must succeed. - If non-root, then only proxy must succeed */ - if (!priv->opened[i] && - (getuid() == 0 || i == XEN_UNIFIED_PROXY_OFFSET)) { - for (j = 0; j < i; ++j) - if (priv->opened[j]) drivers[j]->close (conn); - free (priv); - /* The assumption is that one of the underlying drivers - * has set virterror already. - */ - return VIR_DRV_OPEN_ERROR; + /* XenD is required to suceed if root. + * If it fails as non-root, then the proxy driver may take over + */ + DEBUG0("Trying XenD sub-driver"); + if (drivers[XEN_UNIFIED_XEND_OFFSET]->open(conn, uri, auth, flags) == + VIR_DRV_OPEN_SUCCESS) { + priv->opened[XEN_UNIFIED_XEND_OFFSET] = 1; + + /* XenD is active, so try the xm & xs drivers too, both requird to + * succeed if root, optional otherwise */ + if (priv->xendConfigVersion <= 2) { + DEBUG0("Trying XM sub-driver"); + if (drivers[XEN_UNIFIED_XM_OFFSET]->open(conn, uri, auth, flags) == + VIR_DRV_OPEN_SUCCESS) { + priv->opened[XEN_UNIFIED_XM_OFFSET] = 1; + } + } + DEBUG0("Trying XS sub-driver"); + if (drivers[XEN_UNIFIED_XS_OFFSET]->open(conn, uri, auth, flags) == + VIR_DRV_OPEN_SUCCESS) { + priv->opened[XEN_UNIFIED_XS_OFFSET] = 1; + } else { + if (getuid() == 0) + goto fail; /* XS is mandatory as root */ + } + } else { + if (getuid() == 0) { + goto fail; /* XenD is mandatory as root */ + } else { +#if WITH_PROXY + DEBUG0("Trying proxy sub-driver"); + if (drivers[XEN_UNIFIED_PROXY_OFFSET]->open(conn, uri, auth, flags) == + VIR_DRV_OPEN_SUCCESS) { + priv->opened[XEN_UNIFIED_PROXY_OFFSET] = 1; + } else { + goto fail; /* Proxy is mandatory if XenD failed */ + } +#else + DEBUG0("Handing off for remote driver"); + return VIR_DRV_OPEN_DECLINED; /* Let remote_driver try instead */ +#endif } } return VIR_DRV_OPEN_SUCCESS; + + fail: + DEBUG0("Failed mandatory driver"); + for (i = 0 ; i < XEN_UNIFIED_NR_DRIVERS ; i++) + if (priv->opened[i]) drivers[i]->close(conn); + free(priv); + return VIR_DRV_OPEN_ERROR; } #define GET_PRIVATE(conn) \ Index: src/xend_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xend_internal.c,v retrieving revision 1.173 diff -u -p -r1.173 xend_internal.c --- src/xend_internal.c 7 Mar 2008 09:23:30 -0000 1.173 +++ src/xend_internal.c 10 Mar 2008 18:59:24 -0000 @@ -234,14 +234,13 @@ do_connect(virConnectPtr xend) close(s); errno = serrno; s = -1; - /* - * not being able to connect via the socket as a normal user - * is rather normal, this should fallback to the proxy (or - * remote) mechanism. - */ - if ((getuid() == 0) || (xend->flags & VIR_CONNECT_RO)) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, - _("failed to connect to xend")); + + /* + * Connecting to XenD as root is mandatory, so log this error + */ + if (getuid() == 0) { + virXendError(xend, VIR_ERR_INTERNAL_ERROR, + _("failed to connect to xend")); } } -- |: Red Hat, Engineering, Boston -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 :|

2 3

[Libvir] [PATCH] fix typos (part?)
by Atsushi SAKAI 17 Mar '08

17 Mar '08

Various typos fix. priviledged => privileged neccessary => necessary hve => have advertizement => advertisement supervizing => supervising (Saori Fukuta suggest us as typo) poool => pool persitent => persistent numbber => number overriden => overridden independantly => independently hypvisor => hypervisor adminstrator => administrator maintainance => maintenance targetted => targeted from Longman Dictionary of Contemporary English http://pewebdic2.cw.idm.fr/ I hope no one suggest typo on libvirt. docs/FAQ.html | 6 +++--- docs/architecture.html | 12 ++++++------ docs/auth.html | 14 +++++++------- docs/devhelp/libvirt-libvirt.html | 30 +++++++++++++++--------------- docs/html/libvirt-libvirt.html | 30 +++++++++++++++--------------- docs/libvir.html | 20 ++++++++++---------- docs/libvirt-api.xml | 34 +++++++++++++++++----------------- docs/libvirt-refs.xml | 10 +++++----- docs/news.html | 2 +- docs/virsh.pod | 2 +- include/libvirt/libvirt.h | 2 +- include/libvirt/libvirt.h.in | 2 +- qemud/mdns.h | 12 ++++++------ src/libvirt.c | 28 ++++++++++++++-------------- src/qemu.conf | 2 +- src/remote_internal.c | 2 +- src/xend_internal.c | 2 +- tests/confdata/libvirtd.conf | 2 +- tests/confdata/libvirtd.out | 2 +- virsh.1 | 2 +- 20 files changed, 108 insertions(+), 108 deletions(-) Thanks Atsushi SAKAI

3 2