1. 30 5月, 2013 4 次提交
  2. 29 5月, 2013 10 次提交
    • E
      build: fix build without libvirtd · fd8fa33b
      Eric Blake 提交于
      Building when configured --with-libvirtd=no fails with:
      
      In file included from ../src/qemu/qemu_command.h:30:0,
                       from testutilsqemu.h:4,
                       from networkxml2xmltest.c:14:
      ../src/qemu/qemu_conf.h:175:5: error: expected specifier-qualifier-list before 'virStateInhibitCallback'
      
      * src/libvirt_internal.h (virStateInhibitCallback): Move outside
      of conditional.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      fd8fa33b
    • E
      build: fix build with newer gnutls · 7d21d6b6
      Eric Blake 提交于
      Building with gnutls 3.2.0 (such as shipped with current cygwin) fails
      with:
      
      rpc/virnettlscontext.c: In function 'virNetTLSSessionGetKeySize':
      rpc/virnettlscontext.c:1358:5: error: implicit declaration of function 'gnutls_cipher_get_key_size' [-Wimplicit-function-declaration]
      
      Yeah, it's stupid that gnutls broke API by moving their declaration
      into a new header without including that header from the old one,
      but it's easy enough to work around, all without breaking on gnutls
      1.4.1 (hello RHEL 5) that lacked the new header.
      
      * configure.ac (gnutls): Check for <gnutls/crypto.h>.
      * src/rpc/virnettlscontext.c (includes): Include additional header.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      7d21d6b6
    • O
      storage_conf: Use uid_t/gid_t instead of int to cast the value · 6c89768d
      Osier Yang 提交于
      And error out if the casted value is not same with the original
      one, which prevents the bug on platform(s) where uid_t/gid_t
      has different size with long.
      6c89768d
    • O
      storage_conf: Improve error messages · ec2b81c6
      Osier Yang 提交于
      virStoragePoolDefParseSource:
        * Better error message
      
      virStoragePoolObjLoad:
        * Break the line line
      ec2b81c6
    • O
      storage_conf: Use NULLSTR instead · 1c6fe3fa
      Osier Yang 提交于
      1c6fe3fa
    • O
      storage_conf: Improve the memory deallocation of virStorageVolDefParseXML · 107130cc
      Osier Yang 提交于
      Changes:
        * Add a new goto label "error"
        * Free the strings at "cleanup"
        * Remove the unnecessary frees
      107130cc
    • O
      storage_conf: Improve the memory deallocation of pool def parsing · 6afdfc8e
      Osier Yang 提交于
      Changes:
          * Free all the strings at "cleanup", instead of freeing them
            in the middle
          * Remove xmlFree
          * s/tmppath/target_path/, to make it more sensible
          * Add new goto label "error"
      6afdfc8e
    • M
      qemuOpenVhostNet: Decrease vhostfdSize on open failure · d10cfaec
      Michal Privoznik 提交于
      Currently, if there's an error opening /dev/vhost-net (e.g. because
      it doesn't exist) but it's not required we proceed with vhostfd array
      filled with -1 and vhostfdSize unchanged. Later, when constructing
      the qemu command line only non-negative items within vhostfd array
      are taken into account. This means, vhostfdSize may be greater than
      the actual count of non-negative items in vhostfd array. This results
      in improper command line arguments being generated, e.g.:
      
      -netdev tap,fd=21,id=hostnet0,vhost=on,vhostfd=(null)
      d10cfaec
    • E
      build: fix build with older gcc · f6817c70
      Eric Blake 提交于
      gcc 4.1.2 (hello, RHEL 5!) fails to build on 32-bit platforms with:
      
      conf/domain_conf.c: In function 'virDomainDefParseXML':
      conf/domain_conf.c:10581: warning: integer constant is too large for 'long' type
      
      Problem introduced in commit f8e3221f.
      
      * src/conf/domain_conf.c (virDomainDefParseXML): Mark large constants.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      f6817c70
    • E
      build: drop unused variable · 327d4db8
      Eric Blake 提交于
      Compilation for mingw failed:
      
      ../../src/util/virutil.c: In function 'virGetWin32DirectoryRoot':
      ../../src/util/virutil.c:1094:9: error: unused variable 'ret' [-Werror=unused-variable]
      
      * src/util/virutil.c (virGetWin32DirectoryRoot): Silence compiler
      warning.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      327d4db8
  3. 28 5月, 2013 5 次提交
    • E
      syntax: fix broken error message in previous patch · 0c8926da
      Eric Blake 提交于
      Osier Yang pointed out that I introduced a syntax error in my
      syntax check (I really shouldn't make last-minute changes without
      testing them....).
      
      /bin/sh: -c: line 2: syntax error near unexpected token `;'
      /bin/sh: -c: line 2: `  { echo 'maint.mk: incorrect whitespace, see HACKING for rules' 2>&; \'
      make: *** [bracket-spacing-check] Error 1
      
      * cfg.mk (bracket-spacing-check): Fix copy-and-paste error.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      0c8926da
    • C
      qemu: Don't report error on successful media eject · 406d8a98
      Cole Robinson 提交于
      If we are just ejecting media, ret == -1 even after the retry loop
      determines that the tray is open, as requested. This means media
      disconnect always report's error.
      
      Fix it, and fix some other mini issues:
      
      - Don't overwrite the 'eject' error message if the retry loop fails
      - Move the retries decrement inside the loop, otherwise the final loop
        might succeed, yet retries == 0 and we will raise error
      - Setting ret = -1 in the disk->src check is unneeded
      - Fix comment typos
      
      cc: mprivozn@redhat.com
      406d8a98
    • E
      syntax-check: mandate space after mid-line semicolon · 134e685b
      Eric Blake 提交于
      Enforce the style cleanup in the previous patch.
      
      * build-aux/bracket-spacing.pl: Enforce trailing spacing.
      * cfg.mk (bracket-spacing-check): Tweak error wording.
      * docs/hacking.html.in: Document the rule.
      * HACKING: Regenerate.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      134e685b
    • E
      syntax: prefer space after semicolon in for loop · 146ba114
      Eric Blake 提交于
      I noticed several unusual spacings in for loops, and decided to
      fix them up.  See the next commit for the syntax check that found
      all of these.
      
      * examples/domsuspend/suspend.c (main): Fix spacing.
      * python/libvirt-override.c: Likewise.
      * src/conf/interface_conf.c: Likewise.
      * src/security/virt-aa-helper.c: Likewise.
      * src/util/virconf.c: Likewise.
      * src/util/virhook.c: Likewise.
      * src/util/virlog.c: Likewise.
      * src/util/virsocketaddr.c: Likewise.
      * src/util/virsysinfo.c: Likewise.
      * src/util/viruuid.c: Likewise.
      * src/vbox/vbox_tmpl.c: Likewise.
      * src/xen/xen_hypervisor.c: Likewise.
      * tools/virsh-domain-monitor.c (vshDomainStateToString): Drop
      default case, to let compiler check us.
      * tools/virsh-domain.c (vshDomainVcpuStateToString): Likewise.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      146ba114
    • Y
      util: fix the VIR_STRDUP when src is NULL · 2da3bc64
      yangdongsheng 提交于
      When src is NULL, VIR_STRDUP will return 0 directly.
      This patch will set dest to NULL before VIR_STRDUP return.
      
      Example:
      [root@yds-pc libvirt]# virsh
      Welcome to virsh, the virtualization interactive terminal.
      
      Type: 'help' for help with commands
      'quit' to quit
      
      virsh # connect
      error: Failed to connect to the hypervisor
      error: internal error Unable to parse URI �N�*
      Signed-off-by: Nyangdongsheng <yangds.fnst@cn.fujitsu.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      2da3bc64
  4. 27 5月, 2013 1 次提交
  5. 25 5月, 2013 3 次提交
    • S
      qemu: save domain state to XML after reboot · 2697c8a1
      Sergey Fionov 提交于
      Currently qemuDomainReboot() does reboot in two phases:
      qemuMonitorSystemPowerdown() and qemuProcessFakeReboot().
      
      qemuMonitorSystemPowerdown() shutdowns the domain and saves domain
      state/reason as VIR_DOMAIN_SHUTDOWN_UNKNOWN.
      
      qemuProcessFakeReboot() sets domain state/reason to
      VIR_DOMAIN_RESUMED_UNPAUSED but does not save domain state changes.
      
      Subsequent restart of libvirtd leads to restoring domain state/reason to
      saved that is VIR_DOMAIN_SHUTDOWN_UNKNOWN and to automatic shutdown of
      the domain. This commit adds virDomainSaveStatus() into
      qemuProcessFakeReboot() to avoid unexpected shutdowns.
      2697c8a1
    • M
      esx: Fix dynamic VI object type detection · befc36a8
      Matthias Bolte 提交于
      VI objects support inheritance with subtype polymorphism. For example the
      FileInfo object type is extended by FloppyImageFileInfo, FolderFileInfo
      etc. Then SearchDatastore_Task returns an array of FileInfo objects and
      depending on the represented file the FileInfo is actually a FolderFileInfo
      or FloppyImageFileInfo etc. The actual type information is stored as XML
      attribute that allows clients such as libvirt to distinguish between the
      actual types. esxVI_GetActualObjectType is used to extract the actual type.
      
      I assumed that this mechanism would be used for all VI object types that
      have subtypes. But this is not the case. It seems only to be used for types
      that are actually used as generic base type such as FileInfo. But it is not
      used for types that got extended later such as ElementDescription that was
      extended by ExtendedElementDescription (added in vSphere API 4.0) or that
      are not meant to be used with subtype polymorphism.
      
      This breaks the deserialization of types that contain ElementDescription
      properties such as PerfCounterInfo or ChoiceOption, because the code
      expects an ElementDescription object to have an XML attribute named type
      that is not present, since ExtendedElementDescription was added to the
      esx_vi_generator.input in commit 60f0f55e.
      This in turn break virtual machine question handling and auto answering.
      
      Fix this by using the base type if no XML type attribute is present.
      befc36a8
    • V
      spec: Build vbox packages only for x86 architectures · 831909a9
      Viktor Mihajlovski 提交于
      Commit 6ab6bc19 has introduced separate
      daemon/driver packages for vbox. These should only be built for x86
      architectures which is done hereby.
      Signed-off-by: NViktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
      831909a9
  6. 24 5月, 2013 17 次提交