1. 04 12月, 2014 5 次提交
    • P
      cpu: fix possible crash in getModels · 4a4cff58
      Pavel Hrdina 提交于
      Commit 86a15a25 introduced a new cpu driver API 'getModels'. Public API
      allow you to pass NULL for models to get only number of existing models.
      However the new code will crash with segfault so we have to count with
      the possibility that the user wants only the number.
      
      There is also difference in order of the models gathered by this new API
      as the old approach was inserting the elements to the end of the array
      so we should use 'VIR_APPEND_ELEMENT'.
      Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
      4a4cff58
    • P
      qemu: driver: Reload snapshots and managedsaves prior to reconnecting · 48a05560
      Peter Krempa 提交于
      Reconnect to the VM is a possibly long-running job spawned in a separate
      thread. We should reload the snapshot defs and managedsave state prior
      to spawning the thread to avoid blocking of the daemon startup which
      would serialize on the VM lock.
      
      Also the reloading code would violate the domain job held while
      reconnecting as the loader functions don't create jobs.
      48a05560
    • P
      leaseshelper: Fix incorrect alignment of a switch case · b17c0f0e
      Peter Krempa 提交于
      Introduced in ca6dbdd0
      b17c0f0e
    • P
      leaseshelper: Skip entries missing expiry time on INIT action · 3be8c1f0
      Peter Krempa 提交于
      Coverity pointed out that in other places we always check the return
      value from virJSONValueObjectGetNumberLong() but not in the new addition
      in leaseshelper. To solve the issue and also be more robust in case
      somebody would corrupt the file, skip outputting of the lease entry in
      case the expiry time is missing.
      3be8c1f0
    • L
      storage: fix crash caused by no check return before set close · 87b9437f
      Luyao Huang 提交于
      https://bugzilla.redhat.com/show_bug.cgi?id=1087104#c5
      
      When trying to use an invalid offset to virStorageVolUpload(), libvirt
      fails in virFDStreamOpenFileInternal(), although it seems libvirt does
      not check the return in storageVolUpload(), and calls
      virFDStreamSetInternalCloseCb() right after.  But stream doesn't have a
      privateData (is NULL) yet, and the daemon crashes then.
      
      0  0x00007f09429a9c10 in pthread_mutex_lock () from /lib64/libpthread.so.0
      1  0x00007f094514dbf5 in virMutexLock (m=<optimized out>) at util/virthread.c:88
      2  0x00007f09451cb211 in virFDStreamSetInternalCloseCb at fdstream.c:795
      3  0x00007f092ff2c9eb in storageVolUpload at storage/storage_driver.c:2098
      4  0x00007f09451f46e0 in virStorageVolUpload at libvirt.c:14000
      5  0x00007f0945c78fa1 in remoteDispatchStorageVolUpload at remote_dispatch.h:14339
      6  remoteDispatchStorageVolUploadHelper at remote_dispatch.h:14309
      7  0x00007f094524a192 in virNetServerProgramDispatchCall at rpc/virnetserverprogram.c:437
      Signed-off-by: NLuyao Huang <lhuang@redhat.com>
      87b9437f
  2. 03 12月, 2014 20 次提交
    • S
      virsh: vol-upload disallow negative offset · cd53d947
      Shanzhi Yu 提交于
      Commit 570d0f63 describes disabling negative offset usage for
      vol-upload/download (e.g. cmdVolDownload and cmdVolUpload; however,
      the change was only made to cmdVolDownload. There was no change to
      cmdVolUpload.  This patch adds the same checks for vol-upload.
      
      Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1087104Signed-off-by: NShanzhi Yu <shyu@redhat.com>
      cd53d947
    • P
      network: dnsmasq: Don't format lease file path · 42140680
      Peter Krempa 提交于
      Now that we don't use the leases file at all for leases just don't
      format it into the config and use the leaseshelper to do all the
      lifting.
      42140680
    • P
      leaseshelper: Refactor control flow · ca6dbdd0
      Peter Krempa 提交于
      Untangle a few conditions into a case statement and improve reporting of
      invaid commands.
      ca6dbdd0
    • N
      leaseshelper: improvements to support all events · 0f87054b
      Nehal J Wani 提交于
      This patch enables the helper program to detect event(s) triggered when
      there is a change in lease length or expiry and client-id. This
      transfers complete control of leases database to libvirt and obsoletes
      use of the lease database file (<network-name>.leases). That file will
      not be created, read, or written.  This is achieved by adding the option
      --leasefile-ro to dnsmasq and passing a custom env var to leaseshelper,
      which helps us map events related to leases with their corresponding
      network bridges, no matter what the event be.
      
      Also, this requires the addition of a new non-lease entry in our custom
      lease database: "server-duid". It is required to identify a DHCPv6
      server.
      
      Now that dnsmasq doesn't maintain its own leases database, it relies on
      our helper program to tell it about previous leases and server duid.
      Thus, this patch makes our leases program honor an extra action: "init",
      in which it sends the known info in a particular format to dnsmasq
      by printing it to stdout.
      
      The drawback of this change is that upgrade to this new approach does
      not transfer the existing leases for the network if the leaseshelper
      wasn't already used.
      0f87054b
    • D
      cpu-driver: Fix the cross driver function call · 86a15a25
      Daniel Hansel 提交于
      For Intel and PowerPC the implementation is calling a cpu driver
      function across driver layers (i.e. from qemu driver directly to cpu
      driver).
      The correct behavior is to use libvirt API functionality to perform such
      a inter-driver call.
      
      This patch introduces a new cpu driver API function getModels() to
      retrieve the cpu models. The currect implementation to process the
      cpu_map XML content is transferred to the INTEL and PowerPC cpu driver
      specific API functions.
      Additionally processing the cpu_map XML file is not safe due to the fact
      that the cpu map does not exist for all architectures. Therefore it is
      better to encapsulate the processing in the architecture specific cpu
      drivers.
      Signed-off-by: NDaniel Hansel <daniel.hansel@linux.vnet.ibm.com>
      Reviewed-by: NBoris Fiuczynski <fiuczy@linux.vnet.ibm.com>
      Reviewed-by: NViktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
      86a15a25
    • M
      qemu_migration: Precreate missing storage · cf54c606
      Michal Privoznik 提交于
      Based on previous commit, we can now precreate missing volumes. While
      digging out the functionality from storage driver would be nicer, if
      you've seen the code it's nearly impossible. So I'm going from the
      other end:
      
      1) For given disk target, disk path is looked up.
      2) For the disk path, storage pool is looked up, a volume XML is
      constructed and then passed to virStorageVolCreateXML() which has all
      the knowledge how to create raw images, (encrypted) qcow(2) images,
      etc.
      
      One of the advantages of this approach is, we don't have to care about
      image conversion - qemu does that for us. So for instance, users can
      transform qcow2 into raw on migration (if the correct XML is passed to
      the migration API).
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      cf54c606
    • M
      qemu_migration: Send disk sizes to the other side · e1466dc7
      Michal Privoznik 提交于
      Up 'til now, users need to precreate non-shared storage on migration
      themselves. This is not very friendly requirement and we should do
      something about it. In this patch, the migration cookie is extended,
      so that <nbd/> section does not only contain NBD port, but info on
      disks being migrated. This patch sends a list of pairs of:
      
          <disk target; disk size>
      
      to the destination. The actual storage allocation is left for next
      commit.
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      e1466dc7
    • M
      qemuMonitorJSONBlockStatsUpdateCapacity: Don't skip disks · a714533b
      Michal Privoznik 提交于
      The function queries the block devices visible to qemu
      ('query-block') and parses the qemu's output. The info is
      returned in a hash table which is expected to be pre-filled by
      qemuMonitorJSONGetAllBlockStatsInfo(). However, in the next patch
      we are not going to call the latter function at all, so we should
      make the former function add devices into the hash table if not
      found there.
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      a714533b
    • M
      storage: Introduce storagePoolLookupByTargetPath · 5ab746b8
      Michal Privoznik 提交于
      While this could be exposed as a public API, it's not done yet as
      there's no demand for that yet. Anyway, this is just preparing
      the environment for easier volume creation on the destination.
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      5ab746b8
    • J
      Replace virDomainSnapshotFree with virObjectUnref · c8230c4d
      John Ferlan 提交于
      Since virDomainSnapshotFree will call virObjectUnref anyway, let's just use
      that directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      c8230c4d
    • J
      Replace virInterfaceFree with virObjectUnref · c56a591a
      John Ferlan 提交于
      Since virInterfaceFree will call virObjectUnref anyway, let's just use that
      directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      c56a591a
    • J
      Replace virNWFilterFree with virObjectUnref · 7b4938f5
      John Ferlan 提交于
      Since virNWFilterFree will call virObjectUnref anyway, let's just use that
      directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      7b4938f5
    • J
      Replace virSecretFree with virObjectUnref · a0b13d35
      John Ferlan 提交于
      Since virSecretFree will call virObjectUnref anyway, let's just use that
      directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      a0b13d35
    • J
      Replace virStreamFree with virObjectUnref · 1725a468
      John Ferlan 提交于
      Since virStreamFree will call virObjectUnref anyway, let's just use that
      directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      1725a468
    • J
      Replace virStoragePoolFree with virObjectUnref · adbbff5f
      John Ferlan 提交于
      Since virStoragePoolFree will call virObjectUnref anyway, let's just use that
      directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      adbbff5f
    • J
      Replace virStorageVolFree with virObjectUnref · d1219054
      John Ferlan 提交于
      Since virStorageVolFree will call virObjectUnref anyway, let's just use that
      directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      d1219054
    • J
      Replace virNodeDeviceFree with virObjectUnref · e3b456de
      John Ferlan 提交于
      Since virNodeDeviceFree will call virObjectUnref anyway, let's just use that
      directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      e3b456de
    • J
      Replace virNetworkFree with virObjectUnref · 121c09a9
      John Ferlan 提交于
      Since virNetworkFree will call virObjectUnref anyway, let's just use that
      directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      121c09a9
    • J
      Replace virDomainFree with virObjectUnref · 8fb3aee2
      John Ferlan 提交于
      Since virDomainFree will call virObjectUnref anyway, let's just use that
      directly so as to avoid the possibility that we inadvertently clear out
      a pending error message when using the public API.
      8fb3aee2
    • J
      rpc: Replace virXXXFree with virObjectUnref · 1695f4ee
      John Ferlan 提交于
      Modify the various virXXXFree calls to only call virObjectUnref. Calling
      the public API will reset the last error thus clearing out a pending error.
      1695f4ee
  3. 02 12月, 2014 14 次提交
    • D
      parallels: fix compilation of parallels_storage.c · 572d0508
      Dmitry Guryanov 提交于
      virConnect.privateData is void *, so we can't access
      fields of parallelsConn, pointer to which is stored in
      virConnect.privateData. So replace all occurences of
      conn->privateData->storageState with privconn->storageState.
      Signed-off-by: NDmitry Guryanov <dguryanov@parallels.com>
      572d0508
    • J
      Generate a MAC when loading a config instead of package update · a47ae7c0
      Ján Tomko 提交于
      Partially reverts commit 5754dbd5.
      
      The code in the specfile adds a MAC address to every <bridge>,
      even for <forward mode='bridge'> for which we don't support
      changing MAC addresses.
      
      Remove it completely. For new networks, we have been adding
      MAC addresses on definition/creation since the commit mentioned above.
      For existing networks (pre-0.9.0), the MAC is added by this commit.
      
      https://bugzilla.redhat.com/show_bug.cgi?id=1156367
      a47ae7c0
    • J
      Silently ignore MAC in NetworkLoadConfig · c9c7a2bd
      Ján Tomko 提交于
      Libvirt's RPMs have been adding it to networks which don't support it.
      
      https://bugzilla.redhat.com/show_bug.cgi?id=1156367
      c9c7a2bd
    • M
      libvirt.c: Move virDomainGetFSInfo to libvirt-domain.c · 2cc8c44e
      Michal Privoznik 提交于
      Since our big split of libvirt.c there are only a few functions
      living there. The majority was moved to corresponding subfile,
      e.g. domain functions were moved to libvirt-domain.c. However,
      the patches for virDomainGetFSInfo() and virDomainFSInfoFree()
      introduction were posted prior the big split and merged after.
      This resulted in two domain functions landing in wrong file.
      Move them to the correct one.
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      2cc8c44e
    • P
      nwfilter: fix crash when adding non-existing nwfilter · d98ad8dd
      Pavel Hrdina 提交于
      Adding non-existing nwfilter to a network interface device without any
      nwfilter specified will crash libvirt daemon with segfault. The reason is
      that the nwfilter is not found an libvirt will try to restore old
      nwfilter configuration but there is no nwfilter specified.
      Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
      d98ad8dd
    • W
      conf: fix a comment typo in virDomainVideoDefaultRAM · 82bde426
      Wang Rui 提交于
      Signed-off-by: NWang Rui <moon.wangrui@huawei.com>
      82bde426
    • L
      conf: replace call to virNetworkFree() with virObjectUnref() · c2d5bca1
      Laine Stump 提交于
      The function virNetworkObjListExport() in network_conf.c had a call to
      the public API virNetworkFree() which was causing a link error:
      
      CCLD     libvirt_driver_vbox_network_impl.la
       ./.libs/libvirt_conf.a(libvirt_conf_la-network_conf.o): In function `virNetworkObjListExport':
      /home/laine/devel/libvirt/src/conf/network_conf.c:4496: undefined reference to `virNetworkFree'
      
      This would happen when I added
      
        #include "network_conf.h"
      
      into domain_conf.h, then attempted to call a new function from that
      file (and enum converter, similar to virNetworkForwardTypeToString())
      
      In the end, virNetworkFree() ends up just calling virObjectUnref(obj)
      anyway (after clearing all pending errors, which we probably *don't*
      want to do in the cleanup of a utility function), so this is likely
      more correct than the original code as well.
      c2d5bca1
    • M
      build, docs: Let make see the dependencies for html/*.html · b79d195b
      Martin Kletzander 提交于
      Make was not able to realize the dependencies for html/*.html files when
      running 'make -j9 dist'.  All the files are generated together with
      html/index.html, so simply separating them into another variable and
      adding one block into the dependency chain solves the issue.
      Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
      b79d195b
    • M
      docs: Correct invalid hyperlinks · af1b89d1
      Martin Kletzander 提交于
      Since libvirt.h was split into multiple files and similarly
      docs/libvirt-libvirt.html, docs/hvsupport.html have bad hyperlinks.  The
      same happens for all the html.in files that used <code class='docref'>
      tag, because page.xsl has no idea where to point the link that's found.
      Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
      af1b89d1
    • E
      Fix race condition in qemuGetProcessInfo · ff018e68
      Eduardo Costa 提交于
      There is a race condition between the fopen and fscanf calls
      in qemuGetProcessInfo. If fopen succeeds, there is a small
      possibility that the file no longer exists before reading from it.
      Now, if either fopen or fscanf calls fail, the function will behave
      just as only fopen had failed.
      
      Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1169055Signed-off-by: NEric Blake <eblake@redhat.com>
      ff018e68
    • J
      libxl: Resolve Coverity CHECKED_RETURN · 5f1d3c6c
      John Ferlan 提交于
      Commit id 'cb88d433' refactored the calling sequence to use a thread;
      however, in doing so "lost" the check for if virNetSocketAccept returns
      failure.  Since other code makes that check, Coverity complains. Although
      a false positive, adding back the failure check pacifies Coverity
      5f1d3c6c
    • J
      domain_conf: Resolve Coverity CHECKED_RETURN · 025dc403
      John Ferlan 提交于
      Commit id '0d36a5d0' modified the code slightly, but removed the
      return value check thus causing Coverity to complain that this call
      was the only one where the return value wasn't checked. Since nothing
      was done previously if there was a failure, just use ignore_value here
      to pacify Coverity
      025dc403
    • J
      virhook: Resolve Coverity NULL_RETURNS · f7212f6b
      John Ferlan 提交于
      Coverity complains that many other callers to return err from
      virGetLastError() will check if err is not NULL before dereferencing
      it.  Just do the same here for safety.
      f7212f6b
    • J
      hotplug: Resolve Coverity FORWARD_NULL · 59802f23
      John Ferlan 提交于
      Coverity complained that because the cfg->macFilter call checked
      net->ifname != NULL before calling ebtablesRemoveForwardAllowIn, then
      the virNetDevOpenvswitchRemovePort call should have the same check.
      
      However, if I move the ebtables call prior to the check for TYPE_DIRECT
      (where there is a VIR_FREE(net->ifname)), then it seems Coverity is
      happy.  Since firewall info is tacked on last during setup, removing
      it in the opposite order of initialization seems to be natural anyway
      59802f23
  4. 01 12月, 2014 1 次提交
    • J
      storage: Add mixed fc_host/scsi_host duplicate adapter source checks · b09ff138
      John Ferlan 提交于
      https://bugzilla.redhat.com/show_bug.cgi?id=1159180
      
      The virStoragePoolSourceFindDuplicate only checks the incoming definition
      against the same type of pool as the def; however, for "scsi_host" and
      "fc_host" adapter pools, it's possible that either some pool "scsi_host"
      adapter definition is already using the scsi_hostN that the "fc_host"
      adapter definition wants to use or some "fc_host" pool adapter definition
      is using a vHBA scsi_hostN or parent scsi_hostN that an incoming "scsi_host"
      definition is trying to use.
      
      This patch adds the mismatched type checks and adds extraneous comments
      to describe what each check is determining.
      
      This patch also modifies the documentation to be describe what scsi_hostN
      devices a "scsi_host" source adapter should use and which to avoid. It also
      updates the parent definition to specifically call out that for mixed
      environments it's better to define which parent to use so that the duplicate
      pool checks can be done properly.
      b09ff138