hacking.html.in 38.0 KB
Newer Older
1 2 3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
4 5 6 7 8 9 10 11
  <body>
    <h1>Contributor guidelines</h1>

    <ul id="toc"></ul>

    <h2><a name="patches">General tips for contributing patches</a></h2>
    <ol>
      <li>Discuss any large changes on the mailing list first.  Post patches
M
Matthew Booth 已提交
12
        early and listen to feedback.</li>
13

E
Eric Blake 已提交
14 15 16 17 18 19
      <li><p>Post patches in unified diff format, with git rename
        detection enabled.  You need a one-time setup of:</p>
<pre>
  git config diff.renames true
</pre>
        <p>After that, a command similar to this should work:</p>
20 21 22
<pre>
  diff -urp libvirt.orig/ libvirt.modified/ &gt; libvirt-myfeature.patch
</pre>
M
Matthew Booth 已提交
23 24 25
        <p>
          or:
        </p>
26
<pre>
J
Ján Tomko 已提交
27
  git diff &gt; libvirt-myfeature.patch
28
</pre>
E
Eric Blake 已提交
29 30 31
        <p>Also, for code motion patches, you may find that <code>git
        diff --patience</code> provides an easier-to-read patch.
        However, the usual workflow of libvirt developer is:</p>
32 33 34 35 36 37 38 39 40 41
<pre>
  git checkout master
  git pull
  git checkout -t origin -b workbranch
  Hack, committing any changes along the way
</pre>
        <p>Then, when you want to post your patches:</p>
<pre>
  git pull --rebase
  (fix any conflicts)
42 43
  git send-email --cover-letter --no-chain-reply-to --annotate \
                 --to=libvir-list@redhat.com master
44
</pre>
45 46 47 48 49 50 51
        <p>(Note that the "git send-email" subcommand may not be in
        the main git package and using it may require installion of a
        separate package, for example the "git-email" package in
        Fedora.)  For a single patch you can omit
        <code>--cover-letter</code>, but a series of two or more
        patches needs a cover letter. If you get tired of typing
        <code>--to=libvir-list@redhat.com</code> designation you can
52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
        set it in git config:</p>
<pre>
  git config sendemail.to libvir-list@redhat.com
</pre>
        <p>Please follow this as close as you can, especially the rebase and
        git send-email part, as it makes life easier for other developers to
        review your patch set. One should avoid sending patches as attachments,
        but rather send them in email body along with commit message. If a
        developer is sending another version of the patch (e.g. to address
        review comments), he is advised to note differences to previous
        versions after the <code>---</code> line in the patch so that it helps
        reviewers but doesn't become part of git history. Moreover, such patch
        needs to be prefixed correctly with
        <code>--subject-prefix=PATCHv2</code> appended to <code>git
            send-email</code> (substitute <code>v2</code> with the correct
        version if needed though).</p>
      </li>

E
Eric Blake 已提交
70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
      <li><p>In your commit message, make the summary line reasonably
          short (60 characters is typical), followed by a blank line,
          followed by any longer description of why your patch makes
          sense.  If the patch fixes a regression, and you know what
          commit introduced the problem, mentioning that is useful.
          If the patch resolves a bugzilla report, mentioning the URL
          of the bug number is useful; but also summarize the issue
          rather than making all readers follow the link.  You can use
          'git shortlog -30' to get an idea of typical summary lines.
          Libvirt does not currently attach any meaning to
          Signed-off-by: lines, so it is up to you if you want to
          include or omit them in the commit message.
        </p>
      </li>

85
      <li><p>Split large changes into a series of smaller patches,
86 87 88 89 90 91 92 93 94
        self-contained if possible, with an explanation of each patch
        and an explanation of how the sequence of patches fits
        together. Moreover, please keep in mind that it's required to
        be able to compile cleanly (<b>including</b> <code>make
        check</code> and <code>make syntax-check</code>) after each
        patch.  A feature does not have to work until the end of a
        series, but intermediate patches must compile and not cause
        test-suite failures (this is to preserve the usefulness
        of <code>git bisect</code>, among other things).</p>
95
      </li>
96

97 98
      <li>Make sure your patches apply against libvirt GIT.  Developers
        only follow GIT and don't care much about released versions.</li>
99
      <li><p>Run the automated tests on your code before submitting any changes.
100 101 102
          In particular, configure with compile warnings set to
          -Werror.  This is done automatically for a git checkout; from a
          tarball, use:</p>
103
<pre>
104
  ./configure --enable-werror
105
</pre>
M
Matthew Booth 已提交
106 107 108
        <p>
          and run the tests:
        </p>
