- Devel - libvirt List Archives

[libvirt] [PATCH 1/4] Make avahi startup more robust.
by Chris Lalancette 21 Apr '10

21 Apr '10

If the hostname of the current virtualization machine could not be resolved, then libvirtd would fail to start. However, for disconnected operation (on a laptop, for instance) the hostname may very legitimately not be resolvable. This patch makes it so that if we can't resolve the hostname, avahi doesn't fail, it just uses a less useful MDNS string. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 863bf21..69106ee 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -998,22 +998,29 @@ static int qemudNetworkInit(struct qemud_server *server) { struct libvirtd_mdns_group *group; struct qemud_socket *sock; int port = 0; + int ret; server->mdns = libvirtd_mdns_new(); if (!mdns_name) { - char groupname[64], *localhost, *tmp; + char *groupname, *localhost, *tmp; /* Extract the host part of the potentially FQDN */ localhost = virGetHostname(NULL); if (localhost == NULL) + ret = virAsprintf(&groupname, "Virtualization Host"); + else { + if ((tmp = strchr(localhost, '.'))) + *tmp = '\0'; + ret = virAsprintf(&groupname, "Virtualization Host %s", + localhost); + } + if (ret < 0) { + virReportOOMError(); goto cleanup; - - if ((tmp = strchr(localhost, '.'))) - *tmp = '\0'; - snprintf(groupname, sizeof(groupname)-1, "Virtualization Host %s", localhost); - groupname[sizeof(groupname)-1] = '\0'; + } group = libvirtd_mdns_add_group(server->mdns, groupname); VIR_FREE(localhost); + VIR_FREE(groupname); } else { group = libvirtd_mdns_add_group(server->mdns, mdns_name); } -- 1.6.6.1

3 5

[libvirt] empty type parameter in driver tag for disk in machine xml file
by Frederik Himpe 21 Apr '10

21 Apr '10

I updated my system from libvirt 0.7.1 to 0.7.7, one of my qemu-kvm VMs was not starting anymore, with this error: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/ TMPDIR=/tmp QEMU_AUDIO_DRV=none /usr/bin/qemu-kvm -S -M pc-0.11 -enable-kvm -m 512 - smp 1,sockets=1,cores=1,threads=1 -name debian-testing -uuid 54f57a86- b84c-61ba-7f2a-c69f39f80a41 -nodefaults -chardev socket,id=monitor,path=/ var/lib/libvirt/qemu/debian-testing.monitor,server,nowait -mon chardev=monitor,mode=readline -rtc base=utc -boot c -drive file=/home/ frederik/Software/iso/debian-testing-amd64- netinst.iso,if=none,media=cdrom,id=drive-ide0-1-0 -device ide- drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -drive file=/home/ frederik/VM/debian-testing.img,if=none,id=drive-virtio- disk0,boot=on,format= -device virtio-blk- pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:25:9c:a0,bus=pci.0,addr=0x5 - net tap,fd=19,vlan=0,name=hostnet0 -chardev pty,id=serial0 -device isa- serial,chardev=serial0 -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:1 -k fr-be -vga vmware -device ES1370,id=sound0,bus=pci.0,addr=0x6 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 char device redirected to /dev/pts/6 qemu: '' invalid format It seems this part of the libvirt xml file was causing the problem: <disk type='file' device='disk'> <driver name='qemu' type=''/> <source file='/home/frederik/VM/debian-testing.img'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> Notice the empty type parameter in the driver tag. Removing type='' completely, makes the machine start fine. Is this a bug which should be fixed, so that libvirt can deal empty type tags, possible set by older versions? -- Frederik Himpe

3 5

[libvirt] [PATCH] Add a test case that validates save to a block device
by Daniel P. Berrange 21 Apr '10

21 Apr '10

There are some unusual problems when saving to a block device, vs a file. This test case covers problems inherant in using block devices --- scripts/domain/103-blockdev-save-restore.t | 91 ++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) create mode 100644 scripts/domain/103-blockdev-save-restore.t diff --git a/scripts/domain/103-blockdev-save-restore.t b/scripts/domain/103-blockdev-save-restore.t new file mode 100644 index 0000000..3cacc2f --- /dev/null +++ b/scripts/domain/103-blockdev-save-restore.t @@ -0,0 +1,91 @@ +# -*- perl -*- +# +# Copyright (C) 2009-2010 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/103-blockdev-save-restore.t: Save/restore with a block device + +=head1 DESCRIPTION + +The test case validates that it is possible to save and restore +transient domains to/from a block device, instead of a plain file + +=cut + +use strict; +use warnings; + +use Test::More tests => 9; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; + unlink "tck.img" if -f "tck.img"; +} + + +my $xml = $tck->generic_domain("tck")->as_xml; + +my $dev = $tck->get_host_block_device(); + +my $dom; +diag "Creating a new transient domain"; +ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); + +SKIP: { + skip "no block device available", 7 unless $dev; + + ok(-b $dev, "$dev is a block device"); + + diag "Clearing any existing data in block device"; + open DEV, ">$dev" or die "cannot open $dev: $1"; + my $zeros = "\0"x1024; + for (my $i = 0; $i < 1024 * 10 ; $i++) { + print DEV $zeros; + } + close DEV or die "cannot save $dev: $!"; + + eval { $dom->save($dev); }; + skip "save/restore not implemented", 6 if $@ && err_not_implemented($@); + + ok(!$@, "domain saved"); + die $@ if $@; + + diag "Verifying it is still a block device, not a file"; + ok(-b $dev, "$dev is a block device"); + + diag "Checking that transient domain has gone away"; + ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", 42); + + diag "Attempting to restore the guest"; + lives_ok { $conn->restore_domain($dev) } "domain has been restored"; + + ok_domain(sub { $dom = $conn->get_domain_by_name("tck") }, "restored domain is still there", "tck"); + + ok(-b $dev, "$dev is a block device"); +} +diag "Destroying the transient domain"; +$dom->destroy; + +diag "Checking that transient domain has gone away"; +ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", 42); + +# end -- 1.6.5.2

2 1

