1. 13 2月, 2014 5 次提交
    • E
      event: pass reason for PM events · 6831c1d3
      Eric Blake 提交于
      Commit 57ddcc23 (v0.9.11) introduced the pmwakeup event, with
      an optional 'reason' field reserved for possible future expansion.
      But it failed to wire the field through RPC, so even if we do
      add a reason in the future, we will be unable to get it back
      to the user.
      
      Worse, commit 7ba5defb (v1.0.0) repeated the same mistake with
      the pmsuspend_disk event.
      
      As long as we are adding new RPC calls, we might as well fix
      the events to actually match the signature so that we don't have
      to add yet another RPC in the future if we do decide to start
      using the reason field.
      
      * src/remote/remote_protocol.x
      (remote_domain_event_callback_pmwakeup_msg)
      (remote_domain_event_callback_pmsuspend_msg)
      (remote_domain_event_callback_pmsuspend_disk_msg): Add reason
      field.
      * daemon/remote.c (remoteRelayDomainEventPMWakeup)
      (remoteRelayDomainEventPMSuspend)
      (remoteRelayDomainEventPMSuspendDisk): Pass reason to client.
      * src/conf/domain_event.h (virDomainEventPMWakeupNewFromDom)
      (virDomainEventPMSuspendNewFromDom)
      (virDomainEventPMSuspendDiskNewFromDom): Require additional
      parameter.
      * src/conf/domain_event.c (virDomainEventPMClass): New class.
      (virDomainEventPMDispose): New function.
      (virDomainEventPMWakeupNew*, virDomainEventPMSuspendNew*)
      (virDomainEventPMSuspendDiskNew*)
      (virDomainEventDispatchDefaultFunc): Use new class.
      * src/remote/remote_driver.c (remoteDomainBuildEvent*PM*): Pass
      reason through.
      * src/remote_protocol-structs: Regenerate.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      6831c1d3
    • E
      event: convert remaining domain events to new style · 158795d2
      Eric Blake 提交于
      Following the patterns established by lifecycle events, this
      creates all the new RPC calls needed to pass callback IDs
      for every domain event, and changes the limits in client and
      server codes to use modern style when possible.
      
      I've tested all combinations: both 'old client and new server'
      and 'new client and old server' continue to work with the old
      RPCs, and 'new client and new server' benefit from server-side
      filtering with the new RPCs.
      
      * src/remote/remote_protocol.x (REMOTE_PROC_DOMAIN_EVENT_*): Add
      REMOTE_PROC_DOMAIN_EVENT_CALLBACK_* counterparts.
      * daemon/remote.c (remoteRelayDomainEvent*): Send callbackID via
      newer RPC when used with new-style registration.
      (remoteDispatchConnectDomainEventCallbackRegisterAny): Extend to
      cover all domain events.
      * src/remote/remote_driver.c (remoteDomainBuildEvent*): Add new
      Callback and Helper functions.
      (remoteEvents): Match order of RPC numbers, register new handlers.
      (remoteConnectDomainEventRegisterAny)
      (remoteConnectDomainEventDeregisterAny): Extend to cover all
      domain events.
      * src/remote_protocol-structs: Regenerate.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      158795d2
    • E
      event: client RPC protocol tweaks for domain lifecycle events · 355ea626
      Eric Blake 提交于
      The counterpart to the server RPC additions; here, a single
      function can serve both old and new calls, while incoming
      events must be serviced by two different functions.  Again,
      some wise choices in our XDR made it easier to share code
      managing similar events.
      
      While this only supports lifecycle events, it covers the
      harder part of how Register and RegisterAny interact; the
      remaining 15 events will be a mechanical change in a later
      patch.  For Register, we now have a callbackID locally for
      more efficient cleanup if the RPC fails; we also prefer to
      use the newer RPC where we know it is supported (the older
      RPC must be used if we don't know if RegisterAny is
      supported).
      
      * src/remote/remote_driver.c (remoteEvents): Register new RPC
      event handler.
      (remoteDomainBuildEventLifecycle): Move guts...
      (remoteDomainBuildEventLifecycleHelper): ...here.
      (remoteDomainBuildEventCallbackLifecycle): New function.
      (remoteConnectDomainEventRegister)
      (remoteConnectDomainEventDeregister)
      (remoteConnectDomainEventRegisterAny)
      (remoteConnectDomainEventDeregisterAny): Use new RPC when supported.
      355ea626
    • E
      event: prepare client to track domain callbackID · caaf6ba1
      Eric Blake 提交于
      We want to convert over to server-side events, even for older
      APIs.  To do that, the client side of the remote driver wants
      to distinguish between legacy virConnectDomainEventRegister and
      normal virConnectDomainEventRegisterAny, while knowing the
      client callbackID and the server's serverID for both types of
      registration.  The client also needs to probe whether the
      server supports server-side filtering.  However, for ease of
      review, we don't actually use the new RPCs until a later patch.
      
      * src/conf/object_event_private.h (virObjectEventStateCallbackID):
      Add parameter.
      * src/conf/object_event.c (virObjectEventCallbackListAddID)
      (virObjectEventStateRegisterID): Separate legacy from callbackID.
      (virObjectEventStateCallbackID): Pass through parameter.
      (virObjectEventCallbackLookup): Let legacy and global domain
      lifecycle events share a common remoteID.
      * src/conf/network_event.c (virNetworkEventStateRegisterID):
      Update caller.
      * src/conf/domain_event.c (virDomainEventStateRegister)
      (virDomainEventStateRegisterID, virDomainEventStateDeregister):
      Likewise.
      (virDomainEventStateRegisterClient)
      (virDomainEventStateCallbackID): Implement new functions.
      * src/conf/domain_event.h (virDomainEventStateRegisterClient)
      (virDomainEventStateCallbackID): New prototypes.
      * src/remote/remote_driver.c (private_data): Add field.
      (doRemoteOpen): Probe server feature.
      (remoteConnectDomainEventRegister)
      (remoteConnectDomainEventRegisterAny): Use new function.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      caaf6ba1
    • E
      event: server RPC protocol tweaks for domain lifecycle events · 03722957
      Eric Blake 提交于
      This patch adds some new RPC call numbers, but for ease of review,
      they sit idle until a later patch adds the client counterpart to
      drive the new RPCs.  Also for ease of review, I limited this patch
      to just the lifecycle event; although converting the remaining
      15 domain events will be quite mechanical.  On the server side,
      we have to have a function per RPC call, largely with duplicated
      bodies (the key difference being that we store in our callback
      opaque pointer whether events should be fired with old or new
      style); meanwhile, a single function can drive multiple RPC
      messages.  With a strategic choice of XDR struct layout, we can
      make the event generation code for both styles fairly compact.
      
      I debated about adding a tri-state witness variable per
      connection (values 'unknown', 'legacy', 'modern').  It would start
      as 'unknown', move to 'legacy' if any RPC call is made to a legacy
      event call, and move to 'modern' if the feature probe is made;
      then the event code could issue an error if the witness state is
      incorrect (a legacy RPC call while in 'modern', a modern RPC call
      while in 'unknown' or 'legacy', and a feature probe while in
      'legacy' or 'modern').  But while it might prevent odd behavior
      caused by protocol fuzzing, I don't see that it would prevent
      any security holes, so I considered it bloat.
      
      Note that sticking @acl markers on the new RPCs generates unused
      functions in access/viraccessapicheck.c, because there is no new
      API call that needs to use the new checks; however, having a
      consistent .x file is worth the dead code.
      
      * src/libvirt_internal.h (VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK):
      New feature.
      * src/remote/remote_protocol.x
      (REMOTE_PROC_CONNECT_DOMAIN_EVENT_CALLBACK_REGISTER_ANY)
      (REMOTE_PROC_CONNECT_DOMAIN_EVENT_CALLBACK_DEREGISTER_ANY)
      (REMOTE_PROC_DOMAIN_EVENT_CALLBACK_LIFECYCLE): New RPCs.
      * daemon/remote.c (daemonClientCallback): Add field.
      (remoteDispatchConnectDomainEventCallbackRegisterAny)
      (remoteDispatchConnectDomainEventCallbackDeregisterAny): New
      functions.
      (remoteDispatchConnectDomainEventRegisterAny)
      (remoteDispatchConnectDomainEventDeregisterAny): Mark legacy use.
      (remoteRelayDomainEventLifecycle): Change message based on legacy
      or new use.
      (remoteDispatchConnectSupportsFeature): Advertise new feature.
      * src/remote_protocol-structs: Regenerate.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      03722957
  2. 12 2月, 2014 8 次提交
  3. 11 2月, 2014 12 次提交
    • J
      Rename 'index' in virCapabilitiesGetCpusForNode · 47fa97a7
      Ján Tomko 提交于
      This shadows the index function on some systems (RHEL-6.4, FreeBSD 9):
      ../../src/conf/capabilities.c: In function 'virCapabilitiesGetCpusForNode':
      ../../src/conf/capabilities.c:1005: warning: declaration of'index'
            shadows a global declaration [-Wshadow]
      /usr/include/strings.h:57: warning: shadowed declaration is here [-Wshadow]
      47fa97a7
    • P
      Handle non-sequential NUMA node numbers · cd921cf0
      Pradipta Kr. Banerjee 提交于
      On some platforms like IBM PowerNV the NUMA node numbers can be
      non-sequential. For eg. numactl --hardware o/p from such a machine looks
      as given below
      
      node distances:
         node   0   1  16  17
           0:  10  40  40  40
           1:  40  10  40  40
          16:  40  40  10  40
          17:  40  40  40  10
      
      The NUMA nodes are 0,1,16,17
      
      Libvirt uses sequential index as NUMA node numbers and this can
      result in crash or incorrect results.
      Signed-off-by: NShivaprasad G Bhat <sbhat@linux.vnet.ibm.com>
      Signed-off-by: NPradipta Kr. Banerjee <bpradip@in.ibm.com>
      cd921cf0
    • P
      storage: gluster: Set volume metadata in a separate function · 037ffda3
      Peter Krempa 提交于
      Extract the metadata setting code into a separate function for future
      use.
      037ffda3
    • M
      qemu: introduce spiceport chardev backend · d27e6bc4
      Martin Kletzander 提交于
      Add a new backend for any character device.  This backend uses channel
      in spice connection.  This channel is similar to spicevmc, but
      all-purpose in contrast to spicevmc.
      
      Apart from spicevmc, spiceport-backed chardev will not be formatted
      into the command-line if there is no spice to use (with test for that
      as well).  For this I moved the def->graphics counting to the start
      of the function so its results can be used in rest of the code even in
      the future.
      Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
      d27e6bc4
    • M
      qemu: remove pointless condition · 296a4791
      Martin Kletzander 提交于
      This patch is here just to ease the code review and make related
      changes look more sensible.  Apart from removing the condition this is
      merely a whitespace (indentation) change.
      Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
      296a4791
    • M
      qemu: rework '-serial none' · a53e5040
      Martin Kletzander 提交于
      Limiting ourselves to qemu without QEMU_CAPS_DEVICE capability, we
      used '-serial none' only if there was no serial device defined in the
      domain XML.  This means that if we want to have a possibility of the
      device being defined in XML, but not used in the command-line
      (e.g. when it's pointless), we'll fail to attach '-serial none' to the
      command-line (when skipping the device's command-line building and the
      device being the only one).
      
      Since there is no such device, this patch doesn't actually do
      anything, but enables easier future additions in this manner.
      Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
      a53e5040
    • M
      conf: introduce spiceport chardev backend · 5b189541
      Martin Kletzander 提交于
      Add a new character device backend called 'spiceport' that uses
      spice's channel for communications and apart from spicevmc can be used
      as a backend for any character device from libvirt's point of view.
      Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
      5b189541
    • W
      rbd: Use rbd_create3 to create RBD format 2 images by default · 0227889a
      Wido den Hollander 提交于
      This new RBD format supports snapshotting and cloning. By having
      libvirt create images in format 2 end-users of the created images
      can benefit from the new RBD format.
      
      Older versions of libvirt can work with this new RBD format as long
      as librbd supports format 2. RBD format is supported by librbd since
      version 0.56 (Ceph Bobtail).
      Signed-off-by: NWido den Hollander <wido@widodh.nl>
      0227889a
    • J
      Libvirt lose sheepdogs volumes on pool refresh or restart. · 97410063
      Joel SIMOES 提交于
      When restarting sheepdog pool, all volumes are missing.
      This patch add automatically all volume from the added pool.
      
      Adding last Daniel P. Berrange's syntaxes correction.
      Adding vol on separeted function 'inspired' from parallels_storage :
      parallelsAddDiskVolume
      97410063
    • L
      build: correctly check for SOICGIFVLAN GET_VLAN_VID_CMD command · 0144d729
      Laine Stump 提交于
      In order to make a client-only build successful on RHEL4 (yes, you
      read that correctly!), commit 3ed2e545 modified src/util/virnetdev.c so
      that the functional version of virNetDevGetVLanID() was only compiled
      if GET_VLAN_VID_CMD was defined. However, it is *never* defined, but
      is only an enum value, so the proper version was no longer compiled
      even on platforms that support it. This resulted in the vlan tag not
      being properly set for guest traffic on VEPA mode guest macvtap
      interfaces that were bound to a vlan interface (that's the only place
      that libvirt currently uses virNetDevGetVLanID)
      
      Since there is no way to compile conditionally based on the presence
      of an enum value, this patch modifies configure.ac to check for said
      enum value with AC_CHECK_DECLS(), which #defines
      HAVE_DECL_GET_VLAN_VID_CMD to 1 if it's successful compiling a test
      program that uses GET_VLAN_VID_CMD (and still #defines it, but to 0,
      if it's not successful).  We can then make the compilation of
      virNetDevGetVLanID() conditional on the value of
      HAVE_DECL_GET_VLAN_VID_CMD.
      0144d729
    • Y
      maint: fix line numbers in check-aclrules reports · cc25e451
      Yuri Myasoedov 提交于
      Reset line numbering on each input file in check-aclrules.pl. Otherwise
      it reports wrong line numbers in its error messages.
      Signed-off-by: NYuri Myasoedov <ymyasoedov@yandex.ru>
      Signed-off-by: NRoman Bogorodskiy <bogorodskiy@gmail.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      cc25e451
    • M
      virNetworkLoadState: Disallow mangled 'floor' element · 28900766
      Michal Privoznik 提交于
      In the network status XML we may have the <floor/> element with the
      'sum' attribute. The attribute represents sum of all 'floor'-s of
      computed over each interface connected to the network (this is needed to
      guarantee certain bandwidth for certain domain). The sum is therefore a
      number. However, if the number was mangled (e.g. by an user's
      interference to network status file), we've just ignored it without
      refusing to parse such file. This was all due to 'goto error' missing.
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      28900766
  4. 10 2月, 2014 5 次提交
    • P
      qemu: Use correct permissions when determining the image chain · 9bf629ab
      Peter Krempa 提交于
      The code took into account only the global permissions. The domains now
      support per-vm DAC labels and per-image DAC labels. Use the most
      specific label available.
      9bf629ab
    • M
      networkStartNetwork: Be more verbose · e209c077
      Michal Privoznik 提交于
      The lack of debug printings might be frustrating in the future.
      Moreover, this function doesn't follow the usual pattern we have in the
      rest of the code:
      
        int ret = -1;
        /* do some work */
        ret = 0;
      cleanup:
        /* some cleanup work */
        return ret;
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      e209c077
    • P
      qemu: hyperv: Add support for timer enlightenments · 600bca59
      Peter Krempa 提交于
      Add a new <timer> for the HyperV reference time counter enlightenment
      and the iTSC reference page for Windows guests.
      
      This feature provides a paravirtual approach to track timer events for
      the guest (similar to kvmclock) with the option to use real hardware
      clock on systems with a iTSC with compensation across various hosts.
      600bca59
    • P
      conf: Enforce supported options for certain timers · 8ffaa42d
      Peter Krempa 提交于
      According to the documentation various timer options are only supported
      by certain timer types. Add a post parse check to verify that the user
      didn't specify invalid options.
      
      Also fix the qemu command line parsing function to set correct default
      values for the kvmclock timer so that it passes the new check.
      8ffaa42d
    • P
      schema: Fix guest timer specification schema according to the docs · bbd392ff
      Peter Krempa 提交于
      According to the documentation describing various tunables for domain
      timers not all the fields are supported by all the driver types. Express
      these in the RNG:
      
      - rtc, platform: Only these support the "track" attribute.
      - tsc: only one to support "frequency" and "mode" attributes
      - hpet, pit: tickpolicy/catchup attribute/element
      - kvmclock: no extra attributes are supported
      
      Additionally the attributes of the <catchup> element for
      tickpolicy='catchup' are optional according to the parsing code. Express
      this in the XML and fix a spurious space added while formatting the
      <catchup> element and add tests for it.
      bbd392ff
  5. 07 2月, 2014 10 次提交
    • J
      virpci: Resolve coverity issues · b60644f3
      John Ferlan 提交于
      Coverity complains about "USE_AFTER_FREE" due to how virPCIDeviceSetStubDriver
      "could" return either -1, 0, or 1 from the VIR_STRDUP() and then possibly makes
      a call to virPCIDeviceDetach().
      
      The only way this could happen is if NULL were passed as the "driver" name
      and virStrdup() returned 0.  Since the calling functions check < 0 on the
      initial function call, the 0 possibility causes Coverity to complain.
      
      To fix this - enforce that the second parameter is not NULL using
      ATTRIBUTE_NONNULL(2) for the function prototype, then in virPCIDeviceDetach
      add an sa_assert(dev->stubDriver). This will result in Coverity not complaining
      any more.
      b60644f3
    • C
      Add glusterfs to VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE · f336b1cc
      Christophe Fergeau 提交于
      If it's not present in this list, we won't be able to get only
      glusterfs pools when using virConnectListAllStoragePools.
      f336b1cc
    • M
      qemu: keep pre-migration domain state after failed migration · 440a1aa5
      Martin Kletzander 提交于
      Couple of codepaths shared the same code which can be moved out to a
      function and on one of such places, qemuMigrationConfirmPhase(), the
      domain was resumed even if it wasn't running before the migration
      started.
      
      Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1057407Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
      440a1aa5
    • J
      libxl: remove unneeded locking of driver when restoring · 630b6456
      Jim Fehlig 提交于
      libxlDomainRestoreFlags acquires the driver lock while reading the
      domain config from the save file and adding it to
      libxlDriverPrivatePtr->domains.  But virDomainObjList provides
      self-locking APIs, so remove the needless driver locking.
      Signed-off-by: NJim Fehlig <jfehlig@suse.com>
      630b6456
    • J
      libxl: improve subprocess handling · 778067e1
      Jim Fehlig 提交于
      If available, let libxl handle reaping any children it creates by
      specifying libxl_sigchld_owner_libxl_always_selective_reap.  This
      feature was added to improve subprocess handling in libxl when used
      in an application that does not install a SIGCHLD handler like
      libvirt
      
      http://lists.xen.org/archives/html/xen-devel/2014-01/msg01555.html
      
      Prior to this patch, it is possible to hit asserts in libxl when
      reaping subprocesses, particularly during simultaneous operations
      on multiple domains.  With this patch, and the corresponding changes
      to libxl, I no longer see the asserts.  Note that the libxl changes
      will be included in Xen 4.4.0.  Previous Xen versions will be
      susceptible to hitting the asserts even with this patch applied to
      the libvirt libxl driver.
      Signed-off-by: NJim Fehlig <jfehlig@suse.com>
      778067e1
    • J
      libxl: handle domain shutdown events in a thread · 03b3f894
      Jim Fehlig 提交于
      Handling the domain shutdown event within the event handler seems
      a bit unfair to libxl's event machinery.  Domain "shutdown" could
      take considerable time.  E.g. if the shutdown reason is reboot,
      the domain must be reaped and then started again.
      
      Spawn a shutdown handler thread to do this work, allowing libxl's
      event machinery to go about its business.
      Signed-off-by: NJim Fehlig <jfehlig@suse.com>
      03b3f894
    • J
      libxl: remove list of timer registrations from libxlDomainObjPrivate · eaa8d9b2
      Jim Fehlig 提交于
      Due to some misunderstanding of requirements libxl places on timer
      handling, I introduced the half-brained idea of maintaining a list
      of timeouts that the driver could force to expire before freeing a
      libxlDomainObjPrivate (and hence libxl_ctx).  But testing all
      the latest versions of Xen supported by the libxl driver (4.2.3,
      4.3.1, 4.4.0 RC3), I see that libxl will handle this just fine and
      there is no need to force expiration behind libxl's back.  Indeed it
      may be harmful to do so.
      
      This patch removes the timer list, allowing libxl to handle cleanup
      of its timer registrations.
      Signed-off-by: NJim Fehlig <jfehlig@suse.com>
      eaa8d9b2
    • J
      libxl: fix leaking libxlDomainObjPrivate · cda52dbf
      Jim Fehlig 提交于
      When libxl registers an FD with the libxl driver, the refcnt of the
      associated libxlDomainObjPrivate object is incremented. The refcnt
      is decremented when libxl deregisters the FD.  But some FDs are only
      deregistered when their libxl ctx is freed, which unfortunately is
      done in the libxlDomainObjPrivate dispose function.  With references
      held by the FDs, libxlDomainObjPrivate is never disposed.
      
      I added the ref/unref in FD registration/deregistration when adding
      the same in timer registration/deregistration.  For timers, this
      is a simple approach to ensuring the libxlDomainObjPrivate is not
      disposed prior to their expirtation, which libxl guarantees will
      occur.  It is not needed for FDs, and only causes
      libxlDomainObjPrivate to leak.
      
      This patch removes the reference on libxlDomainObjPrivate for FD
      registrations, but retains them for timer registrations.  Tested on
      the latest releases of Xen supported by the libxl driver:  4.2.3,
      4.3.1, and 4.4.0 RC3.
      Signed-off-by: NJim Fehlig <jfehlig@suse.com>
      cda52dbf
    • M
      qemu_driver: Introduce <filesystem/> support in device attach/detach · 0778fc1a
      Matthieu Coudron 提交于
      This commit allows to attach/detach a <filesystem> device in qemu. For
      this purpose I'm introducing two new functions: virDomainFSInsert() and
      virDomainFSRemove() and adding necessary code in the qemu driver.  It
      compares filesystems based on their "destination" folder. So if two
      filesystems share the same destination, they are considered equal and
      the qemu driver would reject the insertion.
      Signed-off-by: NMatthieu Coudron <mattator@gmail.com>
      0778fc1a
    • M
      virDomainHostdev{Insert,Delete}: Replace VIR_REALLOC_N by VIR_{APPEND,DELETE}_ELEMENT · 8fc98ac8
      Matthieu Coudron 提交于
      With this change the code gets shorter and more readable.
      Signed-off-by: NMatthieu Coudron <mattator@gmail.com>
      8fc98ac8