109
<pre>
110 111
  make check
  make syntax-check
112 113
  make -C tests valgrind
</pre>
114 115 116
        <p><a href="http://valgrind.org/">Valgrind</a> is a test that checks
        for memory management issues, such as leaks or use of uninitialized
        variables.
M
Matthew Booth 已提交
117
        </p>
118

119 120 121 122 123 124
        <p>
          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:
        </p>
D
David Allan 已提交
125

126
<pre>
D
David Allan 已提交
127
  VIR_TEST_DEBUG=1 make check    (or)
128 129 130 131 132 133 134 135 136
  VIR_TEST_DEBUG=2 make check
</pre>
        <p>
          Also, individual tests can be run from inside the <code>tests/</code>
          directory, like:
        </p>
<pre>
  ./qemuxml2xmltest
</pre>
E
Eric Blake 已提交
137 138 139
        <p>There is also a <code>./run</code> script at the top level,
          to make it easier to run programs that have not yet been
          installed, as well as to wrap invocations of various tests
140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229
          under gdb or Valgrind.
        </p>

      </li>
      <li><p>The Valgrind test should produce similar output to
          <code>make check</code>. If the output has traces within libvirt
          API's, then investigation is required in order to determine the
          cause of the issue. Output such as the following indicates some
          sort of leak:
        </p>
<pre>
==5414== 4 bytes in 1 blocks are definitely lost in loss record 3 of 89
==5414==    at 0x4A0881C: malloc (vg_replace_malloc.c:270)
==5414==    by 0x34DE0AAB85: xmlStrndup (in /usr/lib64/libxml2.so.2.7.8)
==5414==    by 0x4CC97A6: virDomainVideoDefParseXML (domain_conf.c:7410)
==5414==    by 0x4CD581D: virDomainDefParseXML (domain_conf.c:10188)
==5414==    by 0x4CD8C73: virDomainDefParseNode (domain_conf.c:10640)
==5414==    by 0x4CD8DDB: virDomainDefParse (domain_conf.c:10590)
==5414==    by 0x41CB1D: testCompareXMLToArgvHelper (qemuxml2argvtest.c:100)
==5414==    by 0x41E20F: virtTestRun (testutils.c:161)
==5414==    by 0x41C7CB: mymain (qemuxml2argvtest.c:866)
==5414==    by 0x41E84A: virtTestMain (testutils.c:723)
==5414==    by 0x34D9021734: (below main) (in /usr/lib64/libc-2.15.so)
</pre>
        <p>In this example, the <code>virDomainDefParseXML()</code> had
           an error path where the <code>virDomainVideoDefPtr video</code>
           pointer was not properly disposed. By simply adding a
           <code>virDomainVideoDefFree(video);</code> in the error path,
           the issue was resolved.
        </p>

        <p>Another common mistake is calling a printing function, such as
           <code>VIR_DEBUG()</code> without initializing a variable to be
           printed.  The following example involved a call which could return
           an error, but not set variables passed by reference to the call.
           The solution was to initialize the variables prior to the call.
        </p>
<pre>
==4749== Use of uninitialised value of size 8
==4749==    at 0x34D904650B: _itoa_word (in /usr/lib64/libc-2.15.so)
==4749==    by 0x34D9049118: vfprintf (in /usr/lib64/libc-2.15.so)
==4749==    by 0x34D9108F60: __vasprintf_chk (in /usr/lib64/libc-2.15.so)
==4749==    by 0x4CAEEF7: virVasprintf (stdio2.h:199)
==4749==    by 0x4C8A55E: virLogVMessage (virlog.c:814)
==4749==    by 0x4C8AA96: virLogMessage (virlog.c:751)
==4749==    by 0x4DA0056: virNetTLSContextCheckCertKeyUsage (virnettlscontext.c:225)
==4749==    by 0x4DA06DB: virNetTLSContextCheckCert (virnettlscontext.c:439)
==4749==    by 0x4DA1620: virNetTLSContextNew (virnettlscontext.c:562)
==4749==    by 0x4DA26FC: virNetTLSContextNewServer (virnettlscontext.c:927)
==4749==    by 0x409C39: testTLSContextInit (virnettlscontexttest.c:467)
==4749==    by 0x40AB8F: virtTestRun (testutils.c:161)
</pre>
        <p>Valgrind will also find some false positives or code paths
           which cannot be resolved by making changes to the libvirt code.
           For these paths, it is possible to add a filter to avoid the
           errors. For example:
        </p>