[libvirt] [PATCH[ nwfilter: lock interface by its index
by Stefan Berger 21 Apr '10

21 Apr '10

Since the name of an interface can be the same between stops and starts of different VMs I have to switch the IP address learning thread to use the index of the interface to determine whether an interface is still available or not - in the case of macvtap the thread needs to listen for traffic on the physical interface, thus having to time out periodically to check whether the VM's macvtap device is still there as an indication that the VM is still alive. Previously the following sequence of 2 VMs with macvtap device virsh start testvm1; virsh destroy testvm1 ; virsh start testvm2 would not terminate the thread upon testvm1's destroy since the name of the interface on the host could be the same (i.e, macvtap0) on testvm1 and testvm2, thus it was easily race-able. The thread would then determine the IP address parameter for testvm2 but apply the rule set for testvm1. :-( I am also introducing a lock for the interface (by name) that the thread must hold while it listens for the traffic and releases when it terminates upon VM termination or 0.5 second thereafter. Thus, the new thread for a newly started VM with the same interface name will not start while the old one still holds the lock. The only other code that I see that also needs to grab the lock to serialize operation is the one that tears down the firewall that were established on behalf of an interface. I am moving the code applying the 'basic' firewall rules during the IP address learning phase inside the thread but won't start the thread unless it is ensured that the firewall driver has the ability to apply the 'basic' firewall rules. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_gentech_driver.c | 24 +++ src/nwfilter/nwfilter_gentech_driver.h | 2 src/nwfilter/nwfilter_learnipaddr.c | 231 +++++++++++++++++++++++++++------ src/nwfilter/nwfilter_learnipaddr.h | 7 - 4 files changed, 221 insertions(+), 43 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -54,6 +54,11 @@ #define VIR_FROM_THIS VIR_FROM_NWFILTER +#define IFINDEX2STR(VARNAME, ifindex) \ + char VARNAME[20]; \ + snprintf(VARNAME, sizeof(VARNAME), "%d", ifindex); + +#define PKT_TIMEOUT_MS 500 /* ms */ /* structure of an ARP request/reply message */ struct f_arphdr { @@ -109,6 +114,81 @@ static virHashTablePtr pendingLearnReq; static virMutex ipAddressMapLock; static virNWFilterHashTablePtr ipAddressMap; +static virMutex ifaceMapLock; +static virHashTablePtr ifaceLockMap; + +typedef struct _virNWFilterIfaceLock virNWFilterIfaceLock; +typedef virNWFilterIfaceLock *virNWFilterIfaceLockPtr; +struct _virNWFilterIfaceLock { + char ifname[IF_NAMESIZE]; + virMutex lock; + int refctr; +}; + + +static bool threadsTerminate = false; + + +int +virNWFilterLockIface(const char *ifname) { + virNWFilterIfaceLockPtr ifaceLock; + + virMutexLock(&ifaceMapLock); + + ifaceLock = virHashLookup(ifaceLockMap, ifname); + if (!ifaceLock) { + if (VIR_ALLOC(ifaceLock) < 0) { + virReportOOMError(); + goto err_exit; + } + + if (virMutexInitRecursive(&ifaceLock->lock) || + virStrcpyStatic(ifaceLock->ifname, ifname) == NULL || + virHashAddEntry(ifaceLockMap, ifname, ifaceLock)) { + VIR_FREE(ifaceLock); + goto err_exit; + } + + ifaceLock->refctr = 0; + } + + ifaceLock->refctr++; + + virMutexUnlock(&ifaceMapLock); + + virMutexLock(&ifaceLock->lock); + + return 0; + + err_exit: + virMutexUnlock(&ifaceMapLock); + + return 1; +} + + +static void +freeIfaceLock(void *payload, const char *name ATTRIBUTE_UNUSED) { + VIR_FREE(payload); +} + + +void +virNWFilterUnlockIface(const char *ifname) { + virNWFilterIfaceLockPtr ifaceLock; + + virMutexLock(&ifaceMapLock); + + ifaceLock = virHashLookup(ifaceLockMap, ifname); + virMutexUnlock(&ifaceLock->lock); + + ifaceLock->refctr--; + if (ifaceLock->refctr == 0) + virHashRemoveEntry(ifaceLockMap, ifname, freeIfaceLock); + + virMutexUnlock(&ifaceMapLock); +} + static void virNWFilterIPAddrLearnReqFree(virNWFilterIPAddrLearnReqPtr req) { @@ -127,10 +207,12 @@ virNWFilterIPAddrLearnReqFree(virNWFilte static int virNWFilterRegisterLearnReq(virNWFilterIPAddrLearnReqPtr req) { int res = -1; + IFINDEX2STR(ifindex_str, req->ifindex); + virMutexLock(&pendingLearnReqLock); - if (!virHashLookup(pendingLearnReq, req->ifname)) - res = virHashAddEntry(pendingLearnReq, req->ifname, req); + if (!virHashLookup(pendingLearnReq, ifindex_str)) + res = virHashAddEntry(pendingLearnReq, ifindex_str, req); virMutexUnlock(&pendingLearnReqLock); @@ -141,12 +223,13 @@ virNWFilterRegisterLearnReq(virNWFilterI virNWFilterIPAddrLearnReqPtr -virNWFilterLookupLearnReq(const char *ifname) { +virNWFilterLookupLearnReq(int ifindex) { void *res; + IFINDEX2STR(ifindex_str, ifindex); virMutexLock(&pendingLearnReqLock); - res = virHashLookup(pendingLearnReq, ifname); + res = virHashLookup(pendingLearnReq, ifindex_str); virMutexUnlock(&pendingLearnReqLock); @@ -163,15 +246,16 @@ freeLearnReqEntry(void *payload, const c #ifdef HAVE_LIBPCAP static virNWFilterIPAddrLearnReqPtr -virNWFilterDeregisterLearnReq(const char *ifname) { +virNWFilterDeregisterLearnReq(int ifindex) { virNWFilterIPAddrLearnReqPtr res; + IFINDEX2STR(ifindex_str, ifindex); virMutexLock(&pendingLearnReqLock); - res = virHashLookup(pendingLearnReq, ifname); + res = virHashLookup(pendingLearnReq, ifindex_str); if (res) - virHashRemoveEntry(pendingLearnReq, ifname, NULL); + virHashRemoveEntry(pendingLearnReq, ifindex_str, NULL); virMutexUnlock(&pendingLearnReqLock); @@ -274,7 +358,7 @@ static void * learnIPAddressThread(void *arg) { char errbuf[PCAP_ERRBUF_SIZE] = {0}; - pcap_t *handle; + pcap_t *handle = NULL; struct bpf_program fp; struct pcap_pkthdr header; const u_char *packet; @@ -285,19 +369,26 @@ learnIPAddressThread(void *arg) unsigned int ethHdrSize; char *listen_if = (strlen(req->linkdev) != 0) ? req->linkdev : req->ifname; - int to_ms = (strlen(req->linkdev) != 0) ? 1000 - : 0; int dhcp_opts_len; char macaddr[VIR_MAC_STRING_BUFLEN]; virBuffer buf = VIR_BUFFER_INITIALIZER; - char *filter= NULL; + char *filter = NULL; uint16_t etherType; + bool showError = true; enum howDetect howDetected = 0; virNWFilterTechDriverPtr techdriver = req->techdriver; + virNWFilterLockIface(req->ifname); + req->status = 0; - handle = pcap_open_live(listen_if, BUFSIZ, 0, to_ms, errbuf); + /* anything change to the VM's interface -- check at least once */ + if (ifaceCheck(false, req->ifname, NULL, req->ifindex)) { + req->status = ENODEV; + goto done; + } + + handle = pcap_open_live(listen_if, BUFSIZ, 0, PKT_TIMEOUT_MS, errbuf); if (handle == NULL) { VIR_DEBUG("Couldn't open device %s: %s\n", listen_if, errbuf); @@ -309,11 +400,22 @@ learnIPAddressThread(void *arg) switch (req->howDetect) { case DETECT_DHCP: + if (techdriver->applyDHCPOnlyRules(req->ifname, + req->macaddr, + NULL)) { + req->status = EINVAL; + goto done; + } virBufferVSprintf(&buf, " ether dst %s" " and src port 67 and dst port 68", macaddr); break; default: + if (techdriver->applyBasicRules(req->ifname, + req->macaddr)) { + req->status = EINVAL; + goto done; + } virBufferVSprintf(&buf, "ether host %s", macaddr); } @@ -324,25 +426,36 @@ learnIPAddressThread(void *arg) filter = virBufferContentAndReset(&buf); - if (pcap_compile(handle, &fp, filter, 1, 0) != 0 || - pcap_setfilter(handle, &fp) != 0) { - VIR_DEBUG("Couldn't compile or set filter '%s'.\n", filter); + if (pcap_compile(handle, &fp, filter, 1, 0) != 0) { + VIR_DEBUG("Couldn't compile filter '%s'.\n", filter); req->status = EINVAL; goto done; } + if (pcap_setfilter(handle, &fp) != 0) { + VIR_DEBUG("Couldn't set filter '%s'.\n", filter); + req->status = EINVAL; + pcap_freecode(&fp); + goto done; + } + + pcap_freecode(&fp); + while (req->status == 0 && vmaddr == 0) { packet = pcap_next(handle, &header); if (!packet) { - if (to_ms == 0) { - /* assuming IF disappeared */ - req->status = ENODEV; + + if (threadsTerminate) { + req->status = ECANCELED; + showError = false; break; } - /* listening on linkdev, check whether VM's dev is still there */ - if (ifaceCheck(false, req->ifname, req->macaddr, -1)) { + + /* check whether VM's dev is still there */ + if (ifaceCheck(false, req->ifname, NULL, req->ifindex)) { req->status = ENODEV; + showError = false; break; } continue; @@ -470,6 +583,7 @@ learnIPAddressThread(void *arg) ret = virNWFilterInstantiateFilterLate(NULL, req->ifname, + req->ifindex, req->linkdev, req->nettype, req->macaddr, @@ -478,13 +592,22 @@ learnIPAddressThread(void *arg) req->driver); VIR_DEBUG("Result from applying firewall rules on " "%s with IP addr %s : %d\n", req->ifname, inetaddr, ret); + } else { + if (showError) + virReportSystemError(req->status, + "%s encountered an error. Shutting down " + "interface %s", + __FUNCTION__, req->ifname); + ifaceDown(req->ifname); } memset(&req->thread, 0x0, sizeof(req->thread)); VIR_DEBUG("pcap thread terminating for interface %s\n",req->ifname); - virNWFilterDeregisterLearnReq(req->ifname); + virNWFilterDeregisterLearnReq(req->ifindex); + + virNWFilterUnlockIface(req->ifname); virNWFilterIPAddrLearnReqFree(req); @@ -496,6 +619,7 @@ learnIPAddressThread(void *arg) * virNWFilterLearnIPAddress * @techdriver : driver to build firewalls * @ifname: the name of the interface + * @ifindex: the index of the interface * @linkdev : the name of the link device; currently only used in case of a * macvtap device * @nettype : the type of interface @@ -516,6 +640,7 @@ learnIPAddressThread(void *arg) int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -530,6 +655,14 @@ virNWFilterLearnIPAddress(virNWFilterTec if (howDetect == 0) return 1; + if ( !techdriver->canApplyBasicRules()) { + virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("IP parameter must be provided since " + "snooping the IP address does not work " + "possibly due to missing tools")); + return 1; + } + if (VIR_ALLOC(req) < 0) { virReportOOMError(); goto err_no_req; @@ -538,7 +671,7 @@ virNWFilterLearnIPAddress(virNWFilterTec ht = virNWFilterHashTableCreate(0); if (ht == NULL) { virReportOOMError(); - goto err_no_ht; + goto err_free_req; } if (virNWFilterHashTablePutAll(filterparams, ht)) @@ -565,6 +698,8 @@ virNWFilterLearnIPAddress(virNWFilterTec goto err_free_ht; } } + + req->ifindex = ifindex; req->nettype = nettype; memcpy(req->macaddr, macaddr, sizeof(req->macaddr)); req->driver = driver; @@ -576,35 +711,21 @@ virNWFilterLearnIPAddress(virNWFilterTec rc = virNWFilterRegisterLearnReq(req); if (rc) - goto err_free_ht; - - switch (howDetect) { - case DETECT_DHCP: - if (techdriver->applyDHCPOnlyRules(ifname, - macaddr, - NULL)) - goto err_free_ht; - break; - default: - if (techdriver->applyBasicRules(ifname, - macaddr)) - goto err_free_ht; - } - + goto err_free_req; if (pthread_create(&req->thread, NULL, learnIPAddressThread, req) != 0) - goto err_remove_rules; + goto err_dereg_req; return 0; -err_remove_rules: - techdriver->removeBasicRules(ifname); +err_dereg_req: + virNWFilterDeregisterLearnReq(ifindex); err_free_ht: virNWFilterHashTableFree(ht); -err_no_ht: +err_free_req: virNWFilterIPAddrLearnReqFree(req); err_no_req: return 1; @@ -615,6 +736,7 @@ err_no_req: int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, const char *ifname ATTRIBUTE_UNUSED, + int ifindex ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, enum virDomainNetType nettype ATTRIBUTE_UNUSED, const unsigned char *macaddr ATTRIBUTE_UNUSED, @@ -637,6 +759,12 @@ virNWFilterLearnIPAddress(virNWFilterTec */ int virNWFilterLearnInit(void) { + + if (pendingLearnReq) + return 0; + + threadsTerminate = false; + pendingLearnReq = virHashCreate(0); if (!pendingLearnReq) { virReportOOMError(); @@ -660,6 +788,18 @@ virNWFilterLearnInit(void) { return 1; } + ifaceLockMap = virHashCreate(0); + if (!ifaceLockMap) { + virReportOOMError(); + virNWFilterLearnShutdown(); + return 1; + } + + if (virMutexInit(&ifaceMapLock)) { + virNWFilterLearnShutdown(); + return 1; + } + return 0; } @@ -670,9 +810,18 @@ virNWFilterLearnInit(void) { */ void virNWFilterLearnShutdown(void) { + + threadsTerminate = true; + + while (virHashSize(pendingLearnReq) != 0) + usleep((PKT_TIMEOUT_MS * 1000) / 3); + virHashFree(pendingLearnReq, freeLearnReqEntry); pendingLearnReq = NULL; virNWFilterHashTableFree(ipAddressMap); ipAddressMap = NULL; + + virHashFree(ifaceLockMap, freeIfaceLock); + ifaceLockMap = NULL; } Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.h +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h @@ -35,6 +35,7 @@ typedef virNWFilterIPAddrLearnReq *virNW struct _virNWFilterIPAddrLearnReq { virNWFilterTechDriverPtr techdriver; char ifname[IF_NAMESIZE]; + int ifindex; char linkdev[IF_NAMESIZE]; enum virDomainNetType nettype; unsigned char macaddr[VIR_MAC_BUFLEN]; @@ -49,6 +50,7 @@ struct _virNWFilterIPAddrLearnReq { int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -57,12 +59,15 @@ int virNWFilterLearnIPAddress(virNWFilte virNWFilterDriverStatePtr driver, enum howDetect howDetect); -virNWFilterIPAddrLearnReqPtr virNWFilterLookupLearnReq(const char *ifname); +virNWFilterIPAddrLearnReqPtr virNWFilterLookupLearnReq(int ifindex); void virNWFilterDelIpAddrForIfname(const char *ifname); const char *virNWFilterGetIpAddrForIfname(const char *ifname); +int virNWFilterLockIface(const char *ifname); +void virNWFilterUnlockIface(const char *ifname); + int virNWFilterLearnInit(void); void virNWFilterLearnShutdown(void); Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -557,6 +557,7 @@ virNWFilterInstantiate(virConnectPtr con enum virDomainNetType nettype, virNWFilterDefPtr filter, const char *ifname, + int ifindex, const char *linkdev, virNWFilterHashTablePtr vars, enum instCase useNewFilter, int *foundNewFilter, @@ -592,9 +593,10 @@ virNWFilterInstantiate(virConnectPtr con if (virHashSize(missing_vars->hashTable) == 1) { if (virHashLookup(missing_vars->hashTable, NWFILTER_STD_VAR_IP) != NULL) { - if (virNWFilterLookupLearnReq(ifname) == NULL) { + if (virNWFilterLookupLearnReq(ifindex) == NULL) { rc = virNWFilterLearnIPAddress(techdriver, ifname, + ifindex, linkdev, nettype, macaddr, filter->name, @@ -639,11 +641,21 @@ virNWFilterInstantiate(virConnectPtr con if (rc) goto err_exit; + virNWFilterLockIface(ifname); + rc = techdriver->applyNewRules(conn, ifname, nptrs, ptrs); if (teardownOld && rc == 0) techdriver->tearOldRules(conn, ifname); + if (rc == 0 && ifaceCheck(false, ifname, NULL, ifindex)) { + /* interface changed/disppeared */ + techdriver->allTeardown(ifname); + rc = 1; + } + + virNWFilterUnlockIface(ifname); + VIR_FREE(ptrs); } @@ -666,6 +678,7 @@ static int __virNWFilterInstantiateFilter(virConnectPtr conn, bool teardownOld, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -767,6 +780,7 @@ __virNWFilterInstantiateFilter(virConnec nettype, filter, ifname, + ifindex, linkdev, vars, useNewFilter, &foundNewFilter, @@ -798,9 +812,15 @@ _virNWFilterInstantiateFilter(virConnect const char *linkdev = (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) ? net->data.direct.linkdev : NULL; + int ifindex; + + if (ifaceGetIndex(true, net->ifname, &ifindex)) + return 1; + return __virNWFilterInstantiateFilter(conn, teardownOld, net->ifname, + ifindex, linkdev, net->type, net->mac, @@ -814,6 +834,7 @@ _virNWFilterInstantiateFilter(virConnect int virNWFilterInstantiateFilterLate(virConnectPtr conn, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -825,6 +846,7 @@ virNWFilterInstantiateFilterLate(virConn rc = __virNWFilterInstantiateFilter(conn, 1, ifname, + ifindex, linkdev, nettype, macaddr, Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -49,6 +49,7 @@ int virNWFilterTearOldFilter(virConnectP int virNWFilterInstantiateFilterLate(virConnectPtr conn, const char *ifname, + int ifindex, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -77,6 +78,7 @@ virNWFilterTearNWFilter(virDomainNetDefP static inline void virNWFilterTearVMNWFilters(virDomainObjPtr vm) { int i; + for (i = 0; i < vm->def->nnets; i++) virNWFilterTearNWFilter(vm->def->nets[i]); }

2 2

[libvirt] [PATCH] esx: Gather some XML generation macros in esx_vi.h
by Matthias Bolte 21 Apr '10

21 Apr '10

--- src/esx/esx_vi.c | 27 ++------------------------- src/esx/esx_vi.h | 37 +++++++++++++++++++++++++++++++++++++ src/esx/esx_vi_methods.c | 17 ----------------- src/esx/esx_vi_types.c | 20 -------------------- 4 files changed, 39 insertions(+), 62 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index c6854f1..e405c80 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -38,38 +38,13 @@ #define VIR_FROM_THIS VIR_FROM_ESX -#define ESX_VI__SOAP__REQUEST_HEADER \ - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ - "<soapenv:Envelope " \ - "xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " \ - "xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " \ - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " \ - "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" \ - "<soapenv:Body>" - -#define ESX_VI__SOAP__REQUEST_FOOTER \ - "</soapenv:Body>" \ - "</soapenv:Envelope>" + #define ESX_VI__SOAP__RESPONSE_XPATH(_type) \ ((char *)"/soapenv:Envelope/soapenv:Body/" \ "vim:"_type"Response/vim:returnval") -#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \ - do { \ - virBufferAddLit(_buffer, "<"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \ - virBufferAdd(_buffer, _type, -1); \ - virBufferAddLit(_buffer, "\">"); \ - } while (0) - -#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \ - do { \ - virBufferAddLit(_buffer, "</"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, ">"); \ - } while (0) + #define ESX_VI__TEMPLATE__ALLOC(_type) \ int \ @@ -78,6 +53,8 @@ return esxVI_Alloc((void **)ptrptr, sizeof(esxVI_##_type)); \ } + + #define ESX_VI__TEMPLATE__FREE(_type, _body) \ void \ esxVI_##_type##_Free(esxVI_##_type **ptrptr) \ diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index a3d9363..e0d731e 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -40,6 +40,43 @@ +#define ESX_VI__SOAP__REQUEST_HEADER \ + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ + "<soapenv:Envelope\n" \ + " xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" \ + " xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"\n" \ + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \ + " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" \ + "<soapenv:Body>\n" + + + +#define ESX_VI__SOAP__REQUEST_FOOTER \ + "</soapenv:Body>\n" \ + "</soapenv:Envelope>" + + + +#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \ + do { \ + virBufferAddLit(_buffer, "<"); \ + virBufferAdd(_buffer, _element, -1); \ + virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \ + virBufferAdd(_buffer, _type, -1); \ + virBufferAddLit(_buffer, "\">"); \ + } while (0) + + + +#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \ + do { \ + virBufferAddLit(_buffer, "</"); \ + virBufferAdd(_buffer, _element, -1); \ + virBufferAddLit(_buffer, ">"); \ + } while (0) + + + typedef enum _esxVI_APIVersion esxVI_APIVersion; typedef enum _esxVI_ProductVersion esxVI_ProductVersion; typedef enum _esxVI_Occurrence esxVI_Occurrence; diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index 5c52167..8f841e3 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -34,23 +34,6 @@ -#define ESX_VI__SOAP__REQUEST_HEADER \ - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \ - "<soapenv:Envelope " \ - "xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " \ - "xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " \ - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " \ - "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" \ - "<soapenv:Body>" - - - -#define ESX_VI__SOAP__REQUEST_FOOTER \ - "</soapenv:Body>" \ - "</soapenv:Envelope>" - - - #define ESX_VI__METHOD__CHECK_OUTPUT__None \ /* nothing */ diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index ed4674b..7d2c02c 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -39,26 +39,6 @@ -#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \ - do { \ - virBufferAddLit(_buffer, "<"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \ - virBufferAdd(_buffer, _type, -1); \ - virBufferAddLit(_buffer, "\">"); \ - } while (0) - - - -#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \ - do { \ - virBufferAddLit(_buffer, "</"); \ - virBufferAdd(_buffer, _element, -1); \ - virBufferAddLit(_buffer, ">"); \ - } while (0) - - - #define ESX_VI__TEMPLATE__ALLOC(__type) \ int \ esxVI_##__type##_Alloc(esxVI_##__type **ptrptr) \ -- 1.6.3.3

2 3

[libvirt] [RFC PATCH] Support for qemu aio drive option
by Matthias Dahl 21 Apr '10

21 Apr '10

This is a "quick" implementation to support the qemu aio drive option. I tried to stay true to the coding style and this has been tested w/ libvirt 0.7.6 and works just fine. Since I am not that familiar w/ the inner workings of libvirt, I am sure I missed a few spots, so I hope either someone will base his work on this patch or point me into the right direction so I can finish this up for good. :-) For everyone else, enjoy... --- src/conf/domain_conf.c | 23 +++++++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ 4 files changed, 49 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 766993c..8bee7b8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -120,6 +120,11 @@ VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, "writethrough", "writeback") +VIR_ENUM_IMPL(virDomainDiskAIO, VIR_DOMAIN_DISK_AIO_LAST, + "default", + "native", + "threads") + VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, "ide", "fdc", @@ -1228,6 +1233,7 @@ virDomainDiskDefParseXML(virConnectPtr conn, char *target = NULL; char *bus = NULL; char *cachetag = NULL; + char *aiotag = NULL; char *devaddr = NULL; virStorageEncryptionPtr encryption = NULL; char *serial = NULL; @@ -1293,6 +1299,7 @@ virDomainDiskDefParseXML(virConnectPtr conn, driverName = virXMLPropString(cur, "name"); driverType = virXMLPropString(cur, "type"); cachetag = virXMLPropString(cur, "cache"); + aiotag = virXMLPropString(cur, "aio"); } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { @@ -1409,6 +1416,13 @@ virDomainDiskDefParseXML(virConnectPtr conn, goto error; } + if (aiotag && + (def->aiomode = virDomainDiskAIOTypeFromString(aiotag)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unknown disk aio mode '%s'"), aiotag); + goto error; + } + if (devaddr) { if (sscanf(devaddr, "%x:%x:%x", &def->info.addr.pci.domain, @@ -1450,6 +1464,7 @@ cleanup: VIR_FREE(driverType); VIR_FREE(driverName); VIR_FREE(cachetag); + VIR_FREE(aiotag); VIR_FREE(devaddr); VIR_FREE(serial); virStorageEncryptionFree(encryption); @@ -4565,6 +4580,7 @@ virDomainDiskDefFormat(virConnectPtr conn, const char *device = virDomainDiskDeviceTypeToString(def->device); const char *bus = virDomainDiskBusTypeToString(def->bus); const char *cachemode = virDomainDiskCacheTypeToString(def->cachemode); + const char *aiomode = virDomainDiskAIOTypeToString(def->aiomode); if (!type) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, @@ -4586,6 +4602,11 @@ virDomainDiskDefFormat(virConnectPtr conn, _("unexpected disk cache mode %d"), def- >cachemode); return -1; } + if (!aiomode) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected disk aio mode %d"), def->aiomode); + return -1; + } virBufferVSprintf(buf, " <disk type='%s' device='%s'>\n", @@ -4597,6 +4618,8 @@ virDomainDiskDefFormat(virConnectPtr conn, virBufferVSprintf(buf, " type='%s'", def->driverType); if (def->cachemode) virBufferVSprintf(buf, " cache='%s'", cachemode); + if (def->aiomode) + virBufferVSprintf(buf, " aio='%s'", aiomode); virBufferVSprintf(buf, "/>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0b79e88..07805a6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -141,6 +141,14 @@ enum virDomainDiskCache { VIR_DOMAIN_DISK_CACHE_LAST }; +enum virDomainDiskAIO { + VIR_DOMAIN_DISK_AIO_DEFAULT, + VIR_DOMAIN_DISK_AIO_NATIVE, + VIR_DOMAIN_DISK_AIO_THREADS, + + VIR_DOMAIN_DISK_AIO_LAST +}; + /* Stores the virtual disk configuration */ typedef struct _virDomainDiskDef virDomainDiskDef; typedef virDomainDiskDef *virDomainDiskDefPtr; @@ -154,6 +162,7 @@ struct _virDomainDiskDef { char *driverType; char *serial; int cachemode; + int aiomode; unsigned int readonly : 1; unsigned int shared : 1; virDomainDeviceInfo info; @@ -897,6 +906,7 @@ VIR_ENUM_DECL(virDomainDisk) VIR_ENUM_DECL(virDomainDiskDevice) VIR_ENUM_DECL(virDomainDiskBus) VIR_ENUM_DECL(virDomainDiskCache) +VIR_ENUM_DECL(virDomainDiskAIO) VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainNet) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3d83a8f..fd3a670 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -83,6 +83,12 @@ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAIN_DISK_CACHE_LAST, "writethrough", "writeback"); +VIR_ENUM_DECL(qemuDiskAIO) +VIR_ENUM_IMPL(qemuDiskAIO, VIR_DOMAIN_DISK_AIO_LAST, + "default", + "native", + "threads"); + VIR_ENUM_DECL(qemuVideo) VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, @@ -1137,6 +1143,8 @@ static unsigned int qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_DRIVE_CACHE_V2; if (strstr(help, "format=")) flags |= QEMUD_CMD_FLAG_DRIVE_FORMAT; + if (strstr(help, "aio=threads|native")) + flags |= QEMUD_CMD_FLAG_DRIVE_AIO; } if (strstr(help, "-vga") && !strstr(help, "-std-vga")) flags |= QEMUD_CMD_FLAG_VGA; @@ -2340,6 +2348,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAddLit(&opt, ",cache=off"); } + if (disk->aiomode && (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_AIO)) { + const char * mode = qemuDiskAIOTypeToString(disk->aiomode); + + virBufferVSprintf(&opt, ",aio=%s", mode); + } + if (virBufferError(&opt)) { virReportOOMError(NULL); goto error; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 101f187..780ae6e 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -82,6 +82,8 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_SDL = (1 << 27), /* Is the new -sdl arg available */ QEMUD_CMD_FLAG_SMP_TOPOLOGY = (1 << 28), /* Is sockets=s,cores=c,threads=t available for -smp? */ QEMUD_CMD_FLAG_NETDEV = (1 << 29), /* The -netdev flag & netdev_add/remove monitor commands */ + + QEMUD_CMD_FLAG_DRIVE_AIO = (1 << 30), /* Is -drive aio= avail */ }; /* Main driver state */ -- 1.7.0.4

3 4

[libvirt] New VM Snapshot API Not working
by Tej Parkash, ERS, HCLTech 21 Apr '10

21 Apr '10

All, I have compiled new libvirt library 0.8.0. Compilation and installation went really fine except "make check" which has show some test got failed. Here is what make check said. Failed Test: ---------------snip----------- PASS: statstest TEST: qparamtest ................................ 32 OK PASS: qparamtest TEST: capabilityschematest !!!!!!!!!!!! 12 FAILED FAIL: capabilityschematest TEST: interfaceschematest !!!!!!!!!!!!!!!!!! 18 FAILED FAIL: interfaceschematest TEST: networkschematest !!!!!!!!!!! 11 FAILED FAIL: networkschematest TEST: storagepoolschematest !!!!!!!!!!!!!!!!!!!! 20 FAILED FAIL: storagepoolschematest TEST: storagevolschematest !!!!!!!!!!!! 12 FAILED FAIL: storagevolschematest TEST: domainschematest !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 40 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 80 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 120 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 160 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 200 !! 202 FAILED FAIL: domainschematest TEST: nodedevschematest !!!!!!!!!!!!!! 14 FAILED FAIL: nodedevschematest TEST: nwfilterschematest !!!!!!!!!!!!!!!!!!!!!!!!!!! 27 FAILED FAIL: nwfilterschematest TEST: test_conf.sh .. 2 OK ---------------- snip --------------------------- ==================== 9 of 40 tests failed ==================== make[3]: *** [check-TESTS] Error 1 make[3]: Leaving directory `/tmp/libvirt-0.8.0/tests' make[2]: *** [check-am] Error 2 make[2]: Leaving directory `/tmp/libvirt-0.8.0/tests' make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory `/tmp/libvirt-0.8.0/tests' make: *** [check-recursive] Error 1 ------------------------------------------------------------------------- However installation went fine. After I started create some snapshot, I am getting some remote error: root@hcl:~# xm li Name ID Mem VCPUs State Time(s) Domain-0 0 622 2 r----- 1755.3 Test 3 256 1 -b---- 4.4 root@hcl:~# virsh snapshot-create 3 error: unmarshalling remote_error root@hcl:~# virsh snapshot-create 3 test.xml error: unmarshalling remote_error I have even written a C code with API's but same problem. Here is livirt version n all root@hcl:/tmp/libvirt-0.8.0# libvirtd --version libvirtd (libvirt) 0.8.0 root@hcl:/tmp/libvirt-0.8.0# virsh -v 0.8.0 root@hcl:/tmp/libvirt-0.8.0# Any Idea???????????????? Any suggestion???????/ Thanks Tej DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or HCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of HCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. Before opening any mail and attachments please check them for viruses and defect. -----------------------------------------------------------------------------------------------------------------------

3 4

[libvirt] Bug with creating snapshots in ESX in 0.8.0 (patch included)
by Chris Wong 21 Apr '10

21 Apr '10

I was testing out the new snapshot on functionality with GSX (VMWare Server 2.0.2) and noticed that it would fail to create a snapshot on a VM with no snapshots. I tracked it down to the esxDomainSnapshotCreateXML call, which would prematurely fail if the Root Snapshot Tree was empty -- which it would be. Verified that both ESXi 4.0 and GSX return an empty snapshot tree. I don't feel this should be an error, and it prevents snapshots from being created. I don't think I saw a fix for this in the master git branch. I'm not too sure if this is the proper path to go down, but at the very least it fixes my specific problem. If there is another fix or if I completely missed this point, let me know. diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index fea887a..70bfc2c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3330,12 +3330,16 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, (priv->host, domain->uuid, NULL, &virtualMachine, priv->autoAnswer) < 0 || esxVI_LookupRootSnapshotTreeList(priv->host, domain->uuid, - &rootSnapshotList) < 0 || - esxVI_GetSnapshotTreeByName(rootSnapshotList, def->name, - &snapshotTree, &snapshotTreeParent, - esxVI_Occurrence_OptionalItem) < 0) { + &rootSnapshotList) < 0) { goto failure; } + if (rootSnapshotList) { + if (esxVI_GetSnapshotTreeByName(rootSnapshotList, def->name, + &snapshotTree, &snapshotTreeParent, + esxVI_Occurrence_OptionalItem) < 0) { + goto failure; + } + } if (snapshotTree != NULL) { ESX_ERROR(VIR_ERR_OPERATION_INVALID, diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 89ef2dd..93ef36b 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -2561,12 +2561,6 @@ esxVI_LookupRootSnapshotTreeList } } - if (*rootSnapshotTreeList == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not lookup root snapshot list")); - goto failure; - } - cleanup: esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine);

2 2

[libvirt] iface-list command in virsh
by Dev.Atom 21 Apr '10

21 Apr '10

Hi, I'm trying to list physical interface of a remote tcp host via the C API and it fails. I have tried to use virsh iface-list in remote TCP connection and it fails also. I have trying on the libvirt host with my normal account and it fails also, but when I connect under root account on the libvirt host, iface-list works. Any clue ? Best regards, Arnaud Champion

4 8

[libvirt] [PATCH] esx: Fix FindByIp response handling
by Matthias Bolte 21 Apr '10

21 Apr '10

FindByIp may return nothing if there is no host or virtual machine with the given IP address. Handle that case properly. --- src/esx/esx_vi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 37270fe..c6854f1 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1968,6 +1968,13 @@ esxVI_LookupHostSystemByIp(esxVI_Context *ctx, const char *ipAddress, goto failure; } + if (managedObjectReference == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find host system with IP address '%s'"), + ipAddress); + goto failure; + } + if (esxVI_LookupObjectContentByType(ctx, managedObjectReference, "HostSystem", propertyNameList, esxVI_Boolean_False, hostSystem) < 0) { -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Fix virtualHW.version generation
by Matthias Bolte 21 Apr '10

21 Apr '10

The supported virtualHW.version doesn't depend on the API version, but on the product version. --- src/esx/esx_driver.c | 8 ++-- src/esx/esx_vmx.c | 46 +++++++++++++------------- src/esx/esx_vmx.h | 4 +- tests/vmx2xmltest.c | 85 +++++++++++++++++++++++++------------------------ tests/xml2vmxtest.c | 73 ++++++++++++++++++++++--------------------- 5 files changed, 109 insertions(+), 107 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 97c1645..c0c3195 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2145,7 +2145,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags) } def = esxVMX_ParseConfig(priv->host, vmx, datastoreName, directoryName, - priv->host->apiVersion); + priv->host->productVersion); if (def != NULL) { xml = virDomainDefFormat(def, flags); @@ -2188,7 +2188,7 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, } def = esxVMX_ParseConfig(priv->host, nativeConfig, "?", "?", - priv->host->apiVersion); + priv->host->productVersion); if (def != NULL) { xml = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE); @@ -2222,7 +2222,7 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, return NULL; } - vmx = esxVMX_FormatConfig(priv->host, def, priv->host->apiVersion); + vmx = esxVMX_FormatConfig(priv->host, def, priv->host->productVersion); virDomainDefFree(def); @@ -2445,7 +2445,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) } /* Build VMX from domain XML */ - vmx = esxVMX_FormatConfig(priv->host, def, priv->host->apiVersion); + vmx = esxVMX_FormatConfig(priv->host, def, priv->host->productVersion); if (vmx == NULL) { goto failure; diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c2e9be6..84c4aef 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -724,7 +724,7 @@ esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, virDomainDefPtr esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, const char *datastoreName, const char *directoryName, - esxVI_APIVersion apiVersion) + esxVI_ProductVersion productVersion) { virConfPtr conf = NULL; virDomainDefPtr def = NULL; @@ -774,42 +774,41 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, goto failure; } - switch (apiVersion) { - case esxVI_APIVersion_25: + /* + * virtualHW.version compatibility matrix: + * + * 4 7 API + * ESX 3.5 + 2.5 + * ESX 4.0 + + 4.0 + * GSX 2.0 + + 2.5 + */ + switch (productVersion) { + case esxVI_ProductVersion_ESX35: if (virtualHW_version != 4) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'virtualHW.version' to be 4 for " - "VI API version 2.5 but found %lld"), + _("Expecting VMX entry 'virtualHW.version' to be 4 " + "but found %lld"), virtualHW_version); goto failure; } break; - case esxVI_APIVersion_40: + case esxVI_ProductVersion_GSX20: + case esxVI_ProductVersion_ESX40: if (virtualHW_version != 4 && virtualHW_version != 7) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " - "for VI API version 4.0 but found %lld"), + "but found %lld"), virtualHW_version); goto failure; } break; - case esxVI_APIVersion_Unknown: - if (virtualHW_version != 4 && virtualHW_version != 7) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " - "but found %lld"), virtualHW_version); - goto failure; - } - - break; - default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting VI API version 2.5 or 4.0")); + _("Unexpected product version")); goto failure; } @@ -2189,7 +2188,7 @@ esxVMX_FormatFileName(esxVI_Context *ctx ATTRIBUTE_UNUSED, const char *src) char * esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, - esxVI_APIVersion apiVersion) + esxVI_ProductVersion productVersion) { int i; int sched_cpu_affinity_length; @@ -2210,18 +2209,19 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, virBufferAddLit(&buffer, "config.version = \"8\"\n"); /* vmx:virtualHW.version */ - switch (apiVersion) { - case esxVI_APIVersion_25: + switch (productVersion) { + case esxVI_ProductVersion_ESX35: virBufferAddLit(&buffer, "virtualHW.version = \"4\"\n"); break; - case esxVI_APIVersion_40: + case esxVI_ProductVersion_GSX20: + case esxVI_ProductVersion_ESX40: virBufferAddLit(&buffer, "virtualHW.version = \"7\"\n"); break; default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting VI API version 2.5 or 4.0")); + _("Unexpected product version")); goto failure; } diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h index c07f8b3..081b67d 100644 --- a/src/esx/esx_vmx.h +++ b/src/esx/esx_vmx.h @@ -58,7 +58,7 @@ esxVMX_ParseFileName(esxVI_Context *ctx, const char *fileName, virDomainDefPtr esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, const char *datastoreName, const char *directoryName, - esxVI_APIVersion apiVersion); + esxVI_ProductVersion productVersion); int esxVMX_ParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def); @@ -96,7 +96,7 @@ esxVMX_FormatFileName(esxVI_Context *ctx, const char *src); char * esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, - esxVI_APIVersion apiVersion); + esxVI_ProductVersion productVersion); int esxVMX_FormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer); diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index f3b3b5e..12229b9 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -17,7 +17,8 @@ static char *abs_srcdir = NULL; # define MAX_FILE 4096 static int -testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) +testCompareFiles(const char *vmx, const char *xml, + esxVI_ProductVersion productVersion) { int result = -1; char vmxData[MAX_FILE]; @@ -37,7 +38,7 @@ testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) } def = esxVMX_ParseConfig(NULL, vmxData, "datastore", "directory", - apiVersion); + productVersion); if (def == NULL) { err = virGetLastError(); @@ -70,7 +71,7 @@ testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) struct testInfo { const char *input; const char *output; - esxVI_APIVersion version; + esxVI_ProductVersion version; }; static int @@ -112,7 +113,7 @@ mymain(int argc, char **argv) return EXIT_FAILURE; } -# define DO_TEST(_in, _out, _version) \ +# define DO_TEST(_in, _out, _version) \ do { \ struct testInfo info = { _in, _out, _version }; \ virResetLastError(); \ @@ -122,57 +123,57 @@ mymain(int argc, char **argv) } \ } while (0) - DO_TEST("case-insensitive-1", "case-insensitive-1", esxVI_APIVersion_25); - DO_TEST("case-insensitive-2", "case-insensitive-2", esxVI_APIVersion_25); + DO_TEST("case-insensitive-1", "case-insensitive-1", esxVI_ProductVersion_ESX35); + DO_TEST("case-insensitive-2", "case-insensitive-2", esxVI_ProductVersion_ESX35); - DO_TEST("minimal", "minimal", esxVI_APIVersion_25); - DO_TEST("minimal-64bit", "minimal-64bit", esxVI_APIVersion_25); + DO_TEST("minimal", "minimal", esxVI_ProductVersion_ESX35); + DO_TEST("minimal-64bit", "minimal-64bit", esxVI_ProductVersion_ESX35); - DO_TEST("graphics-vnc", "graphics-vnc", esxVI_APIVersion_25); + DO_TEST("graphics-vnc", "graphics-vnc", esxVI_ProductVersion_ESX35); - DO_TEST("scsi-driver", "scsi-driver", esxVI_APIVersion_25); - DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_APIVersion_25); + DO_TEST("scsi-driver", "scsi-driver", esxVI_ProductVersion_ESX35); + DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_ProductVersion_ESX35); - DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_APIVersion_25); - DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_APIVersion_25); + DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_ProductVersion_ESX35); - DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_APIVersion_25); - DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_APIVersion_25); + DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_ProductVersion_ESX35); - DO_TEST("floppy-file", "floppy-file", esxVI_APIVersion_25); - DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); + DO_TEST("floppy-file", "floppy-file", esxVI_ProductVersion_ESX35); + DO_TEST("floppy-device", "floppy-device", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); - DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-custom", "ethernet-custom", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); - DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); - DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); - DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-static", "ethernet-static", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-other", "ethernet-other", esxVI_ProductVersion_ESX35); - DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); - DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); - DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_APIVersion_25); - DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_APIVersion_25); - DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_APIVersion_25); - DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_ProductVersion_ESX35); + DO_TEST("serial-device", "serial-device", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe-server-vm", "serial-pipe", esxVI_ProductVersion_ESX35); - DO_TEST("parallel-file", "parallel-file", esxVI_APIVersion_25); - DO_TEST("parallel-device", "parallel-device", esxVI_APIVersion_25); + DO_TEST("parallel-file", "parallel-file", esxVI_ProductVersion_ESX35); + DO_TEST("parallel-device", "parallel-device", esxVI_ProductVersion_ESX35); - DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_ProductVersion_ESX35); - DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_ProductVersion_ESX35); return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index f9c4730..e7720bf 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -65,7 +65,8 @@ testESXCapsInit(void) } static int -testCompareFiles(const char *xml, const char *vmx, esxVI_APIVersion apiVersion) +testCompareFiles(const char *xml, const char *vmx, + esxVI_ProductVersion productVersion) { int result = -1; char xmlData[MAX_FILE]; @@ -89,7 +90,7 @@ testCompareFiles(const char *xml, const char *vmx, esxVI_APIVersion apiVersion) goto failure; } - formatted = esxVMX_FormatConfig(NULL, def, apiVersion); + formatted = esxVMX_FormatConfig(NULL, def, productVersion); if (formatted == NULL) { goto failure; @@ -112,7 +113,7 @@ testCompareFiles(const char *xml, const char *vmx, esxVI_APIVersion apiVersion) struct testInfo { const char *input; const char *output; - esxVI_APIVersion version; + esxVI_ProductVersion version; }; static int @@ -170,51 +171,51 @@ mymain(int argc, char **argv) return EXIT_FAILURE; } - DO_TEST("minimal", "minimal", esxVI_APIVersion_25); - DO_TEST("minimal-64bit", "minimal-64bit", esxVI_APIVersion_25); + DO_TEST("minimal", "minimal", esxVI_ProductVersion_ESX35); + DO_TEST("minimal-64bit", "minimal-64bit", esxVI_ProductVersion_ESX35); - DO_TEST("graphics-vnc", "graphics-vnc", esxVI_APIVersion_25); + DO_TEST("graphics-vnc", "graphics-vnc", esxVI_ProductVersion_ESX35); - DO_TEST("scsi-driver", "scsi-driver", esxVI_APIVersion_25); - DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_APIVersion_25); + DO_TEST("scsi-driver", "scsi-driver", esxVI_ProductVersion_ESX35); + DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_ProductVersion_ESX35); - DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_APIVersion_25); - DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_APIVersion_25); + DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("harddisk-ide-file", "harddisk-ide-file", esxVI_ProductVersion_ESX35); - DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_APIVersion_25); - DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_APIVersion_25); - DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_APIVersion_25); + DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-file", "cdrom-ide-file", esxVI_ProductVersion_ESX35); + DO_TEST("cdrom-ide-device", "cdrom-ide-device", esxVI_ProductVersion_ESX35); - DO_TEST("floppy-file", "floppy-file", esxVI_APIVersion_25); - DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); + DO_TEST("floppy-file", "floppy-file", esxVI_ProductVersion_ESX35); + DO_TEST("floppy-device", "floppy-device", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); - DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-custom", "ethernet-custom", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_ProductVersion_ESX35); - DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); - DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); - DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); - DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-static", "ethernet-static", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_ProductVersion_ESX35); + DO_TEST("ethernet-other", "ethernet-other", esxVI_ProductVersion_ESX35); - DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); - DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); - DO_TEST("serial-pipe", "serial-pipe", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_ProductVersion_ESX35); + DO_TEST("serial-device", "serial-device", esxVI_ProductVersion_ESX35); + DO_TEST("serial-pipe", "serial-pipe", esxVI_ProductVersion_ESX35); - DO_TEST("parallel-file", "parallel-file", esxVI_APIVersion_25); - DO_TEST("parallel-device", "parallel-device", esxVI_APIVersion_25); + DO_TEST("parallel-file", "parallel-file", esxVI_ProductVersion_ESX35); + DO_TEST("parallel-device", "parallel-device", esxVI_ProductVersion_ESX35); - DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", esxVI_ProductVersion_ESX35); - DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_APIVersion_25); - DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_APIVersion_25); + DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", esxVI_ProductVersion_ESX35); + DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", esxVI_ProductVersion_ESX35); virCapabilitiesFree(caps); -- 1.6.3.3

2 2

[libvirt] [PATCH] nwfilter: add support for connlimit match
by Stefan Berger 20 Apr '10

20 Apr '10

This patch adds support for the connlimit match in iptables that is used to limit number of outgoing directions. Signed-off-by" Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.c | 5 ++ src/conf/nwfilter_conf.h | 1 src/nwfilter/nwfilter_ebiptables_driver.c | 57 +++++++++++++++++++++++------- 3 files changed, 50 insertions(+), 13 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -875,6 +875,11 @@ static const virXMLAttr2Struct ipv6Attri .datatype = DATATYPE_UINT8,\ .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataDSCP),\ /*.validator = dscpValidator,*/\ + },\ + {\ + .name = "connlimit-above",\ + .datatype = DATATYPE_UINT16,\ + .dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataConnlimitAbove),\ } #define COMMON_PORT_PROPS(STRUCT) \ Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -153,6 +153,7 @@ struct _ipHdrDataDef { nwItemDesc dataDstIPFrom; nwItemDesc dataDstIPTo; nwItemDesc dataDSCP; + nwItemDesc dataConnlimitAbove; }; Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -815,7 +815,8 @@ static int iptablesHandleIpHdr(virBufferPtr buf, virNWFilterHashTablePtr vars, ipHdrDataDefPtr ipHdr, - int directionIn) + int directionIn, + bool *skipRule, bool *skipMatch) { char ipaddr[INET6_ADDRSTRLEN], number[20]; @@ -944,6 +945,24 @@ iptablesHandleIpHdr(virBufferPtr buf, number); } + if (HAS_ENTRY_ITEM(&ipHdr->dataConnlimitAbove)) { + if (directionIn) { + // only support for limit in outgoing dir. + *skipRule = true; + } else { + if (printDataType(vars, + number, sizeof(number), + &ipHdr->dataConnlimitAbove)) + goto err_exit; + + virBufferVSprintf(buf, + " -m connlimit %s --connlimit-above %s", + ENTRY_GET_NEG_SIGN(&ipHdr->dataConnlimitAbove), + number); + *skipMatch = true; + } + } + return 0; err_exit: @@ -1063,6 +1082,8 @@ _iptablesCreateRuleInstance(int directio : iptables_cmd_path; unsigned int bufUsed; bool srcMacSkipped = false; + bool skipRule = false; + bool skipMatch = false; if (!iptables_cmd) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, @@ -1096,7 +1117,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.tcpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (iptablesHandlePortData(&buf, @@ -1140,7 +1162,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.udpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (iptablesHandlePortData(&buf, @@ -1171,7 +1194,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.udpliteHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1197,7 +1221,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.espHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1223,7 +1248,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.ahHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1249,7 +1275,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.sctpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (iptablesHandlePortData(&buf, @@ -1283,7 +1310,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.icmpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; if (HAS_ENTRY_ITEM(&rule->p.icmpHdrFilter.dataICMPType)) { @@ -1341,7 +1369,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.igmpHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1367,7 +1396,8 @@ _iptablesCreateRuleInstance(int directio if (iptablesHandleIpHdr(&buf, vars, &rule->p.allHdrFilter.ipHdr, - directionIn)) + directionIn, + &skipRule, &skipMatch)) goto err_exit; break; @@ -1376,7 +1406,8 @@ _iptablesCreateRuleInstance(int directio return -1; } - if (srcMacSkipped && bufUsed == virBufferUse(&buf)) { + if ((srcMacSkipped && bufUsed == virBufferUse(&buf)) || + skipRule) { virBufferFreeAndReset(&buf); return 0; } @@ -1385,10 +1416,10 @@ _iptablesCreateRuleInstance(int directio target = accept_target; else { target = "DROP"; - match = NULL; + skipMatch = true; } - if (match) + if (match && !skipMatch) virBufferVSprintf(&buf, " %s", match);

2 2

[libvirt] [PATCH] nwfilter: Extend fwall-drv interface and call functions via interface
by Stefan Berger 20 Apr '10

20 Apr '10

I moving some functions into the interface of the firewall driver and make them only accessible via the driver's interface. Adapt the code where needed. One new function is added that checks whether some 'basic' rules can be applied, which is used by a subsequent patch. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/conf/nwfilter_conf.h | 16 ++++++++++++++++ src/nwfilter/nwfilter_ebiptables_driver.c | 24 +++++++++++++++++++++--- src/nwfilter/nwfilter_ebiptables_driver.h | 8 -------- src/nwfilter/nwfilter_gentech_driver.c | 3 ++- src/nwfilter/nwfilter_learnipaddr.c | 24 ++++++++++++++---------- src/nwfilter/nwfilter_learnipaddr.h | 4 +++- 6 files changed, 56 insertions(+), 23 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -98,6 +98,7 @@ static const char *m_physdev_out_str = " #define MATCH_PHYSDEV_OUT m_physdev_out_str +static int ebtablesRemoveBasicRules(const char *ifname); static int ebiptablesDriverInit(void); static void ebiptablesDriverShutdown(void); @@ -2578,6 +2579,18 @@ ebiptablesInstCommand(virBufferPtr buf, /** + * ebiptablesCanApplyBasicRules + * + * Determine whether this driver can apply the basic rules, meaning + * run ebtablesApplyBasicRules and ebtablesApplyDHCPOnlyRules. + * In case of this driver we need the ebtables tool available. + */ +static int +ebiptablesCanApplyBasicRules(void) { + return (ebtables_cmd_path != NULL); +} + +/** * ebtablesApplyBasicRules * * @conn: virConnect object @@ -2591,7 +2604,7 @@ ebiptablesInstCommand(virBufferPtr buf, * - filtering for MAC address spoofing * - allowing IPv4 & ARP traffic */ -int +static int ebtablesApplyBasicRules(const char *ifname, const unsigned char *macaddr) { @@ -2685,7 +2698,7 @@ tear_down_tmpebchains: * Apply filtering rules so that the VM can only send and receive * DHCP traffic and nothing else. */ -int +static int ebtablesApplyDHCPOnlyRules(const char *ifname, const unsigned char *macaddr, const char *dhcpserver) @@ -2794,7 +2807,7 @@ tear_down_tmpebchains: } -int +static int ebtablesRemoveBasicRules(const char *ifname) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -3188,6 +3201,11 @@ virNWFilterTechDriver ebiptables_driver .removeRules = ebiptablesRemoveRules, .freeRuleInstance = ebiptablesFreeRuleInstance, .displayRuleInstance = ebiptablesDisplayRuleInstance, + + .canApplyBasicRules = ebiptablesCanApplyBasicRules, + .applyBasicRules = ebtablesApplyBasicRules, + .applyDHCPOnlyRules = ebtablesApplyDHCPOnlyRules, + .removeBasicRules = ebtablesRemoveBasicRules, }; Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.h @@ -45,12 +45,4 @@ extern virNWFilterTechDriver ebiptables_ # define EBIPTABLES_DRIVER_ID "ebiptables" - -int ebtablesApplyBasicRules(const char *ifname, - const unsigned char *macaddr); -int ebtablesApplyDHCPOnlyRules(const char *ifname, - const unsigned char *macaddr, - const char *dhcpServer); -int ebtablesRemoveBasicRules(const char *ifname); - #endif Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -487,6 +487,17 @@ typedef int (*virNWFilterRuleFreeInstanc typedef int (*virNWFilterRuleDisplayInstanceData)(virConnectPtr conn, void *_inst); +typedef int (*virNWFilterCanApplyBasicRules)(void); + +typedef int (*virNWFilterApplyBasicRules)(const char *ifname, + const unsigned char *macaddr); + +typedef int (*virNWFilterApplyDHCPOnlyRules)(const char *ifname, + const unsigned char *macaddr, + const char *dhcpserver); + +typedef int (*virNWFilterRemoveBasicRules)(const char *ifname); + enum techDrvFlags { TECHDRV_FLAG_INITIALIZED = (1 << 0), }; @@ -506,6 +517,11 @@ struct _virNWFilterTechDriver { virNWFilterRuleAllTeardown allTeardown; virNWFilterRuleFreeInstanceData freeRuleInstance; virNWFilterRuleDisplayInstanceData displayRuleInstance; + + virNWFilterCanApplyBasicRules canApplyBasicRules; + virNWFilterApplyBasicRules applyBasicRules; + virNWFilterApplyDHCPOnlyRules applyDHCPOnlyRules; + virNWFilterRemoveBasicRules removeBasicRules; }; Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.h +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h @@ -33,6 +33,7 @@ enum howDetect { typedef struct _virNWFilterIPAddrLearnReq virNWFilterIPAddrLearnReq; typedef virNWFilterIPAddrLearnReq *virNWFilterIPAddrLearnReqPtr; struct _virNWFilterIPAddrLearnReq { + virNWFilterTechDriverPtr techdriver; char ifname[IF_NAMESIZE]; char linkdev[IF_NAMESIZE]; enum virDomainNetType nettype; @@ -46,7 +47,8 @@ struct _virNWFilterIPAddrLearnReq { pthread_t thread; }; -int virNWFilterLearnIPAddress(const char *ifname, +int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, + const char *ifname, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -593,7 +593,8 @@ virNWFilterInstantiate(virConnectPtr con if (virHashLookup(missing_vars->hashTable, NWFILTER_STD_VAR_IP) != NULL) { if (virNWFilterLookupLearnReq(ifname) == NULL) { - rc = virNWFilterLearnIPAddress(ifname, + rc = virNWFilterLearnIPAddress(techdriver, + ifname, linkdev, nettype, macaddr, filter->name, Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -293,6 +293,7 @@ learnIPAddressThread(void *arg) char *filter= NULL; uint16_t etherType; enum howDetect howDetected = 0; + virNWFilterTechDriverPtr techdriver = req->techdriver; req->status = 0; @@ -458,7 +459,7 @@ learnIPAddressThread(void *arg) if (handle) pcap_close(handle); - ebtablesRemoveBasicRules(req->ifname); + techdriver->removeBasicRules(req->ifname); if (req->status == 0) { int ret; @@ -493,7 +494,7 @@ learnIPAddressThread(void *arg) /** * virNWFilterLearnIPAddress - * @conn: pointer to virConnect object + * @techdriver : driver to build firewalls * @ifname: the name of the interface * @linkdev : the name of the link device; currently only used in case of a * macvtap device @@ -513,7 +514,8 @@ learnIPAddressThread(void *arg) * firewall rules on the interface. */ int -virNWFilterLearnIPAddress(const char *ifname, +virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, + const char *ifname, const char *linkdev, enum virDomainNetType nettype, const unsigned char *macaddr, @@ -569,6 +571,7 @@ virNWFilterLearnIPAddress(const char *if req->filterparams = ht; ht = NULL; req->howDetect = howDetect; + req->techdriver = techdriver; rc = virNWFilterRegisterLearnReq(req); @@ -577,14 +580,14 @@ virNWFilterLearnIPAddress(const char *if switch (howDetect) { case DETECT_DHCP: - if (ebtablesApplyDHCPOnlyRules(ifname, - macaddr, - NULL)) + if (techdriver->applyDHCPOnlyRules(ifname, + macaddr, + NULL)) goto err_free_ht; break; default: - if (ebtablesApplyBasicRules(ifname, - macaddr)) + if (techdriver->applyBasicRules(ifname, + macaddr)) goto err_free_ht; } @@ -598,7 +601,7 @@ virNWFilterLearnIPAddress(const char *if return 0; err_remove_rules: - ebtablesRemoveBasicRules(ifname); + techdriver->removeBasicRules(ifname); err_free_ht: virNWFilterHashTableFree(ht); err_no_ht: @@ -610,7 +613,8 @@ err_no_req: #else int -virNWFilterLearnIPAddress(const char *ifname ATTRIBUTE_UNUSED, +virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, + const char *ifname ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, enum virDomainNetType nettype ATTRIBUTE_UNUSED, const unsigned char *macaddr ATTRIBUTE_UNUSED,

2 2

[libvirt] [PATCH] Mark in_open parameter of remoteAuthenticate as unused when it's unused
by Matthias Bolte 20 Apr '10

20 Apr '10

Otherwise compiling with -Werror will fail. --- I just pushed this trivial patch. src/remote/remote_driver.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e3df27b..c2b58e6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6475,7 +6475,11 @@ done: /*----------------------------------------------------------------------*/ static int -remoteAuthenticate (virConnectPtr conn, struct private_data *priv, int in_open, +remoteAuthenticate (virConnectPtr conn, struct private_data *priv, int in_open +#if !HAVE_SASL && !HAVE_POLKIT + ATTRIBUTE_UNUSED +#endif + , virConnectAuthPtr auth #if !HAVE_SASL && !HAVE_POLKIT ATTRIBUTE_UNUSED -- 1.6.3.3

2 2

[libvirt] [PATCH] Explicitly set virStoragePoolTypeInfo FS and NETFS defaults
by Matthias Bolte 20 Apr '10

20 Apr '10

No semantic change, the now explicitly set default are all zero and that's what GCC sets unspecified struct members to. --- src/conf/storage_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 620744f..6467c73 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -151,6 +151,7 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { { .poolType = VIR_STORAGE_POOL_FS, .poolOptions = { .flags = (VIR_STORAGE_POOL_SOURCE_DEVICE), + .defaultFormat = VIR_STORAGE_POOL_FS_AUTO, .formatFromString = virStoragePoolFormatFileSystemTypeFromString, .formatToString = virStoragePoolFormatFileSystemTypeToString, }, @@ -164,7 +165,7 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { .poolOptions = { .flags = (VIR_STORAGE_POOL_SOURCE_HOST | VIR_STORAGE_POOL_SOURCE_DIR), - .defaultFormat = VIR_STORAGE_POOL_FS_AUTO, + .defaultFormat = VIR_STORAGE_POOL_NETFS_AUTO, .formatFromString = virStoragePoolFormatFileSystemNetTypeFromString, .formatToString = virStoragePoolFormatFileSystemNetTypeToString, }, -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Add support for the VMXNET 2 (Enhanced) NIC model
by Matthias Bolte 20 Apr '10

20 Apr '10

Add a test case and document it. --- docs/drvesx.html.in | 5 +- src/esx/esx_vmx.c | 60 +++++++++++++++++------- tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx | 9 ++++ tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml | 20 ++++++++ tests/vmx2xmltest.c | 1 + tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx | 14 ++++++ tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml | 15 ++++++ tests/xml2vmxtest.c | 1 + 8 files changed, 106 insertions(+), 19 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 422a7f0..d454904 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -307,10 +307,11 @@ ethernet0.checkMACAddress = "false" <dd> AMD PCnet32 network card for older guests. </dd> - <dt><code>vmxnet</code>, <code>vmxnet3</code></dt> + <dt><code>vmxnet</code>, <code>vmxnet2</code>, <code>vmxnet3</code></dt> <dd> Special VMware VMXnet network card, requires VMware tools inside - the guest. + the guest. See <a href="http://kb.vmware.com/kb/1001805">VMware KB1001805</a> + for details. </dd> <dt><code>e1000</code></dt> <dd> diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c2e9be6..52c97e5 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -265,6 +265,7 @@ def->disks[0]... def->nets[0]... ->model = <model> <=> ethernet0.virtualDev = "<model>" # default depends on guestOS value + ethernet0.features = "15" # if present and virtualDev is "vmxnet" => vmxnet2 (enhanced) ethernet0.addressType = "generated" # default to "generated" @@ -1705,6 +1706,9 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) char virtualDev_name[48] = ""; char *virtualDev = NULL; + char features_name[48] = ""; + long long features = 0; + char vnet_name[48] = ""; char *vnet = NULL; @@ -1737,6 +1741,7 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) ESX_BUILD_VMX_NAME(generatedAddress); ESX_BUILD_VMX_NAME(address); ESX_BUILD_VMX_NAME(virtualDev); + ESX_BUILD_VMX_NAME(features); ESX_BUILD_VMX_NAME(networkName); ESX_BUILD_VMX_NAME(vnet); @@ -1797,21 +1802,34 @@ esxVMX_ParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) goto failure; } - /* vmx:virtualDev -> def:model */ - if (esxUtil_GetConfigString(conf, virtualDev_name, &virtualDev, 1) < 0) { + /* vmx:virtualDev, vmx:features -> def:model */ + if (esxUtil_GetConfigString(conf, virtualDev_name, &virtualDev, 1) < 0 || + esxUtil_GetConfigLong(conf, features_name, &features, 0, 1) < 0) { goto failure; } - if (virtualDev != NULL && - STRCASENEQ(virtualDev, "vlance") && - STRCASENEQ(virtualDev, "vmxnet") && - STRCASENEQ(virtualDev, "vmxnet3") && - STRCASENEQ(virtualDev, "e1000")) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " - "'vmxnet3' or 'e1000' but found '%s'"), virtualDev_name, - virtualDev); - goto failure; + if (virtualDev != NULL) { + if (STRCASENEQ(virtualDev, "vlance") && + STRCASENEQ(virtualDev, "vmxnet") && + STRCASENEQ(virtualDev, "vmxnet3") && + STRCASENEQ(virtualDev, "e1000")) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " + "'vmxnet3' or 'e1000' but found '%s'"), virtualDev_name, + virtualDev); + goto failure; + } + + if (STRCASEEQ(virtualDev, "vmxnet") && features == 15) { + VIR_FREE(virtualDev); + + virtualDev = strdup("vmxnet2"); + + if (virtualDev == NULL) { + virReportOOMError(); + goto failure; + } + } } /* vmx:networkName -> def:data.bridge.brname */ @@ -2744,21 +2762,29 @@ esxVMX_FormatEthernet(virDomainNetDefPtr def, int controller, virBufferVSprintf(buffer, "ethernet%d.present = \"true\"\n", controller); - /* def:model -> vmx:virtualDev */ + /* def:model -> vmx:virtualDev, vmx:features */ if (def->model != NULL) { if (STRCASENEQ(def->model, "vlance") && STRCASENEQ(def->model, "vmxnet") && + STRCASENEQ(def->model, "vmxnet2") && STRCASENEQ(def->model, "vmxnet3") && STRCASENEQ(def->model, "e1000")) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting domain XML entry 'devices/interfase/model' " - "to be 'vlance' or 'vmxnet' or 'vmxnet3' or 'e1000' " - "but found '%s'"), def->model); + "to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' " + "or 'e1000' but found '%s'"), def->model); return -1; } - virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n", - controller, def->model); + if (STRCASEEQ(def->model, "vmxnet2")) { + virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"vmxnet\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.features = \"15\"\n", + controller); + } else { + virBufferVSprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n", + controller, def->model); + } } /* def:type, def:ifname -> vmx:connectionType */ diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx new file mode 100644 index 0000000..1c3f063 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.vmx @@ -0,0 +1,9 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.virtualDev = "vmxnet" +ethernet0.features = "15" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml new file mode 100644 index 0000000..090f7ce --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml @@ -0,0 +1,20 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + <model type='vmxnet2'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index f3b3b5e..b26a703 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -145,6 +145,7 @@ mymain(int argc, char **argv) DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2", esxVI_APIVersion_25); DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx new file mode 100644 index 0000000..50709e2 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx @@ -0,0 +1,14 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-vmxnet2" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.virtualDev = "vmxnet" +ethernet0.features = "15" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml new file mode 100644 index 0000000..7d6d0e5 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml @@ -0,0 +1,15 @@ +<domain type='vmware'> + <name>ethernet-vmxnet2</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + <model type='vmxnet2'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index f9c4730..40386eb 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -190,6 +190,7 @@ mymain(int argc, char **argv) DO_TEST("floppy-device", "floppy-device", esxVI_APIVersion_25); DO_TEST("ethernet-e1000", "ethernet-e1000", esxVI_APIVersion_25); + DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2", esxVI_APIVersion_25); DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); -- 1.6.3.3

2 2

[libvirt] compiler warning about unused in_open parameter
by Gustavo Morozowski 20 Apr '10

20 Apr '10

Hi, I am trying to build 0.8.0 for windows using Fedora 12 [1], the compile is breaking with the message - make[3]: Entering directory `/home/gustavo/Devel/libvirt-0.8.0/src' CC libvirt_driver_remote_la-remote_driver.lo cc1: warnings being treated as errors remote/remote_driver.c: In function 'remoteAuthenticate': remote/remote_driver.c:6478: error: unused parameter 'in_open' [-Wunused-parameter] It seems 'in_open' is not used when both SASL and POLKIT are disabled. Gustavo [1] https://www.redhat.com/archives/libvir-list/2010-March/msg00612.html

3 2

[libvirt] [PATCH] logrotate: don't rotate zero-length logfiles only
by Anton Protopopov 20 Apr '10

20 Apr '10

Hi. In logrotate configuration files used by libvirt, there is an option 'minsize 100k', which prevents logrotate from rotating small (< 100k) files into an archive. But the target goal of the http://www.mail-archive.com/libvir-list@redhat.com/msg17443.html patch was to prevent logrotate from packing _empty_ files. This indeed could be done more accurately with the 'notifempty' option, see attached patch.

2 1

[libvirt] [PATCH] Don't ship generated python/libvirt.? files.
by Philipp Hahn 20 Apr '10

20 Apr '10

libvirt.c and libvirt.h are auto-generated files. Mentioning their names in *_SOURCES includes them in the distribution. During an out-of-tree build these shipped files are included instead of the auto-generated version, potentially breaking the build (as it happend in 0.8.0, because the shipped libvirt.h was missing the declaration for 'libvirt_virDomainUpdateDeviceFlags') Use the nodist_*_SOURCES automake variable instead. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- python/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

3 2

[libvirt] [PATCH] Support for faking emulator in qemuxml2argv tests
by Jiri Denemark 20 Apr '10

20 Apr '10

Hi, I thought I'd need it but turned out I didn't. In case someone else finds a good use for that, here's the patch. The idea was to provide a way to fake qemu responses on -M ?, -cpu ?, and the like. Jirka >From d1fa129d1018cd66d2bbdadc68a5f72e91bc6b0c Mon Sep 17 00:00:00 2001 Message-Id: <d1fa129d1018cd66d2bbdadc68a5f72e91bc6b0c.1271681198.git.jdenemar(a)redhat.com> From: Jiri Denemark <jdenemar(a)redhat.com> Date: Fri, 16 Apr 2010 08:20:33 +0200 Subject: [PATCH] Support for faking emulator in qemuxml2argv tests Mail-Followup-To: libvir-list(a)redhat.com This patch allows for using custom scripts instead of /usr/bin/qemu emulator in domain XML. To do so, one can specify relative path to the custom script in <emulator/>. The path needs to be relative to qemuxml2argvdata directory and it will be transparently made absolute in runtime. The expected command line needs to contain the exact relative path as was used in domain XML. --- tests/qemuxml2argvtest.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index beb5dcd..da28c93 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -38,6 +38,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virDomainDefPtr vmdef = NULL; virDomainChrDef monitor_chr; virConnectPtr conn; + char *emulator = NULL; if (!(conn = virGetConnect())) goto fail; @@ -49,6 +50,17 @@ static int testCompareXMLToArgvFiles(const char *xml, VIR_DOMAIN_XML_INACTIVE))) goto fail; + if (vmdef->emulator && *vmdef->emulator != '/') { + emulator = vmdef->emulator; + vmdef->emulator = NULL; + if (virAsprintf(&vmdef->emulator, "%s/qemuxml2argvdata/%s", + abs_srcdir, emulator) < 0) { + vmdef->emulator = emulator; + emulator = NULL; + goto fail; + } + } + if (extraFlags & QEMUD_CMD_FLAG_DOMID) vmdef->id = 6; else @@ -86,6 +98,12 @@ static int testCompareXMLToArgvFiles(const char *xml, NULL, NULL, migrateFrom, NULL) < 0) goto fail; + if (emulator && *argv) { + free(*(char**) argv); + *argv = emulator; + emulator = NULL; + } + len = 1; /* for trailing newline */ tmp = qenv; while (*tmp) { @@ -125,6 +143,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; fail: + free(emulator); free(actualargv); if (argv) { tmp = argv; -- 1.7.0.4

1 1

[libvirt] [PATCH 0/6] CPU selection fixes and tests
by Jiri Denemark 20 Apr '10

20 Apr '10

4 out of the 8 tests added by patch 2/6 fail with current libvirt. After 5/6 some of them pass and some of them fail in a different way. After 6/6 all of them pass. Jirka Jiri Denemark (6): Fake host CPU for qemu tests Tests for CPU selection in qemu driver Deal with CPU models in [] Move MIN macro to util.h so that others can use it Support removing features when converting data to CPU Use configured CPU model if possible src/cpu/cpu.c | 8 +- src/cpu/cpu.h | 6 +- src/cpu/cpu_x86.c | 82 +++++++++++++++----- src/qemu/qemu_conf.c | 39 ++++++++-- src/util/util.c | 4 - src/util/util.h | 4 + .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 28 +++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 35 ++++++++ .../qemuxml2argv-cpu-minimum1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml | 21 +++++ .../qemuxml2argv-cpu-minimum2.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 25 ++++++ .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 38 +++++++++ .../qemuxml2argv-cpu-topology1.args | 1 + .../qemuxml2argv-cpu-topology1.xml | 21 +++++ .../qemuxml2argv-cpu-topology2.args | 1 + .../qemuxml2argv-cpu-topology2.xml | 22 +++++ .../qemuxml2argv-cpu-topology3.args | 1 + .../qemuxml2argv-cpu-topology3.xml | 21 +++++ tests/qemuxml2argvtest.c | 9 ++ tests/testutilsqemu.c | 30 +++++++- 24 files changed, 362 insertions(+), 39 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml

2 16

[libvirt] [PATCH] Fixup python binding for virDomainSnapshot APIs
by Daniel P. Berrange 20 Apr '10

20 Apr '10

The generator code was totally wrong for the virDomainSnapshot APIs, not generating the wrapper class, and giving methods the wrong names * generator.py: Set metadata for virDomainSnapshot type & APIs * libvirt-override-api.xml, libvirt-override.c: Hand-code the virDomainSnapshotListNames glue layer --- python/generator.py | 27 ++++++++++++++++++++++- python/libvirt-override-api.xml | 6 +++++ python/libvirt-override.c | 46 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 1 deletions(-) diff --git a/python/generator.py b/python/generator.py index cb9f3d9..6f082e8 100755 --- a/python/generator.py +++ b/python/generator.py @@ -243,6 +243,9 @@ py_types = { 'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), + 'const virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), + 'virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), + 'const virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), } py_return_types = { @@ -277,6 +280,7 @@ skip_impl = ( 'virConnectListDefinedStorageVols', 'virConnectListDefinedInterfaces', 'virConnectListNWFilters', + 'virDomainSnapshotListNames', 'virConnGetLastError', 'virGetLastError', 'virDomainGetInfo', @@ -643,6 +647,8 @@ classes_type = { "virStream *": ("._o", "virStream(self, _obj=%s)", "virStream"), "virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"), "virConnect *": ("._o", "virConnect(_obj=%s)", "virConnect"), + "virDomainSnapshotPtr": ("._o", "virDomainSnapshot(self,_obj=%s)", "virDomainSnapshot"), + "virDomainSnapshot *": ("._o", "virDomainSnapshot(self, _obj=%s)", "virDomainSnapshot"), } converter_type = { @@ -651,7 +657,7 @@ converter_type = { primary_classes = ["virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice", "virSecret", - "virStream"] + "virStream", "virDomainSnapshot"] classes_ancestor = { } @@ -663,6 +669,7 @@ classes_destructors = { "virStorageVol": "virStorageVolFree", "virNodeDevice" : "virNodeDeviceFree", "virSecret": "virSecretFree", + "virDomainSnapshot": "virDomainSnapshotFree", # We hand-craft __del__ for this one #"virStream": "virStreamFree", } @@ -767,6 +774,24 @@ def nameFixup(name, classe, type, file): elif name[0:12] == "virDomainGet": func = name[12:] func = string.lower(func[0:1]) + func[1:] + elif name[0:29] == "virDomainSnapshotLookupByName": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:26] == "virDomainSnapshotListNames": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:20] == "virDomainSnapshotNum": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:26] == "virDomainSnapshotCreateXML": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:24] == "virDomainSnapshotCurrent": + func = name[9:] + func = string.lower(func[0:1]) + func[1:] + elif name[0:17] == "virDomainSnapshot": + func = name[17:] + func = string.lower(func[0:1]) + func[1:] elif name[0:9] == "virDomain": func = name[9:] func = string.lower(func[0:1]) + func[1:] diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index e95c46a..6f1bc04 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -243,5 +243,11 @@ <arg name='xmlCPUs' type='const char **' info='array of XML descriptions of host CPUs'/> <arg name='flags' type='unsigned int' info='fine-tuning flags, currently unused, pass 0.'/> </function> + <function name='virDomainSnapshotListNames' file='python'> + <info>collect the list of snapshots for the given domain</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='flags' type='unsigned int' info='flags, curently unused'/> + <return type='str *' info='the list of Names of None in case of error'/> + </function> </symbols> </api> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 02bc313..ce21f60 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -943,6 +943,51 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval; + char **names = NULL; + int c_retval, i; + virDomainPtr dom; + PyObject *pyobj_dom; + int flags; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainSnapshotListNames", &pyobj_dom, &flags)) + return(NULL); + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainSnapshotNum(dom, flags); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) + return VIR_PY_NONE; + + if (c_retval) { + names = malloc(sizeof(*names) * c_retval); + if (!names) + return VIR_PY_NONE; + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainSnapshotListNames(dom, names, c_retval, flags); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { + free(names); + return VIR_PY_NONE; + } + } + py_retval = PyList_New(c_retval); + + if (names) { + for (i = 0;i < c_retval;i++) { + PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); + free(names[i]); + } + free(names); + } + + return(py_retval); +} + +static PyObject * libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; int c_retval; @@ -3275,6 +3320,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL}, {(char *) "virConnectBaselineCPU", libvirt_virConnectBaselineCPU, METH_VARARGS, NULL}, {(char *) "virDomainGetJobInfo", libvirt_virDomainGetJobInfo, METH_VARARGS, NULL}, + {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; -- 1.6.6.1

3 3

[libvirt] KVM Forum 2010: Call for Papers
by KVM Forum 2010 Program Committee 20 Apr '10

20 Apr '10

================================================================= CALL FOR PAPERS KVM Forum 2010 ================================================================= DESCRIPTION The KVM Forum is back! After a break last year we're proud to present this year's gathering around KVM again. The idea is to have everyone involved with KVM development come together to talk about the future and current state of KVM, teaching everyone some pieces of the puzzle they might be missing without. So if you're a KVM developer, mark the dates in your calendar! If possible, also submit a talk -- we're interested in a wide variety of KVM topics, so don't hesitate to propose a talk on your work. If you're not a KVM developer, please read on nevertheless (or jump to END USER COLLABORATION). DATES / LOCATION Conference: August 9 - 10, 2010 Location: Renaissance Boston Waterfront in Boston, MA Abstracts due: May 14th, 2010 Notification: May 28th, 2010 Yes, we're colocated with LinuxCon. Tickets for the KVM Forum also count for LinuxCon. http://events.linuxfoundation.org/component/registrationpro/?func=details&d… PROCESS At first check if it's before May 14th. If you're past that date, you're out of luck. Now try to think hard and come up with a great idea that you could talk about. Once you have that set, we need you to write up a short abstract (~150 words) on it. In your submission please note how long your talk will take. Slots vary in length up to one hour. Also include in your proposal the proposal type -- one of: technical talk, breakout session, or end-user talk. Add that information to the abstract and submit it at the following URL: http://events.linuxfoundation.org/cfp/cfp-add Now, wait until May 24th. You will receive a notification on whether your talk was accepted or not. SCOPE OF TALKS We have a list of suggested presentation topics below. These suggestions are just for guidance, please feel free to submit a proposal on any of these or related topics. In general, the more it's about backend infrastructure, the better. KVM - Scaling and performance - Nested virtualization - I/O improvements - Driver domains - Time keeping - Memory management (page sharing, swapping, huge pages, etc) - Fault tolerance - VEPA, vswitch Embedded KVM - KVM on ARM, PPC, MIPS, ...? - Real-time requirements host/guest - Device pass-through w/o iommu - Custom device/platform models QEMU - Device model improvements - New devices - Security model - Scaling and performance - Desktop virtualization - Increasing robustness - Management interfaces - QMP protocol and implementation - Live migration Virtio - Speeding up existing devices - Vhost - Alternatives - Using virtio in non-kvm environments - Virtio on non-Linux Management infrastructure - Libvirt - Kvm autotest - Easy networking - Qemud BREAKOUT SESSION We will reserve some time each day to break out for working sessions. These sessions will be less formal than a presentation and more focused on developing a solution to some real development issue. If you are interested in getting developers together to hack on some code, submit your proposal and just make it clear it's a breakout session proposal. END-USER COLLABORATION One of the big challenges as developers is to know what, where and how people actually use our software. To solve this issue at least a little, there will be a few slots reserved for end users talking about their deployments, problems and achievements. So if you have a KVM based deployment running in production or are about to roll out one, please also submit a talk (see PROCESS), and simply mark it asn an end-user collaboration proposal. We would love to have an open discussion of fields where KVM/Qemu can still improve and you would have the unique chance to steer that process! Keep in mind that most of the Forum will be focused on development though, so we suggest you also come with a good portion of technical interest :-). And of course, no product marketing please! The purpose is to engage with KVM developers. LIGHTNING TALKS In addition to submitted talks we will also have some room for lightning talks. So if you have something you think might be done until the KVM Forum, but you're not sure you could fill 15 minutes with it. Or if you don't know if you'll make it until there, just keep in mind that you will still get the chance to talk about it. Lightning talk submissions and scheduling will be handled on-site at KVM Forum. Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2010 in August! Now, start thinking about that talk you want to give. Thanks, your KVM Forum 2010 Program Commitee Alexander Graf, Novell Anthony Liguori, IBM Avi Kivity, Red Hat Chris Wright, Red Hat Dor Laor, Red Hat Jan Kiszka, Siemens Please contact us with any questions or comments. KVM-Forum-2010-PC(a)redhat.com

1 0

[libvirt] [PATCH] Fix crash in nwfilter driver check
by Daniel P. Berrange 19 Apr '10

19 Apr '10

The nwfilterDriverActive() could de-reference a NULL pointer if it hadn't be started at the point it was called. It was also not thread safe, since it lacked locking around data accesses. * src/nwfilter/nwfilter_driver.c: Fix locking & NULL checks in nwfilterDriverActive() --- src/nwfilter/nwfilter_driver.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 58df4e1..412c5b8 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -153,9 +153,16 @@ nwfilterDriverReload(void) { */ static int nwfilterDriverActive(void) { - if (!driverState->pools.count) + int ret; + + if (!driverState) return 0; - return 1; + + nwfilterDriverLock(driverState); + ret = driverState->pools.count ? 1 : 0; + nwfilterDriverUnlock(driverState); + + return ret; } /** -- 1.6.6.1

2 1

[libvirt] ESX and inaccessible storage pools
by Matthias Bolte 19 Apr '10

19 Apr '10

I'm currently implementing the storage driver for ESX and have a mapping problem. libvirt storage pools can be either running or inactive just like the domain. ESX is a bit different here. A datastore is always active. It can be inaccessible, e.g. if an NFS is mounted as datastore but the NFS server went unreachable. I discussed this with Daniel on IRC and he summarized it like this: <DV> they are defined, the system knows them, but they are not available for use The question is, what should the ESX driver do with inaccessible datastores? Option 1: They could just be represented as inactive storage pools, but libvirt's semantic for inactive storage pools includes that the user can start an inactive storage pool. That's not possible for an inaccessible datastore, so the driver would report an error if a user tries to start an inaccessible storage pool. Option 2: Just ignore inaccessible datastores and make the ESX storage driver to pretend that they don't exist. But this would hide information from the user. Option 3: Extend libvirt's API for inaccessible storage pools. There are possibly other options and I'd like to hear your comments and suggestions. Matthias

3 3