1. 26 4月, 2011 1 次提交
    • E
      build: make VIR_FREE do some type checking · 90d761ee
      Eric Blake 提交于
      We can exploit the fact that gcc warns about int-to-pointer conversion
      in ternary cond?(void*):(int) in order to prevent future mistakes of
      calling VIR_FREE on a scalar lvalue.  For example, between commits
      158ba873 and 802e2df9, we would have had this warning:
      
      cc1: warnings being treated as errors
      remote.c: In function 'remoteDispatchListNetworks':
      remote.c:3684:70: error: pointer/integer type mismatch in conditional expression
      
      There are still a number of places that malloc into a const char*;
      while it would probably be worth scrubbing them to use char*
      instead, that is a separate patch, so we have to cast away const
      in VIR_FREE for now.
      
      * src/util/memory.h (VIR_FREE): Make gcc warn about integers.
      Iteratively developed from a patch by Christophe Fergeau.
      90d761ee
  2. 25 4月, 2011 1 次提交
    • E
      threads: add one-time initialization support · 99de5990
      Eric Blake 提交于
      mingw lacks the counterpart to PTHREAD_MUTEX_INITIALIZER, so the
      best we can do is portably expose once-only runtime initialization.
      
      * src/util/threads.h (virOnceControlPtr): New opaque type.
      (virOnceFunc): New callback type.
      (virOnce): New prototype.
      * src/util/threads-pthread.h (virOnceControl): Declare.
      (VIR_ONCE_CONTROL_INITIALIZER): Define.
      * src/util/threads-win32.h (virOnceControl)
      (VIR_ONCE_CONTROL_INITIALIZER): Likewise.
      * src/util/threads-pthread.c (virOnce): Implement in pthreads.
      * src/util/threads-win32.c (virOnce): Implement in WIN32.
      * src/libvirt_private.syms: Export it.
      99de5990
  3. 24 4月, 2011 2 次提交
  4. 23 4月, 2011 2 次提交
  5. 22 4月, 2011 5 次提交
    • K
      libvirt/qemu - clean up UpdateDevice for consolidation. · 9b8543b6
      KAMEZAWA Hiroyuki 提交于
      This patch strips reusable part of qemuDomainUpdateDeviceFlags()
      and consolidate it to qemuDomainModifyDeviceFlags().
      No functional changes.
      
      * src/qemu/qemu_driver.c
      (qemuDomainChangeDiskMediaLive) : pulled out code for updating disks.
      (qemuDomainUpdateDeviceLive) : core of UpdateDevice, extracted from
      UpdateDeviceFlags()
      (qemuDomainModifyDeviceFlags): add support for updating device in live domain.
      (qemuDomainUpdateDeviceFlags): reworked as a wrapper function of
      qemuDomainModifyDeviceFlags()
      Signed-off-by: NKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      9b8543b6
    • K
      libvirt/qemu - clean up At(De)tachDeviceFlags() for consolidation. · 19ad136f
      KAMEZAWA Hiroyuki 提交于
      clean up At(De)tachDeviceFlags() for consolidation.
      
      qemuDomainAttachDeviceFlags()/qemuDomainDetachFlags()/
      qemuDomainUpdateDeviceFlags() has similar logics and copied codes.
      
      This patch series tries to unify them to use shared code when it can.
      At first, clean up At(De)tachDeviceFlags() and devide it into functions.
      
      By this, this patch pulls out shared components between functions.
      Based on patch series by Eric Blake, I added some modification as
      switch-case with QEMU_DEVICE_ATTACH, QEMU_DEVICE_DETACH, QEMU_DEVICE_UPDATE
      
      * src/qemu/qemu_driver.c
      (qemuDomainAt(De)tachDeviceFlags) : pulled out to qemuDomainModifyDeviceFlags()
      (qemuDomainModifyDeviceFlags) : implements generic code for modifying domain.
      (qemuDomainAt(De)tachDeviceFlagsLive) : code for at(de)taching devices to
      domain in line. no changes in logic from old code.
      (qemuDomainAt(De)tachDeviceDiskLive) : for at(de)taching Disks.
      (qemuDomainAt(De)tachDeviceControllerLive) : for at(de)taching Controllers
      Signed-off-by: NKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      19ad136f
    • K
      libvirt/qemu - Centralize device modification in the more flexible APIs · 2160116f
      KAMEZAWA Hiroyuki 提交于
      Centralize device modification in the more flexible APIs, to allow future
      honoring of additional flags.  Explicitly reject the
      VIR_DOMAIN_DEVICE_MODIFY_FORCE flag on attach/detach.
      
      Based on Eric Blake<eblake@redhat.com>'s work.
      
      * src/qemu/qemu_driver.c
      (qemudDomainAttachDevice)(qemudDomainAttachDeviceFlags): Swap bodies,rename...
      (qemudDomainDetachDevice, qemudDomainDetachDeviceFlags): Likewise.
      Signed-off-by: NKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      2160116f
    • M
      Add support for s390(x) cpu options parsing · eb954ede
      Michal Privoznik 提交于
      Up to now we missed parser for cpuinfo on x390(x) machines. Those machines
      have only 1 thread, core, socket. What is missing is information about
      CPU frequency.
      eb954ede
    • D
      Fix QEMU tunnelled migration FD handling · 29fca785
      Daniel P. Berrange 提交于
      The two ends of the pipe used for feeding QEMU tunnelled
      migration data were interchanged, so QEMU got given the
      "write" end instead of the "read" end.
      
      The qemuMigrationPrepareTunnel method was also immediately
      closing the "write" end of the pipe, so the stream failed
      to actually write anything.
      
      * src/qemu/qemu_migration.c: Swap tunnelled migration
        pipe FDs & don't close pipe given to stream
      29fca785
  6. 21 4月, 2011 4 次提交
  7. 20 4月, 2011 2 次提交
  8. 19 4月, 2011 5 次提交
    • E
      virsh: nuke use of TRUE and FALSE · b56fa5bb
      Eric Blake 提交于
      Gnulib already guarantees <stdbool.h>, so it is easier to just
      use the standardized spellings.
      
      * tools/virsh.c (vshCmdDef): Change callback to return real bool.
      (__vshControl): Change several fields to bool.
      (vshCommandOptBool): Change return type.
      All callers updated.
      * tools/Makefile.am (virsh-net-edit.c, virsh-pool-edit.c):
      Likewise.
      b56fa5bb
    • W
      qemu: fix the check of virDomainObjUnref()'s return value · d2fd997e
      Wen Congyang 提交于
      If vm is unlocked in virDomainObjUnref(), the return value is 0, not less
      than 0.
      d2fd997e
    • M
      Add cputune support to libxl driver · 68c5b6fb
      Markus Groß 提交于
      Here is a new version of this patch:
      https://www.redhat.com/archives/libvir-list/2011-April/msg00337.html
      
      v2:
        - store the cputune info for the whole runtime of the domain
        - remove cputune info when domain is destroyed
      
      The nodeGetInfo code had to be moved into a helper
      function to reuse it without a virConnectPtr.
      68c5b6fb
    • M
      Update and sort msg_gen_function list and mark unmarked messages · 78ef49ea
      Matthias Bolte 提交于
      Inspired by Eric Blake
      78ef49ea
    • E
      phyp: another simplification · a35af32c
      Eric Blake 提交于
      Rather than copying and pasting lots of code, factor it into a
      single helper function.
      
      This commit adds a warning if tighter integer parsing would fail
      due to any stray bytes after the number, but should not change
      any behavior other than the bug fix for phypNumDomainsGeneric
      looking only at numeric lines.
      
      * src/phyp/phyp_driver.c (phypExecInt): New function.
      (phypGetVIOSPartitionID, phypNumDomainsGeneric, phypGetLparID)
      (phypGetLparMem, phypGetLparCPUGeneric, phypGetRemoteSlot)
      (phypGetVIOSNextSlotNumber, phypAttachDevice)
      (phypGetStoragePoolSize, phypStoragePoolNumOfVolumes)
      (phypNumOfStoragePools, phypInterfaceDestroy)
      (phypInterfaceDefineXML, phypInterfaceLookupByName)
      (phypInterfaceIsActive, phypNumOfInterfaces): Use it.
      (phypNumDomainsGeneric): Correctly find numeric line.
      a35af32c
  9. 18 4月, 2011 10 次提交
    • E
      maint: ignore built file · d80740b3
      Eric Blake 提交于
      * .gitignore: Add exemption for hashtest.
      d80740b3
    • D
      build: fix qemu build failure in previous patch · ce3ae1b0
      Daniel P. Berrange 提交于
      This last minute addition caused a build failure
      
      cc1: warnings being treated as errors
      qemu/qemu_process.c: In function 'qemuProcessHandleWatchdog':
      qemu/qemu_process.c:436:34: error: ignoring return value of 'virDomainObjUnref', declared with attribute warn_unused_result [-Wunused-result]
      make[3]: *** [libvirt_driver_qemu_la-qemu_process.lo] Error 1
      ce3ae1b0
    • D
      Change some variable names to follow standard in daemon dispatcher · bf4883ca
      Daniel P. Berrange 提交于
      Replace some occurrances of
      
        virDomainPtr domain;
        virNetworkPtr network;
      
      With
      
        virDomainPtr dom;
        virNetworkPtr net;
      
      * daemon/remote.c: Fix variable naming to follow standard
      bf4883ca
    • D
      Write error check conditionals in more compact form for dispatcher · 05a6283c
      Daniel P. Berrange 提交于
      Replace cases of
      
           type = virConnectGetType(conn);
           if (type == NULL)
               goto cleanup;
      
      With
      
           if (!(type = virConnectGetType(conn)))
               goto cleanup;
      
      * daemon/remote.c: Write error checks in compat form
      05a6283c
    • D
      Remove curly braces on all single-line conditional jumps in dispatcher · 55c71a26
      Daniel P. Berrange 提交于
      Replace all occurrances of
      
         if (....) {
            goto cleanup;
         }
      
      With
      
         if (.....)
            goto cleanup;
      
      to save one line of code
      
      * daemon/remote.c: Remove curly braces on single line conditionals
      55c71a26
    • D
      Fix checking of return codes in dispatcher · c19295e5
      Daniel P. Berrange 提交于
      The libvirt APIs reserve any negative value for indicating an
      error. Thus checks
      
          if (virXXXX() == -1)
      
      Should instead be
      
          if (virXXXX() < 0)
      
      * daemon/remote.c: s/ == -1/ < 0/
      c19295e5
    • D
      Merge all returns paths from dispatcher into single path · 158ba873
      Daniel P. Berrange 提交于
      The dispatcher functions have numerous places where they
      return to the caller. This leads to duplicated cleanup
      code, often resulting in memory leaks. It makes it harder
      to ensure that errors are dispatched before freeing objects,
      which may overwrite the original error.
      
      The standard pattern is now
      
          remoteDispatchXXX(...) {
              int rv = -1;
      
              ....
              if (XXX < 0)
                goto cleanup;
              ...
              if (XXXX < 0)
                goto cleanup;
              ...
      
              rv = 0;
          cleanup:
              if (rv < 0)
                 remoteDispatchError(rerr);
              ...free all other stuff..
              return rv;
          }
      
      * daemon/remote.c: Centralize all cleanup paths
      * daemon/stream.c: s/remoteDispatchConnError/remoteDispatchError/
      * daemon/dispatch.c, daemon/dispatch.h: Replace
        remoteDispatchConnError with remoteDispatchError
        removing unused virConnectPtr
      158ba873
    • A
      Experimental libvirtd upstart job · 16d6b0d8
      Alan Pevec 提交于
      To install it, disable libvirtd sysv initscript:
          chkconfig libvirtd off
          service libvirtd stop
      
      and enable libvirtd upstart job:
          cp  /usr/share/doc/libvirt-*/libvirtd.upstart \
              /etc/init/libvirtd.conf
          initctl reload-configuration
          initctl start libvirtd
      
      Test:
          initctl status libvirtd
      libvirtd start/running, process 3929
          killall -9 libvirtd
          initctl status libvirtd
      libvirtd start/running, process 4047
      
      I looked into the possibility to use the upstart script from Ubuntu or
      at least getting inspiration from it but that's not possible. "expect
      daemon" is a nice thing but it only works if the process is defined with
      exec stanza instead of script ... no script. Unfortunately, with exec
      stanza environment variables can only be set within upstart script
      (i.e., configuration in /etc/sysconfig/libvirtd can't work). Hence, we
      need to use script stanza, source sysconfig, and execute libvirtd
      without --daemon. For similar reasons we can't use limit stanza and need
      to handle DAEMON_COREFILE_LIMIT in job's script.
      16d6b0d8
    • W
      enhance processWatchdogEvent() · b060d2e5
      Wen Congyang 提交于
      This patch does the following two things:
      1. hold an extra reference while handling watchdog event
         If the domain is not persistent, and qemu quits unexpectedly before
         calling processWatchdogEvent(), vm will be freed and the function
         processWatchdogEvent() will be dangerous.
      
      2. unlock qemu driver and vm before returning from processWatchdogEvent()
         When the function processWatchdogEvent() failed, we only free wdEvent,
         but forget to unlock qemu driver and vm, free dumpfile.
      b060d2e5
    • W
      qemu: avoid qemu_driver being unlocked twice when virThreadPoolNew() failed · 847efb32
      Wen Congyang 提交于
      We do not lock qemu_driver when calling virThreadPoolNew(). If it failed,
      we will unlock qemu_driver. It is dangerous.
      
      We may use this pool during auto starting domains. So we must create it before
      calling qemuAutostartDomains(). Otherwise, libvirtd will crash.
      847efb32
  10. 17 4月, 2011 3 次提交
  11. 16 4月, 2011 5 次提交
    • J
      tests: Unit tests for internal hash APIs · b0d28307
      Jiri Denemark 提交于
      This is a basic set of tests for testing removals of hash entries during
      iteration.
      b0d28307
    • W
      build: include esx_vi.generated.* into dist file · ffbdf3e1
      Wen Congyang 提交于
      commit d4601696 introduces two more generated files: esx_vi.generated.h
      and esx_vi.generated.h. But we do not include them into dist file.
      It will break building if using dist file to build.
      ffbdf3e1
    • E
      tests: test recent virsh option parsing changes · c2d92f6a
      Eric Blake 提交于
      * tests/virsh-optparse: New file.
      * tests/Makefile.am (test_scripts): Use it.
      c2d92f6a
    • E
      virsh: fix regression in parsing optional integer · b9973f52
      Eric Blake 提交于
      Regression introduced in 0.8.5, commit c1564268.  The command
      'virsh freecell 0' quit working when it changed from an optional
      string to an optional integer.
      
      This patch introduces a slight change that specifying an option
      twice is now detected as an error.  It also changes things so
      that a command that has more than 1 required option will not
      complain about missing options if one but not all of the options
      were given in long format, as in 'virsh vol-create --pool p file',
      as well as making positional parsing work for all optional
      options (each positional argument is associated with the earliest
      option that has not yet been seen by name).
      
      Optional boolean options can appear before required argument
      options, because they don't affect positional argument parsing,
      and obviously a required boolean option makes no sense.
      
      Technically, this patch renders VSH_OT_STRING and VSH_OT_DATA
      redundant; but cleaning that up can be a separate patch.
      
      No command should ever need more than 32 options, right? :)
      
      * tools/virsh.c (vshCmddefGetData, vshCmddefGetOption)
      (vshCommandCheckOpts): Alter parameters to use bitmaps.
      (vshCmddefOptParse): New function.
      (vshCommandParse): Update for better handling of positional
      arguments.
      (vshCmddefHelp): Allow unit tests to validate options.
      b9973f52
    • E
      virsh: list required options first · 6b75a1a5
      Eric Blake 提交于
      The current state of virsh parsing is that:
      
      $ virsh vol-info /path/to/image
      $ virsh vol-info --pool default /path/to/image
      $ virsh vol-info --pool default --vol /path/to/image
      
      all lookup the volume by path (technically, the last two also attempt
      a name lookup within a pool, whereas the first skips that step, but
      the end result is the same); meanwhile:
      
      $ virsh vol-info default /path/to/image
      
      complains about unexpected data.  Why?  Because the --pool option is
      optional, so default was parsed as the --vol argument, and
      /path/to/image.img doesn't match up with any remaining options that
      require an argument.  For proof, note that:
      
      $ virsh vol-info default --vol /path/to/image
      
      complains about looking up 'default' - the parser mis-associated both
      arguments with --vol.  Given the above, the only way to specify pool
      is with an explicit "--pool" argument (you can't specify it
      positionally).  However, named arguments can appear in any order, so:
      
      $ virsh vol-info /path/to/image --pool default
      $ virsh vol-info --vol /path/to/image --pool default
      
      have also always worked.  Therefore, this patch has no functional
      change on vol-info option parsing, but only on 'virsh help vol-info'
      synopsis layout.  However, it also allows the next patch to 1) enforce
      that required options are always first (without this patch, the next
      patch would fail the testsuite), and 2) allow the user to omit the
      "--pool" argument.  That is, the next patch makes it possible to do:
      
      $ virsh vol-info /path/to/image default
      
      which to date was not possible.
      
      * tools/virsh.c (opts_vol_create_from, opts_vol_clone)
      (opts_vol_upload, opts_vol_download, opts_vol_delete)
      (opts_vol_wipe, opts_vol_info, opts_vol_dumpxml, opts_vol_key)
      (opts_vol_path): List optional pool parameter after required
      arguments.
      6b75a1a5