<pre>
==4643== 7 bytes in 1 blocks are possibly lost in loss record 4 of 20
==4643==    at 0x4A0881C: malloc (vg_replace_malloc.c:270)
==4643==    by 0x34D90853F1: strdup (in /usr/lib64/libc-2.15.so)
==4643==    by 0x34EEC2C08A: ??? (in /usr/lib64/libnl.so.1.1)
==4643==    by 0x34EEC15B81: ??? (in /usr/lib64/libnl.so.1.1)
==4643==    by 0x34D8C0EE15: call_init.part.0 (in /usr/lib64/ld-2.15.so)
==4643==    by 0x34D8C0EECF: _dl_init (in /usr/lib64/ld-2.15.so)
==4643==    by 0x34D8C01569: ??? (in /usr/lib64/ld-2.15.so)

</pre>
        <p>In this instance, it is acceptible to modify the
           <code>tests/.valgrind.supp</code> file in order to add a
           suppression filter. The filter should be unique enough to
           not suppress real leaks, but it should be generic enough to
           cover multiple code paths. The format of the entry can be
           found in the documentation found at the
           <a href="http://valgrind.org/">Valgrind home page.</a>
           The following trace was added to <code>tests/.valgrind.supp</code>
           in order to suppress the warning:
        </p>
<pre>
{
    dlInitMemoryLeak1
    Memcheck:Leak
    fun:?alloc
    ...
    fun:call_init.part.0
    fun:_dl_init
    ...
    obj:*/lib*/ld-2.*so*
}
</pre>
230
      </li>
231
      <li>Update tests and/or documentation, particularly if you are adding
M
Matthew Booth 已提交
232
        a new feature or changing the output of a program.</li>
233 234 235 236 237 238
    </ol>

    <p>
      There is more on this subject, including lots of links to background
      reading on the subject, on
      <a href="http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/">
M
Matthew Booth 已提交
239
        Richard Jones' guide to working with open source projects</a>
240 241 242 243 244 245 246 247 248 249 250 251 252 253 254
    </p>


    <h2><a name="indent">Code indentation</a></h2>
    <p>
      Libvirt's C source code generally adheres to some basic code-formatting
      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&amp;R style.
    </p>
    <p>
      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:
    </p>
255
<pre>
256 257 258 259 260 261 262 263 264
  ;;; 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&amp;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
M
Matthew Booth 已提交
265 266
            '(lambda () (if (string-match "/libvirt" (buffer-file-name))
                            (libvirt-c-mode))))
267 268
</pre>

269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294
    <p>
      If you use vim, append the following to your ~/.vimrc file:
    </p>
<pre>
  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/
</pre>
    <p>
      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.
    </p>

295 296 297 298 299 300 301 302 303
    <h2><a name="formatting">Code formatting (especially for new code)</a></h2>

    <p>
      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:
    </p>

304
<pre>
305 306 307 308 309 310 311 312 313
  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 "$@"
  }
</pre>

    <p>
314
      Note that sometimes you'll have to post-process that output further, by
315
      piping it through <code>expand -i</code>, since some leading TABs can get through.
316 317 318 319
      Usually they're in macro definitions or strings, and should be converted
      anyhow.
    </p>

320 321 322 323 324 325 326 327 328 329
    <p>
      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 <code>/* */</code> comments rather
      than <code>//</code>.  Also, when declaring local variables, the
      prevailing style has been to declare them at the beginning of a
      scope, rather than immediately before use.
    </p>

330

331 332 333 334 335
    <h2><a name="bracket_spacing">Bracket spacing</a></h2>

    <p>
      The keywords <code>if</code>, <code>for</code>, <code>while</code>,
      and <code>switch</code> must have a single space following them
336
      before the opening bracket. E.g.
337 338 339 340 341 342 343 344
    </p>
    <pre>
      if(foo)   // Bad
      if (foo)  // Good
</pre>

    <p>
      Function implementations must <strong>not</strong> have any whitespace
345
      between the function name and the opening bracket. E.g.
346 347 348 349 350 351 352 353
    </p>
    <pre>
      int foo (int wizz)  // Bad
      int foo(int wizz)   // Good
</pre>

    <p>
      Function calls must <strong>not</strong> have any whitespace
354
      between the function name and the opening bracket. E.g.
355 356 357 358 359 360 361 362 363
    </p>
    <pre>
      bar = foo (wizz);  // Bad
      bar = foo(wizz);   // Good
</pre>

    <p>
      Function typedefs must <strong>not</strong> have any whitespace
      between the closing bracket of the function name and opening
364
      bracket of the arg list. E.g.
365 366 367 368 369 370 371 372
    </p>
    <pre>
      typedef int (*foo) (int wizz);  // Bad
      typedef int (*foo)(int wizz);   // Good
