1. 16 12月, 2011 6 次提交
    • P
      migration: Add more specific error code/message on migration abort · 8fb2aeb6
      Peter Krempa 提交于
      A generic error code was returned, if the user aborted a migration job.
      This made it hard to distinguish between a user requested abort and an
      error that might have occured. This patch introduces a new error code,
      which is returned in the specific case of a user abort, while leaving
      all other failures with their existing code. This makes it easier to
      distinguish between failure while mirgrating and an user requested
      abort.
      
       * include/libvirt/virterror.h: - add new error code
       * src/util/virterror.c: - add message for the new error code
       * src/qemu/qemu_migration.h: - Emit operation aborted error instead of
                                      operation failed, on migration abort
      8fb2aeb6
    • E
      qemu: detect truncated file as invalid save image · d99fe011
      Eric Blake 提交于
      If managed save fails at the right point in time, then the save
      image can end up with 0 bytes in length (no valid header), and
      our attempts in commit 55d88def to detect and skip invalid save
      files missed this case.
      
      * src/qemu/qemu_driver.c (qemuDomainSaveImageOpen): Also unlink
      empty file as corrupt.  Reported by Dennis Householder.
      d99fe011
    • M
      qemu: Don't drop hostdev config until security label restore · 13d5a6b8
      Michal Privoznik 提交于
      Currently, on device detach, we parse given XML, find the device
      in domain object, free it and try to restore security labels.
      However, in some cases (e.g. usb hostdev) parsed XML contains
      less information than freed device. In usb case it is bus & device
      IDs. These are needed during label restoring as a symlink into
      /dev/bus is generated from them. Therefore don't drop device
      configuration until security labels are restored.
      13d5a6b8
    • P
      virsh: Add option to undefine storage with domains · 3bb6bcfc
      Peter Krempa 提交于
      Add an option for virsh undefine command, to remove associated storage
      volumes while undefining a domain. This patch allows the user to remove
      associated (libvirt managed ) storage volumes while undefining a domain.
      
      The new option --storage for the undefine command takes a string
      argument that consists of comma separated list of target or source path
      of volumes to be undefined. Volumes are removed after the domain has
      been successfully undefined,
      
      If a volume is not part of a storage pool, the user is warned to remove
      the volume in question himself.
      
      Option --wipe-storage may be specified along with this, that ensures
      the image is wiped before removing.
      
      Option --remove-all-storage enables the user to remove all storage. The
      name is chosen long as the users should be aware what they're about to
      do.
      3bb6bcfc
    • E
      build: let autobuild check more code · daa8c962
      Eric Blake 提交于
      Some gcc warnings about no % in a printf format string only
      appear under --disable-nls.  And configure.ac should automatically
      be excluding modules on mingw without us having to be explicit.
      Improving autobuild.sh to stress more combinations can only help.
      
      * autobuild.sh: Add --disable-nls on first build.  Update mingw
      build to rely more on configure.ac detection.
      daa8c962
    • J
      Fix default migration speed in qemu driver · d8916dc8
      Jim Fehlig 提交于
      In commit 6f84e110 I mistakenly set default migration speed to
      33554432 Mb!  The units of migMaxBandwidth is Mb, with conversion
      handled in qemuMonitor{JSON,Text}SetMigrationSpeed().
      
      Also, remove definition of QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX since
      it is no longer used after reverting commit ef1065cf.
      d8916dc8
  2. 15 12月, 2011 5 次提交
    • O
      python: Expose blockPeek and memoryPeek in Python binding · d758e0cb
      Osier Yang 提交于
      A simple example to show how to use it:
      
      \#! /usr/bin/python
      
      import os
      import sys
      import libvirt
      
      disk = "/var/lib/libvirt/images/test.img"
      
      conn = libvirt.open(None)
      dom = conn.lookupByName('test')
      
      mem_contents = dom.memoryPeek(0, 32, libvirt.VIR_MEMORY_VIRTUAL);
      sys.stdout.write(mem_contents)
      
      % python test.py | hexdump
      0000000 1660 0209 0000 0000 0000 0000 0000 0000
      0000010 0000 0000 0000 0000 d3a0 01d0 0000 0000
      0000020
      d758e0cb
    • J
      qemu: Fix race between async and query jobs · 6948b725
      Jiri Denemark 提交于
      If an async job run on a domain will stop the domain at the end of the
      job, a concurrently run query job can hang in qemu monitor and nothing
      can be done with that domain from this point on. An attempt to start
      such domain results in "Timed out during operation: cannot acquire state
      change lock" error.
      
      However, quite a few things have to happen at the right time... There
      must be an async job running which stops a domain at the end. This race
      was reported with dump --crash but other similar jobs, such as
      (managed)save and migration, should be able to trigger this bug as well.
      While this async job is processing its last monitor command, that is a
      query-migrate to which qemu replies with status "completed", a new
      libvirt API that results in a query job must arrive and stay waiting
      until the query-migrate command finishes. Once query-migrate is done but
      before the async job closes qemu monitor while stopping the domain, the
      other thread needs to wake up and call qemuMonitorSend to send its
      command to qemu. Before qemu gets a chance to respond to this command,
      the async job needs to close the monitor. At this point, the query job
      thread is waiting for a condition that no-one will ever signal so it
      never finishes the job.
      6948b725
    • O
      qemu: Do not free the device from activePciHostdevs if it's in use · 3f29d6c9
      Osier Yang 提交于
      * src/qemu/qemu_hostdev.c (qemuDomainReAttachHostdevDevices):
      pciDeviceListFree(pcidevs) in the end free()s the device even if
      it's in use by other domain, which can cause a race.
      
      How to reproduce:
      
      <script>
      
      virsh nodedev-dettach pci_0000_00_19_0
      virsh start test
      virsh attach-device test hostdev.xml
      virsh start test2
      
      for i in {1..5}; do
              echo "[ -- ${i}th time --]"
              virsh nodedev-reattach pci_0000_00_19_0
      done
      
      echo "clean up"
      virsh destroy test
      virsh nodedev-reattach pci_0000_00_19_0
      </script>
      
      Device pci_0000_00_19_0 dettached
      
      Domain test started
      
      Device attached successfully
      
      error: Failed to start domain test2
      error: Requested operation is not valid: PCI device 0000:00:19.0 is in use by domain test
      
      [ -- 1th time --]
      Device pci_0000_00_19_0 re-attached
      
      [ -- 2th time --]
      Device pci_0000_00_19_0 re-attached
      
      [ -- 3th time --]
      Device pci_0000_00_19_0 re-attached
      
      [ -- 4th time --]
      Device pci_0000_00_19_0 re-attached
      
      [ -- 5th time --]
      Device pci_0000_00_19_0 re-attached
      
      clean up
      Domain test destroyed
      
      Device pci_0000_00_19_0 re-attached
      
      The patch also fixes another problem, there won't be error like
      "qemuDomainReAttachHostdevDevices: Not reattaching active
      device 0000:00:19.0" in daemon log if some device is in active.
      As pciResetDevice and pciReattachDevice won't be called for
      the device anymore. This is sensible as we already reported
      error when preparing the device if it's active. Blindly trying
      to pciResetDevice & pciReattachDevice on the device and getting
      an error is just redundant.
      3f29d6c9
    • O
      qemu: Honor the original properties of PCI device when detaching · a0aec362
      Osier Yang 提交于
      This patch fixes two problems:
          1) The device will be reattached to host even if it's not
             managed, as there is a "pciDeviceSetManaged".
          2) The device won't be reattached to host with original
             driver properly. As it doesn't honor the device original
             properties which are maintained by driver->activePciHostdevs.
      a0aec362
    • W
      spec: fix inverted logic on sanlock · 6e532938
      Wen Congyang 提交于
      Commit d336dbdb tried to refactor sanlock to avoid building it
      on RHEL for architectures where it is not available, but used
      the wrong conditional.
      
      * libvirt.spec.in (with_sanlock): Use %ifarch, not %ifnarch.
      6e532938
  3. 14 12月, 2011 4 次提交
    • K
      virsh: support multifunction in attach-disk · 65aefae1
      KAMEZAWA Hiroyuki 提交于
      PCI <address...> can be specified by attach-disk but multifunction cannot
      be specified. Add --multifunction support.
      65aefae1
    • E
      docs: tweak 'virsh edit' wording · 972f7e6e
      Eric Blake 提交于
      I was wondering why 'virsh edit' didn't support the same
      '--inactive' option as 'virsh dumpxml'; reading the source
      code showed that --inactive was already implied, and that
      the only way to alter a running guest rather than affecting
      next boot is by hot-plugging individual devices, or by
      something complex like saving the guest and modifying the
      save image.
      
      * tools/virsh.pod (define, edit): Mention behavior when guest is
      already running.
      972f7e6e
    • P
      python: Fix export of virDomainSnapshotListChildrenNames · fbd8d6fc
      Peter Krempa 提交于
      Commit f2013c9d added implementation of
      virDomainSnapshotListChildrenNames override export, but registration of
      the newly exported function was not added.
      
       *python/libvirt-override.c: - register export of function
      fbd8d6fc
    • L
      Provide a helper method virDomainLiveConfigHelperMethod · ae523427
      Lei Li 提交于
      This chunk of code below repeated in several functions, factor it into
      a helper method virDomainLiveConfigHelperMethod to eliminate duplicated code
      based on Eric and Adam's suggestion. I have tested it for all the
      relevant APIs changed.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NLei Li <lilei@linux.vnet.ibm.com>
      ae523427
  4. 13 12月, 2011 5 次提交
    • P
      virsh: Print error message if argument parsing fails for cmdNodesuspend · b72c774b
      Peter Krempa 提交于
      If parsing of arguments failed, virsh did silently exit returning and
      error state, but not specifying the possible problem.
      
       * tools/virsh: cmdNodesuspend: - error handling added
      b72c774b
    • A
      tests: plug memory leak on linuxTestNodeInfo · 98b942c6
      Alex Jia 提交于
      Detected by valgrind. Leak introduced in commit 82ff25e1.
      
      * tests/nodeinfotest.c: avoid memory leak on nodeinfo test case.
      
      * how to reproduce?
        % cd tests && valgrind -v --leak-check=full ./nodeinfotest
      
      * actual valgrind result:
      
      ==22147== 65 bytes in 1 blocks are definitely lost in loss record 14 of 29
      ==22147==    at 0x4A0610F: realloc (vg_replace_malloc.c:525)
      ==22147==    by 0x330D6FED94: __vasprintf_chk (in /lib64/libc-2.12.so)
      ==22147==    by 0x426697: virVasprintf (stdio2.h:199)
      ==22147==    by 0x426757: virAsprintf (util.c:1695)
      ==22147==    by 0x41585F: linuxTestNodeInfo (nodeinfotest.c:108)
      ==22147==    by 0x416B21: virtTestRun (testutils.c:141)
      ==22147==    by 0x4157EA: mymain (nodeinfotest.c:140)
      ==22147==    by 0x416217: virtTestMain (testutils.c:696)
      ==22147==    by 0x330D61ECDC: (below main) (in /lib64/libc-2.12.so)
      ==22147==
      ==22147== LEAK SUMMARY:
      ==22147==    definitely lost: 65 bytes in 1 blocks
      ==22147==    indirectly lost: 0 bytes in 0 blocks
      ==22147==      possibly lost: 0 bytes in 0 blocks
      ==22147==    still reachable: 126,126 bytes in 1,341 blocks
      Signed-off-by: NAlex Jia <ajia@redhat.com>
      98b942c6
    • O
      storage: Fix a potential crash when creating vol object · 380f3269
      Osier Yang 提交于
      If the vol object is newly created, it increases the volumes count,
      but doesn't decrease the volumes count when do cleanup. It can
      cause libvirtd to crash when one trying to free the volume objects
      like:
          for (i = 0; i < pool->volumes.count; i++)
              virStorageVolDefFree(pool->volumes.objs[i]);
      
      It's more reliable if we add the newly created vol object in the
      end.
      380f3269
    • E
      docs: document <address> elements in one place · fe7fc161
      Eric Blake 提交于
      Improve the documentation of what forms a valid <address> element,
      since these elements appear in numerous devices.
      
      * docs/formatdomain.html.in (elementsAddress): New section.
      (elementsControllers, elementsUSB, elementsNICS, elementsInput)
      (elementsHub, elementsCharChannel, elementsSound): Refer to it.
      fe7fc161
    • E
      build: follow directory install conventions · 10404671
      Eric Blake 提交于
      Commit 4d9e51f6 fixed a 'make uninstall' failure, but failed
      to follow other conventions already present in src/Makefile.am.
      In particular, we prefer MKDIR_P over mkdir -p, and should
      have a matching rmdir during uninstall for every directory
      created during install (the idea being that uninstall in a
      DESTDIR should be clean, while installation in the final
      system should not fail with non-empty directories left behind).
      
      * tools/Makefile.am (install-sysconfig, install-initscript)
      (install-systemd): Use MKDIR_P.
      (uninstall-sysconfig, uninstall-initscript, uninstall-systemd):
      Also remove directories.
      * daemon/Makefile.am (install-data-local, install-data-polkit)
      (install-logrotate, install-sysconfig, install-sysctl)
      (install-init-redhat, install-init-upstart, install-init-systemd)
      (install-data-sasl): Use MKDIR_P.
      (uninstall-data-polkit, uninstall-sysconfig, uninstall-sysctl)
      (uninstall-init-redhat, uninstall-init-upstart)
      (uninstall-init-systemd): Also remove directory.
      (uninstall-logrotate): New rule.
      (uninstall-local): Add uninstall-logrotate.
      10404671
  5. 12 12月, 2011 6 次提交
  6. 10 12月, 2011 11 次提交
    • L
      test: replace deprecated "fedora-13" machine with "pc-0.13" · 7204a9fd
      Laine Stump 提交于
      One of the xml tests in the test suite was created using a
      now-deprecated qemu machine type ("fedora-13", which was only ever
      valid for Fedora builds of qemu). Although strictly speaking it's not
      necessary to replace it with an actual supported qemu machine type
      (since the xml in question is never actually sent to qemu), this patch
      changes it to the actually-supported "pc-0.13" just for general
      tidiness. (Also, on some Fedora builds which contain a special patch
      to rid the world of "fedora-13", having it mentioned in the test suite
      will cause make check to fail.)
      7204a9fd
    • L
      network: don't add iptables rules for externally managed networks · ae1232b2
      Laine Stump 提交于
      This patch addresses https://bugzilla.redhat.com/show_bug.cgi?id=760442
      
      When a network has any forward type other than route, nat or none, the
      network configuration should be done completely external to libvirt -
      libvirt only uses these types to allow configuring guests in a manner
      that isn't tied to a specific host (all the host-specific information,
      in particular interface names, port profile data, and bandwidth
      configuration is in the network definition, and the guest
      configuration only references it).
      
      Due to a bug in the bridge network driver, libvirt was adding iptables
      rules for networks with forward type='bridge' etc. any time libvirtd
      was restarted while one of these networks was active.
      
      This patch eliminates that error by only "reloading" iptables rules if
      forward type is route, nat, or none.
      ae1232b2
    • M
      qemu: Prepare to cater for more general address assignment · 9f406c58
      Michael Ellerman 提交于
      Currently qemuDomainAssignPCIAddresses() is called to assign addresses
      to PCI devices.
      
      We need to do something similar for devices with spapr-vio addresses.
      So create one place where address assignment will be done, that is
      qemuDomainAssignAddresses().
      Signed-off-by: NMichael Ellerman <michael@ellerman.id.au>
      9f406c58
    • M
      qemu: Add address in qemuBuildChrDeviceStr() on pseries · 2a994a3b
      Michael Ellerman 提交于
      For the PPC64 pseries machine type we need to add address information
      for the spapr-vty device.
      Signed-off-by: NMichael Ellerman <michael@ellerman.id.au>
      2a994a3b
    • M
      qemu: Use spapr-vscsi on pseries machine type · e1636f47
      Michael Ellerman 提交于
      On the PPC64 pseries machine type we need to use the spapr-vscsi device
      rather than an lsi.
      Signed-off-by: NMichael Ellerman <michael@ellerman.id.au>
      e1636f47
    • E
      network: allow '-' in model name · dad3c209
      Eric Blake 提交于
      In QEMU PPC64 we have a network device called "spapr-vlan". We can specify
      this using the existing syntax for network devices, however libvirt
      currently rejects "spapr-vlan" in virDomainNetDefParseXML() because of
      the "-". Fix the code to accept "-".
      
      * src/conf/domain_conf.c (virDomainNetDefParseXML): Allow '-' in
      model name, and be more efficient.
      * docs/schemas/domaincommon.rng: Limit valid model names to match code.
      Based on a patch by Michael Ellerman.
      dad3c209
    • M
      threadpool: Use while loop on virCondWait · a7adac37
      Michal Privoznik 提交于
      instead of simple 'if' statement as virCondWait can return
      even if associated condition was not signaled.
      a7adac37
    • M
      threads: Document spurious wakeups on virCondWait · 6c811ed4
      Michal Privoznik 提交于
      6c811ed4
    • A
      virsh: plug memory leak on cmdDomblklist · 9707c2a8
      Alex Jia 提交于
      Detected by valgrind. Leak introduced in commit 88a993b1:
      
      * tools/virsh.c: fix memory leak on cmdDomblklist.
      
      * how to reproduce?
        % valgrind -v --leak-check=full virsh domblklist <domain name>
      
      * actual valgrind result:
      
      ==6573== 1,836 bytes in 1 blocks are definitely lost in loss record 110 of 124
      ==6573==    at 0x4A05FDE: malloc (vg_replace_malloc.c:236)
      ==6573==    by 0x330D71497D: xdr_string (in /lib64/libc-2.12.so)
      ==6573==    by 0x4D26CED: xdr_remote_nonnull_string (remote_protocol.c:30)
      ==6573==    by 0x4D28138: xdr_remote_domain_get_xml_desc_ret (remote_protocol.c:1418)
      ==6573==    by 0x4D3C0C2: virNetMessageDecodePayload (virnetmessage.c:382)
      ==6573==    by 0x4D3279F: virNetClientProgramCall (virnetclientprogram.c:382)
      ==6573==    by 0x4D0D50B: callWithFD (remote_driver.c:4339)
      ==6573==    by 0x4D0D5AB: call (remote_driver.c:4360)
      ==6573==    by 0x4D16EAF: remoteDomainGetXMLDesc (remote_client_bodies.h:861)
      ==6573==    by 0x4CF9F4F: virDomainGetXMLDesc (libvirt.c:4098)
      ==6573==    by 0x4154D9: cmdDomblklist (virsh.c:1722)
      ==6573==    by 0x4149E2: vshCommandRun (virsh.c:16365)
      ==6573==
      ==6573== 46,009 (352 direct, 45,657 indirect) bytes in 1 blocks are definitely lost in loss record 123 of 124
      ==6573==    at 0x4A05FDE: malloc (vg_replace_malloc.c:236)
      ==6573==    by 0x3318286DC6: xmlXPathNewContext (in /usr/lib64/libxml2.so.2.7.6)
      ==6573==    by 0x4C79AE2: virXMLParseHelper (xml.c:779)
      ==6573==    by 0x415512: cmdDomblklist (virsh.c:1726)
      ==6573==    by 0x4149E2: vshCommandRun (virsh.c:16365)
      ==6573==    by 0x427743: main (virsh.c:17867)
      ==6573==
      ==6573== LEAK SUMMARY:
      ==6573==    definitely lost: 2,188 bytes in 2 blocks
      ==6573==    indirectly lost: 45,657 bytes in 332 blocks
      ==6573==      possibly lost: 0 bytes in 0 blocks
      ==6573==    still reachable: 128,034 bytes in 1,364 blocks
      ==6573==         suppressed: 0 bytes in 0 blocks
      Signed-off-by: NAlex Jia <ajia@redhat.com>
      9707c2a8
    • S
      fix error when parsing ppc64 models on x86 host · 84f56333
      Stefan Berger 提交于
      When parsing ppc64 models on an x86 host an out-of-memory error message is displayed due
      to it checking for retcpus being NULL. Fix this by removing the check whether retcpus is NULL
      since we will realloc into this variable.
      Also in the X86 model parser display the OOM error at the location where it happens.
      84f56333
    • S
      fix memory leak in src/nodeinfo.c · b1d6d56c
      Stefan Berger 提交于
      Fix memory leak:
      
      ==27534== 24 bytes in 1 blocks are definitely lost in loss record 207 of 530
      ==27534==    at 0x4A05E46: malloc (vg_replace_malloc.c:195)
      ==27534==    by 0x38EC26EC37: vasprintf (in /lib64/libc-2.13.so)
      ==27534==    by 0x4E998E6: virVasprintf (util.c:1677)
      ==27534==    by 0x4E999F1: virAsprintf (util.c:1695)
      ==27534==    by 0x4F1EAAC: nodeGetInfo (nodeinfo.c:593)
      ==27534==    by 0x47948F: qemuCapsInitCPU (qemu_capabilities.c:855)
      ==27534==    by 0x4796B1: qemuCapsInit (qemu_capabilities.c:915)
      ==27534==    by 0x456550: qemuCreateCapabilities (qemu_driver.c:245)
      ==27534==    by 0x4578C4: qemudStartup (qemu_driver.c:580)
      ==27534==    by 0x4F20886: virStateInitialize (libvirt.c:852)
      ==27534==    by 0x420E55: daemonRunStateInit (libvirtd.c:1156)
      ==27534==    by 0x4E94C56: virThreadHelper (threads-pthread.c:157)
      
      Mark this leaked variable as const char * when it is passed into another
      function. 
      b1d6d56c
  7. 09 12月, 2011 3 次提交