2010-03-09 16:59:25 +00:00
|
|
|
-*- buffer-read-only: t -*- vi: set ro:
|
|
|
|
DO NOT EDIT THIS FILE! IT IS GENERATED AUTOMATICALLY!
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
Contributor guidelines
|
|
|
|
======================
|
|
|
|
|
2008-04-10 16:56:44 +00:00
|
|
|
|
|
|
|
|
2008-06-02 11:53:23 +00:00
|
|
|
General tips for contributing patches
|
|
|
|
=====================================
|
2010-11-12 14:36:53 +00:00
|
|
|
(1) Discuss any large changes on the mailing list first. Post patches early and
|
|
|
|
listen to feedback.
|
2008-06-02 11:53:23 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
(2) Post patches in unified diff format. A command similar to this should work:
|
2008-06-02 11:53:23 +00:00
|
|
|
|
|
|
|
diff -urp libvirt.orig/ libvirt.modified/ > libvirt-myfeature.patch
|
|
|
|
|
|
|
|
or:
|
|
|
|
|
2010-01-08 00:40:38 +00:00
|
|
|
git diff > libvirt-myfeature.patch
|
2008-06-02 11:53:23 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
(3) Split large changes into a series of smaller patches, self-contained if
|
|
|
|
possible, with an explanation of each patch and an explanation of how the
|
|
|
|
sequence of patches fits together.
|
2008-06-02 11:53:23 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
(4) Make sure your patches apply against libvirt GIT. Developers only follow GIT
|
|
|
|
and don't care much about released versions.
|
2008-06-02 11:53:23 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
(5) Run the automated tests on your code before submitting any changes. In
|
|
|
|
particular, configure with compile warnings set to -Werror:
|
2008-06-02 11:53:23 +00:00
|
|
|
|
|
|
|
./configure --enable-compile-warnings=error
|
|
|
|
|
|
|
|
and run the tests:
|
|
|
|
|
|
|
|
make check
|
|
|
|
make syntax-check
|
|
|
|
make -C tests valgrind
|
|
|
|
|
|
|
|
The latter test checks for memory leaks.
|
|
|
|
|
2009-10-16 15:37:36 +00:00
|
|
|
If you encounter any failing tests, the VIR_TEST_DEBUG environment variable
|
|
|
|
may provide extra information to debug the failures. Larger values of
|
|
|
|
VIR_TEST_DEBUG may provide larger amounts of information:
|
|
|
|
|
|
|
|
VIR_TEST_DEBUG=1 make check (or)
|
|
|
|
VIR_TEST_DEBUG=2 make check
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
Also, individual tests can be run from inside the "tests/" directory, like:
|
2009-10-16 15:37:36 +00:00
|
|
|
|
|
|
|
./qemuxml2xmltest
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
(6) Update tests and/or documentation, particularly if you are adding a new
|
|
|
|
feature or changing the output of a program.
|
2008-06-02 11:53:23 +00:00
|
|
|
|
|
|
|
|
2008-08-01 11:25:22 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
There is more on this subject, including lots of links to background reading
|
|
|
|
on the subject, on
|
2008-08-01 11:25:22 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
Richard Jones' guide to working with open source projects
|
|
|
|
http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/
|
2008-08-01 11:25:22 +00:00
|
|
|
|
2008-06-02 11:53:23 +00:00
|
|
|
|
2008-04-10 16:56:44 +00:00
|
|
|
Code indentation
|
|
|
|
================
|
|
|
|
Libvirt's C source code generally adheres to some basic code-formatting
|
2010-11-12 14:36:53 +00:00
|
|
|
conventions. The existing code base is not totally consistent on this front,
|
|
|
|
but we do prefer that contributed code be formatted similarly. In short, use
|
|
|
|
spaces-not-TABs for indentation, use 4 spaces for each indentation level, and
|
|
|
|
other than that, follow the K&R style.
|
2008-04-10 16:56:44 +00:00
|
|
|
|
|
|
|
If you use Emacs, add the following to one of one of your start-up files
|
|
|
|
(e.g., ~/.emacs), to help ensure that you get indentation right:
|
|
|
|
|
|
|
|
;;; When editing C sources in libvirt, use this style.
|
|
|
|
(defun libvirt-c-mode ()
|
|
|
|
"C mode with adjusted defaults for use with libvirt."
|
|
|
|
(interactive)
|
|
|
|
(c-set-style "K&R")
|
|
|
|
(setq indent-tabs-mode nil) ; indent using spaces, not TABs
|
|
|
|
(setq c-indent-level 4)
|
|
|
|
(setq c-basic-offset 4))
|
|
|
|
(add-hook 'c-mode-hook
|
2010-11-12 14:36:53 +00:00
|
|
|
'(lambda () (if (string-match "/libvirt" (buffer-file-name))
|
|
|
|
(libvirt-c-mode))))
|
|
|
|
|
2011-03-17 02:35:17 +00:00
|
|
|
If you use vim, append the following to your ~/.vimrc file:
|
|
|
|
|
|
|
|
set nocompatible
|
|
|
|
filetype on
|
|
|
|
set autoindent
|
|
|
|
set smartindent
|
|
|
|
set cindent
|
|
|
|
set tabstop=8
|
|
|
|
set shiftwidth=4
|
|
|
|
set expandtab
|
|
|
|
set cinoptions=(0,:0,l1,t0
|
|
|
|
filetype plugin indent on
|
|
|
|
au FileType make setlocal noexpandtab
|
|
|
|
au BufRead,BufNewFile *.am setlocal noexpandtab
|
|
|
|
match ErrorMsg /\s\+$\| \+\ze\t/
|
|
|
|
|
|
|
|
Or if you don't want to mess your ~/.vimrc up, you can save the above into a
|
|
|
|
file called .lvimrc (not .vimrc) located at the root of libvirt source, then
|
|
|
|
install a vim script from
|
|
|
|
http://www.vim.org/scripts/script.php?script_id=1408, which will load the
|
|
|
|
.lvimrc only when you edit libvirt code.
|
|
|
|
|
2008-04-10 16:56:44 +00:00
|
|
|
|
|
|
|
Code formatting (especially for new code)
|
|
|
|
=========================================
|
2010-11-12 14:36:53 +00:00
|
|
|
With new code, we can be even more strict. Please apply the following function
|
|
|
|
(using GNU indent) to any new code. Note that this also gives you an idea of
|
|
|
|
the type of spacing we prefer around operators and keywords:
|
2008-04-10 16:56:44 +00:00
|
|
|
|
|
|
|
indent-libvirt()
|
|
|
|
{
|
|
|
|
indent -bad -bap -bbb -bli4 -br -ce -brs -cs -i4 -l75 -lc75 \
|
|
|
|
-sbi4 -psl -saf -sai -saw -sbi4 -ss -sc -cdw -cli4 -npcs -nbc \
|
|
|
|
--no-tabs "$@"
|
|
|
|
}
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
Note that sometimes you'll have to post-process that output further, by piping
|
|
|
|
it through "expand -i", since some leading TABs can get through. Usually
|
|
|
|
they're in macro definitions or strings, and should be converted anyhow.
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2011-03-30 15:48:51 +00:00
|
|
|
Libvirt requires a C99 compiler for various reasons. However, most of the code
|
|
|
|
base prefers to stick to C89 syntax unless there is a compelling reason
|
|
|
|
otherwise. For example, it is preferable to use "/* */" comments rather than
|
|
|
|
"//". Also, when declaring local variables, the prevailing style has been to
|
|
|
|
declare them at the beginning of a scope, rather than immediately before use.
|
|
|
|
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-04-15 17:31:04 +00:00
|
|
|
Curly braces
|
|
|
|
============
|
|
|
|
Omit the curly braces around an "if", "while", "for" etc. body only when that
|
|
|
|
body occupies a single line. In every other case we require the braces. This
|
2010-11-12 14:36:53 +00:00
|
|
|
ensures that it is trivially easy to identify a single-'statement' loop: each
|
|
|
|
has only one 'line' in its body.
|
2010-04-15 17:31:04 +00:00
|
|
|
|
|
|
|
Omitting braces with a single-line body is fine:
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
while (expr) // one-line body -> omitting curly braces is ok
|
|
|
|
single_line_stmt();
|
2010-04-15 17:31:04 +00:00
|
|
|
|
|
|
|
However, the moment your loop/if/else body extends onto a second line, for
|
|
|
|
whatever reason (even if it's just an added comment), then you should add
|
|
|
|
braces. Otherwise, it would be too easy to insert a statement just before that
|
2010-11-12 14:36:53 +00:00
|
|
|
comment (without adding braces), thinking it is already a multi-statement loop:
|
2010-04-15 17:31:04 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
while (true) // BAD! multi-line body with no braces
|
|
|
|
/* comment... */
|
|
|
|
single_line_stmt();
|
2010-04-15 17:31:04 +00:00
|
|
|
|
|
|
|
Do this instead:
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
while (true) { // Always put braces around a multi-line body.
|
|
|
|
/* comment... */
|
|
|
|
single_line_stmt();
|
|
|
|
}
|
2010-04-15 17:31:04 +00:00
|
|
|
|
|
|
|
There is one exception: when the second body line is not at the same
|
|
|
|
indentation level as the first body line:
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
if (expr)
|
|
|
|
die("a diagnostic that would make this line"
|
|
|
|
" extend past the 80-column limit"));
|
2010-04-15 17:31:04 +00:00
|
|
|
|
|
|
|
It is safe to omit the braces in the code above, since the further-indented
|
|
|
|
second body line makes it obvious that this is still a single-statement body.
|
|
|
|
|
|
|
|
To reiterate, don't do this:
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
if (expr) // BAD: no braces around...
|
|
|
|
while (expr_2) { // ... a multi-line body
|
|
|
|
...
|
|
|
|
}
|
2010-04-15 17:31:04 +00:00
|
|
|
|
|
|
|
Do this, instead:
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
if (expr) {
|
|
|
|
while (expr_2) {
|
|
|
|
...
|
|
|
|
}
|
|
|
|
}
|
2010-04-15 17:31:04 +00:00
|
|
|
|
|
|
|
However, there is one exception in the other direction, when even a one-line
|
|
|
|
block should have braces. That occurs when that one-line, brace-less block is
|
2011-01-05 17:58:35 +00:00
|
|
|
an "if" or "else" block, and the counterpart block *does* use braces. In that
|
|
|
|
case, put braces around both blocks. Also, if the "else" block is much shorter
|
|
|
|
than the "if" block, consider negating the "if"-condition and swapping the
|
|
|
|
bodies, putting the short block first and making the longer, multi-line block
|
|
|
|
be the "else" block.
|
2010-04-15 17:31:04 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
if (expr) {
|
|
|
|
...
|
|
|
|
...
|
|
|
|
}
|
|
|
|
else
|
2011-01-05 17:58:35 +00:00
|
|
|
x = y; // BAD: braceless "else" with braced "then",
|
|
|
|
// and short block last
|
2010-04-15 17:31:04 +00:00
|
|
|
|
2011-01-05 17:58:35 +00:00
|
|
|
if (expr)
|
|
|
|
x = y; // BAD: braceless "if" with braced "else"
|
|
|
|
else {
|
|
|
|
...
|
|
|
|
...
|
|
|
|
}
|
2010-04-15 17:31:04 +00:00
|
|
|
|
2011-01-05 17:58:35 +00:00
|
|
|
Keeping braces consistent and putting the short block first is preferred,
|
|
|
|
especially when the multi-line body is more than a few lines long, because it
|
|
|
|
is easier to read and grasp the semantics of an if-then-else block when the
|
|
|
|
simpler block occurs first, rather than after the more involved block:
|
|
|
|
|
|
|
|
if (!expr) {
|
2010-11-12 14:36:53 +00:00
|
|
|
x = y; // putting the smaller block first is more readable
|
2011-01-05 17:58:35 +00:00
|
|
|
} else {
|
2010-11-12 14:36:53 +00:00
|
|
|
...
|
|
|
|
...
|
|
|
|
}
|
2010-04-15 17:31:04 +00:00
|
|
|
|
2011-01-05 17:58:35 +00:00
|
|
|
But if negating a complex condition is too ugly, then at least add braces:
|
2010-04-15 17:31:04 +00:00
|
|
|
|
2011-01-05 17:58:35 +00:00
|
|
|
if (complex expr not worth negating) {
|
2010-11-12 14:36:53 +00:00
|
|
|
...
|
|
|
|
...
|
|
|
|
} else {
|
|
|
|
x = y;
|
|
|
|
}
|
2010-04-15 17:31:04 +00:00
|
|
|
|
|
|
|
|
2010-03-09 00:02:45 +00:00
|
|
|
Preprocessor
|
|
|
|
============
|
|
|
|
For variadic macros, stick with C99 syntax:
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
#define vshPrint(_ctl, ...) fprintf(stdout, __VA_ARGS__)
|
2010-03-09 00:02:45 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
Use parenthesis when checking if a macro is defined, and use indentation to
|
|
|
|
track nesting:
|
2010-03-09 00:02:45 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
#if defined(HAVE_POSIX_FALLOCATE) && !defined(HAVE_FALLOCATE)
|
|
|
|
# define fallocate(a,ignored,b,c) posix_fallocate(a,b,c)
|
|
|
|
#endif
|
2010-03-09 00:02:45 +00:00
|
|
|
|
|
|
|
|
2009-01-05 08:12:11 +00:00
|
|
|
C types
|
|
|
|
=======
|
|
|
|
Use the right type.
|
|
|
|
|
|
|
|
Scalars
|
|
|
|
-------
|
2010-11-12 14:36:53 +00:00
|
|
|
- If you're using "int" or "long", odds are good that there's a better type.
|
|
|
|
|
|
|
|
- If a variable is counting something, be sure to declare it with an unsigned
|
|
|
|
type.
|
|
|
|
|
|
|
|
- If it's memory-size-related, use "size_t" (use "ssize_t" only if required).
|
|
|
|
|
|
|
|
- If it's file-size related, use uintmax_t, or maybe "off_t".
|
|
|
|
|
|
|
|
- If it's file-offset related (i.e., signed), use "off_t".
|
|
|
|
|
|
|
|
- If it's just counting small numbers use "unsigned int"; (on all but oddball
|
|
|
|
embedded systems, you can assume that that type is at least four bytes wide).
|
|
|
|
|
|
|
|
- If a variable has boolean semantics, give it the "bool" type and use the
|
|
|
|
corresponding "true" and "false" macros. It's ok to include <stdbool.h>, since
|
|
|
|
libvirt's use of gnulib ensures that it exists and is usable.
|
|
|
|
|
|
|
|
- In the unusual event that you require a specific width, use a standard type
|
|
|
|
like "int32_t", "uint32_t", "uint64_t", etc.
|
|
|
|
|
|
|
|
- While using "bool" is good for readability, it comes with minor caveats:
|
|
|
|
|
|
|
|
-- Don't use "bool" in places where the type size must be constant across all
|
|
|
|
systems, like public interfaces and on-the-wire protocols. Note that it would
|
|
|
|
be possible (albeit wasteful) to use "bool" in libvirt's logical wire
|
|
|
|
protocol, since XDR maps that to its lower-level "bool_t" type, which *is*
|
|
|
|
fixed-size.
|
|
|
|
|
|
|
|
-- Don't compare a bool variable against the literal, "true", since a value with
|
|
|
|
a logical non-false value need not be "1". I.e., don't write "if (seen ==
|
|
|
|
true) ...". Rather, write "if (seen)...".
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Of course, take all of the above with a grain of salt. If you're about to use
|
|
|
|
some system interface that requires a type like "size_t", "pid_t" or "off_t",
|
|
|
|
use matching types for any corresponding variables.
|
|
|
|
|
|
|
|
Also, if you try to use e.g., "unsigned int" as a type, and that conflicts
|
|
|
|
with the signedness of a related variable, sometimes it's best just to use the
|
|
|
|
*wrong* type, if 'pulling the thread' and fixing all related variables would
|
|
|
|
be too invasive.
|
|
|
|
|
|
|
|
Finally, while using descriptive types is important, be careful not to go
|
|
|
|
overboard. If whatever you're doing causes warnings, or requires casts, then
|
|
|
|
reconsider or ask for help.
|
2009-01-05 08:12:11 +00:00
|
|
|
|
|
|
|
Pointers
|
|
|
|
--------
|
2010-11-12 14:36:53 +00:00
|
|
|
Ensure that all of your pointers are 'const-correct'. Unless a pointer is used
|
|
|
|
to modify the pointed-to storage, give it the "const" attribute. That way, the
|
|
|
|
reader knows up-front that this is a read-only pointer. Perhaps more
|
|
|
|
importantly, if we're diligent about this, when you see a non-const pointer,
|
|
|
|
you're guaranteed that it is used to modify the storage it points to, or it is
|
|
|
|
aliased to another pointer that is.
|
2009-01-05 08:12:11 +00:00
|
|
|
|
|
|
|
|
2008-05-08 14:49:53 +00:00
|
|
|
Low level memory management
|
|
|
|
===========================
|
|
|
|
Use of the malloc/free/realloc/calloc APIs is deprecated in the libvirt
|
2010-11-12 14:36:53 +00:00
|
|
|
codebase, because they encourage a number of serious coding bugs and do not
|
|
|
|
enable compile time verification of checks for NULL. Instead of these
|
2010-08-13 21:00:47 +00:00
|
|
|
routines, use the macros from memory.h.
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-08-13 21:00:47 +00:00
|
|
|
- To allocate a single object:
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
virDomainPtr domain;
|
|
|
|
|
|
|
|
if (VIR_ALLOC(domain) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-05-08 14:49:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2010-08-13 21:00:47 +00:00
|
|
|
- To allocate an array of objects:
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
virDomainPtr domains;
|
2010-08-13 21:00:47 +00:00
|
|
|
size_t ndomains = 10;
|
2010-11-12 14:36:53 +00:00
|
|
|
|
|
|
|
if (VIR_ALLOC_N(domains, ndomains) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-05-08 14:49:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2010-08-13 21:00:47 +00:00
|
|
|
- To allocate an array of object pointers:
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
virDomainPtr *domains;
|
2010-08-14 15:42:51 +00:00
|
|
|
size_t ndomains = 10;
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
if (VIR_ALLOC_N(domains, ndomains) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-08-14 15:42:51 +00:00
|
|
|
- To re-allocate the array of domains to be 1 element longer (however, note that
|
|
|
|
repeatedly expanding an array by 1 scales quadratically, so this is
|
|
|
|
recommended only for smaller arrays):
|
|
|
|
|
|
|
|
virDomainPtr domains;
|
|
|
|
size_t ndomains = 0;
|
2010-11-12 14:36:53 +00:00
|
|
|
|
2010-08-14 15:42:51 +00:00
|
|
|
if (VIR_EXPAND_N(domains, ndomains, 1) < 0) {
|
2010-11-12 14:36:53 +00:00
|
|
|
virReportOOMError();
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-08-14 15:42:51 +00:00
|
|
|
domains[ndomains - 1] = domain;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- To ensure an array has room to hold at least one more element (this approach
|
|
|
|
scales better, but requires tracking allocation separately from usage)
|
|
|
|
|
|
|
|
virDomainPtr domains;
|
|
|
|
size_t ndomains = 0;
|
|
|
|
size_t ndomains_max = 0;
|
|
|
|
|
|
|
|
if (VIR_RESIZE_N(domains, ndomains_max, ndomains, 1) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
domains[ndomains++] = domain;
|
2010-11-12 14:36:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2010-11-22 19:27:07 +00:00
|
|
|
- To trim an array of domains from its allocated size down to the actual used
|
|
|
|
size:
|
2010-08-13 21:00:47 +00:00
|
|
|
|
2010-08-14 15:42:51 +00:00
|
|
|
virDomainPtr domains;
|
|
|
|
size_t ndomains = x;
|
|
|
|
size_t ndomains_max = y;
|
|
|
|
|
2010-11-22 19:27:07 +00:00
|
|
|
VIR_SHRINK_N(domains, ndomains_max, ndomains_max - ndomains);
|
2010-08-13 21:00:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2010-08-14 15:42:51 +00:00
|
|
|
- To free an array of domains:
|
2010-11-12 14:36:53 +00:00
|
|
|
|
2010-08-14 15:42:51 +00:00
|
|
|
virDomainPtr domains;
|
|
|
|
size_t ndomains = x;
|
|
|
|
size_t ndomains_max = y;
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
for (i = 0; i < ndomains; i++)
|
|
|
|
VIR_FREE(domains[i]);
|
|
|
|
VIR_FREE(domains);
|
|
|
|
ndomains_max = ndomains = 0;
|
2008-05-08 14:49:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-10-19 14:23:51 +00:00
|
|
|
File handling
|
|
|
|
=============
|
2010-11-17 02:13:29 +00:00
|
|
|
Usage of the "fdopen()", "close()", "fclose()" APIs is deprecated in libvirt
|
|
|
|
code base to help avoiding double-closing of files or file descriptors, which
|
|
|
|
is particulary dangerous in a multi-threaded applications. Instead of these
|
|
|
|
APIs, use the macros from files.h
|
|
|
|
|
2010-08-13 21:00:47 +00:00
|
|
|
- Open a file from a file descriptor:
|
2010-11-17 02:13:29 +00:00
|
|
|
|
|
|
|
if ((file = VIR_FDOPEN(fd, "r")) == NULL) {
|
|
|
|
virReportSystemError(errno, "%s",
|
|
|
|
_("failed to open file from file descriptor"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* fd is now invalid; only access the file using file variable */
|
|
|
|
|
|
|
|
|
2010-10-19 14:23:51 +00:00
|
|
|
|
2010-08-13 21:00:47 +00:00
|
|
|
- Close a file descriptor:
|
2010-11-12 14:36:53 +00:00
|
|
|
|
|
|
|
if (VIR_CLOSE(fd) < 0) {
|
2010-11-17 02:13:29 +00:00
|
|
|
virReportSystemError(errno, "%s", _("failed to close file"));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-08-13 21:00:47 +00:00
|
|
|
- Close a file:
|
2010-11-17 02:13:29 +00:00
|
|
|
|
|
|
|
if (VIR_FCLOSE(file) < 0) {
|
|
|
|
virReportSystemError(errno, "%s", _("failed to close file"));
|
2010-11-12 14:36:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-08-13 21:00:47 +00:00
|
|
|
- Close a file or file descriptor in an error path, without losing the previous
|
|
|
|
"errno" value:
|
2010-11-12 14:36:53 +00:00
|
|
|
|
|
|
|
VIR_FORCE_CLOSE(fd);
|
2010-11-17 02:13:29 +00:00
|
|
|
VIR_FORCE_FCLOSE(file);
|
2010-11-12 14:36:53 +00:00
|
|
|
|
|
|
|
|
2010-10-19 14:23:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2008-05-08 14:49:53 +00:00
|
|
|
|
|
|
|
String comparisons
|
|
|
|
==================
|
2010-11-12 14:36:53 +00:00
|
|
|
Do not use the strcmp, strncmp, etc functions directly. Instead use one of the
|
|
|
|
following semantically named macros
|
|
|
|
|
|
|
|
- For strict equality:
|
|
|
|
|
|
|
|
STREQ(a,b)
|
|
|
|
STRNEQ(a,b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- For case insensitive equality:
|
|
|
|
|
|
|
|
STRCASEEQ(a,b)
|
|
|
|
STRCASENEQ(a,b)
|
|
|
|
|
|
|
|
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
- For strict equality of a substring:
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
STREQLEN(a,b,n)
|
|
|
|
STRNEQLEN(a,b,n)
|
2008-05-08 14:49:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
- For case insensitive equality of a substring:
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
STRCASEEQLEN(a,b,n)
|
|
|
|
STRCASENEQLEN(a,b,n)
|
2008-05-08 14:49:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
- For strict equality of a prefix:
|
|
|
|
|
|
|
|
STRPREFIX(a,b)
|
|
|
|
|
|
|
|
|
2008-05-08 14:49:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-08-03 12:37:44 +00:00
|
|
|
String copying
|
|
|
|
==============
|
2010-11-12 14:36:53 +00:00
|
|
|
Do not use the strncpy function. According to the man page, it does *not*
|
|
|
|
guarantee a NULL-terminated buffer, which makes it extremely dangerous to use.
|
|
|
|
Instead, use one of the functionally equivalent functions:
|
2009-08-03 12:37:44 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
virStrncpy(char *dest, const char *src, size_t n, size_t destbytes)
|
2009-08-03 12:37:44 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
The first three arguments have the same meaning as for strncpy; namely the
|
|
|
|
destination, source, and number of bytes to copy, respectively. The last
|
|
|
|
argument is the number of bytes available in the destination string; if a copy
|
|
|
|
of the source string (including a \0) will not fit into the destination, no
|
|
|
|
bytes are copied and the routine returns NULL. Otherwise, n bytes from the
|
|
|
|
source are copied into the destination and a trailing \0 is appended.
|
2009-08-03 12:37:44 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
virStrcpy(char *dest, const char *src, size_t destbytes)
|
2009-08-03 12:37:44 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
Use this variant if you know you want to copy the entire src string into dest.
|
|
|
|
Note that this is a macro, so arguments could be evaluated more than once.
|
|
|
|
This is equivalent to virStrncpy(dest, src, strlen(src), destbytes)
|
2009-08-03 12:37:44 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
virStrcpyStatic(char *dest, const char *src)
|
|
|
|
|
|
|
|
Use this variant if you know you want to copy the entire src string into dest
|
|
|
|
*and* you know that your destination string is a static string (i.e. that
|
|
|
|
sizeof(dest) returns something meaningful). Note that this is a macro, so
|
|
|
|
arguments could be evaluated more than once. This is equivalent to
|
|
|
|
virStrncpy(dest, src, strlen(src), sizeof(dest)).
|
2009-08-03 12:37:44 +00:00
|
|
|
|
|
|
|
|
2008-05-08 14:49:53 +00:00
|
|
|
Variable length string buffer
|
|
|
|
=============================
|
2010-11-12 14:36:53 +00:00
|
|
|
If there is a need for complex string concatenations, avoid using the usual
|
|
|
|
sequence of malloc/strcpy/strcat/snprintf functions and make use of the
|
|
|
|
virBuffer API described in buf.h
|
2008-05-08 14:49:53 +00:00
|
|
|
|
2010-08-13 21:00:47 +00:00
|
|
|
Typical usage is as follows:
|
2008-05-08 14:49:53 +00:00
|
|
|
|
|
|
|
char *
|
2010-11-12 14:36:53 +00:00
|
|
|
somefunction(...)
|
|
|
|
{
|
2008-05-08 14:49:53 +00:00
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
|
|
|
|
...
|
|
|
|
|
|
|
|
virBufferAddLit(&buf, "<domain>\n");
|
2011-04-30 16:34:49 +00:00
|
|
|
virBufferAsprintf(&buf, " <memory>%d</memory>\n", memory);
|
2008-05-08 14:49:53 +00:00
|
|
|
...
|
|
|
|
virBufferAddLit(&buf, "</domain>\n");
|
|
|
|
|
2009-12-09 23:00:50 +00:00
|
|
|
...
|
2008-05-08 14:49:53 +00:00
|
|
|
|
|
|
|
if (virBufferError(&buf)) {
|
2009-12-09 23:00:50 +00:00
|
|
|
virBufferFreeAndReset(&buf);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-05-08 14:49:53 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return virBufferContentAndReset(&buf);
|
|
|
|
}
|
Standardize use of header files, making internal.h primary.
* qemud/internal.h, qemud/qemud.h: Rename this file so it
doesn't conflict with src/internal.h.
* HACKING: Document how header files should be used.
* qemud/Makefile.am: Add src/ directory to includes.
* qemud/event.c, qemud/mdns.c, qemud/qemud.c, qemud/remote.c,
qemud/remote_protocol.c, qemud/remote_protocol.h,
qemud/remote_protocol.x, src/buf.c, src/libvirt.c,
src/nodeinfo.c, src/qemu_conf.c, src/qemu_driver.c,
src/stats_linux.c, src/storage_backend.c, src/storage_backend_fs.c,
src/storage_backend_iscsi.c, src/storage_backend_logical.c,
src/storage_conf.c, src/storage_driver.c, src/util.c,
src/util.h, src/virsh.c, src/virterror.c, src/xend_internal.c,
src/xml.c, tests/reconnect.c, tests/xmlrpctest.c,
tests/qparamtest.c: Standardize use of header files.
* docs/*, po/*: Rebuild docs.
2008-05-23 08:24:41 +00:00
|
|
|
|
|
|
|
|
|
|
|
Include files
|
|
|
|
=============
|
2010-11-12 14:36:53 +00:00
|
|
|
There are now quite a large number of include files, both libvirt internal and
|
|
|
|
external, and system includes. To manage all this complexity it's best to
|
|
|
|
stick to the following general plan for all *.c source files:
|
Standardize use of header files, making internal.h primary.
* qemud/internal.h, qemud/qemud.h: Rename this file so it
doesn't conflict with src/internal.h.
* HACKING: Document how header files should be used.
* qemud/Makefile.am: Add src/ directory to includes.
* qemud/event.c, qemud/mdns.c, qemud/qemud.c, qemud/remote.c,
qemud/remote_protocol.c, qemud/remote_protocol.h,
qemud/remote_protocol.x, src/buf.c, src/libvirt.c,
src/nodeinfo.c, src/qemu_conf.c, src/qemu_driver.c,
src/stats_linux.c, src/storage_backend.c, src/storage_backend_fs.c,
src/storage_backend_iscsi.c, src/storage_backend_logical.c,
src/storage_conf.c, src/storage_driver.c, src/util.c,
src/util.h, src/virsh.c, src/virterror.c, src/xend_internal.c,
src/xml.c, tests/reconnect.c, tests/xmlrpctest.c,
tests/qparamtest.c: Standardize use of header files.
* docs/*, po/*: Rebuild docs.
2008-05-23 08:24:41 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright notice
|
|
|
|
* ....
|
|
|
|
* ....
|
|
|
|
* ....
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h> Must come first in every file.
|
|
|
|
|
|
|
|
#include <stdio.h> Any system includes you need.
|
|
|
|
#include <string.h>
|
|
|
|
#include <limits.h>
|
|
|
|
|
|
|
|
#if HAVE_NUMACTL Some system includes aren't supported
|
2010-03-09 16:21:55 +00:00
|
|
|
# include <numa.h> everywhere so need these #if guards.
|
Standardize use of header files, making internal.h primary.
* qemud/internal.h, qemud/qemud.h: Rename this file so it
doesn't conflict with src/internal.h.
* HACKING: Document how header files should be used.
* qemud/Makefile.am: Add src/ directory to includes.
* qemud/event.c, qemud/mdns.c, qemud/qemud.c, qemud/remote.c,
qemud/remote_protocol.c, qemud/remote_protocol.h,
qemud/remote_protocol.x, src/buf.c, src/libvirt.c,
src/nodeinfo.c, src/qemu_conf.c, src/qemu_driver.c,
src/stats_linux.c, src/storage_backend.c, src/storage_backend_fs.c,
src/storage_backend_iscsi.c, src/storage_backend_logical.c,
src/storage_conf.c, src/storage_driver.c, src/util.c,
src/util.h, src/virsh.c, src/virterror.c, src/xend_internal.c,
src/xml.c, tests/reconnect.c, tests/xmlrpctest.c,
tests/qparamtest.c: Standardize use of header files.
* docs/*, po/*: Rebuild docs.
2008-05-23 08:24:41 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "internal.h" Include this first, after system includes.
|
|
|
|
|
|
|
|
#include "util.h" Any libvirt internal header files.
|
|
|
|
#include "buf.h"
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
static int
|
|
|
|
myInternalFunc() The actual code.
|
Standardize use of header files, making internal.h primary.
* qemud/internal.h, qemud/qemud.h: Rename this file so it
doesn't conflict with src/internal.h.
* HACKING: Document how header files should be used.
* qemud/Makefile.am: Add src/ directory to includes.
* qemud/event.c, qemud/mdns.c, qemud/qemud.c, qemud/remote.c,
qemud/remote_protocol.c, qemud/remote_protocol.h,
qemud/remote_protocol.x, src/buf.c, src/libvirt.c,
src/nodeinfo.c, src/qemu_conf.c, src/qemu_driver.c,
src/stats_linux.c, src/storage_backend.c, src/storage_backend_fs.c,
src/storage_backend_iscsi.c, src/storage_backend_logical.c,
src/storage_conf.c, src/storage_driver.c, src/util.c,
src/util.h, src/virsh.c, src/virterror.c, src/xend_internal.c,
src/xml.c, tests/reconnect.c, tests/xmlrpctest.c,
tests/qparamtest.c: Standardize use of header files.
* docs/*, po/*: Rebuild docs.
2008-05-23 08:24:41 +00:00
|
|
|
{
|
2010-11-12 14:36:53 +00:00
|
|
|
...
|
Standardize use of header files, making internal.h primary.
* qemud/internal.h, qemud/qemud.h: Rename this file so it
doesn't conflict with src/internal.h.
* HACKING: Document how header files should be used.
* qemud/Makefile.am: Add src/ directory to includes.
* qemud/event.c, qemud/mdns.c, qemud/qemud.c, qemud/remote.c,
qemud/remote_protocol.c, qemud/remote_protocol.h,
qemud/remote_protocol.x, src/buf.c, src/libvirt.c,
src/nodeinfo.c, src/qemu_conf.c, src/qemu_driver.c,
src/stats_linux.c, src/storage_backend.c, src/storage_backend_fs.c,
src/storage_backend_iscsi.c, src/storage_backend_logical.c,
src/storage_conf.c, src/storage_driver.c, src/util.c,
src/util.h, src/virsh.c, src/virterror.c, src/xend_internal.c,
src/xml.c, tests/reconnect.c, tests/xmlrpctest.c,
tests/qparamtest.c: Standardize use of header files.
* docs/*, po/*: Rebuild docs.
2008-05-23 08:24:41 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
Of particular note: *Do not* include libvirt/libvirt.h or libvirt/virterror.h.
|
|
|
|
It is included by "internal.h" already and there are some special reasons why
|
|
|
|
you cannot include these files explicitly.
|
2008-10-21 14:26:59 +00:00
|
|
|
|
|
|
|
|
2008-12-17 17:22:43 +00:00
|
|
|
Printf-style functions
|
|
|
|
======================
|
2010-11-12 14:36:53 +00:00
|
|
|
Whenever you add a new printf-style function, i.e., one with a format string
|
|
|
|
argument and following "..." in its prototype, be sure to use gcc's printf
|
|
|
|
attribute directive in the prototype. For example, here's the one for
|
|
|
|
virAsprintf, in util.h:
|
|
|
|
|
|
|
|
int virAsprintf(char **strp, const char *fmt, ...)
|
|
|
|
ATTRIBUTE_FORMAT(printf, 2, 3);
|
|
|
|
|
|
|
|
This makes it so gcc's -Wformat and -Wformat-security options can do their
|
|
|
|
jobs and cross-check format strings with the number and types of arguments.
|
|
|
|
|
2010-08-18 23:31:39 +00:00
|
|
|
When printing to a string, consider using virBuffer for incremental
|
|
|
|
allocations, virAsprintf for a one-shot allocation, and snprintf for
|
|
|
|
fixed-width buffers. Do not use sprintf, even if you can prove the buffer
|
|
|
|
won't overflow, since gnulib does not provide the same portability guarantees
|
|
|
|
for sprintf as it does for snprintf.
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
|
|
|
|
Use of goto
|
|
|
|
===========
|
|
|
|
The use of goto is not forbidden, and goto is widely used throughout libvirt.
|
|
|
|
While the uncontrolled use of goto will quickly lead to unmaintainable code,
|
|
|
|
there is a place for it in well structured code where its use increases
|
|
|
|
readability and maintainability. In general, if goto is used for error
|
|
|
|
recovery, it's likely to be ok, otherwise, be cautious or avoid it all
|
|
|
|
together.
|
2008-12-17 17:22:43 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
The typical use of goto is to jump to cleanup code in the case of a long list
|
|
|
|
of actions, any of which may fail and cause the entire operation to fail. In
|
|
|
|
this case, a function will have a single label at the end of the function.
|
|
|
|
It's almost always ok to use this style. In particular, if the cleanup code
|
|
|
|
only involves free'ing memory, then having multiple labels is overkill.
|
|
|
|
VIR_FREE() and every function named XXXFree() in libvirt is required to handle
|
|
|
|
NULL as its arg. Thus you can safely call free on all the variables even if
|
|
|
|
they were not yet allocated (yes they have to have been initialized to NULL).
|
|
|
|
This is much simpler and clearer than having multiple labels.
|
2008-12-17 17:22:43 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
There are a couple of signs that a particular use of goto is not ok:
|
2008-12-17 17:22:43 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
- You're using multiple labels. If you find yourself using multiple labels,
|
|
|
|
you're strongly encouraged to rework your code to eliminate all but one of
|
|
|
|
them.
|
2008-12-17 17:22:43 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
- The goto jumps back up to a point above the current line of code being
|
|
|
|
executed. Please use some combination of looping constructs to re-execute code
|
|
|
|
instead; it's almost certainly going to be more understandable by others. One
|
|
|
|
well-known exception to this rule is restarting an i/o operation following
|
|
|
|
EINTR.
|
2008-12-17 17:22:43 +00:00
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
- The goto jumps down to an arbitrary place in the middle of a function followed
|
|
|
|
by further potentially failing calls. You should almost certainly be using a
|
|
|
|
conditional and a block instead of a goto. Perhaps some of your function's
|
|
|
|
logic would be better pulled out into a helper function.
|
2008-10-21 14:26:59 +00:00
|
|
|
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
|
|
|
|
Although libvirt does not encourage the Linux kernel wind/unwind style of
|
|
|
|
multiple labels, there's a good general discussion of the issue archived at
|
|
|
|
|
|
|
|
KernelTrap
|
|
|
|
http://kerneltrap.org/node/553/2131
|
|
|
|
|
|
|
|
When using goto, please use one of these standard labels if it makes sense:
|
|
|
|
|
|
|
|
error: A path only taken upon return with an error code
|
|
|
|
cleanup: A path taken upon return with success code + optional error
|
|
|
|
no_memory: A path only taken upon return with an OOM error code
|
2010-08-13 21:00:47 +00:00
|
|
|
retry: If needing to jump upwards (e.g., retry on EINTR)
|
2010-11-12 14:36:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
Libvirt committer guidelines
|
|
|
|
============================
|
|
|
|
The AUTHORS files indicates the list of people with commit access right who
|
|
|
|
can actually merge the patches.
|
2008-10-21 14:26:59 +00:00
|
|
|
|
2010-03-09 16:21:55 +00:00
|
|
|
The general rule for committing a patch is to make sure it has been reviewed
|
2010-11-12 14:36:53 +00:00
|
|
|
properly in the mailing-list first, usually if a couple of people gave an ACK
|
|
|
|
or +1 to a patch and nobody raised an objection on the list it should be good
|
|
|
|
to go. If the patch touches a part of the code where you're not the main
|
|
|
|
maintainer, or where you do not have a very clear idea of how things work,
|
|
|
|
it's better to wait for a more authoritative feedback though. Before
|
|
|
|
committing, please also rebuild locally, run 'make check syntax-check', and
|
|
|
|
make sure you don't raise errors. Try to look for warnings too; for example,
|
|
|
|
configure with
|
|
|
|
|
|
|
|
--enable-compile-warnings=error
|
|
|
|
|
2008-10-21 14:26:59 +00:00
|
|
|
which adds -Werror to compile flags, so no warnings get missed
|
|
|
|
|
2010-11-12 14:36:53 +00:00
|
|
|
An exception to 'review and approval on the list first' is fixing failures to
|
|
|
|
build:
|
|
|
|
|
|
|
|
- if a recently committed patch breaks compilation on a platform or for a given
|
|
|
|
driver, then it's fine to commit a minimal fix directly without getting the
|
|
|
|
review feedback first
|
|
|
|
|
|
|
|
- if make check or make syntax-check breaks, if there is an obvious fix, it's
|
|
|
|
fine to commit immediately. The patch should still be sent to the list (or
|
|
|
|
tell what the fix was if trivial), and 'make check syntax-check' should pass
|
|
|
|
too, before committing anything
|
|
|
|
|
|
|
|
- fixes for documentation and code comments can be managed in the same way, but
|
|
|
|
still make sure they get reviewed if non-trivial.
|