</pre>

    <p>
      There must not be any whitespace immediately following any
373
      opening bracket, or immediately prior to any closing bracket. E.g.
374 375 376 377 378 379
    </p>
    <pre>
      int foo( int wizz );  // Bad
      int foo(int wizz);    // Good
</pre>

380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408
    <h2><a name="semicolon">Semicolons</a></h2>

    <p>
      Semicolons should never have a space beforehand.  Inside the
      condition of a <code>for</code> loop, there should always be a
      space or line break after each semicolon, except for the special
      case of an infinite loop (although more infinite loops
      use <code>while</code>).  While not enforced, loop counters
      generally use post-increment.
    </p>
    <pre>
      for (i = 0 ;i &lt; limit ; ++i) { // Bad
      for (i = 0; i &lt; limit; i++) { // Good
      for (;;) { // ok
      while (1) { // Better
</pre>
    <p>
      Empty loop bodies are better represented with curly braces and a
      comment, although use of a semicolon is not currently rejected.
    </p>
    <pre>
      while ((rc = waitpid(pid, &amp;st, 0) == -1) &amp;&amp;
             errno == EINTR); // ok
      while ((rc = waitpid(pid, &amp;st, 0) == -1) &amp;&amp;
             errno == EINTR) { // Better
          /* nothing */
      }
</pre>

409 410 411
    <h2><a name="curly_braces">Curly braces</a></h2>

    <p>
412 413
      Omit the curly braces around an <code>if</code>, <code>while</code>,
      <code>for</code> etc. body only
414 415
      when that body occupies a single line.  In every other case we require
      the braces.  This ensures that it is trivially easy to identify a
416
      single-<i>statement</i> loop: each has only one <i>line</i> in its body.
417 418 419 420 421
    </p>
    <p>
      Omitting braces with a single-line body is fine:
    </p>

422
<pre>
423
  while (expr) // one-line body -> omitting curly braces is ok
424 425
      single_line_stmt();
</pre>
426 427

    <p>
E
Eric Blake 已提交
428
      However, the moment your loop/if/else body extends on to a second
429 430 431 432 433 434
      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 comment (without adding braces), thinking
      it is already a multi-statement loop:
    </p>

435
<pre>
436 437
  while (true) // BAD! multi-line body with no braces
      /* comment... */
438 439
      single_line_stmt();
</pre>
440 441 442
    <p>
      Do this instead:
    </p>
443
<pre>
444 445
  while (true) { // Always put braces around a multi-line body.
      /* comment... */
446 447 448
      single_line_stmt();
  }
</pre>
449 450 451 452
    <p>
      There is one exception: when the second body line is not at the same
      indentation level as the first body line:
    </p>
453
<pre>
454
  if (expr)
455 456 457
      die("a diagnostic that would make this line"
          " extend past the 80-column limit"));
</pre>
458 459 460 461 462 463 464 465 466 467 468

    <p>
      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.
    </p>

    <p>
      To reiterate, don't do this:
    </p>

469
<pre>
470 471 472
  if (expr)            // BAD: no braces around...
      while (expr_2) { // ... a multi-line body
          ...
473 474
      }
</pre>
475 476 477 478 479

    <p>
      Do this, instead:
    </p>

480
<pre>
481 482 483 484
  if (expr) {
      while (expr_2) {
          ...
      }
485 486
  }
</pre>
487 488 489 490

    <p>
      However, there is one exception in the other direction, when even a
      one-line block should have braces.  That occurs when that one-line,
491 492 493 494 495 496 497
      brace-less block is an <code>if</code> or <code>else</code>
      block, and the counterpart block <b>does</b> use braces.  In
      that case, put braces around both blocks.  Also, if
      the <code>else</code> block is much shorter than
      the <code>if</code> block, consider negating the
      <code>if</code>-condition and swapping the bodies, putting the
      short block first and making the longer, multi-line block be the
498
      <code>else</code> block.
499 500
    </p>

501
<pre>
502 503 504 505 506
  if (expr) {
      ...
      ...
  }
  else
507 508 509 510 511 512 513 514 515
      x = y;    // BAD: braceless "else" with braced "then",
                // and short block last

  if (expr)
      x = y;    // BAD: braceless "if" with braced "else"
  else {
      ...
      ...
  }
516
</pre>
517 518

    <p>
519 520
      Keeping braces consistent and putting the short block first is
      preferred, especially when the multi-line body is more than a
521 522 523 524 525
      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:
    </p>

526
<pre>
527
  if (!expr) {
528
    x = y; // putting the smaller block first is more readable
529
  } else {
530 531
      ...
      ...
532 533
  }
</pre>
534 535

    <p>
536 537
      But if negating a complex condition is too ugly, then at least
      add braces:
538 539
    </p>

540
<pre>
541
  if (complex expr not worth negating) {
542 543 544 545
      ...
      ...
  } else {
      x = y;
546 547
  }
</pre>
548

549
    <h2><a name="preprocessor">Preprocessor</a></h2>
550

551 552 553 554
    <p>Macros defined with an ALL_CAPS name should generally be
      assumed to be unsafe with regards to arguments with side-effects
      (that is, MAX(a++, b--) might increment a or decrement b too
      many or too few times).  Exceptions to this rule are explicitly
555
      documented for macros in viralloc.h and virstring.h.
556 557
    </p>

558 559
    <p>
      For variadic macros, stick with C99 syntax:
560
    </p>
561
<pre>
562
  #define vshPrint(_ctl, ...) fprintf(stdout, __VA_ARGS__)
563
</pre>
564 565 566

    <p>Use parenthesis when checking if a macro is defined, and use
    indentation to track nesting:
567
    </p>
568
<pre>
569 570 571
  #if defined(HAVE_POSIX_FALLOCATE) &amp;&amp; !defined(HAVE_FALLOCATE)
  # define fallocate(a,ignored,b,c) posix_fallocate(a,b,c)
  #endif
572
</pre>
573

574
    <h2><a name="types">C types</a></h2>
575 576 577 578 579 580 581 582

    <p>
      Use the right type.
    </p>

    <h3>Scalars</h3>

    <ul>
583 584
      <li>If you're using <code>int</code> or <code>long</code>, odds are
          good that there's a better type.</li>
585
      <li>If a variable is counting something, be sure to declare it with an
M
Matthew Booth 已提交
586
        unsigned type.</li>
587 588 589 590 591
      <li>If it's memory-size-related, use <code>size_t</code> (use
        <code>ssize_t</code> only if required).</li>
      <li>If it's file-size related, use uintmax_t, or maybe <code>off_t</code>.</li>
      <li>If it's file-offset related (i.e., signed), use <code>off_t</code>.</li>
      <li>If it's just counting small numbers use <code>unsigned int</code>;
M
Matthew Booth 已提交
592 593
        (on all but oddball embedded systems, you can assume that that
        type is at least four bytes wide).</li>
594 595 596
      <li>If a variable has boolean semantics, give it the <code>bool</code> type
        and use the corresponding <code>true</code> and <code>false</code> macros.
         It's ok to include &lt;stdbool.h&gt;, since libvirt's use of gnulib ensures
M
Matthew Booth 已提交
597
          that it exists and is usable.</li>
598
      <li>In the unusual event that you require a specific width, use a
599 600 601 602
        standard type like <code>int32_t</code>, <code>uint32_t</code>,
        <code>uint64_t</code>, etc.</li>
      <li>While using <code>bool</code> is good for readability, it comes with
          minor caveats:
M
Matthew Booth 已提交
603
        <ul>
604
          <li>Don't use <code>bool</code> in places where the type size must be constant across
M
Matthew Booth 已提交
605
            all systems, like public interfaces and on-the-wire protocols.  Note
606 607 608 609 610 611 612
            that it would be possible (albeit wasteful) to use <code>bool</code> in libvirt's
            logical wire protocol, since XDR maps that to its lower-level <code>bool_t</code>
            type, which <b>is</b> fixed-size.</li>
          <li>Don't compare a bool variable against the literal, <code>true</code>,
            since a value with a logical non-false value need not be <code>1</code>.
            I.e., don't write <code>if (seen == true) ...</code>.  Rather,
            write <code>if (seen)...</code>.</li>
M
Matthew Booth 已提交
613
        </ul>
614 615 616 617 618
      </li>
    </ul>

    <p>
      Of course, take all of the above with a grain of salt.  If you're about
619 620 621
      to use some system interface that requires a type like <code>size_t</code>,
      <code>pid_t</code> or <code>off_t</code>, use matching types for any
      corresponding variables.
622 623 624
    </p>

    <p>
625
      Also, if you try to use e.g., <code>unsigned int</code> as a type, and that
626
      conflicts with the signedness of a related variable, sometimes
627
      it's best just to use the <b>wrong</b> type, if <i>pulling the thread</i>
628 629 630 631 632 633 634 635 636 637 638 639
      and fixing all related variables would be too invasive.
    </p>

    <p>
      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.
    </p>

    <h3>Pointers</h3>

    <p>
640
      Ensure that all of your pointers are <i>const-correct</i>.
641
      Unless a pointer is used to modify the pointed-to storage,
642
      give it the <code>const</code> attribute.  That way, the reader knows
643 644 645 646 647 648 649 650 651 652 653 654
      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.
    </p>

    <h2><a name="memalloc">Low level memory management</a></h2>

    <p>
      Use of the malloc/free/realloc/calloc APIs is deprecated in the libvirt
      codebase, because they encourage a number of serious coding bugs and do
      not enable compile time verification of checks for NULL. Instead of these
655
      routines, use the macros from viralloc.h.
656 657 658
    </p>

    <ul>
659 660
      <li><p>To allocate a single object:</p>

661
<pre>
662
  virDomainPtr domain;
663

664 665 666 667 668 669
  if (VIR_ALLOC(domain) &lt; 0) {
      virReportOOMError();
      return NULL;
  }
</pre>
      </li>
670

671
      <li><p>To allocate an array of objects:</p>
672
<pre>
673
  virDomainPtr domains;
674
  size_t ndomains = 10;
675

676 677 678 679 680 681
  if (VIR_ALLOC_N(domains, ndomains) &lt; 0) {
      virReportOOMError();
      return NULL;
  }
</pre>
      </li>
682

683
      <li><p>To allocate an array of object pointers:</p>
684
<pre>
685
  virDomainPtr *domains;
686
  size_t ndomains = 10;
687

688 689 690 691 692 693
  if (VIR_ALLOC_N(domains, ndomains) &lt; 0) {
      virReportOOMError();
      return NULL;
  }
</pre>
      </li>
694

695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713
      <li><p>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):</p>
<pre>
  virDomainPtr domains;
  size_t ndomains = 0;

  if (VIR_EXPAND_N(domains, ndomains, 1) &lt; 0) {
      virReportOOMError();
      return NULL;
  }
  domains[ndomains - 1] = domain;
</pre></li>

      <li><p>To ensure an array has room to hold at least one more
      element (this approach scales better, but requires tracking
      allocation separately from usage)</p>

714
<pre>
715 716 717 718 719
  virDomainPtr domains;
  size_t ndomains = 0;
  size_t ndomains_max = 0;

  if (VIR_RESIZE_N(domains, ndomains_max, ndomains, 1) &lt; 0) {
720 721 722
      virReportOOMError();
      return NULL;
  }
723
  domains[ndomains++] = domain;
724 725
</pre>
      </li>
726

727 728
      <li><p>To trim an array of domains from its allocated size down
      to the actual used size:</p>
729 730

<pre>
731 732 733 734
  virDomainPtr domains;
  size_t ndomains = x;
  size_t ndomains_max = y;

735
  VIR_SHRINK_N(domains, ndomains_max, ndomains_max - ndomains);
736 737
</pre></li>

738
      <li><p>To free an array of domains:</p>
739
<pre>
740 741 742 743 744 745 746 747 748
  virDomainPtr domains;
  size_t ndomains = x;
  size_t ndomains_max = y;
  size_t i;

  for (i = 0; i &lt; ndomains; i++)
      VIR_FREE(domains[i]);
  VIR_FREE(domains);
  ndomains_max = ndomains = 0;
749
</pre>
750
      </li>
751 752
    </ul>

753
    <h2><a name="file_handling">File handling</a></h2>
754

755
    <p>
756 757
      Usage of the <code>fdopen()</code>, <code>close()</code>, <code>fclose()</code>
      APIs is deprecated in libvirt code base to help avoiding double-closing of files
J
Ján Tomko 已提交
758 759
      or file descriptors, which is particularly dangerous in a multi-threaded
      application. Instead of these APIs, use the macros from virfile.h
760 761
    </p>

762
   <ul>
763
      <li><p>Open a file from a file descriptor:</p>
764 765 766 767 768 769 770 771 772 773

<pre>
  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 */
</pre></li>

774
      <li><p>Close a file descriptor:</p>
775
<pre>
776
  if (VIR_CLOSE(fd) &lt; 0) {
777
      virReportSystemError(errno, "%s", _("failed to close file"));
778
  }
779 780
</pre></li>

781
      <li><p>Close a file:</p>
782 783 784 785 786 787

<pre>
  if (VIR_FCLOSE(file) &lt; 0) {
      virReportSystemError(errno, "%s", _("failed to close file"));
  }
</pre></li>
788

789 790
      <li><p>Close a file or file descriptor in an error path, without losing
             the previous <code>errno</code> value:</p>
791 792

<pre>
793
  VIR_FORCE_CLOSE(fd);
794
  VIR_FORCE_FCLOSE(file);
795 796
</pre>
      </li>
797
    </ul>
798

D
David Allan 已提交
799
    <h2><a name="string_comparision">String comparisons</a></h2>
800 801 802 803 804 805 806 807

    <p>
      Do not use the strcmp, strncmp, etc functions directly. Instead use
      one of the following semantically named macros
    </p>

    <ul>
      <li><p>For strict equality:</p>
808 809 810
<pre>
  STREQ(a,b)
  STRNEQ(a,b)
811 812 813
</pre>
      </li>

814
      <li><p>For case insensitive equality:</p>
815 816 817
<pre>
  STRCASEEQ(a,b)
  STRCASENEQ(a,b)
818 819 820 821
</pre>
      </li>

      <li><p>For strict equality of a substring:</p>
822 823 824
<pre>
  STREQLEN(a,b,n)
  STRNEQLEN(a,b,n)
825 826 827
</pre>
      </li>

828
      <li><p>For case insensitive equality of a substring:</p>
829 830 831
<pre>
  STRCASEEQLEN(a,b,n)
  STRCASENEQLEN(a,b,n)
832 833 834 835
</pre>
      </li>

      <li><p>For strict equality of a prefix:</p>
836 837
<pre>
  STRPREFIX(a,b)
838 839 840 841 842 843
</pre>
      </li>
      <li><p>To avoid having to check if a or b are NULL:</p>
<pre>
  STREQ_NULLABLE(a, b)
  STRNEQ_NULLABLE(a, b)
844 845 846 847 848
</pre>
      </li>
    </ul>


D
David Allan 已提交
849 850 851 852 853 854 855 856
    <h2><a name="string_copying">String copying</a></h2>

    <p>
      Do not use the strncpy function.  According to the man page, it
      does <b>not</b> guarantee a NULL-terminated buffer, which makes
      it extremely dangerous to use.  Instead, use one of the
      functionally equivalent functions:
    </p>
857 858 859 860

<pre>
  virStrncpy(char *dest, const char *src, size_t n, size_t destbytes)
</pre>
D
David Allan 已提交
861 862 863 864 865 866 867 868 869 870 871
    <p>
      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.
    </p>

872 873 874
<pre>
  virStrcpy(char *dest, const char *src, size_t destbytes)
</pre>
D
David Allan 已提交
875 876 877 878 879 880 881
    <p>
      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)
      </p>

