hacking.html.in 42.9 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
  <body>
    <h1>Contributor guidelines</h1>

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

    <h2><a name="patches">General tips for contributing patches</a></h2>
    <ol>
11 12 13 14
      <li>
        <p>Discuss any large changes on the mailing list first.  Post patches
        early and listen to feedback.</p>
      </li>
15

16 17
      <li>
        <p>Official upstream repository is kept in git
18 19
        (<code>git://libvirt.org/libvirt.git</code>) and is browsable
        along with other libvirt-related repositories
20 21
        (e.g. libvirt-python) <a href="http://libvirt.org/git/">online</a>.</p>
      </li>
22

23 24
      <li>
        <p>Patches to translations are maintained via
25 26 27 28
        the <a href="https://fedora.zanata.org/">zanata project</a>.
        If you want to fix a translation in a .po file, join the
        appropriate language team. The libvirt release process
        automatically pulls the latest version of each translation
29 30
        file from zanata.</p>
      </li>
31

32
      <li><p>Post patches using "git send-email", with git rename
E
Eric Blake 已提交
33 34 35
        detection enabled.  You need a one-time setup of:</p>
<pre>
  git config diff.renames true
36
</pre>
E
Eric Blake 已提交
37 38 39
        <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>
40 41 42 43 44 45
<pre>
  git checkout master
  git pull
  git checkout -t origin -b workbranch
  Hack, committing any changes along the way
</pre>
E
Eric Blake 已提交
46 47 48
        <p>More hints on compiling can be
        found <a href="compiling.html">here</a>.  When you want to
        post your patches:</p>
49 50 51
<pre>
  git pull --rebase
  (fix any conflicts)
52 53
  git send-email --cover-letter --no-chain-reply-to --annotate \
                 --to=libvir-list@redhat.com master
54
</pre>
55
        <p>(Note that the "git send-email" subcommand may not be in
C
Chen Hanxiao 已提交
56
        the main git package and using it may require installation of a
57 58 59 60 61
        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
62 63 64 65 66 67 68 69 70
        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
71
        review comments), they are advised to note differences to previous
72 73 74 75 76 77 78 79
        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 已提交
80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
      <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>

95
      <li><p>Split large changes into a series of smaller patches,
96 97 98 99 100 101 102 103 104
        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>
105
      </li>
106

107 108 109 110 111
      <li>
        <p>Make sure your patches apply against libvirt GIT.  Developers
        only follow GIT and don't care much about released versions.</p>
      </li>

112
      <li><p>Run the automated tests on your code before submitting any changes.
113 114 115
          In particular, configure with compile warnings set to
          -Werror.  This is done automatically for a git checkout; from a
          tarball, use:</p>
116
<pre>
117
  ./configure --enable-werror
118
</pre>
M
Matthew Booth 已提交
119 120 121
        <p>
          and run the tests:
        </p>
122
<pre>
123 124
  make check
  make syntax-check
125 126
  make -C tests valgrind
</pre>
127 128 129
        <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 已提交
130
        </p>
131

132 133 134 135
        <p>
          Some tests are skipped by default in a development environment,
          based on the time they take in comparison to the likelihood
          that those tests will turn up problems during incremental builds.
136
          These tests default to being run when building from a
137 138 139 140 141 142 143
          tarball or with the configure option --enable-expensive-tests;
          you can also force a one-time toggle of these tests by
          setting VIR_TEST_EXPENSIVE to 0 or 1 at make time, as in:
        </p>
<pre>
  make check VIR_TEST_EXPENSIVE=1
</pre>
144 145 146 147 148 149
        <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 已提交
150

151
<pre>
D
David Allan 已提交
152
  VIR_TEST_DEBUG=1 make check    (or)
153 154
  VIR_TEST_DEBUG=2 make check
</pre>
E
Eric Blake 已提交
155 156 157 158 159 160 161 162 163 164 165

        <p>
          When debugging failures during development, it is possible
          to focus in on just the failing subtests by using TESTS and
          VIR_TEST_RANGE:
        </p>

<pre>
  make check VIR_TEST_DEBUG=1 VIR_TEST_RANGE=3-5 TESTS=qemuxml2argvtest
</pre>

166 167 168 169 170 171 172
        <p>
          Also, individual tests can be run from inside the <code>tests/</code>
          directory, like:
        </p>
<pre>
  ./qemuxml2xmltest
</pre>
173 174 175 176 177 178 179 180 181 182 183 184

        <p>
          If you are adding new test cases, or making changes that alter
          existing test output, you can use the environment variable
          VIR_TEST_REGENERATE_OUTPUT to quickly update the saved test data.
          Of course you still need to review the changes VERY CAREFULLY to
          ensure they are correct.
        </p>
<pre>
  VIR_TEST_REGENERATE_OUTPUT=1 ./qemuxml2argvtest
</pre>

E
Eric Blake 已提交
185 186 187
        <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
188 189 190
          under gdb or Valgrind.
        </p>

191 192 193 194 195 196 197 198 199 200 201 202 203
        <p>When running our test suite it may happen that the test result is
        nondeterministic because of the test suite relying on a particular file
        in the system being accessible or having some specific value. To catch
        this kind of errors, the test suite has a module for that prints any
        path touched that fulfils constraints described above
        into a file. To enable it just set
        <code>VIR_TEST_FILE_ACCESS</code> environment variable.
        Then <code>VIR_TEST_FILE_ACCESS_OUTPUT</code> environment
        variable can alter location where the file is stored.</p>
<pre>
  VIR_TEST_FILE_ACCESS=1 VIR_TEST_FILE_ACCESS_OUTPUT="/tmp/file_access.txt" ./qemuxml2argvtest
</pre>

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 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268
      </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>
269
        <p>In this instance, it is acceptable to modify the
270 271 272 273 274
           <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
E
Eric Blake 已提交
275
           <a href="http://valgrind.org/">Valgrind home page</a>.
276 277 278 279 280 281 282 283 284 285 286 287 288 289 290
           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>
291
      </li>
A
Andrea Bolognani 已提交
292 293 294 295 296

      <li>
        <p>Update tests and/or documentation, particularly if you are adding
        a new feature or changing the output of a program.</p>
      </li>
297 298 299 300 301 302 303 304 305 306

      <li>
        <p>Don't forget to update the <a href="news.html">release notes</a>
        by changing <code>docs/news.xml</code> if your changes are
        significant. All user-visible changes, such as adding new XML elements
        or fixing all but the most obscure bugs, must be (briefly) described
        in a release notes entry; changes that are only relevant to other
        libvirt developers, such as code refactoring, don't belong in the
        release notes.</p>
      </li>
307 308 309 310 311
    </ol>

    <p>
      There is more on this subject, including lots of links to background
      reading on the subject, on
312
      <a href="http://people.redhat.com/rjones/how-to-supply-code-to-open-source-projects/">
E
Eric Blake 已提交
313
        Richard Jones' guide to working with open source projects</a>.
314 315 316 317 318 319 320 321 322 323 324 325
    </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>

326
    <p>
J
Ján Tomko 已提交
327 328 329
      If you use Emacs, the project includes a file .dir-locals.el
      that sets up the preferred indentation. If you use vim,
      append the following to your ~/.vimrc file:
330 331 332 333 334 335 336 337 338 339
    </p>
<pre>
  set nocompatible
  filetype on
  set autoindent
  set smartindent
  set cindent
  set tabstop=8
  set shiftwidth=4
  set expandtab
J
Ján Tomko 已提交
340
  set cinoptions=(0,:0,l1,t0,L3
341 342 343 344 345 346 347 348 349 350 351 352 353
  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>

354 355 356 357 358 359 360 361 362
    <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>

363
<pre>
364 365 366 367 368 369 370 371 372
  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>
373
      Note that sometimes you'll have to post-process that output further, by
374
      piping it through <code>expand -i</code>, since some leading TABs can get through.
375 376 377 378
      Usually they're in macro definitions or strings, and should be converted
      anyhow.
    </p>

379 380 381 382 383 384 385 386 387 388
    <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>

389

390 391 392 393 394
    <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
395
      before the opening bracket. E.g.
396 397 398 399 400 401 402 403
    </p>
    <pre>
      if(foo)   // Bad
      if (foo)  // Good
</pre>

    <p>
      Function implementations must <strong>not</strong> have any whitespace
404
      between the function name and the opening bracket. E.g.
405 406 407 408 409 410 411 412
    </p>
    <pre>
      int foo (int wizz)  // Bad
      int foo(int wizz)   // Good
</pre>

    <p>
      Function calls must <strong>not</strong> have any whitespace
413
      between the function name and the opening bracket. E.g.
414 415 416 417 418 419 420 421 422
    </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
423
      bracket of the arg list. E.g.
424 425 426 427 428 429 430 431
    </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
432
      opening bracket, or immediately prior to any closing bracket. E.g.
433 434 435 436 437 438
    </p>
    <pre>
      int foo( int wizz );  // Bad
      int foo(int wizz);    // Good
</pre>

E
Eric Blake 已提交
439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475
    <h2><a name="comma">Commas</a></h2>

    <p>
      Commas should always be followed by a space or end of line, and
      never have leading space; this is enforced during 'make
      syntax-check'.
    </p>
    <pre>
      call(a,b ,c);// Bad
      call(a, b, c); // Good
</pre>

    <p>
      When declaring an enum or using a struct initializer that
      occupies more than one line, use a trailing comma.  That way,
      future edits to extend the list only have to add a line, rather
      than modify an existing line to add the intermediate comma.  Any
      sentinel enumerator value with a name ending in _LAST is exempt,
      since you would extend such an enum before the _LAST element.
      Another reason to favor trailing commas is that it requires less
      effort to produce via code generators.  Note that the syntax
      checker is unable to enforce a style of trailing commas, so
      there are counterexamples in existing code which do not use it;
      also, while C99 allows trailing commas, remember that JSON and
      XDR do not.
    </p>
    <pre>
      enum {
          VALUE_ONE,
          VALUE_TWO // Bad
      };
      enum {
          VALUE_THREE,
          VALUE_FOUR, // Good
      };
</pre>

476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504
    <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>

505 506 507
    <h2><a name="curly_braces">Curly braces</a></h2>

    <p>
508
      Omit the curly braces around an <code>if</code>, <code>while</code>,
509 510
      <code>for</code> etc. body only when both that body and the condition
      itself occupy a single line.  In every other case we require
511
      the braces.  This ensures that it is trivially easy to identify a
512
      single-<i>statement</i> loop: each has only one <i>line</i> in its body.
513 514
    </p>

515
<pre>
516 517 518 519 520 521 522 523 524 525 526 527
  while (expr)             // single line body; {} is forbidden
      single_line_stmt();
</pre>

<pre>
  while (expr(arg1,
              arg2))      // indentation makes it obvious it is single line,
      single_line_stmt(); // {} is optional (not enforced either way)
</pre>

<pre>
  while (expr1 &amp;&amp;
H
Hao Liu 已提交
528
         expr2) {         // multi-line, at same indentation, {} required
529
      single_line_stmt();
H
Hao Liu 已提交
530
  }
531
</pre>
532 533

    <p>
E
Eric Blake 已提交
534
      However, the moment your loop/if/else body extends on to a second
535 536 537 538 539 540
      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>

541
<pre>
542 543
  while (true) // BAD! multi-line body with no braces
      /* comment... */
544 545
      single_line_stmt();
</pre>
546 547 548
    <p>
      Do this instead:
    </p>
549
<pre>
550 551
  while (true) { // Always put braces around a multi-line body.
      /* comment... */
552 553 554
      single_line_stmt();
  }
</pre>
555 556 557 558
    <p>
      There is one exception: when the second body line is not at the same
      indentation level as the first body line:
    </p>
559
<pre>
560
  if (expr)
561 562 563
      die("a diagnostic that would make this line"
          " extend past the 80-column limit"));
</pre>
564 565 566 567 568 569 570 571 572 573 574

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

575
<pre>
576 577 578
  if (expr)            // BAD: no braces around...
      while (expr_2) { // ... a multi-line body
          ...
579 580
      }
</pre>
581 582 583 584 585

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

586
<pre>
587 588 589 590
  if (expr) {
      while (expr_2) {
          ...
      }
591 592
  }
</pre>
593 594 595 596

    <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,
597 598 599 600 601 602 603
      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
604
      <code>else</code> block.
605 606
    </p>

607
<pre>
608 609 610 611 612
  if (expr) {
      ...
      ...
  }
  else
613 614 615 616 617 618 619 620 621
      x = y;    // BAD: braceless "else" with braced "then",
                // and short block last

  if (expr)
      x = y;    // BAD: braceless "if" with braced "else"
  else {
      ...
      ...
  }
622
</pre>
623 624

    <p>
625 626
      Keeping braces consistent and putting the short block first is
      preferred, especially when the multi-line body is more than a
627 628 629 630 631
      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>

632
<pre>
633
  if (!expr) {
634
    x = y; // putting the smaller block first is more readable
635
  } else {
636 637
      ...
      ...
638 639
  }
</pre>
640 641

    <p>
642 643
      But if negating a complex condition is too ugly, then at least
      add braces:
644 645
    </p>

646
<pre>
647
  if (complex expr not worth negating) {
648 649 650 651
      ...
      ...
  } else {
      x = y;
652 653
  }
</pre>
654

655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685
    <p>Use hanging braces for compound statements: the opening brace
      of a compound statement should be on the same line as the
      condition being tested.  Only top-level function bodies, nested
      scopes, and compound structure declarations should ever have {
      on a line by itself.
    </p>

<pre>
  void
  foo(int a, int b)
  {                          // correct - function body
      int 2d[][] = {
        {                    // correct - complex initialization
          1, 2,
        },
      };
      if (a)
      {                      // BAD: compound brace on its own line
          do_stuff();
      }
      {                      // correct - nested scope
          int tmp;
          if (a &lt; b) {       // correct - hanging brace
              tmp = b;
              b = a;
              a = tmp;
          }
      }
  }
</pre>

686
    <h2><a name="preprocessor">Preprocessor</a></h2>
687

688 689 690 691
    <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
692
      documented for macros in viralloc.h and virstring.h.
693 694
    </p>

695 696
    <p>
      For variadic macros, stick with C99 syntax:
697
    </p>
698
<pre>
699
  #define vshPrint(_ctl, ...) fprintf(stdout, __VA_ARGS__)
700
</pre>
701 702 703

    <p>Use parenthesis when checking if a macro is defined, and use
    indentation to track nesting:
704
    </p>
705
<pre>
706
  #if defined(HAVE_POSIX_FALLOCATE) &amp;&amp; !defined(HAVE_FALLOCATE)
M
Michal Privoznik 已提交
707
  # define fallocate(a, ignored, b, c) posix_fallocate(a, b, c)
708
  #endif
709
</pre>
710

711
    <h2><a name="types">C types</a></h2>
712 713 714 715 716 717 718 719

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

    <h3>Scalars</h3>

    <ul>
720 721
      <li>If you're using <code>int</code> or <code>long</code>, odds are
          good that there's a better type.</li>
722
      <li>If a variable is counting something, be sure to declare it with an
M
Matthew Booth 已提交
723
        unsigned type.</li>
724 725 726 727 728
      <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 已提交
729 730
        (on all but oddball embedded systems, you can assume that that
        type is at least four bytes wide).</li>
731 732 733
      <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 已提交
734
          that it exists and is usable.</li>
735
      <li>In the unusual event that you require a specific width, use a
736 737 738 739
        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 已提交
740
        <ul>
741
          <li>Don't use <code>bool</code> in places where the type size must be constant across
M
Matthew Booth 已提交
742
            all systems, like public interfaces and on-the-wire protocols.  Note
743 744 745 746 747 748 749
            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 已提交
750
        </ul>
751 752 753 754 755
      </li>
    </ul>

    <p>
      Of course, take all of the above with a grain of salt.  If you're about
756 757 758
      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.
759 760 761
    </p>

    <p>
762
      Also, if you try to use e.g., <code>unsigned int</code> as a type, and that
763
      conflicts with the signedness of a related variable, sometimes
764
      it's best just to use the <b>wrong</b> type, if <i>pulling the thread</i>
765 766 767 768 769 770 771 772 773 774 775 776
      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>
777
      Ensure that all of your pointers are <i>const-correct</i>.
778
      Unless a pointer is used to modify the pointed-to storage,
779
      give it the <code>const</code> attribute.  That way, the reader knows
780 781 782 783 784 785 786 787 788 789 790 791
      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
792
      routines, use the macros from viralloc.h.
793 794 795
    </p>

    <ul>
796 797
      <li><p>To allocate a single object:</p>

798
<pre>
799
  virDomainPtr domain;
800

801
  if (VIR_ALLOC(domain) &lt; 0)
802 803 804
      return NULL;
</pre>
      </li>
805

806
      <li><p>To allocate an array of objects:</p>
807
<pre>
808
  virDomainPtr domains;
809
  size_t ndomains = 10;
810

811
  if (VIR_ALLOC_N(domains, ndomains) &lt; 0)
812 813 814
      return NULL;
</pre>
      </li>
815

816
      <li><p>To allocate an array of object pointers:</p>
817
<pre>
818
  virDomainPtr *domains;
819
  size_t ndomains = 10;
820

821
  if (VIR_ALLOC_N(domains, ndomains) &lt; 0)
822 823 824
      return NULL;
</pre>
      </li>
825

826 827 828 829 830 831 832 833
      <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;

834
  if (VIR_EXPAND_N(domains, ndomains, 1) &lt; 0)
835 836 837 838 839 840 841 842
      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>

843
<pre>
844 845 846 847
  virDomainPtr domains;
  size_t ndomains = 0;
  size_t ndomains_max = 0;

848
  if (VIR_RESIZE_N(domains, ndomains_max, ndomains, 1) &lt; 0)
849
      return NULL;
850
  domains[ndomains++] = domain;
851 852
</pre>
      </li>
853

854 855
      <li><p>To trim an array of domains from its allocated size down
      to the actual used size:</p>
856 857

<pre>
858 859 860 861
  virDomainPtr domains;
  size_t ndomains = x;
  size_t ndomains_max = y;

862
  VIR_SHRINK_N(domains, ndomains_max, ndomains_max - ndomains);
863 864
</pre></li>

865
      <li><p>To free an array of domains:</p>
866
<pre>
867 868 869 870 871 872 873 874 875
  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;
876
</pre>
877
      </li>
878 879
    </ul>

880
    <h2><a name="file_handling">File handling</a></h2>
881

882
    <p>
883 884
      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 已提交
885 886
      or file descriptors, which is particularly dangerous in a multi-threaded
      application. Instead of these APIs, use the macros from virfile.h
887 888
    </p>

889
   <ul>
890
      <li><p>Open a file from a file descriptor:</p>
891 892 893 894 895 896 897 898 899 900

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

901
      <li><p>Close a file descriptor:</p>
902
<pre>
903
  if (VIR_CLOSE(fd) &lt; 0) {
904
      virReportSystemError(errno, "%s", _("failed to close file"));
905
  }
906 907
</pre></li>

908
      <li><p>Close a file:</p>
909 910 911 912 913 914

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

916 917
      <li><p>Close a file or file descriptor in an error path, without losing
             the previous <code>errno</code> value:</p>
918 919

<pre>
920
  VIR_FORCE_CLOSE(fd);
921
  VIR_FORCE_FCLOSE(file);
922 923
</pre>
      </li>
924
    </ul>
925

D
David Allan 已提交
926
    <h2><a name="string_comparision">String comparisons</a></h2>
927 928 929 930 931 932 933 934

    <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>
935 936 937
<pre>
  STREQ(a,b)
  STRNEQ(a,b)
938 939 940
</pre>
      </li>

941
      <li><p>For case insensitive equality:</p>
942 943 944
<pre>
  STRCASEEQ(a,b)
  STRCASENEQ(a,b)
945 946 947 948
</pre>
      </li>

      <li><p>For strict equality of a substring:</p>
949 950 951
<pre>
  STREQLEN(a,b,n)
  STRNEQLEN(a,b,n)
952 953 954
</pre>
      </li>

955
      <li><p>For case insensitive equality of a substring:</p>
956 957 958
<pre>
  STRCASEEQLEN(a,b,n)
  STRCASENEQLEN(a,b,n)
959 960 961 962
</pre>
      </li>

      <li><p>For strict equality of a prefix:</p>
963 964
<pre>
  STRPREFIX(a,b)
965 966 967 968 969 970
</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)
971 972 973 974 975
</pre>
      </li>
    </ul>


D
David Allan 已提交
976 977 978 979 980 981 982 983
    <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>
984 985 986 987

<pre>
  virStrncpy(char *dest, const char *src, size_t n, size_t destbytes)
</pre>
D
David Allan 已提交
988 989 990 991 992 993 994 995 996 997 998
    <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>

999 1000 1001
<pre>
  virStrcpy(char *dest, const char *src, size_t destbytes)
</pre>
D
David Allan 已提交
1002 1003 1004 1005 1006 1007 1008
    <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>

1009 1010 1011
<pre>
  virStrcpyStatic(char *dest, const char *src)
</pre>
D
David Allan 已提交
1012 1013
    <p>
      Use this variant if you know you want to copy the entire src
1014
      string into dest <b>and</b> you know that your destination string is
D
David Allan 已提交
1015 1016 1017 1018 1019 1020
      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>

1021 1022 1023 1024 1025 1026
<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
1027 1028 1029 1030
      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
1031 1032 1033 1034 1035
      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>

1036 1037 1038 1039 1040
    <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
J
Ján Tomko 已提交
1041
      make use of the virBuffer API described in virbuffer.h
1042 1043
    </p>

1044
    <p>Typical usage is as follows:</p>
1045

1046
<pre>
1047
  char *
1048 1049
  somefunction(...)
  {
1050 1051 1052 1053 1054
     virBuffer buf = VIR_BUFFER_INITIALIZER;

     ...

     virBufferAddLit(&amp;buf, "&lt;domain&gt;\n");
1055
     virBufferAsprintf(&amp;buf, "  &lt;memory&gt;%d&lt;/memory&gt;\n", memory);
1056 1057 1058
     ...
     virBufferAddLit(&amp;buf, "&lt;/domain&gt;\n");

1059
     ...
1060

J
Ján Tomko 已提交
1061
     if (virBufferCheckError(&amp;buf) &lt; 0)
1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077
         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>

1078
<pre>
1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092
  /*
   * 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;

1093
  #if WITH_NUMACTL                Some system includes aren't supported
1094
  # include &lt;numa.h&gt;              everywhere so need these #if guards.
1095 1096 1097 1098 1099 1100 1101
  #endif

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

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

1102 1103
  static int
  myInternalFunc()                The actual code.
1104
  {
1105
      ...
1106 1107 1108
</pre>

    <p>
O
Osier Yang 已提交
1109 1110 1111 1112 1113 1114
      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.
1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126
    </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>

1127 1128 1129
<pre>
  int virAsprintf(char **strp, const char *fmt, ...)
      ATTRIBUTE_FORMAT(printf, 2, 3);
1130 1131 1132 1133 1134 1135 1136 1137
</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 已提交
1138 1139 1140 1141 1142 1143 1144 1145 1146
    <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 已提交
1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198
    <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
1199
      <a href="http://kerneltrap.org/node/553/2131">KernelTrap</a>
D
David Allan 已提交
1200 1201 1202 1203 1204 1205 1206
    </p>

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

1207
<pre>
D
David Allan 已提交
1208 1209 1210
      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
1211
      retry: If needing to jump upwards (e.g., retry on EINTR)
1212
</pre>
D
David Allan 已提交
1213

J
Ján Tomko 已提交
1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227
    <p>
    Top-level labels should be indented by one space (putting them on
    the beginning of the line confuses function context detection in git):
    </p>

<pre>
int foo()
{
    /* ... do stuff ... */
 cleanup:
    /* ... do other stuff ... */
}
</pre>

1228 1229


1230
    <h2><a name="committers">Libvirt committer guidelines</a></h2>
1231 1232

    <p>
E
Eric Blake 已提交
1233
      The AUTHORS files indicates the list of people with commit access right
1234 1235 1236 1237
      who can actually merge the patches.
    </p>

    <p>
1238 1239 1240
      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
1241
      ACK or +1 to a patch and nobody raised an objection on the list it should
1242 1243
      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 已提交
1244 1245 1246 1247 1248
      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
1249
    </p>
E
Eric Blake 已提交
1250
<pre>
1251
  --enable-compile-warnings=error
E
Eric Blake 已提交
1252
</pre>
1253
    <p>
1254 1255 1256 1257
      which adds -Werror to compile flags, so no warnings get missed
    </p>

    <p>
E
Eric Blake 已提交
1258
      An exception to 'review and approval on the list first' is fixing failures
1259 1260 1261
      to build:
    </p>
    <ul>
E
Eric Blake 已提交
1262 1263
      <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 已提交
1264
        directly without getting the review feedback first</li>
1265
      <li>if make check or make syntax-check breaks, if there is
M
Matthew Booth 已提交
1266 1267
        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 已提交
1268
        trivial), and 'make check syntax-check' should pass too, before committing
M
Matthew Booth 已提交
1269
        anything</li>
1270
      <li>
M
Matthew Booth 已提交
1271 1272
        fixes for documentation and code comments can be managed
        in the same way, but still make sure they get reviewed if non-trivial.
1273 1274 1275 1276
      </li>
    </ul>
  </body>
</html>