1. 14 10月, 2011 8 次提交
    • J
      qemu: Make sure BeginJob is always followed by EndJob · bf7676af
      Jiri Denemark 提交于
      Otherwise we can end up with a dangling job that can only be cleared by
      restarting libvirtd.
      bf7676af
    • J
      qemu: Log debug messages when changing job · dddbfcf6
      Jiri Denemark 提交于
      Log debug messages anytime we call *BeginJob* or *EndJob* so that it's
      easier to spot incorrect usage of domain job APIs.
      dddbfcf6
    • E
      qemu: fix text block info parsing · f043ff63
      Eric Blake 提交于
      Detected by Coverity.  p (the pointer to the string) is always true;
      when in reality, we wanted to know whether the integer value of the
      just-parsed string is '0' or '1'.  Logic bug since commit b1b5b51a.
      
      * src/qemu/qemu_monitor_text.c (qemuMonitorTextGetBlockInfo): Set
      results to proper value.
      f043ff63
    • E
      qemu: avoid text monitor null deref · 60be9e8c
      Eric Blake 提交于
      Detected by Coverity.  If, for some reason, our text monitor input
      does not match our assumptions, we end up incrementing p while it
      is NULL, then dereferencing the pointer 0x1, which will fault.
      
      * src/qemu/qemu_monitor_text.c
      (qemuMonitorTextGetBlockStatsParamsNumber): Rewrite to avoid
      deref of strchr failure.  Fix indentation.
      60be9e8c
    • E
      qemu: check for json allocation failure · ce521f24
      Eric Blake 提交于
      Detected by Coverity.  Introduced in commit b1b5b51a.
      
      * src/qemu/qemu_monitor_json.c (qemuMonitorJSONGetBlockInfo):
      Avoid null dereference.
      ce521f24
    • E
      build: add compiler attributes to virUUIDParse · 430156cf
      Eric Blake 提交于
      Coverity complained that most, but not all, clients of virUUIDParse
      were checking for errors.  Silence those coverity warnings by
      explicitly marking the cases where we trust the input, and fixing
      one instance that really should have been checking.  In particular,
      this silences a rather large percentage of the warnings I saw on my
      most recent Coverity analysis run.
      
      * src/util/uuid.h (virUUIDParse): Enforce rules.
      * src/util/uuid.c (virUUIDParse): Drop impossible check; at least
      Coverity will detect if we break rules and pass NULL.
      * src/xenapi/xenapi_driver.c (xenapiDomainCreateXML)
      (xenapiDomainLookupByID, xenapiDomainLookupByName)
      (xenapiDomainDefineXML): Ignore return when we trust data source.
      * src/vbox/vbox_tmpl.c (nsIDtoChar, vboxIIDToUUID_v3_x)
      (vboxCallbackOnMachineStateChange)
      (vboxCallbackOnMachineRegistered, vboxStoragePoolLookupByName):
      Likewise.
      * src/node_device/node_device_hal.c (gather_system_cap): Likewise.
      * src/xenxs/xen_sxpr.c (xenParseSxpr): Check for errors.
      430156cf
    • M
      virFDStream: close also given errfd (fd leak) · 72851bb9
      Marc-André Lureau 提交于
      In virFDStreamOpenFileInternal(), a errfd pipe is opened by
      virCommandRunAsync() and given to virFDStreamOpenInternal().
      
      It seems virFDStream should close errfd, just like the other
      fd it is given.
      
      This fixes screenshots leaking FDs:
      http://bugzilla.redhat.com/show_bug.cgi?id=745761
      72851bb9
    • E
      command: avoid fd leak on failure · 219600c9
      Eric Blake 提交于
      virCommandTransferFD promises that the fd is no longer owned by
      the caller.  Normally, we want the fd to remain open until the
      child runs, but in error situations, we must close it earlier.
      
      * src/util/command.c (virCommandTransferFD): Close fd now if we
      can't track it to close later.
      (virCommandKeepFD): Adjust helper to make this easier.
      219600c9
  2. 13 10月, 2011 17 次提交
    • S
      Fix typo in lxc_controller · d60299c3
      Serge E. Hallyn 提交于
      s/Mouting/Mounting.
      Signed-off-by: NSerge Hallyn <serge.hallyn@canonical.com>
      d60299c3
    • E
      spec: mingw cleanups · df92bab4
      Eric Blake 提交于
      * libvirt.spec.in (%configure): Drop unused %{one} macro.
      * mingw32-libvirt.spec.in (%{rhel}): Compile ESX but not HyperV on
      mingw build for RHEL.
      (%build): Make configure honor spec conditionals.  Reorder to
      match libvirt.spec.
      * autobuild.sh (mingw): Update list to match.
      Suggested by Daniel P. Berrange.
      df92bab4
    • E
      build: update to latest gnulib · f65eda36
      Eric Blake 提交于
      358 changes; most probably have no impact on libvirt, but we
      might as well stay current.
      
      * .gnulib: Update to latest.
      f65eda36
    • M
      qemu: Check for domain being active on successful job acquire · 9bc9999b
      Michal Privoznik 提交于
      As this is needed. Although some functions check for domain
      being active before obtaining job, we need to check it after,
      because obtaining job unlocks domain object, during which
      a state of domain can be changed.
      9bc9999b
    • M
      events: Propose a separate lock for event queue · d81eee40
      Michal Privoznik 提交于
      Currently, push & pop from event queue (both server & client side)
      rely on lock from higher levels, e.g. on driver lock (qemu),
      private_data (remote), ...; This alone is not sufficient as not
      every function that interacts with this queue can/does lock,
      esp. in client where we have a different approach, "passing
      the buck".
      
      Therefore we need a separate lock just to protect event queue.
      
      For more info see:
      https://bugzilla.redhat.com/show_bug.cgi?id=743817
      d81eee40
    • M
      qemu: Implement VIR_DUMP_RESET · 2050b61d
      Michal Privoznik 提交于
      This patch extends qemudDomainCoreDump so it supports new VIR_DUMP_RESET
      flag. If this flag is set, domain is reset on successful dump. However,
      this is needed to be done after we start CPUs.
      2050b61d
    • M
      virDomainCoreDump: Introduce VIR_DUMP_RESET flag · 4dadfe59
      Michal Privoznik 提交于
      This flag is intended to allow user to do so called system reset
      after dump, instead of sending ACPI reboot event.
      4dadfe59
    • P
      example: Support debug output and loop switch · f319b553
      Philipp Hahn 提交于
      Add support for enabling debug output via command line option.
      Allow to toggle the loop implementation between pure-Python and
      native-C.
      Signed-off-by: NPhilipp Hahn <hahn@univention.de>
      f319b553
    • P
      example: Redirect --help output to stdout/stderr · 78adf509
      Philipp Hahn 提交于
      When --help is requested, print usage() to stdout.
      When an illegal option is passed, print usage to stderr.
      Signed-off-by: NPhilipp Hahn <hahn@univention.de>
      78adf509
    • P
      example: Fix argument handling · 08d56e24
      Philipp Hahn 提交于
      sys.argv contains the original command line arguments, while args only
      contains the arguments not handled by getopt(). Currently this is no
      problem since --help is the only command line option passable, which
      terminates the process, so the code is never reached. Any option added
      in the future will reveal the bug.
      Signed-off-by: NPhilipp Hahn <hahn@univention.de>
      08d56e24
    • E
      snapshot: implement LIST_LEAVES flag in qemu · 5cf56c4b
      Eric Blake 提交于
      With the recent refactoring of qemu snapshot relationships, it
      is now trivial to filter on leaves.
      
      * src/conf/domain_conf.c (virDomainSnapshotObjListCount)
      (virDomainSnapshotObjListCopyNames): Handle new flag.
      * src/qemu/qemu_driver.c (qemuDomainSnapshotListNames)
      (qemuDomainSnapshotNum, qemuDomainSnapshotListChildrenNames)
      (qemuDomainSnapshotNumChildren): Pass new flag through.
      5cf56c4b
    • E
      snapshot: add API for filtering by leaves · 8b6d1a20
      Eric Blake 提交于
      Counterpart to --roots.
      
      * include/libvirt/libvirt.h.in (VIR_DOMAIN_SNAPSHOT_LIST_LEAVES):
      New flag.
      * src/libvirt.c (virDomainSnapshotNum, virDomainSnapshotListNames)
      (virDomainSnapshotNumChildren)
      (virDomainSnapshotListChildrenNames): Document it.
      * tools/virsh.c (cmdSnapshotList): Expose it.
      * tools/virsh.pod (snapshot-list): Document --leaves.
      8b6d1a20
    • P
      xen: Return tap2 for tap2 disks · c490b469
      Philipp Hahn 提交于
      For some versions of Xen the difference between "tap" and "tap2" is
      important. When converting back from xen-sxpr to libvirt-xml, that
      information is lost, which breaks re-defining the domain using that
      data.
      
      Explicitly return "tap2" for disks defined as "device/tap2".
      Signed-off-by: NPhilipp Hahn <hahn@univention.de>
      c490b469
    • P
      xen: fix PyGrub boot device order · c2969ec7
      Philipp Hahn 提交于
      When PyGrub is used as the bootloader in Xen, it gets passed the first
      bootable disk. Xend supports a "bootable"-flag for this, which isn't
      explicitly supported by libvirt.
      When converting libvirt-xml to xen-sxpr the "bootable"-flag gets
      implicitly set by xen.xend.XenConfig.device_add() for the first disk
      (marked as "Compat hack -- mark first disk bootable").
      When converting back xen-sxpr to libvirt-xml, the disks are returned in
      the internal order used by Xend ignoring the "bootable"-flag, which
      loses the original order. When the domain is then re-defined, the order
      of disks is changed, which breaks PyGrub, since a different disk gets
      passed.
      
      When converting xen-sxpr to libvirt-xml, use the "bootable"-flag to
      determine the first disk.
      
      This isn't perfect, since several disks can be marked as bootable using
      the Xend-API, but that is not supported by libvirt. In all known cases
      relevant to libvirt exactly one disk is marked as bootable.
      Signed-off-by: NPhilipp Hahn <hahn@univention.de>
      c2969ec7
    • P
      tests: Add support for skipping tests · c58d778d
      Philipp Hahn 提交于
      AM_TESTS has support for skipping tests, while the C-implementation
      virtTestRun() does not support that feature.
      
      Print "_" or "SKIP" in verbose mode for tests returning EXIT_AM_SKIP=77.
      Signed-off-by: NPhilipp Hahn <hahn@univention.de>
      c58d778d
    • H
      Introduce <driver> under <filesystem> to support open-by-handle · da8127e6
      Harsh Prateek Bora 提交于
      VirtFS allows the user to choose between path/handle based fs driver.
      As of now, libvirt hardcoded path based driver only. This patch provides
      a solution to allow user to choose between path/handle based fs driver.
      
      Sample:
      
          <filesystem type='mount'>
            <driver type='handle'/>
            <source dir='/folder/to/share1'/>
            <target dir='mount_tag1'/>
          </filesystem>
      
          <filesystem type='mount'>
            <driver type='path'/>
            <source dir='/folder/to/share2'/>
            <target dir='mount_tag2'/>
          </filesystem>
      Signed-off-by: NHarsh Prateek Bora <harsh@linux.vnet.ibm.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      da8127e6
    • S
      buf: implement generic virBufferEscape · 7f197559
      Sage Weil 提交于
      Implement a generic helper to escape a given set of characters with a
      leading '\'.  Generalizes virBufferEscapeSexpr().
      Signed-off-by: NSage Weil <sage@newdream.net>
      7f197559
  3. 12 10月, 2011 14 次提交
    • O
      daemon: Always advertise libvirtd service · 33b55fd8
      Osier Yang 提交于
      This is a regression introduced by new RPC codes, previously
      we advertise the service via ssh even if the daemon doesn't
      listen on TLS port (TCP is not choosed). Now the service is
      only advertised when it listens on TLS or TCP port. This breaks
      upper layer apps which intends to discover the service, such
      as virt-manager.
      33b55fd8
    • E
      snapshot: drop dead parameters · ebec21ee
      Eric Blake 提交于
      The previous optimizations lead to some follow-on cleanups.
      
      * src/conf/domain_conf.c (virDomainSnapshotForEachChild)
      (virDomainSnapshotForEachDescendant): Drop dead parameter.
      (virDomainSnapshotActOnDescendant)
      (virDomainSnapshotObjListNumFrom)
      (virDomainSnapshotObjListGetNamesFrom): Update callers.
      * src/qemu/qemu_driver.c (qemuDomainSnapshotNumChildren)
      (qemuDomainSnapshotListChildrenNames, qemuDomainSnapshotDelete):
      Likewise.
      * src/conf/domain_conf.h: Update prototypes.
      ebec21ee
    • E
      snapshot: take advantage of new relations · 35abced2
      Eric Blake 提交于
      Among other improvements, virDomainSnapshotForEachDescendant is
      changed from iterative O(n^2) to recursive O(n).  A bit better
      than the O(n^3) implementation in virsh snapshot-list!
      
      * src/conf/domain_conf.c (virDomainSnapshotObjListNum)
      (virDomainSnapshotObjListNumFrom)
      (virDomainSnapshotObjeListGetNames, virDomainSnapshotForEachChild)
      (virDomainSnapshotForEachDescendant): Optimize.
      (virDomainSnapshotActOnDescendant): Tweak.
      (virDomainSnapshotActOnChild, virDomainSnapshotMarkDescendant):
      Delete, now that they are unused.
      35abced2
    • E
      snapshot: track qemu snapshot relations · 9279bdf7
      Eric Blake 提交于
      Maintain the parent/child relationships of all qemu snapshots.
      
      * src/qemu/qemu_driver.c (qemuDomainSnapshotLoad): Populate
      relationships after loading.
      (qemuDomainSnapshotCreateXML): Set relations on creation; tweak
      redefinition to reuse existing object.
      (qemuDomainSnapshotReparentChildren, qemuDomainSnapshotDelete):
      Clear relations on delete.
      9279bdf7
    • E
      snapshot: framework for more efficient relation traversal · 7ec6f7bd
      Eric Blake 提交于
      No one was using virDomainSnapshotHasChildren, but that was an
      O(n) function.  Exposing and tracking a bit more metadata for each
      snapshot will allow the same query to be made with an O(1) query
      of the member field.  For single snapshot operations (create,
      delete), callers can be trusted to maintain the metadata themselves,
      but for reloading, we can't compute parents as we go since there
      is no guarantee that parents were parsed before children, so we also
      provide a function to refresh the relationships, and which can
      be used to detect if the user has ignored our warnings and been
      directly modifying files in /var/lib/libvirt/qemu/snapshot.  This
      patch only adds metadata; later patches will actually use it.
      
      This layout intentionally hardcodes the size of each snapshot struct,
      by tracking sibling pointers, rather than having to deal with the
      headache of yet more memory management by directly sticking a
      dynamically sized child[] on each parent.
      
      * src/conf/domain_conf.h (_virDomainSnapshotObj)
      (_virDomainSnapshotObjList): Add members.
      (virDomainSnapshotUpdateRelations, virDomainSnapshotDropParent):
      New prototypes.
      (virDomainSnapshotHasChildren): Delete.
      * src/conf/domain_conf.c (virDomainSnapshotSetRelations)
      (virDomainSnapshotUpdateRelations, virDomainSnapshotDropParent):
      New functions.
      (virDomainSnapshotHasChildren): Drop unused function.
      * src/libvirt_private.syms (domain_conf): Update exports.
      7ec6f7bd
    • E
      snapshot: use correct qmp monitor command · 59f179ce
      Eric Blake 提交于
      To date, JSON disk snapshots worked by accident, as they were always
      using hmp fallback due to a typo in commit e702b5ba not picking up
      on the (intentional) difference in command names between the two
      monitor protocols.
      
      * src/qemu/qemu_monitor_json.c (qemuMonitorJSONDiskSnapshot):
      Spell QMP command correctly.
      Reported by Luiz Capitulino.
      59f179ce
    • E
      snapshot: virsh shorthand for operating on current snap · b77b203c
      Eric Blake 提交于
      Rather than having to do:
      
      $ virsh snapshot-revert dom $(virsh snapshot-current dom --name)
      
      I thought it would be nice to do:
      
      $ virsh snapshot-revert dom --current
      
      I didn't add 'virsh snapshot-dumpxml --current' since we already have
      'virsh snapshot-current' for the same task.  snapshot-list accepted
      a name but did not require it, and that remains the case, with
      --current serving in place of that name.  For all other commands,
      name used to be required, and can now be replaced by --current;
      I intentionally made it so that omitting both --current and a name
      is an error (having the absence of a name imply --current seems
      just a bit too magic, so --current must be explicit).  I also had
      to keep snapshot-edit backwards-compatible, as the only command
      that already had a --current argument alongside a name, which still
      works to both edit a named snapshot and make it current.
      
      * tools/virsh.c (vshLookupSnapshot): New helper function.
      (cmdSnapshotEdit, cmdSnapshotList, cmdSnapshotParent)
      (cmdSnapshotDelete, cmdDomainSnapshotRevert): Use it, adding an
      option where needed.
      * tools/virsh.pod (snapshot-delete, snapshot-edit)
      (snapshot-list, snapshot-parent, snapshot-revert): Document
      use of --current.
      (snapshot-dumpxml): Mention alternative.
      b77b203c
    • E
      build: fix mingw build without sasl · 83ad88b7
      Eric Blake 提交于
      Detected by autogen.sh on a cross-mingw build:
      
      Creating library file: .libs/libvirt.dll.a
      Cannot export virNetSASLContextCheckIdentity: symbol not defined
      Cannot export virNetSASLContextNewServer: symbol not defined
      ...
      
      * src/libvirt_private.syms (virnetsaslcontext.h): Move symbols...
      * src/libvirt_sasl.syms: ...to new file.
      * src/Makefile.am (USED_SYM_FILES) [HAVE_SASL]: Use new file.
      (EXTRA_DIST): Ship it.
      83ad88b7
    • E
      build: fix 'make rpm' · bbbdc148
      Eric Blake 提交于
      Since commit ddf3bd32, 'make rpm' failed with:
      
      RPM build errors:
          File not found: /home/remote/eblake/rpmbuild/BUILDROOT/libvirt-0.9.6-1.fc14.eblake1318366440.x86_64/usr/share/systemtap/tapset/libvirtd.stp
      
      * libvirt.spec.in (with_dtrace): Match installed .stp files.
      bbbdc148
    • E
      build: fix 'make distcheck' · c654ba88
      Eric Blake 提交于
      I got these distcheck failures with sanlock enabled:
      
      ERROR: files left in build directory after distclean:
      ./tools/virt-sanlock-cleanup
      ./src/locking/qemu-sanlock.conf
      
      * src/Makefile.am (DISTCLEANFILES) [HAVE_SANLOCK]: Clean built
      file.
      * tools/Makefile.am (DISTCLEANFILES): Likewise.
      c654ba88
    • E
      build: ship helper scripts · e648aee0
      Eric Blake 提交于
      Otherwise, 'make rpm' fails with:
      
        GEN    libvirt_qemu.def
      make[2]: *** No rule to make target `dtrace2systemtap.pl', needed by `libvirt_probes.stp'.  Stop.
      
      * src/Makefile.am (EXTRA_DIST): Add recent script additions.
      e648aee0
    • D
      disable xenlight for non-Xen platforms · 099dc93b
      Dan Horák 提交于
      when building libvirt in Fedora/s390x I've found that xenlight needs to
      be explicitly disabled in the spec file. Configure properly sets the
      library as non-existent, but the %files section still wants to package
      the 3 /var/*/libvirt/libxl directories. See also
      https://bugzilla.redhat.com/show_bug.cgi?id=745020
      099dc93b
    • E
      build: fix 'make check' linkage with dtrace · b794d2a5
      Eric Blake 提交于
      Building on Linux with dtrace enabled was failing 'make check':
      
        CCLD   nodeinfotest
      ../src/.libs/libvirt_test.a(libvirt_net_rpc_client_la-virnetclient.o): In function `virNetClientNew':
      /home/remote/eblake/libvirt/src/rpc/virnetclient.c:162: undefined reference to `libvirt_rpc_client_new_semaphore'
      
      On looking further, I see some earlier warnings emitted from libtool:
      
      *** Warning: Linking the shared library libvirt.la against the non-libtool
      *** objects  probes.o is not portable!
      
      Since src/probes.o is only built on Linux, and even then, only when
      dtrace is enabled, this failure does not affect other platforms, and
      despite libtool warning that it is not generally portable, it is not
      a problem for our use-case in libvirt.la.  But it turns out that while
      libtool is willing to jam raw .o files into an installed shared
      library (libvirt.la becomes libvirt.so), it is NOT willing to jam
      the same .o file into the convenience library libvirt_test.la.
      Perhaps this is a bug in libtool, but even if we get libtool fixed,
      libvirt must continue to build on platforms with older libtool.  So,
      the fix is the same as we are already using for the libvirt_lxc
      executable - don't rely on the .o file being in the convenience
      library, but instead use LDADD to pull it in directly.
      
      * tests/Makefile.am (PROBES_O): New macro.
      (LDADDS): Use it to fix link errors.
      b794d2a5
    • J
      build: Fix VPATH build with new probes · 15d52307
      Jiri Denemark 提交于
      15d52307
  4. 11 10月, 2011 1 次提交