882 883 884
<pre>
  virStrcpyStatic(char *dest, const char *src)
</pre>
D
David Allan 已提交
885 886
    <p>
      Use this variant if you know you want to copy the entire src
887
      string into dest <b>and</b> you know that your destination string is
D
David Allan 已提交
888 889 890 891 892 893
      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)).
    </p>

894 895 896 897 898 899
<pre>
  VIR_STRDUP(char *dst, const char *src);
  VIR_STRNDUP(char *dst, const char *src, size_t n);
</pre>
    <p>
      You should avoid using strdup or strndup directly as they do not report
900 901 902 903
      out-of-memory error, and do not allow a NULL source. Use
      VIR_STRDUP or VIR_STRNDUP macros instead, which return 0 for
      NULL source, 1 for successful copy, and -1 for allocation
      failure with the error already reported. In very
904 905 906 907 908
      specific cases, when you don't want to report the out-of-memory error, you
      can use VIR_STRDUP_QUIET or VIR_STRNDUP_QUIET, but such usage is very rare
      and usually considered a flaw.
    </p>

909 910 911 912 913 914 915 916
    <h2><a name="strbuf">Variable length string buffer</a></h2>

    <p>
      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
    </p>

917
    <p>Typical usage is as follows:</p>
918

919
<pre>
920
  char *
