- Devel - libvirt List Archives

[libvirt] Callback and stream questions
by arnaud.champion＠devatom.fr 06 Aug '10

06 Aug '10

Hi, I would know if there is some callbacks for network adding/change/remove and for storage pool add/change/remove, I haven't seen these kind of callback in the API documentation. Also, I don't understand the use of the virStream... functions (what is it used for ?) Thanks Arnaud Champion

2 1

[libvirt] [PATCH 1/3] Attempt to load tun module on tap add error
by Doug Goldstein 06 Aug '10

06 Aug '10

When attempting to add a tap device, the error message is fairly cryptic as to what really happened. If possible, try to load the tun module and then try again to add the tap device again to improve the user experience. Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/util/bridge.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/util/bridge.c b/src/util/bridge.c index 7d0caae..ca4bcc9 100644 --- a/src/util/bridge.c +++ b/src/util/bridge.c @@ -486,12 +486,29 @@ brAddTap(brControl *ctl, { int fd; struct ifreq ifr; + const char * const argv[] = { "modprobe", "tun", NULL }; + int err, exitstatus = 0; if (!ctl || !ctl->fd || !bridge || !ifname) return EINVAL; - if ((fd = open("/dev/net/tun", O_RDWR)) < 0) - return errno; + if ((fd = open("/dev/net/tun", O_RDWR)) < 0) { + err = errno; + + /* If the tun device was non-existent, lets try to load the module */ + if (err == ENOENT) { + if (virRun(argv, &exitstatus) < 0) { + return ENOENT; + } + + /* Now lets try to open the tun device again */ + if ((fd = open("/dev/net/tun", O_RDWR)) < 0) { + return errno; + } + } else { + return err; + } + } memset(&ifr, 0, sizeof(ifr)); -- 1.7.2

3 2

[libvirt] [PATCH 3/3] Fix return value usage
by Doug Goldstein 06 Aug '10

06 Aug '10

Fix the error checking to use the return value from brAddTap() instead of checking the current errno value which might have been changed by clean up calls inside of brAddTap(). Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e92021a..7c0e354 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1689,7 +1689,7 @@ qemudNetworkIfaceConnect(virConnectPtr conn, tapmac, vnet_hdr, &tapfd))) { - if (errno == ENOTSUP) { + if (err == ENOTSUP) { /* In this particular case, give a better diagnostic. */ qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to add tap interface to bridge. " -- 1.7.2

3 2

[libvirt] [PATCH 2/3] Add a detailed message when tap device add fails
by Doug Goldstein 05 Aug '10

05 Aug '10

Added a more detailed error message when adding a tap devices fails and the kernel is missing tun support. Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- src/qemu/qemu_conf.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2ca3350..e92021a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1694,6 +1694,13 @@ qemudNetworkIfaceConnect(virConnectPtr conn, qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to add tap interface to bridge. " "%s is not a bridge device"), brname); + } else if (err == ENOENT) { + /* When the tun drive is missing, give a better message. */ + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to add tap interface to bridge. " + "Your kernel is missing the 'tun' module or " + "CONFIG_TUN or you need to add the " + "/dev/net/tun device node.")); } else if (template_ifname) { virReportSystemError(err, _("Failed to add tap interface to bridge '%s'"), -- 1.7.2

2 1

[libvirt] [PATCH] build: rerun bootstrap if po/Makevars got nuked
by Eric Blake 05 Aug '10

05 Aug '10

There has been a frequent complaint of: make[2]: Entering directory `/home/remote/eblake/libvirt/po' make[2]: *** No rule to make target `/config.status', needed by `Makefile'. Stop. It happens after nuking and regenerating the po directory, which is a common action after running anything like 'make dist' or 'make rpm' that dirties all the .po files. Teach autogen.sh that it must regenerate po/Makevars to avoid the missing variable declaration, and teach cfg.mk to recognize that a nuked po directory is cause to rerun autogen.sh. * cfg.mk (_update_required): Check for po/Makevars. * autogen.sh (bootstrap): Run bootstrap if it got lost. Diagnosed by Justin Clift. --- Tested by 'git clean -x -f po && make'. A bit drastic (I prefer 'git checkout po' as the fastest way to undo local changes to the po directory caused by 'make dist', since that won't erase po/Makevars), but using that sledgehammer to clean po/ proves that this patch works. This should even work in a VPATH build :) autogen.sh | 8 ++++++-- cfg.mk | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 2f5b42d..c0a1c4a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -74,10 +74,14 @@ bootstrap_hash() # Ensure that whenever we pull in a gnulib update or otherwise change to a # different version (i.e., when switching branches), we also rerun ./bootstrap. +# Also, running 'make rpm' tends to litter the po/ directory, and some people +# like to run 'git clean -x -f po' to fix it; but only ./bootstrap regenerates +# the required file po/Makevars. curr_status=.git-module-status t=$(bootstrap_hash; git diff .gnulib) -if test "$t" = "$(cat $curr_status 2>/dev/null)"; then - : # good, it's up to date, all we need is autoreconf +if test "$t" = "$(cat $curr_status 2>/dev/null)" \ + && test -f "$THEDIR/po/Makevars"; then + # good, it's up to date, all we need is autoreconf autoreconf -if else echo running bootstrap... diff --git a/cfg.mk b/cfg.mk index e12265e..7226828 100644 --- a/cfg.mk +++ b/cfg.mk @@ -459,6 +459,7 @@ ifeq (0,$(MAKELEVEL)) # b653eda3ac4864de205419d9f41eec267cb89eeb _submodule_hash = sed 's/^[ +-]//;s/ .*//' _update_required := $(shell \ + test -f po/Makevars || { echo 1; exit; }; \ cd '$(srcdir)'; \ actual=$$(git submodule status | $(_submodule_hash); \ git hash-object bootstrap.conf; \ -- 1.7.2

2 2

[libvirt] NUMA cell?
by adrian wyssen 05 Aug '10

05 Aug '10

Hi, I have a question regarding the documentation of libvirt. There is a structure called 'virNodeInfo' and in the doc, you speak about NUMA cell. I was wondering what that is. And what do you understand by 'the number of threads per core'? Thank you for a quick response, since I need to write an explanation in a report until this evening. Have a good day!

2 1

[libvirt] Libvirt synchronous hooks
by Radek Hladik 05 Aug '10

05 Aug '10

I am trying Libvirt synchronous hooks and I would like to ask a question. I would like to use the machine start (qemu+kvm) hook to set up the storage for the machine. I already mentioned my setup in this mailing list but for now it is only important that VM storage is a md raid constructed from iSCSI disks. The VM's config is using simple file device: <disk type='file' device='disk'> <driver name='qemu' type=''/> <source file='/dev/disk/by-id/md-uuid-e464a51e:f61e98b4:bfe78010:bc810f04'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </disk> Stopping the array from stop hook works perfectly however it seems that on the startup the storage is checked before the hook is executed. At least I do get errors that the storage file (/dev/disk/by-id/md-uuid-....) does not exist and my hook is not called. I would say that I am hooking on wrong places that I should hook on storage startup/shutdown but as far as I know there are no hooks for storage drivers. Are there any plans in this area? Or is there any other way how to do it that I do not see? Radek

3 2

[libvirt] [PATCH v4 0/8]: Add arbitrary qemu command-line and monitor commands
by Chris Lalancette 05 Aug '10

05 Aug '10

As we discussed previously, here is the patch series to add the ability to specify arbitrary qemu command-line parameters and environment variables, and also give arbitrary monitor commands to a guest. Because these extra arguments have a good shot at confusing libvirt, the use of them is not supported, but left available for advanced users and developers. They are also in a separate library and have a separate on-the-wire protocol. There is one bug left that I have not yet been able to fix. Because of the complicated way that virsh parses command-line arguments, it is not possible to pass through spaces and quotes when using the qemu-monitor-command. Unfortunately, the qemu monitor commands (and in particular when using QMP) depend heavily on quoting and spacing, so using virsh to send through command-lines is difficult. I'll have to think about how to better resolve this issue, but it should not hold up the rest of the series. I will point out one particular patch that could use some careful review, namely PATCH 6/8. In there, I change the remote_message_hdr to use an int proc instead of a enum remote_procedure proc. Now, as far as I can tell the two sizes should be the same, so the wire protocol should be the same. Indeed, testing seems to show that older virsh can talk just fine to a libvirtd with these patches applied. However, the regenerated remote_protocol.c file for parsing remote_message_header has some strange bits in it that I don't quite understand. I'm hoping someone else can look at it and confirm that it is OK. Thanks to Dan Berrange and Eric Blake for their reviews already, and to DV for the Relax NG schema changes. Changes since v3 are listed in the individual patches.

7 26

[libvirt] [PATCH] Fix a memory leak in the qemudBuildCommandLine.
by Chris Lalancette 05 Aug '10

05 Aug '10

ADD_ARG_LIT should only be used for literal arguments, since it duplicates the memory. Since virBufferContentAndReset is already allocating memory, we should only use ADD_ARG. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 172986e..d0655fd 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -4110,7 +4110,7 @@ int qemudBuildCommandLine(virConnectPtr conn, goto error; } - ADD_ARG_LIT(virBufferContentAndReset(&boot_buf)); + ADD_ARG(virBufferContentAndReset(&boot_buf)); } if (def->os.kernel) { -- 1.7.1.1

3 4

Re: [libvirt] [PATCH] Do not use boot=on on IDE device
by Antoine Mercadal 04 Aug '10

04 Aug '10

Hello, Just a feedback about this patch https://www.redhat.com/archives/libvir-list/2010-July/msg00691.html submitted by Daniel Veillard : It works like a charm. Before applying it, I wasn't able to start some windows XP guest on KVM using IDE drives. Cheers -- Antoine Mercadal (+33) 06 23 00 84 04 « Le mot liberté n'admet, par définition, aucune restriction. »

2 1

[libvirt] Release of libvirt-0.8.3
by Daniel Veillard 04 Aug '10

04 Aug '10

Nearly on time :-) It's available as usual from: ftp://libvirt.org/libvirt/ That's mostly a bug fix release exept for ESX 4.1 and vSphere support and the new APIs to allow easier hacking at the QEmu level. Features: - esx: Support vSphere 4.1 (Matthias Bolte) - Qemu arbitrary monitor commands. (Chris Lalancette) - Qemu Monitor API entry point. (Chris Lalancette) Documentation: - docs: Link wiki FAQ to main page (Cole Robinson) - Document the memory balloon device (Daniel P. Berrange) - man pages: update authors and copyright notice for libvirtd and virsh (Justin Clift) - Add openauth example to demonstrate a custom auth callback (Matthias Bolte) - docs: fix so generated .html files are removed with make clean (Justin Clift) - virsh: Fix man page syntax (Jiri Denemark) - html docs: added firewall explanation page by daniel berrange (Justin Clift) - libvirtd: add man page for libvirtd (Justin Clift) Portability: - Fix compile on i686. (Chris Lalancette) - daemon: dispatch.c should include stdio.h (and stdarg.h) (Ryota Ozaki) Bug fixes: - qemu: Fix PCI address allocation (Jiri Denemark) - Don't leak delay string when freeing virInterfaceBridgeDefs (Laine Stump) - qemu: don't lose error on setting monitor capabilities (Eric Blake) - Add iptables rule to fixup DHCP response checksum. (Laine Stump) - Fix the ACS checking in the PCI code. (Chris Lalancette) - Free up memballoon def. (Chris Lalancette) - Fix a bogus warning when parsing <hostdev> (Chris Lalancette) - Update ID after stopping a domain (Matthias Bolte) - openvzDomainCreateWithFlags: set domain id to the correct value (Jean-Baptiste Rouault) - xenapi: Update ID after starting a domain (Matthias Bolte) - esx: Update ID after starting a domain (Matthias Bolte) - Fix DMI uuid parsing. (Chris Lalancette) - Do not activate boot=on on devices when not using KVM (Daniel Veillard) - Fix a memory leak in the qemudBuildCommandLine. (Chris Lalancette) - esx: Fix freeing of heterogeneous lists (Matthias Bolte) - xen: fix logic bug (Eric Blake) - Eliminate memory leak in xenUnifiedDomainInfoListFree (Laine Stump) - lxc: Fix 'autostart' doesn't take effect actually (Ryota Ozaki) - Fix --with-xen-proxy related compile error (Matthias Bolte) - Fix a potential race in pciInitDevice. (Chris Lalancette) - Invert logic for checking for QEMU disk cache options (Daniel P. Berrange) - libvirt-guests: Don't throw errors if libvirtd is not installed (Jiri Denemark) - pciResetDevice: use inactive devices to determine safe reset (Chris Wright) - secaatest: Fix compilation (Matthias Bolte) - virt-aa-helper-test: Fix failure due to the new disk format probing option (Matthias Bolte) - virt-aa-helper: Make getopt accept the p option (Matthias Bolte) - virt-aa-helper: Fix return value of add_file_path (Matthias Bolte) - Fix SEGV on exit after domainEventDeregister() (Philipp Hahn) - pciSharesBusWithActive fails to find multiple devices on bus (Chris Wright) - Fix incorrect use of private data in remote driver (Daniel P. Berrange) - Set a stable & high MAC addr for guest TAP devices on host (Daniel P. Berrange) - Fix PCI address assignment if no IDE controller is present (Daniel P. Berrange) - lxc: force kill of init process by sending SIGKILL if needed (Ryota Ozaki) - Fix a NULL dereference in the case that the arg in question didn't exist. (Chris Lalancette) - Remove bogus free of static strings (Daniel P. Berrange) - Fix a deadlock in bi-directional p2p concurrent migration. (Chris Lalancette) - Make virsh setmaxmem balloon only when successful. (Chris Lalancette) - fsync new storage volumes even if new volume was copied. (Laine Stump) - Don't skip zero'ing end of volume file when inputvol is shorter than newvol (Laine Stump) - Always clear out the last_error in virshReportError. (Chris Lalancette) - CVE-2010-2242 Apply a source port mapping to virtual network masquerading (Daniel P. Berrange) - uml_driver: correct logic error in umlMonitorCommand (Jim Meyering) - qemuConnectMonitor: fix a bug that would have masked SELinux failure (Jim Meyering) - python: Fix IOErrorReasonCallback bindings (Cole Robinson) - cpuCompare: Fix crash on unexpected CPU XML (Jiri Denemark) - cpu: Fail when CPU type cannot be detected from XML (Jiri Denemark) - cpuCompare: Fix comparison of two host CPUs (Jiri Denemark) - Fix potential crash in QEMU monitor JSON impl (Daniel P. Berrange) Improvements: - OpenVZ: implement suspend/resume driver APIs (Jean-Baptiste Rouault) - esx: Set storage pool target path to host.mountInfo.path (Matthias Bolte) - esx: Make storage pool lookup by name and UUID more robust (Matthias Bolte) - esx: Restrict vpx:// to handle a single host in a vCenter (Matthias Bolte) - esx: Map some managed object types (Matthias Bolte) - esx: Parse the path of the URI (Matthias Bolte) - Make virsh -d check its input (Daniel Veillard) - esx: Switch from name to number checks in the subdrivers (Matthias Bolte) - esx: Improve blocked task detection and fix race condition (Matthias Bolte) - build: distribute libvirt_qemu.syms (Eric Blake) - build: restore operation of bit-rotted 'make cov' (Eric Blake) - qemu: virtio console support (Cole Robinson) - domain conf: Track <console> target type (Cole Robinson) - domain conf: char: Add an explicit targetType field (Cole Robinson) - domain conf: Rename character prop targetType -> deviceType (Cole Robinson) - docs: domain: Document virtio <channel> (Cole Robinson) - tests: Test qemuxml2xml when expected xml changes (Cole Robinson) - fix handling of PORT_PROFILE_RESPONSE_INPROGRESS netlink message (Gerhard Stenzel) - maint: turn on gcc logical-op checking (Eric Blake) - libvirt-guests: add reload, condrestart (Eric Blake) - libvirt-guests: enhance status (Eric Blake) - libvirt-guests: detect invalid arguments (Eric Blake) - qemu: Allow setting boot menu on/off (Cole Robinson) - qemu: Error on unsupported graphics config (Cole Robinson) - Force FLR on for buggy SR-IOV devices. (Chris Lalancette) - qemudDomainAttachHostPciDevice refactor to use new helpers (Chris Wright) - Add helpers qemuPrepareHostdevPCIDevice and qemuDomainReAttachHostdevDevices (Chris Wright) - qemuGetPciHostDeviceList take hostdev list directly (Chris Wright) - esx: Add vpx:// scheme to allow direct connection to a vCenter (Matthias Bolte) - esx: Don't ignore the vcenter query parameter (Matthias Bolte) - esx: Add autodetection for the SCSI controller model (Matthias Bolte) - esx: Allow 'vmpvscsi' as SCSI controller model (Matthias Bolte) - Add tests for the new Qemu namespace XML. (Chris Lalancette) - Qemu remote protocol. (Chris Lalancette) - Handle arbitrary qemu command-lines in qemuParseCommandLine. (Chris Lalancette) - Qemu arbitrary command-line arguments. (Chris Lalancette) - Add namespace callback hooks to domain_conf. (Chris Lalancette) - Remove erroneous setting of return value to errno. (Laine Stump) - Change virDirCreate to return -errno on failure. (Laine Stump) - Make virStorageBackendCopyToFD return -errno. (Laine Stump) - Change virFileOperation to return -errno (ie < 0) on error. (Laine Stump) - Re-arrange PCI device address assignment to match QEMU's default (Daniel P. Berrange) - Explicitly represent balloon device in XML and handle PCI address (Daniel P. Berrange) - Rearrange VGA/IDE controller address reservation (Daniel P. Berrange) - Use unsigned long in cmdSetmem. (Chris Lalancette) - Fix up inconsistent virsh option error reporting. (Chris Lalancette) - Use the extract backing store format in storage volume lookup (Daniel P. Berrange) - Rewrite qemu-img backing store format handling (Daniel P. Berrange) - Add ability to set a default driver name/type when parsing disks (Daniel P. Berrange) - Disable all disk probing in QEMU driver & add config option to re-enable (Daniel P. Berrange) - Pass security driver object into all security driver callbacks (Daniel P. Berrange) - Convert all disk backing store loops to shared helper API (Daniel P. Berrange) - Add an API for iterating over disk paths (Daniel P. Berrange) - Require format to be passed into virStorageFileGetMetadata (Daniel P. Berrange) - Refactor virStorageFileGetMetadataFromFD to separate functionality (Daniel P. Berrange) - Remove 'type' field from FileTypeInfo struct (Daniel P. Berrange) - Extract the backing store format as well as name, if available (Daniel P. Berrange) - RFC: Canonicalize block device paths (David Allan) - .gitignore: Ignore generated libvirtd docs (Cole Robinson) - esx: Make esxVI_*_Deserialize dynamically dispatched (Matthias Bolte) - qemu: Use -nodefconfig when probing for CPU models (Jiri Denemark) - Ensure we return the callback ID in python events binding (Daniel P. Berrange) - virsh: add new --details option to vol-list (Justin Clift) - Implement virsh managedsave-remove command. (Chris Lalancette) - cpu: Add new models from qemu's target-x86_64.conf (Jiri Denemark) - cpu: Add support for CPU vendor (Jiri Denemark) - cpuBaseline: Detect empty set of common features (Jiri Denemark) - cpuBaseline: Don't mess with the CPU returned by arch driver (Jiri Denemark) - Make html docs in non-srcdir build (Jiri Denemark) Cleanups: - Fix build error in virsh.c (Laine Stump) - Fix virsh error message when -d arg is not numeric (Eric Blake) - Fix a couple of typo in iSCSI backend (Aurelien ROUGEMONT) - Don't put a semicolon on the end of a VIR_ENUM_IMPL. (Chris Lalancette) - Remove duplicate </p> from downloads.html.in (Matthias Bolte) - storage: kill dead stores (Eric Blake) - qemu: kill some dead stores (Eric Blake) - network: kill dead store (Eric Blake) - esx: silence spurious compiler warning (Eric Blake) - build: fix 'make syntax-check' failure (Eric Blake) - lxc: Fix return values of veth.c functions (Ryota Ozaki) - maint: fix comment typos (Eric Blake) - Fix up confusing indentation in qemudDomainAttachHostPciDevice. (Chris Lalancette) - build: fix VPATH builds (Eric Blake) - virt-aa-helper: Ignore open errors again (Matthias Bolte) - qemu-api: avoid build failure (Eric Blake) - Fix .mailmap after accidental wrong committer address (Daniel P. Berrange) - Remove inappropriate use of VIR_ERR_NO_SUPPORT (Daniel P. Berrange) - Remove unused and bitrotting vshCommandOptStringList (Chris Lalancette) - Remove error checking after using vshMalloc. (Chris Lalancette) - Remove the "showerror" parameter from vshConnectionUsability. (Chris Lalancette) - Eliminate compiler warning due to gettext string with no format args (Laine Stump) - Fix build by removing unknown pod2man flag (Daniel P. Berrange) Thanks everybody for the help on this release ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

Re: [libvirt] [RHEL6 PATCH] Correct cpuid flags and "model" fields, V2
by john cooper 04 Aug '10

04 Aug '10

A question arose in today's kvm meeting concerning any impact to libvirt from this change. I've discussed it with Cole and it seems to be a non-issue. But just to err on the side of caution, here's a summary: The current cpu model definition of "qemu64" upstream is problematic from kvm's perspective such that we need to modify it slightly (BZ justifications listed below). Doing so we've left the qemu64 definition as-is, but added "cpu64-rhel6" and "cpu64-rhel5" models which are now selected by default via "-M <machine>", for "RHEL 6.0.0 PC" and "RHEL 5.x.y PC" respectively. So the only issue would be libvirt invoking qemu with neither a "-cpu" nor "-M" argument (which defaults to qemu64) or explicitly requesting "-cpu qemu64". >From my discussion with Cole it appears the use cases where this may happen fall outside of routine/expected usage and would need to be explicitly requested by the user. However I wanted to call this out here in the event we're overlooking something. Thanks, -john http://post-office.corp.redhat.com/archives/rhvirt-patches/2010-July/msg011… http://post-office.corp.redhat.com/archives/rhvirt-patches/2010-July/msg008… john cooper wrote: > Addresses BZs: > > #618332 - CPUID_EXT_POPCNT enabled in qemu64 and qemu32 built-in models. > #613892 - [SR-IOV]VF device can not start on 32bit Windows2008 SP2 > > Summary: > > CPU feature flags for several processor definitions require correction > to accurately reflect the corresponding shipped silicon. In particular > overly conservative values for cpuid "model" fields cause disable of > MSI support in windows guests (BZ #613892). Also recent upstream changes > of qemu64's built-in definition enables POPCNT (for the benefit of TCG) > but risks kvm migration breakage (BZ #618332). The following patch > address these issues collectively. > > Changes relative to previous version: > > - drop of the "qemu32-rhel5" model as it appears to be unneeded. > > - rename of "qemu64-rhel?" to "cpu64-rhel?" as we're diverging from > upstream qemu64's definition but haven't migrated to kvm64 quite yet. > > - Correction of several fields for the (now) cpu64-rhel5 model. > > Further detail may be found in the associated mail thread common to > both BZ cases starting about here: > > http://post-office.corp.redhat.com/archives/rhvirt-patches/2010-July/msg008… > > Brew Build: > > https://brewweb.devel.redhat.com/taskinfo?taskID=2643552 > > Upstream status: > > BZ #618332 is a local, interim change and doesn't relate to upstream > concerns. Longer-term this qemu64 derived model would be displaced > by kvm64. The update of cpu definitions (BZ #613892) however needs > to be pushed upstream upon validation in rhel6. We're currently the > sole users of the new cpu models which fosters this inverted process. -- john.cooper(a)redhat.com

2 1

[libvirt] [PATCH] qemu: Fix PCI address allocation
by Jiri Denemark 04 Aug '10

04 Aug '10

When attaching a PCI device which doesn't explicitly set its PCI address, libvirt allocates the address automatically. The problem is that when checking which PCI address is unused, we only check for those with slot number higher than the highest slot number ever used. Thus attaching/detaching such device several times in a row (31 is the theoretical limit, less then 30 tries are enough in practise) makes any further device attachment fail. Furthermore, attaching a device with predefined PCI address to 0:0:31 immediately forbids attachment of any PCI device without explicit address. This patch changes the logic so that we always check all PCI addresses before we say there is no PCI address available. --- src/qemu/qemu_conf.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 57bc02f..eaebcc1 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2055,8 +2055,6 @@ qemuAssignDeviceAliases(virDomainDefPtr def, unsigned long long qemuCmdFlags) #define QEMU_PCI_ADDRESS_LAST_SLOT 31 struct _qemuDomainPCIAddressSet { virHashTablePtr used; - int nextslot; - /* XXX add domain, bus later when QEMU allows > 1 */ }; @@ -2148,9 +2146,6 @@ int qemuDomainPCIAddressReserveAddr(qemuDomainPCIAddressSetPtr addrs, return -1; } - if (dev->addr.pci.slot > addrs->nextslot) - addrs->nextslot = dev->addr.pci.slot + 1; - return 0; } @@ -2217,7 +2212,7 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, { int i; - for (i = addrs->nextslot ; i <= QEMU_PCI_ADDRESS_LAST_SLOT ; i++) { + for (i = 0 ; i <= QEMU_PCI_ADDRESS_LAST_SLOT ; i++) { virDomainDeviceInfo maybe; char *addr; @@ -2228,13 +2223,14 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, addr = qemuPCIAddressAsString(&maybe); - VIR_DEBUG("Allocating PCI addr %s", addr); - if (virHashLookup(addrs->used, addr)) { + VIR_DEBUG("PCI addr %s already in use", addr); VIR_FREE(addr); continue; } + VIR_DEBUG("Allocating PCI addr %s", addr); + if (virHashAddEntry(addrs->used, addr, addr) < 0) { VIR_FREE(addr); return -1; @@ -2245,8 +2241,6 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, dev->addr.pci.bus = 0; dev->addr.pci.slot = i; - addrs->nextslot = i + 1; - return 0; } -- 1.7.2

4 6

[libvirt] [PATCH] OpenVZ: implement suspend/resume driver APIs
by Jean-Baptiste Rouault 04 Aug '10

04 Aug '10

--- src/openvz/openvz_driver.c | 84 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 82 insertions(+), 2 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index e5bbdd0..bdc0e92 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -503,6 +503,86 @@ static void openvzSetProgramSentinal(const char **prog, const char *key) } } +static int openvzDomainSuspend(virDomainPtr dom) { + struct openvz_driver *driver = dom->conn->privateData; + virDomainObjPtr vm; + const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINAL, "--suspend", NULL}; + int ret = -1; + + openvzDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + openvzDriverUnlock(driver); + + if (!vm) { + openvzError(VIR_ERR_INVALID_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + openvzError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not running")); + goto cleanup; + } + + if (vm->state != VIR_DOMAIN_PAUSED) { + openvzSetProgramSentinal(prog, vm->def->name); + if (virRun(prog, NULL) < 0) { + openvzError(VIR_ERR_OPERATION_FAILED, "%s", + _("Suspend operation failed")); + goto cleanup; + } + vm->state = VIR_DOMAIN_PAUSED; + } + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + +static int openvzDomainResume(virDomainPtr dom) { + struct openvz_driver *driver = dom->conn->privateData; + virDomainObjPtr vm; + const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINAL, "--resume", NULL}; + int ret = -1; + + openvzDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + openvzDriverUnlock(driver); + + if (!vm) { + openvzError(VIR_ERR_INVALID_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + openvzError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not running")); + goto cleanup; + } + + if (vm->state == VIR_DOMAIN_PAUSED) { + openvzSetProgramSentinal(prog, vm->def->name); + if (virRun(prog, NULL) < 0) { + openvzError(VIR_ERR_OPERATION_FAILED, "%s", + _("Resume operation failed")); + goto cleanup; + } + vm->state = VIR_DOMAIN_RUNNING; + } + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + static int openvzDomainShutdown(virDomainPtr dom) { struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -1491,8 +1571,8 @@ static virDriver openvzDriver = { openvzDomainLookupByID, /* domainLookupByID */ openvzDomainLookupByUUID, /* domainLookupByUUID */ openvzDomainLookupByName, /* domainLookupByName */ - NULL, /* domainSuspend */ - NULL, /* domainResume */ + openvzDomainSuspend, /* domainSuspend */ + openvzDomainResume, /* domainResume */ openvzDomainShutdown, /* domainShutdown */ openvzDomainReboot, /* domainReboot */ openvzDomainShutdown, /* domainDestroy */ -- 1.7.0.4

2 1

[libvirt] [PATCH] Don't leak delay string when freeing virInterfaceBridgeDefs
by Laine Stump 03 Aug '10

03 Aug '10

I noticed this while looking into checking the default bridge delay to 0. --- src/conf/interface_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 6430f7a..b24526f 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -84,6 +84,7 @@ void virInterfaceDefFree(virInterfaceDefPtr def) switch (def->type) { case VIR_INTERFACE_TYPE_BRIDGE: + VIR_FREE(def->data.bridge.delay); for (i = 0;i < def->data.bridge.nbItf;i++) { if (def->data.bridge.itf[i] == NULL) break; /* to cope with half parsed data on errors */ -- 1.7.2

2 1

[libvirt] [PATCH] Fix build error in virsh.c
by Laine Stump 03 Aug '10

03 Aug '10

I just pushed this under the trivial rule... Another gettext string with no format args sent to printf as a format string. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 2ccf08b..c0ee3ee 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11022,7 +11022,7 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) switch (arg) { case 'd': if (virStrToLong_i(optarg, NULL, 10, &ctl->debug) < 0) { - vshError(ctl, _("option -d takes a numeric argument")); + vshError(ctl, "%s", _("option -d takes a numeric argument")); exit(EXIT_FAILURE); } break; -- 1.7.2

1 0

Re: [libvirt] [virt-tools-list] Add a manually configured XEN
by Michal Novotny 03 Aug '10

03 Aug '10

Hi, I can see the point Bernhard. It seems that libvirt is not aware of this guest. Well, if virsh (part of libvirt) is seeing the guest only then the guest is running then you need to create a configuration for that in the libvirt itself. I know there's something like: virsh domxml-from-native <format> <config> but I never used it so I don't know about the config and format and how does it work. Please try asking the libvirt guys on the libvirt list (I put this list in CC now). Michal On 08/03/2010 02:59 PM, Bernhard Suttner wrote: > Hi, > > manually means, I did not use virt-install or the virt-manager to add the XEN domU to the dom0. I set it up manually (created configuration manually, added disk images and so on manually, ....). > > virsh list --all does show the domU BUT only if I start it manually with xm create domU. If the domU does not run, it does not appear. Other virtual manchines (domU) which I created with virt-manager or virt-install do also appear, if the domU is currently not up (stopped). > > Best regards, > Bernhard > > -----Ursprüngliche Nachricht----- > Von: Michal Novotny [mailto:minovotn@redhat.com] > Gesendet: Dienstag, 3. August 2010 14:17 > An: Bernhard Suttner > Cc: virt-tools-list(a)redhat.com > Betreff: Re: AW: [virt-tools-list] Add a manually configured XEN > > On 08/03/2010 02:14 PM, Bernhard Suttner wrote: > >> Hi, >> >> thanks. But this did not work. I think, this option does only connect to another dom0 - means, to another xen host system. I want, that virt-manager does show the domU (the guest) of the local xen installation which I manually added to this system. >> >> > Why do you mean that is manually added to the system? Does `virsh list > --all` show the guest? > > Regards, > Michal > > >> Best regards, >> Bernhard >> >> -----Ursprüngliche Nachricht----- >> Von: Michal Novotny [mailto:minovotn@redhat.com] >> Gesendet: Dienstag, 3. August 2010 10:51 >> An: Bernhard Suttner >> Cc: virt-tools-list(a)redhat.com >> Betreff: Re: [virt-tools-list] Add a manually configured XEN >> >> Hi Bernhard, >> I'm not the expert but when you start virt-manager you can go to the >> File -> Add connection and add the connection there. The connection >> should be persistent and just connecting to it should fail when xend is >> not running AFAIK. >> >> Hope this helps, >> Michal >> >> On 08/02/2010 09:13 PM, Bernhard Suttner wrote: >> >> >>> Hi, >>> >>> I am using XEN and the virt-manager (which use libvirt). I have configured the XEN domU manually within the shell. If I start the domU with xm create config then the virtual machine appears in the virt-manager. If I stop the XEN it will disappear. How could I add the XEN to the virt-manager like all the other (with virt-manager) created domU that I have it listed with the virt-manager and could start it from GUI? >>> >>> Best regards, >>> Bernhard Suttner >>> >>> _______________________________________________ >>> virt-tools-list mailing list >>> virt-tools-list(a)redhat.com >>> https://www.redhat.com/mailman/listinfo/virt-tools-list >>> >>> >>> >> >> > > -- Michal Novotny<minovotn(a)redhat.com>, RHCE Virtualization Team (xen userspace), Red Hat

1 0

[libvirt] [PATCH] [RFC] ISCSI transport protocol support in libvirt
by Aurelien ROUGEMONT 03 Aug '10

03 Aug '10

Hi everyone, This my first post on this list Context : Some days ago I have decided to use infiniband for ISCSI streams. Infiniband adds a new wonderful transport protocol : ISER. This protocols is added to the well known the default TCP. (NB: ISER = ISCSI + RDMA). I could not see any ISCSI transport protocol modification support in libivirt (the default protocol tcp is even hardcoded in the regex) What i have done : - did the shell testing for the iscsiadm - the attached patch that corrects 2 typos in the original code and switches completely the iscsi transport protocol from tcp to iser (which is not ideal at all) What should be done (imho): - add iscsi transport protocol support (using my patch as a basis) - add a new XML property/whatever_fits_the_projects_policy to the storagepool object that allows user to pick the iscsi transport protocol (default is tcp) I was thinking of having something like : <pool type="iscsi"> <name>volumename</name> <source> <host name="1.2.3.4"/> <device path="IQNOFTARGET"/> <transport protocol="iser"/> </source> <target> <path>/dev/disk/by-path</path> </target> </pool> Any comment on this ? Any help on the XML part ? Best regards, Aurélien NB: the current iscsi transport protocols available are : tcp(default), iser, qla4xxx, bnx2, and icxgb3i. PS: i'm still doing extensive testing of my patch !DSPAM:4c46f49d90977882820711!

2 2

Re: [libvirt] Extensions to the libvirt Storage API
by Shyam Iyer 03 Aug '10

03 Aug '10

On 07/28/2010 01:24 PM, Daniel P. Berrange wrote: > > >>>> > >>>> > >>> We explicitly don't support external driver plugins in libvirt for a > >>> couple of reasons > >>> > >>> - We don't want to support use of closed source plugins > >>> - We don't want to guarentee stability of any aspect of > >>> libvirt's internal API > >>> > >>> We would like to see support for the various vendor specific iSCSI > >>> extensions to allow volume creation/deletion, but want that code to > >>> be part of the libvirt codebase. > >>> The APIs can also invoke standard snmpget/set methods to talk to the target. All standard distributions ship with a net-snmp implementation. Would an implementation of the APIs that invokes snmpset/gets be an amenable solution? > Namespace clash ! The virDomainSnapshot APIs are per-hypervisor. They > do snapshotting of the guest VM (including its storage). > > I was actually just talking about the storage backends though which > can do snapshots independently of any hypervisor. See > the<backingstorage> > element here: > > http://libvirt.org/formatstorage.html#StorageVolBacking > > This is already implemented with the LVM pool doing LVM snapshots. We > also use it for external qcow2 backing files. > There are certain benefits of allowing snapshots/backup to happen in the storage and thereby save CPU cycles. It becomes even more visible with large TB storage where in a simple qcow2 backup copy could take a long time.

1 0

[libvirt] [PATCH] esx: Restrict vpx:// to handle a single host in a vCenter
by Matthias Bolte 02 Aug '10

02 Aug '10

Now a vpx:// connection has an explicitly specified host. This allows to enabled several functions for a vpx:// connection again, like host UUID, hostname, general node info, max vCPU count, free memory, migration and defining new domains. Lookup datacenter, compute resource, resource pool and host system once and cache them. This simplifies the rest of the code and reduces overall HTTP(S) traffic a bit. esx:// and vpx:// can be mixed freely for a migration. Ensure that migration source and destination refer to the same vCenter. Also directly encode the resource pool and host system object IDs into the migration URI in the prepare function. Then directly build managed object references in the perform function instead of re-looking up already known information. --- docs/drvesx.html.in | 33 +++- src/esx/esx_driver.c | 360 ++++++++++---------------- src/esx/esx_storage_driver.c | 24 +-- src/esx/esx_vi.c | 588 ++++++++++++++++++++++++++---------------- src/esx/esx_vi.h | 26 ++- src/esx/esx_vmx.c | 4 + 6 files changed, 561 insertions(+), 474 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 4ae7a51..dfc91bb 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -28,7 +28,7 @@ Some example remote connection URIs for the driver are: </p> <pre> -vpx://example-vcenter.com (VPX over HTTPS) +vpx://example-vcenter.com/dc1/srv1 (VPX over HTTPS, select ESX server 'srv1' in datacenter 'dc1') esx://example-esx.com (ESX over HTTPS) gsx://example-gsx.com (GSX over HTTPS) esx://example-esx.com/?transport=http (ESX over HTTP) @@ -48,7 +48,7 @@ esx://example-esx.com/?no_verify=1 (ESX over HTTPS, but doesn't verify the s URIs have this general form (<code>[...]</code> marks an optional part). </p> <pre> -type://[username@]hostname[:port]/[?extraparameters] +type://[username@]hostname[:port]/[datacenter[/cluster]/server][?extraparameters] </pre> <p> The <code>type://</code> is either <code>esx://</code> or @@ -58,6 +58,20 @@ type://[username@]hostname[:port]/[?extraparameters] is 443, for <code>gsx://</code> it is 8333. If the port parameter is given, it overrides the default port. </p> + <p> + A <code>vpx://</code> connection is currently restricted to a single + ESX server. This might be relaxed in the future. The path part of the + URI is used to specify the datacenter and the ESX server in it. If the + ESX server is part of a cluster then the cluster has to be specified too. + </p> + <p> + An example: ESX server <code>example-esx.com</code> is managed by + vCenter <code>example-vcenter.com</code> and part of cluster + <code>cluster1</code>. This cluster is part of datacenter <code>dc1</code>. + </p> +<pre> +vpx://example-vcenter.com/dc1/cluster1/example-esx.com +</pre> <h4>Extra parameters</h4> @@ -588,7 +602,7 @@ ethernet0.address = "00:50:56:25:48:C7" esx://example.com/?vcenter=example-vcenter.com </pre> <p> - Here an example how to migrate the domain <code>Fedora11</code> from + Here's an example how to migrate the domain <code>Fedora11</code> from ESX server <code>example-src.com</code> to ESX server <code>example-dst.com</code> implicitly involving vCenter <code>example-vcenter.com</code> using <code>virsh</code>. @@ -604,6 +618,19 @@ Enter root password for example-dst.com: Enter username for example-vcenter.com [administrator]: Enter administrator password for example-vcenter.com: </pre> + <p> + <span class="since">Since 0.8.3</span> you can directly connect to a vCenter. + This simplifies migration a bit. Here's the same migration as above but + using <code>vpx://</code> connections and assuming both ESX server are in + datacenter <code>dc1</code> and aren't part of a cluster. + </p> +<pre> +$ virsh -c vpx://example-vcenter.com/dc1/example-src.com migrate Fedora11 vpx://example-vcenter.com/dc1/example-dst.com +Enter username for example-vcenter.com [administrator]: +Enter administrator password for example-vcenter.com: +Enter username for example-vcenter.com [administrator]: +Enter administrator password for example-vcenter.com: +</pre> <h2><a name="scheduler">Scheduler configuration</a></h2> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 3bdc551..fd87078 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -67,20 +67,14 @@ esxSupportsLongMode(esxPrivate *priv) return priv->supportsLongMode; } - if (priv->host == NULL) { - /* FIXME: Currently no host for a vpx:// connection */ - return esxVI_Boolean_False; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return esxVI_Boolean_Undefined; } if (esxVI_String_AppendValueToList(&propertyNameList, "hardware.cpuFeature") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -153,20 +147,14 @@ esxLookupHostSystemBiosUuid(esxPrivate *priv, unsigned char *uuid) esxVI_ObjectContent *hostSystem = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; - if (priv->host == NULL) { - /* FIXME: Currently no host for a vpx:// connection */ - return 0; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "hardware.systemInfo.uuid") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -236,7 +224,7 @@ esxCapsInit(esxPrivate *priv) } virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x00, 0x0c, 0x29 }); - virCapabilitiesAddHostMigrateTransport(caps, "esx"); + virCapabilitiesAddHostMigrateTransport(caps, "vpxmigr"); caps->hasWideScsiBus = true; @@ -347,7 +335,8 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, if (esxVI_Context_Alloc(&priv->host) < 0 || esxVI_Context_Connect(priv->host, url, ipAddress, username, password, - parsedUri) < 0) { + parsedUri) < 0 || + esxVI_Context_LookupObjectsByPath(priv->host, parsedUri) < 0) { goto cleanup; } @@ -373,8 +362,8 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, if (esxVI_String_AppendValueListToList(&propertyNameList, "runtime.inMaintenanceMode\0" "summary.managementServerIp\0") < 0 || - esxVI_LookupHostSystemByIp(priv->host, ipAddress, propertyNameList, - &hostSystem) < 0 || + esxVI_LookupHostSystemProperties(priv->host, propertyNameList, + &hostSystem) < 0 || esxVI_GetBoolean(hostSystem, "runtime.inMaintenanceMode", &inMaintenanceMode, esxVI_Occurrence_RequiredItem) < 0 || @@ -416,6 +405,7 @@ static int esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, const char *hostname, int port, const char *predefinedUsername, + const char *hostSystemIpAddress, esxUtil_ParsedUri *parsedUri) { int result = -1; @@ -424,6 +414,14 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, char *password = NULL; char *url = NULL; + if (hostSystemIpAddress == NULL && + (parsedUri->path_datacenter == NULL || + parsedUri->path_computeResource == NULL)) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Path has to specify the datacenter and compute resource")); + return -1; + } + if (esxUtil_ResolveHostname(hostname, ipAddress, NI_MAXHOST) < 0) { return -1; } @@ -473,6 +471,17 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, goto cleanup; } + if (hostSystemIpAddress != NULL) { + if (esxVI_Context_LookupObjectsByHostSystemIp(priv->vCenter, + hostSystemIpAddress) < 0) { + goto cleanup; + } + } else { + if (esxVI_Context_LookupObjectsByPath(priv->vCenter, parsedUri) < 0) { + goto cleanup; + } + } + result = 0; cleanup: @@ -486,7 +495,8 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, /* - * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<query parameter> ...] + * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<path>][?<query parameter> ...] + * <path> = <datacenter>/<computeresource>[/<hostsystem>] * * If no port is specified the default port is set dependent on the scheme and * transport parameter: @@ -497,6 +507,11 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, * - gsx+http 8222 * - gsx+https 8333 * + * For a vpx:// connection <path> references a host managed by the vCenter. + * In case the host is part of a cluster then <computeresource> is the cluster + * name. Otherwise <computeresource> and <hostsystem> are equal and the later + * can be omitted. + * * Optional query parameters: * - transport={http|https} * - vcenter={<vcenter>|*} only useful for an esx:// connection @@ -508,7 +523,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, * * The vcenter parameter is only necessary for migration, because the vCenter * server is in charge to initiate a migration between two ESX hosts. The - * vcenter parameter can be set to an explicity hostname or to *. If set to *, + * vcenter parameter can be set to an explicitly hostname or to *. If set to *, * the driver will check if the ESX host is managed by a vCenter and connect to * it. If the ESX host is not managed by a vCenter an error is reported. * @@ -635,7 +650,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } if (esxConnectToVCenter(priv, auth, vCenterIpAddress, - conn->uri->port, NULL, parsedUri) < 0) { + conn->uri->port, NULL, + priv->host->ipAddress, parsedUri) < 0) { goto cleanup; } } @@ -644,7 +660,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } else { /* VPX */ /* Connect to vCenter */ if (esxConnectToVCenter(priv, auth, conn->uri->server, conn->uri->port, - conn->uri->user, parsedUri) < 0) { + conn->uri->user, NULL, parsedUri) < 0) { goto cleanup; } @@ -722,26 +738,19 @@ esxSupportsVMotion(esxPrivate *priv) { esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; if (priv->supportsVMotion != esxVI_Boolean_Undefined) { return priv->supportsVMotion; } - if (priv->host == NULL) { - /* FIXME: Currently no host for a vpx:// connection */ - return esxVI_Boolean_False; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return esxVI_Boolean_Undefined; } if (esxVI_String_AppendValueToList(&propertyNameList, "capability.vmotionSupported") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -751,19 +760,10 @@ esxSupportsVMotion(esxPrivate *priv) goto cleanup; } - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "capability.vmotionSupported")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Boolean) < 0) { - goto cleanup; - } - - priv->supportsVMotion = dynamicProperty->val->boolean; - break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } + if (esxVI_GetBoolean(hostSystem, "capability.vmotionSupported", + &priv->supportsVMotion, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; } cleanup: @@ -842,14 +842,7 @@ esxGetHostname(virConnectPtr conn) const char *domainName = NULL; char *complete = NULL; - if (priv->host == NULL) { - /* FIXME: Currently no host for a vpx:// connection */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve the hostname for a vpx:// connection")); - return NULL; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -857,9 +850,8 @@ esxGetHostname(virConnectPtr conn) (&propertyNameList, "config.network.dnsConfig.hostName\0" "config.network.dnsConfig.domainName\0") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -944,14 +936,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) memset(nodeinfo, 0, sizeof (*nodeinfo)); - if (priv->host == NULL) { - /* FIXME: Currently no host for a vpx:// connection */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Nodeinfo is not available for a vpx:// connection")); - return -1; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } @@ -963,9 +948,8 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) "hardware.memorySize\0" "hardware.numaInfo.numNodes\0" "summary.hardware.cpuModel\0") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -1126,10 +1110,8 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || - esxVI_LookupObjectContentByType(priv->primary, priv->primary->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -1209,10 +1191,8 @@ esxDomainLookupByID(virConnectPtr conn, int id) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_LookupObjectContentByType(priv->primary, priv->primary->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -2142,22 +2122,14 @@ esxDomainGetMaxVcpus(virDomainPtr domain) priv->maxVcpus = -1; - if (priv->host == NULL) { - /* FIXME: Currently no host for a vpx:// connection */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("MaxVCPUs value is not available for a vpx:// connection")); - return -1; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return -1; } if (esxVI_String_AppendValueToList(&propertyNameList, "capability.maxSupportedVcpus") < 0 || - esxVI_LookupObjectContentByType(priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { goto cleanup; } @@ -2196,11 +2168,8 @@ esxDomainDumpXML(virDomainPtr domain, int flags) { esxPrivate *priv = domain->conn->privateData; esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datacenter = NULL; esxVI_ObjectContent *virtualMachine = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - const char *vmPathName = NULL; - char *datacenterName = NULL; + char *vmPathName = NULL; char *datastoreName = NULL; char *directoryName = NULL; char *fileName = NULL; @@ -2214,38 +2183,16 @@ esxDomainDumpXML(virDomainPtr domain, int flags) return NULL; } - if (esxVI_String_AppendValueToList(&propertyNameList, "name") < 0 || - esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter, - "Datacenter", propertyNameList, - esxVI_Boolean_False, &datacenter) < 0 || - esxVI_GetStringValue(datacenter, "name", &datacenterName, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } - - esxVI_String_Free(&propertyNameList); - if (esxVI_String_AppendValueToList(&propertyNameList, "config.files.vmPathName") < 0 || esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, propertyNameList, &virtualMachine, - esxVI_Occurrence_RequiredItem) < 0) { + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetStringValue(virtualMachine, "config.files.vmPathName", + &vmPathName, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - for (dynamicProperty = virtualMachine->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "config.files.vmPathName")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } - - vmPathName = dynamicProperty->val->string; - break; - } - } - if (esxUtil_ParseDatastoreRelatedPath(vmPathName, &datastoreName, &directoryName, &fileName) < 0) { goto cleanup; @@ -2261,7 +2208,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags) virBufferURIEncodeString(&buffer, fileName); virBufferAddLit(&buffer, "?dcPath="); - virBufferURIEncodeString(&buffer, datacenterName); + virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); @@ -2289,7 +2236,6 @@ esxDomainDumpXML(virDomainPtr domain, int flags) } esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datacenter); esxVI_ObjectContent_Free(&virtualMachine); VIR_FREE(datastoreName); VIR_FREE(directoryName); @@ -2392,10 +2338,8 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) if (esxVI_String_AppendValueListToList(&propertyNameList, "name\0" "runtime.powerState\0") < 0 || - esxVI_LookupObjectContentByType(priv->primary, priv->primary->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -2557,14 +2501,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) esxVI_TaskInfoState taskInfoState; virDomainPtr domain = NULL; - if (priv->host == NULL) { - /* FIXME: Currently no host for a vpx:// connection */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not define domain with a vpx:// connection")); - return NULL; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -2577,7 +2514,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } /* Check if an existing domain should be edited */ - if (esxVI_LookupVirtualMachineByUuid(priv->host, def->uuid, NULL, + if (esxVI_LookupVirtualMachineByUuid(priv->primary, def->uuid, NULL, &virtualMachine, esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; @@ -2592,8 +2529,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } /* Build VMX from domain XML */ - vmx = esxVMX_FormatConfig(priv->host, priv->caps, def, - priv->host->productVersion); + vmx = esxVMX_FormatConfig(priv->primary, priv->caps, def, + priv->primary->productVersion); if (vmx == NULL) { goto cleanup; @@ -2657,7 +2594,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) virBufferURIEncodeString(&buffer, def->name); virBufferAddLit(&buffer, ".vmx?dcPath="); - virBufferURIEncodeString(&buffer, priv->host->datacenter->value); + virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); @@ -2682,31 +2619,21 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } } - /* Get resource pool */ - if (esxVI_String_AppendValueToList(&propertyNameList, "parent") < 0 || - esxVI_LookupHostSystemByIp(priv->host, priv->host->ipAddress, - propertyNameList, &hostSystem) < 0) { - goto cleanup; - } - - if (esxVI_LookupResourcePoolByHostSystem(priv->host, hostSystem, - &resourcePool) < 0) { - goto cleanup; - } - /* Check, if VMX file already exists */ /* FIXME */ /* Upload VMX file */ - if (esxVI_Context_UploadFile(priv->host, url, vmx) < 0) { + if (esxVI_Context_UploadFile(priv->primary, url, vmx) < 0) { goto cleanup; } /* Register the domain */ - if (esxVI_RegisterVM_Task(priv->host, priv->host->vmFolder, + if (esxVI_RegisterVM_Task(priv->primary, priv->primary->datacenter->vmFolder, datastoreRelatedPath, NULL, esxVI_Boolean_False, - resourcePool, hostSystem->obj, &task) < 0 || - esxVI_WaitForTaskCompletion(priv->host, task, def->uuid, + priv->primary->computeResource->resourcePool, + priv->primary->hostSystem->_reference, + &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, def->uuid, esxVI_Occurrence_OptionalItem, priv->autoAnswer, &taskInfoState) < 0) { goto cleanup; @@ -3102,32 +3029,25 @@ static int esxDomainMigratePrepare(virConnectPtr dconn, char **cookie ATTRIBUTE_UNUSED, int *cookielen ATTRIBUTE_UNUSED, - const char *uri_in, char **uri_out, + const char *uri_in ATTRIBUTE_UNUSED, + char **uri_out, unsigned long flags ATTRIBUTE_UNUSED, const char *dname ATTRIBUTE_UNUSED, unsigned long resource ATTRIBUTE_UNUSED) { - int result = -1; - esxUtil_ParsedUri *parsedUri = NULL; + esxPrivate *priv = dconn->privateData; if (uri_in == NULL) { - if (esxUtil_ParseUri(&parsedUri, dconn->uri) < 0) { - return -1; - } - - if (virAsprintf(uri_out, "%s://%s:%d/sdk", parsedUri->transport, - dconn->uri->server, dconn->uri->port) < 0) { + if (virAsprintf(uri_out, "vpxmigr://%s/%s/%s", + priv->vCenter->ipAddress, + priv->vCenter->computeResource->resourcePool->value, + priv->vCenter->hostSystem->_reference->value) < 0) { virReportOOMError(); - goto cleanup; + return -1; } } - result = 0; - - cleanup: - esxUtil_FreeParsedUri(&parsedUri); - - return result; + return 0; } @@ -3143,12 +3063,13 @@ esxDomainMigratePerform(virDomainPtr domain, { int result = -1; esxPrivate *priv = domain->conn->privateData; - xmlURIPtr xmlUri = NULL; - char hostIpAddress[NI_MAXHOST] = ""; + xmlURIPtr parsedUri = NULL; + char *saveptr; + char *path_resourcePool; + char *path_hostSystem; esxVI_ObjectContent *virtualMachine = NULL; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *hostSystem = NULL; - esxVI_ManagedObjectReference *resourcePool = NULL; + esxVI_ManagedObjectReference resourcePool; + esxVI_ManagedObjectReference hostSystem; esxVI_Event *eventList = NULL; esxVI_ManagedObjectReference *task = NULL; esxVI_TaskInfoState taskInfoState; @@ -3169,39 +3090,57 @@ esxDomainMigratePerform(virDomainPtr domain, return -1; } - /* Parse the destination URI and resolve the hostname */ - xmlUri = xmlParseURI(uri); + /* Parse migration URI */ + parsedUri = xmlParseURI(uri); - if (xmlUri == NULL) { + if (parsedUri == NULL) { virReportOOMError(); return -1; } - if (esxUtil_ResolveHostname(xmlUri->server, hostIpAddress, - NI_MAXHOST) < 0) { + if (parsedUri->scheme == NULL || STRCASENEQ(parsedUri->scheme, "vpxmigr")) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Only vpxmigr:// migration URIs are supported")); goto cleanup; } - /* Lookup VirtualMachine, HostSystem and ResourcePool */ - if (esxVI_LookupVirtualMachineByUuidAndPrepareForTask - (priv->vCenter, domain->uuid, NULL, &virtualMachine, - priv->autoAnswer) < 0 || - esxVI_String_AppendValueToList(&propertyNameList, "parent") < 0 || - esxVI_LookupHostSystemByIp(priv->vCenter, hostIpAddress, - propertyNameList, &hostSystem) < 0) { + if (STRCASENEQ(priv->vCenter->ipAddress, parsedUri->server)) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Migration source and destination have to refer to " + "the same vCenter")); + goto cleanup; + } + + path_resourcePool = strtok_r(parsedUri->path, "/", &saveptr); + path_hostSystem = strtok_r(NULL, "", &saveptr); + + if (path_resourcePool == NULL || path_hostSystem == NULL) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Migration URI has to specify resource pool and host system")); goto cleanup; } - if (esxVI_LookupResourcePoolByHostSystem(priv->vCenter, hostSystem, - &resourcePool) < 0) { + resourcePool._next = NULL; + resourcePool._type = esxVI_Type_ManagedObjectReference; + resourcePool.type = (char *)"ResourcePool"; + resourcePool.value = path_resourcePool; + + hostSystem._next = NULL; + hostSystem._type = esxVI_Type_ManagedObjectReference; + hostSystem.type = (char *)"HostSystem"; + hostSystem.value = path_hostSystem; + + /* Lookup VirtualMachine */ + if (esxVI_LookupVirtualMachineByUuidAndPrepareForTask + (priv->vCenter, domain->uuid, NULL, &virtualMachine, + priv->autoAnswer) < 0) { goto cleanup; } /* Validate the purposed migration */ if (esxVI_ValidateMigration(priv->vCenter, virtualMachine->obj, - esxVI_VirtualMachinePowerState_Undefined, - NULL, resourcePool, hostSystem->obj, - &eventList) < 0) { + esxVI_VirtualMachinePowerState_Undefined, NULL, + &resourcePool, &hostSystem, &eventList) < 0) { goto cleanup; } @@ -3224,8 +3163,8 @@ esxDomainMigratePerform(virDomainPtr domain, } /* Perform the purposed migration */ - if (esxVI_MigrateVM_Task(priv->vCenter, virtualMachine->obj, resourcePool, - hostSystem->obj, + if (esxVI_MigrateVM_Task(priv->vCenter, virtualMachine->obj, + &resourcePool, &hostSystem, esxVI_VirtualMachineMovePriority_DefaultPriority, esxVI_VirtualMachinePowerState_Undefined, &task) < 0 || @@ -3245,11 +3184,8 @@ esxDomainMigratePerform(virDomainPtr domain, result = 0; cleanup: - xmlFreeURI(xmlUri); + xmlFreeURI(parsedUri); esxVI_ObjectContent_Free(&virtualMachine); - esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&hostSystem); - esxVI_ManagedObjectReference_Free(&resourcePool); esxVI_Event_Free(&eventList); esxVI_ManagedObjectReference_Free(&task); @@ -3276,41 +3212,19 @@ esxNodeGetFreeMemory(virConnectPtr conn) unsigned long long result = 0; esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *hostSystem = NULL; - esxVI_ManagedObjectReference *managedObjectReference = NULL; esxVI_ObjectContent *resourcePool = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_ResourcePoolResourceUsage *resourcePoolResourceUsage = NULL; - if (priv->host == NULL) { - /* FIXME: Currently no host for a vpx:// connection */ - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve free memory for a vpx:// connection")); - return 0; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return 0; } - /* Lookup host system with its resource pool */ - if (esxVI_String_AppendValueToList(&propertyNameList, "parent") < 0 || - esxVI_LookupHostSystemByIp(priv->host, priv->host->ipAddress, - propertyNameList, &hostSystem) < 0) { - goto cleanup; - } - - if (esxVI_LookupResourcePoolByHostSystem(priv->host, hostSystem, - &managedObjectReference) < 0) { - goto cleanup; - } - - esxVI_String_Free(&propertyNameList); - /* Get memory usage of resource pool */ if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.memory") < 0 || - esxVI_LookupObjectContentByType(priv->host, managedObjectReference, + esxVI_LookupObjectContentByType(priv->primary, + priv->primary->computeResource->resourcePool, "ResourcePool", propertyNameList, esxVI_Boolean_False, &resourcePool) < 0) { @@ -3341,8 +3255,6 @@ esxNodeGetFreeMemory(virConnectPtr conn) cleanup: esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&hostSystem); - esxVI_ManagedObjectReference_Free(&managedObjectReference); esxVI_ObjectContent_Free(&resourcePool); esxVI_ResourcePoolResourceUsage_Free(&resourcePoolResourceUsage); diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 9f25e02..b0ccc32 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -78,9 +78,7 @@ esxNumberOfStoragePools(virConnectPtr conn) return -1; } - if (esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter, - "Datastore", NULL, esxVI_Boolean_True, - &datastoreList) < 0) { + if (esxVI_LookupDatastoreList(priv->primary, NULL, &datastoreList) < 0) { return -1; } @@ -123,10 +121,8 @@ esxListStoragePools(virConnectPtr conn, char **const names, int maxnames) if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupObjectContentByType(priv->primary, priv->primary->datacenter, - "Datastore", propertyNameList, - esxVI_Boolean_True, - &datastoreList) < 0) { + esxVI_LookupDatastoreList(priv->primary, propertyNameList, + &datastoreList) < 0) { goto cleanup; } @@ -308,15 +304,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) char *name = NULL; virStoragePoolPtr pool = NULL; - /* FIXME: Need to handle this for a vpx:// connection */ - if (priv->host == NULL || - ! (priv->host->productVersion & esxVI_ProductVersion_ESX)) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Lookup by UUID is supported on ESX only")); - return NULL; - } - - if (esxVI_EnsureSession(priv->host) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } @@ -334,7 +322,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) * part of the 'summary.url' property if there is no name match. */ if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupDatastoreByName(priv->host, uuid_string, + esxVI_LookupDatastoreByName(priv->primary, uuid_string, propertyNameList, &datastore, esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; @@ -350,7 +338,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (datastore == NULL && STREQ(uuid_string + 17, "-0000-000000000000")) { uuid_string[17] = '\0'; - if (esxVI_LookupDatastoreByName(priv->host, uuid_string, + if (esxVI_LookupDatastoreByName(priv->primary, uuid_string, propertyNameList, &datastore, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 5695881..9f2ac36 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -101,10 +101,11 @@ ESX_VI__TEMPLATE__FREE(Context, VIR_FREE(item->password); esxVI_ServiceContent_Free(&item->service); esxVI_UserSession_Free(&item->session); - esxVI_ManagedObjectReference_Free(&item->datacenter); - esxVI_ManagedObjectReference_Free(&item->vmFolder); - esxVI_ManagedObjectReference_Free(&item->hostFolder); + esxVI_Datacenter_Free(&item->datacenter); + esxVI_ComputeResource_Free(&item->computeResource); + esxVI_HostSystem_Free(&item->hostSystem); esxVI_SelectionSpec_Free(&item->fullTraversalSpecList); + esxVI_SelectionSpec_Free(&item->fullTraversalSpecList2); }); static size_t @@ -279,11 +280,6 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, const char *password, esxUtil_ParsedUri *parsedUri) { - int result = -1; - esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *datacenterList = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - if (ctx == NULL || url == NULL || ipAddress == NULL || username == NULL || password == NULL || ctx->url != NULL || ctx->service != NULL || ctx->curl_handle != NULL || ctx->curl_headers != NULL) { @@ -293,7 +289,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (esxVI_String_DeepCopyValue(&ctx->url, url) < 0 || esxVI_String_DeepCopyValue(&ctx->ipAddress, ipAddress) < 0) { - goto cleanup; + return -1; } ctx->curl_handle = curl_easy_init(); @@ -301,7 +297,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->curl_handle == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize CURL")); - goto cleanup; + return -1; } ctx->curl_headers = curl_slist_append(ctx->curl_headers, "Content-Type: " @@ -321,7 +317,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->curl_headers == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not build CURL header list")); - goto cleanup; + return -1; } curl_easy_setopt(ctx->curl_handle, CURLOPT_URL, ctx->url); @@ -357,7 +353,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (virMutexInit(&ctx->curl_lock) < 0) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize CURL mutex")); - goto cleanup; + return -1; } ctx->username = strdup(username); @@ -365,11 +361,11 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->username == NULL || ctx->password == NULL) { virReportOOMError(); - goto cleanup; + return -1; } if (esxVI_RetrieveServiceContent(ctx, &ctx->service) < 0) { - goto cleanup; + return -1; } if (STREQ(ctx->service->about->apiType, "HostAgent") || @@ -389,7 +385,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VI API major/minor version '2.5' or '4.x' " "but found '%s'"), ctx->service->about->apiVersion); - goto cleanup; + return -1; } if (STREQ(ctx->service->about->productLineId, "gsx")) { @@ -399,7 +395,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting GSX major/minor version '2.0' but " "found '%s'"), ctx->service->about->version); - goto cleanup; + return -1; } } else if (STREQ(ctx->service->about->productLineId, "esx") || STREQ(ctx->service->about->productLineId, "embeddedEsx")) { @@ -419,7 +415,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Expecting ESX major/minor version '3.5' or " "'4.x' but found '%s'"), ctx->service->about->version); - goto cleanup; + return -1; } } else if (STREQ(ctx->service->about->productLineId, "vpx")) { if (STRPREFIX(ctx->service->about->version, "2.5")) { @@ -437,36 +433,67 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VPX major/minor version '2.5' or '4.x' " "but found '%s'"), ctx->service->about->version); - goto cleanup; + return -1; } } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " "or 'vpx' but found '%s'"), ctx->service->about->productLineId); - goto cleanup; + return -1; } } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " "but found '%s'"), ctx->service->about->apiType); - goto cleanup; + return -1; } - if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0) { - goto cleanup; + if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || + esxVI_BuildFullTraversalSpecList(&ctx->fullTraversalSpecList) < 0) { + return -1; } - esxVI_BuildFullTraversalSpecList(&ctx->fullTraversalSpecList); + /* Folder -> parent (Folder, Datacenter) */ + if (esxVI_BuildFullTraversalSpecItem(&ctx->fullTraversalSpecList2, + "managedEntityToParent", + "ManagedEntity", "parent", + NULL) < 0) { + return -1; + } - if (esxVI_String_AppendValueListToList(&propertyNameList, - "vmFolder\0" - "hostFolder\0") < 0) { - goto cleanup; + /* ComputeResource -> parent (Folder) */ + if (esxVI_BuildFullTraversalSpecItem(&ctx->fullTraversalSpecList2, + "computeResourceToParent", + "ComputeResource", "parent", + "managedEntityToParent\0") < 0) { + return -1; } - /* Get pointer to Datacenter for later use */ - if (esxVI_LookupObjectContentByType(ctx, ctx->service->rootFolder, + return 0; +} + +int +esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, + esxUtil_ParsedUri *parsedUri) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + char *name = NULL; + esxVI_ObjectContent *datacenterList = NULL; + esxVI_ObjectContent *datacenter = NULL; + esxVI_ObjectContent *computeResourceList = NULL; + esxVI_ObjectContent *computeResource = NULL; + char *hostSystemName = NULL; + esxVI_ObjectContent *hostSystemList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + + /* Lookup Datacenter */ + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0" + "vmFolder\0" + "hostFolder\0") < 0 || + esxVI_LookupObjectContentByType(ctx, ctx->service->rootFolder, "Datacenter", propertyNameList, esxVI_Boolean_True, &datacenterList) < 0) { @@ -475,36 +502,156 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (datacenterList == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve the 'datacenter' object from the " - "VI host/center")); + _("Could not retrieve datacenter list")); goto cleanup; } - ctx->datacenter = datacenterList->obj; - datacenterList->obj = NULL; + if (parsedUri->path_datacenter != NULL) { + for (datacenter = datacenterList; datacenter != NULL; + datacenter = datacenter->_next) { + name = NULL; - /* Get pointer to vmFolder and hostFolder for later use */ - for (dynamicProperty = datacenterList->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "vmFolder")) { - if (esxVI_ManagedObjectReference_CastFromAnyType - (dynamicProperty->val, &ctx->vmFolder)) { + if (esxVI_GetStringValue(datacenter, "name", &name, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - } else if (STREQ(dynamicProperty->name, "hostFolder")) { - if (esxVI_ManagedObjectReference_CastFromAnyType - (dynamicProperty->val, &ctx->hostFolder)) { + + if (STREQ(name, parsedUri->path_datacenter)) { + break; + } + } + + if (datacenter == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datacenter '%s'"), + parsedUri->path_datacenter); + goto cleanup; + } + } else { + datacenter = datacenterList; + } + + if (esxVI_Datacenter_CastFromObjectContent(datacenter, + &ctx->datacenter) < 0) { + goto cleanup; + } + + /* Lookup ComputeResource */ + esxVI_String_Free(&propertyNameList); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0" + "host\0" + "resourcePool\0") < 0 || + esxVI_LookupObjectContentByType(ctx, ctx->datacenter->hostFolder, + "ComputeResource", propertyNameList, + esxVI_Boolean_True, + &computeResourceList) < 0) { + goto cleanup; + } + + if (computeResourceList == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve compute resource list")); + goto cleanup; + } + + if (parsedUri->path_computeResource != NULL) { + for (computeResource = computeResourceList; computeResource != NULL; + computeResource = computeResource->_next) { + name = NULL; + + if (esxVI_GetStringValue(computeResource, "name", &name, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + + if (STREQ(name, parsedUri->path_computeResource)) { + break; + } } + + if (computeResource == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find compute resource '%s'"), + parsedUri->path_computeResource); + goto cleanup; + } + } else { + computeResource = computeResourceList; + } + + if (esxVI_ComputeResource_CastFromObjectContent(computeResource, + &ctx->computeResource) < 0) { + goto cleanup; + } + + if (ctx->computeResource->resourcePool == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve resource pool")); + goto cleanup; + } + + /* Lookup HostSystem */ + if (parsedUri->path_hostSystem == NULL && + STREQ(ctx->computeResource->_reference->type, + "ClusterComputeResource")) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Path has to specify the host system")); + goto cleanup; } - if (ctx->vmFolder == NULL || ctx->hostFolder == NULL) { + esxVI_String_Free(&propertyNameList); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0") < 0 || + esxVI_LookupObjectContentByType(ctx, ctx->computeResource->_reference, + "HostSystem", propertyNameList, + esxVI_Boolean_True, + &hostSystemList) < 0) { + goto cleanup; + } + + if (hostSystemList == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("The 'datacenter' object is missing the " - "'vmFolder'/'hostFolder' property")); + _("Could not retrieve host system list")); + goto cleanup; + } + + if (parsedUri->path_hostSystem != NULL || + (parsedUri->path_computeResource != NULL && + parsedUri->path_hostSystem == NULL)) { + if (parsedUri->path_hostSystem != NULL) { + hostSystemName = parsedUri->path_hostSystem; + } else { + hostSystemName = parsedUri->path_computeResource; + } + + for (hostSystem = hostSystemList; hostSystem != NULL; + hostSystem = hostSystem->_next) { + name = NULL; + + if (esxVI_GetStringValue(hostSystem, "name", &name, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + if (STREQ(name, hostSystemName)) { + break; + } + } + + if (hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find host system '%s'"), hostSystemName); + goto cleanup; + } + } else { + hostSystem = hostSystemList; + } + + if (esxVI_HostSystem_CastFromObjectContent(hostSystem, + &ctx->hostSystem) < 0) { goto cleanup; } @@ -513,6 +660,110 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datacenterList); + esxVI_ObjectContent_Free(&computeResourceList); + esxVI_ObjectContent_Free(&hostSystemList); + + return result; +} + +int +esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, + const char *hostSystemIpAddress) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_ManagedObjectReference *managedObjectReference = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_ObjectContent *computeResource = NULL; + esxVI_ObjectContent *datacenter = NULL; + + /* Lookup HostSystem */ + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0") < 0 || + esxVI_FindByIp(ctx, NULL, hostSystemIpAddress, esxVI_Boolean_False, + &managedObjectReference) < 0 || + esxVI_LookupObjectContentByType(ctx, managedObjectReference, + "HostSystem", propertyNameList, + esxVI_Boolean_False, &hostSystem) < 0) { + goto cleanup; + } + + if (hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve host system")); + goto cleanup; + } + + if (esxVI_HostSystem_CastFromObjectContent(hostSystem, + &ctx->hostSystem) < 0) { + goto cleanup; + } + + /* Lookup ComputeResource */ + esxVI_String_Free(&propertyNameList); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0" + "host\0" + "resourcePool\0") < 0 || + esxVI_LookupObjectContentByType(ctx, hostSystem->obj, + "ComputeResource", propertyNameList, + esxVI_Boolean_True, + &computeResource) < 0) { + goto cleanup; + } + + if (computeResource == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve compute resource of host system")); + goto cleanup; + } + + if (esxVI_ComputeResource_CastFromObjectContent(computeResource, + &ctx->computeResource) < 0) { + goto cleanup; + } + + /* Lookup Datacenter */ + esxVI_String_Free(&propertyNameList); + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "name\0" + "vmFolder\0" + "hostFolder\0") < 0 || + esxVI_LookupObjectContentByType(ctx, computeResource->obj, + "Datacenter", propertyNameList, + /* FIXME: Passing Undefined here is a hack until + * esxVI_LookupObjectContentByType supports more + * fine grained traversal configuration. Looking + * up the Datacenter from the ComputeResource + * requiers an upward search. Putting this in the + * list with the other downward traversal rules + * would result in cyclic searching */ + esxVI_Boolean_Undefined, + &datacenter) < 0) { + goto cleanup; + } + + if (datacenter == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve datacenter of compute resource")); + goto cleanup; + } + + if (esxVI_Datacenter_CastFromObjectContent(datacenter, + &ctx->datacenter) < 0) { + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ManagedObjectReference_Free(&managedObjectReference); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_ObjectContent_Free(&computeResource); + esxVI_ObjectContent_Free(&datacenter); return result; } @@ -1219,82 +1470,64 @@ esxVI_BuildFullTraversalSpecList(esxVI_SelectionSpec **fullTraversalSpecList) return -1; } + /* Folder -> childEntity (ManagedEntity) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "visitFolders", + "folderToChildEntity", "Folder", "childEntity", - "visitFolders\0" - "datacenterToDatastore\0" - "datacenterToVmFolder\0" - "datacenterToHostFolder\0" - "computeResourceToHost\0" - "computeResourceToResourcePool\0" - "hostSystemToVm\0" - "resourcePoolToVm\0") < 0) { + "folderToChildEntity\0") < 0) { goto failure; } - /* Traversal through datastore branch */ + /* ComputeResource -> host (HostSystem) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "datacenterToDatastore", - "Datacenter", "datastore", + "computeResourceToHost", + "ComputeResource", "host", NULL) < 0) { goto failure; } - /* Traversal through vmFolder branch */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "datacenterToVmFolder", - "Datacenter", "vmFolder", - "visitFolders\0") < 0) { - goto failure; - } - - /* Traversal through hostFolder branch */ + /* ComputeResource -> datastore (Datastore) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "datacenterToHostFolder", - "Datacenter", "hostFolder", - "visitFolders\0") < 0) { + "computeResourceToDatastore", + "ComputeResource", "datastore", + NULL) < 0) { goto failure; } - /* Traversal through host branch */ + /* ResourcePool -> resourcePool (ResourcePool) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "computeResourceToHost", - "ComputeResource", "host", - NULL) < 0) { + "resourcePoolToResourcePool", + "ResourcePool", "resourcePool", + "resourcePoolToResourcePool\0" + "resourcePoolToVm\0") < 0) { goto failure; } - /* Traversal through resourcePool branch */ + /* ResourcePool -> vm (VirtualMachine) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "computeResourceToResourcePool", - "ComputeResource", "resourcePool", - "resourcePoolToResourcePool\0" - "resourcePoolToVm\0") < 0) { + "resourcePoolToVm", + "ResourcePool", "vm", NULL) < 0) { goto failure; } - /* Recurse through all resource pools */ + /* HostSystem -> parent (ComputeResource) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "resourcePoolToResourcePool", - "ResourcePool", "resourcePool", - "resourcePoolToResourcePool\0" - "resourcePoolToVm\0") < 0) { + "hostSystemToParent", + "HostSystem", "parent", NULL) < 0) { goto failure; } - /* Recurse through all hosts */ + /* HostSystem -> vm (VirtualMachine) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, "hostSystemToVm", - "HostSystem", "vm", - "visitFolders\0") < 0) { + "HostSystem", "vm", NULL) < 0) { goto failure; } - /* Recurse through all resource pools */ + /* HostSystem -> datastore (Datastore) */ if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "resourcePoolToVm", - "ResourcePool", "vm", NULL) < 0) { + "hostSystemToDatastore", + "HostSystem", "datastore", NULL) < 0) { goto failure; } @@ -1422,6 +1655,11 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, return -1; } + if (objectContentList == NULL || *objectContentList != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + if (esxVI_ObjectSpec_Alloc(&objectSpec) < 0) { return -1; } @@ -1431,6 +1669,8 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, if (recurse == esxVI_Boolean_True) { objectSpec->selectSet = ctx->fullTraversalSpecList; + } else if (recurse == esxVI_Boolean_Undefined) { + objectSpec->selectSet = ctx->fullTraversalSpecList2; } if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) { @@ -1669,9 +1909,8 @@ esxVI_LookupNumberOfDomainsByPowerState(esxVI_Context *ctx, if (esxVI_String_AppendValueToList(&propertyNameList, "runtime.powerState") < 0 || - esxVI_LookupObjectContentByType(ctx, ctx->vmFolder, "VirtualMachine", - propertyNameList, esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(ctx, propertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -1965,125 +2204,28 @@ esxVI_GetSnapshotTreeBySnapshot -int -esxVI_LookupResourcePoolByHostSystem - (esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool) +int esxVI_LookupHostSystemProperties(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **hostSystem) { - int result = -1; - esxVI_String *propertyNameList = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_ManagedObjectReference *managedObjectReference = NULL; - esxVI_ObjectContent *computeResource = NULL; - - if (resourcePool == NULL || *resourcePool != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } - - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "parent")) { - if (esxVI_ManagedObjectReference_CastFromAnyType - (dynamicProperty->val, &managedObjectReference) < 0) { - goto cleanup; - } - - break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } - } - - if (managedObjectReference == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve compute resource of host system")); - goto cleanup; - } - - if (esxVI_String_AppendValueToList(&propertyNameList, "resourcePool") < 0 || - esxVI_LookupObjectContentByType(ctx, managedObjectReference, - "ComputeResource", propertyNameList, - esxVI_Boolean_False, - &computeResource) < 0) { - goto cleanup; - } - - if (computeResource == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve compute resource of host system")); - goto cleanup; - } - - for (dynamicProperty = computeResource->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "resourcePool")) { - if (esxVI_ManagedObjectReference_CastFromAnyType - (dynamicProperty->val, resourcePool) < 0) { - goto cleanup; - } - - break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } - } - - if ((*resourcePool) == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not retrieve resource pool of compute resource")); - goto cleanup; - } - - result = 0; - - cleanup: - esxVI_String_Free(&propertyNameList); - esxVI_ManagedObjectReference_Free(&managedObjectReference); - esxVI_ObjectContent_Free(&computeResource); - - return result; + return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, + "HostSystem", propertyNameList, + esxVI_Boolean_False, hostSystem); } int -esxVI_LookupHostSystemByIp(esxVI_Context *ctx, const char *ipAddress, - esxVI_String *propertyNameList, - esxVI_ObjectContent **hostSystem) +esxVI_LookupVirtualMachineList(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **virtualMachineList) { - int result = -1; - esxVI_ManagedObjectReference *managedObjectReference = NULL; - - if (hostSystem == NULL || *hostSystem != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } - - if (esxVI_FindByIp(ctx, ctx->datacenter, ipAddress, esxVI_Boolean_False, - &managedObjectReference) < 0) { - return -1; - } - - if (managedObjectReference == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not find host system with IP address '%s'"), - ipAddress); - goto cleanup; - } - - if (esxVI_LookupObjectContentByType(ctx, managedObjectReference, - "HostSystem", propertyNameList, - esxVI_Boolean_False, hostSystem) < 0) { - goto cleanup; - } - - result = 0; - - cleanup: - esxVI_ManagedObjectReference_Free(&managedObjectReference); - - return result; + /* FIXME: Switch from ctx->hostSystem to ctx->computeResource->resourcePool + * for cluster support */ + return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + virtualMachineList); } @@ -2105,8 +2247,8 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, virUUIDFormat(uuid, uuid_string); - if (esxVI_FindByUuid(ctx, ctx->datacenter, uuid_string, esxVI_Boolean_True, - &managedObjectReference) < 0) { + if (esxVI_FindByUuid(ctx, ctx->datacenter->_reference, uuid_string, + esxVI_Boolean_True, &managedObjectReference) < 0) { return -1; } @@ -2158,10 +2300,8 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, if (esxVI_String_DeepCopyList(&completePropertyNameList, propertyNameList) < 0 || esxVI_String_AppendValueToList(&completePropertyNameList, "name") < 0 || - esxVI_LookupObjectContentByType(ctx, ctx->vmFolder, "VirtualMachine", - completePropertyNameList, - esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupVirtualMachineList(ctx, completePropertyNameList, + &virtualMachineList) < 0) { goto cleanup; } @@ -2260,6 +2400,19 @@ esxVI_LookupVirtualMachineByUuidAndPrepareForTask int +esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList, + esxVI_ObjectContent **datastoreList) +{ + /* FIXME: Switch from ctx->hostSystem to ctx->computeResource for cluster + * support */ + return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, + "Datastore", propertyNameList, + esxVI_Boolean_True, datastoreList); +} + + + +int esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_String *propertyNameList, esxVI_ObjectContent **datastore, @@ -2285,14 +2438,9 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_String_AppendValueListToList(&completePropertyNameList, "summary.accessible\0" "summary.name\0" - "summary.url\0") < 0) { - goto cleanup; - } - - if (esxVI_LookupObjectContentByType(ctx, ctx->datacenter, "Datastore", - completePropertyNameList, - esxVI_Boolean_True, - &datastoreList) < 0) { + "summary.url\0") < 0 || + esxVI_LookupDatastoreList(ctx, completePropertyNameList, + &datastoreList) < 0) { goto cleanup; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 325ba69..a23c56d 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -158,10 +158,11 @@ struct _esxVI_Context { esxVI_APIVersion apiVersion; esxVI_ProductVersion productVersion; esxVI_UserSession *session; - esxVI_ManagedObjectReference *datacenter; - esxVI_ManagedObjectReference *vmFolder; - esxVI_ManagedObjectReference *hostFolder; + esxVI_Datacenter *datacenter; + esxVI_ComputeResource *computeResource; + esxVI_HostSystem *hostSystem; esxVI_SelectionSpec *fullTraversalSpecList; + esxVI_SelectionSpec *fullTraversalSpecList2; }; int esxVI_Context_Alloc(esxVI_Context **ctx); @@ -169,6 +170,10 @@ void esxVI_Context_Free(esxVI_Context **ctx); int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress, const char *url, const char *username, const char *password, esxUtil_ParsedUri *parsedUri); +int esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, + esxUtil_ParsedUri *parsedUri); +int esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, + const char *hostSystemIpAddress); int esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, char **content); int esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, @@ -327,13 +332,13 @@ int esxVI_GetSnapshotTreeBySnapshot esxVI_ManagedObjectReference *snapshot, esxVI_VirtualMachineSnapshotTree **snapshotTree); -int esxVI_LookupResourcePoolByHostSystem - (esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool); +int esxVI_LookupHostSystemProperties(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **hostSystem); -int esxVI_LookupHostSystemByIp(esxVI_Context *ctx, const char *ipAddress, - esxVI_String *propertyNameList, - esxVI_ObjectContent **hostSystem); +int esxVI_LookupVirtualMachineList(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **virtualMachineList); int esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, @@ -351,6 +356,9 @@ int esxVI_LookupVirtualMachineByUuidAndPrepareForTask esxVI_String *propertyNameList, esxVI_ObjectContent **virtualMachine, esxVI_Boolean autoAnswer); +int esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList, + esxVI_ObjectContent **datastoreList); + int esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_String *propertyNameList, esxVI_ObjectContent **datastore, diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 8905ffd..807c6db 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -2711,6 +2711,10 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def, case esxVI_ProductVersion_ESX40: case esxVI_ProductVersion_ESX41: case esxVI_ProductVersion_ESX4x: + /* FIXME: Putting VPX* here is a hack until a more fine grained system is in place */ + case esxVI_ProductVersion_VPX40: + case esxVI_ProductVersion_VPX41: + case esxVI_ProductVersion_VPX4x: virBufferAddLit(&buffer, "virtualHW.version = \"7\"\n"); break; -- 1.7.0.4

2 4

[libvirt] [PATCH] esx: Set storage pool target path to host.mountInfo.path
by Matthias Bolte 02 Aug '10

02 Aug '10

Now all storage pool types expose the target path. --- src/esx/esx_storage_driver.c | 114 ++++++++++++++++++----------------------- src/esx/esx_vi.c | 68 +++++++++++++++++++++++++ src/esx/esx_vi.h | 4 ++ src/esx/esx_vi_generator.py | 2 +- 4 files changed, 123 insertions(+), 65 deletions(-) diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index e0680a1..4fcc4af 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -194,11 +194,8 @@ static virStoragePoolPtr esxStoragePoolLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->storagePrivateData; - esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *datastore = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_DatastoreHostMount *datastoreHostMountList = NULL; - esxVI_DatastoreHostMount *datastoreHostMount = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; char *suffix = NULL; int suffixLength; char uuid_string[VIR_UUID_STRING_BUFLEN] = "00000000-00000000-0000-000000000000"; @@ -209,9 +206,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) return NULL; } - if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 || - esxVI_LookupDatastoreByName(priv->primary, name, - propertyNameList, &datastore, + if (esxVI_LookupDatastoreByName(priv->primary, name, NULL, &datastore, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } @@ -232,30 +227,12 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) * The object name of virtual machine contains an integer, we use that as * domain ID. */ - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "host")) { - if (esxVI_DatastoreHostMount_CastListFromAnyType - (dynamicProperty->val, &datastoreHostMountList) < 0) { - goto cleanup; - } - - break; - } + if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount) < 0) { + goto cleanup; } - for (datastoreHostMount = datastoreHostMountList; datastoreHostMount != NULL; - datastoreHostMount = datastoreHostMount->_next) { - if (STRNEQ(priv->primary->hostSystem->_reference->value, - datastoreHostMount->key->value)) { - continue; - } - - if ((suffix = STRSKIP(datastoreHostMount->mountInfo->path, - "/vmfs/volumes/")) == NULL) { - break; - } - + if ((suffix = STRSKIP(hostMount->mountInfo->path, "/vmfs/volumes/")) != NULL) { suffixLength = strlen(suffix); if ((suffixLength == 35 && /* = strlen("4b0beca7-7fd401f3-1d7f-000ae484a6a3") */ @@ -284,9 +261,8 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) pool = virGetStoragePool(conn, name, uuid); cleanup: - esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); - esxVI_DatastoreHostMount_Free(&datastoreHostMountList); + esxVI_DatastoreHostMount_Free(&hostMount); return pool; } @@ -481,13 +457,12 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) esxPrivate *priv = pool->conn->storagePrivateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_Boolean accessible = esxVI_Boolean_Undefined; virStoragePoolDef def; esxVI_DatastoreInfo *info = NULL; - esxVI_LocalDatastoreInfo *localInfo = NULL; esxVI_NasDatastoreInfo *nasInfo = NULL; - esxVI_VmfsDatastoreInfo *vmfsInfo = NULL; char *xml = NULL; virCheckFlags(0, NULL); @@ -507,13 +482,17 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) propertyNameList, &datastore, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetBoolean(datastore, "summary.accessible", - &accessible, esxVI_Occurrence_RequiredItem) < 0) { + &accessible, esxVI_Occurrence_RequiredItem) < 0 || + esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount) < 0) { goto cleanup; } def.name = pool->name; memcpy(def.uuid, pool->uuid, VIR_UUID_BUFLEN); + def.target.path = hostMount->mountInfo->path; + if (accessible == esxVI_Boolean_True) { for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { @@ -531,46 +510,52 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) } def.available = dynamicProperty->val->int64; - } else if (STREQ(dynamicProperty->name, "info")) { - if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, - &info) < 0) { - goto cleanup; - } } } def.allocation = def.capacity - def.available; + } - /* See vSphere API documentation about HostDatastoreSystem for details */ - if ((localInfo = esxVI_LocalDatastoreInfo_DynamicCast(info)) != NULL) { - def.type = VIR_STORAGE_POOL_DIR; - def.target.path = localInfo->path; - } else if ((nasInfo = esxVI_NasDatastoreInfo_DynamicCast(info)) != NULL) { - def.type = VIR_STORAGE_POOL_NETFS; - def.source.host.name = nasInfo->nas->remoteHost; - def.source.dir = nasInfo->nas->remotePath; - - if (STRCASEEQ(nasInfo->nas->type, "NFS")) { - def.source.format = VIR_STORAGE_POOL_NETFS_NFS; - } else if (STRCASEEQ(nasInfo->nas->type, "CIFS")) { - def.source.format = VIR_STORAGE_POOL_NETFS_CIFS; - } else { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore has unexpected type '%s'"), - nasInfo->nas->type); + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "info")) { + if (esxVI_DatastoreInfo_CastFromAnyType(dynamicProperty->val, + &info) < 0) { goto cleanup; } - } else if ((vmfsInfo = esxVI_VmfsDatastoreInfo_DynamicCast(info)) != NULL) { - def.type = VIR_STORAGE_POOL_FS; - /* - * FIXME: I'm not sure how to represent the source and target of a - * VMFS based datastore in libvirt terms - */ + + break; + } + } + + /* See vSphere API documentation about HostDatastoreSystem for details */ + if (esxVI_LocalDatastoreInfo_DynamicCast(info) != NULL) { + def.type = VIR_STORAGE_POOL_DIR; + } else if ((nasInfo = esxVI_NasDatastoreInfo_DynamicCast(info)) != NULL) { + def.type = VIR_STORAGE_POOL_NETFS; + def.source.host.name = nasInfo->nas->remoteHost; + def.source.dir = nasInfo->nas->remotePath; + + if (STRCASEEQ(nasInfo->nas->type, "NFS")) { + def.source.format = VIR_STORAGE_POOL_NETFS_NFS; + } else if (STRCASEEQ(nasInfo->nas->type, "CIFS")) { + def.source.format = VIR_STORAGE_POOL_NETFS_CIFS; } else { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("DatastoreInfo has unexpected type")); + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Datastore has unexpected type '%s'"), + nasInfo->nas->type); goto cleanup; } + } else if (esxVI_VmfsDatastoreInfo_DynamicCast(info) != NULL) { + def.type = VIR_STORAGE_POOL_FS; + /* + * FIXME: I'm not sure how to represent the source and target of a + * VMFS based datastore in libvirt terms + */ + } else { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("DatastoreInfo has unexpected type")); + goto cleanup; } xml = virStoragePoolDefFormat(&def); @@ -578,6 +563,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreHostMount_Free(&hostMount); esxVI_DatastoreInfo_Free(&info); return xml; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index f421502..55c5246 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2566,6 +2566,74 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, int +esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, + esxVI_ManagedObjectReference *datastore, + esxVI_DatastoreHostMount **hostMount) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *objectContent = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_DatastoreHostMount *hostMountList = NULL; + esxVI_DatastoreHostMount *candidate = NULL; + + if (hostMount == NULL || *hostMount != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 || + esxVI_LookupObjectContentByType(ctx, datastore, "Datastore", + propertyNameList, esxVI_Boolean_False, + &objectContent) < 0) { + goto cleanup; + } + + for (dynamicProperty = objectContent->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "host")) { + if (esxVI_DatastoreHostMount_CastListFromAnyType + (dynamicProperty->val, &hostMountList) < 0) { + goto cleanup; + } + + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + for (candidate = hostMountList; candidate != NULL; + candidate = candidate->_next) { + if (STRNEQ(ctx->hostSystem->_reference->value, candidate->key->value)) { + continue; + } + + if (esxVI_DatastoreHostMount_DeepCopy(hostMount, candidate) < 0) { + goto cleanup; + } + + break; + } + + if (*hostMount == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not lookup datastore host mount")); + goto cleanup; + } + + result = 0; + + cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&objectContent); + esxVI_DatastoreHostMount_Free(&hostMountList); + + return result; +} + + +int esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, esxVI_TaskInfo **taskInfo) diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index fdd15f1..d5dc9d5 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -370,6 +370,10 @@ int esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, esxVI_ObjectContent **datastore, esxVI_Occurrence occurrence); +int esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, + esxVI_ManagedObjectReference *datastore, + esxVI_DatastoreHostMount **hostMount); + int esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, esxVI_TaskInfo **taskInfo); diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index e3c3d14..411fd80 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1127,7 +1127,7 @@ additional_enum_features = { "ManagedEntityStatus" : Enum.FEATURE__ANY_TYPE "VirtualMachinePowerState" : Enum.FEATURE__ANY_TYPE } -additional_object_features = { "DatastoreHostMount" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, +additional_object_features = { "DatastoreHostMount" : Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, "DatastoreInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST, "Event" : Object.FEATURE__LIST, "FileInfo" : Object.FEATURE__DYNAMIC_CAST, -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Make storage pool lookup by name and UUID more robust
by Matthias Bolte 02 Aug '10

02 Aug '10

Don't rely on summary.url anymore, because its value is different between an esx:// and vpx:// connection. Use host.mountInfo.path instead. Don't fallback to lookup by UUID (actually lookup by absolute path) in esxVI_LookupDatastoreByName when lookup by name fails. Add a seperate function for this: esxVI_LookupDatastoreByAbsolutePath --- src/esx/esx_driver.c | 8 +- src/esx/esx_storage_driver.c | 107 ++++++++++++++------------ src/esx/esx_util.c | 22 +++--- src/esx/esx_util.h | 5 +- src/esx/esx_vi.c | 171 ++++++++++++++++++++-------------------- src/esx/esx_vi.h | 6 ++ src/esx/esx_vi_generator.input | 13 +++ src/esx/esx_vi_generator.py | 3 +- src/esx/esx_vmx.c | 65 +++++++-------- src/esx/esx_vmx.h | 3 +- tests/esxutilstest.c | 14 ++-- 11 files changed, 221 insertions(+), 196 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index fd87078..d824371 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2193,8 +2193,8 @@ esxDomainDumpXML(virDomainPtr domain, int flags) goto cleanup; } - if (esxUtil_ParseDatastoreRelatedPath(vmPathName, &datastoreName, - &directoryName, &fileName) < 0) { + if (esxUtil_ParseDatastorePath(vmPathName, &datastoreName, &directoryName, + &fileName) < 0) { goto cleanup; } @@ -2572,8 +2572,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) goto cleanup; } - if (esxUtil_ParseDatastoreRelatedPath(disk->src, &datastoreName, - &directoryName, &fileName) < 0) { + if (esxUtil_ParseDatastorePath(disk->src, &datastoreName, &directoryName, + &fileName) < 0) { goto cleanup; } diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index b0ccc32..e0680a1 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -196,61 +196,64 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) esxPrivate *priv = conn->storagePrivateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *datastore = NULL; - esxVI_Boolean accessible = esxVI_Boolean_Undefined; - char *summaryUrl = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_DatastoreHostMount *datastoreHostMountList = NULL; + esxVI_DatastoreHostMount *datastoreHostMount = NULL; char *suffix = NULL; int suffixLength; char uuid_string[VIR_UUID_STRING_BUFLEN] = "00000000-00000000-0000-000000000000"; unsigned char uuid[VIR_UUID_BUFLEN]; - char *realName = NULL; virStoragePoolPtr pool = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } - if (esxVI_String_AppendValueListToList(&propertyNameList, - "summary.accessible\0" - "summary.name\0" - "summary.url\0") < 0 || + if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 || esxVI_LookupDatastoreByName(priv->primary, name, propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0 || - esxVI_GetBoolean(datastore, "summary.accessible", - &accessible, esxVI_Occurrence_RequiredItem) < 0) { + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } /* - * Datastores don't have a UUID. We can use the 'summary.url' property as - * source for a "UUID" on ESX, because the property value has this format: + * Datastores don't have a UUID. We can use the 'host.mountInfo.path' + * property as source for a "UUID" on ESX, because the property value has + * this format: * - * summary.url = /vmfs/volumes/4b0beca7-7fd401f3-1d7f-000ae484a6a3 - * summary.url = /vmfs/volumes/b24b7a78-9d82b4f5 (short format) + * host.mountInfo.path = /vmfs/volumes/4b0beca7-7fd401f3-1d7f-000ae484a6a3 + * host.mountInfo.path = /vmfs/volumes/b24b7a78-9d82b4f5 (short format) * - * The 'summary.url' property comes in two forms, with a complete "UUID" - * and a short "UUID". + * The 'host.mountInfo.path' property comes in two forms, with a complete + * "UUID" and a short "UUID". * * But this trailing "UUID" is not guaranteed to be there. On the other * hand we already rely on another implementation detail of the ESX server: * The object name of virtual machine contains an integer, we use that as * domain ID. - * - * The 'summary.url' property of an inaccessible datastore is invalid. */ - /* FIXME: Need to handle this for a vpx:// connection */ - if (accessible == esxVI_Boolean_True && priv->host != NULL && - priv->host->productVersion & esxVI_ProductVersion_ESX) { - if (esxVI_GetStringValue(datastore, "summary.url", &summaryUrl, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "host")) { + if (esxVI_DatastoreHostMount_CastListFromAnyType + (dynamicProperty->val, &datastoreHostMountList) < 0) { + goto cleanup; + } + + break; } + } - if ((suffix = STRSKIP(summaryUrl, "/vmfs/volumes/")) == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore URL '%s' has unexpected prefix, " - "expecting '/vmfs/volumes/' prefix"), summaryUrl); - goto cleanup; + for (datastoreHostMount = datastoreHostMountList; datastoreHostMount != NULL; + datastoreHostMount = datastoreHostMount->_next) { + if (STRNEQ(priv->primary->hostSystem->_reference->value, + datastoreHostMount->key->value)) { + continue; + } + + if ((suffix = STRSKIP(datastoreHostMount->mountInfo->path, + "/vmfs/volumes/")) == NULL) { + break; } suffixLength = strlen(suffix); @@ -266,8 +269,8 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) */ memcpy(uuid_string, suffix, suffixLength); } else { - VIR_WARN("Datastore URL suffix '%s' has unexpected format, " - "cannot deduce a UUID from it", suffix); + VIR_WARN("Datastore host mount path suffix '%s' has unexpected " + "format, cannot deduce a UUID from it", suffix); } } @@ -278,16 +281,12 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) goto cleanup; } - if (esxVI_GetStringValue(datastore, "summary.name", &realName, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; - } - - pool = virGetStoragePool(conn, realName, uuid); + pool = virGetStoragePool(conn, name, uuid); cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); + esxVI_DatastoreHostMount_Free(&datastoreHostMountList); return pool; } @@ -301,6 +300,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *datastore = NULL; char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; + char *absolutePath = NULL; char *name = NULL; virStoragePoolPtr pool = NULL; @@ -309,7 +309,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) } /* - * Convert from UUID to datastore URL form by stripping the second '-': + * Convert UUID to 'host.mountInfo.path' form by stripping the second '-': * * <---- 14 ----><-------- 22 --------> <---- 13 ---><-------- 22 --------> * 4b0beca7-7fd4-01f3-1d7f-000ae484a6a3 -> 4b0beca7-7fd401f3-1d7f-000ae484a6a3 @@ -317,14 +317,15 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virUUIDFormat(uuid, uuid_string); memmove(uuid_string + 13, uuid_string + 14, 22 + 1); - /* - * Use esxVI_LookupDatastoreByName because it also does try to match "UUID" - * part of the 'summary.url' property if there is no name match. - */ + if (virAsprintf(&absolutePath, "/vmfs/volumes/%s", uuid_string) < 0) { + virReportOOMError(); + goto cleanup; + } + if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupDatastoreByName(priv->primary, uuid_string, - propertyNameList, &datastore, - esxVI_Occurrence_OptionalItem) < 0) { + esxVI_LookupDatastoreByAbsolutePath(priv->primary, absolutePath, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; } @@ -338,9 +339,16 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (datastore == NULL && STREQ(uuid_string + 17, "-0000-000000000000")) { uuid_string[17] = '\0'; - if (esxVI_LookupDatastoreByName(priv->primary, uuid_string, - propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0) { + VIR_FREE(absolutePath); + + if (virAsprintf(&absolutePath, "/vmfs/volumes/%s", uuid_string) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_LookupDatastoreByAbsolutePath(priv->primary, absolutePath, + propertyNameList, &datastore, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } } @@ -348,7 +356,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (datastore == NULL) { virUUIDFormat(uuid, uuid_string); - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + ESX_VI_ERROR(VIR_ERR_NO_STORAGE_POOL, _("Could not find datastore with UUID '%s'"), uuid_string); @@ -363,6 +371,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) pool = virGetStoragePool(conn, name, uuid); cleanup: + VIR_FREE(absolutePath); esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 75a9aaf..7c7c841 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -274,12 +274,11 @@ esxUtil_ParseVirtualMachineIDString(const char *id_string, int *id) int -esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, - char **datastoreName, - char **directoryName, char **fileName) +esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, + char **directoryName, char **fileName) { int result = -1; - char *copyOfDatastoreRelatedPath = NULL; + char *copyOfDatastorePath = NULL; char *tmp = NULL; char *saveptr = NULL; char *preliminaryDatastoreName = NULL; @@ -293,18 +292,17 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, return -1; } - if (esxVI_String_DeepCopyValue(&copyOfDatastoreRelatedPath, - datastoreRelatedPath) < 0) { + if (esxVI_String_DeepCopyValue(&copyOfDatastorePath, datastorePath) < 0) { goto cleanup; } /* Expected format: '[<datastore>] <path>' */ - if ((tmp = STRSKIP(copyOfDatastoreRelatedPath, "[")) == NULL || + if ((tmp = STRSKIP(copyOfDatastorePath, "[")) == NULL || (preliminaryDatastoreName = strtok_r(tmp, "]", &saveptr)) == NULL || (directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore related path '%s' doesn't have expected format " - "'[<datastore>] <path>'"), datastoreRelatedPath); + _("Datastore path '%s' doesn't have expected format " + "'[<datastore>] <path>'"), datastorePath); goto cleanup; } @@ -323,8 +321,8 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, if (*separator == '\0') { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore related path '%s' doesn't reference a file"), - datastoreRelatedPath); + _("Datastore path '%s' doesn't reference a file"), + datastorePath); goto cleanup; } @@ -348,7 +346,7 @@ esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, VIR_FREE(*fileName); } - VIR_FREE(copyOfDatastoreRelatedPath); + VIR_FREE(copyOfDatastorePath); return result; } diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 99ce81d..5799730 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -51,9 +51,8 @@ void esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri); int esxUtil_ParseVirtualMachineIDString(const char *id_string, int *id); -int esxUtil_ParseDatastoreRelatedPath(const char *datastoreRelatedPath, - char **datastoreName, - char **directoryName, char **fileName); +int esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, + char **directoryName, char **fileName); int esxUtil_ResolveHostname(const char *hostname, char *ipAddress, size_t ipAddress_length); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 9f2ac36..f421502 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2422,10 +2422,7 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_String *completePropertyNameList = NULL; esxVI_ObjectContent *datastoreList = NULL; esxVI_ObjectContent *candidate = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_Boolean accessible = esxVI_Boolean_Undefined; - size_t offset = 14; /* = strlen("/vmfs/volumes/") */ - int numInaccessibleDatastores = 0; + char *name_candidate; if (datastore == NULL || *datastore != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -2435,118 +2432,123 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, /* Get all datastores */ if (esxVI_String_DeepCopyList(&completePropertyNameList, propertyNameList) < 0 || - esxVI_String_AppendValueListToList(&completePropertyNameList, - "summary.accessible\0" - "summary.name\0" - "summary.url\0") < 0 || + esxVI_String_AppendValueToList(&completePropertyNameList, + "summary.name") < 0 || esxVI_LookupDatastoreList(ctx, completePropertyNameList, &datastoreList) < 0) { goto cleanup; } - if (datastoreList == NULL) { - if (occurrence == esxVI_Occurrence_OptionalItem) { - goto success; - } else { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("No datastores available")); + /* Search for a matching datastore */ + for (candidate = datastoreList; candidate != NULL; + candidate = candidate->_next) { + name_candidate = NULL; + + if (esxVI_GetStringValue(candidate, "summary.name", &name_candidate, + esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; } + + if (STREQ(name_candidate, name)) { + if (esxVI_ObjectContent_DeepCopy(datastore, candidate) < 0) { + goto cleanup; + } + + // Found datastore with matching name + goto success; + } + } + + if (*datastore == NULL && occurrence != esxVI_Occurrence_OptionalItem) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datastore with name '%s'"), name); + goto cleanup; + } + + success: + result = 0; + + cleanup: + esxVI_String_Free(&completePropertyNameList); + esxVI_ObjectContent_Free(&datastoreList); + + return result; +} + + +int +esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, + const char *absolutePath, + esxVI_String *propertyNameList, + esxVI_ObjectContent **datastore, + esxVI_Occurrence occurrence) +{ + int result = -1; + esxVI_String *completePropertyNameList = NULL; + esxVI_ObjectContent *datastoreList = NULL; + esxVI_ObjectContent *candidate = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_DatastoreHostMount *datastoreHostMountList = NULL; + esxVI_DatastoreHostMount *datastoreHostMount = NULL; + + if (datastore == NULL || *datastore != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + /* Get all datastores */ + if (esxVI_String_DeepCopyList(&completePropertyNameList, + propertyNameList) < 0 || + esxVI_String_AppendValueToList(&completePropertyNameList, "host") < 0 || + esxVI_LookupDatastoreList(ctx, completePropertyNameList, + &datastoreList) < 0) { + goto cleanup; } /* Search for a matching datastore */ for (candidate = datastoreList; candidate != NULL; candidate = candidate->_next) { - accessible = esxVI_Boolean_Undefined; + esxVI_DatastoreHostMount_Free(&datastoreHostMountList); for (dynamicProperty = candidate->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.accessible")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_Boolean) < 0) { + if (STREQ(dynamicProperty->name, "host")) { + if (esxVI_DatastoreHostMount_CastListFromAnyType + (dynamicProperty->val, &datastoreHostMountList) < 0) { goto cleanup; } - accessible = dynamicProperty->val->boolean; break; } } - if (accessible == esxVI_Boolean_Undefined) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Got incomplete response while querying for the " - "datastore 'summary.accessible' property")); - goto cleanup; - } - - if (accessible == esxVI_Boolean_False) { - ++numInaccessibleDatastores; + if (datastoreHostMountList == NULL) { + continue; } - for (dynamicProperty = candidate->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.name")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } - - if (STREQ(dynamicProperty->val->string, name)) { - if (esxVI_ObjectContent_DeepCopy(datastore, - candidate) < 0) { - goto cleanup; - } - - /* Found datastore with matching name */ - goto success; - } - } else if (STREQ(dynamicProperty->name, "summary.url") && - ctx->productVersion & esxVI_ProductVersion_ESX) { - if (accessible == esxVI_Boolean_False) { - /* - * The 'summary.url' property of an inaccessible datastore - * is invalid and cannot be used to identify the datastore. - */ - continue; - } + for (datastoreHostMount = datastoreHostMountList; + datastoreHostMount != NULL; + datastoreHostMount = datastoreHostMount->_next) { + if (STRNEQ(ctx->hostSystem->_reference->value, + datastoreHostMount->key->value)) { + continue; + } - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { + if (STRPREFIX(absolutePath, datastoreHostMount->mountInfo->path)) { + if (esxVI_ObjectContent_DeepCopy(datastore, candidate) < 0) { goto cleanup; } - if (! STRPREFIX(dynamicProperty->val->string, - "/vmfs/volumes/")) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Datastore URL '%s' has unexpected prefix, " - "expecting '/vmfs/volumes/' prefix"), - dynamicProperty->val->string); - goto cleanup; - } - - if (STREQ(dynamicProperty->val->string + offset, name)) { - if (esxVI_ObjectContent_DeepCopy(datastore, - candidate) < 0) { - goto cleanup; - } - - /* Found datastore with matching URL suffix */ - goto success; - } + /* Found datastore with matching mount path */ + goto success; } } } - if (occurrence != esxVI_Occurrence_OptionalItem) { - if (numInaccessibleDatastores > 0) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not find datastore '%s', maybe it's " - "inaccessible"), name); - } else { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not find datastore '%s'"), name); - } - + if (*datastore == NULL && occurrence != esxVI_Occurrence_OptionalItem) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datastore containing absolute path '%s'"), + absolutePath); goto cleanup; } @@ -2556,6 +2558,7 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, cleanup: esxVI_String_Free(&completePropertyNameList); esxVI_ObjectContent_Free(&datastoreList); + esxVI_DatastoreHostMount_Free(&datastoreHostMountList); return result; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index a23c56d..fdd15f1 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -364,6 +364,12 @@ int esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_ObjectContent **datastore, esxVI_Occurrence occurrence); +int esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, + const char *absolutePath, + esxVI_String *propertyNameList, + esxVI_ObjectContent **datastore, + esxVI_Occurrence occurrence); + int esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, esxVI_ManagedObjectReference *task, esxVI_TaskInfo **taskInfo); diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index b4b33f6..ab50ea5 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -146,6 +146,12 @@ object ChoiceOption extends OptionType end +object DatastoreHostMount + ManagedObjectReference key r + HostMountInfo mountInfo r +end + + object DatastoreInfo String name r String url r @@ -251,6 +257,13 @@ object HostFileSystemVolume end +object HostMountInfo + String path o + String accessMode r + Boolean accessible o +end + + object HostNasVolume extends HostFileSystemVolume String remoteHost r String remotePath r diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 44c3493..e3c3d14 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1127,7 +1127,8 @@ additional_enum_features = { "ManagedEntityStatus" : Enum.FEATURE__ANY_TYPE "VirtualMachinePowerState" : Enum.FEATURE__ANY_TYPE } -additional_object_features = { "DatastoreInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST, +additional_object_features = { "DatastoreHostMount" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "DatastoreInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST, "Event" : Object.FEATURE__LIST, "FileInfo" : Object.FEATURE__DYNAMIC_CAST, "FileQuery" : Object.FEATURE__DYNAMIC_CAST, diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 807c6db..1a5e8d3 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -749,8 +749,8 @@ esxVMX_AutodetectSCSIControllerModel(esxVI_Context *ctx, return 0; } - if (esxUtil_ParseDatastoreRelatedPath(def->src, &datastoreName, - &directoryName, &fileName) < 0) { + if (esxUtil_ParseDatastorePath(def->src, &datastoreName, &directoryName, + &fileName) < 0) { goto cleanup; } @@ -986,19 +986,19 @@ esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, char * -esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, - const char *absolutePath) +esxVMX_AbsolutePathToDatastorePath(esxVI_Context *ctx, const char *absolutePath) { bool success = false; char *copyOfAbsolutePath = NULL; char *tmp = NULL; char *saveptr = NULL; - char *datastoreRelatedPath = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + + char *datastorePath = NULL; char *preliminaryDatastoreName = NULL; char *directoryAndFileName = NULL; - esxVI_DynamicProperty *dynamicProperty = NULL; - esxVI_ObjectContent *datastore = NULL; - const char *datastoreName = NULL; + char *datastoreName = NULL; if (esxVI_String_DeepCopyValue(&copyOfAbsolutePath, absolutePath) < 0) { return NULL; @@ -1015,30 +1015,26 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, } if (ctx != NULL) { - if (esxVI_LookupDatastoreByName(ctx, preliminaryDatastoreName, - NULL, &datastore, - esxVI_Occurrence_OptionalItem) < 0) { + if (esxVI_String_AppendValueToList(&propertyNameList, + "summary.name") < 0 || + esxVI_LookupDatastoreByAbsolutePath(ctx, absolutePath, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; } - if (datastore != NULL) { - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.accessible")) { - /* Ignore it */ - } else if (STREQ(dynamicProperty->name, "summary.name")) { - if (esxVI_AnyType_ExpectType(dynamicProperty->val, - esxVI_Type_String) < 0) { - goto cleanup; - } + if (datastore == NULL) { + if (esxVI_LookupDatastoreByName(ctx, preliminaryDatastoreName, + propertyNameList, &datastore, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + } - datastoreName = dynamicProperty->val->string; - break; - } else if (STREQ(dynamicProperty->name, "summary.url")) { - /* Ignore it */ - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); - } + if (datastore != NULL) { + if (esxVI_GetStringValue(datastore, "summary.name", &datastoreName, + esxVI_Occurrence_RequiredItem)) { + goto cleanup; } } @@ -1053,7 +1049,7 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, datastoreName = preliminaryDatastoreName; } - if (virAsprintf(&datastoreRelatedPath, "[%s] %s", datastoreName, + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, directoryAndFileName) < 0) { virReportOOMError(); goto cleanup; @@ -1065,13 +1061,14 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, cleanup: if (! success) { - VIR_FREE(datastoreRelatedPath); + VIR_FREE(datastorePath); } VIR_FREE(copyOfAbsolutePath); + esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&datastore); - return datastoreRelatedPath; + return datastorePath; } @@ -1088,7 +1085,7 @@ esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, if (STRPREFIX(fileName, "/vmfs/volumes/")) { /* Found absolute path referencing a file inside a datastore */ - return esxVMX_AbsolutePathToDatastoreRelatedPath(ctx, fileName); + return esxVMX_AbsolutePathToDatastorePath(ctx, fileName); } else if (STRPREFIX(fileName, "/")) { /* Found absolute path referencing a file outside a datastore */ src = strdup(fileName); @@ -2625,8 +2622,8 @@ esxVMX_FormatFileName(esxVI_Context *ctx ATTRIBUTE_UNUSED, const char *src) if (STRPREFIX(src, "[")) { /* Found potential datastore related path */ - if (esxUtil_ParseDatastoreRelatedPath(src, &datastoreName, - &directoryName, &fileName) < 0) { + if (esxUtil_ParseDatastorePath(src, &datastoreName, &directoryName, + &fileName) < 0) { goto cleanup; } diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h index 3ccae7a..bda98f0 100644 --- a/src/esx/esx_vmx.h +++ b/src/esx/esx_vmx.h @@ -56,8 +56,7 @@ esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, int virtualDev[4], bool present[4]); char * -esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, - const char *absolutePath); +esxVMX_AbsolutePathToDatastorePath(esxVI_Context *ctx, const char *absolutePath); diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 2a13282..09470ed 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -95,7 +95,7 @@ testDiskNameToIndex(const void *data ATTRIBUTE_UNUSED) struct testPath { - const char *datastoreRelatedPath; + const char *datastorePath; int result; const char *datastoreName; const char *directoryName; @@ -111,7 +111,7 @@ static struct testPath paths[] = { }; static int -testParseDatastoreRelatedPath(const void *data ATTRIBUTE_UNUSED) +testParseDatastorePath(const void *data ATTRIBUTE_UNUSED) { int i, result = 0; char *datastoreName = NULL; @@ -123,9 +123,9 @@ testParseDatastoreRelatedPath(const void *data ATTRIBUTE_UNUSED) VIR_FREE(directoryName); VIR_FREE(fileName); - if (esxUtil_ParseDatastoreRelatedPath(paths[i].datastoreRelatedPath, - &datastoreName, &directoryName, - &fileName) != paths[i].result) { + if (esxUtil_ParseDatastorePath(paths[i].datastorePath, + &datastoreName, &directoryName, + &fileName) != paths[i].result) { goto failure; } @@ -242,7 +242,7 @@ mymain(int argc, char **argv) virSetErrorFunc(NULL, testQuietError); -# define DO_TEST(_name) \ +# define DO_TEST(_name) \ do { \ if (virtTestRun("VMware "#_name, 1, test##_name, \ NULL) < 0) { \ @@ -252,7 +252,7 @@ mymain(int argc, char **argv) DO_TEST(IndexToDiskName); DO_TEST(DiskNameToIndex); - DO_TEST(ParseDatastoreRelatedPath); + DO_TEST(ParseDatastorePath); DO_TEST(ConvertDateTimeToCalendarTime); return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Map some managed object types
by Matthias Bolte 02 Aug '10

02 Aug '10

Datacenter, ComputeResource and HostSystem will be used for simplified handling and caching. --- src/esx/esx_vi_types.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi_types.h | 96 ++++++++++++++++ 2 files changed, 379 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 5cf30b1..bb791af 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -704,6 +704,15 @@ esxVI_Type_ToString(esxVI_Type type) case esxVI_Type_ManagedObjectReference: return "ManagedObjectReference"; + case esxVI_Type_Datacenter: + return "Datacenter"; + + case esxVI_Type_ComputeResource: + return "ComputeResource"; + + case esxVI_Type_HostSystem: + return "HostSystem"; + #include "esx_vi_types.generated.typetostring" case esxVI_Type_Other: @@ -734,8 +743,15 @@ esxVI_Type_FromString(const char *type) return esxVI_Type_Fault; } else if (STREQ(type, "ManagedObjectReference")) { return esxVI_Type_ManagedObjectReference; + } else if (STREQ(type, "Datacenter")) { + return esxVI_Type_Datacenter; + } else if (STREQ(type, "ComputeResource")) { + return esxVI_Type_ComputeResource; + } else if (STREQ(type, "HostSystem")) { + return esxVI_Type_HostSystem; } + #include "esx_vi_types.generated.typefromstring" else { @@ -1532,6 +1548,273 @@ esxVI_ManagedObjectReference_Deserialize /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: Datacenter + * extends ManagedEntity + */ + +/* esxVI_Datacenter_Alloc */ +ESX_VI__TEMPLATE__ALLOC(Datacenter) + +/* esxVI_Datacenter_Free */ +ESX_VI__TEMPLATE__FREE(Datacenter, +{ + esxVI_Datacenter_Free(&item->_next); + esxVI_ManagedObjectReference_Free(&item->_reference); + + /* ManagedEntity */ + VIR_FREE(item->name); + + /* Datacenter */ + esxVI_ManagedObjectReference_Free(&item->hostFolder); + esxVI_ManagedObjectReference_Free(&item->vmFolder); +}) + +/* esxVI_Datacenter_Validate */ +ESX_VI__TEMPLATE__VALIDATE(Datacenter, +{ + /* ManagedEntity */ + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(name); + + /* Datacenter */ + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(hostFolder); + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(vmFolder); +}) + +int +esxVI_Datacenter_CastFromObjectContent(esxVI_ObjectContent *objectContent, + esxVI_Datacenter **datacenter) +{ + esxVI_DynamicProperty *dynamicProperty = NULL; + + if (objectContent == NULL || datacenter == NULL || *datacenter != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_Datacenter_Alloc(datacenter) < 0) { + return -1; + } + + if (esxVI_ManagedObjectReference_DeepCopy(&(*datacenter)->_reference, + objectContent->obj) < 0) { + goto failure; + } + + for (dynamicProperty = objectContent->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "name")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_String) < 0) { + goto failure; + } + + (*datacenter)->name = strdup(dynamicProperty->val->string); + + if ((*datacenter)->name == NULL) { + virReportOOMError(); + goto failure; + } + } else if (STREQ(dynamicProperty->name, "hostFolder")) { + if (esxVI_ManagedObjectReference_CastFromAnyType + (dynamicProperty->val, &(*datacenter)->hostFolder) < 0) { + goto failure; + } + } else if (STREQ(dynamicProperty->name, "vmFolder")) { + if (esxVI_ManagedObjectReference_CastFromAnyType + (dynamicProperty->val, &(*datacenter)->vmFolder) < 0) { + goto failure; + } + } + } + + if (esxVI_Datacenter_Validate(*datacenter) < 0) { + goto failure; + } + + return 0; + + failure: + esxVI_Datacenter_Free(datacenter); + + return -1; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: ComputeResource + * extends ManagedEntity + */ + +/* esxVI_ComputeResource_Alloc */ +ESX_VI__TEMPLATE__ALLOC(ComputeResource) + +/* esxVI_ComputeResource_Free */ +ESX_VI__TEMPLATE__FREE(ComputeResource, +{ + esxVI_ComputeResource_Free(&item->_next); + esxVI_ManagedObjectReference_Free(&item->_reference); + + /* ManagedEntity */ + VIR_FREE(item->name); + + /* ComputeResource */ + esxVI_ManagedObjectReference_Free(&item->host); + esxVI_ManagedObjectReference_Free(&item->resourcePool); +}) + +/* esxVI_ComputeResource_Validate */ +ESX_VI__TEMPLATE__VALIDATE(ComputeResource, +{ + /* ManagedEntity */ + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(name); + + /* ComputeResource */ +}) + +int +esxVI_ComputeResource_CastFromObjectContent + (esxVI_ObjectContent *objectContent, esxVI_ComputeResource **computeResource) +{ + esxVI_DynamicProperty *dynamicProperty = NULL; + + if (objectContent == NULL || computeResource == NULL || + *computeResource != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_ComputeResource_Alloc(computeResource) < 0) { + return -1; + } + + if (esxVI_ManagedObjectReference_DeepCopy(&(*computeResource)->_reference, + objectContent->obj) < 0) { + goto failure; + } + + for (dynamicProperty = objectContent->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "name")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_String) < 0) { + goto failure; + } + + (*computeResource)->name = strdup(dynamicProperty->val->string); + + if ((*computeResource)->name == NULL) { + virReportOOMError(); + goto failure; + } + } else if (STREQ(dynamicProperty->name, "host")) { + if (esxVI_ManagedObjectReference_CastListFromAnyType + (dynamicProperty->val, &(*computeResource)->host) < 0) { + goto failure; + } + } else if (STREQ(dynamicProperty->name, "resourcePool")) { + if (esxVI_ManagedObjectReference_CastFromAnyType + (dynamicProperty->val, &(*computeResource)->resourcePool) < 0) { + goto failure; + } + } + } + + if (esxVI_ComputeResource_Validate(*computeResource) < 0) { + goto failure; + } + + return 0; + + failure: + esxVI_ComputeResource_Free(computeResource); + + return -1; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: HostSystem + * extends ManagedEntity + */ + +/* esxVI_HostSystem_Alloc */ +ESX_VI__TEMPLATE__ALLOC(HostSystem) + +/* esxVI_HostSystem_Free */ +ESX_VI__TEMPLATE__FREE(HostSystem, +{ + esxVI_HostSystem_Free(&item->_next); + esxVI_ManagedObjectReference_Free(&item->_reference); + + /* ManagedEntity */ + VIR_FREE(item->name); + + /* HostSystem */ +}) + +/* esxVI_HostSystem_Validate */ +ESX_VI__TEMPLATE__VALIDATE(HostSystem, +{ + /* ManagedEntity */ + ESX_VI__TEMPLATE__PROPERTY__REQUIRE(name); + + /* HostSystem */ +}) + +int +esxVI_HostSystem_CastFromObjectContent(esxVI_ObjectContent *objectContent, + esxVI_HostSystem **hostSystem) +{ + esxVI_DynamicProperty *dynamicProperty = NULL; + + if (objectContent == NULL || hostSystem == NULL || *hostSystem != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_HostSystem_Alloc(hostSystem) < 0) { + return -1; + } + + if (esxVI_ManagedObjectReference_DeepCopy(&(*hostSystem)->_reference, + objectContent->obj) < 0) { + goto failure; + } + + for (dynamicProperty = objectContent->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "name")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_String) < 0) { + goto failure; + } + + (*hostSystem)->name = strdup(dynamicProperty->val->string); + + if ((*hostSystem)->name == NULL) { + virReportOOMError(); + goto failure; + } + } + } + + if (esxVI_HostSystem_Validate(*hostSystem) < 0) { + goto failure; + } + + return 0; + + failure: + esxVI_HostSystem_Free(hostSystem); + + return -1; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * VI Enum: VirtualMachinePowerState (Additions) */ diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 4bedca9..f659361 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -26,6 +26,7 @@ typedef enum _esxVI_Type esxVI_Type; typedef struct _esxVI_Object esxVI_Object; +typedef struct _esxVI_ManagedObject esxVI_ManagedObject; @@ -48,6 +49,9 @@ typedef struct _esxVI_DateTime esxVI_DateTime; typedef struct _esxVI_Fault esxVI_Fault; typedef struct _esxVI_ManagedObjectReference esxVI_ManagedObjectReference; +typedef struct _esxVI_Datacenter esxVI_Datacenter; +typedef struct _esxVI_ComputeResource esxVI_ComputeResource; +typedef struct _esxVI_HostSystem esxVI_HostSystem; # include "esx_vi_types.generated.typedef" @@ -68,6 +72,9 @@ enum _esxVI_Type { esxVI_Type_DateTime, esxVI_Type_Fault, esxVI_Type_ManagedObjectReference, + esxVI_Type_Datacenter, + esxVI_Type_ComputeResource, + esxVI_Type_HostSystem, # include "esx_vi_types.generated.typeenum" @@ -91,6 +98,18 @@ struct _esxVI_Object { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * ManagedObject extends Object + */ + +struct _esxVI_ManagedObject { + esxVI_ManagedObject *_next; /* optional */ + esxVI_Type _type; /* required */ + esxVI_ManagedObjectReference *_reference; /* required */ +}; + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * XSD: Boolean */ @@ -301,6 +320,83 @@ int esxVI_ManagedObjectReference_Deserialize /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: Datacenter + * extends ManagedEntity + */ + +struct _esxVI_Datacenter { + esxVI_Datacenter *_next; /* optional */ + esxVI_Type _type; /* required */ + esxVI_ManagedObjectReference *_reference; /* required */ + + /* ManagedEntity */ + char *name; /* required */ + + /* Datacenter */ + esxVI_ManagedObjectReference *hostFolder; /* required */ + esxVI_ManagedObjectReference *vmFolder; /* required */ +}; + +int esxVI_Datacenter_Alloc(esxVI_Datacenter **datacenter); +void esxVI_Datacenter_Free(esxVI_Datacenter **datacenter); +int esxVI_Datacenter_Validate(esxVI_Datacenter *datacenter); +int esxVI_Datacenter_CastFromObjectContent(esxVI_ObjectContent *objectContent, + esxVI_Datacenter **datacenter); + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: ComputeResource + * extends ManagedEntity + */ + +struct _esxVI_ComputeResource { + esxVI_ComputeResource *_next; /* optional */ + esxVI_Type _type; /* required */ + esxVI_ManagedObjectReference *_reference; /* required */ + + /* ManagedEntity */ + char *name; /* required */ + + /* ComputeResource */ + esxVI_ManagedObjectReference *host; /* optional, list */ + esxVI_ManagedObjectReference *resourcePool; /* optional */ +}; + +int esxVI_ComputeResource_Alloc(esxVI_ComputeResource **computeResource); +void esxVI_ComputeResource_Free(esxVI_ComputeResource **computeResource); +int esxVI_ComputeResource_Validate(esxVI_ComputeResource *computeResource); +int esxVI_ComputeResource_CastFromObjectContent + (esxVI_ObjectContent *objectContent, + esxVI_ComputeResource **computeResource); + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * VI Managed Object: HostSystem + * extends ManagedEntity + */ + +struct _esxVI_HostSystem { + esxVI_HostSystem *_next; /* optional */ + esxVI_Type _type; /* required */ + esxVI_ManagedObjectReference *_reference; /* required */ + + /* ManagedEntity */ + char *name; /* required */ + + /* HostSystem */ +}; + +int esxVI_HostSystem_Alloc(esxVI_HostSystem **hostSystem); +void esxVI_HostSystem_Free(esxVI_HostSystem **hostSystem); +int esxVI_HostSystem_Validate(esxVI_HostSystem *hostSystem); +int esxVI_HostSystem_CastFromObjectContent(esxVI_ObjectContent *objectContent, + esxVI_HostSystem **hostSystem); + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * VI Enum: VirtualMachinePowerState (Additions) */ -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Parse the path of the URI
by Matthias Bolte 02 Aug '10

02 Aug '10

The path will be used to specify the datacenter, compute resource and host system to be used with a vpx:// connection. --- src/esx/esx_driver.c | 49 ++++++++++------------- src/esx/esx_util.c | 104 +++++++++++++++++++++++++++++++------------------- src/esx/esx_util.h | 11 +++-- src/esx/esx_vi.c | 14 +++--- src/esx/esx_vi.h | 3 +- 5 files changed, 102 insertions(+), 79 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 913420c..3bdc551 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -294,7 +294,7 @@ static int esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, const char *hostname, int port, const char *predefinedUsername, - esxUtil_ParsedQuery *parsedQuery, + esxUtil_ParsedUri *parsedUri, esxVI_ProductVersion expectedProductVersion, char **vCenterIpAddress) { @@ -347,7 +347,7 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, if (esxVI_Context_Alloc(&priv->host) < 0 || esxVI_Context_Connect(priv->host, url, ipAddress, username, password, - parsedQuery) < 0) { + parsedUri) < 0) { goto cleanup; } @@ -416,7 +416,7 @@ static int esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, const char *hostname, int port, const char *predefinedUsername, - esxUtil_ParsedQuery *parsedQuery) + esxUtil_ParsedUri *parsedUri) { int result = -1; char ipAddress[NI_MAXHOST] = ""; @@ -459,7 +459,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, if (esxVI_Context_Alloc(&priv->vCenter) < 0 || esxVI_Context_Connect(priv->vCenter, url, ipAddress, username, - password, parsedQuery) < 0) { + password, parsedUri) < 0) { goto cleanup; } @@ -528,7 +528,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) { virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; esxPrivate *priv = NULL; - esxUtil_ParsedQuery *parsedQuery = NULL; + esxUtil_ParsedUri *parsedUri = NULL; char *potentialVCenterIpAddress = NULL; char vCenterIpAddress[NI_MAXHOST] = ""; @@ -545,29 +545,24 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) return VIR_DRV_OPEN_DECLINED; } - if (conn->uri->path != NULL && STRNEQ(conn->uri->path, "") && - STRNEQ(conn->uri->path, "/")) { - VIR_WARN("Ignoring unexpected path '%s' in URI", conn->uri->path); - } - /* Allocate per-connection private data */ if (VIR_ALLOC(priv) < 0) { virReportOOMError(); goto cleanup; } - if (esxUtil_ParseQuery(&parsedQuery, conn->uri) < 0) { + if (esxUtil_ParseUri(&parsedUri, conn->uri) < 0) { goto cleanup; } - priv->transport = parsedQuery->transport; - parsedQuery->transport = NULL; + priv->transport = parsedUri->transport; + parsedUri->transport = NULL; priv->maxVcpus = -1; priv->supportsVMotion = esxVI_Boolean_Undefined; priv->supportsLongMode = esxVI_Boolean_Undefined; - priv->autoAnswer = parsedQuery->autoAnswer ? esxVI_Boolean_True - : esxVI_Boolean_False; + priv->autoAnswer = parsedUri->autoAnswer ? esxVI_Boolean_True + : esxVI_Boolean_False; priv->usedCpuTimeCounterId = -1; /* @@ -597,7 +592,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) STRCASEEQ(conn->uri->scheme, "gsx")) { /* Connect to host */ if (esxConnectToHost(priv, auth, conn->uri->server, conn->uri->port, - conn->uri->user, parsedQuery, + conn->uri->user, parsedUri, STRCASEEQ(conn->uri->scheme, "esx") ? esxVI_ProductVersion_ESX : esxVI_ProductVersion_GSX, @@ -606,8 +601,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } /* Connect to vCenter */ - if (parsedQuery->vCenter != NULL) { - if (STREQ(parsedQuery->vCenter, "*")) { + if (parsedUri->vCenter != NULL) { + if (STREQ(parsedUri->vCenter, "*")) { if (potentialVCenterIpAddress == NULL) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("This host is not managed by a vCenter")); @@ -622,7 +617,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) goto cleanup; } } else { - if (esxUtil_ResolveHostname(parsedQuery->vCenter, + if (esxUtil_ResolveHostname(parsedUri->vCenter, vCenterIpAddress, NI_MAXHOST) < 0) { goto cleanup; } @@ -633,14 +628,14 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) _("This host is managed by a vCenter with IP " "address %s, but a mismachting vCenter '%s' " "(%s) has been specified"), - potentialVCenterIpAddress, parsedQuery->vCenter, + potentialVCenterIpAddress, parsedUri->vCenter, vCenterIpAddress); goto cleanup; } } if (esxConnectToVCenter(priv, auth, vCenterIpAddress, - conn->uri->port, NULL, parsedQuery) < 0) { + conn->uri->port, NULL, parsedUri) < 0) { goto cleanup; } } @@ -649,7 +644,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } else { /* VPX */ /* Connect to vCenter */ if (esxConnectToVCenter(priv, auth, conn->uri->server, conn->uri->port, - conn->uri->user, parsedQuery) < 0) { + conn->uri->user, parsedUri) < 0) { goto cleanup; } @@ -678,7 +673,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) VIR_FREE(priv); } - esxUtil_FreeParsedQuery(&parsedQuery); + esxUtil_FreeParsedUri(&parsedUri); VIR_FREE(potentialVCenterIpAddress); return result; @@ -3113,14 +3108,14 @@ esxDomainMigratePrepare(virConnectPtr dconn, unsigned long resource ATTRIBUTE_UNUSED) { int result = -1; - esxUtil_ParsedQuery *parsedQuery = NULL; + esxUtil_ParsedUri *parsedUri = NULL; if (uri_in == NULL) { - if (esxUtil_ParseQuery(&parsedQuery, dconn->uri) < 0) { + if (esxUtil_ParseUri(&parsedUri, dconn->uri) < 0) { return -1; } - if (virAsprintf(uri_out, "%s://%s:%d/sdk", parsedQuery->transport, + if (virAsprintf(uri_out, "%s://%s:%d/sdk", parsedUri->transport, dconn->uri->server, dconn->uri->port) < 0) { virReportOOMError(); goto cleanup; @@ -3130,7 +3125,7 @@ esxDomainMigratePrepare(virConnectPtr dconn, result = 0; cleanup: - esxUtil_FreeParsedQuery(&parsedQuery); + esxUtil_FreeParsedUri(&parsedUri); return result; } diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index d79de2c..75a9aaf 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -41,7 +41,7 @@ int -esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) +esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) { int result = -1; struct qparam_set *queryParamSet = NULL; @@ -50,13 +50,14 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) int noVerify; int autoAnswer; char *tmp; + char *saveptr; - if (parsedQuery == NULL || *parsedQuery != NULL) { + if (parsedUri == NULL || *parsedUri != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } - if (VIR_ALLOC(*parsedQuery) < 0) { + if (VIR_ALLOC(*parsedUri) < 0) { virReportOOMError(); return -1; } @@ -75,29 +76,29 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) queryParam = &queryParamSet->p[i]; if (STRCASEEQ(queryParam->name, "transport")) { - VIR_FREE((*parsedQuery)->transport); + VIR_FREE((*parsedUri)->transport); - (*parsedQuery)->transport = strdup(queryParam->value); + (*parsedUri)->transport = strdup(queryParam->value); - if ((*parsedQuery)->transport == NULL) { + if ((*parsedUri)->transport == NULL) { virReportOOMError(); goto cleanup; } - if (STRNEQ((*parsedQuery)->transport, "http") && - STRNEQ((*parsedQuery)->transport, "https")) { + if (STRNEQ((*parsedUri)->transport, "http") && + STRNEQ((*parsedUri)->transport, "https")) { ESX_ERROR(VIR_ERR_INVALID_ARG, _("Query parameter 'transport' has unexpected value " "'%s' (should be http|https)"), - (*parsedQuery)->transport); + (*parsedUri)->transport); goto cleanup; } } else if (STRCASEEQ(queryParam->name, "vcenter")) { - VIR_FREE((*parsedQuery)->vCenter); + VIR_FREE((*parsedUri)->vCenter); - (*parsedQuery)->vCenter = strdup(queryParam->value); + (*parsedUri)->vCenter = strdup(queryParam->value); - if ((*parsedQuery)->vCenter == NULL) { + if ((*parsedUri)->vCenter == NULL) { virReportOOMError(); goto cleanup; } @@ -110,7 +111,7 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) goto cleanup; } - (*parsedQuery)->noVerify = noVerify != 0; + (*parsedUri)->noVerify = noVerify != 0; } else if (STRCASEEQ(queryParam->name, "auto_answer")) { if (virStrToLong_i(queryParam->value, NULL, 10, &autoAnswer) < 0 || (autoAnswer != 0 && autoAnswer != 1)) { @@ -120,23 +121,23 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) goto cleanup; } - (*parsedQuery)->autoAnswer = autoAnswer != 0; + (*parsedUri)->autoAnswer = autoAnswer != 0; } else if (STRCASEEQ(queryParam->name, "proxy")) { /* Expected format: [<type>://]<hostname>[:<port>] */ - (*parsedQuery)->proxy = true; - (*parsedQuery)->proxy_type = CURLPROXY_HTTP; - VIR_FREE((*parsedQuery)->proxy_hostname); - (*parsedQuery)->proxy_port = 1080; + (*parsedUri)->proxy = true; + (*parsedUri)->proxy_type = CURLPROXY_HTTP; + VIR_FREE((*parsedUri)->proxy_hostname); + (*parsedUri)->proxy_port = 1080; if ((tmp = STRSKIP(queryParam->value, "http://")) != NULL) { - (*parsedQuery)->proxy_type = CURLPROXY_HTTP; + (*parsedUri)->proxy_type = CURLPROXY_HTTP; } else if ((tmp = STRSKIP(queryParam->value, "socks://")) != NULL || (tmp = STRSKIP(queryParam->value, "socks5://")) != NULL) { - (*parsedQuery)->proxy_type = CURLPROXY_SOCKS5; + (*parsedUri)->proxy_type = CURLPROXY_SOCKS5; } else if ((tmp = STRSKIP(queryParam->value, "socks4://")) != NULL) { - (*parsedQuery)->proxy_type = CURLPROXY_SOCKS4; + (*parsedUri)->proxy_type = CURLPROXY_SOCKS4; } else if ((tmp = STRSKIP(queryParam->value, "socks4a://")) != NULL) { - (*parsedQuery)->proxy_type = CURLPROXY_SOCKS4A; + (*parsedUri)->proxy_type = CURLPROXY_SOCKS4A; } else if ((tmp = strstr(queryParam->value, "://")) != NULL) { *tmp = '\0'; @@ -149,15 +150,15 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) tmp = queryParam->value; } - (*parsedQuery)->proxy_hostname = strdup(tmp); + (*parsedUri)->proxy_hostname = strdup(tmp); - if ((*parsedQuery)->proxy_hostname == NULL) { + if ((*parsedUri)->proxy_hostname == NULL) { virReportOOMError(); goto cleanup; } - if ((tmp = strchr((*parsedQuery)->proxy_hostname, ':')) != NULL) { - if (tmp == (*parsedQuery)->proxy_hostname) { + if ((tmp = strchr((*parsedUri)->proxy_hostname, ':')) != NULL) { + if (tmp == (*parsedUri)->proxy_hostname) { ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Query parameter 'proxy' doesn't contain a " "hostname")); @@ -167,9 +168,9 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) *tmp++ = '\0'; if (virStrToLong_i(tmp, NULL, 10, - &(*parsedQuery)->proxy_port) < 0 || - (*parsedQuery)->proxy_port < 1 || - (*parsedQuery)->proxy_port > 65535) { + &(*parsedUri)->proxy_port) < 0 || + (*parsedUri)->proxy_port < 1 || + (*parsedUri)->proxy_port > 65535) { ESX_ERROR(VIR_ERR_INVALID_ARG, _("Query parameter 'proxy' has unexpected port" "value '%s' (should be [1..65535])"), tmp); @@ -182,10 +183,32 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) } } - if ((*parsedQuery)->transport == NULL) { - (*parsedQuery)->transport = strdup("https"); + /* Expected format: [/]<datacenter>/<computeresource>[/<hostsystem>] */ + if (uri->path != NULL) { + tmp = strdup(uri->path); - if ((*parsedQuery)->transport == NULL) { + if (tmp == NULL) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_String_DeepCopyValue(&(*parsedUri)->path_datacenter, + strtok_r(tmp, "/", &saveptr)) < 0 || + esxVI_String_DeepCopyValue(&(*parsedUri)->path_computeResource, + strtok_r(NULL, "/", &saveptr)) < 0 || + esxVI_String_DeepCopyValue(&(*parsedUri)->path_hostSystem, + strtok_r(NULL, "", &saveptr)) < 0) { + VIR_FREE(tmp); + goto cleanup; + } + + VIR_FREE(tmp); + } + + if ((*parsedUri)->transport == NULL) { + (*parsedUri)->transport = strdup("https"); + + if ((*parsedUri)->transport == NULL) { virReportOOMError(); goto cleanup; } @@ -195,7 +218,7 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) cleanup: if (result < 0) { - esxUtil_FreeParsedQuery(parsedQuery); + esxUtil_FreeParsedUri(parsedUri); } if (queryParamSet != NULL) { @@ -209,17 +232,20 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) void -esxUtil_FreeParsedQuery(esxUtil_ParsedQuery **parsedQuery) +esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri) { - if (parsedQuery == NULL || *parsedQuery == NULL) { + if (parsedUri == NULL || *parsedUri == NULL) { return; } - VIR_FREE((*parsedQuery)->transport); - VIR_FREE((*parsedQuery)->vCenter); - VIR_FREE((*parsedQuery)->proxy_hostname); + VIR_FREE((*parsedUri)->transport); + VIR_FREE((*parsedUri)->vCenter); + VIR_FREE((*parsedUri)->proxy_hostname); + VIR_FREE((*parsedUri)->path_datacenter); + VIR_FREE((*parsedUri)->path_computeResource); + VIR_FREE((*parsedUri)->path_hostSystem); - VIR_FREE(*parsedQuery); + VIR_FREE(*parsedUri); } diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index a1927a6..99ce81d 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -29,9 +29,9 @@ # include "internal.h" # include "conf.h" -typedef struct _esxUtil_ParsedQuery esxUtil_ParsedQuery; +typedef struct _esxUtil_ParsedUri esxUtil_ParsedUri; -struct _esxUtil_ParsedQuery { +struct _esxUtil_ParsedUri { char *transport; char *vCenter; bool noVerify; @@ -40,11 +40,14 @@ struct _esxUtil_ParsedQuery { int proxy_type; char *proxy_hostname; int proxy_port; + char *path_datacenter; + char *path_computeResource; + char *path_hostSystem; }; -int esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri); +int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri); -void esxUtil_FreeParsedQuery(esxUtil_ParsedQuery **parsedQuery); +void esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri); int esxUtil_ParseVirtualMachineIDString(const char *id_string, int *id); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 98b8bcd..5695881 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -277,7 +277,7 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) int esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, - const char *password, esxUtil_ParsedQuery *parsedQuery) + const char *password, esxUtil_ParsedUri *parsedUri) { int result = -1; esxVI_String *propertyNameList = NULL; @@ -329,9 +329,9 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_HEADER, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_FOLLOWLOCATION, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYPEER, - parsedQuery->noVerify ? 0 : 1); + parsedUri->noVerify ? 0 : 1); curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYHOST, - parsedQuery->noVerify ? 0 : 2); + parsedUri->noVerify ? 0 : 2); curl_easy_setopt(ctx->curl_handle, CURLOPT_COOKIEFILE, ""); curl_easy_setopt(ctx->curl_handle, CURLOPT_HTTPHEADER, ctx->curl_headers); curl_easy_setopt(ctx->curl_handle, CURLOPT_READFUNCTION, @@ -345,13 +345,13 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_VERBOSE, 1); #endif - if (parsedQuery->proxy) { + if (parsedUri->proxy) { curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXY, - parsedQuery->proxy_hostname); + parsedUri->proxy_hostname); curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXYTYPE, - parsedQuery->proxy_type); + parsedUri->proxy_type); curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXYPORT, - parsedQuery->proxy_port); + parsedUri->proxy_port); } if (virMutexInit(&ctx->curl_lock) < 0) { diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index ef9c6d9..325ba69 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -168,8 +168,7 @@ int esxVI_Context_Alloc(esxVI_Context **ctx); void esxVI_Context_Free(esxVI_Context **ctx); int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress, const char *url, const char *username, - const char *password, - esxUtil_ParsedQuery *parsedQuery); + const char *password, esxUtil_ParsedUri *parsedUri); int esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, char **content); int esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, -- 1.7.0.4

2 2

[libvirt] [PATCH] Add iptables rule to fixup DHCP response checksum.
by Laine Stump 02 Aug '10

02 Aug '10

From: Laine Stump <laine(a)redhat.com> (I don't know whether or not we want to commit this upstream yet - the proposed iptables and kernel module backend for the changes have been posted but not yet committed upstream. On the other hand, the new libvirt code ends up simply printing a warning message if the necessary iptables support isn't yet in place.) This patch attempts to take advantage of a newly added netfilter module to correct for a problem with some guest DHCP client implementations when used in conjunction with a DHCP server run on the host systems with packet checksum offloading enabled. The problem is that, when the guest uses a RAW socket to read the DHCP response packets, the checksum hasn't yet been fixed by the IP stack, so it is incorrect. The fix implemented here is to add a rule to the POSTROUTING chain of the mangle table in iptables that fixes up the checksum for packets on the virtual network's bridge that are destined for the bootpc port (ie "dhcpc", ie port 68) port on the guest. Only very new versions of iptables will have this support (it has been submitted upstream, but not yet committed), so a failure to add this rule only results in a warning message. The iptables patch is here: http://patchwork.ozlabs.org/patch/58525/ A corresponding kernel module patch is also required (the backend of the iptables patch) and has been submitted, but I don't have the details for that (I tested using a pre-built image I received from the developer, Michael Tsirkin). --- src/libvirt_private.syms | 2 + src/network/bridge_driver.c | 17 ++++++++++ src/util/iptables.c | 71 +++++++++++++++++++++++++++++++++++++++++++ src/util/iptables.h | 6 ++++ 4 files changed, 96 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 778ceb1..d81d4cf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -328,6 +328,7 @@ iptablesAddForwardAllowRelatedIn; iptablesAddForwardMasquerade; iptablesAddForwardRejectIn; iptablesAddForwardRejectOut; +iptablesAddOutputFixUdpChecksum; iptablesAddTcpInput; iptablesAddUdpInput; iptablesContextFree; @@ -339,6 +340,7 @@ iptablesRemoveForwardAllowRelatedIn; iptablesRemoveForwardMasquerade; iptablesRemoveForwardRejectIn; iptablesRemoveForwardRejectOut; +iptablesRemoveOutputFixUdpChecksum; iptablesRemoveTcpInput; iptablesRemoveUdpInput; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 72255c1..c4480ff 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -781,6 +781,19 @@ networkAddIptablesRules(struct network_driver *driver, !networkAddRoutingIptablesRules(driver, network)) goto err8; + /* If we are doing local DHCP service on this network, attempt to + * add a rule that will fixup the checksum of DHCP response + * packets back to the guests (but report failure without + * aborting, since not all iptables implementations support it). + */ + + if ((network->def->ipAddress || network->def->nranges) && + (iptablesAddOutputFixUdpChecksum(driver->iptables, + network->def->bridge, 68) != 0)) { + VIR_WARN("Could not add rule to fixup DHCP response checksums " + "on network '%s'", network->def->name); + } + return 1; err8: @@ -811,6 +824,10 @@ networkAddIptablesRules(struct network_driver *driver, static void networkRemoveIptablesRules(struct network_driver *driver, virNetworkObjPtr network) { + if (network->def->ipAddress || network->def->nranges) { + iptablesRemoveOutputFixUdpChecksum(driver->iptables, + network->def->bridge, 68); + } if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE) { if (network->def->forwardType == VIR_NETWORK_FORWARD_NAT) { iptablesRemoveForwardMasquerade(driver->iptables, diff --git a/src/util/iptables.c b/src/util/iptables.c index d06b857..9b888e5 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -60,6 +60,7 @@ struct _iptablesContext iptRules *input_filter; iptRules *forward_filter; iptRules *nat_postrouting; + iptRules *mangle_postrouting; }; static void @@ -188,6 +189,9 @@ iptablesContextNew(void) if (!(ctx->nat_postrouting = iptRulesNew("nat", "POSTROUTING"))) goto error; + if (!(ctx->mangle_postrouting = iptRulesNew("mangle", "POSTROUTING"))) + goto error; + return ctx; error: @@ -210,6 +214,8 @@ iptablesContextFree(iptablesContext *ctx) iptRulesFree(ctx->forward_filter); if (ctx->nat_postrouting) iptRulesFree(ctx->nat_postrouting); + if (ctx->mangle_postrouting) + iptRulesFree(ctx->mangle_postrouting); VIR_FREE(ctx); } @@ -753,3 +759,68 @@ iptablesRemoveForwardMasquerade(iptablesContext *ctx, { return iptablesForwardMasquerade(ctx, network, physdev, REMOVE); } + + +static int +iptablesOutputFixUdpChecksum(iptablesContext *ctx, + const char *iface, + int port, + int action) +{ + char portstr[32]; + + snprintf(portstr, sizeof(portstr), "%d", port); + portstr[sizeof(portstr) - 1] = '\0'; + + return iptablesAddRemoveRule(ctx->mangle_postrouting, + action, + "--out-interface", iface, + "--protocol", "udp", + "--destination-port", portstr, + "--jump", "CHECKSUM", "--checksum-fill", + NULL); +} + +/** + * iptablesAddOutputFixUdpChecksum: + * @ctx: pointer to the IP table context + * @iface: the interface name + * @port: the UDP port to match + * + * Add an rule to the mangle table's POSTROUTING chain that fixes up the + * checksum of packets with the given destination @port. + * the given @iface interface for TCP packets. + * + * Returns 0 in case of success or an error code in case of error. + * (NB: if the system's iptables does not support checksum mangling, + * this will return an error, which should be ignored.) + */ + +int +iptablesAddOutputFixUdpChecksum(iptablesContext *ctx, + const char *iface, + int port) +{ + return iptablesOutputFixUdpChecksum(ctx, iface, port, ADD); +} + +/** + * iptablesRemoveOutputFixUdpChecksum: + * @ctx: pointer to the IP table context + * @iface: the interface name + * @port: the UDP port of the rule to remove + * + * Removes the checksum fixup rule that was previous added with + * iptablesAddOutputFixUdpChecksum. + * + * Returns 0 in case of success or an error code in case of error + * (again, if iptables doesn't support checksum fixup, this will + * return an error, which should be ignored) + */ +int +iptablesRemoveOutputFixUdpChecksum(iptablesContext *ctx, + const char *iface, + int port) +{ + return iptablesOutputFixUdpChecksum(ctx, iface, port, REMOVE); +} diff --git a/src/util/iptables.h b/src/util/iptables.h index 7d55a6d..5c2e553 100644 --- a/src/util/iptables.h +++ b/src/util/iptables.h @@ -89,5 +89,11 @@ int iptablesAddForwardMasquerade (iptablesContext *ctx, int iptablesRemoveForwardMasquerade (iptablesContext *ctx, const char *network, const char *physdev); +int iptablesAddOutputFixUdpChecksum (iptablesContext *ctx, + const char *iface, + int port); +int iptablesRemoveOutputFixUdpChecksum (iptablesContext *ctx, + const char *iface, + int port); #endif /* __QEMUD_IPTABLES_H__ */ -- 1.7.1.1

2 3