921 922
  somefunction(...)
  {
923 924 925 926 927
     virBuffer buf = VIR_BUFFER_INITIALIZER;

     ...

     virBufferAddLit(&amp;buf, "&lt;domain&gt;\n");
928
     virBufferAsprintf(&amp;buf, "  &lt;memory&gt;%d&lt;/memory&gt;\n", memory);
929 930 931
     ...
     virBufferAddLit(&amp;buf, "&lt;/domain&gt;\n");

932
     ...
933 934

     if (virBufferError(&amp;buf)) {
935
         virBufferFreeAndReset(&amp;buf);
936
         virReportOOMError();
937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953
         return NULL;
     }

     return virBufferContentAndReset(&amp;buf);
  }
</pre>


    <h2><a name="includes">Include files</a></h2>

    <p>
      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:
    </p>

954
<pre>
955 956 957 958 959 960 961 962 963 964 965 966 967 968
  /*
   * Copyright notice
   * ....
   * ....
   * ....
   *
   */

  #include &lt;config.h&gt;             Must come first in every file.

  #include &lt;stdio.h&gt;              Any system includes you need.
  #include &lt;string.h&gt;
  #include &lt;limits.h&gt;

969
  #if WITH_NUMACTL                Some system includes aren't supported
970
  # include &lt;numa.h&gt;              everywhere so need these #if guards.
971 972 973 974 975 976 977
  #endif

  #include "internal.h"           Include this first, after system includes.

  #include "util.h"               Any libvirt internal header files.
  #include "buf.h"

978 979
  static int
  myInternalFunc()                The actual code.
980
  {
981
      ...
982 983 984
</pre>

    <p>
O
Osier Yang 已提交
985 986 987 988 989 990
      Of particular note: <b>Do not</b> include libvirt/libvirt.h,
      libvirt/virterror.h, libvirt/libvirt-qemu.h, or libvirt/libvirt-lxc.h.
      They are included by "internal.h" already and there are some special reasons
      why you cannot include these files explicitly. One of the special cases,
      "libvirt/libvirt.h" is included prior to "internal.h" in "remote_protocol.x",
      to avoid exposing *_LAST enum elements.
991 992 993 994 995 996 997 998 999 1000 1001 1002
    </p>


    <h2><a name="printf">Printf-style functions</a></h2>

    <p>
      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:
    </p>

1003 1004 1005
<pre>
  int virAsprintf(char **strp, const char *fmt, ...)
      ATTRIBUTE_FORMAT(printf, 2, 3);
1006 1007 1008 1009 1010 1011 1012 1013
</pre>

    <p>
      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.
    </p>

E
Eric Blake 已提交
1014 1015 1016 1017 1018 1019 1020 1021 1022
    <p>
      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.
    </p>

D
David Allan 已提交
1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074
    <h2><a name="goto">Use of goto</a></h2>

    <p>
      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.
    </p>

    <p>
      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.
    </p>

    <p>
      There are a couple of signs that a particular use of goto is not
      ok:
    </p>

    <ul>
      <li>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.</li>
      <li>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.</li>
      <li>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.</li>
    </ul>

    <p>
      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
1075
      <a href="http://kerneltrap.org/node/553/2131">KernelTrap</a>
D
David Allan 已提交
1076 1077 1078 1079 1080 1081 1082
    </p>

    <p>
      When using goto, please use one of these standard labels if it
      makes sense:
    </p>

1083
<pre>
D
David Allan 已提交
1084 1085 1086
      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
1087
      retry: If needing to jump upwards (e.g., retry on EINTR)
1088
</pre>
D
David Allan 已提交
1089

1090 1091


1092
    <h2><a name="committers">Libvirt committer guidelines</a></h2>
1093 1094

    <p>
E
Eric Blake 已提交
1095
      The AUTHORS files indicates the list of people with commit access right
1096 1097 1098 1099
      who can actually merge the patches.
    </p>

    <p>
1100 1101 1102
      The general rule for committing a patch is to make sure
      it has been reviewed
      properly in the mailing-list first, usually if a couple of people gave an
1103
      ACK or +1 to a patch and nobody raised an objection on the list it should
1104 1105
      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
E
Eric Blake 已提交
1106 1107 1108 1109 1110
      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
1111
    </p>
E
Eric Blake 已提交
1112
<pre>
1113
  --enable-compile-warnings=error
E
Eric Blake 已提交
1114
</pre>
1115
    <p>
1116 1117 1118 1119
      which adds -Werror to compile flags, so no warnings get missed
    </p>

    <p>
E
Eric Blake 已提交
1120
      An exception to 'review and approval on the list first' is fixing failures
1121 1122 1123
      to build:
    </p>
    <ul>
E
Eric Blake 已提交
1124 1125
      <li>if a recently committed patch breaks compilation on a platform
        or for a given driver, then it's fine to commit a minimal fix
M
Matthew Booth 已提交
1126
        directly without getting the review feedback first</li>
1127
      <li>if make check or make syntax-check breaks, if there is
M
Matthew Booth 已提交
1128 1129
        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
E
Eric Blake 已提交
1130
        trivial), and 'make check syntax-check' should pass too, before committing
M
Matthew Booth 已提交
1131
        anything</li>
1132
      <li>
M
Matthew Booth 已提交
1133 1134
        fixes for documentation and code comments can be managed
        in the same way, but still make sure they get reviewed if non-trivial.
1135 1136 1137 1138
      </li>
    </ul>
  </body>
</html>