- Devel - libvirt List Archives

[libvirt] [PATCHv2] network: fix network driver startup for qemu:///session
by Laine Stump 03 May '13

03 May '13

This should resolve https://bugzilla.redhat.com/show_bug.cgi?id=958907 Recent new addition of code to read/write active network state to the NETWORK_STATE_DIR in the network driver broke startup for qemu:///session. The network driver had several state file paths hardcoded to /var, which could never possibly work in session mode. This patch modifies *all* state files to use a variable string that is set differently according to whether or not we're running privileged. (It turns out that logDir was never used, so it's been completely eliminated.) There are very definitely other problems preventing dnsmasq and radvd from running in non-privileged mode, but it's more consistent to have the directories used by them be determined in the same fashion. NB: I've noted before that the network driver is storing its state (including dnsmasq and radvd state) in /var/lib, while qemu stores its state in /var/run. It would probably have been better if the two matched, but it's been this way for a long time, and changing it would break running installations during an upgrade, so it's best to just leave it as it is. --- Changes since V1: * change user directory names as outlined by danpb. * eliminate the "base" string which caused so much bad code, and otherwise simplify the logic * get rid of logDir, since it's never used. * eliminage the *_DIR #defines, since they're now each only used once, and they just serve to obscure what's being done. src/network/bridge_driver.c | 182 +++++++++++++++++++++++++------------------- 1 file changed, 102 insertions(+), 80 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e828997..543b098 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1,4 +1,3 @@ - /* * bridge_driver.c: core driver methods for managing network * @@ -67,12 +66,6 @@ #include "virfile.h" #include "virstring.h" -#define NETWORK_PID_DIR LOCALSTATEDIR "/run/libvirt/network" -#define NETWORK_STATE_DIR LOCALSTATEDIR "/lib/libvirt/network" - -#define DNSMASQ_STATE_DIR LOCALSTATEDIR "/lib/libvirt/dnsmasq" -#define RADVD_STATE_DIR LOCALSTATEDIR "/lib/libvirt/radvd" - #define VIR_FROM_THIS VIR_FROM_NETWORK /* Main driver state */ @@ -84,7 +77,10 @@ struct network_driver { iptablesContext *iptables; char *networkConfigDir; char *networkAutostartDir; - char *logDir; + char *stateDir; + char *pidDir; + char *dnsmasqStateDir; + char *radvdStateDir; dnsmasqCapsPtr dnsmasqCaps; }; @@ -133,8 +129,8 @@ networkDnsmasqLeaseFileNameDefault(const char *netname) { char *leasefile; - ignore_value(virAsprintf(&leasefile, DNSMASQ_STATE_DIR "/%s.leases", - netname)); + ignore_value(virAsprintf(&leasefile, "%s/%s.leases", + driverState->dnsmasqStateDir, netname)); return leasefile; } @@ -146,8 +142,8 @@ networkDnsmasqConfigFileName(const char *netname) { char *conffile; - ignore_value(virAsprintf(&conffile, DNSMASQ_STATE_DIR "/%s.conf", - netname)); + ignore_value(virAsprintf(&conffile, "%s/%s.conf", + driverState->dnsmasqStateDir, netname)); return conffile; } @@ -166,8 +162,8 @@ networkRadvdConfigFileName(const char *netname) { char *configfile; - ignore_value(virAsprintf(&configfile, RADVD_STATE_DIR "/%s-radvd.conf", - netname)); + ignore_value(virAsprintf(&configfile, "%s/%s-radvd.conf", + driverState->radvdStateDir, netname)); return configfile; } @@ -187,8 +183,10 @@ networkRemoveInactive(struct network_driver *driver, int ret = -1; /* remove the (possibly) existing dnsmasq and radvd files */ - if (!(dctx = dnsmasqContextNew(def->name, DNSMASQ_STATE_DIR))) + if (!(dctx = dnsmasqContextNew(def->name, + driverState->dnsmasqStateDir))) { goto cleanup; + } if (!(leasefile = networkDnsmasqLeaseFileName(def->name))) goto cleanup; @@ -202,7 +200,8 @@ networkRemoveInactive(struct network_driver *driver, if (!(configfile = networkDnsmasqConfigFileName(def->name))) goto no_memory; - if (!(statusfile = virNetworkConfigFile(NETWORK_STATE_DIR, def->name))) + if (!(statusfile + = virNetworkConfigFile(driverState->stateDir, def->name))) goto no_memory; /* dnsmasq */ @@ -212,7 +211,7 @@ networkRemoveInactive(struct network_driver *driver, /* radvd */ unlink(radvdconfigfile); - virPidFileDelete(NETWORK_PID_DIR, radvdpidbase); + virPidFileDelete(driverState->pidDir, radvdpidbase); /* remove status file */ unlink(statusfile); @@ -279,7 +278,7 @@ networkFindActiveConfigs(struct network_driver *driver) if (obj->def->ips && (obj->def->nips > 0)) { char *radvdpidbase; - ignore_value(virPidFileReadIfAlive(NETWORK_PID_DIR, obj->def->name, + ignore_value(virPidFileReadIfAlive(driverState->pidDir, obj->def->name, &obj->dnsmasqPid, dnsmasqCapsGetBinaryPath(driver->dnsmasqCaps))); @@ -287,7 +286,7 @@ networkFindActiveConfigs(struct network_driver *driver) virReportOOMError(); goto cleanup; } - ignore_value(virPidFileReadIfAlive(NETWORK_PID_DIR, radvdpidbase, + ignore_value(virPidFileReadIfAlive(driverState->pidDir, radvdpidbase, &obj->radvdPid, RADVD)); VIR_FREE(radvdpidbase); } @@ -359,7 +358,9 @@ networkStateInitialize(bool privileged, virStateInhibitCallback callback ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { - char *base = NULL; + int ret = -1; + char *configdir = NULL; + char *rundir = NULL; #ifdef HAVE_FIREWALLD DBusConnection *sysbus = NULL; #endif @@ -373,43 +374,53 @@ networkStateInitialize(bool privileged, } networkDriverLock(driverState); + /* Configuration paths one of + * ~/.libvirt/... (old style session/unprivileged) + * ~/.config/libvirt/... (new XDG session/unprivileged) + * /etc/libvirt/... && /var/(run|lib)/libvirt/... (system/privileged). + * + * NB: The qemu driver puts its domain state in /var/run, and I + * think the network driver should have used /var/run too (instead + * of /var/lib), but it's been this way for a long time, and we + * probably should change it now. + */ if (privileged) { - if (virAsprintf(&driverState->logDir, - "%s/log/libvirt/qemu", LOCALSTATEDIR) == -1) - goto out_of_memory; - - if ((base = strdup(SYSCONFDIR "/libvirt")) == NULL) + if (!(driverState->networkConfigDir + = strdup(SYSCONFDIR "/libvirt/qemu/networks")) || + !(driverState->networkAutostartDir + = strdup(SYSCONFDIR "/libvirt/qemu/networks/autostart")) || + !(driverState->stateDir + = strdup(LOCALSTATEDIR "/lib/libvirt/network")) || + !(driverState->pidDir + = strdup(LOCALSTATEDIR "/run/libvirt/network")) || + !(driverState->dnsmasqStateDir + = strdup(LOCALSTATEDIR "/lib/libvirt/dnsmasq")) || + !(driverState->radvdStateDir + = strdup(LOCALSTATEDIR "/lib/libvirt/radvd"))) { goto out_of_memory; + } } else { - char *userdir = virGetUserCacheDirectory(); - - if (!userdir) + configdir = virGetUserConfigDirectory(); + rundir = virGetUserRuntimeDirectory(); + if (!(configdir && rundir)) goto error; - if (virAsprintf(&driverState->logDir, - "%s/qemu/log", userdir) == -1) { - VIR_FREE(userdir); + if ((virAsprintf(&driverState->networkConfigDir, + "%s/qemu/networks", configdir) < 0) || + (virAsprintf(&driverState->networkAutostartDir, + "%s/qemu/networks/autostart", configdir) < 0) || + (virAsprintf(&driverState->stateDir, + "%s/network/lib", rundir) < 0) || + (virAsprintf(&driverState->pidDir, + "%s/network/run", rundir) < 0) || + (virAsprintf(&driverState->dnsmasqStateDir, + "%s/dnsmasq/lib", rundir) < 0) || + (virAsprintf(&driverState->radvdStateDir, + "%s/radvd/lib", rundir) < 0)) { goto out_of_memory; } - VIR_FREE(userdir); - - base = virGetUserConfigDirectory(); - if (!base) - goto error; } - /* Configuration paths are either ~/.libvirt/qemu/... (session) or - * /etc/libvirt/qemu/... (system). - */ - if (virAsprintf(&driverState->networkConfigDir, "%s/qemu/networks", base) == -1) - goto out_of_memory; - - if (virAsprintf(&driverState->networkAutostartDir, "%s/qemu/networks/autostart", - base) == -1) - goto out_of_memory; - - VIR_FREE(base); - if (!(driverState->iptables = iptablesContextNew())) { goto out_of_memory; } @@ -418,7 +429,7 @@ networkStateInitialize(bool privileged, driverState->dnsmasqCaps = dnsmasqCapsNewFromBinary(DNSMASQ); if (virNetworkLoadAllState(&driverState->networks, - NETWORK_STATE_DIR) < 0) + driverState->stateDir) < 0) goto error; if (virNetworkLoadAllConfigs(&driverState->networks, @@ -459,18 +470,19 @@ networkStateInitialize(bool privileged, } #endif - return 0; + ret = 0; +cleanup: + VIR_FREE(configdir); + VIR_FREE(rundir); + return ret; out_of_memory: virReportOOMError(); - error: if (driverState) networkDriverUnlock(driverState); - - VIR_FREE(base); networkStateCleanup(); - return -1; + goto cleanup; } /** @@ -486,7 +498,7 @@ networkStateReload(void) { networkDriverLock(driverState); virNetworkLoadAllState(&driverState->networks, - NETWORK_STATE_DIR); + driverState->stateDir); virNetworkLoadAllConfigs(&driverState->networks, driverState->networkConfigDir, driverState->networkAutostartDir); @@ -513,9 +525,12 @@ networkStateCleanup(void) { /* free inactive networks */ virNetworkObjListFree(&driverState->networks); - VIR_FREE(driverState->logDir); VIR_FREE(driverState->networkConfigDir); VIR_FREE(driverState->networkAutostartDir); + VIR_FREE(driverState->stateDir); + VIR_FREE(driverState->pidDir); + VIR_FREE(driverState->dnsmasqStateDir); + VIR_FREE(driverState->radvdStateDir); if (driverState->iptables) iptablesContextFree(driverState->iptables); @@ -1057,32 +1072,33 @@ networkStartDhcpDaemon(struct network_driver *driver, goto cleanup; } - if (virFileMakePath(NETWORK_PID_DIR) < 0) { + if (virFileMakePath(driverState->pidDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - NETWORK_PID_DIR); + driverState->pidDir); goto cleanup; } - if (virFileMakePath(NETWORK_STATE_DIR) < 0) { + if (virFileMakePath(driverState->stateDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - NETWORK_STATE_DIR); + driverState->stateDir); goto cleanup; } - if (!(pidfile = virPidFileBuildPath(NETWORK_PID_DIR, network->def->name))) { + if (!(pidfile = virPidFileBuildPath(driverState->pidDir, + network->def->name))) { virReportOOMError(); goto cleanup; } - if (virFileMakePath(DNSMASQ_STATE_DIR) < 0) { + if (virFileMakePath(driverState->dnsmasqStateDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - DNSMASQ_STATE_DIR); + driverState->dnsmasqStateDir); goto cleanup; } - dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR); + dctx = dnsmasqContextNew(network->def->name, driverState->dnsmasqStateDir); if (dctx == NULL) goto cleanup; @@ -1110,7 +1126,7 @@ networkStartDhcpDaemon(struct network_driver *driver, * pid */ - ret = virPidFileRead(NETWORK_PID_DIR, network->def->name, + ret = virPidFileRead(driverState->pidDir, network->def->name, &network->dnsmasqPid); if (ret < 0) goto cleanup; @@ -1147,8 +1163,10 @@ networkRefreshDhcpDaemon(struct network_driver *driver, return networkStartDhcpDaemon(driver, network); VIR_INFO("Refreshing dnsmasq for network %s", network->def->bridge); - if (!(dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR))) + if (!(dctx = dnsmasqContextNew(network->def->name, + driverState->dnsmasqStateDir))) { goto cleanup; + } /* Look for first IPv4 address that has dhcp defined. * We only support dhcp-host config on one IPv4 subnetwork @@ -1372,16 +1390,16 @@ networkStartRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, goto cleanup; } - if (virFileMakePath(NETWORK_PID_DIR) < 0) { + if (virFileMakePath(driverState->pidDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - NETWORK_PID_DIR); + driverState->pidDir); goto cleanup; } - if (virFileMakePath(RADVD_STATE_DIR) < 0) { + if (virFileMakePath(driverState->radvdStateDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - RADVD_STATE_DIR); + driverState->radvdStateDir); goto cleanup; } @@ -1390,7 +1408,7 @@ networkStartRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, virReportOOMError(); goto cleanup; } - if (!(pidfile = virPidFileBuildPath(NETWORK_PID_DIR, radvdpidbase))) { + if (!(pidfile = virPidFileBuildPath(driverState->pidDir, radvdpidbase))) { virReportOOMError(); goto cleanup; } @@ -1418,7 +1436,7 @@ networkStartRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, if (virCommandRun(cmd, NULL) < 0) goto cleanup; - if (virPidFileRead(NETWORK_PID_DIR, radvdpidbase, &network->radvdPid) < 0) + if (virPidFileRead(driverState->pidDir, radvdpidbase, &network->radvdPid) < 0) goto cleanup; ret = 0; @@ -1445,7 +1463,7 @@ networkRefreshRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, network->def->name) >= 0) && ((radvdpidbase = networkRadvdPidfileBasename(network->def->name)) != NULL)) { - virPidFileDelete(NETWORK_PID_DIR, radvdpidbase); + virPidFileDelete(driverState->pidDir, radvdpidbase); VIR_FREE(radvdpidbase); } network->radvdPid = -1; @@ -1485,7 +1503,7 @@ networkRestartRadvd(struct network_driver *driver, network->def->name) >= 0) && ((radvdpidbase = networkRadvdPidfileBasename(network->def->name)) != NULL)) { - virPidFileDelete(NETWORK_PID_DIR, radvdpidbase); + virPidFileDelete(driverState->pidDir, radvdpidbase); VIR_FREE(radvdpidbase); } network->radvdPid = -1; @@ -2575,7 +2593,7 @@ static int networkShutdownNetworkVirtual(struct network_driver *driver, if (!(radvdpidbase = networkRadvdPidfileBasename(network->def->name))) { virReportOOMError(); } else { - virPidFileDelete(NETWORK_PID_DIR, radvdpidbase); + virPidFileDelete(driverState->pidDir, radvdpidbase); VIR_FREE(radvdpidbase); } } @@ -2676,7 +2694,8 @@ networkStartNetwork(struct network_driver *driver, /* Persist the live configuration now that anything autogenerated * is setup. */ - if ((ret = virNetworkSaveStatus(NETWORK_STATE_DIR, network)) < 0) { + if ((ret = virNetworkSaveStatus(driverState->stateDir, + network)) < 0) { goto error; } @@ -2706,7 +2725,8 @@ static int networkShutdownNetwork(struct network_driver *driver, if (!virNetworkObjIsActive(network)) return 0; - stateFile = virNetworkConfigFile(NETWORK_STATE_DIR, network->def->name); + stateFile = virNetworkConfigFile(driverState->stateDir, + network->def->name); if (!stateFile) return -1; @@ -3371,8 +3391,10 @@ networkUpdate(virNetworkPtr net, } /* save current network state to disk */ - if ((ret = virNetworkSaveStatus(NETWORK_STATE_DIR, network)) < 0) + if ((ret = virNetworkSaveStatus(driverState->stateDir, + network)) < 0) { goto cleanup; + } } ret = 0; cleanup: @@ -4705,7 +4727,7 @@ networkPlugBandwidth(virNetworkObjPtr net, /* update sum of 'floor'-s of attached NICs */ net->floor_sum += ifaceBand->in->floor; /* update status file */ - if (virNetworkSaveStatus(NETWORK_STATE_DIR, net) < 0) { + if (virNetworkSaveStatus(driverState->stateDir, net) < 0) { ignore_value(virBitmapClearBit(net->class_id, class_id)); net->floor_sum -= ifaceBand->in->floor; iface->data.network.actual->class_id = 0; @@ -4751,7 +4773,7 @@ networkUnplugBandwidth(virNetworkObjPtr net, ignore_value(virBitmapClearBit(net->class_id, iface->data.network.actual->class_id)); /* update status file */ - if (virNetworkSaveStatus(NETWORK_STATE_DIR, net) < 0) { + if (virNetworkSaveStatus(driverState->stateDir, net) < 0) { net->floor_sum += ifaceBand->in->floor; ignore_value(virBitmapSetBit(net->class_id, iface->data.network.actual->class_id)); -- 1.7.11.7

4 3

Re: [libvirt] [Qemu-devel] [PATCH 3/3] gtk: add devices menu to allow changing removable block devices
by Anthony Liguori 03 May '13

03 May '13

Kevin Wolf <kwolf(a)redhat.com> writes: > Am 02.05.2013 um 15:41 hat Anthony Liguori geschrieben: >> Kevin Wolf <kwolf(a)redhat.com> writes: >> >> > >> > Ugh. Comparing the device name to an incomplete set of strings here and >> > then figuring out for each what the specific way for this device is to >> > create a nice string sounds like a bad idea. >> > >> > Why can't all devices just expose a property with a human-readable >> > string? We'll need it for more than just the disk change menus. >> >> I thought about this, there are a few concerns. The first is that you >> might lose consistency across devices. The second is i18n. > > What's the kind of consistency that you lose? I guess I could see the > point (even if not agree) if it was about creating the string here vs. > in each device, as the centralised strings would be more likely to use > the same pattern, but you already have this part in the IDE device. Note that these menu items are not descriptions of the device's class but of the device. They should be unique. So for instance, for virtio-blk-pci, we would want something like: "VirtIO Block Device [00:03.0]" If no serial property is defined on it, If there is a serial property, then the serial property should be shown vs. the PCI address. We probably want to show the PCI address consistently for any PCI based block device. This is what I mean by consistency. It's very hard to enforce outside of a central location. > The i18n point I don't buy. Avoiding i18n by choosing cryptic device > names that can't be translated isn't a good strategy. But if you do have > translations, it doesn't matter whether you have them in the GUI or in > the device itself, except that the latter could be used outside the > GTK frontend, too. > >> I would like to show USB device separately from IDE devices (even if >> it's a USB CDROM). I want the menu to look something like this: >> >> QEMU DVD-ROM QM003 -> >> Floppy Disk -> >> --------------------- >> USB Devices -> >> USB Tablet -> >> ----------------------------------- >> Description of USB Host Device 1 -> >> Description of USB Host Device 2 -> >> Description of USB Host Device 3 -> >> >> Such that you can also do USB host device pass through via the menus. >> >> From an i18n point of view, I would expect 'Floppy Disk' to be >> translated. I wouldn't expect 'QEMU DVD-ROM QM003' to be translated >> though since this is how the device is described within the guest. > > Note that there can be two floppy drives. Currently both will show up as > "isa-fdc". No, it shows the BlockDriverState name which will always be unique. > I also wonder how other buses fit in your menu structure, like a SCSI > CD-ROM, SCSI CD-ROM would show above the separator. Note that this is only showing removable devices. Hotplug isn't considered here. I was thinking in the long run we could have another menu item under USB Devices called "Add/Remove Hardware..." that would pop up a dialog to allow for hot plug/unplug. > or even PCI hotplug. Your proposal isn't quite consistent in > itself because it treats USB devices different from IDE or floppy > devices. That's a feature as these are the most common devices. > (That said, I agree that CD and floppy should be accessible > from the top level. But maybe usb-storage should be as well. It's not > quite clear to me how things would work out best.) I agree re: removable usb-storage. The goal of the menu is to give prominence to what the devices are that you would interact with the most. > > Another inconsistency is that you want to have "USB Tablet" there, > because USB has a product description as well. Should this be "QEMU USB > Tablet"? Ack. My intention was for that to be the product description FWIW. >> >> + >> >> + if (strcmp(type, "ide-cd") == 0) { >> >> + disk_type = DT_CDROM; >> >> + } else if (strcmp(type, "isa-fdc") == 0) { >> >> + disk_type = DT_FLOPPY; >> >> + } else { >> >> + disk_type = DT_NORMAL; >> >> + } >> > >> > Same thing here, comparing against strings is a hack. Devices should >> > probably have a property that says what kind of device they are. >> >> Ack, this is nasty. I would like to eliminate this. There is a type >> field in BlockInfo but: >> >> # @type: This field is returned only for compatibility reasons, it should >> # not be used (always returns 'unknown') >> >> I vaguely remember this happening but I don't remember the specific >> reason why. I would definitely prefer that we filled out type >> correctly. >> >> I think Markus was involved in this. Markus or Luiz, do you remember >> the story here? > > The reason is that BlockInfo is about the backend and it simply doesn't > know (ever since we introduced if=none, this was buggy, so we just > abandoned it at some point). We would have to ask the device, not the > block layer. Yes, this makes sense. We could introduce an interface that all disks implemented that returned information about whether it was a CD-ROM, Floppy, etc. How does libvirt cope with this today? I presume they do something similar to what this patch is doing in terms of hard coding device names. Regards, Anthony Liguori > > Kevin

2 3

[libvirt] [PATCH] Fix release of resources with lockd plugin
by Daniel P. Berrange 03 May '13

03 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The lockd plugin for the lock manager was not correctly handling the release of resource locks. This meant that during migration, or when pausing a VM, the locks would not get released. This in turn made it impossible to resume the domain, or finish migration --- src/locking/lock_driver_lockd.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 28a4f15..4d0cd74 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -774,10 +774,11 @@ static int virLockManagerLockDaemonRelease(virLockManagerPtr lock, virNetClientPtr client = NULL; virNetClientProgramPtr program = NULL; int counter = 0; - virLockSpaceProtocolReleaseResourceArgs args; int rv = -1; + size_t i; + virLockManagerLockDaemonPrivatePtr priv = lock->privateData; - memset(&args, 0, sizeof(args)); + virCheckFlags(0, -1); if (state) *state = NULL; @@ -785,16 +786,29 @@ static int virLockManagerLockDaemonRelease(virLockManagerPtr lock, if (!(client = virLockManagerLockDaemonConnect(lock, &program, &counter))) goto cleanup; - args.flags = flags; - - if (virNetClientProgramCall(program, - client, - counter++, - VIR_LOCK_SPACE_PROTOCOL_PROC_RELEASE_RESOURCE, - 0, NULL, NULL, NULL, - (xdrproc_t)xdr_virLockSpaceProtocolReleaseResourceArgs, &args, - (xdrproc_t)xdr_void, NULL) < 0) - goto cleanup; + for (i = 0 ; i < priv->nresources ; i++) { + virLockSpaceProtocolReleaseResourceArgs args; + + memset(&args, 0, sizeof(args)); + + if (priv->resources[i].lockspace) + args.path = priv->resources[i].lockspace; + args.name = priv->resources[i].name; + args.flags = priv->resources[i].flags; + + args.flags &= + ~(VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED | + VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE); + + if (virNetClientProgramCall(program, + client, + counter++, + VIR_LOCK_SPACE_PROTOCOL_PROC_RELEASE_RESOURCE, + 0, NULL, NULL, NULL, + (xdrproc_t)xdr_virLockSpaceProtocolReleaseResourceArgs, &args, + (xdrproc_t)xdr_void, NULL) < 0) + goto cleanup; + } rv = 0; -- 1.8.2.1

2 2

[libvirt] [PATCH 1/2] Fixup rpcgen code on kFreeBSD too
by Guido Günther 03 May '13

03 May '13

since it uses glibc's rpcgen. --- src/rpc/genprotocol.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index c8c1570..f02ce13 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -31,7 +31,7 @@ open RPCGEN, "-|", $rpcgen, $mode, $xdrdef open TARGET, ">$target" or die "cannot create $target: $!"; -my $fixup = $^O eq "linux" || $^O eq "cygwin"; +my $fixup = $^O eq "linux" || $^O eq "cygwin" || $^O eq "gnukfreebsd"; if ($mode eq "-c") { print TARGET "#include <config.h>\n"; -- 1.7.10.4

2 1

[libvirt] [PATCH] virthreadpthread: don't try to cast pthread_t to void*
by Guido Günther 03 May '13

03 May '13

This fixes the build on kFreeBSD that otherwise fails with: util/virthreadpthread.c: In function 'virThreadSelfID': util/virthreadpthread.c:222:27: error: cast from function call of type 'pthread_t' to non-matching type 'void *' [-Werror=bad-function-cast] --- I'm unsure why we'd need the cast to (void*) first. -- Guido src/util/virthreadpthread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virthreadpthread.c b/src/util/virthreadpthread.c index b42b333..8d5e197 100644 --- a/src/util/virthreadpthread.c +++ b/src/util/virthreadpthread.c @@ -219,7 +219,7 @@ int virThreadSelfID(void) tid = syscall(SYS_gettid); return (int)tid; #else - return (int)(intptr_t)(void *)pthread_self(); + return (int)(intptr_t)pthread_self(); #endif } -- 1.7.10.4

5 10

[libvirt] [PATCH] build: fix make rpm failure
by Laine Stump 03 May '13

03 May '13

Commit 297c99a accidentally put a { where a ( belonged, causing make rpm to fail. --- Pushed under the build breaker rule. libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6f25031..0ecd38d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1721,7 +1721,7 @@ fi %if %{with_qemu} %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr{0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ +%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %endif %if %{with_lxc} -- 1.7.11.7

1 0

[libvirt] [PATCH] Fix warning about unsupported cookie flags in QEMU driver
by Daniel P. Berrange 03 May '13

03 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The QEMU migration code unconditionally sets the 'persistent' cookie flag on the source host. The dest host, however, only allows it during parsing if VIR_MIGRATE_PERSIST_DEST was set. Make the source host only set it if this flag is present. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_migration.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0732614..d50099c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2941,8 +2941,9 @@ cleanup: VIR_FORCE_CLOSE(fd); } - cookieFlags |= (QEMU_MIGRATION_COOKIE_PERSISTENT | - QEMU_MIGRATION_COOKIE_NETWORK); + cookieFlags |= QEMU_MIGRATION_COOKIE_NETWORK; + if (flags & VIR_MIGRATE_PERSIST_DEST) + cookieFlags |= QEMU_MIGRATION_COOKIE_PERSISTENT; if (ret == 0 && qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, cookieFlags) < 0) { -- 1.8.1.4

2 1

Re: [libvirt] libvirt 'xdr_u_int64_t' undeclared error
by appzer0 03 May '13

03 May '13

Le 03/05/2013 10:06, WangXu a écrit : > Hi, > I found someone solved this problem using > "CPPFLAGS="-I/usr/include/tirpc" ./configure...". > You could try whether it works. > ---------------------------------------- Hi and thanks for your input, The result is the same, though it occurs now in another place : --- CC libvirt_lxc-lxc_fuse.o CC libvirt_lxc-lxc_controller.o CC libvirt_lxc-nodeinfo.o CC libvirt_lxc-datatypes.o CC virtlockd-lock_daemon.o CC virtlockd-lock_daemon_config.o CC virtlockd-lock_daemon_dispatch.o CC virtlockd-lock_protocol.o GEN test_libvirtd_qemu.aug GEN test_libvirtd_lxc.aug GEN test_libvirt_lockd.aug CCLD libvirt_util.la CCLD libvirt_conf.la CCLD libvirt_cpu.la CCLD libvirt_vmx.la CCLD libvirt_driver.la CCLD libvirt_driver_test.la CCLD libvirt-net-rpc-client.la CCLD libvirt-net-rpc-server.la CCLD libvirt-net-rpc.la CCLD libvirt_driver_phyp.la CCLD libvirt_driver_openvz.la CCLD libvirt_driver_vmware.la CCLD libvirt_driver_vbox.la CCLD libvirt_driver_esx.la CCLD libvirt_driver_parallels.la CCLD libvirt_security_manager.la CCLD lockd.la CCLD libvirt_driver_qemu_impl.la CCLD libvirt_driver_lxc_impl.la CCLD libvirt_driver_uml_impl.la CCLD libvirt_driver_network_impl.la CCLD libvirt_driver_interface.la CCLD libvirt_driver_secret.la CCLD libvirt_driver_storage_impl.la CCLD libvirt_driver_nodedev.la CCLD libvirt_driver_nwfilter.la CCLD libvirt_iohelper CCLD libvirt_parthelper CCLD libvirt_lxc CCLD virtlockd CCLD libvirt_driver_remote.la CCLD libvirt_driver_qemu.la CCLD libvirt_driver_lxc.la CCLD libvirt_driver_uml.la CCLD libvirt_driver_network.la CCLD libvirt_driver_storage.la CCLD libvirt.la libvirt_lxc-lxc_monitor_protocol.o: In function `xdr_virLXCMonitorInitEventMsg': lxc_monitor_protocol.c:(.text+0x95): undefined reference to `xdr_uint64_t' collect2: error: ld returned 1 exit status make[3]: *** [libvirt_lxc] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5' make: *** [all] Erreur 2 --- Thanks again! appzer0 >> Date: Fri, 3 May 2013 09:51:18 +0200 >> From: appzer0(a)free.fr >> To: libvir-list(a)redhat.com >> Subject: [libvirt] libvirt 'xdr_u_int64_t' undeclared error >> >> Hello list, >> >> >> I don't know if I should file a bug so I'm asking here: I got problems >> building libvirt with obsolete headers from glibc + libtirpc headers. >> >> I met the "'xdr_u_int64_t' undeclared" error as it seems XDR_CFLAGS are >> never taken into account, no matter I "export" them, tweaks CFLAGS or >> add -I/usr/include/tirpc flags. >> >> Building on x86_64, libvirt 1.0.4 and 1.0.5 have the same behaviour here. >> >> Header is present: >> >> $ grep xdr_u_int64_t $(find /usr/include) 2>/dev/null >> /usr/include/tirpc/rpc/xdr.h:extern bool_t xdr_u_int64_t(XDR *, >> u_int64_t *); >> >> Here is the log. Please notice the empty "xdr:" line in the configure's >> summary : >> >> --- >> + CFLAGS='-O2 -fPIC -pipe' >> + CXXFLAGS='-O2 -fPIC -pipe' >> + LDFLAGS=-I/usr/include/tirpc >> + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var >> --libdir=/usr/lib64 --libexecdir=/usr/lib64/libvirt --mandir=/usr/man >> --infodir=/usr/info --docdir=/usr/doc/libvirt-1.0.5 >> --with-init-script=systemd --with-interface --with-storage-lvm >> --with-udev --build=x86_64-0-linux-gnu >> checking for a BSD-compatible install... /usr/bin/ginstall -c >> checking whether build environment is sane... yes >> checking for a thread-safe mkdir -p... /usr/bin/mkdir -p >> checking for gawk... gawk >> checking whether make sets $(MAKE)... yes >> checking how to create a ustar tar archive... gnutar >> checking whether to enable maintainer-specific portions of Makefiles... yes >> checking whether make supports nested variables... yes >> checking build system type... x86_64-0-linux-gnu >> checking host system type... x86_64-0-linux-gnu >> checking for gcc... gcc >> checking whether the C compiler works... yes >> checking for C compiler default output file name... a.out >> checking for suffix of executables... >> checking whether we are cross compiling... no >> checking for suffix of object files... o >> checking whether we are using the GNU C compiler... yes >> checking whether gcc accepts -g... yes >> checking for gcc option to accept ISO C89... none needed >> checking for style of include used by make... GNU >> checking dependency style of gcc... gcc3 >> checking how to run the C preprocessor... gcc -E >> checking for grep that handles long lines and -e... /usr/bin/grep >> checking for egrep... /usr/bin/grep -E >> checking for Minix Amsterdam compiler... no >> checking for ar... ar >> checking for ranlib... ranlib >> checking whether gcc and cc understand -c and -o together... yes >> checking for ANSI C header files... yes >> checking for sys/types.h... yes >> checking for sys/stat.h... yes >> checking for stdlib.h... yes >> checking for string.h... yes >> checking for memory.h... yes >> checking for strings.h... yes >> checking for inttypes.h... yes >> checking for stdint.h... yes >> checking for unistd.h... yes >> checking minix/config.h usability... no >> checking minix/config.h presence... no >> checking for minix/config.h... no >> checking whether it is safe to define __EXTENSIONS__... yes >> checking whether _XOPEN_SOURCE should be defined... no >> checking for _LARGEFILE_SOURCE value needed for large files... no >> checking for special C compiler options needed for large files... no >> checking for _FILE_OFFSET_BITS value needed for large files... no >> checking for gcc option to accept ISO C99... -std=gnu99 >> checking for gcc -std=gnu99 option to accept ISO Standard C... (cached) >> -std=gnu99 >> configure: autobuild project... libvirt >> configure: autobuild revision... 1.0.5 >> configure: autobuild hostname... poopy >> configure: autobuild timestamp... 20130503T072146Z >> checking sys/socket.h usability... yes >> checking sys/socket.h presence... yes >> checking for sys/socket.h... yes >> checking arpa/inet.h usability... yes >> checking arpa/inet.h presence... yes >> checking for arpa/inet.h... yes >> checking features.h usability... yes >> checking features.h presence... yes >> checking for features.h... yes >> checking sys/param.h usability... yes >> checking sys/param.h presence... yes >> checking for sys/param.h... yes >> checking for unistd.h... (cached) yes >> checking execinfo.h usability... yes >> checking execinfo.h presence... yes >> checking for execinfo.h... yes >> checking wctype.h usability... yes >> checking wctype.h presence... yes >> checking for wctype.h... yes >> checking for sys/stat.h... (cached) yes >> checking netdb.h usability... yes >> checking netdb.h presence... yes >> checking for netdb.h... yes >> checking netinet/in.h usability... yes >> checking netinet/in.h presence... yes >> checking for netinet/in.h... yes >> checking stdio_ext.h usability... yes >> checking stdio_ext.h presence... yes >> checking for stdio_ext.h... yes >> checking termios.h usability... yes >> checking termios.h presence... yes >> checking for termios.h... yes >> checking sys/time.h usability... yes >> checking sys/time.h presence... yes >> checking for sys/time.h... yes >> checking langinfo.h usability... yes >> checking langinfo.h presence... yes >> checking for langinfo.h... yes >> checking xlocale.h usability... yes >> checking xlocale.h presence... yes >> checking for xlocale.h... yes >> checking sys/mman.h usability... yes >> checking sys/mman.h presence... yes >> checking for sys/mman.h... yes >> checking pty.h usability... yes >> checking pty.h presence... yes >> checking for pty.h... yes >> checking poll.h usability... yes >> checking poll.h presence... yes >> checking for poll.h... yes >> checking sys/ioctl.h usability... yes >> checking sys/ioctl.h presence... yes >> checking for sys/ioctl.h... yes >> checking sys/filio.h usability... no >> checking sys/filio.h presence... no >> checking for sys/filio.h... no >> checking pthread.h usability... yes >> checking pthread.h presence... yes >> checking for pthread.h... yes >> checking sched.h usability... yes >> checking sched.h presence... yes >> checking for sched.h... yes >> checking sys/select.h usability... yes >> checking sys/select.h presence... yes >> checking for sys/select.h... yes >> checking wchar.h usability... yes >> checking wchar.h presence... yes >> checking for wchar.h... yes >> checking for stdint.h... (cached) yes >> checking for strings.h... (cached) yes >> checking sys/uio.h usability... yes >> checking sys/uio.h presence... yes >> checking for sys/uio.h... yes >> checking sys/utsname.h usability... yes >> checking sys/utsname.h presence... yes >> checking for sys/utsname.h... yes >> checking sys/wait.h usability... yes >> checking sys/wait.h presence... yes >> checking for sys/wait.h... yes >> checking grp.h usability... yes >> checking grp.h presence... yes >> checking for grp.h... yes >> checking for inttypes.h... (cached) yes >> checking math.h usability... yes >> checking math.h presence... yes >> checking for math.h... yes >> checking spawn.h usability... yes >> checking spawn.h presence... yes >> checking for spawn.h... yes >> checking whether the preprocessor supports include_next... yes >> checking whether system header files limit the line length... no >> checking whether <sys/socket.h> is self-contained... yes >> checking for shutdown... yes >> checking whether <sys/socket.h> defines the SHUT_* macros... yes >> checking for struct sockaddr_storage... yes >> checking for sa_family_t... yes >> checking for struct sockaddr_storage.ss_family... yes >> checking for size_t... yes >> checking for working alloca.h... yes >> checking for alloca... yes >> checking for C/C++ restrict keyword... __restrict >> checking whether <wchar.h> uses 'inline' correctly... yes >> checking for btowc... yes >> checking for canonicalize_file_name... yes >> checking for getcwd... yes >> checking for readlink... yes >> checking for realpath... yes >> checking for readlinkat... yes >> checking for chown... yes >> checking for fchown... yes >> checking for _set_invalid_parameter_handler... no >> checking for fcntl... yes >> checking for symlink... yes >> checking for ffs... yes >> checking for ffsl... yes >> checking for isblank... yes >> checking for iswctype... yes >> checking for mbsrtowcs... yes >> checking for mempcpy... yes >> checking for wmemchr... yes >> checking for wmemcpy... yes >> checking for wmempcpy... yes >> checking for fpurge... no >> checking for __fpurge... yes >> checking for __freading... yes >> checking for fsync... yes >> checking for getdelim... yes >> checking for getdtablesize... yes >> checking for __fsetlocking... yes >> checking for tcgetattr... yes >> checking for tcsetattr... yes >> checking for gettimeofday... yes >> checking for lstat... yes >> checking for mbsinit... yes >> checking for mbrtowc... yes >> checking for mprotect... yes >> checking for mkostemp... yes >> checking for mkostemps... yes >> checking for nl_langinfo... yes >> checking for recvmsg... yes >> checking for sendmsg... yes >> checking for strerror_r... yes >> checking for __xpg_strerror_r... yes >> checking for pipe... yes >> checking for pipe2... yes >> checking for posix_openpt... yes >> checking for pthread_sigmask... no >> checking for wcscoll... yes >> checking for secure_getenv... no >> checking for setenv... yes >> checking for sigaction... yes >> checking for sigaltstack... yes >> checking for siginterrupt... yes >> checking for sleep... yes >> checking for snprintf... yes >> checking for strdup... yes >> checking for catgets... yes >> checking for strndup... yes >> checking for strptime... yes >> checking for localtime_r... yes >> checking for timegm... yes >> checking for usleep... yes >> checking for vasnprintf... no >> checking for wcrtomb... yes >> checking for iswcntrl... yes >> checking for getegid... yes >> checking for ftruncate... yes >> checking for newlocale... yes >> checking for getgrouplist... yes >> checking for socketpair... yes >> checking for posix_spawn... yes >> checking for ptsname_r... yes >> checking for shutdown... (cached) yes >> checking for wctob... yes >> checking for cfmakeraw... yes >> checking for geteuid... yes >> checking for getgid... yes >> checking for getgrnam_r... yes >> checking for getmntent_r... yes >> checking for getpwuid_r... yes >> checking for getuid... yes >> checking for initgroups... yes >> checking for kill... yes >> checking for mmap... yes >> checking for posix_fallocate... yes >> checking for posix_memalign... yes >> checking for prlimit... yes >> checking for regexec... yes >> checking for sched_getaffinity... yes >> checking for setns... yes >> checking for setrlimit... yes >> checking for nl_langinfo and CODESET... yes >> checking for a traditional french locale... fr_FR >> checking whether malloc, realloc, calloc are POSIX compliant... yes >> checking whether // is distinct from /... no >> checking whether realpath works... yes >> checking for uid_t in sys/types.h... yes >> checking for unistd.h... (cached) yes >> checking for working chown... yes >> checking whether chown dereferences symlinks... yes >> checking whether chown honors trailing slash... yes >> checking whether chown always updates ctime... yes >> checking for unsigned long long int... yes >> checking whether byte ordering is bigendian... no >> checking if environ is properly declared... yes >> checking for complete errno.h... yes >> checking for working fcntl.h... yes >> checking for pid_t... yes >> checking for mode_t... yes >> checking whether fdatasync is declared... yes >> checking for mbstate_t... yes >> checking whether stdin defaults to large file offsets... yes >> checking whether fseeko is declared... yes >> checking for fseeko... yes >> checking whether fflush works on input streams... no >> checking whether stat file-mode macros are broken... no >> checking for nlink_t... yes >> checking whether ftello is declared... yes >> checking for ftello... yes >> checking whether ftello works... yes >> checking for library containing gethostbyname... none required >> checking for gethostbyname... yes >> checking for library containing getservbyname... none required >> checking for getservbyname... yes >> checking for library containing inet_ntop... none required >> checking whether inet_ntop is declared... yes >> checking for IPv4 sockets... yes >> checking for IPv6 sockets... yes >> checking whether getcwd (NULL, 0) allocates memory for result... yes >> checking for getcwd with POSIX signature... yes >> checking whether getdelim is declared... yes >> checking whether getline is declared... yes >> checking whether getpass is declared... yes >> checking whether fflush_unlocked is declared... yes >> checking whether flockfile is declared... yes >> checking whether fputs_unlocked is declared... yes >> checking whether funlockfile is declared... yes >> checking whether putc_unlocked is declared... yes >> checking for struct timeval... yes >> checking for wide-enough struct timeval.tv_sec member... yes >> checking whether ldexp() can be used without linking with libm... yes >> checking whether getc_unlocked is declared... yes >> checking whether we are using the GNU C Library 2.1 or newer... yes >> checking for wchar_t... yes >> checking whether NULL can be used in arbitrary expressions... yes >> checking for ld used by GCC... /usr/bin/ld >> checking if the linker (/usr/bin/ld) is GNU ld... yes >> checking for shared library run path origin... done >> checking whether imported symbols can be declared weak... yes >> checking for pthread.h... (cached) yes >> checking for pthread_kill in -lpthread... yes >> checking for pthread_rwlock_t... yes >> checking for multithread API to use... posix >> checking for inline... inline >> checking whether lstat correctly handles trailing slash... yes >> checking for stdlib.h... (cached) yes >> checking for GNU libc compatible malloc... yes >> checking for long long int... yes >> checking for a traditional japanese locale... ja_JP >> checking for a transitional chinese locale... none >> checking for a french Unicode locale... fr_FR.UTF-8 >> checking for mmap... (cached) yes >> checking for MAP_ANONYMOUS... yes >> checking whether memchr works... yes >> checking whether alarm is declared... yes >> checking whether C symbols are prefixed with underscore at the linker >> level... no >> checking for promoted mode_t type... mode_t >> checking for library containing forkpty... -lutil >> checking whether strerror(0) succeeds... yes >> checking for strerror_r with POSIX signature... no >> checking whether __xpg_strerror_r works... yes >> checking whether strerror_r is declared... yes >> checking for external symbol _system_configuration... no >> checking for library containing setsockopt... none needed >> checking whether imported symbols can be declared weak... yes >> checking for pthread.h... (cached) yes >> checking for pthread_kill in -lpthread... (cached) yes >> checking for multithread API to use... posix >> checking for sigset_t... yes >> checking for SIGPIPE... yes >> checking whether <sys/select.h> is self-contained... yes >> checking whether setenv is declared... yes >> checking search.h usability... yes >> checking search.h presence... yes >> checking for search.h... yes >> checking for tsearch... yes >> checking whether snprintf returns a byte count as in C99... yes >> checking whether snprintf is declared... yes >> checking for stdbool.h that conforms to C99... yes >> checking for _Bool... yes >> checking whether stdint.h conforms to C99... yes >> checking whether strdup is declared... yes >> checking whether strndup is declared... yes >> checking whether strnlen is declared... yes >> checking for struct tm.tm_gmtoff... yes >> checking whether strtok_r is declared... yes >> checking for struct timespec in <time.h>... yes >> checking whether ttyname_r is declared... yes >> checking for wint_t... yes >> checking for inttypes.h... yes >> checking for stdint.h... yes >> checking for intmax_t... yes >> checking where to find the exponent in a 'double'... word 1 bit 20 >> checking for snprintf... (cached) yes >> checking for strnlen... yes >> checking for wcslen... yes >> checking for wcsnlen... yes >> checking for mbrtowc... (cached) yes >> checking for wcrtomb... (cached) yes >> checking whether _snprintf is declared... no >> checking whether vsnprintf is declared... yes >> checking whether strerror_r is declared... (cached) yes >> checking for strerror_r... (cached) yes >> checking whether strerror_r returns char *... yes >> checking for sig_atomic_t... yes >> checking whether ungetc works on arbitrary bytes... yes >> checking type of array argument to getgroups... gid_t >> checking for inttypes.h... (cached) yes >> checking whether the inttypes.h PRIxNN macros are broken... no >> checking where to find the exponent in a 'float'... word 0 bit 23 >> checking whether long double and double are the same... no >> checking for LC_MESSAGES... yes >> checking for CFPreferencesCopyAppValue... no >> checking for CFLocaleCopyCurrent... no >> checking whether posix_spawn works... yes >> checking whether posix_spawnattr_setschedpolicy is supported... yes >> checking whether posix_spawnattr_setschedparam is supported... yes >> checking whether unsetenv is declared... yes >> checking for alloca as a compiler built-in... yes >> checking whether btowc(0) is correct... yes >> checking whether btowc(EOF) is correct... yes >> checking byteswap.h usability... yes >> checking byteswap.h presence... yes >> checking for byteswap.h... yes >> checking for library containing clock_gettime... -lrt >> checking for clock_gettime... yes >> checking for clock_settime... yes >> checking whether // is distinct from /... (cached) no >> checking whether dup2 works... yes >> checking for library containing backtrace_symbols_fd... none required >> checking whether fflush works on input streams... (cached) no >> checking whether fcntl handles F_DUPFD correctly... yes >> checking whether fcntl understands F_DUPFD_CLOEXEC... needs runtime check >> checking for library containing fdatasync... none required >> checking whether fflush works on input streams... (cached) no >> checking whether conversion from 'int' to 'long double' works... yes >> checking for working POSIX fnmatch... yes >> checking whether fpurge is declared... no >> checking for fseeko... (cached) yes >> checking whether fflush works on input streams... (cached) no >> checking for _fseeki64... no >> checking for ftello... (cached) yes >> checking whether ftello works... (cached) yes >> checking whether __func__ is available... yes >> configure: checking how to do getaddrinfo, freeaddrinfo and getnameinfo >> checking for library containing getaddrinfo... none required >> checking for getaddrinfo... yes >> checking whether gai_strerror is declared... yes >> checking whether gai_strerrorA is declared... no >> checking for gai_strerror with POSIX signature... yes >> checking for struct sockaddr.sa_len... no >> checking whether getaddrinfo is declared... yes >> checking whether freeaddrinfo is declared... yes >> checking whether getnameinfo is declared... yes >> checking for struct addrinfo... yes >> checking for working getdelim function... yes >> checking for gethostname... yes >> checking for HOST_NAME_MAX... yes >> checking for getline... yes >> checking for working getline function... yes >> checking for getpass... yes >> checking whether gettimeofday clobbers localtime buffer... no >> checking for gettimeofday with POSIX signature... almost >> checking for library containing gethostbyname... (cached) none required >> checking for gethostbyname... (cached) yes >> checking for library containing inet_ntop... (cached) none required >> checking whether inet_ntop is declared... (cached) yes >> checking for library containing inet_pton... none required >> checking whether inet_pton is declared... yes >> checking for ioctl... yes >> checking for ioctl with POSIX signature... no >> checking whether langinfo.h defines CODESET... yes >> checking whether langinfo.h defines T_FMT_AMPM... yes >> checking whether langinfo.h defines ERA... yes >> checking whether langinfo.h defines YESEXPR... yes >> checking whether locale.h conforms to POSIX:2001... yes >> checking whether locale.h defines locale_t... yes >> checking whether struct lconv is properly defined... yes >> checking whether lseek detects pipes... yes >> checking for stdlib.h... (cached) yes >> checking for GNU libc compatible malloc... (cached) yes >> checking whether mbrtowc handles incomplete characters... yes >> checking whether mbrtowc works as well as mbtowc... guessing yes >> checking whether mbrtowc handles a NULL pwc argument... yes >> checking whether mbrtowc handles a NULL string argument... yes >> checking whether mbrtowc has a correct return value... yes >> checking whether mbrtowc returns 0 when parsing a NUL character... >> guessing yes >> checking whether mbrtowc handles incomplete characters... (cached) yes >> checking whether mbrtowc works as well as mbtowc... (cached) guessing yes >> checking whether mbrtowc handles incomplete characters... (cached) yes >> checking whether mbrtowc works as well as mbtowc... (cached) guessing yes >> checking whether mbsrtowcs works... yes >> checking for working mktime... yes >> checking for __mktime_internal... no >> checking whether <net/if.h> is self-contained... yes >> checking whether <netinet/in.h> is self-contained... yes >> checking whether YESEXPR works... yes >> checking whether open recognizes a trailing slash... yes >> checking whether openpty is declared... yes >> checking for const-safe openpty signature... yes >> checking for struct msghdr.msg_accrights... no >> checking whether perror matches strerror... yes >> checking for sys/pstat.h... no >> checking for sys/sysmp.h... no >> checking for sys/sysinfo.h... yes >> checking for machine/hal_sysinfo.h... no >> checking for sys/table.h... no >> checking for sys/param.h... (cached) yes >> checking for sys/systemcfg.h... no >> checking for sys/sysctl.h... yes >> checking for pstat_getstatic... no >> checking for pstat_getdynamic... no >> checking for sysmp... no >> checking for getsysinfo... no >> checking for sysctl... yes >> checking for table... no >> checking for poll... yes >> checking for a shell that conforms to POSIX... /bin/sh >> checking for pthread_t... yes >> checking for pthread_spinlock_t... yes >> checking for library containing pthread_create and pthread_join... -lpthread >> checking for pthread_sigmask in -lpthread... yes >> checking whether pthread_sigmask returns error numbers... yes >> checking whether pthread_sigmask unblocks signals correctly... guessing yes >> checking for raise... yes >> checking for sigprocmask... yes >> checking for random.h... no >> checking for struct random_data... yes >> checking for random_r... yes >> checking for rawmemchr... yes >> checking whether readlink signature is correct... yes >> checking whether readlink handles trailing slash correctly... yes >> checking for working re_compile_pattern... no >> checking libintl.h usability... yes >> checking libintl.h presence... yes >> checking for libintl.h... yes >> checking whether isblank is declared... yes >> checking for __secure_getenv... yes >> checking whether select supports a 0 argument... yes >> checking whether select detects invalid fds... yes >> checking for library containing getservbyname... (cached) none required >> checking for getservbyname... (cached) yes >> checking whether setenv validates arguments... yes >> checking for struct sigaction.sa_sigaction... yes >> checking for volatile sig_atomic_t... yes >> checking for sighandler_t... yes >> checking for sigprocmask... (cached) yes >> checking for stdint.h... (cached) yes >> checking for SIZE_MAX... yes >> checking whether sleep is declared... yes >> checking for working sleep... yes >> checking for snprintf... (cached) yes >> checking whether snprintf respects a size of 1... yes >> checking whether printf supports POSIX/XSI format strings with >> positions... yes >> checking for library containing setsockopt... (cached) none needed >> checking for socklen_t... yes >> checking for ssize_t... yes >> checking whether stat handles trailing slashes on directories... yes >> checking whether stat handles trailing slashes on files... yes >> checking for struct stat.st_atim.tv_nsec... yes >> checking whether struct stat.st_atim is of type struct timespec... yes >> checking for struct stat.st_birthtimespec.tv_nsec... no >> checking for struct stat.st_birthtimensec... no >> checking for struct stat.st_birthtim.tv_nsec... no >> checking for working stdalign.h... yes >> checking for va_copy... yes >> checking whether NULL can be used in arbitrary expressions... (cached) yes >> checking for stpcpy... yes >> checking for strcasecmp... yes >> checking for strncasecmp... yes >> checking whether strncasecmp is declared... yes >> checking for strchrnul... yes >> checking whether strchrnul works... yes >> checking for working strerror function... yes >> checking for working strndup... yes >> checking for working strnlen... yes >> checking for strsep... yes >> checking for strtok_r... yes >> checking whether strtok_r works... yes >> checking whether <sys/ioctl.h> declares ioctl... yes >> checking whether <sys/select.h> is self-contained... (cached) yes >> checking whether <sys/socket.h> is self-contained... (cached) yes >> checking for shutdown... (cached) yes >> checking whether <sys/socket.h> defines the SHUT_* macros... (cached) yes >> checking for struct sockaddr_storage... (cached) yes >> checking for sa_family_t... (cached) yes >> checking for struct sockaddr_storage.ss_family... (cached) yes >> checking for nlink_t... (cached) yes >> checking for struct utsname... yes >> checking whether localtime_r is declared... yes >> checking whether localtime_r is compatible with its POSIX signature... yes >> checking for ttyname_r... yes >> checking whether ttyname_r is compatible with its POSIX signature... yes >> checking whether ttyname_r works with small buffers... yes >> checking for uname... yes >> checking for useconds_t... yes >> checking whether usleep allows large arguments... yes >> checking for ptrdiff_t... yes >> checking for vasprintf... yes >> checking for vsnprintf... yes >> checking whether snprintf respects a size of 1... (cached) yes >> checking whether printf supports POSIX/XSI format strings with >> positions... (cached) yes >> checking whether mbrtowc handles incomplete characters... (cached) yes >> checking whether mbrtowc works as well as mbtowc... (cached) guessing yes >> checking whether wcrtomb return value is correct... yes >> checking whether iswcntrl works... yes >> checking for towlower... yes >> checking for wctype_t... yes >> checking for wctrans_t... yes >> checking for stdint.h... (cached) yes >> checking for a traditional french locale... (cached) fr_FR >> checking for a french Unicode locale... (cached) fr_FR.UTF-8 >> checking for a traditional french locale... (cached) fr_FR >> checking for a turkish Unicode locale... tr_TR.UTF-8 >> checking for error_at_line... yes >> checking whether fdopen sets errno... yes >> checking for getgroups... yes >> checking for working getgroups... yes >> checking whether getgroups handles negative values... yes >> checking for getpagesize... yes >> checking whether getpagesize is declared... yes >> checking for grantpt... yes >> checking whether byte ordering is bigendian... (cached) no >> checking whether byte ordering is bigendian... (cached) no >> checking whether INT32_MAX < INTMAX_MAX... yes >> checking whether INT64_MAX == LONG_MAX... yes >> checking whether UINT32_MAX < UINTMAX_MAX... yes >> checking whether UINT64_MAX == ULONG_MAX... yes >> checking whether isnan(double) can be used without linking with libm... yes >> checking where to find the exponent in a 'double'... (cached) word 1 bit 20 >> checking whether isnan(float) can be used without linking with libm... yes >> checking whether isnan(float) works... yes >> checking where to find the exponent in a 'float'... (cached) word 0 bit 23 >> checking whether isnan(long double) can be used without linking with >> libm... yes >> checking whether isnanl works... no >> checking where to find the exponent in a 'long double'... word 2 bit 0 >> checking where to find the exponent in a 'long double'... (cached) word >> 2 bit 0 >> checking for setlocale... yes >> checking for uselocale... yes >> checking whether NAN macro works... yes >> checking whether HUGE_VAL works... yes >> checking for a traditional french locale... (cached) fr_FR >> checking for a french Unicode locale... (cached) fr_FR.UTF-8 >> checking for a traditional japanese locale... (cached) ja_JP >> checking for a transitional chinese locale... (cached) none >> checking for a french Unicode locale... (cached) fr_FR.UTF-8 >> checking for a traditional french locale... (cached) fr_FR >> checking for a french Unicode locale... (cached) fr_FR.UTF-8 >> checking for a traditional japanese locale... (cached) ja_JP >> checking for a transitional chinese locale... (cached) none >> checking for mmap... (cached) yes >> checking for MAP_ANONYMOUS... yes >> checking for library containing if_nameindex... none required >> checking for a traditional french locale... (cached) fr_FR >> checking for a french Unicode locale... (cached) fr_FR.UTF-8 >> checking whether posix_spawn_file_actions_addclose works... yes >> checking whether posix_spawn_file_actions_adddup2 works... yes >> checking whether posix_spawn_file_actions_addopen works... yes >> checking whether program_invocation_name is declared... yes >> checking whether program_invocation_short_name is declared... yes >> checking for ptsname... yes >> checking whether ptsname sets errno on failure... yes >> checking whether ptsname_r has the same signature as in glibc... yes >> checking for putenv compatible with GNU and SVID... yes >> checking for mmap... (cached) yes >> checking for MAP_ANONYMOUS... yes >> checking for stdlib.h... (cached) yes >> checking for GNU libc compatible realloc... yes >> checking for a traditional french locale... (cached) fr_FR >> checking for a french Unicode locale... (cached) fr_FR.UTF-8 >> checking for a traditional japanese locale... (cached) ja_JP >> checking for a transitional chinese locale... (cached) none >> checking for signbit macro... yes >> checking for signbit compiler built-ins... yes >> checking for posix_spawnattr_t... yes >> checking for posix_spawn_file_actions_t... yes >> checking for mmap... (cached) yes >> checking for MAP_ANONYMOUS... yes >> checking whether symlink handles trailing slash correctly... yes >> checking for pthread_atfork... yes >> checking for unlockpt... yes >> checking for unsetenv... yes >> checking for unsetenv() return type... int >> checking whether unsetenv obeys POSIX... yes >> checking for waitid... yes >> checking for a traditional french locale... (cached) fr_FR >> checking for a french Unicode locale... (cached) fr_FR.UTF-8 >> checking for a traditional japanese locale... (cached) ja_JP >> checking for a transitional chinese locale... (cached) none >> checking whether wctob works... yes >> checking whether wctob is declared... yes >> checking for uid_t in sys/types.h... (cached) yes >> checking how to print strings... printf >> checking for a sed that does not truncate output... /usr/bin/sed >> checking for fgrep... /usr/bin/grep -F >> checking for ld used by gcc -std=gnu99... /usr/bin/ld >> checking if the linker (/usr/bin/ld) is GNU ld... yes >> checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B >> checking the name lister (/usr/bin/nm -B) interface... BSD nm >> checking whether ln -s works... yes >> checking the maximum length of command line arguments... 1572864 >> checking whether the shell understands some XSI constructs... yes >> checking whether the shell understands "+="... yes >> checking how to convert x86_64-0-linux-gnu file names to >> x86_64-0-linux-gnu format... func_convert_file_noop >> checking how to convert x86_64-0-linux-gnu file names to toolchain >> format... func_convert_file_noop >> checking for /usr/bin/ld option to reload object files... -r >> checking for objdump... objdump >> checking how to recognize dependent libraries... pass_all >> checking for dlltool... dlltool >> checking how to associate runtime and link libraries... printf %s\n >> checking for archiver @FILE support... @ >> checking for strip... strip >> checking for ranlib... (cached) ranlib >> checking command to parse /usr/bin/nm -B output from gcc -std=gnu99 >> object... ok >> checking for sysroot... no >> checking for mt... no >> checking if : is a manifest tool... no >> checking for dlfcn.h... yes >> checking for objdir... .libs >> checking if gcc -std=gnu99 supports -fno-rtti -fno-exceptions... no >> checking for gcc -std=gnu99 option to produce PIC... -fPIC -DPIC >> checking if gcc -std=gnu99 PIC flag -fPIC -DPIC works... yes >> checking if gcc -std=gnu99 static flag -static works... yes >> checking if gcc -std=gnu99 supports -c -o file.o... yes >> checking if gcc -std=gnu99 supports -c -o file.o... (cached) yes >> checking whether the gcc -std=gnu99 linker (/usr/bin/ld -m elf_x86_64) >> supports shared libraries... yes >> checking whether -lc should be explicitly linked in... no >> checking dynamic linker characteristics... GNU/Linux ld.so >> checking how to hardcode library paths into programs... immediate >> checking whether stripping libraries is possible... yes >> checking if libtool supports shared libraries... yes >> checking whether to build shared libraries... yes >> checking whether to build static libraries... no >> checking for ld used by gcc -std=gnu99... (cached) /usr/bin/ld >> checking if the linker (/usr/bin/ld) is GNU ld... (cached) yes >> checking for how to mark DSO non-deletable at runtime... -Wl,-z -Wl,nodelete >> checking for how to set DSO symbol versions... -Wl,--version-script= >> checking whether gcc -Wformat allows NULL strings... yes >> checking whether pragma GCC diagnostic push works... yes >> checking whether GCC -Wlogical-op gives bogus warnings... no >> checking whether -Wno-missing-field-initializers is supported... yes >> checking whether -Wno-missing-field-initializers is needed... no >> checking whether -Wuninitialized is supported... yes >> checking whether C compiler handles -W... yes >> checking whether C compiler handles -Waddress... yes >> checking whether C compiler handles -Wall... yes >> checking whether C compiler handles -Warray-bounds... yes >> checking whether C compiler handles -Wattributes... yes >> checking whether C compiler handles -Wbad-function-cast... yes >> checking whether C compiler handles -Wbuiltin-macro-redefined... yes >> checking whether C compiler handles -Wcast-align... yes >> checking whether C compiler handles -Wchar-subscripts... yes >> checking whether C compiler handles -Wclobbered... yes >> checking whether C compiler handles -Wcomment... yes >> checking whether C compiler handles -Wcomments... yes >> checking whether C compiler handles -Wcoverage-mismatch... yes >> checking whether C compiler handles -Wcpp... yes >> checking whether C compiler handles -Wdeprecated-declarations... yes >> checking whether C compiler handles -Wdisabled-optimization... yes >> checking whether C compiler handles -Wdiv-by-zero... yes >> checking whether C compiler handles -Wdouble-promotion... yes >> checking whether C compiler handles -Wempty-body... yes >> checking whether C compiler handles -Wendif-labels... yes >> checking whether C compiler handles -Wextra... yes >> checking whether C compiler handles -Wformat-contains-nul... yes >> checking whether C compiler handles -Wformat-extra-args... yes >> checking whether C compiler handles -Wformat-security... yes >> checking whether C compiler handles -Wformat-y2k... yes >> checking whether C compiler handles -Wformat-zero-length... yes >> checking whether C compiler handles -Wformat=2... yes >> checking whether C compiler handles -Wfree-nonheap-object... yes >> checking whether C compiler handles -Wignored-qualifiers... yes >> checking whether C compiler handles -Wimplicit... yes >> checking whether C compiler handles -Wimplicit-function-declaration... yes >> checking whether C compiler handles -Wimplicit-int... yes >> checking whether C compiler handles -Winit-self... yes >> checking whether C compiler handles -Winline... yes >> checking whether C compiler handles -Wint-to-pointer-cast... yes >> checking whether C compiler handles -Winvalid-memory-model... yes >> checking whether C compiler handles -Winvalid-pch... yes >> checking whether C compiler handles -Wjump-misses-init... yes >> checking whether C compiler handles -Wlogical-op... yes >> checking whether C compiler handles -Wmain... yes >> checking whether C compiler handles -Wmaybe-uninitialized... yes >> checking whether C compiler handles -Wmissing-braces... yes >> checking whether C compiler handles -Wmissing-declarations... yes >> checking whether C compiler handles -Wmissing-field-initializers... yes >> checking whether C compiler handles -Wmissing-format-attribute... yes >> checking whether C compiler handles -Wmissing-include-dirs... yes >> checking whether C compiler handles -Wmissing-noreturn... yes >> checking whether C compiler handles -Wmissing-parameter-type... yes >> checking whether C compiler handles -Wmissing-prototypes... yes >> checking whether C compiler handles -Wmudflap... yes >> checking whether C compiler handles -Wmultichar... yes >> checking whether C compiler handles -Wnarrowing... yes >> checking whether C compiler handles -Wnested-externs... yes >> checking whether C compiler handles -Wnonnull... yes >> checking whether C compiler handles -Wnormalized=nfc... yes >> checking whether C compiler handles -Wold-style-declaration... yes >> checking whether C compiler handles -Wold-style-definition... yes >> checking whether C compiler handles -Woverflow... yes >> checking whether C compiler handles -Woverride-init... yes >> checking whether C compiler handles -Wpacked-bitfield-compat... yes >> checking whether C compiler handles -Wparentheses... yes >> checking whether C compiler handles -Wpointer-arith... yes >> checking whether C compiler handles -Wpointer-sign... yes >> checking whether C compiler handles -Wpointer-to-int-cast... yes >> checking whether C compiler handles -Wpragmas... yes >> checking whether C compiler handles -Wreturn-type... yes >> checking whether C compiler handles -Wsequence-point... yes >> checking whether C compiler handles -Wshadow... yes >> checking whether C compiler handles -Wsizeof-pointer-memaccess... no >> checking whether C compiler handles -Wstrict-aliasing... yes >> checking whether C compiler handles -Wstrict-prototypes... yes >> checking whether C compiler handles -Wsuggest-attribute=const... yes >> checking whether C compiler handles -Wsuggest-attribute=format... no >> checking whether C compiler handles -Wsuggest-attribute=noreturn... yes >> checking whether C compiler handles -Wsuggest-attribute=pure... yes >> checking whether C compiler handles -Wswitch... yes >> checking whether C compiler handles -Wsync-nand... yes >> checking whether C compiler handles -Wtrampolines... yes >> checking whether C compiler handles -Wtrigraphs... yes >> checking whether C compiler handles -Wtype-limits... yes >> checking whether C compiler handles -Wuninitialized... yes >> checking whether C compiler handles -Wunknown-pragmas... yes >> checking whether C compiler handles -Wunused... yes >> checking whether C compiler handles -Wunused-but-set-parameter... yes >> checking whether C compiler handles -Wunused-but-set-variable... yes >> checking whether C compiler handles -Wunused-function... yes >> checking whether C compiler handles -Wunused-label... yes >> checking whether C compiler handles -Wunused-local-typedefs... yes >> checking whether C compiler handles -Wunused-parameter... yes >> checking whether C compiler handles -Wunused-result... yes >> checking whether C compiler handles -Wunused-value... yes >> checking whether C compiler handles -Wunused-variable... yes >> checking whether C compiler handles -Wvarargs... no >> checking whether C compiler handles -Wvariadic-macros... yes >> checking whether C compiler handles -Wvector-operation-performance... yes >> checking whether C compiler handles -Wvolatile-register-var... yes >> checking whether C compiler handles -Wwrite-strings... yes >> checking whether C compiler handles -Wno-sign-compare... yes >> checking whether C compiler handles -Wjump-misses-init... (cached) yes >> checking whether C compiler handles -Wno-format-nonliteral... yes >> checking whether C compiler handles -Wframe-larger-than=4096... yes >> checking whether C compiler handles -fstack-protector-all... yes >> checking whether C compiler handles --param=ssp-buffer-size=4... yes >> checking whether C compiler handles -fexceptions... yes >> checking whether C compiler handles -fasynchronous-unwind-tables... yes >> checking whether C compiler handles -fdiagnostics-show-option... yes >> checking whether C compiler handles -funit-at-a-time... yes >> checking whether C compiler handles -fipa-pure-const... yes >> checking whether C compiler handles -Wno-suggest-attribute=pure... yes >> checking whether C compiler handles -Wno-suggest-attribute=const... yes >> checking whether C compiler handles -Wno-redundant-decls... yes >> checking whether C compiler handles -fPIE -DPIE... yes >> checking for how to force completely read-only GOT table... -Wl,-z >> -Wl,relro -Wl,-z -Wl,now >> checking for aa_change_profile in -lapparmor... no >> checking for getxattr in -lattr... yes >> checking attr/xattr.h usability... yes >> checking attr/xattr.h presence... yes >> checking for attr/xattr.h... yes >> checking for audit_encode_nv_string in -laudit... no >> checking for pkg-config... /usr/bin/pkg-config >> checking pkg-config is at least version 0.9.0... yes >> checking for AVAHI... yes >> checking for BLKID... yes >> checking for capng_updatev in -lcap-ng... yes >> checking for cap-ng.h... (cached) yes >> checking for CURL... yes >> checking for DBUS... yes >> checking for dbus_watch_get_unix_fd... yes >> checking for FUSE... yes >> checking for HAL... no >> checking for NETCF... no >> checking for numa_available in -lnuma... no >> checking for OPENWSMAN... no >> checking for PCIACCESS... yes >> checking for sanlock_init in -lsanlock_client... no >> checking for sasl_client_init in -lsasl2... yes >> checking for sasl/sasl.h... (cached) yes >> checking for fgetfilecon_raw in -lselinux... no >> checking for SSH2... yes >> checking for UDEV... yes >> checking for yajl_parse_complete in -lyajl... no >> checking for yajl_tree_parse in -lyajl... yes >> checking for yajl/yajl_common.h... (cached) yes >> checking for CPUID instruction... yes >> checking size of long... 8 >> checking for pthread_mutexattr_init... yes >> checking pwd.h usability... yes >> checking pwd.h presence... yes >> checking for pwd.h... yes >> checking paths.h usability... yes >> checking paths.h presence... yes >> checking for paths.h... yes >> checking regex.h usability... yes >> checking regex.h presence... yes >> checking for regex.h... yes >> checking sys/un.h usability... yes >> checking sys/un.h presence... yes >> checking for sys/un.h... yes >> checking sys/poll.h usability... yes >> checking sys/poll.h presence... yes >> checking for sys/poll.h... yes >> checking syslog.h usability... yes >> checking syslog.h presence... yes >> checking for syslog.h... yes >> checking mntent.h usability... yes >> checking mntent.h presence... yes >> checking for mntent.h... yes >> checking net/ethernet.h usability... yes >> checking net/ethernet.h presence... yes >> checking for net/ethernet.h... yes >> checking linux/magic.h usability... yes >> checking linux/magic.h presence... yes >> checking for linux/magic.h... yes >> checking for sys/un.h... (cached) yes >> checking sys/syscall.h usability... yes >> checking sys/syscall.h presence... yes >> checking for sys/syscall.h... yes >> checking netinet/tcp.h usability... yes >> checking netinet/tcp.h presence... yes >> checking for netinet/tcp.h... yes >> checking ifaddrs.h usability... yes >> checking ifaddrs.h presence... yes >> checking for ifaddrs.h... yes >> checking libtasn1.h usability... yes >> checking libtasn1.h presence... yes >> checking for libtasn1.h... yes >> checking sys/ucred.h usability... no >> checking sys/ucred.h presence... no >> checking for sys/ucred.h... no >> checking sys/mount.h usability... yes >> checking sys/mount.h presence... yes >> checking for sys/mount.h... yes >> checking whether htole64 is declared... yes >> checking for atomic ops implementation... gcc >> checking for struct ifreq... yes >> checking for gettext in -lintl... no >> checking for rpcgen... /usr/bin/rpcgen >> checking for xmllint... /usr/bin/xmllint >> checking for xmlcatalog... /usr/bin/xmlcatalog >> checking for xsltproc... /usr/bin/xsltproc >> checking for augparse... /usr/bin/augparse >> checking for dnsmasq... dnsmasq >> checking for radvd... radvd >> checking for brctl... brctl >> checking for tc... /sbin/tc >> checking for udevadm... /sbin/udevadm >> checking for udevsettle... no >> checking for modprobe... /sbin/modprobe >> checking for ovs-vsctl... ovs-vsctl >> checking for scrub... scrub >> checking for init script flavor... systemd >> checking for whether to install sysctl config... yes >> checking for ip... /usr/sbin/ip >> checking for iptables... /usr/sbin/iptables >> checking for ip6tables... /usr/sbin/ip6tables >> checking for ebtables... /sbin/ebtables >> checking for xdrmem_create in -lportablexdr... no >> checking for library containing xdrmem_create... -ltirpc >> checking for xdr_u_int64_t... yes >> checking where to find <rpc/rpc.h>... none >> checking for dlfcn.h... (cached) yes >> checking for library containing dlopen... -ldl >> checking for xen_vm_start in -lxenserver... no >> checking for libxl_ctx_alloc in -lxenlight... no >> checking for xs_read in -lxenstore... no >> checking linux/kvm.h usability... yes >> checking linux/kvm.h presence... yes >> checking for linux/kvm.h... yes >> checking for shell that supports <> redirection... /bin/sh >> checking for linux/param.h... yes >> checking for linux/sockios.h... yes >> checking for linux/if_bridge.h... yes >> checking for linux/if_tun.h... yes >> checking for pkg-config... (cached) /usr/bin/pkg-config >> checking pkg-config is at least version 0.9.0... yes >> checking for LIBXML... yes >> checking for struct _xmlURI.query_raw... yes >> checking for GNUTLS... yes >> checking for pkcheck... /usr/bin/pkcheck >> checking for dtrace... no >> checking for numad... no >> checking libpcap pcap-config >= 1.0.0 ... yes >> checking sys/inotify.h usability... yes >> checking sys/inotify.h presence... yes >> checking for sys/inotify.h... yes >> checking readline/readline.h usability... yes >> checking readline/readline.h presence... yes >> checking for readline/readline.h... yes >> checking for readline in -lreadline... yes >> checking for mntent.h... (cached) yes >> checking for mount... /usr/bin/mount >> checking for umount... /usr/bin/umount >> checking for mkfs... /sbin/mkfs >> checking for showmount... /sbin/showmount >> checking for pvcreate... /sbin/pvcreate >> checking for vgcreate... /sbin/vgcreate >> checking for lvcreate... /sbin/lvcreate >> checking for pvremove... /sbin/pvremove >> checking for vgremove... /sbin/vgremove >> checking for lvremove... /sbin/lvremove >> checking for lvchange... /sbin/lvchange >> checking for vgchange... /sbin/vgchange >> checking for vgscan... /sbin/vgscan >> checking for pvs... /sbin/pvs >> checking for vgs... /sbin/vgs >> checking for lvs... /sbin/lvs >> checking for iscsiadm... no >> checking rbd/librbd.h usability... no >> checking rbd/librbd.h presence... no >> checking for rbd/librbd.h... no >> checking for collie... no >> checking for parted... /sbin/parted >> checking for dmsetup... /sbin/dmsetup >> checking for LIBPARTED... yes >> checking for DEVMAPPER... yes >> checking libdevmapper.h usability... yes >> checking libdevmapper.h presence... yes >> checking for libdevmapper.h... yes >> checking for python... /usr/bin/python >> checking for python version... 2.7 >> checking for python platform... linux2 >> checking for python script directory... >> ${prefix}/lib64/python2.7/site-packages >> checking for python extension module directory... >> ${exec_prefix}/lib64/python2.7/site-packages >> checking for perl... /usr/bin/perl >> checking Whether to build test suite by default... no >> checking whether NLS is requested... yes >> checking for msgfmt... /usr/bin/msgfmt >> checking for gmsgfmt... /usr/bin/msgfmt >> checking for xgettext... /usr/bin/xgettext >> checking for msgmerge... /usr/bin/msgmerge >> checking for CFPreferencesCopyAppValue... (cached) no >> checking for CFLocaleCopyCurrent... (cached) no >> checking for GNU gettext in libc... yes >> checking whether to use NLS... yes >> checking where the gettext function comes from... libc >> checking whether to compile with macvtap support... yes >> checking whether MACVLAN_MODE_PASSTHRU is declared... yes >> checking whether to compile with virtual port support... yes >> checking for LIBNL... yes >> checking for LIBNL_ROUTE3... yes >> checking for struct ifreq.ifr_newname... yes >> checking for struct ifreq.ifr_ifindex... yes >> checking for struct ifreq.ifr_index... no >> checking whether this build is done by a static analysis tool... no >> configure: creating ./config.status >> config.status: creating run >> config.status: creating Makefile >> config.status: creating src/Makefile >> config.status: creating include/Makefile >> config.status: creating docs/Makefile >> config.status: creating docs/schemas/Makefile >> config.status: creating gnulib/lib/Makefile >> config.status: creating gnulib/tests/Makefile >> config.status: creating libvirt.pc >> config.status: creating libvirt.spec >> config.status: creating mingw-libvirt.spec >> config.status: creating po/Makefile.in >> config.status: creating include/libvirt/Makefile >> config.status: creating include/libvirt/libvirt.h >> config.status: creating python/Makefile >> config.status: creating python/tests/Makefile >> config.status: creating daemon/Makefile >> config.status: creating tools/Makefile >> config.status: creating tests/Makefile >> config.status: creating examples/apparmor/Makefile >> config.status: creating examples/domain-events/events-c/Makefile >> config.status: creating examples/domsuspend/Makefile >> config.status: creating examples/dominfo/Makefile >> config.status: creating examples/openauth/Makefile >> config.status: creating examples/python/Makefile >> config.status: creating examples/hellolibvirt/Makefile >> config.status: creating examples/systemtap/Makefile >> config.status: creating examples/xml/nwfilter/Makefile >> config.status: creating config.h >> config.status: executing depfiles commands >> config.status: executing libtool commands >> config.status: executing po-directories commands >> config.status: creating po/POTFILES >> config.status: creating po/Makefile >> configure: >> configure: Configuration summary >> configure: ===================== >> configure: >> configure: Drivers >> configure: >> configure: Xen: no >> configure: QEMU: yes >> configure: UML: yes >> configure: OpenVZ: yes >> configure: VMware: yes >> configure: VBox: yes >> configure: XenAPI: no >> configure: xenlight: no >> configure: LXC: yes >> configure: PHYP: yes >> configure: ESX: yes >> configure: Hyper-V: no >> configure: Parallels: yes >> configure: Test: yes >> configure: Remote: yes >> configure: Network: yes >> configure: Libvirtd: yes >> configure: Interface: yes >> configure: macvtap: yes >> configure: virtport: yes >> configure: >> configure: Storage Drivers >> configure: >> configure: Dir: yes >> configure: FS: yes >> configure: NetFS: yes >> configure: LVM: yes >> configure: iSCSI: no >> configure: SCSI: yes >> configure: mpath: yes >> configure: Disk: yes >> configure: RBD: no >> configure: Sheepdog: no >> configure: >> configure: Security Drivers >> configure: >> configure: SELinux: no () >> configure: AppArmor: no >> configure: >> configure: Driver Loadable Modules >> configure: >> configure: dlopen: -export-dynamic -ldl >> configure: >> configure: Libraries >> configure: >> configure: apparmor: no >> configure: attr: yes (CFLAGS='' LIBS='-lattr') >> configure: audit: no >> configure: avahi: yes (CFLAGS='-D_REENTRANT ' LIBS='-lavahi-common >> -lavahi-client ') >> configure: blkid: yes (CFLAGS='-I/usr/include/blkid >> -I/usr/include/uuid ' LIBS='-lblkid ') >> configure: capng: yes (CFLAGS='' LIBS='-lcap-ng') >> configure: curl: yes (CFLAGS='-DCURL_DISABLE_TYPECHECK ' >> LIBS='-lcurl ') >> configure: dbus: yes (CFLAGS='-I/usr/include/dbus-1.0 >> -I/usr/lib64/dbus-1.0/include ' LIBS='-ldbus-1 ') >> configure: fuse: yes (CFLAGS='-D_FILE_OFFSET_BITS=64 >> -I/usr/include/fuse ' LIBS='-lfuse -pthread ') >> configure: hal: no >> configure: netcf: no >> configure: numactl: no >> configure: openwsman: no >> configure: pciaccess: yes (CFLAGS='' LIBS='-lpciaccess ') >> configure: sanlock: no >> configure: sasl: yes (CFLAGS='' LIBS='-lsasl2') >> configure: selinux: no >> configure: ssh2: yes (CFLAGS='' LIBS='-lssh2 ') >> configure: udev: yes (CFLAGS='' LIBS='-ludev ') >> configure: yajl: yes (CFLAGS='' LIBS='-lyajl') >> configure: libxml: -I/usr/include/libxml2 -lxml2 >> configure: dlopen: -ldl >> configure: openwsman: no >> configure: gnutls: -I/usr/include/p11-kit-1 -lgnutls -lgcrypt >> configure: firewalld: yes >> configure: polkit: /usr/bin/pkcheck (version 1) >> configure: xen: no >> configure: xenapi: no >> configure: xenlight: no >> configure: pcap: -I/usr/include -L/usr/lib64 -Wl,-rpath,/usr/lib64 >> -lpcap >> configure: nl: -I/usr/include/libnl3 -I/usr/include/libnl3 >> -lnl-3 -lnl-route-3 -lnl-3 >> configure: mscom: no >> configure: xdr: >> configure: rbd: no >> configure: >> configure: Test suite >> configure: >> configure: Coverage: no >> configure: Alloc OOM: no >> configure: >> configure: Miscellaneous >> configure: >> configure: Debug: yes >> configure: Use -Werror: no >> configure: Warning Flags: -W -Waddress -Wall -Warray-bounds >> -Wattributes -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align >> -Wchar-subscripts -Wclobbered -Wcomment -Wcomments -Wcoverage-mismatch >> -Wcpp -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero >> -Wdouble-promotion -Wempty-body -Wendif-labels -Wextra >> -Wformat-contains-nul -Wformat-extra-args -Wformat-security -Wformat-y2k >> -Wformat-zero-length -Wformat=2 -Wfree-nonheap-object >> -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration >> -Wimplicit-int -Winit-self -Winline -Wint-to-pointer-cast >> -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init -Wlogical-op >> -Wmain -Wmaybe-uninitialized -Wmissing-braces -Wmissing-declarations >> -Wmissing-field-initializers -Wmissing-format-attribute >> -Wmissing-include-dirs -Wmissing-noreturn -Wmissing-parameter-type >> -Wmissing-prototypes -Wmudflap -Wmultichar -Wnarrowing -Wnested-externs >> -Wnonnull -Wnormalized=nfc -Wold-style-declaration >> -Wold-style-definition -Woverflow -Woverride-init >> -Wpacked-bitfield-compat -Wparentheses -Wpointer-arith -Wpointer-sign >> -Wpointer-to-int-cast -Wpragmas -Wreturn-type -Wsequence-point -Wshadow >> -Wstrict-aliasing -Wstrict-prototypes -Wsuggest-attribute=const >> -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wswitch >> -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized >> -Wunknown-pragmas -Wunused -Wunused-but-set-parameter >> -Wunused-but-set-variable -Wunused-function -Wunused-label >> -Wunused-local-typedefs -Wunused-parameter -Wunused-result >> -Wunused-value -Wunused-variable -Wvariadic-macros >> -Wvector-operation-performance -Wvolatile-register-var -Wwrite-strings >> -Wno-sign-compare -Wjump-misses-init -Wno-format-nonliteral >> -Wframe-larger-than=4096 -fstack-protector-all --param=ssp-buffer-size=4 >> -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option >> -funit-at-a-time -fipa-pure-const -Wno-suggest-attribute=pure >> -Wno-suggest-attribute=const >> configure: Readline: yes >> configure: Python: yes >> configure: DTrace: no >> configure: numad: no >> configure: XML Catalog: /etc/xml/catalog >> configure: Init script: systemd >> configure: Char device locks: /var/lock >> configure: >> configure: Privileges >> configure: >> configure: QEMU: root:root >> configure: >> + make -j5 EXAMPLE_DIR=/usr/doc/libvirt-1.0.5/examples >> HTML_DIR=/usr/doc/libvirt-1.0.5 >> make all-recursive >> make[1]: Entering directory `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5' >> Making all in gnulib/lib >> make[2]: Entering directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/gnulib/lib' >> GEN alloca.h >> GEN c++defs.h >> GEN warn-on-use.h >> GEN arg-nonnull.h >> GEN configmake.h >> GEN unused-parameter.h >> GEN sys/types.h >> GEN sys/wait.h >> GEN sys/uio.h >> GEN termios.h >> GEN time.h >> GEN unistd.h >> GEN wchar.h >> GEN wctype.h >> GEN arpa/inet.h >> GEN fcntl.h >> GEN langinfo.h >> GEN locale.h >> GEN netdb.h >> GEN poll.h >> GEN pty.h >> GEN signal.h >> GEN stdio.h >> GEN stdlib.h >> GEN string.h >> GEN strings.h >> GEN sys/ioctl.h >> GEN sys/select.h >> GEN sys/socket.h >> GEN sys/stat.h >> GEN sys/utsname.h >> GEN sys/time.h >> make all-am >> make[3]: Entering directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/gnulib/lib' >> CC allocator.lo >> CC areadlink.lo >> CC base64.lo >> CC binary-io.lo >> CC bitrotate.lo >> CC c-ctype.lo >> CC c-strcasecmp.lo >> CC c-strncasecmp.lo >> CC c-strcasestr.lo >> CC careadlinkat.lo >> CC cloexec.lo >> CC count-one-bits.lo >> CC md5.lo >> CC sha256.lo >> CC dirname-lgpl.lo >> CC basename-lgpl.lo >> CC stripslash.lo >> CC fd-hook.lo >> CC freading.lo >> CC localcharset.lo >> CC lock.lo >> CC malloca.lo >> CC nonblocking.lo >> CC passfd.lo >> CC physmem.lo >> CC pipe2.lo >> CC sig-handler.lo >> CC sockets.lo >> CC stat-time.lo >> CC strnlen1.lo >> CC sys_socket.lo >> CC tempname.lo >> CC threadlib.lo >> CC unistd.lo >> CC wctype-h.lo >> CC xsize.lo >> CC asnprintf.lo >> CC fclose.lo >> CC fcntl.lo >> CC fflush.lo >> CC fpurge.lo >> CC fseek.lo >> CC fseeko.lo >> CC ioctl.lo >> CC mktime.lo >> CC printf-args.lo >> CC printf-parse.lo >> CC regex.lo >> CC secure_getenv.lo >> CC strerror_r.lo >> CC vasnprintf.lo >> GEN charset.alias >> GEN ref-add.sed >> GEN ref-del.sed >> CCLD libgnu.la >> make[3]: Leaving directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/gnulib/lib' >> make[2]: Leaving directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/gnulib/lib' >> Making all in include >> make[2]: Entering directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/include' >> Making all in libvirt >> make[3]: Entering directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/include/libvirt' >> make[3]: Nothing to be done for `all'. >> make[3]: Leaving directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/include/libvirt' >> make[3]: Entering directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/include' >> make[3]: Nothing to be done for `all-am'. >> make[3]: Leaving directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/include' >> make[2]: Leaving directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/include' >> Making all in src >> make[2]: Entering directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/src' >> GEN libvirt.syms >> GEN libvirt_qemu.def >> GEN libvirt_lxc.def >> GEN locking/qemu-lockd.conf >> GEN virtlockd.service >> GEN virtlockd.socket >> GEN libvirt.def >> make all-am >> make[3]: Entering directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/src' >> CC libvirt_util_la-viralloc.lo >> CC libvirt_util_la-virarch.lo >> CC libvirt_util_la-viratomic.lo >> CC libvirt_util_la-viraudit.lo >> CC libvirt_util_la-virauth.lo >> CC libvirt_util_la-virauthconfig.lo >> CC libvirt_util_la-virbitmap.lo >> CC libvirt_util_la-virbuffer.lo >> CC libvirt_util_la-vircgroup.lo >> CC libvirt_util_la-vircommand.lo >> CC libvirt_util_la-virconf.lo >> CC libvirt_util_la-virdbus.lo >> CC libvirt_util_la-virdnsmasq.lo >> CC libvirt_util_la-virebtables.lo >> CC libvirt_util_la-virerror.lo >> CC libvirt_util_la-virevent.lo >> CC libvirt_util_la-vireventpoll.lo >> CC libvirt_util_la-virfile.lo >> CC libvirt_util_la-virhash.lo >> CC libvirt_util_la-virhashcode.lo >> CC libvirt_util_la-virhook.lo >> CC libvirt_util_la-viridentity.lo >> CC libvirt_util_la-virinitctl.lo >> CC libvirt_util_la-viriptables.lo >> CC libvirt_util_la-virjson.lo >> CC libvirt_util_la-virkeycode.lo >> CC libvirt_util_la-virlockspace.lo >> CC libvirt_util_la-virkeyfile.lo >> CC libvirt_util_la-virlog.lo >> CC libvirt_util_la-virmacaddr.lo >> CC libvirt_util_la-virnetdev.lo >> CC libvirt_util_la-virnetdevbandwidth.lo >> CC libvirt_util_la-virnetdevbridge.lo >> CC libvirt_util_la-virnetdevmacvlan.lo >> CC libvirt_util_la-virnetdevopenvswitch.lo >> CC libvirt_util_la-virnetdevtap.lo >> CC libvirt_util_la-virnetdevveth.lo >> CC libvirt_util_la-virnetdevvlan.lo >> CC libvirt_util_la-virnetdevvportprofile.lo >> CC libvirt_util_la-virnetlink.lo >> CC libvirt_util_la-virnodesuspend.lo >> CC libvirt_util_la-virnuma.lo >> CC libvirt_util_la-virobject.lo >> CC libvirt_util_la-virpci.lo >> CC libvirt_util_la-virpidfile.lo >> CC libvirt_util_la-virportallocator.lo >> CC libvirt_util_la-virprocess.lo >> CC libvirt_util_la-virrandom.lo >> CC libvirt_util_la-virsexpr.lo >> CC libvirt_util_la-virsocketaddr.lo >> CC libvirt_util_la-virstatslinux.lo >> CC libvirt_util_la-virstoragefile.lo >> CC libvirt_util_la-virstring.lo >> CC libvirt_util_la-virthread.lo >> CC libvirt_util_la-virsysinfo.lo >> CC libvirt_util_la-virthreadpool.lo >> CC libvirt_util_la-virtime.lo >> CC libvirt_util_la-virtpm.lo >> CC libvirt_util_la-virtypedparam.lo >> CC libvirt_util_la-virusb.lo >> CC libvirt_util_la-viruri.lo >> CC libvirt_util_la-virutil.lo >> CC libvirt_util_la-viruuid.lo >> CC libvirt_util_la-virxml.lo >> CC libvirt_conf_la-netdev_bandwidth_conf.lo >> CC libvirt_conf_la-netdev_vport_profile_conf.lo >> CC libvirt_conf_la-netdev_vlan_conf.lo >> CC libvirt_conf_la-capabilities.lo >> CC libvirt_conf_la-domain_conf.lo >> CC libvirt_conf_la-domain_audit.lo >> CC libvirt_conf_la-domain_nwfilter.lo >> CC libvirt_conf_la-snapshot_conf.lo >> CC libvirt_conf_la-domain_event.lo >> CC libvirt_conf_la-network_conf.lo >> CC libvirt_conf_la-nwfilter_params.lo >> CC libvirt_conf_la-nwfilter_ipaddrmap.lo >> CC libvirt_conf_la-nwfilter_conf.lo >> CC libvirt_conf_la-node_device_conf.lo >> CC libvirt_conf_la-storage_conf.lo >> CC libvirt_conf_la-storage_encryption_conf.lo >> CC libvirt_conf_la-interface_conf.lo >> CC libvirt_conf_la-secret_conf.lo >> CC libvirt_conf_la-cpu_conf.lo >> CC libvirt_conf_la-virchrdev.lo >> CC libvirt_conf_la-device_conf.lo >> CC libvirt_cpu_la-cpu.lo >> CC libvirt_cpu_la-cpu_generic.lo >> CC libvirt_cpu_la-cpu_x86.lo >> CC libvirt_cpu_la-cpu_s390.lo >> CC libvirt_cpu_la-cpu_arm.lo >> CC libvirt_cpu_la-cpu_map.lo >> CC libvirt_cpu_la-cpu_powerpc.lo >> CC libvirt_vmx_la-vmx.lo >> CC libvirt_driver_la-driver.lo >> CC libvirt_driver_la-datatypes.lo >> CC libvirt_driver_la-fdstream.lo >> CC libvirt_driver_la-nodeinfo.lo >> CC libvirt_driver_la-libvirt.lo >> CC libvirt_driver_la-lock_manager.lo >> CC libvirt_driver_la-lock_driver_nop.lo >> CC libvirt_driver_la-domain_lock.lo >> CC libvirt_driver_test_la-test_driver.lo >> CC libvirt_driver_remote_la-remote_driver.lo >> CC libvirt_driver_remote_la-remote_protocol.lo >> ./remote/remote_protocol.c: In function 'xdr_remote_vcpu_info': >> ./remote/remote_protocol.c:257:10: warning: implicit declaration of >> function 'xdr_u_int64_t' [-Wimplicit-function-declaration] >> ./remote/remote_protocol.c:257:10: warning: nested extern declaration of >> 'xdr_u_int64_t' [-Wnested-externs] >> ./remote/remote_protocol.c: In function >> 'xdr_remote_node_get_cells_free_memory_ret': >> ./remote/remote_protocol.c:623:48: error: 'xdr_u_int64_t' undeclared >> (first use in this function) >> ./remote/remote_protocol.c:623:48: note: each undeclared identifier is >> reported only once for each function it appears in >> make[3]: *** [libvirt_driver_remote_la-remote_protocol.lo] Error 1 >> make[3]: *** Waiting for unfinished jobs.... >> make[3]: Leaving directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/src' >> make[2]: *** [all] Error 2 >> make[2]: Leaving directory >> `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5/src' >> make[1]: *** [all-recursive] Error 1 >> make[1]: Leaving directory `/tmp/0-marmite/libvirt/sources/libvirt-1.0.5' >> make: *** [all] Erreur 2 >> --- >> >> Thanks! >> >> >> appzer0 >> >> -- >> libvir-list mailing list >> libvir-list(a)redhat.com >> https://www.redhat.com/mailman/listinfo/libvir-list

1 0

[libvirt] [PATCH] docs: fix 'since' for socket path generation
by Ján Tomko 03 May '13

03 May '13

Commit 297c99a says it works from 1.0.5 but it only got pushed after the 1.0.5 release. --- Pushed under the trivial rule. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8d4edfb..3570bbc 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3999,7 +3999,7 @@ qemu-kvm -net nic,model=? /dev/null then libvirt can interact with a guest agent installed in the guest, for actions such as guest shutdown or file system quiescing. Since 0.7.7, guest agent interaction - since 0.9.10 Moreover, since 1.0.5 + since 0.9.10 Moreover, since 1.0.6 it is possible to have source path auto generated for virtio unix channels. This is very useful in case of a qemu guest agent, where users don't usually care about the source path since it's libvirt who talks to -- 1.8.1.5

1 0

[libvirt] [PATCH] build: fix mingw build of vbox
by Eric Blake 03 May '13

03 May '13

More fallout from commit 7c9a2d88 dropping too many headers. Fixes: In file included from ../../src/vbox/vbox_glue.c:26:0: ../../src/vbox/vbox_MSCOMGlue.c: In function 'vboxLookupVersionInRegistry': ../../src/vbox/vbox_MSCOMGlue.c:435:5: error: implicit declaration of function 'virParseVersionString' [-Werror=implicit-function-declaration] ... ../../src/vbox/vbox_driver.c: In function 'vboxConnectOpen': ../../src/vbox/vbox_driver.c:147:5: error: implicit declaration of function 'getuid' [-Werror=implicit-function-declaration] ../../src/vbox/vbox_driver.c:147:5: error: nested extern declaration of 'getuid' [-Werror=nested-externs] * src/vbox/vbox_MSCOMGlue.c (includes): Add missing includes. * src/vbox/vbox_driver.c (includes): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. 1.0.5 is immune. src/vbox/vbox_MSCOMGlue.c | 3 +++ src/vbox/vbox_driver.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index 6cebfaf..706f1ba 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -2,6 +2,7 @@ /* * vbox_MSCOMGlue.c: glue to the MSCOM based VirtualBox API * + * Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2010-2011 Matthias Bolte <matthias.bolte(a)googlemail.com> * * This library is free software; you can redistribute it and/or @@ -33,6 +34,8 @@ #include "viralloc.h" #include "virlog.h" #include "virerror.h" +#include "virstring.h" +#include "virutil.h" #include "vbox_MSCOMGlue.h" #define VIR_FROM_THIS VIR_FROM_VBOX diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 30721fd..5dfaf1c 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2008-2009 Sun Microsystems, Inc. * * This file is part of a free software library; you can redistribute @@ -38,6 +38,7 @@ #include "vbox_driver.h" #include "vbox_glue.h" #include "virerror.h" +#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_VBOX -- 1.8.1.4

2 3

[libvirt] [PATCH] util: Prevent libvirtd crash from virPCIDeviceAddressIsEqual()
by Alex Jia 03 May '13

03 May '13

GDB backtrace: Breakpoint 1, virPCIGetVirtualFunctionIndex (pf_sysfs_device_link=0x7fc04400f470 "/sys/bus/pci/devices/0000:03:00.1", vf_sysfs_device_link=<optimized out>, vf_index=vf_index@entry=0x7fc06897b8f4) at util/virpci.c:2107 2107 if (virPCIDeviceAddressIsEqual(vf_bdf, virt_fns[i])) { (gdb) p *vf_bdf $1 = {domain = 0, bus = 3, slot = 16, function = 1} (gdb) l 2102 "virtual_functions"), pf_sysfs_device_link); 2103 goto out; 2104 } 2105 2106 for (i = 0; i < num_virt_fns; i++) { 2107 if (virPCIDeviceAddressIsEqual(vf_bdf, virt_fns[i])) { 2108 *vf_index = i; 2109 ret = 0; 2110 break; 2111 } (gdb) p num_virt_fns $46 = 2 (gdb) p virt_fns[0] $48 = (virPCIDeviceAddressPtr) 0x0 (gdb) s virPCIDeviceAddressIsEqual (bdf2=0x0, bdf1=0x7fc04400f330) at util/virpci.c:1844 1844 (bdf1->slot == bdf2->slot) && (gdb) s Program received signal SIGSEGV, Segmentation fault. RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=957416 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/util/virpci.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 97bba74..dda044c 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1897,7 +1897,8 @@ static bool virPCIDeviceAddressIsEqual(virPCIDeviceAddressPtr bdf1, virPCIDeviceAddressPtr bdf2) { - return ((bdf1->domain == bdf2->domain) && + return (bdf1 && bdf2 && + (bdf1->domain == bdf2->domain) && (bdf1->bus == bdf2->bus) && (bdf1->slot == bdf2->slot) && (bdf1->function == bdf2->function)); -- 1.7.1

2 4

[libvirt] [PATCH] esx: Reduce code duplication in generator
by Matthias Bolte 03 May '13

03 May '13

--- src/esx/esx_vi_generator.py | 430 ++++++++++++------------------------------- 1 file changed, 118 insertions(+), 312 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 7130624..547eef6 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -440,8 +440,7 @@ class Type: return string - -class Object(Type): +class GenericObject(Type): FEATURE__DYNAMIC_CAST = (1 << 1) FEATURE__LIST = (1 << 2) FEATURE__DEEP_COPY = (1 << 3) @@ -450,16 +449,36 @@ class Object(Type): FEATURE__DESERIALIZE = (1 << 6) - def __init__(self, name, extends, properties, features=0, extended_by=None): + def __init__(self, name, category, managed, generic_objects_by_name): Type.__init__(self, "struct", name) - self.extends = extends - self.features = features - self.properties = properties - self.extended_by = extended_by - self.candidate_for_dynamic_cast = False + self.category = category + self.managed = managed + self.generic_objects_by_name = generic_objects_by_name + + + def generate_comment(self): + comment = separator + comment += " * %s: %s\n" % (self.category, self.name) + + if self.extends is not None: + comment += " * %s extends %s\n" \ + % (' ' * len(self.category), self.extends) + + first = True if self.extended_by is not None: - self.extended_by.sort() + for extended_by in self.extended_by: + if first: + comment += " * %s extended by %s\n" \ + % (' ' * len(self.category), extended_by) + first = False + else: + comment += " * %s %s\n" \ + % (' ' * len(self.category), extended_by) + + comment += " */\n\n" + + return comment def generate_struct_members(self, add_banner=False, struct_gap=False): @@ -469,7 +488,7 @@ class Object(Type): members += "\n" if self.extends is not None: - members += objects_by_name[self.extends] \ + members += self.generic_objects_by_name[self.extends] \ .generate_struct_members(add_banner=True, struct_gap=False) + "\n" @@ -499,7 +518,7 @@ class Object(Type): % (suffix, extended_by) for extended_by in self.extended_by: - source += objects_by_name[extended_by] \ + source += self.generic_objects_by_name[extended_by] \ .generate_dispatch(suffix, False) return source @@ -509,7 +528,7 @@ class Object(Type): source = "" if self.extends is not None: - source += objects_by_name[self.extends] \ + source += self.generic_objects_by_name[self.extends] \ .generate_free_code(add_banner=True) + "\n" if self.extends is not None or add_banner: @@ -535,7 +554,7 @@ class Object(Type): source = "" if self.extends is not None: - source += objects_by_name[self.extends] \ + source += self.generic_objects_by_name[self.extends] \ .generate_validate_code(add_banner=True) + "\n" if self.extends is not None or add_banner: @@ -547,7 +566,7 @@ class Object(Type): string = "" for property in self.properties: - string += property.generate_validate_code() + string += property.generate_validate_code(self.managed) if len(string) < 1: source += " /* no required properties */\n" @@ -557,6 +576,20 @@ class Object(Type): return source + +class Object(GenericObject): + def __init__(self, name, extends, properties, features=0, extended_by=None): + GenericObject.__init__(self, name, 'VI Object', False, objects_by_name) + self.extends = extends + self.features = features + self.properties = properties + self.extended_by = extended_by + self.candidate_for_dynamic_cast = False + + if self.extended_by is not None: + self.extended_by.sort() + + def generate_dynamic_cast_code(self, is_first=True): source = "" @@ -642,23 +675,7 @@ class Object(Type): def generate_header(self): - header = separator - header += " * VI Object: %s\n" % self.name - - if self.extends is not None: - header += " * extends %s\n" % self.extends - - first = True - - if self.extended_by is not None: - for extended_by in self.extended_by: - if first: - header += " * extended by %s\n" % extended_by - first = False - else: - header += " * %s\n" % extended_by - - header += " */\n\n" + header = self.generate_comment() # struct header += "struct _esxVI_%s {\n" % self.name @@ -762,57 +779,37 @@ class Object(Type): source += "ESX_VI__TEMPLATE__ALLOC(%s)\n\n" % self.name # free + source += "/* esxVI_%s_Free */\n" % self.name + if self.extended_by is None: - source += "/* esxVI_%s_Free */\n" % self.name source += "ESX_VI__TEMPLATE__FREE(%s,\n" % self.name - source += "{\n" - - if self.features & Object.FEATURE__LIST: - if self.extends is not None: - # avoid "dereferencing type-punned pointer will break - # strict-aliasing rules" warnings - source += " esxVI_%s *next = (esxVI_%s *)item->_next;\n\n" \ - % (self.extends, self.extends) - source += " esxVI_%s_Free(&next);\n" % self.extends - source += " item->_next = (esxVI_%s *)next;\n\n" % self.name - else: - source += " esxVI_%s_Free(&item->_next);\n\n" % self.name - - source += self.generate_free_code() - - source += "})\n\n" else: - source += "/* esxVI_%s_Free */\n" % self.name source += "ESX_VI__TEMPLATE__DYNAMIC_FREE(%s,\n" % self.name source += "{\n" - source += self.generate_dispatch('FREE') - source += "},\n" - source += "{\n" - if self.features & Object.FEATURE__LIST: - if self.extends is not None: - # avoid "dereferencing type-punned pointer will break - # strict-aliasing rules" warnings - source += " esxVI_%s *next = (esxVI_%s *)item->_next;\n\n" \ - % (self.extends, self.extends) - source += " esxVI_%s_Free(&next);\n" % self.extends - source += " item->_next = (esxVI_%s *)next;\n\n" % self.name - else: - source += " esxVI_%s_Free(&item->_next);\n\n" % self.name + source += "{\n" - source += self.generate_free_code() + if self.features & Object.FEATURE__LIST: + if self.extends is not None: + # avoid "dereferencing type-punned pointer will break + # strict-aliasing rules" warnings + source += " esxVI_%s *next = (esxVI_%s *)item->_next;\n\n" \ + % (self.extends, self.extends) + source += " esxVI_%s_Free(&next);\n" % self.extends + source += " item->_next = (esxVI_%s *)next;\n\n" % self.name + else: + source += " esxVI_%s_Free(&item->_next);\n\n" % self.name - source += "})\n\n" + source += self.generate_free_code() + source += "})\n\n" # validate source += "/* esxVI_%s_Validate */\n" % self.name source += "ESX_VI__TEMPLATE__VALIDATE(%s,\n" % self.name source += "{\n" - source += self.generate_validate_code() - source += "})\n\n" # dynamic cast @@ -821,9 +818,7 @@ class Object(Type): source += "/* esxVI_%s_DynamicCast */\n" % self.name source += "ESX_VI__TEMPLATE__DYNAMIC_CAST(%s,\n" % self.name source += "{\n" - source += self.generate_dynamic_cast_code() - source += "})\n\n" else: report_error("cannot add dynamic cast support for an untyped object") @@ -834,39 +829,25 @@ class Object(Type): source += "ESX_VI__TEMPLATE__LIST__APPEND(%s)\n\n" % self.name # deep copy - if self.extended_by is None: - if self.features & Object.FEATURE__DEEP_COPY: - source += "/* esxVI_%s_DeepCopy */\n" % self.name - source += "ESX_VI__TEMPLATE__DEEP_COPY(%s,\n" % self.name - source += "{\n" - - source += self.generate_deep_copy_code() - - source += "})\n\n" + if self.features & Object.FEATURE__DEEP_COPY: + source += "/* esxVI_%s_DeepCopy */\n" % self.name - if self.features & Object.FEATURE__LIST: - source += "/* esxVI_%s_DeepCopyList */\n" % self.name - source += "ESX_VI__TEMPLATE__LIST__DEEP_COPY(%s)\n\n" \ - % self.name - else: - if self.features & Object.FEATURE__DEEP_COPY: - source += "/* esxVI_%s_DeepCopy */\n" % self.name + if self.extended_by is None: + source += "ESX_VI__TEMPLATE__DEEP_COPY(%s,\n" % self.name + else: source += "ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(%s,\n" % self.name source += "{\n" - source += self.generate_dispatch('DEEP_COPY') - source += "},\n" - source += "{\n" - - source += self.generate_deep_copy_code() - source += "})\n\n" + source += "{\n" + source += self.generate_deep_copy_code() + source += "})\n\n" - if self.features & Object.FEATURE__LIST: - source += "/* esxVI_%s_DeepCopyList */\n" % self.name - source += "ESX_VI__TEMPLATE__LIST__DEEP_COPY(%s)\n\n" \ - % self.name + if self.features & Object.FEATURE__LIST: + source += "/* esxVI_%s_DeepCopyList */\n" % self.name + source += "ESX_VI__TEMPLATE__LIST__DEEP_COPY(%s)\n\n" \ + % self.name # cast from any type if self.features & Object.FEATURE__ANY_TYPE: @@ -879,9 +860,7 @@ class Object(Type): source += "ESX_VI__TEMPLATE__DYNAMIC_CAST_FROM_ANY_TYPE(%s,\n" \ % self.name source += "{\n" - source += self.generate_dispatch('CAST_FROM_ANY_TYPE') - source += "})\n\n" if self.features & Object.FEATURE__LIST: @@ -890,75 +869,47 @@ class Object(Type): % self.name # serialize - if self.extended_by is None: - if self.features & Object.FEATURE__SERIALIZE: - source += "/* esxVI_%s_Serialize */\n" % self.name - source += "ESX_VI__TEMPLATE__SERIALIZE(%s,\n" % self.name - source += "{\n" - - source += self.generate_serialize_code() - - source += "})\n\n" + if self.features & Object.FEATURE__SERIALIZE: + source += "/* esxVI_%s_Serialize */\n" % self.name - if self.features & Object.FEATURE__LIST: - source += "/* esxVI_%s_SerializeList */\n" % self.name - source += "ESX_VI__TEMPLATE__LIST__SERIALIZE(%s)\n\n" \ - % self.name - else: - if self.features & Object.FEATURE__SERIALIZE: - source += "/* esxVI_%s_Serialize */\n" % self.name + if self.extended_by is None: + source += "ESX_VI__TEMPLATE__SERIALIZE(%s,\n" % self.name + else: source += "ESX_VI__TEMPLATE__DYNAMIC_SERIALIZE(%s,\n" % self.name source += "{\n" - source += self.generate_dispatch('SERIALIZE') - source += "},\n" - source += "{\n" - - source += self.generate_serialize_code() - source += "})\n\n" + source += "{\n" + source += self.generate_serialize_code() + source += "})\n\n" - if self.features & Object.FEATURE__LIST: - source += "/* esxVI_%s_SerializeList */\n" % self.name - source += "ESX_VI__TEMPLATE__LIST__SERIALIZE(%s)\n\n" \ - % self.name + if self.features & Object.FEATURE__LIST: + source += "/* esxVI_%s_SerializeList */\n" % self.name + source += "ESX_VI__TEMPLATE__LIST__SERIALIZE(%s)\n\n" \ + % self.name # deserialize - if self.extended_by is None: - if self.features & Object.FEATURE__DESERIALIZE: - source += "/* esxVI_%s_Deserialize */\n" % self.name - source += "ESX_VI__TEMPLATE__DESERIALIZE(%s,\n" % self.name - source += "{\n" - - source += self.generate_deserialize_code() - - source += "})\n\n" + if self.features & Object.FEATURE__DESERIALIZE: + source += "/* esxVI_%s_Deserialize */\n" % self.name - if self.features & Object.FEATURE__LIST: - source += "/* esxVI_%s_DeserializeList */\n" % self.name - source += "ESX_VI__TEMPLATE__LIST__DESERIALIZE(%s)\n\n" \ - % self.name - else: - if self.features & Object.FEATURE__DESERIALIZE: - source += "/* esxVI_%s_Deserialize */\n" % self.name + if self.extended_by is None: + source += "ESX_VI__TEMPLATE__DESERIALIZE(%s,\n" % self.name + else: source += "ESX_VI__TEMPLATE__DYNAMIC_DESERIALIZE(%s,\n" \ % self.name source += "{\n" - source += self.generate_dispatch('DESERIALIZE') - source += "},\n" - source += "{\n" - - source += self.generate_deserialize_code() - source += "})\n\n" + source += "{\n" + source += self.generate_deserialize_code() + source += "})\n\n" - if self.features & Object.FEATURE__LIST: - source += "/* esxVI_%s_DeserializeList */\n" % self.name - source += "ESX_VI__TEMPLATE__LIST__DESERIALIZE(%s)\n\n" \ - % self.name + if self.features & Object.FEATURE__LIST: + source += "/* esxVI_%s_DeserializeList */\n" % self.name + source += "ESX_VI__TEMPLATE__LIST__DESERIALIZE(%s)\n\n" \ + % self.name source += "\n\n" @@ -966,12 +917,10 @@ class Object(Type): -class ManagedObject(Type): - FEATURE__LIST = (1 << 2) - - +class ManagedObject(GenericObject): def __init__(self, name, extends, properties, features=0, extended_by=None): - Type.__init__(self, "struct", name) + GenericObject.__init__(self, name, 'VI Managed Object', True, + managed_objects_by_name) self.extends = extends self.features = features self.properties = properties @@ -981,100 +930,6 @@ class ManagedObject(Type): self.extended_by.sort() - def generate_struct_members(self, add_banner=False, struct_gap=False): - members = "" - - if struct_gap: - members += "\n" - - if self.extends is not None: - members += managed_objects_by_name[self.extends] \ - .generate_struct_members(add_banner=True) + "\n" - - if self.extends is not None or add_banner: - members += " /* %s */\n" % self.name - - for property in self.properties: - members += property.generate_struct_member() - - if len(self.properties) < 1: - members += " /* no properties */\n" - - return members - - - def generate_dispatch(self, suffix, is_first=True): - source = "" - - if self.extended_by is not None: - if not is_first: - source += "\n" - - source += " /* %s */\n" % self.name - - for extended_by in self.extended_by: - source += " ESX_VI__TEMPLATE__DISPATCH__%s(%s)\n" \ - % (suffix, extended_by) - - for extended_by in self.extended_by: - source += managed_objects_by_name[extended_by] \ - .generate_dispatch(suffix, False) - - return source - - - def generate_free_code(self, add_banner=False): - source = "" - - if self.extends is not None: - source += managed_objects_by_name[self.extends] \ - .generate_free_code(add_banner=True) + "\n" - - if self.extends is not None or add_banner: - source += " /* %s */\n" % self.name - - if len(self.properties) < 1: - source += " /* no properties */\n" - else: - string = "" - - for property in self.properties: - string += property.generate_free_code() - - if len(string) < 1: - source += " /* no properties to be freed */\n" - else: - source += string - - return source - - - def generate_validate_code(self, add_banner=False): - source = "" - - if self.extends is not None: - source += managed_objects_by_name[self.extends] \ - .generate_validate_code(add_banner=True) + "\n" - - if self.extends is not None or add_banner: - source += " /* %s */\n" % self.name - - if len(self.properties) < 1: - source += " /* no properties */\n" - else: - string = "" - - for property in self.properties: - string += property.generate_validate_code(managed=True) - - if len(string) < 1: - source += " /* no required properties */\n" - else: - source += string - - return source - - def generate_lookup_code1(self, add_banner=False): source = "" @@ -1127,30 +982,6 @@ class ManagedObject(Type): return source - def generate_comment(self): - comment = separator - comment += " * VI Managed Object: %s\n" % self.name - - if self.extends is not None: - comment += " * extends %s\n" % self.extends - - first = True - - if self.extended_by is not None: - for extended_by in self.extended_by: - if first: - comment += " * extended by %s\n" \ - % extended_by - first = False - else: - comment += " * %s\n" \ - % extended_by - - comment += " */\n\n" - - return comment - - def generate_header(self): header = self.generate_comment() @@ -1169,7 +1000,6 @@ class ManagedObject(Type): "/* required */\n") header += "\n" header += self.generate_struct_members() - header += "};\n\n" # functions @@ -1213,53 +1043,32 @@ class ManagedObject(Type): source += "ESX_VI__TEMPLATE__ALLOC(%s)\n\n" % self.name # free + source += "/* esxVI_%s_Free */\n" % self.name + if self.extended_by is None: - source += "/* esxVI_%s_Free */\n" % self.name source += "ESX_VI__TEMPLATE__FREE(%s,\n" % self.name - source += "{\n" - - if self.features & ManagedObject.FEATURE__LIST: - if self.extends is not None: - # avoid "dereferencing type-punned pointer will break - # strict-aliasing rules" warnings - source += " esxVI_%s *next = (esxVI_%s *)item->_next;\n\n" \ - % (self.extends, self.extends) - source += " esxVI_%s_Free(&next);\n" % self.extends - source += " item->_next = (esxVI_%s *)next;\n\n" % self.name - else: - source += " esxVI_%s_Free(&item->_next);\n" % self.name - - source += " esxVI_ManagedObjectReference_Free(&item->_reference);\n\n" - - source += self.generate_free_code() - - source += "})\n\n" else: - source += "/* esxVI_%s_Free */\n" % self.name source += "ESX_VI__TEMPLATE__DYNAMIC_FREE(%s,\n" % self.name source += "{\n" - source += self.generate_dispatch('FREE') - source += "},\n" - source += "{\n" - - if self.features & ManagedObject.FEATURE__LIST: - if self.extends is not None: - # avoid "dereferencing type-punned pointer will break - # strict-aliasing rules" warnings - source += " esxVI_%s *next = (esxVI_%s *)item->_next;\n\n" \ - % (self.extends, self.extends) - source += " esxVI_%s_Free(&next);\n" % self.extends - source += " item->_next = (esxVI_%s *)next;\n\n" % self.name - else: - source += " esxVI_%s_Free(&item->_next);\n" % self.name - source += " esxVI_ManagedObjectReference_Free(&item->_reference);\n\n" + source += "{\n" - source += self.generate_free_code() + if self.features & ManagedObject.FEATURE__LIST: + if self.extends is not None: + # avoid "dereferencing type-punned pointer will break + # strict-aliasing rules" warnings + source += " esxVI_%s *next = (esxVI_%s *)item->_next;\n\n" \ + % (self.extends, self.extends) + source += " esxVI_%s_Free(&next);\n" % self.extends + source += " item->_next = (esxVI_%s *)next;\n\n" % self.name + else: + source += " esxVI_%s_Free(&item->_next);\n" % self.name - source += "})\n\n" + source += " esxVI_ManagedObjectReference_Free(&item->_reference);\n\n" + source += self.generate_free_code() + source += "})\n\n" # validate source += "/* esxVI_%s_Validate */\n" % self.name @@ -1319,8 +1128,6 @@ class Enum(Type): header = separator header += " * VI Enum: %s\n" % self.name header += " */\n\n" - - # enum header += "enum _esxVI_%s {\n" % self.name header += " esxVI_%s_Undefined = 0,\n" % self.name @@ -1354,7 +1161,6 @@ class Enum(Type): source = separator source += " * VI Enum: %s\n" % self.name source += " */\n\n" - source += "static const esxVI_Enumeration _esxVI_%s_Enumeration = {\n" \ % self.name source += " esxVI_Type_%s, {\n" % self.name -- 1.7.9.5

2 5

[libvirt] [PATCH] build: Fix build when WITH_HAL is defined
by Jim Fehlig 03 May '13

03 May '13

Commit 7c9a2d88 missed inclusion of virstring.h in a few places when WITH_HAL is defined, causing build failures. --- Pushing under build-breaker rule. src/node_device/node_device_driver.c | 1 + src/node_device/node_device_hal.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 95df2e5..05dc49c 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -33,6 +33,7 @@ #include "datatypes.h" #include "viralloc.h" #include "virlog.h" +#include "virstring.h" #include "node_device_conf.h" #include "node_device_hal.h" #include "node_device_driver.h" diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 63245a9..8c77cc3 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -39,6 +39,7 @@ #include "virlog.h" #include "node_device_driver.h" #include "virdbus.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV -- 1.8.0.1

1 0

[libvirt] [PATCH] build: fix mingw build of virprocess.c
by Eric Blake 02 May '13

02 May '13

Commit 776d49f4 added a static function that is only called conditionally; leading to this compile error on mingw: CC libvirt_util_la-virprocess.lo ../../src/util/virprocess.c:624:26: error: 'struct rlimit' declared inside parameter list [-Werror] ../../src/util/virprocess.c:624:26: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] ../../src/util/virprocess.c:622:1: error: 'virProcessPrLimit' defined but not used [-Werror=unused-function] * src/util/virprocess.c (virProcessPrLimit): Only declare virProcessPrLimit when used. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. (Hmm, this one existed pre-release, which means 1.0.5 doesn't compile on mingw. Oh well). src/util/virprocess.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 73f5123..ac93c4a 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -617,7 +617,7 @@ virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim) { return prlimit(pid, resource, rlim, NULL); } -#else /* ! HAVE_PRLIMIT */ +#elif HAVE_SETRLIMIT static int virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED, int resource ATTRIBUTE_UNUSED, @@ -626,7 +626,7 @@ virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED, errno = ENOSYS; return -1; } -#endif /* ! HAVE_PRLIMIT */ +#endif #if HAVE_SETRLIMIT && defined(RLIMIT_MEMLOCK) int -- 1.8.1.4

1 0

[libvirt] [PATCH] build: fix FreeBSD build
by Eric Blake 02 May '13

02 May '13

Commit 7c9a2d88 cleaned up too many headers; FreeBSD builds failed due to: util/virutil.c:556: warning: implicit declaration of function 'canonicalize_file_name' (Not sure which Linux header leaked this declaration, but gnulib only guarantees it in stdlib.h) libvirt.c:956: warning: implicit declaration of function 'virGetUserConfigDirectory' (Here, a build on Linux was picking up virutil.h indirectly via one of the conditional driver headers, where that driver was not being built on my FreeBSD setup) * src/util/virutil.c (includes): Need <stdlib.h> for canonicalize_file_name. * src/libvirt.c (includes): Use "virutil.h" unconditionally, rather than relying on conditional indirect inclusion. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/libvirt.c | 1 + src/util/virutil.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index 15b37a3..467f6dd 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -63,6 +63,7 @@ #include "viruri.h" #include "virthread.h" #include "virstring.h" +#include "virutil.h" #ifdef WITH_TEST # include "test/test_driver.h" diff --git a/src/util/virutil.c b/src/util/virutil.c index dc14c15..982d4a3 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -29,6 +29,7 @@ #include <dirent.h> #include <stdio.h> #include <stdarg.h> +#include <stdlib.h> #include <unistd.h> #include <fcntl.h> #include <errno.h> -- 1.8.1.4

1 0

[libvirt] [PATCH] build: avoid useless virAsprintf
by Eric Blake 02 May '13

02 May '13

virAsprintf(&foo, "%s", bar) is wasteful compared to foo = strdup(bar) (or eventually, VIR_STRDUP(foo, bar), but one thing at a time...). Noticed while reviewing Laine's attempt to clean up broken qemu:///session. * cfg.mk (sc_prohibit_asprintf): Enhance rule. * src/esx/esx_storage_backend_vmfs.c (esxStorageBackendVMFSVolumeLookupByKey): Fix offender. * src/network/bridge_driver.c (networkStateInitialize): Likewise. * src/nwfilter/nwfilter_dhcpsnoop.c (virNWFilterSnoopDHCPOpen): Likewise. * src/storage/storage_backend_sheepdog.c (virStorageBackendSheepdogRefreshVol): Likewise. * src/util/vircgroup.c (virCgroupAddTaskStrController): Likewise. * src/util/virdnsmasq.c (addnhostsAdd): Likewise. * src/xen/block_stats.c (xenLinuxDomainDeviceID): Likewise. * src/xen/xen_driver.c (xenUnifiedConnectOpen): Likewise. * tools/virsh.c (vshGetTypedParamValue): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- cfg.mk | 4 ++++ src/esx/esx_storage_backend_vmfs.c | 5 ++--- src/network/bridge_driver.c | 9 +++------ src/nwfilter/nwfilter_dhcpsnoop.c | 4 ++-- src/storage/storage_backend_sheepdog.c | 3 ++- src/util/vircgroup.c | 2 +- src/util/virdnsmasq.c | 7 ++++--- src/xen/block_stats.c | 8 ++++---- src/xen/xen_driver.c | 2 +- tools/virsh.c | 2 +- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cfg.mk b/cfg.mk index d499ded..1d63bbd 100644 --- a/cfg.mk +++ b/cfg.mk @@ -378,10 +378,14 @@ sc_prohibit_strtol: $(_sc_search_regexp) # Use virAsprintf rather than as'printf since *strp is undefined on error. +# But for plain %s, virAsprintf is overkill compared to strdup. sc_prohibit_asprintf: @prohibit='\<v?a[s]printf\>' \ halt='use virAsprintf, not as'printf \ $(_sc_search_regexp) + @prohibit='virAsprintf.*, *"%s",' \ + halt='use strdup instead of virAsprintf with "%s"' \ + $(_sc_search_regexp) # Prefer virSetUIDGID. sc_prohibit_setuid: diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index dea6716..5d6f183 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -3,7 +3,7 @@ * esx_storage_backend_vmfs.c: ESX storage driver backend for * managing VMFS datastores * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2011, 2013 Red Hat, Inc. * Copyright (C) 2010-2012 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2012 Ata E Husain Bohra <ata.husain(a)hotmail.com> * @@ -791,8 +791,7 @@ esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key) VIR_FREE(datastorePath); if (length < 1) { - if (virAsprintf(&volumeName, "%s", - fileInfo->path) < 0) { + if (!(volumeName = strdup(fileInfo->path))) { virReportOOMError(); goto cleanup; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 35202f1..3ddea18 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -393,12 +393,9 @@ networkStateInitialize(bool privileged, } VIR_FREE(userdir); - userdir = virGetUserConfigDirectory(); - if (virAsprintf(&base, "%s", userdir) == -1) { - VIR_FREE(userdir); - goto out_of_memory; - } - VIR_FREE(userdir); + base = virGetUserConfigDirectory(); + if (!base) + goto error; } /* Configuration paths are either ~/.libvirt/qemu/... (session) or diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index df11e89..50042df 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -2,7 +2,7 @@ * nwfilter_dhcpsnoop.c: support for DHCP snooping used by a VM * on an interface * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012-2013 Red Hat, Inc. * Copyright (C) 2011,2012 IBM Corp. * * Authors: @@ -1110,7 +1110,7 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac, * generate much more traffic than if we filtered by VM and * braodcast MAC as well */ - if (virAsprintf(&ext_filter, "%s", filter) < 0) { + if (!(ext_filter = strdup(filter))) { virReportOOMError(); return NULL; } diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index a9ee7d3..2e62e6d 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -1,6 +1,7 @@ /* * storage_backend_sheepdog.c: storage backend for Sheepdog handling * + * Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2012 Wido den Hollander * Copyright (C) 2012 Frank Spijkerman * Copyright (C) 2012 Sebastian Wiedenroth @@ -268,7 +269,7 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, } VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s", vol->name) == -1) { + if (!(vol->target.path = strdup(vol->name))) { virReportOOMError(); goto cleanup; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index b05fc45..473d2fc 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1027,7 +1027,7 @@ static int virCgroupAddTaskStrController(virCgroupPtr group, int rc = 0; char *endp; - if (virAsprintf(&str, "%s", pidstr) < 0) + if (!(str = strdup(pidstr))) return -1; cur = str; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 4f05633..36f31d2 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -1,7 +1,7 @@ /* * virdnsmasq.c: Helper APIs for managing dnsmasq * - * Copyright (C) 2007-2012 Red Hat, Inc. + * Copyright (C) 2007-2013 Red Hat, Inc. * Copyright (C) 2010 Satoru SATOH <satoru.satoh(a)gmail.com> * * This library is free software; you can redistribute it and/or @@ -118,7 +118,7 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, if (VIR_ALLOC(addnhostsfile->hosts[idx].hostnames) < 0) goto alloc_error; - if (virAsprintf(&addnhostsfile->hosts[idx].ip, "%s", ipstr) < 0) + if (!(addnhostsfile->hosts[idx].ip = strdup(ipstr))) goto alloc_error; addnhostsfile->hosts[idx].nhostnames = 0; @@ -128,7 +128,8 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, if (VIR_REALLOC_N(addnhostsfile->hosts[idx].hostnames, addnhostsfile->hosts[idx].nhostnames + 1) < 0) goto alloc_error; - if (virAsprintf(&addnhostsfile->hosts[idx].hostnames[addnhostsfile->hosts[idx].nhostnames], "%s", name) < 0) + if (!(addnhostsfile->hosts[idx].hostnames[addnhostsfile->hosts[idx].nhostnames] + = strdup(name))) goto alloc_error; VIR_FREE(ipstr); diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c index 8c18ed5..ded8d7f 100644 --- a/src/xen/block_stats.c +++ b/src/xen/block_stats.c @@ -1,7 +1,7 @@ /* * Linux block and network stats. * - * Copyright (C) 2007-2009 Red Hat, Inc. + * Copyright (C) 2007-2009, 2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -293,11 +293,11 @@ xenLinuxDomainDeviceID(int domid, const char *path) */ if (strlen(path) >= 5 && STRPREFIX(path, "/dev/")) - retval = virAsprintf(&mod_path, "%s", path); + mod_path = strdup(path); else - retval = virAsprintf(&mod_path, "/dev/%s", path); + ignore_value(virAsprintf(&mod_path, "/dev/%s", path)); - if (retval < 0) { + if (!mod_path) { virReportOOMError(); return -1; } diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 938205e..6ad050c 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -443,7 +443,7 @@ xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int f } #endif - if (virAsprintf(&priv->saveDir, "%s", XEN_SAVE_DIR) == -1) { + if (!(priv->saveDir = strdup(XEN_SAVE_DIR))) { virReportOOMError(); goto fail; } diff --git a/tools/virsh.c b/tools/virsh.c index 22bcec2..7ef0bda 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2181,7 +2181,7 @@ vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) break; case VIR_TYPED_PARAM_BOOLEAN: - ret = virAsprintf(&str, "%s", item->value.b ? _("yes") : _("no")); + str = vshStrdup(ctl, item->value.b ? _("yes") : _("no")); break; case VIR_TYPED_PARAM_STRING: -- 1.8.1.4

2 2

[libvirt] libvirt quietly dies (on keep-alive error handling?)
by Igor Lukyanov 02 May '13

02 May '13

Hi all, we detected a floating bug of 1.0.2 version. Libvirtd mysteriously and quietly dies (without core dumps or entries in dmesg/syslog) with the following log messages. If you have any ideas of what it might be and how to deal with it - please give a hint. Many thanks. Here is the tail of libvirtd.log: 2013-04-30 11:47:46.020+000053093: info : qemuDomainUndefineFlags:5784 : Undefining domain 'vm010-002-048-002' 2013-04-30 11:47:46.195+000053087: debug : qemuDomObjFromDomainDriver:213 : Domain not found: no domain with matching uuid '52ab57f1-e198-9bd7-6ef8-74b9d34e7b03' 2013-05-01 21:00:30.997+000053085: warning : qemuDomainObjTaint:1376 : Domain id=170 name='vm010-002-060-007' uuid=41acb52e-96c0-0fe6-4d63-39d6560bc882 is tainted: custom-monitor 2013-05-02 18:37:10.430+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x88d200 after 5 keepalive messages in 30 seconds 2013-05-02 18:37:14.251+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x8858e0 after 5 keepalive messages in 31 seconds 2013-05-02 18:37:14.251+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x88e940 after 5 keepalive messages in 32 seconds 2013-05-02 18:37:14.251+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x897410 after 5 keepalive messages in 32 seconds 2013-05-02 18:37:14.251+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x8901c0 after 5 keepalive messages in 32 seconds 2013-05-02 18:37:14.251+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x894c50 after 5 keepalive messages in 33 seconds 2013-05-02 18:37:14.251+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x884ef0 after 5 keepalive messages in 32 seconds 2013-05-02 18:37:14.251+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x87df20 after 5 keepalive messages in 31 seconds 2013-05-02 18:37:14.251+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x8832e0 after 5 keepalive messages in 32 seconds 2013-05-02 18:37:14.251+000053084: warning : virKeepAliveTimerInternal:141 : No response from client 0x87dc40 after 5 keepalive messages in 32 seconds 2013-05-02 18:37:14.251+000053084: error : virFDStreamRemoveCallback:83 : internal error stream is not open 2013-05-02 18:37:14.681+000053091: error : virFDStreamRemoveCallback:83 : internal error stream is not open ====== end of log ===== 2013-05-02 18:47:28.464+0000: 97308: info : libvirt version: 1.0.2 -- wbr, Igor Lukyanov

2 1

[libvirt] [PATCH] network: fix network driver startup for qemu:///session
by Laine Stump 02 May '13

02 May '13

This should resolve https://bugzilla.redhat.com/show_bug.cgi?id=958907 Recent new addition of code to read/write active network state to the NETWORK_STATE_DIR in the network driver broke startup for qemu:///session. The network driver had several state file paths hardcoded to /var, which could never possibly work in session mode. This patch modifies *all* state files to use a variable string that is set differently according to whether or not we're running privileged. There are very definitely other problems preventing dnsmasq and radvd from running in non-privileged mode, but it's more consistent to have the directories used by them be determined in the same fashion. --- src/network/bridge_driver.c | 155 ++++++++++++++++++++++++++++---------------- 1 file changed, 100 insertions(+), 55 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 35202f1..fb00645 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1,4 +1,3 @@ - /* * bridge_driver.c: core driver methods for managing network * @@ -67,11 +66,11 @@ #include "virfile.h" #include "virstring.h" -#define NETWORK_PID_DIR LOCALSTATEDIR "/run/libvirt/network" -#define NETWORK_STATE_DIR LOCALSTATEDIR "/lib/libvirt/network" +#define NETWORK_PID_DIR "/run/libvirt/network" +#define NETWORK_STATE_DIR "/lib/libvirt/network" -#define DNSMASQ_STATE_DIR LOCALSTATEDIR "/lib/libvirt/dnsmasq" -#define RADVD_STATE_DIR LOCALSTATEDIR "/lib/libvirt/radvd" +#define DNSMASQ_STATE_DIR "/lib/libvirt/dnsmasq" +#define RADVD_STATE_DIR "/lib/libvirt/radvd" #define VIR_FROM_THIS VIR_FROM_NETWORK @@ -84,6 +83,10 @@ struct network_driver { iptablesContext *iptables; char *networkConfigDir; char *networkAutostartDir; + char *stateDir; + char *pidDir; + char *dnsmasqStateDir; + char *radvdStateDir; char *logDir; dnsmasqCapsPtr dnsmasqCaps; }; @@ -133,8 +136,8 @@ networkDnsmasqLeaseFileNameDefault(const char *netname) { char *leasefile; - ignore_value(virAsprintf(&leasefile, DNSMASQ_STATE_DIR "/%s.leases", - netname)); + ignore_value(virAsprintf(&leasefile, "%s/%s.leases", + driverState->dnsmasqStateDir, netname)); return leasefile; } @@ -146,8 +149,8 @@ networkDnsmasqConfigFileName(const char *netname) { char *conffile; - ignore_value(virAsprintf(&conffile, DNSMASQ_STATE_DIR "/%s.conf", - netname)); + ignore_value(virAsprintf(&conffile, "%s/%s.conf", + driverState->dnsmasqStateDir, netname)); return conffile; } @@ -166,8 +169,8 @@ networkRadvdConfigFileName(const char *netname) { char *configfile; - ignore_value(virAsprintf(&configfile, RADVD_STATE_DIR "/%s-radvd.conf", - netname)); + ignore_value(virAsprintf(&configfile, "%s/%s-radvd.conf", + driverState->radvdStateDir, netname)); return configfile; } @@ -187,8 +190,10 @@ networkRemoveInactive(struct network_driver *driver, int ret = -1; /* remove the (possibly) existing dnsmasq and radvd files */ - if (!(dctx = dnsmasqContextNew(def->name, DNSMASQ_STATE_DIR))) + if (!(dctx = dnsmasqContextNew(def->name, + driverState->dnsmasqStateDir))) { goto cleanup; + } if (!(leasefile = networkDnsmasqLeaseFileName(def->name))) goto cleanup; @@ -202,7 +207,8 @@ networkRemoveInactive(struct network_driver *driver, if (!(configfile = networkDnsmasqConfigFileName(def->name))) goto no_memory; - if (!(statusfile = virNetworkConfigFile(NETWORK_STATE_DIR, def->name))) + if (!(statusfile + = virNetworkConfigFile(driverState->stateDir, def->name))) goto no_memory; /* dnsmasq */ @@ -212,7 +218,7 @@ networkRemoveInactive(struct network_driver *driver, /* radvd */ unlink(radvdconfigfile); - virPidFileDelete(NETWORK_PID_DIR, radvdpidbase); + virPidFileDelete(driverState->pidDir, radvdpidbase); /* remove status file */ unlink(statusfile); @@ -279,7 +285,7 @@ networkFindActiveConfigs(struct network_driver *driver) if (obj->def->ips && (obj->def->nips > 0)) { char *radvdpidbase; - ignore_value(virPidFileReadIfAlive(NETWORK_PID_DIR, obj->def->name, + ignore_value(virPidFileReadIfAlive(driverState->pidDir, obj->def->name, &obj->dnsmasqPid, dnsmasqCapsGetBinaryPath(driver->dnsmasqCaps))); @@ -287,7 +293,7 @@ networkFindActiveConfigs(struct network_driver *driver) virReportOOMError(); goto cleanup; } - ignore_value(virPidFileReadIfAlive(NETWORK_PID_DIR, radvdpidbase, + ignore_value(virPidFileReadIfAlive(driverState->pidDir, radvdpidbase, &obj->radvdPid, RADVD)); VIR_FREE(radvdpidbase); } @@ -374,27 +380,59 @@ networkStateInitialize(bool privileged, networkDriverLock(driverState); if (privileged) { - if (virAsprintf(&driverState->logDir, - "%s/log/libvirt/qemu", LOCALSTATEDIR) == -1) - goto out_of_memory; - - if ((base = strdup(SYSCONFDIR "/libvirt")) == NULL) + if (((base = strdup(SYSCONFDIR "/libvirt")) == NULL) || + ((driverState->logDir + = strdup(LOCALSTATEDIR "/log/libvirt/qemu")) == NULL) || + ((driverState->stateDir + = strdup(LOCALSTATEDIR NETWORK_STATE_DIR)) == NULL) || + ((driverState->pidDir + = strdup(LOCALSTATEDIR NETWORK_PID_DIR)) == NULL) || + ((driverState->dnsmasqStateDir + = strdup(LOCALSTATEDIR DNSMASQ_STATE_DIR)) == NULL) || + ((driverState->radvdStateDir + = strdup(LOCALSTATEDIR RADVD_STATE_DIR)) == NULL)) { goto out_of_memory; + } } else { char *userdir = virGetUserCacheDirectory(); if (!userdir) goto error; + userdir = virGetUserConfigDirectory(); + if (virAsprintf(&base, "%s", userdir) < 0) { + VIR_FREE(userdir); + goto out_of_memory; + } + VIR_FREE(userdir); + if (virAsprintf(&driverState->logDir, - "%s/qemu/log", userdir) == -1) { + "%s/qemu/log", userdir) < 0) { VIR_FREE(userdir); goto out_of_memory; } VIR_FREE(userdir); - userdir = virGetUserConfigDirectory(); - if (virAsprintf(&base, "%s", userdir) == -1) { + if (!(userdir = virGetUserRuntimeDirectory())) + goto error; + + if (virAsprintf(&driverState->stateDir, + "%s" NETWORK_STATE_DIR, userdir) < 0) { + VIR_FREE(userdir); + goto out_of_memory; + } + if (virAsprintf(&driverState->pidDir, + "%s" NETWORK_PID_DIR, userdir) < 0) { + VIR_FREE(userdir); + goto out_of_memory; + } + if (virAsprintf(&driverState->dnsmasqStateDir, + "%s" DNSMASQ_STATE_DIR, userdir) < 0) { + VIR_FREE(userdir); + goto out_of_memory; + } + if (virAsprintf(&driverState->radvdStateDir, + "%s" RADVD_STATE_DIR, userdir) < 0) { VIR_FREE(userdir); goto out_of_memory; } @@ -404,12 +442,12 @@ networkStateInitialize(bool privileged, /* Configuration paths are either ~/.libvirt/qemu/... (session) or * /etc/libvirt/qemu/... (system). */ - if (virAsprintf(&driverState->networkConfigDir, "%s/qemu/networks", base) == -1) - goto out_of_memory; - - if (virAsprintf(&driverState->networkAutostartDir, "%s/qemu/networks/autostart", - base) == -1) + if ((virAsprintf(&driverState->networkConfigDir, + "%s/qemu/networks", base) < 0) || + (virAsprintf(&driverState->networkAutostartDir, + "%s/qemu/networks/autostart", base) < 0)) { goto out_of_memory; + } VIR_FREE(base); @@ -421,7 +459,7 @@ networkStateInitialize(bool privileged, driverState->dnsmasqCaps = dnsmasqCapsNewFromBinary(DNSMASQ); if (virNetworkLoadAllState(&driverState->networks, - NETWORK_STATE_DIR) < 0) + driverState->stateDir) < 0) goto error; if (virNetworkLoadAllConfigs(&driverState->networks, @@ -489,7 +527,7 @@ networkStateReload(void) { networkDriverLock(driverState); virNetworkLoadAllState(&driverState->networks, - NETWORK_STATE_DIR); + driverState->stateDir); virNetworkLoadAllConfigs(&driverState->networks, driverState->networkConfigDir, driverState->networkAutostartDir); @@ -1060,32 +1098,33 @@ networkStartDhcpDaemon(struct network_driver *driver, goto cleanup; } - if (virFileMakePath(NETWORK_PID_DIR) < 0) { + if (virFileMakePath(driverState->pidDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - NETWORK_PID_DIR); + driverState->pidDir); goto cleanup; } - if (virFileMakePath(NETWORK_STATE_DIR) < 0) { + if (virFileMakePath(driverState->stateDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - NETWORK_STATE_DIR); + driverState->stateDir); goto cleanup; } - if (!(pidfile = virPidFileBuildPath(NETWORK_PID_DIR, network->def->name))) { + if (!(pidfile = virPidFileBuildPath(driverState->pidDir, + network->def->name))) { virReportOOMError(); goto cleanup; } - if (virFileMakePath(DNSMASQ_STATE_DIR) < 0) { + if (virFileMakePath(driverState->dnsmasqStateDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - DNSMASQ_STATE_DIR); + driverState->dnsmasqStateDir); goto cleanup; } - dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR); + dctx = dnsmasqContextNew(network->def->name, driverState->dnsmasqStateDir); if (dctx == NULL) goto cleanup; @@ -1113,7 +1152,7 @@ networkStartDhcpDaemon(struct network_driver *driver, * pid */ - ret = virPidFileRead(NETWORK_PID_DIR, network->def->name, + ret = virPidFileRead(driverState->pidDir, network->def->name, &network->dnsmasqPid); if (ret < 0) goto cleanup; @@ -1150,8 +1189,10 @@ networkRefreshDhcpDaemon(struct network_driver *driver, return networkStartDhcpDaemon(driver, network); VIR_INFO("Refreshing dnsmasq for network %s", network->def->bridge); - if (!(dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR))) + if (!(dctx = dnsmasqContextNew(network->def->name, + driverState->dnsmasqStateDir))) { goto cleanup; + } /* Look for first IPv4 address that has dhcp defined. * We only support dhcp-host config on one IPv4 subnetwork @@ -1375,16 +1416,16 @@ networkStartRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, goto cleanup; } - if (virFileMakePath(NETWORK_PID_DIR) < 0) { + if (virFileMakePath(driverState->pidDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - NETWORK_PID_DIR); + driverState->pidDir); goto cleanup; } - if (virFileMakePath(RADVD_STATE_DIR) < 0) { + if (virFileMakePath(driverState->radvdStateDir) < 0) { virReportSystemError(errno, _("cannot create directory %s"), - RADVD_STATE_DIR); + driverState->radvdStateDir); goto cleanup; } @@ -1393,7 +1434,7 @@ networkStartRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, virReportOOMError(); goto cleanup; } - if (!(pidfile = virPidFileBuildPath(NETWORK_PID_DIR, radvdpidbase))) { + if (!(pidfile = virPidFileBuildPath(driverState->pidDir, radvdpidbase))) { virReportOOMError(); goto cleanup; } @@ -1421,7 +1462,7 @@ networkStartRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, if (virCommandRun(cmd, NULL) < 0) goto cleanup; - if (virPidFileRead(NETWORK_PID_DIR, radvdpidbase, &network->radvdPid) < 0) + if (virPidFileRead(driverState->pidDir, radvdpidbase, &network->radvdPid) < 0) goto cleanup; ret = 0; @@ -1448,7 +1489,7 @@ networkRefreshRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, network->def->name) >= 0) && ((radvdpidbase = networkRadvdPidfileBasename(network->def->name)) != NULL)) { - virPidFileDelete(NETWORK_PID_DIR, radvdpidbase); + virPidFileDelete(driverState->pidDir, radvdpidbase); VIR_FREE(radvdpidbase); } network->radvdPid = -1; @@ -1488,7 +1529,7 @@ networkRestartRadvd(struct network_driver *driver, network->def->name) >= 0) && ((radvdpidbase = networkRadvdPidfileBasename(network->def->name)) != NULL)) { - virPidFileDelete(NETWORK_PID_DIR, radvdpidbase); + virPidFileDelete(driverState->pidDir, radvdpidbase); VIR_FREE(radvdpidbase); } network->radvdPid = -1; @@ -2572,7 +2613,7 @@ static int networkShutdownNetworkVirtual(struct network_driver *driver, if (!(radvdpidbase = networkRadvdPidfileBasename(network->def->name))) { virReportOOMError(); } else { - virPidFileDelete(NETWORK_PID_DIR, radvdpidbase); + virPidFileDelete(driverState->pidDir, radvdpidbase); VIR_FREE(radvdpidbase); } } @@ -2673,7 +2714,8 @@ networkStartNetwork(struct network_driver *driver, /* Persist the live configuration now that anything autogenerated * is setup. */ - if ((ret = virNetworkSaveStatus(NETWORK_STATE_DIR, network)) < 0) { + if ((ret = virNetworkSaveStatus(driverState->stateDir, + network)) < 0) { goto error; } @@ -2703,7 +2745,8 @@ static int networkShutdownNetwork(struct network_driver *driver, if (!virNetworkObjIsActive(network)) return 0; - stateFile = virNetworkConfigFile(NETWORK_STATE_DIR, network->def->name); + stateFile = virNetworkConfigFile(driverState->stateDir, + network->def->name); if (!stateFile) return -1; @@ -3368,8 +3411,10 @@ networkUpdate(virNetworkPtr net, } /* save current network state to disk */ - if ((ret = virNetworkSaveStatus(NETWORK_STATE_DIR, network)) < 0) + if ((ret = virNetworkSaveStatus(driverState->stateDir, + network)) < 0) { goto cleanup; + } } ret = 0; cleanup: @@ -4702,7 +4747,7 @@ networkPlugBandwidth(virNetworkObjPtr net, /* update sum of 'floor'-s of attached NICs */ net->floor_sum += ifaceBand->in->floor; /* update status file */ - if (virNetworkSaveStatus(NETWORK_STATE_DIR, net) < 0) { + if (virNetworkSaveStatus(driverState->stateDir, net) < 0) { ignore_value(virBitmapClearBit(net->class_id, class_id)); net->floor_sum -= ifaceBand->in->floor; iface->data.network.actual->class_id = 0; @@ -4748,7 +4793,7 @@ networkUnplugBandwidth(virNetworkObjPtr net, ignore_value(virBitmapClearBit(net->class_id, iface->data.network.actual->class_id)); /* update status file */ - if (virNetworkSaveStatus(NETWORK_STATE_DIR, net) < 0) { + if (virNetworkSaveStatus(driverState->stateDir, net) < 0) { net->floor_sum += ifaceBand->in->floor; ignore_value(virBitmapSetBit(net->class_id, iface->data.network.actual->class_id)); -- 1.7.11.7

3 3

[libvirt] [PATCH v2 0/2] qemu: support new HyperV-related features
by Ján Tomko 02 May '13

02 May '13

1/2 prevents memory leaks and hair loss in qemuParseCommandLineCPU 2/2 adds support for the new cpu flags v1: https://www.redhat.com/archives/libvir-list/2013-May/msg00173.html v2: uses virStringSplit instead of strsep added a missing break to virDomainDefParseXML Ján Tomko (2): qemu: simplify CPU command line parsing qemu: add hv_vapic and hv_spinlocks support docs/formatdomain.html.in | 17 ++- docs/schemas/domaincommon.rng | 12 ++ src/conf/domain_conf.c | 40 +++++- src/conf/domain_conf.h | 3 + src/qemu/qemu_command.c | 168 +++++++++++++----------- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 + 7 files changed, 164 insertions(+), 80 deletions(-) -- 1.8.1.5

1 2

[libvirt] Release of libvirt-1.0.5
by Daniel Veillard 02 May '13

02 May '13

I forgot to make the rc2 release on tuesday, but looking at the git state it was looking like the problem reported on rc1 had been fixed, so I decided to go ahead and roll the release as scheduled today. It is tagged in git and the tarball is available as usual at: ftp://libvirt.org/libvirt/ along with rpms. This release contains an homogenous set of features, bug fixes and improvements with some refactoring done in various places. It also includes more localization updates now coming from the Fedora localization project, with around 6 languages fully localized and 3 more over the 70% threshold: Features: - Add NVRAM device (Li Zhang) - Add XML config for resource partitions (Daniel P. Berrange) - Add support for TPM (Stefan Berger) - NPIV storage migration support (Osier Yang) Documentation: - Fix closing tag in snapshot documentation (Christophe Fergeau) - Fix typo in augeas comment (Martin Kletzander) - Fix VIR_DOMAIN_EVENT_ID_PMSUSPEND capitalization in API doc (Christophe Fergeau) - Improve /domainsnapshot/disks/disk@snapshot doc (Christophe Fergeau) - fix memballoon examples (Ján Tomko) - Clarify usage of SELinux baselabel (Peter Krempa) - fix usage of 'onto' (Eric Blake) - Update HACKING (Osier Yang) - conf: fix comment about parsing graphics listen address (Ján Tomko) - lib: Fix docs about return value of virDomainGetVcpusFlags() (Peter Krempa) - virsh: Document that using incomplete XML files may have unexpected results (Peter Krempa) - fix typo when using Kerberos principals (Eric Blake) - use MiB/s instead of Mbps for migration speed (Ján Tomko) - Add the missed <pre> tag (Osier Yang) - virsh: Fix typo in docs (Peter Krempa) - manual: Fix copy-paste errors (Martin Kletzander) - manual: Add info about migrateuri in virsh manual (Martin Kletzander) Portability: - virInitctlRequest: Don't hardcode 384 bytes size (Guido Günther) - S390: Do not generate a default USB controller (Viktor Mihajlovski) - S390: Mention changed USB behavior (Viktor Mihajlovski) - build: fix cygwin build in virnetdev (Eric Blake) - portability: handle ifreq differences in virnetdev (Roman Bogorodskiy) - qemu: fix build error with older platforms (Eric Blake) - Fix compilation error in util/vircgroup.c (Stefan Berger) - Conditionally compile storagevolxml2argvtest (Daniel P. Berrange) - Fix signature of dummy virNetlinkCommand stub (Daniel P. Berrange) - Add empty stub for virThreadCancel on Win32 (Daniel P. Berrange) - Don't enable -fPIE on Win32 platforms (Daniel P. Berrange) - spec: Require pod2man when running autoreconf (Jiri Denemark) - Avoid cast alignment warnings in port allocator test (Daniel P. Berrange) Bug Fixes: - pci: autolearn name of stub driver, remove from arglist (Laine Stump) - ESX: Fix DISPATCH_FREE generation code to free all extended objects (Ata E Husain Bohra) - qemu: fix failure to start with spice graphics and no tls (Laine Stump) - Need to call virFreeError after virSaveLastError (John Ferlan) - libvirt-guests: status: return non-zero when stopped (Ján Tomko) - security driver: eliminate memory leaks in failure paths (Laine Stump) - libxl: Fix double-dispose of libxl domain config (Jim Fehlig) - virsh: fix incorrect argument errors for long options (Ján Tomko) - network: Don't remove transient network if creating of config file fails (Peter Krempa) - qemu: prevent invalid reads in qemuAssignDevicePCISlots (Ján Tomko) - qemu: don't assign a PCI address to 'none' USB controller (Ján Tomko) - fix segfault during virsh save in pv guest (Bamvor Jian Zhang) - conf: reject controllers with duplicate indexes (Ján Tomko) - fix typo introduced by 90430791 (Bamvor Jian Zhang) - Fix usb master startport parsing (Martin Kletzander) - qemu_conf: Don't discard strdup OOM error (Michal Privoznik) - util: Error out if the numa nodeset is out of range (Osier Yang) - selinux: Don't mask errors of virSecuritySELinuxGenNewContext (Peter Krempa) - qemu: Fix the wrong expression (Osier Yang) - audit: properly encode device path in cgroup audit (Eric Blake) - network: bridge_driver: don't lose transient networks on daemon restart (Peter Krempa) - qemu: fix default spice password setting (Ján Tomko) - Fix build breaker with ATTRIBUTE_NONNULL defs (John Ferlan) - Resolve valgrind error (John Ferlan) - Do more complete initialization of libgcrypt (Daniel P. Berrange) - qemu: Set correct migrate host in client_migrate_info (Michal Privoznik) - qemu: fix crash in qemuOpen (Ján Tomko) - conf: fix error for parallel port mismatch (Ján Tomko) - conf: fix a memory leak when parsing nat port XML nodes (Guannan Ren) - conf: Fix race between looking up a domain object and freeing it (Peter Krempa) - Fix crash in virNetDevGetVirtualFunctions (Laine Stump) - schemas: Move PortNumber and sourceinfoadapter to basictypes.rng (Han Cheng) - virsh: Unregister the connection close notifier upon termination (Viktor Mihajlovski) - libvirt: Increase connection reference count for callbacks (Viktor Mihajlovski) - storage: Fix volume cloning for logical volume. (Atsushi Kumagai) - security_manager: fix comparison (Guido Günther) - qemu: fix memory leak on -machine usage error (Eric Blake) - qemu-blockjob: Fix limit of bandwidth for block jobs to supported value (Peter Krempa) - sec_manager: Refuse to start domain with unsupported seclabel (Michal Privoznik) - qemu: Fix crash when updating media with shared device (Peter Krempa) - virsh: Call virDomainFree in cmdDomFSTrim (Michal Privoznik) - smartcard: spell ccid-card-emulated qemu property correctly (Eric Blake) - Resolve valgrind failure (John Ferlan) Improvements: - spec: collect all BuildRequires into one area (Eric Blake) - Resolve valgrind error (John Ferlan) - esx: Support virtualHW version 9 (Martin Kletzander) - build: mark conditionally unused variables (Eric Blake) - virsh: clarify vol-{down,up}load description (Ján Tomko) - qemu: report an error if memballoon has wrong address type (Ján Tomko) - qemu: assign addresses when converting xml to native (Ján Tomko) - qemu: Error out if spice port autoallocation is requested, but disabled (Peter Krempa) - qemu: put usb cgroup setup in common function (Laine Stump) - qemu: add vfio devices to cgroup ACL when appropriate (Laine Stump) - qemu: honor allowDiskFormatProbing when parsing command line (Ján Tomko) - conf: add missing error on OOM (Ján Tomko) - qemu: don't always reserve PCI addresses for implicit controllers (Ján Tomko) - conf: remove extraneous _TYPE from driver backend enums (Laine Stump) - network: support <driver name='vfio'/> in network definitions (Laine Stump) - qemu: launch bridge helper from libvirtd (Paolo Bonzini) - virnetdevtap: add virNetDevTapGetName (Paolo Bonzini) - qemu: set qemu process' RLIMIT_MEMLOCK when VFIO is used (Laine Stump) - qemu: use new virCommandSetMax(Processes|Files) (Laine Stump) - util: new virCommandSetMax(MemLock|Processes|Files) (Laine Stump) - Do proper escaping of cgroup resource partitions (Daniel P. Berrange) - Ensure all cgroup partitions have a suffix of ".partition" (Daniel P. Berrange) - Change VM cgroup suffix from '{lxc,qemu}.libvirt' to 'libvirt-{lxc,qemu}' (Daniel P. Berrange) - test: Add JSON test for query-tpm-types (Stefan Berger) - virsh: suppress aliases in group help (Eric Blake) - security: update hostdev labelling functions for VFIO (Laine Stump) - util: new function virPCIDeviceGetVFIOGroupDev (Laine Stump) - virsh: use new virNodeDeviceDetachFlags (Laine Stump) - xen: implement virNodeDeviceDetachFlags backend (Laine Stump) - qemu: implement virNodeDeviceDetachFlags backend (Laine Stump) - hypervisor api: implement RPC calls for virNodeDeviceDetachFlags (Laine Stump) - hypervisor api: new virNodeDeviceDetachFlags (Laine Stump) - qemu: bind/unbind stub driver according to config <driver name='x'/> (Laine Stump) - pci: keep a stubDriver in each virPCIDevice (Laine Stump) - qemu: use vfio-pci on commandline when appropriate (Laine Stump) - conf: formatter/parser/RNG/docs for hostdev <driver name='kvm|vfio'/> (Laine Stump) - conf: put hostdev pci address in a struct (Laine Stump) - qemu: detect vfio-pci device and its bootindex parameter (Laine Stump) - build: avoid unsafe functions in libgen.h (Eric Blake) - qemu: auto-add pci-root to 'pc-i440*' machines too (Ján Tomko) - qemu: auto-add bridges and allow using them (Ján Tomko) - qemu: auto-add pci-root controller for pc machine types (Ján Tomko) - qemu: build command line for pci-bridge device (liguang) - conf: add PCI controllers (Ján Tomko) - qemu: call post-parse callbacks when parsing command line too (Ján Tomko) - qemu: Add command line builder and parser for NVRAM. (Li Zhang) - qemuBuildCommandLine: Don't overwrite errors with NWFilter's one (Michal Privoznik) - Introduce a sub-element <driver> for controller (Osier Yang) - qemu: Don't require a block or file when looking for an alias (Wido den Hollander) - Change the tag name "num_queues" into "queues" (Osier Yang) - qemu: Improve handling of channels when generating SPICE command line (Peter Krempa) - qemu: Do sensible auto allocation of SPICE port numbers (Peter Krempa) - Make driver method names consistent with public APIs (Daniel P. Berrange) - Dedicated name for sub-driver open/close methods (Daniel P. Berrange) - Rename 'DeviceMonitor' to 'NodeDeviceDriver' (Daniel P. Berrange) - Extend previous check to validate driver struct field names (Daniel P. Berrange) - Ensure driver method names match public API names (Daniel P. Berrange) - Make naming of remote procedures match API names exactly (Daniel P. Berrange) - Cleanup command line options in gendispatch.pl (Daniel P. Berrange) - qemu: Split out SPICE port allocation into a separate function (Peter Krempa) - qemu: Use switch instead of ifs in qemuBuildGraphicsCommandLine (Peter Krempa) - qemu: Split out code to generate VNC command line (Peter Krempa) - qemu: Split out code to generate SPICE command line (Peter Krempa) - qemu: Use -machine accel=tcg|kvm when available (Jiri Denemark) - qemu: Move -enable-kvm and friends earlier in the command line (Jiri Denemark) - Switch to a more extensible annotation system for RPC protocols (Daniel P. Berrange) - qemu: Fix setting of memory tunables (Peter Krempa) - logging: Make log regexp more compact (and readable) (Jiri Denemark) - qemu: Ignore libvirt logs when reading QEMU error output (Jiri Denemark) - qemu: Move QEMU log reading into a separate function (Jiri Denemark) - update input ip processing (Gene Czarcinski) - create virSocketAddrGetIpPrefix utility function (Gene Czarcinski) - Replace more cases of /system with /machine (Daniel P. Berrange) - Change default resource partition to /machine (Daniel P. Berrange) - qemu: rename CheckSlot to SlotInUse (Ján Tomko) - qemu: switch PCI address set from hash table to an array (Ján Tomko) - conf: add model attribute to virDomainDefMaybeAddController (Ján Tomko) - qemu: move PCI address check out of qemuPCIAddressAsString (Ján Tomko) - qemu: QEMU_PCI constant consistency (Ján Tomko) - qemu: print PCI address hexadecimally in errors (Ján Tomko) - qemu: make qemuComparePCIDevice aware of multiple buses (Ján Tomko) - conf: Reword error message to be more universal (Peter Krempa) - cpu: Rename PowerPCUpdate and PowerPCDataFree functions (Jiri Denemark) - cpu: Remove hardcoded list of PowerPC models (Jiri Denemark) - cpu: Reimplement PowerPCDecode (Jiri Denemark) - cpu: Reimplement PowerPCBaseline (Jiri Denemark) - cpu: Fix loading PowerPC vendor from cpu_map.xml (Jiri Denemark) - cpu: Fix PowerPCNodeData (Jiri Denemark) - cpu: Make comparing PowerPC CPUs easier to read (Jiri Denemark) - cpu: Introduce cpuModelIsAllowed internal API (Jiri Denemark) - virsh-domain: Refactor cmdVcpucount and fix output on inactive domains (Peter Krempa) - Set legacy USB option with default for ppc64. (Li Zhang) - qemu_conf: add new configuration key bridge_helper (Paolo Bonzini) - util: allow using virCommandAllowCap with setuid helpers (Paolo Bonzini) - util: simplify virSetUIDGIDWithCaps (Paolo Bonzini) - virsh-domain: Report errors on invalid --holdtime value for cmdSendKey (Peter Krempa) - virsh-domain: Clean up cmdSendKey (Peter Krempa) - qemu: simplify use of virArchFromHost (Tal Kain) - rng: tighten up domain <controller> schema (Laine Stump) - network: remove autostart flag from network when undefining it (Peter Krempa) - syntax-check: Only allows to include public headers in external tools (Osier Yang) - syntax-check: Don't include public headers in internal source (Osier Yang) - syntax-check: Don't include duplicate header (Osier Yang) - qemu: Allow the disk wwn to have "0x" prefix (Osier Yang) - cleanup: Don't include libvirt/virterror.h (Osier Yang) - cleanup: Don't include libvirt/libvirt.h (Osier Yang) - cleanup: Remove the duplicate header (Osier Yang) - cleanup: Only include testutils.h once (Osier Yang) - Check for unsupported QMP command (Stefan Berger) - qemu_agent: Add support for appending arrays to commands (Peter Krempa) - Add support for perf_event and net_cls cgroup controllers (Daniel P. Berrange) - Replace LXC cgroup mount code with call to virCgroupIsolateMount (Daniel P. Berrange) - Add an API for re-mounting cgroups, to isolate the process location (Daniel P. Berrange) - Track symlinks for co-mounted cgroup controllers (Daniel P. Berrange) - Remove non-functional code for setting up non-root cgroups (Daniel P. Berrange) - Change default cgroup layout for QEMU/LXC and honour XML config (Daniel P. Berrange) - Add a new virCgroupNewPartition for setting up resource partitions (Daniel P. Berrange) - Cleanup if creating cgroup directories fails (Daniel P. Berrange) - Add misc extra debugging into cgroups code (Daniel P. Berrange) - Refactor cgroups internal data structures (Daniel P. Berrange) - Add a test suite for cgroups functionality (Daniel P. Berrange) - Rename virCgroupForXXX to virCgroupNewXXX (Daniel P. Berrange) - Pull definition of structs out of vircgroup.c to vircgrouppriv.h (Daniel P. Berrange) - Store a virCgroupPtr instance in virLXCDomainObjPrivatePtr (Daniel P. Berrange) - Store a virCgroupPtr instance in qemuDomainObjPrivatePtr (Daniel P. Berrange) - Add missing param to virCgroupForDriver stub (Daniel P. Berrange) - Introduce a virFileDeleteTree method (Daniel P. Berrange) - Conditionalize use of symlink() function in test suite (Daniel P. Berrange) - maint: update to latest gnulib (Eric Blake) - Use unsigned int instead of unsigned (Osier Yang) - qemu: Report also domain name in error message when domain object wasn't found (Peter Krempa) - qemu: Refactor lookup of domain object (Peter Krempa) - cleanup: Change datatype of net->stp to boolean (Osier Yang) - cleanup: Change datatype of usbdev->allow to boolean (Osier Yang) - cleanup: Change datatype of graphic's members to boolean (Osier Yang) - cleanup: Change datatype of accel's members to boolean (Osier Yang) - Add test case for TPM passthrough (Stefan Berger) - TPM support for QEMU command line (Stefan Berger) - QEMU Cgroup support for TPM passthrough (Stefan Berger) - Audit the starting of a guest using TPM passthrough (Stefan Berger) - Add SELinux and DAC labeling support for TPM passthrough (Stefan Berger) - Convert QMP strings into QEMU capability bits (Stefan Berger) - Parse TPM passthrough XML in the domain XML (Stefan Berger) - Helper functions for host TPM support (Stefan Berger) - Add documentation and schema for TPM passthrough (Stefan Berger) - Add function to find a needle in a string array (Stefan Berger) - Add QMP probing for TPM (Stefan Berger) - conf: Allow for non-contiguous device boot orders (Peter Krempa) - Tweak EOF handling of streams (Daniel P. Berrange) - Add USB option capability (Li Zhang) - Add error handling to optional arguments in cmdCPUStats (John Ferlan) - qemu: Do not report unsafe migration for local files (Jiri Denemark) - qemu: Try to use QMP for send-key if supported (Peter Krempa) - virsh: Update list of shutdown/reboot modes (Michal Privoznik) - cleanup: Change datatype of secret->private to boolean (Osier Yang) - cleanup: Change datatype of secret->ephemeral to boolean (Osier Yang) - cleanup: Change datatype of fs->readonly to boolean (Osier Yang) - cleanup: Change datatype of disk->readonly to boolean (Osier Yang) - cleanup: Change datatype of disk->transient to boolean (Osier Yang) - cleanup: Change datatype of disk->shared to boolean (Osier Yang) - cleanup: Change datatype of auth->expires to boolean (Osier Yang) - cleanup: Change datatype of hostdev->missing to boolean (Osier Yang) - Cleanup: Change datatype of origstate's members to boolean (Osier Yang) - Cleanup: Change datatype of hostdev->managed to boolean (Osier Yang) - conf: Change help function (Han Cheng) - qemu: Remove now obsolete assignment of default network card model for s390 hosts (Peter Krempa) - qemu: Clean up network device CLI generator (Peter Krempa) - qemu: Use correct default model on s390 (Viktor Mihajlovski) - sanlock: add missing test command in virt-sanlock-cleanup.in (Alex Jia) - Generate RFC4122 compliant UUIDs (Milos Vyletel) - Unmount existing filesystems under user specified mounts in LXC (Daniel P. Berrange) - Move lxcContainerUnmountSubtree further up in file (Daniel P. Berrange) - Implement support for <hostdev caps=net> (Bogdan Purcareata) - Update structure & XML definitions to support <hostdev caps=net> (Bogdan Purcareata) - Rename virCgroupMounted to virCgroupHasController & make it more robust (Daniel P. Berrange) - qemu: Allow volume type disk for device 'lun' (Osier Yang) - qemu: Support sgio setting for volume type disk (Osier Yang) - qemu: Support shareable volume type disk (Osier Yang) - qemu: Translate the pool disk source earlier (Osier Yang) - Support seclabels for volume type disk (Osier Yang) - Support startupPolicy for 'volume' disk (Osier Yang) - qemu: Translate the pool disk source when building drive string (Osier Yang) - Introduce new XMLs to specify disk source using libvirt storage (Osier Yang) - conf: New helper virDomainDiskSourceDefFormat to format the disk source (Osier Yang) - storage: Guess the parent if it's not specified for vHBA (Osier Yang) - storage: Add startPool and stopPool for scsi backend (Osier Yang) - util: Add helper to get the scsi host name by iterating over sysfs (Osier Yang) - phyp: Prohibit fc_host adapter for phyp driver (Osier Yang) - storage: Move virStorageBackendSCSIGetHostNumber into iscsi backend (Osier Yang) - storage: Make the adapter name be consistent with node device driver (Osier Yang) - New XML attributes for storage pool source adapter (Osier Yang) - Disable cast-align warnings in various places (Daniel P. Berrange) - Copy struct inotify_event entries to avoid alignment problems (Daniel P. Berrange) - Use VIR_ALLOC_VAR instead of VIR_ALLOC_N for creating virObject (Daniel P. Berrange) - Avoid casts between unsigned char * and struct nlmsghdr (Daniel P. Berrange) - Rewrite keycode map to avoid a struct (Daniel P. Berrange) - Add a test suite for keycode mapping functions (Daniel P. Berrange) - qemu: Error out if the bitmap for pinning is all clear (Osier Yang) - util: Add a helper to check if all bits of a bitmap are clear (Osier Yang) - qemu: Support multiple queue virtio-scsi (Osier Yang) - build: check correct protocol.o file (Eric Blake) - build: use proper pod for nested bulleted VIRSH_DEBUG list (Eric Blake) - qemu: Remove maximum cpu limit when setting processor count using the API (Peter Krempa) - Don't create dirs in cgroup controllers we don't want to use (Daniel P. Berrange) - Rename virCgroupGetAppRoot to virCgroupForSelf (Daniel P. Berrange) - Ensure LD_PRELOAD exists before running test case (Daniel P. Berrange) - Refactor RNG schema for resource tuning (Daniel P. Berrange) - rpc: Fix connection close callback race condition and memory corruption/crash (Peter Krempa) - virsh: Register and unregister the close callback also in cmdConnect (Peter Krempa) - virsh: Move cmdConnect from virsh-host.c to virsh.c (Peter Krempa) - virCaps: get rid of defaultConsoleTargetType callback (Peter Krempa) - virCaps: get rid of macPrefix field (Peter Krempa) - virCaps: get rid of hasWideScsiBus (Peter Krempa) - virCaps: get rid of defaultDiskDriverType (Peter Krempa) - virCaps: get rid of emulatorRequired (Peter Krempa) - virCaps: get rid of defaultDiskDriverName (Peter Krempa) - virCaps: get rid of "defaultInitPath" value in the virCaps struct (Peter Krempa) - qemu: Record the default NIC model in the domain XML (Peter Krempa) - conf callback: Rearrange function parameters (Peter Krempa) - conf: Add post XML parse callbacks and prepare for cleaning of virCaps (Peter Krempa) - maint: Rename xmlconf to xmlopt and virDomainXMLConfig to virDomainXMLOption (Peter Krempa) - Create fake NUMA info if libnuma isn't available (Daniel P. Berrange) - Cope with missing /sys/devices/system/cpu/cpu0/topology files (Daniel P. Berrange) - Add armv6l architecture to list of valid arches (Daniel P. Berrange) - Implement minimal sysinfo for ARM platforms (Daniel P. Berrange) - Disable of unused sysinfotest functions (Daniel P. Berrange) - Wire up sysinfo for LXC driver (Daniel P. Berrange) - Add support for SD cards in nodedev driver (Daniel P. Berrange) - Auto-add a root <filesystem> element to LXC containers on startup (Daniel P. Berrange) - Remove support for old kernels lacking private devpts (Daniel P. Berrange) - Enable full RELRO mode (Daniel P. Berrange) - Build all binaries with PIE (Daniel P. Berrange) - rng: Add definition for network disk source (Osier Yang) - Disable static libraries by default (Daniel P. Berrange) - Allow multiple parameters for schedinfo (Martin Kletzander) - virsh-domain: Add --live, --config, --current logic to cmdDetachDisk (Peter Krempa) - virsh-domain: Add --live, --config, --current logic to cmdDetachDevice (Peter Krempa) - virsh-domain: Add --live, --config, --current logic to cmdDetachInterface (Peter Krempa) - virsh: Fix semantics of --config for "update-device" command (Peter Krempa) - virsh-domain: Fix declarations of flag variables in cmdChangeMedia (Peter Krempa) - virsh-domain: Simplify usage of --current, --live and --config flags (Peter Krempa) - virsh-domain-monitor: Refactor cmdDomIfGetLink (Peter Krempa) - Use virMacAddrFormat instead of manual mac address formatting (Peter Krempa) - util: Change virMacAddrFormat to lowercase hex characters (Peter Krempa) - Optimize machine option to set more options with it (Li Zhang) - conf: Enforce ranges on cputune variables (Peter Krempa) - test: Return Libvirt logo as domain screenshot (Michal Privoznik) - qemu: Allow migration over IPv6 (Ján Tomko) - virsh: Add a helper to parse cpulist (Osier Yang) Cleanups: - qemu_command.c: Fix whitespacing within for() (Michal Privoznik) - qemu: Fix the indention (Osier Yang) - Sanitize whitespace in driver.h (Daniel P. Berrange) - sheepdog: Omit braces with a single-line body (Harry Wei) - storage: Fix the indention (Osier Yang) - Remove extraneous comma in info_cpu_stats and opts_cpu_stats (John Ferlan) Thanks to everybody who helped one way or another in producing this release ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

5 7

[libvirt] [PATCH] util: fix compile errors caused by moving string functions
by Laine Stump 02 May '13

02 May '13

commit 7c9a2d8 missed adding in a few #include "virstring.h"s, causing builds to fail. --- Pushed under the build-breaker rule. src/locking/lock_driver_sanlock.c | 1 + src/storage/storage_backend_rbd.c | 1 + src/storage/storage_backend_sheepdog.c | 1 + tests/storagebackendsheepdogtest.c | 1 + 4 files changed, 4 insertions(+) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 48c6d56..4b48868 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -43,6 +43,7 @@ #include "virfile.h" #include "md5.h" #include "virconf.h" +#include "virstring.h" #include "configmake.h" diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index ca23d4b..99024e3 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -30,6 +30,7 @@ #include "virlog.h" #include "base64.h" #include "viruuid.h" +#include "virstring.h" #include "rados/librados.h" #include "rbd/librbd.h" diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index dfa5673..a9ee7d3 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -32,6 +32,7 @@ #include "vircommand.h" #include "viralloc.h" #include "virlog.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_STORAGE diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 8800acb..9b43a6d 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -32,6 +32,7 @@ #include "internal.h" #include "testutils.h" #include "storage/storage_backend_sheepdog.h" +#include "virstring.h" typedef struct { -- 1.7.11.7

1 0

[libvirt] [PATCH 0/2] qemu: support new HyperV-related features
by Ján Tomko 02 May '13

02 May '13

1/2 prevents memory leaks and hair loss in qemuParseCommandLineCPU 2/2 adds support for the new cpu flags https://bugzilla.redhat.com/show_bug.cgi?id=784836 Ján Tomko (2): qemu: use strsep for CPU command line parsing qemu: add hv_vapic and hv_spinlocks support docs/formatdomain.html.in | 17 ++- docs/schemas/domaincommon.rng | 12 ++ src/conf/domain_conf.c | 39 ++++++- src/conf/domain_conf.h | 3 + src/qemu/qemu_command.c | 145 +++++++++++++----------- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 + 7 files changed, 148 insertions(+), 72 deletions(-) -- 1.8.1.5

2 3

[libvirt] [PATCH 0/2] Fix forgetting of transient networks on daemon restart
by Peter Krempa 02 May '13

02 May '13

Peter Krempa (2): network: remove autostart flag from network when undefining it network: bridge_driver: don't lose transient networks on daemon restart src/conf/network_conf.c | 220 +++++++++++++++++++++++++++++--------------- src/conf/network_conf.h | 10 +- src/libvirt_private.syms | 2 +- src/network/bridge_driver.c | 52 +++++++---- 4 files changed, 185 insertions(+), 99 deletions(-) -- 1.8.1.5

3 9

[libvirt] [libvirt-glib] object: Add "transfer none" annotation to argv parameter
by Christophe Fergeau 02 May '13

02 May '13

This makes the parameter to be passed "unowned" in Vala. This was previously done using a vala metadata file, but it's better to do it directly through a gtk-doc annotation, as this means the gir file will know about this, and thus any gir-based binding can make use of this info. This also makes libvirt-gobject consistent with what was done for gconfig and glib in commit 431720. --- libvirt-gobject/libvirt-gobject-main.c | 4 ++-- vapi/LibvirtGObject-1.0.metadata | 2 -- vapi/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 vapi/LibvirtGObject-1.0.metadata diff --git a/libvirt-gobject/libvirt-gobject-main.c b/libvirt-gobject/libvirt-gobject-main.c index 31d2514..11ea24a 100644 --- a/libvirt-gobject/libvirt-gobject-main.c +++ b/libvirt-gobject/libvirt-gobject-main.c @@ -33,7 +33,7 @@ /** * gvir_init_object: * @argc: (inout): pointer to application's argc - * @argv: (inout) (array length=argc) (allow-none): pointer to application's argv + * @argv: (inout) (array length=argc) (allow-none) (transfer none): pointer to application's argv */ void gvir_init_object(int *argc, char ***argv) @@ -58,7 +58,7 @@ static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, /** * gvir_init_object_check: * @argc: (inout): pointer to application's argc - * @argv: (inout) (array length=argc) (allow-none): pointer to application's argv + * @argv: (inout) (array length=argc) (allow-none) (transfer none): pointer to application's argv * @err: pointer to a #GError to which a message will be posted on error */ gboolean gvir_init_object_check(int *argc, diff --git a/vapi/LibvirtGObject-1.0.metadata b/vapi/LibvirtGObject-1.0.metadata deleted file mode 100644 index 90e5197..0000000 --- a/vapi/LibvirtGObject-1.0.metadata +++ /dev/null @@ -1,2 +0,0 @@ -init_object.argv unowned -init_object_check.argv unowned diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 2ecc3e3..0154104 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -44,4 +44,4 @@ CLEANFILES = \ libvirt-gobject-1.0.vapi \ $(NULL) -EXTRA_DIST = LibvirtGObject-1.0.metadata libvirt-gobject-1.0.deps +EXTRA_DIST = libvirt-gobject-1.0.deps -- 1.8.1.4

3 2

[libvirt] [PATCH] Fix potential use of undefined variable in remote dispatch code
by Daniel P. Berrange 02 May '13

02 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If an early dispatch check caused a jump to the 'cleanup' branch then virTypeParamsFree() would be called with an uninitialized 'nparams' variable. Fortunately 'params' is initialized to NULL, so the uninitialized 'nparams' variable would not be used. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/rpc/gendispatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 7b93062..8d3b013 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -495,7 +495,7 @@ elsif ($mode eq "server") { push(@args_list, "args->$1.$1_len"); } elsif ($args_member =~ m/^remote_typed_param (\S+)<(\S+)>;/) { push(@vars_list, "virTypedParameterPtr $1 = NULL"); - push(@vars_list, "int n$1"); + push(@vars_list, "int n$1 = 0;"); if ($call->{ProcName} eq "NodeSetMemoryParameters") { push(@args_list, "priv->conn"); } -- 1.8.2.1

2 1

[libvirt] [PATCH] More paranoid initialization of 'nparams' variable in dispatch code
by Daniel P. Berrange 02 May '13

02 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Since the 'nparams' variable passed to virTypedParametersFree is supposed to represent the size of the 'params' array, it is bad practice to initialize it to a non-zero value, until the array has been allocated. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/remote.c | 78 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index e5e3f2c..c5567f4 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1001,7 +1001,7 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -1011,12 +1011,13 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS goto cleanup; } - if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) goto no_memory; + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -1109,7 +1110,7 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -1119,12 +1120,13 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE goto cleanup; } - if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) goto no_memory; + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -1284,7 +1286,7 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED, virTypedParameterPtr params = NULL; virDomainPtr dom = NULL; const char *path = args->path; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -1299,14 +1301,15 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED, goto cleanup; flags = args->flags; - if (nparams > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (virDomainBlockStatsFlags(dom, path, params, &nparams, flags) < 0) goto cleanup; @@ -1913,7 +1916,7 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -1926,14 +1929,15 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -1977,7 +1981,7 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED, { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -1990,14 +1994,15 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_DOMAIN_NUMA_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_NUMA_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -2041,7 +2046,7 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED, { virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -2054,14 +2059,15 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_DOMAIN_BLKIO_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_BLKIO_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -2106,7 +2112,7 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, virNodeCPUStatsPtr params = NULL; int i; int cpuNum = args->cpuNum; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -2119,14 +2125,15 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_NODE_CPU_STATS_MAX) { + if (args->nparams > REMOTE_NODE_CPU_STATS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (virNodeGetCPUStats(priv->conn, cpuNum, params, &nparams, flags) < 0) goto cleanup; @@ -2184,7 +2191,7 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, virNodeMemoryStatsPtr params = NULL; int i; int cellNum = args->cellNum; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -2197,14 +2204,15 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_NODE_MEMORY_STATS_MAX) { + if (args->nparams > REMOTE_NODE_MEMORY_STATS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (virNodeGetMemoryStats(priv->conn, cellNum, params, &nparams, flags) < 0) goto cleanup; @@ -2303,7 +2311,7 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED, virDomainPtr dom = NULL; int rv = -1; virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -2312,15 +2320,16 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED, goto cleanup; } - if (nparams > REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -3800,7 +3809,7 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS virDomainPtr dom = NULL; virTypedParameterPtr params = NULL; const char *device = args->device; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -3813,14 +3822,15 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS flags = args->flags; - if (nparams > REMOTE_DOMAIN_INTERFACE_PARAMETERS_MAX) { + if (args->nparams > REMOTE_DOMAIN_INTERFACE_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } + nparams = args->nparams; if (!(dom = get_nonnull_domain(priv->conn, args->dom))) goto cleanup; @@ -4508,7 +4518,7 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, remote_node_get_memory_parameters_ret *ret) { virTypedParameterPtr params = NULL; - int nparams = args->nparams; + int nparams = 0; unsigned int flags; int rv = -1; struct daemonClientPrivate *priv = @@ -4521,15 +4531,15 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_NODE_MEMORY_PARAMETERS_MAX) { + if (args->nparams > REMOTE_NODE_MEMORY_PARAMETERS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } - if (nparams && VIR_ALLOC_N(params, nparams) < 0) { + if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) { virReportOOMError(); goto cleanup; } - + nparams = args->nparams; if (virNodeGetMemoryParameters(priv->conn, params, &nparams, flags) < 0) goto cleanup; -- 1.8.2.1

2 1

[libvirt] [RFC] New API to retrieve node CPU map
by Viktor Mihajlovski 02 May '13

02 May '13

Hi, in order to use the APIs listed below it is necessary for a client to know the maximum number of node CPUs which is passed via the maplen argument. virDomainGetEmulatorPinInfo virDomainGetVcpuPinInfo virDomainGetVcpus virDomainPinEmulator virDomainPinVcpu virDomainPinVcpuFlags The current approach uses virNodeGetInfo to determine the maximum CPU number. This can lead to incorrect results if not all node CPUs are online. The maximum CPU number should always be the number of CPUs present on the host, regardless of their online/offline state. The following example illustrates the issue: Host has 3 logical CPUs, 1 socket, 3 cores, 1 thread. Guest has 1 virtual CPU and is started while all 3 host CPUs are online. $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.4s CPU Affinity: yyy $ echo 0 > /sys/devices/system/cpu/cpu1/online $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.5s CPU Affinity: y- The correct display for CPU affinity would have been y-y, as the guest continues to use CPUs 0 and 2. This is not a display problem only, because it is also not possible to explicitly pin the virtual CPU to host CPUs 0 and 2, due to the truncated CPU mask. PROPOSAL: To help solve the issue above I suggest two new public API functions: int virNodeGetCpuNum(virConnectPtr conn); returning the number of present CPUs on the host or -1 upon failure and int virNodeGetCpuMap(virConnectPtr conn, unsigned char * cpumap, int maplen); returning the number of present CPUs or -1 on failure and storing a bit map of real CPUs as described in virDomainPinVcpu in cpumap. The bits in the bit map are set to 1 for online CPUs and set to 0 for offline CPUs. Implementation is facilitated by the function nodeGetCPUmap in nodeinfo.c. Clients can use virNodeGetCpuNum to properly determine the maximum number of node CPUs and the online/offline information. Thanks for your comments. -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

4 10

[libvirt] [PATCH] portability: handle ifreq differences in virnetdev
by Roman Bogorodskiy 02 May '13

02 May '13

FreeBSD (and maybe other BSDs) have different member names in struct ifreq when compared to Linux, such as: - uses ifr_data instead of ifr_newname for setting interface names - uses ifr_index instead of ifr_ifindex for interface index Also, add a check for SIOCGIFHWADDR for virNetDevValidateConfig(). Use AF_LOCAL if AF_PACKET is not available. --- configure.ac | 8 ++++++++ src/util/virnetdev.c | 23 +++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 23c24d2..4a32f8c 100644 --- a/configure.ac +++ b/configure.ac @@ -2363,6 +2363,14 @@ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) AC_SUBST([LIBNL_CFLAGS]) AC_SUBST([LIBNL_LIBS]) +AC_CHECK_MEMBERS([struct ifreq.ifr_newname, + struct ifreq.ifr_ifindex, + struct ifreq.ifr_index], + [], [], + [#include <sys/ioctl.h> + #include <net/if.h> + ]) + # Only COPYING.LIB is under version control, yet COPYING # is included as part of the distribution tarball. # Copy one to the other, but only if this is a srcdir-build. diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 7ffaac1..02c1716 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -38,7 +38,10 @@ #ifdef __linux__ # include <linux/sockios.h> # include <linux/if_vlan.h> -#elif !defined(AF_PACKET) +# define VIR_NETDEV_FAMILY AF_PACKET +#elif defined(HAVE_STRUCT_IFREQ) && defined(AF_LOCAL) +# define VIR_NETDEV_FAMILY AF_LOCAL +#else # undef HAVE_STRUCT_IFREQ #endif @@ -81,7 +84,7 @@ static int virNetDevSetupControlFull(const char *ifname, static int virNetDevSetupControl(const char *ifname, struct ifreq *ifr) { - return virNetDevSetupControlFull(ifname, ifr, AF_PACKET, SOCK_DGRAM); + return virNetDevSetupControlFull(ifname, ifr, VIR_NETDEV_FAMILY, SOCK_DGRAM); } #endif @@ -478,12 +481,16 @@ int virNetDevSetName(const char* ifname, const char *newifname) if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) return -1; +#if !defined(HAVE_STRUCT_IFREQ_IFR_NEWNAME) + ifr.ifr_data = (caddr_t)newifname; +#else if (virStrcpyStatic(ifr.ifr_newname, newifname) == NULL) { virReportSystemError(ERANGE, _("Network interface name '%s' is too long"), newifname); goto cleanup; } +#endif if (ioctl(fd, SIOCSIFNAME, &ifr)) { virReportSystemError(errno, @@ -630,7 +637,7 @@ int virNetDevGetIndex(const char *ifname, int *ifindex) { int ret = -1; struct ifreq ifreq; - int fd = socket(PF_PACKET, SOCK_DGRAM, 0); + int fd = socket(VIR_NETDEV_FAMILY, SOCK_DGRAM, 0); if (fd < 0) { virReportSystemError(errno, "%s", @@ -654,7 +661,11 @@ int virNetDevGetIndex(const char *ifname, int *ifindex) goto cleanup; } +#if defined(HAVE_STRUCT_IFREQ_IFR_INDEX) + *ifindex = ifreq.ifr_index; +#else *ifindex = ifreq.ifr_ifindex; +#endif ret = 0; cleanup: @@ -870,7 +881,7 @@ int virNetDevGetIPv4Address(const char *ifname ATTRIBUTE_UNUSED, * * Returns 1 if the config matches, 0 if the config does not match, or interface does not exist, -1 on error */ -#if defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ) int virNetDevValidateConfig(const char *ifname, const virMacAddrPtr macaddr, int ifindex) { @@ -924,7 +935,7 @@ int virNetDevValidateConfig(const char *ifname, VIR_FORCE_CLOSE(fd); return ret; } -#else /* ! HAVE_STRUCT_IFREQ */ +#else int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, const virMacAddrPtr macaddr ATTRIBUTE_UNUSED, int ifindex ATTRIBUTE_UNUSED) @@ -933,7 +944,7 @@ int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, _("Unable to check interface config on this platform")); return -1; } -#endif /* ! HAVE_STRUCT_IFREQ */ +#endif #ifdef __linux__ -- 1.8.0

2 4

[libvirt] [PATCH] Remove redundant () in expression
by Daniel P. Berrange 02 May '13

02 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The use of () in a simple boolean comparison was not required Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7d851e3..77452f0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3100,7 +3100,7 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, virBufferAsprintf(&opt, "if=%s", bus); if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { - if ((disk->bus == VIR_DOMAIN_DISK_BUS_SCSI)) { + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) virBufferAddLit(&opt, ",media=cdrom"); } else if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE) { -- 1.8.2.1

2 1

[libvirt] [PATCH] Fix format string handling in network driver
by Daniel P. Berrange 02 May '13

02 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The call to virReportError conditionally switched between two format strings, with different numbers of placeholders. This meant the format string with no placeholders was not protected by a "%s". Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/network/bridge_driver.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8da28e4..327bb08 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1601,11 +1601,13 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, &network->def->forward.addr, &network->def->forward.port, NULL) < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - forwardIf ? - _("failed to add iptables rule to enable masquerading to %s") : - _("failed to add iptables rule to enable masquerading"), - forwardIf); + if (forwardIf) + virReportError(VIR_ERR_SYSTEM_ERROR, + _("failed to add iptables rule to enable masquerading to %s"), + forwardIf); + else + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("failed to add iptables rule to enable masquerading")); goto masqerr3; } @@ -1617,11 +1619,13 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, &network->def->forward.addr, &network->def->forward.port, "udp") < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - forwardIf ? - _("failed to add iptables rule to enable UDP masquerading to %s") : - _("failed to add iptables rule to enable UDP masquerading"), - forwardIf); + if (forwardIf) + virReportError(VIR_ERR_SYSTEM_ERROR, + _("failed to add iptables rule to enable UDP masquerading to %s"), + forwardIf); + else + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("failed to add iptables rule to enable UDP masquerading")); goto masqerr4; } @@ -1633,11 +1637,13 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, &network->def->forward.addr, &network->def->forward.port, "tcp") < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - forwardIf ? - _("failed to add iptables rule to enable TCP masquerading to %s") : - _("failed to add iptables rule to enable TCP masquerading"), - forwardIf); + if (forwardIf) + virReportError(VIR_ERR_SYSTEM_ERROR, + _("failed to add iptables rule to enable TCP masquerading to %s"), + forwardIf); + else + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("failed to add iptables rule to enable TCP masquerading")); goto masqerr5; } -- 1.8.2.1

2 1

[libvirt] [sandbox PATCH] Add a option --package if rpm autodetection fail
by Michael Scherer 02 May '13

02 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=954187 If someone use a custom unit file for the sandbox, the rpm autodetection fail with a exception. Now, this will show a error message, asking to use --package and use this rpm if autodetection fail. --- bin/virt-sandbox-service | 46 +++++++++++++++++++++++++++++++++---- bin/virt-sandbox-service-create.pod | 6 ++++- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 3b78512..740209c 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -363,10 +363,11 @@ class SystemdContainer(Container): DEFAULT_UNIT = "/etc/systemd/system/%s_sandbox.service" - def __init__(self, name=None, uri = "lxc:///", path = Container.DEFAULT_PATH, config=None, create=False): + def __init__(self, name=None, uri = "lxc:///", path = Container.DEFAULT_PATH, config=None, create=False, rpm=None): Container.__init__(self, name, uri, path, config, create) self.copy = False self.unit_file_list = [] + self.rpm = rpm if create: self.config = LibvirtSandbox.ConfigServiceSystemd.new(name) else: @@ -496,8 +497,18 @@ WantedBy=%(TARGET)s self.ts = rpm.ts() + nb_rpm = 0 for u, src in self.unit_file_list: - self.extract_rpm_for_unit(src) + rpm_name = self.get_rpm_for_unit(src) + if rpm_name: + self.extract_rpm(rpm_name) + nb_rpm += 1 + + if nb_rpm == 0: + if self.rpm: + self.extract_rpm(self.rpm) + else: + raise ValueError([_("Cannot autodetect the package for unit files, please use --package")]) def split_filename(self, filename): if filename[-4:] == '.rpm': @@ -521,12 +532,21 @@ WantedBy=%(TARGET)s name = filename[epochIndex + 1:verIndex] return name, ver, rel, epoch, arch - def extract_rpm_for_unit(self, unitfile): + def get_rpm_for_unit(self, unitfile): mi = self.ts.dbMatch(rpm.RPMTAG_BASENAMES, unitfile) try: h = mi.next(); except exceptions.StopIteration: - raise ValueError([_("Cannot find package containing %s") % unitfile]) + return None + return h['name'] + + + def extract_rpm(self, rpm_name): + mi = self.ts.dbMatch('name', rpm_name) + try: + h = mi.next(); + except exceptions.StopIteration: + raise ValueError([_("Cannot find package named %s") % rpm_name]) for fentry in h.fiFromHeader(): fname = fentry[0] @@ -765,11 +785,14 @@ def create(args): if len(args.command) == 0 and len(args.unitfiles) == 0: raise ValueError([_("You must specify a command or a unit file")]) + if args.rpm and len(args.unitfiles) != 1: + raise ValueError([_("Option --package cannot be used without a unit file")]) + if len(args.command) > 0: container = GenericContainer(name = args.name, uri=args.uri, create = True) container.set_command(args.command) else: - container = SystemdContainer(name = args.name, uri=args.uri, create = True) + container = SystemdContainer(name = args.name, uri=args.uri, create = True, rpm = args.rpm) container.set_copy(args.copy) container.set_unit_file_list(args.unitfiles) for net in args.network: @@ -972,6 +995,15 @@ class SetNet(argparse.Action): nets = [values] setattr(namespace, self.dest, nets) +class CheckRpm(argparse.Action): + def __call__(self, parser, namespace, value, option_string=None): + nb_rpm = len(rpm.TransactionSet().dbMatch('name', value)) + if nb_rpm == 0: + raise OSError(_("Cannot find %s rpm") % value) + elif nb_rpm > 1: + raise OSError(_("%s rpm is installed more than once") % value) + setattr(namespace, self.dest, value) + def requires_name(parser): parser.add_argument("name", help=_("name of the sandbox container")) @@ -1015,6 +1047,10 @@ def gen_create_args(subparser): action=CheckUnit, dest="unitfiles", default=[], help=_("Systemd Unit file to run within the systemd sandbox container. Commands cannot be specified with unit files.")) + parser.add_argument("-P", "--package", + action=CheckRpm, + dest="package", default=None, + help=_("Package configuration to use in the container. Default: autodetected from unit files, unless if using a custom unit file.")) parser.add_argument("--username", dest="username", help=_("Specify the username for the container. Default: UID username.")) parser.add_argument("-U", "--uid", dest="uid", diff --git a/bin/virt-sandbox-service-create.pod b/bin/virt-sandbox-service-create.pod index bea6504..ee8cffc 100644 --- a/bin/virt-sandbox-service-create.pod +++ b/bin/virt-sandbox-service-create.pod @@ -8,7 +8,7 @@ virt-sandbox-service create - Create a Security container [--homedir HOMEDIR] [-G GID] [-i IMAGESIZE] [-N NETWORK] [-p PATH] [-s SECURITY] [-u UNITFILES] [--username USERNAME] - [-U UID] + [-U UID] [-P package] name [command [command ...]] =head1 DESCRIPTION @@ -146,6 +146,10 @@ Create file system image file of this size to store container content. systemd Unit file to run within the container +=item B<-P PACKAGE>, B<--package PACKAGE> + +Package used to populate the container if not autodetected based on unit file. + =item B<-U UID>, B<--uid UID> Set uid to use within container. -- 1.8.2.1

2 2

[libvirt] network down lead vm been shutdown
by yue 02 May '13

02 May '13

hi,all the connection between remote-viewer and guest is good, now unplug Network Cable, wait several minutes, then kill virt-viewer. now guest will be shutdwn. ---winxp.log of libvirt---------- handle_dev_display_connect: connect handle_new_display_channel: add display channel client handle_new_display_channel: New display (client 0x7f1cbf9f6ed0) dcc 0x7f1c584db2b0 stream 0x7f1cbfd61560 handle_new_display_channel: jpeg disabled handle_new_display_channel: zlib-over-glz disabled listen_to_new_client_channel: NEW ID = 0 display_channel_client_wait_for_init: creating encoder with id == 0 reds_handle_read_link_done: spice channels 3 should be encrypted reds_handle_auth_mechanism: Auth method: 1 reds_show_new_channel: channel 3:0, connected successfully, over Secure link inputs_connect: inputs channel client create flush_display_commands: update timeout red_channel_client_disconnect: 0x7f1c584db2b0 (channel 0x7f1c580458d0 type 2 id 0) display_channel_client_on_disconnect: validate_surface: failed on 13 validate_surface: panic !worker->surfaces[surface_id].context.canvas 2013-05-02 09:00:16.717+0000: shutting down

2 1

[libvirt] [PATCH v2 1/1][RESEND] Add NVRAM device
by Li Zhang 02 May '13

02 May '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For pSeries guest in QEMU, NVRAM is one kind of spapr-vio device. Users are allowed to specify spapr-vio devices'address. But NVRAM is not supported in libvirt. So this patch is to add NVRAM device to allow users to specify its address. In QEMU, NVRAM device's address is specified by "-global spapr-nvram.reg=xxxxx". In libvirt, XML file is defined as the following: <nvram> <address type='spapr-vio' reg='0x3000'/> </nvram> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- * v2 -> v1: Add NVRAM parameters parsing in qemuParseCommandLine. src/conf/domain_conf.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_command.c | 48 +++++++++++++++++++++++++++ src/qemu/qemu_command.h | 2 ++ 4 files changed, 142 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 10f361c..8c1e8ae 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -175,7 +175,8 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "redirdev", "smartcard", "chr", - "memballoon") + "memballoon", + "nvram") VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, "none", @@ -1442,6 +1443,16 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) VIR_FREE(def); } +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def) +{ + if (!def) + return; + + virDomainDeviceInfoClear(&def->info); + + VIR_FREE(def); +} + void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def) { if (!def) @@ -1602,6 +1613,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: break; } @@ -1791,6 +1803,7 @@ void virDomainDefFree(virDomainDefPtr def) virDomainWatchdogDefFree(def->watchdog); virDomainMemballoonDefFree(def->memballoon); + virDomainNVRAMDefFree(def->nvram); for (i = 0; i < def->nseclabels; i++) virSecurityLabelDefFree(def->seclabels[i]); @@ -2342,6 +2355,12 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, if (cb(def, &device, &def->memballoon->info, opaque) < 0) return -1; } + if (def->nvram) { + device.type = VIR_DOMAIN_DEVICE_NVRAM; + device.data.nvram = def->nvram; + if (cb(def, &device, &def->nvram->info, opaque) < 0) + return -1; + } device.type = VIR_DOMAIN_DEVICE_HUB; for (i = 0; i < def->nhubs ; i++) { device.data.hub = def->hubs[i]; @@ -7461,6 +7480,23 @@ error: goto cleanup; } +static virDomainNVRAMDefPtr +virDomainNVRAMDefParseXML(const xmlNodePtr node, + unsigned int flags) +{ + virDomainNVRAMDefPtr def; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + return NULL; + } + + if ( virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0 ) + return NULL; + + return def; +} + static virSysinfoDefPtr virSysinfoParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt) @@ -10572,6 +10608,32 @@ virDomainDefParseXML(virCapsPtr caps, } } + def->nvram = NULL; + if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) { + goto error; + } + + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only a single nvram device is supported")); + goto error; + } + + if (n > 0) { + virDomainNVRAMDefPtr nvram = + virDomainNVRAMDefParseXML(nodes[0], flags); + if (!nvram) + goto error; + def->nvram = nvram; + VIR_FREE(nodes); + } else { + virDomainNVRAMDefPtr nvram; + if (VIR_ALLOC(nvram) < 0) + goto no_memory; + nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE; + def->nvram = nvram; + } + /* analysis of the hub devices */ if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) { goto error; @@ -13547,6 +13609,21 @@ virDomainMemballoonDefFormat(virBufferPtr buf, } static int +virDomainNVRAMDefFormat(virBufferPtr buf, + virDomainNVRAMDefPtr def, + unsigned int flags) +{ + virBufferAsprintf(buf, " <nvram>\n"); + if (virDomainDeviceInfoIsSet(&def->info, flags)) + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; + + virBufferAddLit(buf, " </nvram>\n"); + + return 0; +} + +static int virDomainSysinfoDefFormat(virBufferPtr buf, virSysinfoDefPtr def) { @@ -14787,6 +14864,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->memballoon) virDomainMemballoonDefFormat(buf, def->memballoon, flags); + if (def->nvram) + virDomainNVRAMDefFormat(buf, def->nvram, flags); + virBufferAddLit(buf, " </devices>\n"); virBufferAdjustIndent(buf, 2); @@ -16061,6 +16141,7 @@ virDomainDeviceDefCopy(virCapsPtr caps, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Copying definition of '%d' type " diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4ffa4aa..8e5f1d8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -108,6 +108,9 @@ typedef virDomainChrDef *virDomainChrDefPtr; typedef struct _virDomainMemballoonDef virDomainMemballoonDef; typedef virDomainMemballoonDef *virDomainMemballoonDefPtr; +typedef struct _virDomainNVRAMDef virDomainNVRAMDef; +typedef virDomainNVRAMDef *virDomainNVRAMDefPtr; + typedef struct _virDomainSnapshotObj virDomainSnapshotObj; typedef virDomainSnapshotObj *virDomainSnapshotObjPtr; @@ -133,6 +136,7 @@ typedef enum { VIR_DOMAIN_DEVICE_SMARTCARD, VIR_DOMAIN_DEVICE_CHR, VIR_DOMAIN_DEVICE_MEMBALLOON, + VIR_DOMAIN_DEVICE_NVRAM, VIR_DOMAIN_DEVICE_LAST } virDomainDeviceType; @@ -158,6 +162,7 @@ struct _virDomainDeviceDef { virDomainSmartcardDefPtr smartcard; virDomainChrDefPtr chr; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; } data; }; @@ -1418,6 +1423,9 @@ struct _virDomainMemballoonDef { virDomainDeviceInfo info; }; +struct _virDomainNVRAMDef { + virDomainDeviceInfo info; +}; enum virDomainSmbiosMode { VIR_DOMAIN_SMBIOS_NONE, @@ -1849,6 +1857,7 @@ struct _virDomainDef { /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; virCPUDefPtr cpu; virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; @@ -1951,6 +1960,7 @@ int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src, void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); void virDomainVideoDefFree(virDomainVideoDefPtr def); virDomainHostdevDefPtr virDomainHostdevDefAlloc(void); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index dee493f..30694d6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -941,6 +941,13 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, goto cleanup; } + if (def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) + def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; + if (qemuAssignSpaprVIOAddress(def, &def->nvram->info, + 0x3000ul) < 0) + goto cleanup; + /* No other devices are currently supported on spapr-vio */ ret = 0; @@ -3406,6 +3413,17 @@ error: return NULL; } +char * +qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && + dev->info.addr.spaprvio.has_reg) + virBufferAsprintf(&buf, "spapr-nvram.reg=0x%llx", + dev->info.addr.spaprvio.reg); + + return virBufferContentAndReset(&buf); +} char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, @@ -7006,6 +7024,19 @@ qemuBuildCommandLine(virConnectPtr conn, } } + if (def->nvram && + def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) { + char *optstr; + virCommandAddArg(cmd, "-global"); + optstr = qemuBuildNVRAMDevStr(def->nvram); + if (!optstr) + goto error; + if (optstr) + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + } + if (snapshot) virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL); @@ -9139,6 +9170,23 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, goto error; } + } else if (STREQ(arg, "-global") && + STRPREFIX(progargv[i + 1], "spapr-nvram.reg=")) { + + WANT_VALUE(); + + if (VIR_ALLOC(def->nvram) < 0) + goto no_memory; + + val += strlen("spapr-nvram.reg="); + if (virStrToLong_ull(val, NULL, 16, + &def->nvram->info.addr.spaprvio.reg) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value for spapr-nvram.reg :" + "'%s'"), val); + goto error; + } + } else if (STREQ(arg, "-S")) { /* ignore, always added by libvirt */ } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index e4db000..7a0fe17 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -118,6 +118,8 @@ char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, virQEMUCapsPtr qemuCaps); +char * qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev); + char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps); -- 1.7.10.1

4 27

[libvirt] Build failed in Jenkins: libvirt-syntax-check #944
by Jenkins CI 02 May '13

02 May '13

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/944/> ------------------------------------------ Started by upstream project "libvirt-build" build number 1052 Started by upstream project "libvirt-build" build number 1053 Building in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson6389583679823866074.sh + make syntax-check GEN bracket-spacing-check GFDL_version 0.65 GFDL_version TAB_in_indentation 0.46 TAB_in_indentation Wundef_boolean 0.23 Wundef_boolean avoid_attribute_unused_in_header 0.30 avoid_attribute_unused_in_header avoid_ctype_macros 0.71 avoid_ctype_macros avoid_if_before_free 5.60 avoid_if_before_free avoid_strcase 0.61 avoid_strcase avoid_write 0.41 avoid_write bindtextdomain 0.34 bindtextdomain cast_of_argument_to_free 0.64 cast_of_argument_to_free cast_of_x_alloc_return_value 0.57 cast_of_x_alloc_return_value changelog 0.25 changelog const_long_option 0.60 const_long_option copyright_address 0.60 copyright_address copyright_check 0.75 copyright_check copyright_format 1.52 copyright_format correct_id_types 0.72 correct_id_types error_message_period 0.45 error_message_period error_message_warn_fatal 0.53 error_message_warn_fatal flags_debug 1.09 flags_debug flags_usage 1.09 flags_usage libvirt_unmarked_diagnostics 2.19 libvirt_unmarked_diagnostics m4_quote_check 0.28 m4_quote_check makefile_TAB_only_indentation 0.26 makefile_TAB_only_indentation makefile_at_at_check 0.21 makefile_at_at_check po_check 13.10 po_check preprocessor_indentation cppi: src/util/virinitctl.c: line 110: not properly indented maint.mk: incorrect preprocessor indentation make: *** [sc_preprocessor_indentation] Error 1 Build step 'Execute shell' marked build as failure

1 2

[libvirt] [PATCH] virInitctlRequest: Don't hardcode 384 bytes size
by Guido Günther 02 May '13

02 May '13

When MAXHOSTNAMELEN is set we have to take it's value into account. Otherwise the build fails on kFreeBSD (FreeBSD kernel and GNU userland) --- src/util/virinitctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index 1618ffa..9a3e8a3 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -103,7 +103,11 @@ struct virInitctlRequest { } i; }; -verify(sizeof(struct virInitctlRequest) == 384); +# ifdef MAXHOSTNAMELEN + verify(sizeof(struct virInitctlRequest) == 320 + MAXHOSTNAMELEN); +# else + verify(sizeof(struct virInitctlRequest) == 384); +#endif /* * Send a message to init to change the runlevel -- 1.7.10.4

2 3

[libvirt] [PATCH 0/3] Fix license violation of virsh when vbox is enabled
by Eric Blake 02 May '13

02 May '13

See the big hairy analysis here: https://www.redhat.com/archives/libvir-list/2013-May/msg00030.html I feel comfortable enough with these patches that I'm hoping to get them into libvirt 1.0.5, while saving the bigger task of refactoring vbox support into libvirtd out to libvirt 1.0.6. Eric Blake (3): build: move readline check into its own macro build: check for libedit build: fall back to libedit if libvirt.so is crippled configure.ac | 54 +++++++++++++------------------------------- libvirt.spec.in | 8 +++++++ m4/virt-edit.m4 | 26 +++++++++++++++++++++ m4/virt-readline.m4 | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.c | 21 ++++++++++++----- 5 files changed, 131 insertions(+), 43 deletions(-) create mode 100644 m4/virt-edit.m4 create mode 100644 m4/virt-readline.m4 -- 1.8.1.4

2 4

[libvirt] License issues
by Eric Blake 02 May '13

02 May '13

tl:dr; summary: It was pointed out to me off-list that libvirt has a licensing issue depending on how it is configured, present since 0.6.3 (introduction of vbox:// URI in commit 10d16508 in April 2009), and which has caused at least libvirt itself to risk shipping non-compliant binaries (at least virsh in Fedora 12 and later is non-compliant, thanks to GPLv3 libreadline 6.0 since mid-2009; although RHEL 6 is immune). The licensing issue can be avoided by configuring --without-vbox, and/or virsh can be fixed by configuring lv_use_readline=no. Meanwhile, we have a plan of attack that would allow future releases of libvirt to provide vbox support to GPLv3 apps, and so that virsh is no longer legally prevented from using GPLv3 readline. Details: The problem stems from the fact that various files in src/vbox (such as vbox_XPCOMCGlue.c) have an explicit LGPLv2-only license. That means that any binary that includes code based on these files is also LGPLv2-only. At least Fedora distributes libvirt.so with vbox support enabled, which means ANY application that links against such a libvirt.so must be compatible with LGPLv2-only. But there is at least one popular license that is definitely incompatible with LGPLv2-only: GPLv3. This means that it is impossible to use Fedora's libvirt.so in a GPLv3 (or GPLv3+) binary, even if that binary will not be directly using vbox:// URIs. (Note that RHEL 6 ships without vbox:// URI support, and therefore its libvirt.so is not poisoned.) Meanwhile, the libvirt package itself usually ships a binary that wants to use GPLv3 code. virsh defaults to compiling against libreadline if it is present (you can avoid it with the undocumented './configure lv_use_readline=no', but to date we have never added a --without-readline configure switch). Prior to 2009, libreadline 5.x was GPLv2+; but in 2009, with the release of readline 6.0, it's license was changed to GPLv3+. Therefore, ever since Fedora 12, virsh has been in license violation - it links against two incompatible libraries (libvirt.so with vbox support is LGPLv2-only, and libreadline 6.0 is GPLv3+). With regards to libreadline, we have a couple of sneaky backdoors: The first is a liberal interpretation of the GPLv2 exception that allows you to use standard system libraries regardless of their licensing - if you can succesfully argue that libreadline is a system library (on the same par as libc) then even though it is GPLv3, using it in a GPLv2 project under the system library clause does not constitute a license violation. I'm not a lawyer, but trying to use this exception feels sleazy; and while it may hold up to scrutiny on GNU/Linux (where libreadline really is present on all installs thanks to bash), it's harder to argue that it will work on all other systems (BSD systems come to mind, which try hard to provide the option of getting a running system without the need for installing GPLv3 libraries). The second backdoor is the existence of libedit, a BSD-licensed library that provides the same API as (at least some versions of) libreadline. If virsh is not using any libreadline features beyond what libedit provides, we could link virsh against libedit instead of libreadline, at which point virsh would no longer be using GPLv3 code, and can be distributed under GPLv2-only as needed according to whether libvirt.so is poisoned to be LGPLv2-only. I'm hoping to patch configure.ac to probe for libedit, and if present, to prefer that over libreadline if vbox is enabled. We'd also want to add a configure --with-readline=... to give the user a documented way to choose which backend they want for interactive virsh (libedit, libreadline, or none) rather than forcing the decision via undocumented cache variables. The /usr/libexec/libvirt_parthelper binary is another potential binary that needs auditing. It exists because we need to interact with libparted, but that library is GPLv3, and thus cannot be linked into libvirt.so proper. By creating a separate application, our goal was to have libvirt_parthelper be a GPLv3 app (thanks to parted) but reuse libvirt code (exercising the "or later" clause of all libvirt LGPLv2+ code used in that binary). At the moment, ldd says that libvirt_parthelper is not linked against libvirt.so (but rather just statically includes other libvirt files such as "virutil.h"), so we can argue that this binary is immune to the problem with vbox code. Note that libvirt's intent has always been to ship LGPLv2+ code, precisely because we want libvirt to be usable in both GPLv2 and GPLv3 projects (anyone wanting to use an LGPLv2+ library in a GPLv3 project merely exercises their "or later" rights of LGPLv2+ to use that library under LGPLv3). But since we are currently falling short of that goal, we need to make a change. Unfortunately, the copyright holder (Sun) that exerted the restrictive LGPLv2-only license no longer exists, and it is not obvious whether their successor Oracle is legally able to relax the license. Even if they are, there is then the question of whether Oracle would choose to relax the license, and how much time it would take to pursue the legal paperwork to get a license change authorized. But we have another possibility, by using what we have already done with the libvirt_parthelper as our guide. That is, as long as we can isolate poisoned licenses out of libvirt.so, and ensure that they are only compiled into standalone binaries, those standalone binaries can have a more restrictive license. We can go in either direction so long each individual binary never mixes both GPLv3 and LGPLv2-only code. Obviously, libvirt_parthelper chose to restrict things to GPLv3, but so far, the libvirtd executable has not been poisoned in either direction. Furthermore, since we have already gone to the efforts of creating a libvirt_parthelper to keep GPLv3 code out of libvirtd, it seems reasonable to assume that we can create other helper apps for any future tasks that libvirtd may want to perform that require GPLv3 code. Therefore, I propose that we poison libvirtd into being [L]GPLv2-only, by linking the vbox support into libvirtd instead of in libvirt.so. Implementation wise, this would mean that we compile the vbox driver as an independent module (much the same as we do for qemu or lxc), and link that module into libvirtd rather than into libvirt.so directly. In libvirt.so, attempts to use a vbox:// URI would then be forwarded over RPC to libvirtd, instead of directly using vbox code. vbox would then be a remote instead of a local protocol. Since existing vbox:// connections are local, vbox users have not previously had to ensure that the system libvirtd daemon is running. Therefore, I suspect that it would be nicer to reuse the qemu://session code that auto-spawns a session libvirtd, so that from the user standpoint, they can continue to connect to vbox without having to have a libvirtd system daemon running. The initial connection time will take slightly longer as a session libvirtd is autospawned, but that should not be too much impact. Qemu has announced that they are delaying their release of 1.5 in part because of a license problem [1]. I'm wondering if we need to follow qemu's lead and possibly delay the release of libvirt 1.0.5 if we don't have a fix in time (at any rate, I'm certainly trying to tackle both proposed solutions in the near future, starting with the libedit idea first). On the other hand, the issue has been around for 4 years, so we could argue that releasing 1.0.5 with the same problem is no worse than what we have done in the past, and that we can wait to fix it until 1.0.6. If we do go with the delay for libvirt.so, users still have the option of configuring --without-vbox to get a libvirt.so that is not poisoned to be LGPLv2-only. And hopefully the libedit work is simple enough that at least virsh can be fixed for 1.0.5, even if libvirt.so is not fixed until 1.0.6. [1] qemu license issue first identified: https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg02096.html Efforts to fix it: https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg05807.html qemu release delay, in part because of license issue: https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg06042.html -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 3

[libvirt] [PATCH] pci: autolearn name of stub driver, remove from arglist
by Laine Stump 02 May '13

02 May '13

virPCIDeviceReattach and virPCIDeviceUnbindFromStub (called by virPCIDeviceReattach) had previously required the name of the stub driver as input. This is unnecessary, because the name of the driver the device is currently bound to can be found by looking at the link: /sys/bus/pci/dddd:bb:ss.ff/driver Instead of requiring that the name of the expected stub driver name and only unbinding if that one name is matched, we no longer take a driver name in the arglist for either of these functions. virPCIDeviceUnbindFromStub just compares the name of the currently bound driver to a list of "well known" stubs (right now contains "pci-stub" and "vfio-pci" for qemu, and "pciback" for xen), and only performs the unbind if it's one of those devices. This allows virsh nodedevice-reattach to work properly across a libvirtd restart, and fixes a couple of cases where we were erroneously still hard-coding "pci-stub" as the drive name. For some unknown reason, virPCIDeviceReattach had been calling modprobe on the stub driver prior to unbinding the device. This was problematic because we no longer know the name of the stub driver in that function. However, it is pointless to probe for the stub driver at that time anyway - because the device is bound to the stub driver, we are guaranteed that it is already loaded, and so that call to modprobe has been removed. --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hostdev.c | 4 +-- src/util/virpci.c | 66 ++++++++++++++++++++++++++++++++++--------------- src/util/virpci.h | 3 +-- src/xen/xen_driver.c | 2 +- 5 files changed, 51 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 296efe3..9492850 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9832,7 +9832,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) virPCIDeviceReattachInit(pci); if (virPCIDeviceReattach(pci, driver->activePciHostdevs, - driver->inactivePciHostdevs, "pci-stub") < 0) + driver->inactivePciHostdevs) < 0) goto out; ret = 0; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 4d1f39d..e4af036 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -609,7 +609,7 @@ reattachdevs: /* NB: This doesn't actually re-bind to original driver, just * unbinds from the stub driver */ - virPCIDeviceReattach(dev, driver->activePciHostdevs, NULL, NULL); + virPCIDeviceReattach(dev, driver->activePciHostdevs, NULL); } cleanup: @@ -869,7 +869,7 @@ void qemuReattachPciDevice(virPCIDevicePtr dev, virQEMUDriverPtr driver) } if (virPCIDeviceReattach(dev, driver->activePciHostdevs, - driver->inactivePciHostdevs, "pci-stub") < 0) { + driver->inactivePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to re-attach PCI device: %s"), err ? err->message : _("unknown error")); diff --git a/src/util/virpci.c b/src/util/virpci.c index 97bba74..8d0dec8 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -909,25 +909,61 @@ recheck: return -1; } +static const char *virPCIKnownStubs[] = { + "pciback", /* used by xen */ + "pci-stub", /* used by kvm legacy passthrough */ + "vfio-pci", /* used by VFIO device assignment */ + NULL +}; + static int -virPCIDeviceUnbindFromStub(virPCIDevicePtr dev, const char *driver) +virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) { int result = -1; char *drvdir = NULL; char *path = NULL; + char *driver = NULL; + const char **stubTest; + bool isStub = false; - if (virPCIDriverDir(&drvdir, driver) < 0) + /* If the device is currently bound to one of the "well known" + * stub drivers, then unbind it, otherwise ignore it. + */ + if (virPCIFile(&path, dev->name, "driver") < 0) + goto cleanup; + /* path = "/sys/bus/pci/dddd:bb:ss.ff/driver" */ + if (virFileIsLink(path) != 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid device %s driver file %s is not a symlink"), + dev->name, path); + goto cleanup; + } + if (virFileResolveLink(path, &drvdir) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to resolve device %s driver symlink %s"), + dev->name, path); goto cleanup; + } + /* drvdir = "/sys/bus/pci/drivers/${drivername} */ if (!dev->unbind_from_stub) goto remove_slot; - /* If the device is bound to stub, unbind it. - */ - if (virPCIFile(&path, dev->name, "driver") < 0) - goto cleanup; + /* If the device isn't bound to a known stub, skip the unbind. */ + if (!(driver = strdup(last_component(drvdir)))) + goto remove_slot; - if (virFileExists(drvdir) && virFileLinkPointsTo(path, drvdir)) { + for (stubTest = virPCIKnownStubs; *stubTest != NULL; stubTest++) { + if (STREQ(driver, *stubTest)) { + isStub = true; + VIR_DEBUG("Found stub driver %s", *stubTest); + break; + } + } + if (!isStub) + goto remove_slot; + + if (virFileExists(drvdir)) { if (virPCIDriverFile(&path, driver, "unbind") < 0) { goto cleanup; } @@ -1141,7 +1177,7 @@ cleanup: VIR_FREE(path); if (result < 0) { - virPCIDeviceUnbindFromStub(dev, driver); + virPCIDeviceUnbindFromStub(dev); } return result; @@ -1183,25 +1219,15 @@ virPCIDeviceDetach(virPCIDevicePtr dev, int virPCIDeviceReattach(virPCIDevicePtr dev, virPCIDeviceListPtr activeDevs, - virPCIDeviceListPtr inactiveDevs, - const char *driver) + virPCIDeviceListPtr inactiveDevs) { - if (!driver && dev->stubDriver) - driver = dev->stubDriver; - - if (virPCIProbeStubDriver(driver) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to load PCI stub module %s"), driver); - return -1; - } - if (activeDevs && virPCIDeviceListFind(activeDevs, dev)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Not reattaching active device %s"), dev->name); return -1; } - if (virPCIDeviceUnbindFromStub(dev, driver) < 0) + if (virPCIDeviceUnbindFromStub(dev) < 0) return -1; /* Steal the dev from list inactiveDevs */ diff --git a/src/util/virpci.h b/src/util/virpci.h index 3911b72..7bcadb4 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -54,8 +54,7 @@ int virPCIDeviceDetach(virPCIDevicePtr dev, const char *driver); int virPCIDeviceReattach(virPCIDevicePtr dev, virPCIDeviceListPtr activeDevs, - virPCIDeviceListPtr inactiveDevs, - const char *driver); + virPCIDeviceListPtr inactiveDevs); int virPCIDeviceReset(virPCIDevicePtr dev, virPCIDeviceListPtr activeDevs, virPCIDeviceListPtr inactiveDevs); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 8971d4c..0642edb 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2254,7 +2254,7 @@ xenUnifiedNodeDeviceReAttach(virNodeDevicePtr dev) goto out; } - if (virPCIDeviceReattach(pci, NULL, NULL, "pciback") < 0) + if (virPCIDeviceReattach(pci, NULL, NULL) < 0) goto out; ret = 0; -- 1.7.11.7

2 2

[libvirt] [libvirt-glib] Rename misnamed 'conn' variable everywhere
by Christophe Fergeau 01 May '13

01 May '13

Through copy and paste from libvirt-gobject-connection.c, we end up with an instance variable named 'conn' in most of our classes even if we are not manipulating a connection object. This commit renames it all 'conn' occurrences in libvirt-gobject and libvirt-gconfig with a name more consistent with the type of the variable named 'conn'. --- .../libvirt-gconfig-domain-interface-bridge.c | 6 ++--- .../libvirt-gconfig-domain-interface-network.c | 6 ++--- .../libvirt-gconfig-domain-interface-user.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-domain.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-interface.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-network-filter.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-network.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-node-device.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-object.c | 12 +++++----- libvirt-gconfig/libvirt-gconfig-secret.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 6 ++--- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-domain.c | 26 +++++++++++----------- libvirt-gobject/libvirt-gobject-interface.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-manager.c | 6 ++--- libvirt-gobject/libvirt-gobject-network-filter.c | 6 ++--- libvirt-gobject/libvirt-gobject-network.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-node-device.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-secret.c | 24 ++++++++++---------- libvirt-gobject/libvirt-gobject-storage-pool.c | 4 ++-- libvirt-gobject/libvirt-gobject-storage-vol.c | 20 ++++++++--------- 23 files changed, 125 insertions(+), 125 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c index fc2f359..c942200 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c @@ -45,11 +45,11 @@ static void gvir_config_domain_interface_bridge_class_init(GVirConfigDomainInter } -static void gvir_config_domain_interface_bridge_init(GVirConfigDomainInterfaceBridge *conn) +static void gvir_config_domain_interface_bridge_init(GVirConfigDomainInterfaceBridge *bridge) { - g_debug("Init GVirConfigDomainInterfaceBridge=%p", conn); + g_debug("Init GVirConfigDomainInterfaceBridge=%p", bridge); - conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_BRIDGE_GET_PRIVATE(conn); + bridge->priv = GVIR_CONFIG_DOMAIN_INTERFACE_BRIDGE_GET_PRIVATE(bridge); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index a5f6270..8c0c920 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -44,11 +44,11 @@ static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInte } -static void gvir_config_domain_interface_network_init(GVirConfigDomainInterfaceNetwork *conn) +static void gvir_config_domain_interface_network_init(GVirConfigDomainInterfaceNetwork *iface) { - g_debug("Init GVirConfigDomainInterfaceNetwork=%p", conn); + g_debug("Init GVirConfigDomainInterfaceNetwork=%p", iface); - conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(conn); + iface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c index a2b7219..2f844dd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c @@ -44,11 +44,11 @@ static void gvir_config_domain_interface_user_class_init(GVirConfigDomainInterfa } -static void gvir_config_domain_interface_user_init(GVirConfigDomainInterfaceUser *conn) +static void gvir_config_domain_interface_user_init(GVirConfigDomainInterfaceUser *iface) { - g_debug("Init GVirConfigDomainInterfaceUser=%p", conn); + g_debug("Init GVirConfigDomainInterfaceUser=%p", iface); - conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_USER_GET_PRIVATE(conn); + iface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_USER_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index c46a23a..3d967f1 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -42,11 +42,11 @@ static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass } -static void gvir_config_domain_snapshot_init(GVirConfigDomainSnapshot *conn) +static void gvir_config_domain_snapshot_init(GVirConfigDomainSnapshot *snapshot) { - g_debug("Init GVirConfigDomainSnapshot=%p", conn); + g_debug("Init GVirConfigDomainSnapshot=%p", snapshot); - conn->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); + snapshot->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(snapshot); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 7ef0be8..eb97cd5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -188,11 +188,11 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) } -static void gvir_config_domain_init(GVirConfigDomain *conn) +static void gvir_config_domain_init(GVirConfigDomain *domain) { - g_debug("Init GVirConfigDomain=%p", conn); + g_debug("Init GVirConfigDomain=%p", domain); - conn->priv = GVIR_CONFIG_DOMAIN_GET_PRIVATE(conn); + domain->priv = GVIR_CONFIG_DOMAIN_GET_PRIVATE(domain); } diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index 4b63091..521455c 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -42,11 +42,11 @@ static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass) } -static void gvir_config_interface_init(GVirConfigInterface *conn) +static void gvir_config_interface_init(GVirConfigInterface *iface) { - g_debug("Init GVirConfigInterface=%p", conn); + g_debug("Init GVirConfigInterface=%p", iface); - conn->priv = GVIR_CONFIG_INTERFACE_GET_PRIVATE(conn); + iface->priv = GVIR_CONFIG_INTERFACE_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index 1efef7c..68c5c79 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -42,11 +42,11 @@ static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass * } -static void gvir_config_network_filter_init(GVirConfigNetworkFilter *conn) +static void gvir_config_network_filter_init(GVirConfigNetworkFilter *filter) { - g_debug("Init GVirConfigNetworkFilter=%p", conn); + g_debug("Init GVirConfigNetworkFilter=%p", filter); - conn->priv = GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(conn); + filter->priv = GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(filter); } diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index cd23aa6..e14b9c7 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -42,11 +42,11 @@ static void gvir_config_network_class_init(GVirConfigNetworkClass *klass) } -static void gvir_config_network_init(GVirConfigNetwork *conn) +static void gvir_config_network_init(GVirConfigNetwork *network) { - g_debug("Init GVirConfigNetwork=%p", conn); + g_debug("Init GVirConfigNetwork=%p", network); - conn->priv = GVIR_CONFIG_NETWORK_GET_PRIVATE(conn); + network->priv = GVIR_CONFIG_NETWORK_GET_PRIVATE(network); } diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index e23cc7c..eab4aab 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -42,11 +42,11 @@ static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass) } -static void gvir_config_node_device_init(GVirConfigNodeDevice *conn) +static void gvir_config_node_device_init(GVirConfigNodeDevice *device) { - g_debug("Init GVirConfigNodeDevice=%p", conn); + g_debug("Init GVirConfigNodeDevice=%p", device); - conn->priv = GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(conn); + device->priv = GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(device); } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index d6e4bd8..9e3b5f2 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -120,10 +120,10 @@ static void gvir_config_object_set_property(GObject *object, static void gvir_config_object_finalize(GObject *object) { - GVirConfigObject *conn = GVIR_CONFIG_OBJECT(object); - GVirConfigObjectPrivate *priv = conn->priv; + GVirConfigObject *gvir_object = GVIR_CONFIG_OBJECT(object); + GVirConfigObjectPrivate *priv = gvir_object->priv; - g_debug("Finalize GVirConfigObject=%p", conn); + g_debug("Finalize GVirConfigObject=%p", gvir_object); g_free(priv->schema); @@ -182,11 +182,11 @@ static void gvir_config_object_class_init(GVirConfigObjectClass *klass) } -static void gvir_config_object_init(GVirConfigObject *conn) +static void gvir_config_object_init(GVirConfigObject *object) { - g_debug("Init GVirConfigObject=%p", conn); + g_debug("Init GVirConfigObject=%p", object); - conn->priv = GVIR_CONFIG_OBJECT_GET_PRIVATE(conn); + object->priv = GVIR_CONFIG_OBJECT_GET_PRIVATE(object); } void gvir_config_object_validate(GVirConfigObject *config, diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index fb268b0..c2dbcff 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -42,11 +42,11 @@ static void gvir_config_secret_class_init(GVirConfigSecretClass *klass) } -static void gvir_config_secret_init(GVirConfigSecret *conn) +static void gvir_config_secret_init(GVirConfigSecret *secret) { - g_debug("Init GVirConfigSecret=%p", conn); + g_debug("Init GVirConfigSecret=%p", secret); - conn->priv = GVIR_CONFIG_SECRET_GET_PRIVATE(conn); + secret->priv = GVIR_CONFIG_SECRET_GET_PRIVATE(secret); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index b06c24c..87caeb6 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -44,11 +44,11 @@ static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klas } -static void gvir_config_storage_pool_init(GVirConfigStoragePool *conn) +static void gvir_config_storage_pool_init(GVirConfigStoragePool *pool) { - g_debug("Init GVirConfigStoragePool=%p", conn); + g_debug("Init GVirConfigStoragePool=%p", pool); - conn->priv = GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(conn); + pool->priv = GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(pool); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index e2a0ae8..6690dd7 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -44,11 +44,11 @@ static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass) } -static void gvir_config_storage_vol_init(GVirConfigStorageVol *conn) +static void gvir_config_storage_vol_init(GVirConfigStorageVol *vol) { - g_debug("Init GVirConfigStorageVol=%p", conn); + g_debug("Init GVirConfigStorageVol=%p", vol); - conn->priv = GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(conn); + vol->priv = GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(vol); } diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index b2c49a4..d4e9b97 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -61,8 +61,8 @@ static void gvir_domain_snapshot_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); - GVirDomainSnapshotPrivate *priv = conn->priv; + GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); + GVirDomainSnapshotPrivate *priv = snapshot->priv; switch (prop_id) { case PROP_HANDLE: @@ -80,8 +80,8 @@ static void gvir_domain_snapshot_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); - GVirDomainSnapshotPrivate *priv = conn->priv; + GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); + GVirDomainSnapshotPrivate *priv = snapshot->priv; switch (prop_id) { case PROP_HANDLE: @@ -98,10 +98,10 @@ static void gvir_domain_snapshot_set_property(GObject *object, static void gvir_domain_snapshot_finalize(GObject *object) { - GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); - GVirDomainSnapshotPrivate *priv = conn->priv; + GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); + GVirDomainSnapshotPrivate *priv = snapshot->priv; - g_debug("Finalize GVirDomainSnapshot=%p", conn); + g_debug("Finalize GVirDomainSnapshot=%p", snapshot); virDomainSnapshotFree(priv->handle); @@ -132,11 +132,11 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass) } -static void gvir_domain_snapshot_init(GVirDomainSnapshot *conn) +static void gvir_domain_snapshot_init(GVirDomainSnapshot *snapshot) { - g_debug("Init GVirDomainSnapshot=%p", conn); + g_debug("Init GVirDomainSnapshot=%p", snapshot); - conn->priv = GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); + snapshot->priv = GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(snapshot); } typedef struct virDomainSnapshot GVirDomainSnapshotHandle; diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index a296144..c6e30e5 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -75,8 +75,8 @@ static void gvir_domain_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; switch (prop_id) { case PROP_HANDLE: @@ -84,7 +84,7 @@ static void gvir_domain_get_property(GObject *object, break; case PROP_PERSISTENT: - g_value_set_boolean(value, gvir_domain_get_persistent (conn)); + g_value_set_boolean(value, gvir_domain_get_persistent (domain)); break; default: @@ -98,8 +98,8 @@ static void gvir_domain_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; switch (prop_id) { case PROP_HANDLE: @@ -116,10 +116,10 @@ static void gvir_domain_set_property(GObject *object, static void gvir_domain_finalize(GObject *object) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; - g_debug("Finalize GVirDomain=%p", conn); + g_debug("Finalize GVirDomain=%p", domain); virDomainFree(priv->handle); @@ -129,8 +129,8 @@ static void gvir_domain_finalize(GObject *object) static void gvir_domain_constructed(GObject *object) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; G_OBJECT_CLASS(gvir_domain_parent_class)->constructed(object); @@ -232,11 +232,11 @@ static void gvir_domain_class_init(GVirDomainClass *klass) } -static void gvir_domain_init(GVirDomain *conn) +static void gvir_domain_init(GVirDomain *domain) { - g_debug("Init GVirDomain=%p", conn); + g_debug("Init GVirDomain=%p", domain); - conn->priv = GVIR_DOMAIN_GET_PRIVATE(conn); + domain->priv = GVIR_DOMAIN_GET_PRIVATE(domain); } typedef struct virDomain GVirDomainHandle; diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index aaf81b9..1fc6656 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -61,8 +61,8 @@ static void gvir_interface_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirInterface *conn = GVIR_INTERFACE(object); - GVirInterfacePrivate *priv = conn->priv; + GVirInterface *iface = GVIR_INTERFACE(object); + GVirInterfacePrivate *priv = iface->priv; switch (prop_id) { case PROP_HANDLE: @@ -80,8 +80,8 @@ static void gvir_interface_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirInterface *conn = GVIR_INTERFACE(object); - GVirInterfacePrivate *priv = conn->priv; + GVirInterface *iface = GVIR_INTERFACE(object); + GVirInterfacePrivate *priv = iface->priv; switch (prop_id) { case PROP_HANDLE: @@ -98,10 +98,10 @@ static void gvir_interface_set_property(GObject *object, static void gvir_interface_finalize(GObject *object) { - GVirInterface *conn = GVIR_INTERFACE(object); - GVirInterfacePrivate *priv = conn->priv; + GVirInterface *iface = GVIR_INTERFACE(object); + GVirInterfacePrivate *priv = iface->priv; - g_debug("Finalize GVirInterface=%p", conn); + g_debug("Finalize GVirInterface=%p", iface); virInterfaceFree(priv->handle); @@ -132,11 +132,11 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass) } -static void gvir_interface_init(GVirInterface *conn) +static void gvir_interface_init(GVirInterface *iface) { - g_debug("Init GVirInterface=%p", conn); + g_debug("Init GVirInterface=%p", iface); - conn->priv = GVIR_INTERFACE_GET_PRIVATE(conn); + iface->priv = GVIR_INTERFACE_GET_PRIVATE(iface); } typedef struct virInterface GVirInterfaceHandle; diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index 005b793..e20343e 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -108,13 +108,13 @@ static void gvir_manager_class_init(GVirManagerClass *klass) } -static void gvir_manager_init(GVirManager *conn) +static void gvir_manager_init(GVirManager *manager) { GVirManagerPrivate *priv; - g_debug("Init GVirManager=%p", conn); + g_debug("Init GVirManager=%p", manager); - priv = conn->priv = GVIR_MANAGER_GET_PRIVATE(conn); + priv = manager->priv = GVIR_MANAGER_GET_PRIVATE(manager); priv->lock = g_mutex_new(); } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index c1ba6ac..60756c0 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -148,11 +148,11 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass) } -static void gvir_network_filter_init(GVirNetworkFilter *conn) +static void gvir_network_filter_init(GVirNetworkFilter *filter) { - g_debug("Init GVirNetworkFilter=%p", conn); + g_debug("Init GVirNetworkFilter=%p", filter); - conn->priv = GVIR_NETWORK_FILTER_GET_PRIVATE(conn); + filter->priv = GVIR_NETWORK_FILTER_GET_PRIVATE(filter); } typedef struct virNWFilter GVirNetworkFilterHandle; diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 25d89af..b1b38a0 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -62,8 +62,8 @@ static void gvir_network_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirNetwork *conn = GVIR_NETWORK(object); - GVirNetworkPrivate *priv = conn->priv; + GVirNetwork *network = GVIR_NETWORK(object); + GVirNetworkPrivate *priv = network->priv; switch (prop_id) { case PROP_HANDLE: @@ -81,8 +81,8 @@ static void gvir_network_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirNetwork *conn = GVIR_NETWORK(object); - GVirNetworkPrivate *priv = conn->priv; + GVirNetwork *network = GVIR_NETWORK(object); + GVirNetworkPrivate *priv = network->priv; switch (prop_id) { case PROP_HANDLE: @@ -99,10 +99,10 @@ static void gvir_network_set_property(GObject *object, static void gvir_network_finalize(GObject *object) { - GVirNetwork *conn = GVIR_NETWORK(object); - GVirNetworkPrivate *priv = conn->priv; + GVirNetwork *network = GVIR_NETWORK(object); + GVirNetworkPrivate *priv = network->priv; - g_debug("Finalize GVirNetwork=%p", conn); + g_debug("Finalize GVirNetwork=%p", network); virNetworkFree(priv->handle); @@ -145,11 +145,11 @@ static void gvir_network_class_init(GVirNetworkClass *klass) } -static void gvir_network_init(GVirNetwork *conn) +static void gvir_network_init(GVirNetwork *network) { - g_debug("Init GVirNetwork=%p", conn); + g_debug("Init GVirNetwork=%p", network); - conn->priv = GVIR_NETWORK_GET_PRIVATE(conn); + network->priv = GVIR_NETWORK_GET_PRIVATE(network); } typedef struct virNetwork GVirNetworkHandle; diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index 2540795..18394d1 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -61,8 +61,8 @@ static void gvir_node_device_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); - GVirNodeDevicePrivate *priv = conn->priv; + GVirNodeDevice *device = GVIR_NODE_DEVICE(object); + GVirNodeDevicePrivate *priv = device->priv; switch (prop_id) { case PROP_HANDLE: @@ -80,8 +80,8 @@ static void gvir_node_device_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); - GVirNodeDevicePrivate *priv = conn->priv; + GVirNodeDevice *device = GVIR_NODE_DEVICE(object); + GVirNodeDevicePrivate *priv = device->priv; switch (prop_id) { case PROP_HANDLE: @@ -98,10 +98,10 @@ static void gvir_node_device_set_property(GObject *object, static void gvir_node_device_finalize(GObject *object) { - GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); - GVirNodeDevicePrivate *priv = conn->priv; + GVirNodeDevice *device = GVIR_NODE_DEVICE(object); + GVirNodeDevicePrivate *priv = device->priv; - g_debug("Finalize GVirNodeDevice=%p", conn); + g_debug("Finalize GVirNodeDevice=%p", device); virNodeDeviceFree(priv->handle); @@ -132,11 +132,11 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass) } -static void gvir_node_device_init(GVirNodeDevice *conn) +static void gvir_node_device_init(GVirNodeDevice *device) { - g_debug("Init GVirNodeDevice=%p", conn); + g_debug("Init GVirNodeDevice=%p", device); - conn->priv = GVIR_NODE_DEVICE_GET_PRIVATE(conn); + device->priv = GVIR_NODE_DEVICE_GET_PRIVATE(device); } typedef struct virNodeDevice GVirNodeDeviceHandle; diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index 8ff17b5..f03b44c 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -62,8 +62,8 @@ static void gvir_secret_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; switch (prop_id) { case PROP_HANDLE: @@ -81,8 +81,8 @@ static void gvir_secret_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; switch (prop_id) { case PROP_HANDLE: @@ -99,10 +99,10 @@ static void gvir_secret_set_property(GObject *object, static void gvir_secret_finalize(GObject *object) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; - g_debug("Finalize GVirSecret=%p", conn); + g_debug("Finalize GVirSecret=%p", secret); virSecretFree(priv->handle); @@ -112,8 +112,8 @@ static void gvir_secret_finalize(GObject *object) static void gvir_secret_constructed(GObject *object) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; G_OBJECT_CLASS(gvir_secret_parent_class)->constructed(object); @@ -147,11 +147,11 @@ static void gvir_secret_class_init(GVirSecretClass *klass) } -static void gvir_secret_init(GVirSecret *conn) +static void gvir_secret_init(GVirSecret *secret) { - g_debug("Init GVirSecret=%p", conn); + g_debug("Init GVirSecret=%p", secret); - conn->priv = GVIR_SECRET_GET_PRIVATE(conn); + secret->priv = GVIR_SECRET_GET_PRIVATE(secret); } typedef struct virSecret GVirSecretHandle; diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 282eee1..e02adc8 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -123,8 +123,8 @@ static void gvir_storage_pool_finalize(GObject *object) static void gvir_storage_pool_constructed(GObject *object) { - GVirStoragePool *conn = GVIR_STORAGE_POOL(object); - GVirStoragePoolPrivate *priv = conn->priv; + GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePoolPrivate *priv = pool->priv; G_OBJECT_CLASS(gvir_storage_pool_parent_class)->constructed(object); diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 7e5ac7d..4c0160a 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -65,8 +65,8 @@ static void gvir_storage_vol_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirStorageVol *conn = GVIR_STORAGE_VOL(object); - GVirStorageVolPrivate *priv = conn->priv; + GVirStorageVol *vol = GVIR_STORAGE_VOL(object); + GVirStorageVolPrivate *priv = vol->priv; switch (prop_id) { case PROP_HANDLE: @@ -88,8 +88,8 @@ static void gvir_storage_vol_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirStorageVol *conn = GVIR_STORAGE_VOL(object); - GVirStorageVolPrivate *priv = conn->priv; + GVirStorageVol *vol = GVIR_STORAGE_VOL(object); + GVirStorageVolPrivate *priv = vol->priv; switch (prop_id) { case PROP_HANDLE: @@ -109,10 +109,10 @@ static void gvir_storage_vol_set_property(GObject *object, static void gvir_storage_vol_finalize(GObject *object) { - GVirStorageVol *conn = GVIR_STORAGE_VOL(object); - GVirStorageVolPrivate *priv = conn->priv; + GVirStorageVol *vol = GVIR_STORAGE_VOL(object); + GVirStorageVolPrivate *priv = vol->priv; - g_debug("Finalize GVirStorageVol=%p", conn); + g_debug("Finalize GVirStorageVol=%p", vol); virStorageVolFree(priv->handle); @@ -154,11 +154,11 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass) } -static void gvir_storage_vol_init(GVirStorageVol *conn) +static void gvir_storage_vol_init(GVirStorageVol *vol) { - g_debug("Init GVirStorageVol=%p", conn); + g_debug("Init GVirStorageVol=%p", vol); - conn->priv = GVIR_STORAGE_VOL_GET_PRIVATE(conn); + vol->priv = GVIR_STORAGE_VOL_GET_PRIVATE(vol); } typedef struct virStorageVol GVirStorageVolHandle; -- 1.8.1.4

2 1

[libvirt] [libvirt-glib] gconfig: Fix gvir_config_domain_graphics_new_from_tree
by Christophe Fergeau 01 May '13

01 May '13

It does not handle the recently added GVirConfigDomainGraphicsRdp and GVirConfigDomainGraphicsDesktop classes. --- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index 2b54b87..e42e0cc 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -67,17 +67,13 @@ gvir_config_domain_graphics_new_from_tree(GVirConfigXmlDoc *doc, } else if (g_str_equal(type, "spice")) { gtype = GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_SPICE; } else if (g_str_equal(type, "rdp")) { - goto unimplemented; + gtype = GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_RDP; } else if (g_str_equal(type, "desktop")) { - goto unimplemented; + gtype = GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_DESKTOP; } else { g_debug("Unknown graphics node: %s", type); return NULL; } return GVIR_CONFIG_DOMAIN_DEVICE(gvir_config_object_new_from_tree(gtype, doc, NULL, tree)); - -unimplemented: - g_debug("Parsing of '%s' graphics nodes is unimplemented", type); - return NULL; } -- 1.8.1.4

2 1

[libvirt] [PATCH] docs: Fix closing tag in snapshot documentation
by Christophe Fergeau 01 May '13

01 May '13

Commit cc6d19f3 added text containing "<code>snapshot<code>" to formatsnapshot.html.in. The closing tag is missing '/' which causes the documentation to misrender. --- Pushed under the trivial rule. docs/formatsnapshot.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatsnapshot.html.in b/docs/formatsnapshot.html.in index b1e259f..2e830f8 100644 --- a/docs/formatsnapshot.html.in +++ b/docs/formatsnapshot.html.in @@ -147,7 +147,7 @@ devices</a> specified for the domain at the time of the snapshot. The attribute <code>snapshot</code> is optional, and the possible values are the same as the - <code>snapshot<code> attribute for + <code>snapshot</code> attribute for <a href="formatdomain.html#elementsDisks">disk devices</a> (<code>no</code>, <code>internal</code>, or <code>external</code>). Some hypervisors like ESX -- 1.8.1.4

1 0

[libvirt] Entering freeze for libvirt-1.0.5
by Daniel Veillard 01 May '13

01 May '13

So as discussed earlier this week, I have tagged the release candidate 1 of libvirt-1.0.5 in git and pushed the tarball and associated rpms to the FTP at: ftp://libvirt.org/libvirt/ We may still push some of the patches needed by Laine to finish the serie started yesterday, but at this point we should focuse our commits on bug fixes and documentation. I will make an rc2 at the beginning of next week and hopefully can push the final version on May 2nd. This passed my own small usage tests, but please give it a try. As usual some feedback on portability issues are really welcome too :-) thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

9 16

[libvirt] Should we keep the original vnc behavior even if the underlying qemu changes?
by Guan Nan Ren 01 May '13

01 May '13

Hi Everybody, Since qemu v1.1.0 upstream commit 8cf364, qemu implemented shared-flag handling the default qemu vnc server behavior from mode 'ignore' to 'allow-exclusive'. The direct effect is as follows for libvirt user: vncviwer client: before: all client could share desktop without any option after: all client need -Shared options for desktop sharing. One client without -Shared option breaks others's connection virt-viewer: before: virt-viewer could support multiple desktop sharing after: only one active connection If we need to keep the original vnc behavior at libvirt level, the '-vnc :1,share=ignore' need to add into qemu commandline. Any ideas about this? Reference RFB Protocol about shared-flag Shared-flag is non-zero (true) if the server should try to share the desktop by leaving other clients connected, zero (false) if it should give exclusive access to this client by disconnecting all other clients From qemu doc: Set display sharing policy. 'allow-exclusive' allows clients to ask for exclusive access. As suggested by the rfb spec this is implemented by dropping other connections. Connecting multiple clients in parallel requires all clients asking for a shared session (vncviewer: -shared switch). This is the default. 'force-shared' disables exclusive client access. Useful for shared desktop sessions, where you don't want someone forgetting specify -shared disconnect everybody else. 'ignore' completely ignores the shared flag and allows everybody connect unconditionally. Doesn't conform to the rfb spec but is traditional qemu behavior. Guannan

2 1

[libvirt] Bug Reports
by Dennis Zou (yunzou) 01 May '13

01 May '13

1.Lost soapAction in http request header When I tried to retrieve the property of storage.perDatastoreUsage under specify virtual machine and got a invalidProperty error but other properties(e.g. summary.storage, guest) under the same virtual machine are ok. Then I write a same program use vsphere web service sdk in java and catch the http package by wireshark. By comparing, I found that we lost soapAction field in http request header, it seems to like this: SOAPAction: "urn:vim25/5.0". I checked the vsphere development document and found some key description as following: When a client application connects to a Web service running on an vSphere server (ESX/ESXi or vCenter Server system), the server detects the version of the API that was used to develop the client and makes available only those operations supported by the client. Client applications convey information about the API version used in the SOAP messages that they send to a vSphere server. These SOAP messages include a versionID in the soapAction attribute. The details are handled transparently by the SOAP toolkit and the client proxy code. The server adjusts its behavior based on the client's version information, exposing the API version that the client supports to the client. If you are developing a client application that must support multiple server versions at the same time (ESX/ESXi 5.0 and ESX/ESXi 3.x, for example), you must obtain information about the API versions that are supported on the server and provide logic in your code to use or not use features, based upon the version information. Finally, I added the soapAction field into http request header and got a correct result. So I added some lines in function esxVI_Context_Connect() at src/esx/esx_vi.c as following: if (virAsprintf(&soapAction, "SOAPAction: \"urn:vim25/%s\"", ctx->service->about->apiVersion) < 0) { virReportOOMError(); goto cleanup; } ctx->curl->headers = curl_slist_append(ctx->curl->headers, soapAction); 2.cat not deserialize the String(maybe other primary types are included) which as a list when I tried to retrieve the property of config.network.pnic under hostsystem and got an error in virsh.log which goes like as following: 2013-04-22 01:57:42.692+0000: 29640: error : esxVI_String_Deserialize:1233 : internal error Wrong XML element type 3 Then I debug my program and find that bug lays where deserialize resourcePoolSchedulerDisallowedReason which is a member of PhysicalNic and has a string[] type. I catch the soap message by wireshark and find that this xml element has no child ,it seems like as following: <resourcePoolSchedulerDisallowedReason>hardwareUnsupported</resourcePoolSchedulerDisallowedReason But the libvirt program still parses it as if it has children, I think this is key point that leads to this bug. Now I fix my program by setting this member as ignore in esx_vi_generator.input. Maybe you want to investigate and fix this bug. Regards, Dennis

2 1

[libvirt] libvirt-snmp on Ubuntu
by george john 01 May '13

01 May '13

Hi, Are there packages of "libvirt-snmp" for Ubuntu? Or instructions to compile libvirt-snmp on Ubuntu? Looks like the instructions given at http://wiki.libvirt.org/page/Libvirt-snmp are for RedHat. Thank you, George

1 0

[libvirt] [sandbox PATCH] Add a option --rpm if rpm autodetection fail
by Michael Scherer 01 May '13

01 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=954187 If someone use a custom unit file for the sandbox, the rpm autodetection fail with a exception. Now, this will show a error message, asking to use --rpm and use this rpm if autodetection fail. --- bin/virt-sandbox-service | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 3b78512..a076397 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -363,10 +363,11 @@ class SystemdContainer(Container): DEFAULT_UNIT = "/etc/systemd/system/%s_sandbox.service" - def __init__(self, name=None, uri = "lxc:///", path = Container.DEFAULT_PATH, config=None, create=False): + def __init__(self, name=None, uri = "lxc:///", path = Container.DEFAULT_PATH, config=None, create=False, rpm=None): Container.__init__(self, name, uri, path, config, create) self.copy = False self.unit_file_list = [] + self.rpm = rpm if create: self.config = LibvirtSandbox.ConfigServiceSystemd.new(name) else: @@ -496,8 +497,18 @@ WantedBy=%(TARGET)s self.ts = rpm.ts() + nb_rpm = 0 for u, src in self.unit_file_list: - self.extract_rpm_for_unit(src) + rpm_name = self.get_rpm_for_unit(src) + if rpm_name: + self.extract_rpm(rpm_name) + nb_rpm += 1 + + if nb_rpm == 0: + if self.rpm: + self.extract_rpm(self.rpm) + else: + raise ValueError([_("Cannot autodetect the rpm for unit files, please use --rpm")]) def split_filename(self, filename): if filename[-4:] == '.rpm': @@ -521,12 +532,21 @@ WantedBy=%(TARGET)s name = filename[epochIndex + 1:verIndex] return name, ver, rel, epoch, arch - def extract_rpm_for_unit(self, unitfile): + def get_rpm_for_unit(self, unitfile): mi = self.ts.dbMatch(rpm.RPMTAG_BASENAMES, unitfile) try: h = mi.next(); except exceptions.StopIteration: - raise ValueError([_("Cannot find package containing %s") % unitfile]) + return None + return h['name'] + + + def extract_rpm(self, rpm_name): + mi = self.ts.dbMatch('name', rpm_name) + try: + h = mi.next(); + except exceptions.StopIteration: + raise ValueError([_("Cannot find package named %s") % rpm_name]) for fentry in h.fiFromHeader(): fname = fentry[0] @@ -765,11 +785,14 @@ def create(args): if len(args.command) == 0 and len(args.unitfiles) == 0: raise ValueError([_("You must specify a command or a unit file")]) + if args.rpm and len(args.unitfiles) != 1: + raise ValueError([_("Option --rpm cannot be used without a unit file")]) + if len(args.command) > 0: container = GenericContainer(name = args.name, uri=args.uri, create = True) container.set_command(args.command) else: - container = SystemdContainer(name = args.name, uri=args.uri, create = True) + container = SystemdContainer(name = args.name, uri=args.uri, create = True, rpm = args.rpm) container.set_copy(args.copy) container.set_unit_file_list(args.unitfiles) for net in args.network: @@ -972,6 +995,15 @@ class SetNet(argparse.Action): nets = [values] setattr(namespace, self.dest, nets) +class CheckRpm(argparse.Action): + def __call__(self, parser, namespace, value, option_string=None): + nb_rpm = len(rpm.TransactionSet().dbMatch('name', value)) + if nb_rpm == 0: + raise OSError(_("Cannot find %s rpm") % value) + elif nb_rpm > 1: + raise OSError(_("%s rpm is installed more than once") % value) + setattr(namespace, self.dest, value) + def requires_name(parser): parser.add_argument("name", help=_("name of the sandbox container")) @@ -1015,6 +1047,10 @@ def gen_create_args(subparser): action=CheckUnit, dest="unitfiles", default=[], help=_("Systemd Unit file to run within the systemd sandbox container. Commands cannot be specified with unit files.")) + parser.add_argument("-r", "--rpm", + action=CheckRpm, + dest="rpm", default=None, + help=_("Rpm configuration to use in the container. Default: autodetected from unit files, unless if using a custom unit file.")) parser.add_argument("--username", dest="username", help=_("Specify the username for the container. Default: UID username.")) parser.add_argument("-U", "--uid", dest="uid", -- 1.8.2.1

2 2

[libvirt] [PATCHv2] rpc: message related sizes enlarged
by Viktor Mihajlovski 01 May '13

01 May '13

From: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> We have seen an issue on s390x platform where domain XMLs larger than 1MB were used. The define command was finished successfully. The dumpxml command was not successful (i.e. could not encode message payload). Enlarged message related sizes (e.g. maximum string size, message size, etc.) to handle larger system configurations used on s390x platform. To improve handling of the RPC message size the allocation during encode process is changed to a dynamic one (i.e. starting with 64kB initial size and increasing that size in steps up to 16MB if the payload data is larger). Signed-off-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/libvirt.c | 4 ++++ src/remote/remote_protocol.x | 6 +++--- src/rpc/virnetmessage.c | 46 ++++++++++++++++++++++++++++++++++-------- src/rpc/virnetmessage.h | 3 ++- src/rpc/virnetprotocol.x | 16 +++++++++++---- tests/virnetmessagetest.c | 2 +- 6 files changed, 60 insertions(+), 17 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 2daa0b4..e6dd315 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7784,6 +7784,8 @@ error: * For your program to be able to work reliably over a remote * connection you should split large requests to <= 65536 bytes. * However, with 0.9.13 this RPC limit has been raised to 1M byte. + * Starting with version 1.0.5 the RPC limit has been raised again. + * Now large requests up to 16M byte are supported. * * Returns: 0 in case of success or -1 in case of failure. */ @@ -7934,6 +7936,8 @@ error: * For your program to be able to work reliably over a remote * connection you should split large requests to <= 65536 bytes. * However, with 0.9.13 this RPC limit has been raised to 1M byte. + * Starting with version 1.0.5 the RPC limit has been raised again. + * Now large requests up to 16M byte are supported. * * Returns: 0 in case of success or -1 in case of failure. */ diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 512ba2e..f61d10c 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -65,7 +65,7 @@ * This is an arbitrary limit designed to stop the decoder from trying * to allocate unbounded amounts of memory when fed with a bad message. */ -const REMOTE_STRING_MAX = 1048576; +const REMOTE_STRING_MAX = 4194304; /* A long string, which may NOT be NULL. */ typedef string remote_nonnull_string<REMOTE_STRING_MAX>; @@ -160,13 +160,13 @@ const REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX = 1024; * Note applications need to be aware of this limit and issue multiple * requests for large amounts of data. */ -const REMOTE_DOMAIN_BLOCK_PEEK_BUFFER_MAX = 1048576; +const REMOTE_DOMAIN_BLOCK_PEEK_BUFFER_MAX = 4194304; /* Maximum length of a memory peek buffer message. * Note applications need to be aware of this limit and issue multiple * requests for large amounts of data. */ -const REMOTE_DOMAIN_MEMORY_PEEK_BUFFER_MAX = 1048576; +const REMOTE_DOMAIN_MEMORY_PEEK_BUFFER_MAX = 4194304; /* * Maximum length of a security label list. diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 647fef7..b2c6e5b 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -221,7 +221,7 @@ int virNetMessageEncodeHeader(virNetMessagePtr msg) int ret = -1; unsigned int len = 0; - msg->bufferLength = VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX; + msg->bufferLength = VIR_NET_MESSAGE_INITIAL + VIR_NET_MESSAGE_LEN_MAX; if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) { virReportOOMError(); return ret; @@ -351,9 +351,27 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, xdrmem_create(&xdr, msg->buffer + msg->bufferOffset, msg->bufferLength - msg->bufferOffset, XDR_ENCODE); - if (!(*filter)(&xdr, data)) { - virReportError(VIR_ERR_RPC, "%s", _("Unable to encode message payload")); - goto error; + /* Try to encode the payload. If the buffer is too small increase it. */ + while (!(*filter)(&xdr, data)) { + if ((msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 > VIR_NET_MESSAGE_MAX) { + virReportError(VIR_ERR_RPC, "%s", _("Unable to encode message payload")); + goto error; + } + + xdr_destroy(&xdr); + + msg->bufferLength = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 + + VIR_NET_MESSAGE_LEN_MAX; + + if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) { + virReportOOMError(); + goto error; + } + + xdrmem_create(&xdr, msg->buffer + msg->bufferOffset, + msg->bufferLength - msg->bufferOffset, XDR_ENCODE); + + VIR_DEBUG("Increased message buffer length = %zu", msg->bufferLength); } /* Get the length stored in buffer. */ @@ -415,11 +433,23 @@ int virNetMessageEncodePayloadRaw(virNetMessagePtr msg, XDR xdr; unsigned int msglen; + /* If the message buffer is too small for the payload increase it accordingly. */ if ((msg->bufferLength - msg->bufferOffset) < len) { - virReportError(VIR_ERR_RPC, - _("Stream data too long to send (%zu bytes needed, %zu bytes available)"), - len, (msg->bufferLength - msg->bufferOffset)); - return -1; + if ((msg->bufferOffset + len) > VIR_NET_MESSAGE_MAX) { + virReportError(VIR_ERR_RPC, + _("Stream data too long to send (%zu bytes needed, %zu bytes available)"), + len, (VIR_NET_MESSAGE_MAX - msg->bufferOffset)); + return -1; + } + + msg->bufferLength = msg->bufferOffset + len; + + if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) { + virReportOOMError(); + return -1; + } + + VIR_DEBUG("Increased message buffer length = %zu", msg->bufferLength); } memcpy(msg->buffer + msg->bufferOffset, data, len); diff --git a/src/rpc/virnetmessage.h b/src/rpc/virnetmessage.h index dfa1c6c..c94dddc 100644 --- a/src/rpc/virnetmessage.h +++ b/src/rpc/virnetmessage.h @@ -34,7 +34,8 @@ typedef void (*virNetMessageFreeCallback)(virNetMessagePtr msg, void *opaque); struct _virNetMessage { bool tracked; - char *buffer; /* Typically VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX */ + char *buffer; /* Initially VIR_NET_MESSAGE_INITIAL + VIR_NET_MESSAGE_LEN_MAX */ + /* Maximum VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX */ size_t bufferLength; size_t bufferOffset; diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x index eb2e81d..131e40b 100644 --- a/src/rpc/virnetprotocol.x +++ b/src/rpc/virnetprotocol.x @@ -44,23 +44,31 @@ /*----- Data types. -----*/ +/* Initial message size. + * When the message payload is larger this initial size will be + * quadrupled until the maximum total message size is reached. + */ +const VIR_NET_MESSAGE_INITIAL = 65536; + /* Maximum total message size (serialised). */ -const VIR_NET_MESSAGE_MAX = 4194304; +const VIR_NET_MESSAGE_MAX = 16777216; /* Size of struct virNetMessageHeader (serialised)*/ const VIR_NET_MESSAGE_HEADER_MAX = 24; /* Size of message payload */ -const VIR_NET_MESSAGE_PAYLOAD_MAX = 4194280; +const VIR_NET_MESSAGE_PAYLOAD_MAX = 16777192; -/* Size of message length field. Not counted in VIR_NET_MESSAGE_MAX */ +/* Size of message length field. Not counted in VIR_NET_MESSAGE_MAX + * and VIR_NET_MESSAGE_INITIAL. + */ const VIR_NET_MESSAGE_LEN_MAX = 4; /* Length of long, but not unbounded, strings. * This is an arbitrary limit designed to stop the decoder from trying * to allocate unbounded amounts of memory when fed with a bad message. */ -const VIR_NET_MESSAGE_STRING_MAX = 1048576; +const VIR_NET_MESSAGE_STRING_MAX = 4194304; /* Limit on number of File Descriptors allowed to be * passed per message diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index e58fd1f..607e0bd 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -47,7 +47,7 @@ static int testMessageHeaderEncode(const void *args ATTRIBUTE_UNUSED) }; /* According to doc to virNetMessageEncodeHeader(&msg): * msg->buffer will be this long */ - unsigned long msg_buf_size = VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX; + unsigned long msg_buf_size = VIR_NET_MESSAGE_INITIAL + VIR_NET_MESSAGE_LEN_MAX; int ret = -1; if (!msg) { -- 1.7.9.5

3 2

[libvirt] [PATCH v2 0/5] Support NBD volumes with LXC containers
by Daniel P. Berrange 01 May '13

01 May '13

A second version of: https://www.redhat.com/archives/libvir-list/2013-March/msg00941.html Aside from the addressing the previous round of feedbac, this adds use of the new '--format' flag to qemu-nbd. This is introduced due to CVE-2013-1922. The upshot is that this code won't work with any qemu-nbd binary lacking the --format flag. This is intentionale.

2 12

[libvirt] [PATCH] qemu: fix failure to start with spice graphics and no tls
by Laine Stump 01 May '13

01 May '13

Commit eca3fdf inadvertantly caused a failure to start for any domain with the following in its config: <graphics type='spice' autoport='yes'/> The problem is that when tlsPort == 0 and defaultMode == "any" (which is the default for defaultMode), this would be flagged in the code as "needTLSPort", and if there was then no spice tls config, the new error+fail would happen. This patch checks for the case of defaultMode == "any", and in that case simply doesn't allocate a TLS port (since that's probably not what the user wanted, and it would have failed later anyway.). It does leave the error in place for cases when the user specifically asked to use tls in one way or another, though. --- src/qemu/qemu_process.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e75c8c9..58f64b7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3294,23 +3294,34 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, if (needTLSPort || graphics->data.spice.tlsPort == -1) { if (!cfg->spiceTLS) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Auto allocation of spice TLS port requested " - "but spice TLS is disabled in qemu.conf")); - goto error; - } - - if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) - goto error; + /* log an error and fail if tls was specifically + * requested, or simply ignore (don't allocate a port) + * if we're here due to "defaultMode='any'" + * (aka unspecified). + */ + if ((graphics->data.spice.tlsPort == -1) || + (graphics->data.spice.defaultMode + == VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Auto allocation of spice TLS port requested " + "but spice TLS is disabled in qemu.conf")); + goto error; + } + } else { + /* cfg->spiceTLS *is* in place, so it makes sense to + * allocate a port. + */ + if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) + goto error; - if (tlsPort == 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to find an unused port for SPICE TLS")); - virPortAllocatorRelease(driver->remotePorts, port); - goto error; + if (tlsPort == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to find an unused port for SPICE TLS")); + virPortAllocatorRelease(driver->remotePorts, port); + goto error; + } + graphics->data.spice.tlsPort = tlsPort; } - - graphics->data.spice.tlsPort = tlsPort; } return 0; -- 1.7.11.7

2 2

[libvirt] [PATCH 0/2] Get rid of default USB controller on S390
by Viktor Mihajlovski 01 May '13

01 May '13

QEMU for S390 has presently no USB controllers nor a PCI bus. Both are created by the default in the libvirt domain definition. Although this can be suppressed by explicitly specifying an USB controller with model='none', it's a real bad default. With Jan's recent patch we can reliably suppress the USB controller (including it's bogus PCI address) if the source XML has no usb controller element. Explicitly set addresses are still honored. Viktor Mihajlovski (2): S390: Mention changed USB behavior S390: Do not generate a default USB controller docs/formatdomain.html.in | 5 +++-- src/qemu/qemu_domain.c | 8 ++++++++ .../qemuxml2argv-console-sclp.args | 2 +- .../qemuxml2argv-console-virtio-ccw.args | 2 +- .../qemuxml2argv-console-virtio-s390.args | 2 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 2 +- .../qemuxml2argv-disk-virtio-ccw.args | 2 +- .../qemuxml2argv-disk-virtio-s390.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 2 +- .../qemuxml2argv-net-virtio-ccw.args | 2 +- .../qemuxml2argv-net-virtio-s390.args | 2 +- .../qemuxml2argv-virtio-rng-ccw.args | 2 +- 12 files changed, 21 insertions(+), 12 deletions(-) -- 1.7.9.5

2 3

[libvirt] [PATCH] build: fix cygwin build in virnetdev
by Eric Blake 30 Apr '13

30 Apr '13

On cygwin, compilation failed because SIOCSIFHWADDR is undefined. * src/util/virnetdev.c (virNetDevSetMAC): Cygwin can query but not set mac address. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. I may have a few more cygwin-related patches as I continue to try and build there, but figured it's better to send things as individual patches instead of squashing unrelated fixes in one go. src/util/virnetdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 0a3e17d..8013f23 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -132,7 +132,8 @@ int virNetDevExists(const char *ifname) #endif -#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCGIFHWADDR) && defined(SIOCSIFHWADDR) && \ + defined(HAVE_STRUCT_IFREQ) /** * virNetDevSetMAC: * @ifname: interface name to set MTU for -- 1.8.1.4

1 0

[libvirt] [PATCH] build: fix cygwin build in virnetdev
by Eric Blake 30 Apr '13

30 Apr '13

On cygwin, compilation failed because SIOCSIFHWADDR is undefined. * src/util/virnetdev.c (virNetDevSetMAC): Cygwin can query but not set mac address. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virnetdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 0a3e17d..8013f23 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -132,7 +132,8 @@ int virNetDevExists(const char *ifname) #endif -#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCGIFHWADDR) && defined(SIOCSIFHWADDR) && \ + defined(HAVE_STRUCT_IFREQ) /** * virNetDevSetMAC: * @ifname: interface name to set MTU for -- 1.8.1.4

1 0

[libvirt] [PATCH] Need to call virFreeError after virSaveLastError
by John Ferlan 30 Apr '13

30 Apr '13

This is a followup to https://www.redhat.com/archives/libvir-list/2013-April/msg02004.html which noted that bridge_driver.c also had a missing virFreeError() call --- src/network/bridge_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 19c9bdb..8da28e4 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2141,6 +2141,7 @@ err: /* return the original error */ virSetError(orig_error); + virFreeError(orig_error); return -1; } -- 1.8.1.4

2 2

[libvirt] [PATCH] libvirt-guests: status: return non-zero when stopped
by Ján Tomko 30 Apr '13

30 Apr '13

Return 3 when the service is stopped, whether there are saved guests or not. --- tools/libvirt-guests.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 4f2e203..261c488 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -524,10 +524,11 @@ rh_status() { else if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then gettext "started"; echo + RETVAL=0 else gettext "stopped, with no saved guests"; echo + RETVAL=3 fi - RETVAL=0 fi } -- 1.8.1.5

2 2

[libvirt] Location of 64 bit libvirt dlls (Windows)?
by george john 30 Apr '13

30 Apr '13

Thank you for your email. I had tried compiling myself following the instructions at http://libvirt.org/windows.html (Matthias Bolte's msys_setup) but it failed on 2 different machines with an error. I get the below error when I try to run compile_libxml2.sh as per instructions https://github.com/photron/msys_setup/blob/master/readme_libvirt.txt Last few lines before the error is : >>>>>>>>>>>>>>>>> make[5]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[4]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' Making install in tests make[4]: Entering directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[5]: Entering directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[5]: Nothing to be done for `install-exec-am'. test -z "/share/doc/libxml2-python-2.9.0/examples" || /bin/mkdir -p "/share/doc/ libxml2-python-2.9.0/examples" /bin/install -c -m 644 build.py attribs.py tst.py tstxpath.py xpathext.py push. py pushSAX.py pushSAXhtml.py error.py serialize.py validate.py tstURI.py cutnpas te.py xpathret.py xpath.py outbuf.py inbuf.py resolver.py regexp.py reader.py re ader2.py reader3.py reader4.py reader5.py reader6.py reader7.py reader8.py reade rnext.py walker.py nsdel.py ctxterror.py readererr.py relaxng.py schema.py threa d2.py sync.py tstLastError.py indexes.py dtdvalid.py tstmem.py '/share/doc/libxm l2-python-2.9.0/examples' /bin/install -c -m 644 validDTD.py validSchemas.py validRNG.py compareNodes.py xpathns.py xpathleak.py tst.xml valid.xml invalid.xml test.dtd '/share/doc/libxm l2-python-2.9.0/examples' make[5]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[4]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[3]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[2]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[1]: Leaving directory `/src/libxml2/libxml2-2.9.0-0' + cp /python/Lib/site-packages/libxml2mod.dll /python/DLLs/libxml2mod.pyd cp: cannot stat `/python/Lib/site-packages/libxml2mod.dll': No such file or directory >>>>>>>>>>>>>>>>>> Do you know how this error could be resolved? Or are there a different set of instructions I could follow to create the a 64 bit libvirt dll (I am not a C/C++ guy and so have to ask for the instructions). I had posted another question to this forum earlier today(04/30/2013) with the subject "Java client error on Windows 7 64 bit for Libvirt on KVM" on this error. Thank you once again for your help. - George > > --- On Tue, 4/30/13, Eric Blake <eblake(a)redhat.com> > wrote: > > > From: Eric Blake <eblake(a)redhat.com> > > Subject: Re: [libvirt] Location of 64 bit libvirt dlls > (Windows)? > > To: "george john" <simplyjoe13(a)yahoo.com> > > Cc: libvir-list(a)redhat.com > > Date: Tuesday, April 30, 2013, 8:14 AM > > On 04/30/2013 08:49 AM, george john > > wrote: > > > I have written a Java client (64 bit JVM) that > uses > > libvirt APIs on a remote KVM for KVM management. Since > the > > JVM is 64 bit, the client needs 64 bit libvirt dlls and > I > > could not find them (I found 32 bit libvirt dlls on http://libvirt.org/windows.html) > > > > > > Could someone point to where I could find 64 bit > > libvirt dlls? > > > > I don't know if anyone is providing pre-compiled > versions of > > 64-bit > > dlls; you may have to compile it yourself using a > mingw64 > > (cross-)compiler. > > > > -- > > Eric Blake eblake redhat com > > +1-919-301-3266 > > Libvirt virtualization library http://libvirt.org > > > > >

1 0

[libvirt] [PATCH 0/2] fix cgroup setup for vfio hostdevs
by Laine Stump 30 Apr '13

30 Apr '13

The first patch is required for vfio hostdev to work. The 2nd is just a refactor to eliminate duplicated code for usb hostdev cgroup setup. Laine Stump (2): qemu: add vfio devices to cgroup ACL when appropriate qemu: put usb cgroup setup in common function src/qemu/qemu.conf | 2 +- src/qemu/qemu_cgroup.c | 182 ++++++++++++++++++++++++++++++++----- src/qemu/qemu_cgroup.h | 9 +- src/qemu/qemu_hotplug.c | 26 ++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 5 files changed, 174 insertions(+), 46 deletions(-) -- 1.7.11.7

2 7

[libvirt] [PATCH] libxl: Fix double-dispose of libxl domain config
by Jim Fehlig 30 Apr '13

30 Apr '13

libxlBuildDomainConfig() was disposing the libxl_domain_config object on error, only to have it disposed again by libxlBuildDomainConfig()'s caller, which resulted in a segfault. Leave disposing of the config object to it's owner. --- src/libxl/libxl_conf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 7e0753a..3de642b 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -796,19 +796,19 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, return -1; if (libxlMakeDomBuildInfo(def, d_config) < 0) { - goto error; + return -1; } if (libxlMakeDiskList(def, d_config) < 0) { - goto error; + return -1; } if (libxlMakeNicList(def, d_config) < 0) { - goto error; + return -1; } if (libxlMakeVfbList(driver, def, d_config) < 0) { - goto error; + return -1; } d_config->on_reboot = def->onReboot; @@ -816,8 +816,4 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, d_config->on_crash = def->onCrash; return 0; - -error: - libxl_domain_config_dispose(d_config); - return -1; } -- 1.8.0.1

2 2

[libvirt] [PATCH v2 00/37] Change OOM reporting
by Michal Privoznik 30 Apr '13

30 Apr '13

Previously, the first version dropped virReportOOMError from almost everywhere. This series don't set such high goal yet. It just prepares ground for doing so. The worst case scenario is the OOM error is reported twice. Once in VIR_ALLOC, VIR_STRDUP, virAsprintf (or similar), then in virReportOOMError itself. However, once this is pushed, it's easy to get rid of the latter one. Patches available at: git://gitorious.org/~zippy2/libvirt/michal-staging.git branch oom3 Remember, this will not be pushed until we are after the freeze. But the freeze creates a nice steady HEAD which is needed in such a giant change like this one. Michal Privoznik (37): virutil: Move string related functions to virstring.c virstring: Introduce VIR_STRUP and VIR_STRNDUP Adapt to VIR_STRDUP in daemon/* Adapt to VIR_STRDUP in src/conf/* Adapt to VIR_STRDUP in src/cpu/* Adapt to VIR_STRDUP in src/esx/* Adapt to VIR_STRDUP in src/hyperv/* Adapt to VIR_STRDUP in src/libxl/* Adapt to VIR_STRDUP in src/locking/* Adapt to VIR_STRDUP in src/lxc/* Adapt to VIR_STRDUP in src/network/* Adapt to VIR_STRDUP in src/node_device/* Adapt to VIR_STRDUP in src/interface/ Adapt to VIR_STRDUP in src/nwfilter/* Adapt to VIR_STRDUP in src/openvz/* Adapt to VIR_STRDUP in src/parallels/* Adapt to VIR_STRDUP in src/phyp/* Adapt to VIR_STRDUP in src/qemu/* Adapt to VIR_STRDUP in src/remote/* Adapt to VIR_STRDUP in src/rpc/* Adapt to VIR_STRDUP in src/secret/* Adapt to VIR_STRDUP in src/security/* Adapt to VIR_STRDUP in src/storage/* Adapt to VIR_STRDUP in src/test/* Adapt to VIR_STRDUP in src/uml/* Adapt to VIR_STRDUP in src/util/* Adapt to VIR_STRDUP in src/vbox/* Adapt to VIR_STRDUP in src/vmware/* Adapt to VIR_STRDUP in src/vmx/* Adapt to VIR_STRDUP in src/xen/* Adapt to VIR_STRDUP in src/xenapi/* Adapt to VIR_STRDUP in src/xenxs/* Adapt to VIR_STRDUP in tests/* Adapt to VIR_STRDUP in src/* Introduce syntax-check rule to prefer VIR_STRDUP over strdup virstring: Introduce virAsprintfQuiet and virVasprintfQuiet viralloc.c: Do report OOM error in VIR_ALLOC and friends HACKING | 19 ++ cfg.mk | 12 +- daemon/libvirtd-config.c | 39 +-- daemon/libvirtd.c | 19 +- daemon/remote.c | 97 +++---- docs/hacking.html.in | 26 ++ include/libvirt/libvirt.h.in | 10 +- po/POTFILES.in | 1 + python/libvirt-override.c | 103 +++---- src/conf/capabilities.c | 27 +- src/conf/cpu_conf.c | 14 +- src/conf/device_conf.c | 2 +- src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 66 ++--- src/conf/domain_conf.h | 1 - src/conf/domain_event.c | 31 +- src/conf/interface_conf.c | 1 - src/conf/netdev_bandwidth_conf.c | 2 +- src/conf/netdev_vport_profile_conf.c | 1 + src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 29 +- src/conf/nwfilter_conf.c | 20 +- src/conf/nwfilter_conf.h | 1 - src/conf/nwfilter_params.c | 23 +- src/conf/secret_conf.c | 1 - src/conf/snapshot_conf.c | 8 +- src/conf/storage_conf.c | 11 +- src/conf/storage_conf.h | 1 - src/conf/storage_encryption_conf.c | 1 - src/conf/virchrdev.c | 7 +- src/cpu/cpu_generic.c | 6 +- src/cpu/cpu_map.c | 3 +- src/cpu/cpu_powerpc.c | 11 +- src/cpu/cpu_x86.c | 9 +- src/datatypes.c | 26 +- src/driver.c | 2 +- src/esx/esx_device_monitor.c | 1 - src/esx/esx_driver.c | 35 +-- src/esx/esx_interface_driver.c | 6 +- src/esx/esx_network_driver.c | 21 +- src/esx/esx_nwfilter_driver.c | 1 - src/esx/esx_secret_driver.c | 1 - src/esx/esx_storage_backend_iscsi.c | 15 +- src/esx/esx_storage_backend_vmfs.c | 10 +- src/esx/esx_util.c | 39 +-- src/esx/esx_vi.c | 54 +--- src/esx/esx_vi_types.c | 24 +- src/fdstream.c | 1 + src/hyperv/hyperv_device_monitor.c | 1 - src/hyperv/hyperv_driver.c | 37 +-- src/hyperv/hyperv_interface_driver.c | 1 - src/hyperv/hyperv_network_driver.c | 1 - src/hyperv/hyperv_nwfilter_driver.c | 1 - src/hyperv/hyperv_secret_driver.c | 1 - src/hyperv/hyperv_storage_driver.c | 1 - src/hyperv/hyperv_util.c | 16 +- src/hyperv/hyperv_wmi.c | 2 +- src/interface/interface_backend_udev.c | 25 +- src/libvirt.c | 10 +- src/libvirt_private.syms | 36 +-- src/libxl/libxl_conf.c | 59 ++-- src/libxl/libxl_driver.c | 14 +- src/locking/lock_daemon.c | 13 +- src/locking/lock_daemon_config.c | 10 +- src/locking/lock_daemon_dispatch.c | 4 +- src/locking/lock_driver_lockd.c | 24 +- src/locking/lock_driver_sanlock.c | 9 +- src/locking/lock_manager.c | 4 +- src/lxc/lxc_cgroup.c | 3 +- src/lxc/lxc_conf.c | 18 +- src/lxc/lxc_container.c | 10 +- src/lxc/lxc_controller.c | 8 +- src/lxc/lxc_driver.c | 9 +- src/lxc/lxc_fuse.c | 1 + src/lxc/lxc_fuse.h | 1 - src/lxc/lxc_monitor.c | 1 + src/lxc/lxc_process.c | 5 +- src/network/bridge_driver.c | 30 +- src/node_device/node_device_driver.c | 29 +- src/node_device/node_device_hal.c | 13 +- src/node_device/node_device_linux_sysfs.c | 1 + src/node_device/node_device_udev.c | 104 +++---- src/nodeinfo.c | 6 +- src/nwfilter/nwfilter_dhcpsnoop.c | 16 +- src/nwfilter/nwfilter_driver.c | 5 +- src/nwfilter/nwfilter_ebiptables_driver.c | 12 +- src/nwfilter/nwfilter_gentech_driver.c | 4 +- src/nwfilter/nwfilter_learnipaddr.c | 4 +- src/openvz/openvz_conf.c | 33 ++- src/openvz/openvz_driver.c | 32 +-- src/parallels/parallels_driver.c | 36 +-- src/parallels/parallels_network.c | 14 +- src/parallels/parallels_storage.c | 40 ++- src/parallels/parallels_utils.c | 2 +- src/phyp/phyp_driver.c | 37 +-- src/qemu/qemu_agent.c | 1 + src/qemu/qemu_bridge_filter.c | 1 - src/qemu/qemu_capabilities.c | 38 +-- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 282 ++++++++----------- src/qemu/qemu_conf.c | 33 +-- src/qemu/qemu_domain.c | 17 +- src/qemu/qemu_driver.c | 93 +++--- src/qemu/qemu_hotplug.c | 9 +- src/qemu/qemu_migration.c | 17 +- src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_monitor_json.c | 40 ++- src/qemu/qemu_monitor_text.c | 10 +- src/qemu/qemu_process.c | 58 ++-- src/remote/remote_driver.c | 83 +++--- src/rpc/gendispatch.pl | 13 +- src/rpc/virkeepalive.c | 1 - src/rpc/virnetclient.c | 8 +- src/rpc/virnetmessage.c | 11 +- src/rpc/virnetsaslcontext.c | 3 +- src/rpc/virnetserver.c | 4 +- src/rpc/virnetserverclient.c | 8 +- src/rpc/virnetservermdns.c | 4 +- src/rpc/virnetsocket.c | 8 +- src/rpc/virnetsshsession.c | 23 +- src/rpc/virnettlscontext.c | 14 +- src/secret/secret_driver.c | 5 +- src/security/security_apparmor.c | 13 +- src/security/security_dac.c | 8 +- src/security/security_nop.c | 4 +- src/security/security_selinux.c | 51 ++-- src/security/virt-aa-helper.c | 6 +- src/storage/parthelper.c | 7 +- src/storage/storage_backend.c | 18 +- src/storage/storage_backend_disk.c | 16 +- src/storage/storage_backend_fs.c | 18 +- src/storage/storage_backend_iscsi.c | 16 +- src/storage/storage_backend_logical.c | 25 +- src/storage/storage_backend_mpath.c | 4 +- src/storage/storage_backend_rbd.c | 4 +- src/storage/storage_backend_scsi.c | 17 +- src/storage/storage_backend_sheepdog.c | 1 - src/storage/storage_driver.c | 13 +- src/test/test_driver.c | 84 +++--- src/uml/uml_conf.c | 7 +- src/uml/uml_driver.c | 8 +- src/util/iohelper.c | 1 + src/util/viralloc.c | 95 ++++++- src/util/viralloc.h | 54 +++- src/util/viraudit.c | 6 +- src/util/virauth.c | 9 +- src/util/virauthconfig.c | 7 +- src/util/virbitmap.c | 10 +- src/util/virbuffer.c | 8 +- src/util/vircgroup.c | 31 +- src/util/vircommand.c | 34 ++- src/util/vircommand.h | 1 - src/util/virconf.c | 21 +- src/util/virdnsmasq.c | 5 +- src/util/virebtables.c | 36 +-- src/util/virerror.c | 25 +- src/util/virfile.c | 1 + src/util/virhash.c | 5 +- src/util/virhook.h | 1 - src/util/viridentity.c | 9 +- src/util/virinitctl.c | 3 +- src/util/viriptables.c | 6 +- src/util/virjson.c | 18 +- src/util/virkeyfile.c | 7 +- src/util/virlockspace.c | 14 +- src/util/virlog.c | 21 +- src/util/virnetdev.c | 2 + src/util/virnetdevbandwidth.c | 1 + src/util/virnetdevbridge.c | 1 + src/util/virnetdevmacvlan.c | 10 +- src/util/virnetdevopenvswitch.c | 1 + src/util/virnetdevopenvswitch.h | 1 - src/util/virnetdevtap.c | 7 +- src/util/virnetdevveth.c | 2 + src/util/virnetdevvportprofile.c | 4 +- src/util/virobject.c | 5 +- src/util/virpci.c | 7 +- src/util/virpidfile.c | 1 + src/util/virprocess.c | 1 + src/util/virrandom.c | 1 + src/util/virsexpr.c | 27 +- src/util/virsocketaddr.c | 6 +- src/util/virstatslinux.c | 1 - src/util/virstoragefile.c | 13 +- src/util/virstring.c | 451 +++++++++++++++++++++++++++++- src/util/virstring.h | 74 +++++ src/util/virsysinfo.c | 170 +++++------ src/util/virthreadpthread.c | 2 +- src/util/virtime.c | 1 - src/util/virtpm.c | 2 +- src/util/virtypedparam.c | 9 +- src/util/viruri.c | 20 +- src/util/virusb.c | 1 + src/util/virutil.c | 393 ++------------------------ src/util/virutil.h | 49 ---- src/util/virxml.c | 7 +- src/vbox/vbox_MSCOMGlue.c | 1 - src/vbox/vbox_XPCOMCGlue.c | 5 +- src/vbox/vbox_driver.c | 1 - src/vbox/vbox_tmpl.c | 191 +++++++------ src/vmware/vmware_conf.c | 15 +- src/vmware/vmware_driver.c | 13 +- src/vmx/vmx.c | 26 +- src/xen/block_stats.c | 2 +- src/xen/xen_driver.c | 4 +- src/xen/xen_hypervisor.c | 17 +- src/xen/xen_inotify.c | 11 +- src/xen/xend_internal.c | 55 ++-- src/xen/xm_internal.c | 8 +- src/xen/xs_internal.c | 22 +- src/xenapi/xenapi_driver.c | 34 ++- src/xenapi/xenapi_utils.c | 22 +- src/xenxs/xen_sxpr.c | 108 +++---- src/xenxs/xen_xm.c | 44 +-- tests/commandhelper.c | 14 +- tests/commandtest.c | 4 +- tests/cputest.c | 1 + tests/domainsnapshotxml2xmltest.c | 1 + tests/esxutilstest.c | 1 - tests/interfacexml2xmltest.c | 2 +- tests/libvirtdconftest.c | 1 + tests/lxcxml2xmltest.c | 1 + tests/networkxml2conftest.c | 3 + tests/networkxml2xmltest.c | 1 + tests/nodedevxml2xmltest.c | 1 + tests/nodeinfotest.c | 2 +- tests/nwfilterxml2xmltest.c | 1 + tests/openvzutilstest.c | 8 +- tests/qemuargv2xmltest.c | 2 +- tests/qemuhelptest.c | 1 + tests/qemumonitortest.c | 1 - tests/qemumonitortestutils.c | 10 +- tests/qemuxml2argvtest.c | 28 +- tests/qemuxml2xmltest.c | 1 + tests/qemuxmlnstest.c | 6 +- tests/securityselinuxhelper.c | 7 +- tests/securityselinuxlabeltest.c | 5 +- tests/securityselinuxtest.c | 9 +- tests/sexpr2xmltest.c | 1 + tests/storagebackendsheepdogtest.c | 6 +- tests/storagepoolxml2xmltest.c | 1 + tests/storagevolxml2argvtest.c | 1 + tests/storagevolxml2xmltest.c | 1 + tests/sysinfotest.c | 2 +- tests/test_conf.c | 2 +- tests/testutils.c | 5 +- tests/testutilsqemu.c | 5 +- tests/virauthconfigtest.c | 1 - tests/virbuftest.c | 2 +- tests/vircgrouptest.c | 4 +- tests/virdrivermoduletest.c | 1 - tests/virhashtest.c | 3 +- tests/viridentitytest.c | 1 - tests/virkeyfiletest.c | 1 - tests/virnetmessagetest.c | 22 +- tests/virnetsockettest.c | 1 + tests/virportallocatortest.c | 2 +- tests/virshtest.c | 2 +- tests/virstoragetest.c | 1 + tests/virstringtest.c | 1 - tests/virtimetest.c | 1 - tests/viruritest.c | 1 - tests/vmx2xmltest.c | 11 +- tests/xencapstest.c | 1 + tests/xmconfigtest.c | 3 + tests/xml2sexprtest.c | 1 + tests/xml2vmxtest.c | 11 +- tools/console.c | 1 - tools/virsh-domain-monitor.c | 1 + tools/virsh-domain.c | 1 - tools/virsh-host.c | 2 +- tools/virsh-interface.c | 1 + tools/virsh-network.c | 1 - tools/virsh-nodedev.c | 1 - tools/virsh-pool.c | 2 +- tools/virsh-snapshot.c | 1 - tools/virsh-volume.c | 1 + tools/virsh.c | 8 +- tools/virt-host-validate-common.c | 1 + 279 files changed, 2544 insertions(+), 2653 deletions(-) -- 1.8.1.5

3 50

[libvirt] [PATCH] security driver: eliminate memory leaks in failure paths
by Laine Stump 30 Apr '13

30 Apr '13

If virPCIDeviceGetVFIOGroupDev() failed, virSecurity*(Set|Restore)HostdevLabel() would fail to free a virPCIDevice that had been allocated. These leaks were all introduced (by me) very recently, in commit f0bd70a. --- src/security/security_apparmor.c | 4 +++- src/security/security_dac.c | 10 ++++++---- src/security/security_selinux.c | 10 ++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 4fa0384..5be5ff0 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -835,8 +835,10 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = AppArmorSetSecurityPCILabel(pci, vfioGroupDev, ptr); VIR_FREE(vfioGroupDev); } else { diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 0366c17..e197eff 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -520,8 +520,10 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = virSecurityDACSetSecurityPCILabel(pci, vfioGroupDev, params); VIR_FREE(vfioGroupDev); } else { @@ -530,7 +532,6 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, } virPCIDeviceFree(pci); - break; } @@ -611,15 +612,16 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = virSecurityDACRestoreSecurityPCILabel(pci, vfioGroupDev, mgr); VIR_FREE(vfioGroupDev); } else { ret = virPCIDeviceFileIterate(pci, virSecurityDACRestoreSecurityPCILabel, mgr); } virPCIDeviceFree(pci); - break; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 87a09c7..0cf4009 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1346,15 +1346,16 @@ virSecuritySELinuxSetSecurityHostdevSubsysLabel(virDomainDefPtr def, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = virSecuritySELinuxSetSecurityPCILabel(pci, vfioGroupDev, def); VIR_FREE(vfioGroupDev); } else { ret = virPCIDeviceFileIterate(pci, virSecuritySELinuxSetSecurityPCILabel, def); } virPCIDeviceFree(pci); - break; } @@ -1518,15 +1519,16 @@ virSecuritySELinuxRestoreSecurityHostdevSubsysLabel(virSecurityManagerPtr mgr, == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci); - if (!vfioGroupDev) + if (!vfioGroupDev) { + virPCIDeviceFree(pci); goto done; + } ret = virSecuritySELinuxRestoreSecurityPCILabel(pci, vfioGroupDev, mgr); VIR_FREE(vfioGroupDev); } else { ret = virPCIDeviceFileIterate(pci, virSecuritySELinuxRestoreSecurityPCILabel, mgr); } virPCIDeviceFree(pci); - break; } -- 1.7.11.7

2 1

[libvirt] [PATCH] esx: Support virtualHW version 9
by Martin Kletzander 30 Apr '13

30 Apr '13

We already support ESX 5.1, but virtualHW version used by such hypervisor [1] wasn't taken into account. [1] http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externa… Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/vmx/vmx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index f520a85..87bec5b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1,8 +1,7 @@ - /* * vmx.c: VMware VMX parsing/formatting functions * - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2009-2010 Matthias Bolte <matthias.bolte(a)googlemail.com> * * This library is free software; you can redistribute it and/or @@ -45,6 +44,7 @@ domain-xml <=> vmx virtualHW.version = "4" # essential for ESX 3.5 virtualHW.version = "7" # essential for ESX 4.0 virtualHW.version = "8" # essential for ESX 5.0 + virtualHW.version = "9" # essential for ESX 5.1 ??? <=> guestOS = "<value>" # essential, FIXME: not representable @@ -1320,10 +1320,10 @@ virVMXParseConfig(virVMXContext *ctx, } if (virtualHW_version != 4 && virtualHW_version != 7 && - virtualHW_version != 8) { + virtualHW_version != 8 && virtualHW_version != 9) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'virtualHW.version' to be 4, 7 or 8 " - "but found %lld"), + _("Expecting VMX entry 'virtualHW.version' to be " + "4, 7, 8 or 9 but found %lld"), virtualHW_version); goto cleanup; } -- 1.8.2.1

2 3

[libvirt] libxl: expose and control xen device model versions
by David Scott 30 Apr '13

30 Apr '13

Hi, These patches expose multiple xen device model options in the capabilities XML and allow the user to select a specific device model via the domain XML's <emulator> tag. It is important to control the device model per VM, since the default is changing from xen-4.2 "qemu traditional" to xen-4.3 "qemu upstream". In this proposal, the capabilities XML now has multiple <domain> elements per <arch> as follows: <arch name='i686'> <wordsize>32</wordsize> <machine>xenfv</machine> <domain type='xen'> <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> </domain> <domain type='xen'> <emulator>/usr/lib64/xen/bin/qemu-system-i386</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> </domain> </arch> -- is it valid/ sensible to have multiple <domain>'s with the same 'type'? Let me know if you can think of a better mapping. Comments, criticism welcome. Cheers, Dave

3 13

[libvirt] Java client error on Windows 7 64 bit for Libvirt on KVM
by george john 30 Apr '13

30 Apr '13

Hi, I need some help in building a Java client on Windows 7 64 bit plaftorm to manage a KVM using the libvirt APIs. Using the instructions at http://libvirt.org/java.html, i was able to build libvirt.jar. My understanding is that libvirt.jar uses JNA to call libvirt's native windows library. I tried using the libvirt dlls in the experimental Windows installation package mentioned in http://libvirt.org/windows.html at http://libvirt.org/sources/win32_experimental/Libvirt-0.8.8-0.exe but whenever I try to connect to my remote API, I get the below Java exception : Exception in thread "main" java.lang.UnsatisfiedLinkError: %1 is not a valid Win32 application. at com.sun.jna.Native.open(Native Method) at com.sun.jna.Native.open(Native.java:1718) at com.sun.jna.NativeLibrary.loadLibrary(NativeLibrary.java:210) at com.sun.jna.NativeLibrary.getInstance(NativeLibrary.java:322) at com.sun.jna.Library$Handler.<init>(Library.java:142) at com.sun.jna.Native.loadLibrary(Native.java:387) at com.sun.jna.Native.loadLibrary(Native.java:366) at org.libvirt.jna.Libvirt.<clinit>(Unknown Source) at org.libvirt.Library.<clinit>(Unknown Source) at org.libvirt.Connect.<init>(Unknown Source) at Main.main(Main.java:8) But when I try the same client code on a Windows XP 32 bit machine (with 32 bit JVM), I don't see this problem and the connection succeeds. So it looks like the problem is that I am not using 64 bit windows libvirt dlls and 64 bit JVM cannot load 32 bit dlls. Is there a Windows installer with 64 bit Libvirt dlls ? Or are the 64 bit version of DLLs published somewhere? I tried using Matthias Bolte's msys_setup script (I tried in 2 machines) and in both machines, I get the below error when I try to run compile_libxml2.sh as per instructions https://github.com/photron/msys_setup/blob/master/readme_libvirt.txt Last few lines before the error is : >>>>>>>>>>>>>>>>> make[5]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[4]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' Making install in tests make[4]: Entering directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[5]: Entering directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[5]: Nothing to be done for `install-exec-am'. test -z "/share/doc/libxml2-python-2.9.0/examples" || /bin/mkdir -p "/share/doc/ libxml2-python-2.9.0/examples" /bin/install -c -m 644 build.py attribs.py tst.py tstxpath.py xpathext.py push. py pushSAX.py pushSAXhtml.py error.py serialize.py validate.py tstURI.py cutnpas te.py xpathret.py xpath.py outbuf.py inbuf.py resolver.py regexp.py reader.py re ader2.py reader3.py reader4.py reader5.py reader6.py reader7.py reader8.py reade rnext.py walker.py nsdel.py ctxterror.py readererr.py relaxng.py schema.py threa d2.py sync.py tstLastError.py indexes.py dtdvalid.py tstmem.py '/share/doc/libxm l2-python-2.9.0/examples' /bin/install -c -m 644 validDTD.py validSchemas.py validRNG.py compareNodes.py xpathns.py xpathleak.py tst.xml valid.xml invalid.xml test.dtd '/share/doc/libxm l2-python-2.9.0/examples' make[5]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[4]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python/tests' make[3]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[2]: Leaving directory `/src/libxml2/libxml2-2.9.0-0/python' make[1]: Leaving directory `/src/libxml2/libxml2-2.9.0-0' + cp /python/Lib/site-packages/libxml2mod.dll /python/DLLs/libxml2mod.pyd cp: cannot stat `/python/Lib/site-packages/libxml2mod.dll': No such file or dire ctory >>>>>>>>>>>>>>>>>> Do you know how this error could be resolved? All help will be greatly appreciated. Thank you.

1 0

[libvirt] [PATCH] Fix typo in augeas comment
by Martin Kletzander 30 Apr '13

30 Apr '13

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as 'trivial' before 1.0.5 as suggested [1] by Michal [1] http://www.redhat.com/archives/libvir-list/2013-April/msg02059.html --- src/qemu/libvirtd_qemu.aug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 61740a9..a3dcb30 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -74,7 +74,7 @@ module Libvirtd_qemu = | int_entry "keepalive_interval" | int_entry "keepalive_count" - (* Each enty in the config is one of the following three ... *) + (* Each entry in the config is one of the following ... *) let entry = vnc_entry | spice_entry | remote_display_entry -- 1.8.2.1

1 0

Re: [libvirt] [PATCH 2/4] QMP: add cpu-add command
by Eduardo Habkost 30 Apr '13

30 Apr '13

(CCing libvir-list) On Tue, Apr 30, 2013 at 08:34:01AM +0200, Igor Mammedov wrote: > Adds "cpu-add id=xxx" QMP command. > > cpu-add's "id" argument is a CPU number in a range [0..max-cpus) > > Example QMP command: > -> { "execute": "cpu-add", "arguments": { "id": 2 } } > <- { "return": {} } > > Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> > Acked-by: Luiz Capitulino <lcapitulino(a)redhat.com> > Reviewed-by: Eric Blake <eblake(a)redhat.com> The only way to find out if CPU hotplug is really available on a given machine-type is by actually trying to run cpu-add, right? Is this sufficient for libvirt requirements? > --- > v7: > * added "Since 1.5" to cpu-add qapi schema definition > v6: > * added valid values description to qapi schema > * split out cpu_hot_add hooks introduction into separate patch > * split out implementation of cpu_hot_add for target-i386 > v5: > * accept id=[0..max_cpus) range in cpu-add command > v4: > * merge "qmp: add cpu-add qmp command" & "target-i386: implement CPU hot-add" patches > * move notifier call to CPUCLass.realize() > * add hook cpu_hot_add to QEMUMachine > * make QEMUMachineInitArgs global and keep default cpu_model there > > v3: > * it appears that 'online/offline' in cpu-set are confusing people > with what command actually does and users might have to distinguish > if 'offline' is not implemented by parsing error message. To simplify > things replace cpu-set with cpu-add command to show more clear what > command does and just add cpu-del when CPU remove is implemented. > > v2: > * s/cpu_set/cpu-set/ > * qmp doc style fix > * use bool type instead of opencodding online/offline string > suggested-by: Eric Blake <eblake(a)redhat.com> > --- > qapi-schema.json | 13 +++++++++++++ > qmp-commands.hx | 23 +++++++++++++++++++++++ > qmp.c | 10 ++++++++++ > 3 files changed, 46 insertions(+) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 5b0fb3b..6f58b0f 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -1387,6 +1387,19 @@ > { 'command': 'cpu', 'data': {'index': 'int'} } > > ## > +# @cpu-add > +# > +# Adds CPU with specified ID > +# > +# @id: ID of CPU to be created, valid values [0..max_cpus) > +# > +# Returns: Nothing on success > +# > +# Since 1.5 > +## > +{ 'command': 'cpu-add', 'data': {'id': 'int'} } > + > +## > # @memsave: > # > # Save a portion of guest memory to a file. > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 0e89132..ed99eb8 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -385,6 +385,29 @@ Note: CPUs' indexes are obtained with the 'query-cpus' command. > EQMP > > { > + .name = "cpu-add", > + .args_type = "id:i", > + .mhandler.cmd_new = qmp_marshal_input_cpu_add, > + }, > + > +SQMP > +cpu-add > +------- > + > +Adds virtual cpu > + > +Arguments: > + > +- "id": cpu id (json-int) > + > +Example: > + > +-> { "execute": "cpu-add", "arguments": { "id": 2 } } > +<- { "return": {} } > + > +EQMP > + > + { > .name = "memsave", > .args_type = "val:l,size:i,filename:s,cpu:i?", > .mhandler.cmd_new = qmp_marshal_input_memsave, > diff --git a/qmp.c b/qmp.c > index ed6c7ef..dd34be6 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -24,6 +24,7 @@ > #include "hw/qdev.h" > #include "sysemu/blockdev.h" > #include "qom/qom-qobject.h" > +#include "hw/boards.h" > > NameInfo *qmp_query_name(Error **errp) > { > @@ -108,6 +109,15 @@ void qmp_cpu(int64_t index, Error **errp) > /* Just do nothing */ > } > > +void qmp_cpu_add(int64_t id, Error **errp) > +{ > + if (current_machine->hot_add_cpu) { > + current_machine->hot_add_cpu(id, errp); > + } else { > + error_setg(errp, "Not supported"); > + } > +} > + > #ifndef CONFIG_VNC > /* If VNC support is enabled, the "true" query-vnc command is > defined in the VNC subsystem */ > -- > 1.8.2.1 > -- Eduardo

3 2

[libvirt] [PATCH] virsh: clarify vol-{down,up}load description
by Ján Tomko 30 Apr '13

30 Apr '13

Mention file/volume contents instead of just 'file'/'volume'. Also change Download->download in vol-download help, to be consistent with other volume commands. https://bugzilla.redhat.com/show_bug.cgi?id=955537 --- tools/virsh-volume.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 0ca295f..728bc23 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -590,10 +590,10 @@ cleanup: */ static const vshCmdInfo info_vol_upload[] = { {.name = "help", - .data = N_("upload a file into a volume") + .data = N_("upload file contents to a volume") }, {.name = "desc", - .data = N_("Upload a file into a volume") + .data = N_("Upload file contents to a volume") }, {.name = NULL} }; @@ -704,10 +704,10 @@ cleanup: */ static const vshCmdInfo info_vol_download[] = { {.name = "help", - .data = N_("Download a volume to a file") + .data = N_("download volume contents to a file") }, {.name = "desc", - .data = N_("Download a volume to a file") + .data = N_("Download volume contents to a file") }, {.name = NULL} }; -- 1.8.1.5

2 2

[libvirt] [PATCH v2] qemu: Generate agent socket path if missing
by Michal Privoznik 30 Apr '13

30 Apr '13

It's not desired to force users imagine path for a socket they are not even supposed to connect to. On the other hand, we already have a release where the qemu agent socket path is exposed to XML, so we cannot silently drop it from there. The new path is generated in form: $LOCALSTATEDIR/lib/libvirt/qemu/channel/target/$domain.$name --- docs/formatdomain.html.in | 7 ++++++- libvirt.spec.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 34 ++++++++++++++++------------------ src/qemu/qemu_domain.c | 16 ++++++++++++++++ 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 888c005..59cbe9b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3928,7 +3928,12 @@ qemu-kvm -net nic,model=? /dev/null then libvirt can interact with a guest agent installed in the guest, for actions such as guest shutdown or file system quiescing. Since 0.7.7, guest agent interaction - since 0.9.10</dd> + since 0.9.10 Moreover, since 1.0.5 + it is possible to have source path auto generated for virtio unix channels. + This is very useful in case of a qemu guest agent, where users don't + usually care about the source path since it's libvirt who talks to + the guest agent. In case users want to utilize this feature, they should + leave <code><source></code> element out. <dt><code>spicevmc</code></dt> <dd>Paravirtualized SPICE channel. The domain must also have a diff --git a/libvirt.spec.in b/libvirt.spec.in index 328b009..11fc12d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1719,6 +1719,7 @@ fi %if %{with_qemu} %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr{0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %endif %if %{with_lxc} diff --git a/src/Makefile.am b/src/Makefile.am index 3adddb4..914b57d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2098,6 +2098,7 @@ if WITH_SANLOCK endif if WITH_QEMU $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channel/target" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index dc0ecaa..839e849 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6507,7 +6507,9 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if (path == NULL) { + /* path can be auto generated */ + if (!path && + chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source path attribute for char device")); goto error; @@ -6602,7 +6604,6 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, char *type = NULL; const char *nodeName; virDomainChrDefPtr def; - int remaining; bool seenTarget = false; if (!(def = virDomainChrDefNew())) @@ -6626,29 +6627,26 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, } cur = node->children; - remaining = virDomainChrSourceDefParseXML(&def->source, cur, flags, - def, ctxt, - vmSeclabels, nvmSeclabels); - if (remaining < 0) - goto error; - if (remaining) { - while (cur != NULL) { - if (cur->type == XML_ELEMENT_NODE) { - if (xmlStrEqual(cur->name, BAD_CAST "target")) { - seenTarget = true; - if (virDomainChrDefParseTargetXML(def, cur) < 0) { - goto error; - } + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "target")) { + seenTarget = true; + if (virDomainChrDefParseTargetXML(def, cur) < 0) { + goto error; } } - cur = cur->next; } + cur = cur->next; } if (!seenTarget && ((def->targetType = virDomainChrDefaultTargetType(def->deviceType)) < 0)) goto cleanup; + if (virDomainChrSourceDefParseXML(&def->source, node->children, flags, def, + ctxt, vmSeclabels, nvmSeclabels) < 0) + goto error; + if (def->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) { if (def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -14094,8 +14092,8 @@ virDomainChrSourceDefFormat(virBufferPtr buf, case VIR_DOMAIN_CHR_TYPE_UNIX: virBufferAsprintf(buf, " <source mode='%s'", def->data.nix.listen ? "bind" : "connect"); - virBufferEscapeString(buf, " path='%s'/>\n", - def->data.nix.path); + virBufferEscapeString(buf, " path='%s'", def->data.nix.path); + virBufferAddLit(buf, "/>\n"); break; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a7aabdf..d8a87a8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -745,6 +745,22 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, (def->os.arch == VIR_ARCH_S390 || def->os.arch == VIR_ARCH_S390X)) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO; + /* auto generate unix socket path */ + if (dev->type == VIR_DOMAIN_DEVICE_CHR && + dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + dev->data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && + dev->data.chr->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && + !dev->data.chr->source.data.nix.path && + (driver && (cfg = virQEMUDriverGetConfig(driver)))) { + + if (virAsprintf(&dev->data.chr->source.data.nix.path, + "%s/channel/target/%s.%s", + cfg->libDir, def->name, + dev->data.chr->target.name) < 0) + goto no_memory; + dev->data.chr->source.data.nix.listen = true; + } + ret = 0; cleanup: -- 1.8.1.5

2 1

[libvirt] RFE: Ability to freeze/thaw guest using libvirt/virsh APIs
by Deepak C Shetty 30 Apr '13

30 Apr '13

I am sending this mail based on the below IRC discussion. Apr 23 18:55:02 <deepakcs> Hi all, is there a way to just do a fsfreeze (and un-freeze) of VM usign virsh. I don't see any option today.... Apr 23 18:55:52 <deepakcs> there is option to take snapshot (which in turn would do freeze/un-freeze), but i want to exercise the freeze/un-freeze only.. w/o the snapshot Apr 23 19:23:57 <eblake> deepakcs: virsh qemu-agent-command can trigger any agent command Apr 23 19:24:35 <eblake> but it is officially unsupported - more of a development aid Apr 23 19:26:38 <eblake> if it turns out that freezing the guest with libvirt commands is worth promoting into a supported api, instead of the qemu-agent-command backdoor, then report that as an RFE to the list Apr 23 19:27:14 <deepakcs> eblake, sorry was in a mtg.. Apr 23 19:28:03 <deepakcs> eblake, yeah.. i was wondering that it would be good to have freeze/un-freeze as supported virsh ops.. then it helps users exploit snapshot functionality provided by things like storage arrays (as an example) Apr 23 19:28:47 <eblake> well, as qemu continues to add more snapshot building blocks, it may make sense

1 0

[libvirt] [PATCH v2] virsh: fix incorrect argument errors for long options
by Ján Tomko 30 Apr '13

30 Apr '13

For long options, print: * the option as specified by the user if it's unknown * the cannoncial long option if its argument is not a number (and should be) And for missing arguments, print both the short and the long option name. (Doing only one of those would require either parsing argv ourselves or let getopt print the errors, since we can't tell long and short options apart by optopt or longindex) https://bugzilla.redhat.com/show_bug.cgi?id=949373 --- v1: https://www.redhat.com/archives/libvir-list/2013-April/msg01653.html tools/virsh.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6ec2f7b..ac86608 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2978,7 +2978,8 @@ vshAllowedEscapeChar(char c) static bool vshParseArgv(vshControl *ctl, int argc, char **argv) { - int arg, len, debug; + int arg, len, debug, i; + int longindex = -1; struct option opt[] = { {"debug", required_argument, NULL, 'd'}, {"help", no_argument, NULL, 'h'}, @@ -2995,11 +2996,12 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) /* Standard (non-command) options. The leading + ensures that no * argument reordering takes place, so that command options are * not confused with top-level virsh options. */ - while ((arg = getopt_long(argc, argv, "+:d:hqtc:vVrl:e:", opt, NULL)) != -1) { + while ((arg = getopt_long(argc, argv, "+:d:hqtc:vVrl:e:", opt, &longindex)) != -1) { switch (arg) { case 'd': if (virStrToLong_i(optarg, NULL, 10, &debug) < 0) { - vshError(ctl, "%s", _("option -d takes a numeric argument")); + vshError(ctl, _("option %s takes a numeric argument"), + longindex == -1 ? "-d" : "--debug"); exit(EXIT_FAILURE); } if (debug < VSH_ERR_DEBUG || debug > VSH_ERR_ERROR) @@ -3050,15 +3052,24 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) } break; case ':': - vshError(ctl, _("option '-%c' requires an argument"), optopt); - exit(EXIT_FAILURE); + for (i = 0; opt[i].name != NULL; i++) { + if (opt[i].val == optopt) { + vshError(ctl, _("option '-%c'/'--%s' requires an argument"), + optopt, opt[i].name); + exit(EXIT_FAILURE); + } + } case '?': - vshError(ctl, _("unsupported option '-%c'. See --help."), optopt); + if (optopt) + vshError(ctl, _("unsupported option '-%c'. See --help."), optopt); + else + vshError(ctl, _("unsupported option '%s'. See --help."), argv[optind - 1]); exit(EXIT_FAILURE); default: vshError(ctl, _("unknown option")); exit(EXIT_FAILURE); } + longindex = -1; } if (argc > optind) { -- 1.8.1.5

2 2

[libvirt] [PATCH v2 0/2] qemu: xml->native memballoon fixes
by Ján Tomko 30 Apr '13

30 Apr '13

v1: https://www.redhat.com/archives/libvir-list/2013-April/msg01910.html v2: Instead of assuming 'pci' as the default memballoon device, assign the addresses when doing xml->native conversion and add an error message for the wrong address type. Ján Tomko (2): qemu: assign addresses when converting xml to native qemu: report an error if memballoon has wrong address type src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_driver.c | 3 +++ 2 files changed, 6 insertions(+) -- 1.8.1.5

2 5

[libvirt] [PATCH] qemu: Error out if spice port autoallocation is requested, but disabled
by Peter Krempa 30 Apr '13

30 Apr '13

When a user requests auto-allocation of the spice TLS port but spice TLS is disabled in qemu.conf, we start the machine and let qemu fail instead of erroring out sooner. Add an error message so that this doesn't happen. --- src/qemu/qemu_process.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f12d7d5..e81e57f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3292,8 +3292,14 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, graphics->data.spice.port = port; } - if (cfg->spiceTLS && - (needTLSPort || graphics->data.spice.tlsPort == -1)) { + if (needTLSPort || graphics->data.spice.tlsPort == -1) { + if (!cfg->spiceTLS) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Auto allocation of spice TLS port requested " + "but spice is disabled in qemu.conf")); + goto error; + } + if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) goto error; -- 1.8.2.1

2 2

[libvirt] [PATCH] network: Don't remove transient network if creating of config file fails
by Peter Krempa 30 Apr '13

30 Apr '13

On the off-chance that creation of persistent configuration file would fail when defining a network that is already started as transient, the code would remove the transient data structure and thus the network. This patch changes the code so that in such case, the network is again marked as transient and left behind. --- src/network/bridge_driver.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 27dd230..64c71af 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3160,8 +3160,13 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { freeDef = false; if (virNetworkSaveConfig(driver->networkConfigDir, def) < 0) { - virNetworkRemoveInactive(&driver->networks, network); - network = NULL; + if (!virNetworkObjIsActive(network)) { + virNetworkRemoveInactive(&driver->networks, network); + network = NULL; + goto cleanup; + } + network->persistent = 0; + virNetworkDefFree(network->newDef); goto cleanup; } -- 1.8.2.1

2 3

[libvirt] [PATCH 0/2] libxl: Add support for qdisk disk backend
by Jim Fehlig 30 Apr '13

30 Apr '13

This small patch series adds support for qdisk backend type in libxl. A qdisk uses the block drivers in qemu to serve as a block backend, verses blktap or blkbk. While testing the second patch, I noticed a slightly misleading error was emitted when the tap backend didn't support the requested disk format. Fix this with the first patch, including adding format checks in the other supported disk backends. Jim Fehlig (2): libxl: Fix disk format error message libxl: support qdisk backend src/libxl/libxl_conf.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) -- 1.8.0.1

1 2

[libvirt] [PATCH 0/2] [RFC] Support for VNC WebSocket
by Martin Kletzander 29 Apr '13

29 Apr '13

This series, which is meant to be applied _after_ 1.0.5 release, is adding support for the VNC WebSocket to be configured for QEMU. I tagged this with [RFC] because this is the fastest way I managed to code it and I'd welcome any opinions on naming changes etc. Documentation from qemu_options.hx: qemu -vnc ...,websocket[=<port>] Opens an additional TCP listening port dedicated to VNC Websocket connections. By definition the Websocket port is 5700+@var{display}. If @var{host} is specified connections will only be allowed from this host. As an alternative the Websocket port could be specified by using @code{websocket}=@var{port}. Martin Kletzander (2): Add VNC WebSocket support qemu: Add VNC WebSocket support docs/formatdomain.html.in | 5 ++ docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 18 +++++++ src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 4 +- src/qemu/qemu.conf | 7 +++ src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 60 +++++++++++++++++++++- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_conf.c | 32 ++++++++++++ src/qemu/qemu_conf.h | 6 +++ src/qemu/qemu_driver.c | 5 ++ src/qemu/qemu_process.c | 31 ++++++++--- src/qemu/test_libvirtd_qemu.aug.in | 2 + tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-graphics-vnc-websocket.args | 4 ++ .../qemuxml2argv-graphics-vnc-websocket.xml | 35 +++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 20 files changed, 219 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml -- 1.8.2.1

4 7

[libvirt] [PATCH] qemu: honor allowDiskFormatProbing when parsing command line
by Ján Tomko 29 Apr '13

29 Apr '13

My commit 024e9af broke this. --- src/qemu/qemu_command.c | 3 --- tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml | 4 ++-- .../qemuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 6 +++--- tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 8 ++++---- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 8 ++++---- tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 8 ++++---- tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 2 +- 57 files changed, 72 insertions(+), 75 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d23bdfc..d161b56 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8540,7 +8540,6 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, def->bus = VIR_DOMAIN_DISK_BUS_IDE; def->device = VIR_DOMAIN_DISK_DEVICE_DISK; def->type = VIR_DOMAIN_DISK_TYPE_FILE; - def->format = VIR_STORAGE_FILE_AUTO; for (i = 0 ; i < nkeywords ; i++) { if (STREQ(keywords[i], "file")) { @@ -9788,8 +9787,6 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, if (VIR_ALLOC(disk) < 0) goto no_memory; - disk->format = VIR_STORAGE_FILE_AUTO; - if (STRPREFIX(val, "/dev/")) disk->type = VIR_DOMAIN_DISK_TYPE_BLOCK; else if (STRPREFIX(val, "nbd:")) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml index c9fcfbb..b5c37bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml index f662990..e42f7ed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='floppy'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/firmware.img'/> <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml index 9230816..8124f34 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml index b4e7424..2acb71f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml index 1d7cc95..138a83a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml index a767eea..b1ee29c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml index a90be1c..d8ff676 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml index 259ea1f..75b9cec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/root/boot.iso'/> <target dev='hdc' bus='ide'/> <readonly/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml index 8683233..59ef29d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml index 32e511e..0c9bc08 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml @@ -15,13 +15,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml index f1840d0..bba512e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml index 0d47dfa..8bbd324 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml @@ -15,19 +15,19 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='floppy'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/fd0'/> <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='floppy'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/firmware.img'/> <target dev='fdb' bus='fdc'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml index d91b783..edcd015 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml @@ -15,25 +15,25 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdb' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <target dev='hdd' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='1'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml index 5f8b8e0..730c4f3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml index 2ca305a..3e2e550 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml @@ -15,25 +15,25 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <target dev='vda' bus='virtio'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <target dev='vdb' bus='virtio'/> </disk> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml index af3a4b7..3baf97d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml @@ -15,25 +15,25 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='cdrom'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/data.img'/> <target dev='xvda' bus='xen'/> </disk> <disk type='file' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source file='/tmp/logs.img'/> <target dev='xvdg' bus='xen'/> </disk> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml index 64f173e..7793161 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml index 99d13a5..26fe28b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml index 4fe20c3..75563df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml index b3214fd..24c7eed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml index 4fe20c3..75563df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml index 65f990b..6dcd076 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml index 63a0d2a..422127c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml index 26e8b42..ee00634 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml index c4534c4..0863737 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml index 208e2b7..03558dd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml index ab17e56..5eb229f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml index 7294ebb..0dd5b39 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml index 742a553..3a375fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml index 4997e5b..6fe8a85 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml index 5f5690d..b9313e0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml index a81f3c4..f432732 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml @@ -19,7 +19,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml index 42ad266..cea52f8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml index f066c13..10c2d41 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml index 4997e5b..6fe8a85 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml index e8c2bf7..8ad6eb7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml index 4bc79ce..6f00fe1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml index e1d3046..960b7aa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml index a699f6e..195a3d9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml index 742a553..3a375fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml index 53381fb..60ea846 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml index 45ede22..29f84db 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml index 1d7cc95..138a83a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml index 742a553..3a375fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml index cde9718..b1a7429 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml index f7da73e..4335f43 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml index f5215bb..4829285 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml index b5be682..d2af760 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml index 4c4a131..06ce154 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml index 64361cc..493f8a1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml index b8895c2..d525965 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml index b24269b..8aa052d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml index e63ff57..12107d7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml index 83ddcb3..55bf16d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml @@ -18,7 +18,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml index 21db704..0bd1185 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml index 31c0152..32d57e0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml @@ -15,7 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> - <driver name='qemu'/> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> -- 1.8.1.5

2 2

[libvirt] [PATCH] Resolve valgrind error
by John Ferlan 29 Apr '13

29 Apr '13

As a result of commit id '19c345f2', 'make -C tests valgrind' has the following for qemuxml2argvtest: ==22482== 197 (80 direct, 117 indirect) bytes in 1 blocks are definitely lost in loss record 101 of 120 ==22482== at 0x4A06B6F: calloc (vg_replace_malloc.c:593) ==22482== by 0x4C6F301: virAlloc (viralloc.c:124) ==22482== by 0x4C840FC: virSaveLastError (virerror.c:308) ==22482== by 0x431882: qemuBuildCommandLine (qemu_command.c:8204) ==22482== by 0x41E8F0: testCompareXMLToArgvHelper (qemuxml2argvtest.c:155) ==22482== by 0x41FE9F: virtTestRun (testutils.c:157) ==22482== by 0x419DEB: mymain (qemuxml2argvtest.c:654) ==22482== by 0x4204DA: virtTestMain (testutils.c:719) ==22482== by 0x39D0821A04: (below main) (libc-start.c:225) ==22482== --- src/qemu/qemu_command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d23bdfc..421a93c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8205,6 +8205,7 @@ error: for (i = 0; i <= last_good_net; i++) virDomainConfNWFilterTeardown(def->nets[i]); virSetError(originalError); + virFreeError(originalError); virCommandFree(cmd); return NULL; } -- 1.8.1.4

2 2

[libvirt] [PATCHv2] qemu: Do fake auto-allocation of ports when generating native command
by Peter Krempa 29 Apr '13

29 Apr '13

When attempting to generate the native command line from an XML file that uses graphics port auto allocation, the generated commandline wouldn't be valid. This patch adds fake autoallocation of ports as done when starting the actual machine. --- src/qemu/qemu_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d3b24a..068d6c4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5271,6 +5271,58 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (qemuAssignDeviceAliases(def, qemuCaps) < 0) goto cleanup; + /* do fake auto-alloc of graphics ports, if such config is used */ + for (i = 0 ; i < def->ngraphics; ++i) { + virDomainGraphicsDefPtr graphics = def->graphics[i]; + if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + !graphics->data.vnc.socket && graphics->data.vnc.autoport) { + graphics->data.vnc.port = 5900; + } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + int j; + bool needTLSPort = false; + bool needPort = false; + int defaultMode = graphics->data.spice.defaultMode; + + if (graphics->data.spice.autoport) { + /* check if tlsPort or port need allocation */ + for (j = 0 ; j < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; j++) { + switch (graphics->data.spice.channels[j]) { + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: + needTLSPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: + needPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: + switch (defaultMode) { + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: + needTLSPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: + needPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: + needTLSPort = true; + needPort = true; + break; + } + break; + } + } + } + + if (needPort || graphics->data.spice.port == -1) + graphics->data.spice.port = 5901; + + if (needTLSPort || graphics->data.spice.tlsPort == -1) + graphics->data.spice.tlsPort = 5902; + } + } + if (!(cmd = qemuBuildCommandLine(conn, driver, def, &monConfig, monitor_json, qemuCaps, NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) -- 1.8.2.1

3 3

[libvirt] [PATCH] qemu: Do fake auto-allocation of ports when generating native command
by Peter Krempa 29 Apr '13

29 Apr '13

When attempting to generate the native command line from an XML file that uses graphics port auto allocation, the generated commandline wouldn't be valid. This patch adds fake autoallocation of ports as done when starting the actual machine. --- src/qemu/qemu_driver.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d3b24a..cec4a7a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5271,6 +5271,57 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (qemuAssignDeviceAliases(def, qemuCaps) < 0) goto cleanup; + /* do fake auto-alloc of graphics ports, if such config is used */ + for (i = 0 ; i < vm->def->ngraphics; ++i) { + virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; + if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + !graphics->data.vnc.socket && graphics->data.vnc.autoport) { + graphics->data.vnc.port = 5900; + } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + int j; + bool needTLSPort = false; + bool needPort = false; + + if (graphics->data.spice.autoport) { + /* check if tlsPort or port need allocation */ + for (j = 0 ; j < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; j++) { + switch (graphics->data.spice.channels[j]) { + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: + needTLSPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: + needPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: + switch (defaultMode) { + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: + needTLSPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: + needPort = true; + break; + + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: + needTLSPort = true; + needPort = true; + break; + } + break; + } + } + } + + if (needPort || graphics->data.spice.port == -1) + graphics->data.spice.port = 5901; + + if (needTLSPort || graphics->data.spice.tlsPort == -1) + graphics->data.spice.tlsPort = 5902; + } + } + if (!(cmd = qemuBuildCommandLine(conn, driver, def, &monConfig, monitor_json, qemuCaps, NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) -- 1.8.2.1

1 1

[libvirt] [libvirt-java] [Patch] remove unused imports
by Stefan Majer 29 Apr '13

29 Apr '13

Hi, Clean up all java classes which have imports which are not used. Greetings Stefan Majer --- src/main/java/org/libvirt/Device.java | 1 - src/main/java/org/libvirt/Domain.java | 1 - src/main/java/org/libvirt/DomainSnapshot.java | 1 - src/main/java/org/libvirt/ErrorHandler.java | 1 - src/main/java/org/libvirt/Interface.java | 1 - src/main/java/org/libvirt/StorageVol.java | 1 - 6 files changed, 6 deletions(-) diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index 416e06a..fe49ce9 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -1,7 +1,6 @@ package org.libvirt; import org.libvirt.jna.DevicePointer; -import org.libvirt.jna.Libvirt; import static org.libvirt.Library.libvirt; /** diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 12ff7f5..85de9b3 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -17,7 +17,6 @@ import com.sun.jna.Native; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; -import com.sun.jna.ptr.PointerByReference; /** * A virtual machine defined within libvirt. diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index 355d9d0..b58fd20 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -1,7 +1,6 @@ package org.libvirt; import org.libvirt.jna.DomainSnapshotPointer; -import org.libvirt.jna.Libvirt; import static org.libvirt.Library.libvirt; public class DomainSnapshot { diff --git a/src/main/java/org/libvirt/ErrorHandler.java b/src/main/java/org/libvirt/ErrorHandler.java index 4dd7c90..434c85d 100644 --- a/src/main/java/org/libvirt/ErrorHandler.java +++ b/src/main/java/org/libvirt/ErrorHandler.java @@ -1,6 +1,5 @@ package org.libvirt; -import org.libvirt.jna.ConnectionPointer; import org.libvirt.jna.Libvirt; import org.libvirt.jna.virError; diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index 71ba3da..7782fb9 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -1,7 +1,6 @@ package org.libvirt; import org.libvirt.jna.InterfacePointer; -import org.libvirt.jna.Libvirt; import static org.libvirt.Library.libvirt; import com.sun.jna.Pointer; diff --git a/src/main/java/org/libvirt/StorageVol.java b/src/main/java/org/libvirt/StorageVol.java index 39776b2..561cb4d 100644 --- a/src/main/java/org/libvirt/StorageVol.java +++ b/src/main/java/org/libvirt/StorageVol.java @@ -1,6 +1,5 @@ package org.libvirt; -import org.libvirt.jna.Libvirt; import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.virStorageVolInfo; -- 1.7.9.5 -- Stefan Majer

2 1

Re: [libvirt] [Xen-devel] libvirt, libxl and QDISKs
by Jim Fehlig 29 Apr '13

29 Apr '13

David Scott wrote: >> Something like the attached, which seems to work well for me when >> specifying driverName = qemu, e.g. >> >> <disk type='file' device='disk'> >> <driver name='qemu'/> >> <source file='/var/lib/xen/images/sles11sp2-pv/disk0.raw'/> >> <target dev='xvda' bus='xen'/> >> </disk> > > This also works for me! Good to hear. I'll send the patch to the libvirt list. > > On a related note, what do you think about the attached patch? It > allows the user to select a non-default qemu via the <emulator> > element. My domain XML looked like this: > > <devices> > <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> IMO, the possible emulators should be exposed in the capabilities. E.g. on a machine with both kvm and qemu, both emulators are shown as possibilities for an hvm, x86_64 guest # virsh capabilities ... <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <domain type='qemu'> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc-1.1</machine> <machine canonical='pc-1.1'>pc</machine> <machine>pc-1.0</machine> <machine>pc-0.15</machine> <machine>pc-0.14</machine> <machine>pc-0.13</machine> <machine>pc-0.12</machine> <machine>pc-0.11</machine> <machine>pc-0.10</machine> <machine>isapc</machine> </domain> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> <machine>pc-1.1</machine> <machine canonical='pc-1.1'>pc</machine> <machine>pc-1.0</machine> <machine>pc-0.15</machine> <machine>pc-0.14</machine> <machine>pc-0.13</machine> <machine>pc-0.12</machine> <machine>pc-0.11</machine> <machine>pc-0.10</machine> <machine>isapc</machine> </domain> .... </guest> ... > <disk device="disk" type="network"> > <driver name='qemu'/> > <source protocol="rbd" name="rbd:rbd/ubuntu1204.img"/> > <target dev="hda"/> > </disk> > <graphics type="vnc" port="-1" autoport="yes" listen="0.0.0.0"/> > </devices> > > Now that upstream qemu is the default in xen-4.3, it seems useful to > be able to select the traditional qemu for older VMs. Agreed. And reporting that both emulators exist via the capabilities would be helpful for users. > > Also I backported this to my xen-4.2 system and used this patch + your > patch + the previous 'stat()' fix to successfully start a VM on ceph > storage via libvirt + libxl (my quest is almost complete!) Nice! > diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c > index f549a5d..abbd3c0 100644 > --- a/src/libxl/libxl_conf.c > +++ b/src/libxl/libxl_conf.c > @@ -811,6 +811,30 @@ libxlMakeCapabilities(libxl_ctx *ctx) > } > > int > +libxlMakeEmulator(virDomainDefPtr def, libxl_domain_config *d_config) > +{ > + /* No explicit override means use the default */ > + if (!def->emulator) { > + return 0; > + } > + if (strstr(def->emulator, "/qemu-system-")) { > + d_config->b_info.device_model_version = > + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; > + return 0; > + } > Here we could check the requested emulator against the capabilities, and then do the proper mapping for device_model_version. Do you have time for an upstream libvirt patch to expose the possible emulators in the capabilities, along with this patch allowing the user to specify one? Regards, Jim > + if (strstr(def->emulator, "/qemu-dm")) { > + d_config->b_info.device_model_version = > + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; > + return 0; > + } > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("libxenlight doesn't support emulator '%s'"), > + def->emulator); > + return -1; > +} > + > + > +int > libxlBuildDomainConfig(libxlDriverPrivatePtr driver, > virDomainDefPtr def, libxl_domain_config *d_config) > { > @@ -834,6 +858,10 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, > goto error; > } > > + if (libxlMakeEmulator(def, d_config) < 0) { > + goto error; > + } > + > d_config->on_reboot = def->onReboot; > d_config->on_poweroff = def->onPoweroff; > d_config->on_crash = def->onCrash; > > ------------------------------------------------------------------------

2 1

[libvirt] [PATCH 0/3] PCI mess fixes
by Ján Tomko 27 Apr '13

27 Apr '13

1/3 should allow domains without a PCI bus to start 2/3 prevents invalid memory access when the domain has no PCI bus 3/3 fixes a mising error message on OOM Ján Tomko (3): qemu: don't always reserve PCI addresses for implicit controllers qemu: prevent invalid reads in qemuAssignDevicePCISlots conf: add missing error on OOM src/conf/domain_conf.c | 1 + src/qemu/qemu_command.c | 42 +++++++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 17 deletions(-) -- 1.8.1.5

2 8

Re: [libvirt] KVM Forum 2013 Save the Date
by tiejun.chen 27 Apr '13

27 Apr '13

On 04/27/2013 02:25 PM, Will Huck wrote: > Hi, > > Where can get slides in 2012 KVM Forum? http://www.linux-kvm.org/page/KVM_Forum_2012 Tiejun

1 0

[libvirt] [PATCH 00/10 v3] Support scsi device passthrough via scsi-generic
by Osier Yang 27 Apr '13

27 Apr '13

This adds the support for qemu's scsi-generic device, which can be used to passthrough scsi host device. An example of the XML: <hostdev mode='subsystem' type='scsi' managed='no'> <source> <adapter name='scsi_host7'/> <address bus='0' target='0' unit='0'/> </source> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </hostdev> Mainly changes from v2.5 (details in each patch): * 1/10 and 2/10 of v2.5 are pushed * 8/10 of v2.5 is splitted * A better way to generate the address for scsi host device instead of the rigid one. * Support all scsi controllers when building the qemu command line. * Figure out the limits of the qemu properties, and do checking * Don't forget DAC and apparmor security backends * Orgnize the patches in a better way. * Fix the make check failure Han Cheng (7): conf: Introduce XMLs for scsi hostdev qemu: New cap flags for scsi-generic utils: util functions for scsi hostdev qemu: Build qemu command line for scsi host device qemu: Introduce activeScsiHostdevs list for scsi host devices qemu: Allow the scsi-generic device in cgroup qemu: Add hotplug support for scsi host device Osier Yang (3): security: Manage the security label for scsi host device qemu: Refactor helpers for USB device attachment conf: Generate address for scsi host device automatically docs/formatdomain.html.in | 38 +- docs/schemas/domaincommon.rng | 29 ++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_audit.c | 10 + src/conf/domain_conf.c | 312 +++++++++++++++- src/conf/domain_conf.h | 8 + src/libvirt_private.syms | 22 ++ src/qemu/qemu_capabilities.c | 14 +- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_cgroup.c | 72 +++- src/qemu/qemu_cgroup.h | 3 + src/qemu/qemu_command.c | 154 +++++++- src/qemu/qemu_command.h | 6 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 3 + src/qemu/qemu_hostdev.c | 213 +++++++++++ src/qemu/qemu_hostdev.h | 10 + src/qemu/qemu_hotplug.c | 224 +++++++++--- src/qemu/qemu_process.c | 3 + src/security/security_apparmor.c | 49 ++- src/security/security_dac.c | 77 +++- src/security/security_selinux.c | 72 +++- src/util/virscsi.c | 407 +++++++++++++++++++++ src/util/virscsi.h | 84 +++++ tests/qemuhelpdata/qemu-1.0-device | 10 + tests/qemuhelpdata/qemu-1.1.0-device | 10 + tests/qemuhelpdata/qemu-1.2.0-device | 5 + tests/qemuhelpdata/qemu-kvm-1.2.0-device | 5 + tests/qemuhelptest.c | 19 +- .../qemuxml2argv-hostdev-scsi-boot.args | 9 + .../qemuxml2argv-hostdev-scsi-boot.xml | 34 ++ .../qemuxml2argv-hostdev-scsi-readonly.args | 9 + .../qemuxml2argv-hostdev-scsi-readonly.xml | 35 ++ tests/qemuxml2argvtest.c | 9 + tests/qemuxml2xmltest.c | 2 + 36 files changed, 1842 insertions(+), 121 deletions(-) create mode 100644 src/util/virscsi.c create mode 100644 src/util/virscsi.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.xml -- 1.8.1.4

2 15

[libvirt] [PATCH 0/2] VFIO bugfix and naming tweak
by Laine Stump 27 Apr '13

27 Apr '13

Laine Stump (2): network: support <driver name='vfio'/> in network definitions conf: remove extraneous _TYPE from driver backend enums src/conf/domain_conf.c | 6 +++--- src/conf/domain_conf.h | 6 +++--- src/conf/network_conf.c | 39 +++++++++++++++++++++++++++++++++- src/conf/network_conf.h | 17 ++++++++++++++- src/network/bridge_driver.c | 23 ++++++++++++++++++++ src/qemu/qemu_command.c | 8 +++---- src/qemu/qemu_hostdev.c | 4 ++-- src/qemu/qemu_hotplug.c | 4 ++-- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 ++-- src/security/security_selinux.c | 4 ++-- tests/networkxml2xmlin/hostdev-pf.xml | 1 + tests/networkxml2xmlout/hostdev-pf.xml | 1 + 13 files changed, 98 insertions(+), 21 deletions(-) -- 1.7.11.7

2 4

[libvirt] [PATCH v2 0/2] qemu: invoke qemu-bridge-helper from libvirtd
by Paolo Bonzini 26 Apr '13

26 Apr '13

The <interface type='bridge'> is working mostly because of a peculiar design decision in Linux. Ideally, QEMU would run with an empty capability bounding set and would not be able to do any privileged operation (not even by running a helper program). This is not the case because dropping capabilities from the bounding set requires a capability of its own, CAP_SETPCAP; thus QEMU does *not* run with an empty bounding set if invoked via qemu:///session. This is apparently for security reasons, to avoid that dropping _some_ caps but not all of them lets you exploit untested error paths in suid binaries. This series lets libvirtd invoke the privileged helper program on its own, which is a cleaner design that would work even if the above Linux quirk was not there. Also, this adds a <target dev='tap0'/> element to the XML of an active domain using <interface type='bridge'>. Thanks to the patches that have already been committed, the recvfd and virCommand APIs make the task almost trivial. v1->v2: OOM fix in patch 1, change label name in patch 2, rebase Paolo Bonzini (2): virnetdevtap: add virNetDevTapGetName qemu: launch bridge helper from libvirtd src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 133 ++++++++++++++++++++++++++++++++++------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_hotplug.c | 25 +++------ src/util/virnetdevtap.c | 33 ++++++++++++ src/util/virnetdevtap.h | 3 ++ 6 files changed, 143 insertions(+), 53 deletions(-) -- 1.8.2

3 6

[libvirt] [PATCH-v4 0/2] Static Route related updates
by Gene Czarcinski 26 Apr '13

26 Apr '13

This update includes two patch files: 1. The first file adds virSocketAddrGetIpPrefix() to determine the prefix for a network. This function is used by the static route code and has also been used to update (replace the code in) virNetworkIpDefPrefix() in src/conf/network_conf.c 2. The second and major update adds functionality to implement static route for both IPv4 and IPv6. Having static route provides the routing information needed to forward packets not directly reachable from a host. As far as I can determine, this update has adopted all suggestions made against the previous version (except that I am still using CommandRun ... that will be addressed in a future update). I also plan to take a look at <ip> processing such as handling ULong return codes. I also raise the question as to whether address= should be manditory rather than (currently) optional ... I am not sure what <ip> means with address= being optional. Gene Czarcinski (2): create virSocketAddrGetIpPrefix utility function Support for static routes on a virtual bridge docs/formatnetwork.html.in | 80 +++++ docs/schemas/network.rng | 22 ++ src/conf/network_conf.c | 364 +++++++++++++++++++-- src/conf/network_conf.h | 20 ++ src/libvirt_private.syms | 2 + src/network/bridge_driver.c | 41 +++ src/util/virnetdev.c | 44 +++ src/util/virnetdev.h | 5 + src/util/virsocketaddr.c | 43 +++ src/util/virsocketaddr.h | 3 + .../networkxml2xmlin/dhcp6host-routed-network.xml | 2 + .../networkxml2xmlout/dhcp6host-routed-network.xml | 2 + 12 files changed, 600 insertions(+), 28 deletions(-) -- 1.8.1.4

3 11

[libvirt] [PATCH] qemu: don't assign a PCI address to 'none' USB controller
by Ján Tomko 26 Apr '13

26 Apr '13

--- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9737609..126cced 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1925,6 +1925,11 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) continue; + /* USB controller model 'none' doesn't need a PCI address */ + if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) + continue; + /* FDC lives behind the ISA bridge; CCID is a usb device */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC || def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_CCID) -- 1.8.1.5

3 5

[libvirt] libvirtd segfault
by AL13N 26 Apr '13

26 Apr '13

regarding http://www.redhat.com/archives/libvir-list/2012-December/msg01365.html and https://www.redhat.com/archives/libvir-list/2012-December/msg00935.html This seems like the problem i'm having... is there a permanent solution for this? (i'm using libvirtd with XEN using libxl) almost every time i shutdown a domain libvirtd segfaults...

4 13

[libvirt] [PATCH] fix segfault during virsh save in pv guest
by Bamvor Jian Zhang 26 Apr '13

26 Apr '13

this patch fix the wrong sequence for fd and timeout register. the sequence was right in dfa1e1dd for fd register, but it changed in e0622ca2. in this patch, set priv, xl_priv in info and increase info->priv ref count before virEventAddHandle. if do this after virEventAddHandle, the fd callback or fd deregister maybe got the empty priv, xl_priv or wrong ref count. after apply this patch, test more than 100 rounds passed compare to fail within 3 rounds without this patch. each round includes define -> start -> destroy -> create -> suspend -> resume -> reboot -> shutdown -> save -> resotre -> dump -> destroy -> create -> setmem -> setvcpus -> destroy. Signed-off-by: Bamvor Jian Zhang <bjzhang(a)suse.com> --- src/libxl/libxl_driver.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index b4f1889..212d0fc 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -181,26 +181,28 @@ libxlFDRegisterEventHook(void *priv, int fd, void **hndp, return -1; } + info->priv = priv; + /* + * Take a reference on the domain object. Reference is dropped in + * libxlEventHookInfoFree, ensuring the domain object outlives the fd + * event objects. + */ + virObjectRef(info->priv); + info->xl_priv = xl_priv; + if (events & POLLIN) vir_events |= VIR_EVENT_HANDLE_READABLE; if (events & POLLOUT) vir_events |= VIR_EVENT_HANDLE_WRITABLE; + info->id = virEventAddHandle(fd, vir_events, libxlFDEventCallback, info, libxlEventHookInfoFree); if (info->id < 0) { + virObjectUnref(info->priv); VIR_FREE(info); return -1; } - info->priv = priv; - /* - * Take a reference on the domain object. Reference is dropped in - * libxlEventHookInfoFree, ensuring the domain object outlives the fd - * event objects. - */ - virObjectRef(info->priv); - - info->xl_priv = xl_priv; *hndp = info; return 0; @@ -283,6 +285,15 @@ libxlTimeoutRegisterEventHook(void *priv, return -1; } + info->priv = priv; + /* + * Also take a reference on the domain object. Reference is dropped in + * libxlEventHookInfoFree, ensuring the domain object outlives the timeout + * event objects. + */ + virObjectRef(info->priv); + info->xl_priv = xl_priv; + gettimeofday(&now, NULL); timersub(&abs_t, &now, &res); /* Ensure timeout is not overflowed */ @@ -296,22 +307,14 @@ libxlTimeoutRegisterEventHook(void *priv, info->id = virEventAddTimeout(timeout, libxlTimerCallback, info, libxlEventHookInfoFree); if (info->id < 0) { + virObjectUnref(info->priv); VIR_FREE(info); return -1; } - info->priv = priv; - /* - * Also take a reference on the domain object. Reference is dropped in - * libxlEventHookInfoFree, ensuring the domain object outlives the timeout - * event objects. - */ - virObjectRef(info->priv); - virObjectLock(info->priv); LIBXL_EV_REG_APPEND(info->priv->timerRegistrations, info); virObjectUnlock(info->priv); - info->xl_priv = xl_priv; *hndp = info; return 0; -- 1.6.0.2

2 1

[libvirt] KVM Forum 2013 Save the Date
by KVM-Forum-2013-PC＠redhat.com 26 Apr '13

26 Apr '13

KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. The oVirt Workshop will run in parallel with the KVM Forum again, bringing in a community focused on enterprise datacenter virtualization management built on KVM. So mark your calendar and join us in advancing KVM. Once again we are colocated with The Linux Foundation's LinuxCon Europe, this year in Edinburgh. Date: October 21-23, 2013 Location: Edinburgh International Conference Centre - Edinburgh, UK Details regarding registration and proposal submission are forthcoming. thanks, -KVM Forum 2013 Program Commitee

1 0

[libvirt] [PATCH 0/4] Remaining patches from VFIO series
by Laine Stump 26 Apr '13

26 Apr '13

I've pushed everything else from all 3 VFIO series. Patch 1/4 in this series had questions from Eric about whether it is the right way to go, or if we want to do something more limited: https://www.redhat.com/archives/libvir-list/2013-April/msg01864.html Eric and danpb had both raised issues with Patch 2/4, so I redid it addressing all the points they brought up, and it's now ready for review: https://www.redhat.com/archives/libvir-list/2013-April/msg01853.html https://www.redhat.com/archives/libvir-list/2013-April/msg01869.html 3/4 and 4/4 were ACKed, but depend on 2/4, so I couldn't push them. If these patches are ACKed and DV wants to make the RC1 snapshot before I wake up, anyone else feel free to push these 4 patches as they are (assuming they're ACKed, of course :-) Laine Stump (4): util: new virCommandSetMax(MemLock|Processes|Files) qemu: use new virCommandSetMax(Processes|Files) qemu: set qemu process' RLIMIT_MEMLOCK when VFIO is used qemu: add VFIO devices to cgroup ACL configure.ac | 2 +- src/libvirt_private.syms | 6 ++ src/qemu/qemu_cgroup.c | 11 ++++ src/qemu/qemu_command.c | 25 +++++--- src/qemu/qemu_hotplug.c | 27 ++++++--- src/qemu/qemu_process.c | 38 +----------- src/util/vircommand.c | 38 ++++++++++++ src/util/vircommand.h | 4 ++ src/util/virprocess.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++- src/util/virprocess.h | 5 +- 10 files changed, 255 insertions(+), 53 deletions(-) -- 1.7.11.7

3 13

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 26 Apr '13

26 Apr '13

Overall status: failed Start date: Fri Apr 26 2013 Start time: 12:45:58 UTC / 13:45:58 BST Build counter: 1366980358 Build timestamp: 1366980358 URL: http://dhcp74-229.virt.bos.redhat.com/index.html Module: libvirt Status: failed URL: http://dhcp74-229.virt.bos.redhat.com/module-libvirt.html

2 1

[libvirt] [PATCH] S390: Add fake PCI root
by Viktor Mihajlovski 26 Apr '13

26 Apr '13

For the time being add a PCI root for s390 to avoid getting issues later on with PCI address checking. I don't want to unconditionally switch off PCI for s390. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d927716..a00536f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -700,6 +700,8 @@ qemuDomainDefPostParse(virDomainDefPtr def, case VIR_ARCH_PPCEMB: case VIR_ARCH_SH4: case VIR_ARCH_SH4EB: + case VIR_ARCH_S390: + case VIR_ARCH_S390X: addPCIRoot = true; break; default: -- 1.7.9.5

3 4

[libvirt] [PATCH] qemu: assume virtio-memballon without an address to be PCI
by Ján Tomko 26 Apr '13

26 Apr '13

When doing XML-to-native conversion, addresses are not assigned. The code building memballon device string assumed they are and returned an error without reporting any error message, leading to: error: An error occurred, but the cause is unknown Assume that address type none means it's a PCI device, as we do for other virtio devices. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=957077 --- This still leaves XML-to-native conversion broken for S390 machines, not just for memballon, but for other virtio devices as well. Should we assign addresses in DomainXMLToNative as well, or just decide which virtio device to add based on the machine type? src/qemu/qemu_command.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6f6b61b..6e1fff2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4083,14 +4083,12 @@ qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, virBuffer buf = VIR_BUFFER_INITIALIZER; switch (dev->info.type) { - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: - virBufferAddLit(&buf, "virtio-balloon-pci"); - break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: virBufferAddLit(&buf, "virtio-balloon-ccw"); break; default: - goto error; + virBufferAddLit(&buf, "virtio-balloon-pci"); + break; } virBufferAsprintf(&buf, ",id=%s", dev->info.alias); -- 1.8.1.5

3 2

[libvirt] [PATCH 0/3] Honour standards for cgroup naming/escaping
by Daniel P. Berrange 26 Apr '13

26 Apr '13

In discussions with the systemd team, we deciced we needed some clearer rules on cgroup naming / escaping, to ensure there are never clashes with filenames owned by the kernel. This series makes the changes required to libvirt

2 10

[libvirt] [PATCH v2] test: Add JSON test for query-tpm-types
by Stefan Berger 26 Apr '13

26 Apr '13

Add a test case for query-tpm-models QMP command. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- tests/qemumonitorjsontest.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 24685c7..6f42598 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -25,6 +25,7 @@ #include "qemu/qemu_conf.h" #include "virthread.h" #include "virerror.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -440,6 +441,59 @@ cleanup: static int +testQemuMonitorJSONGetTPMModels(const void *data) +{ + const virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNew(true, xmlopt); + int ret = -1; + char **tpmmodels = NULL; + int ntpmmodels = 0; + + if (!test) + return -1; + + if (qemuMonitorTestAddItem(test, "query-tpm-models", + "{ " + " \"return\": [ " + " \"passthrough\"" + " ]" + "}") < 0) + goto cleanup; + + if ((ntpmmodels = qemuMonitorGetTPMModels(qemuMonitorTestGetMonitor(test), + &tpmmodels)) < 0) + goto cleanup; + + if (ntpmmodels != 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "ntpmmodels %d is not 1", ntpmmodels); + goto cleanup; + } + +#define CHECK(i, wantname) \ + do { \ + if (STRNEQ(tpmmodels[i], (wantname))) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, \ + "name %s is not %s", \ + tpmmodels[i], (wantname)); \ + goto cleanup; \ + } \ + } while (0) + + CHECK(0, "passthrough"); + +#undef CHECK + + ret = 0; + +cleanup: + qemuMonitorTestFree(test); + virStringFreeList(tpmmodels); + return ret; +} + + +static int mymain(void) { int ret = 0; @@ -465,6 +519,7 @@ mymain(void) DO_TEST(GetMachines); DO_TEST(GetCPUDefinitions); DO_TEST(GetCommands); + DO_TEST(GetTPMModels); virObjectUnref(xmlopt); -- 1.7.11.7

2 2

[libvirt] [PATCH] virsh: suppress aliases in group help
by Eric Blake 26 Apr '13

26 Apr '13

'virsh help | grep nodedev-det' shows only nodedev-detach, but 'virsh help nodedev | grep nodedev-det' also shows the older alias that we intentionally hid in commit af3f9aab. See also commit 787f4fe and this bug report: https://bugzilla.redhat.com/show_bug.cgi?id=956966 * tools/virsh.c (vshCmdGrpHelp): Copy suppression of vshCmdHelp. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 4cd93ca..6ec2f7b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1177,6 +1177,8 @@ vshCmdGrpHelp(vshControl *ctl, const char *grpname) grp->keyword); for (cmd = grp->commands; cmd->name; cmd++) { + if (cmd->flags & VSH_CMD_FLAG_ALIAS) + continue; vshPrint(ctl, " %-30s %s\n", cmd->name, _(vshCmddefGetInfo(cmd, "help"))); } -- 1.8.1.4

2 2

[libvirt] [question] Why doesn't virsh command support an optional parameter
by Zhang Xiaohe 26 Apr '13

26 Apr '13

hi guys, It's hard for me to understand why doesn't virsh command support an optional parameter because I think omitting a parameter and offering a default value sometimes is quite convenient. For example: $ virsh shutdown guest --mode acpi The option --mode only accept string "acpi", "agent", "initctl" and "signal", assuming that "acpi" is the most frequently used parameter when --mode is specified, why not just using $ virsh shutdown guest --mode acpi instead. Maybe this example is not very precise, but what I mean is if there is an option which only accepts several candidate values and one of the value is always used when it is specified, then we can make it the default parameter of this option. This would be convenient and save some typing. Of course, this can also result in ambiguity to people who is not familiar with the command. But with the help, it won't trap one very long, will it? So, why doesn't virsh support this and what do you think of adding this feature? Thanks Zhang Xiaohe

2 2

[libvirt] [libvirt-perl][PATCH] Fix typo in domain help page
by Zhe Peng 26 Apr '13

26 Apr '13

The help page of $dom->set_metadata have a typo,this patch fix it. --- lib/Sys/Virt/Domain.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index a502029..053f127 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -112,7 +112,7 @@ C<$flags> parameter defaults to zero. Sets the metadata element of type C<$type> to hold the value C<$val>. If C<$type> is C<Sys::Virt::Domain::METADATA_ELEMENT> then the C<$key> and C<$uri> elements specify an XML namespace -to use, otherwise they should both be C<nudef>. The optional +to use, otherwise they should both be C<undef>. The optional C<$flags> parameter defaults to zero. =item $dom->is_active() -- 1.7.7.6

1 0

[libvirt] [PATCH 0/8] VDIO support part 3
by Laine Stump 26 Apr '13

26 Apr '13

This *almost* completes VFIO support. I still need to add a couple of xml/args test cases. Laine Stump (8): util: new function virPCIDeviceGetVFIOGroupDev security: update hostdev labelling functions for VFIO qemu: add VFIO devices to cgroup ACL qemu: add QEMU_CAPS_VFIO_PCI_BOOTINDEX qemu: use vfio-pci on commandline when appropriate util: new virCommandSetMax(MemLock|Processes|Files) qemu: use new virCommandSetMax(Processes|Files) qemu: set qemu process' RLIMIT_MEMLOCK when VFIO is used configure.ac | 2 +- src/libvirt_private.syms | 7 ++ src/qemu/qemu_capabilities.c | 7 ++ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_cgroup.c | 11 +++ src/qemu/qemu_command.c | 56 ++++++++++++--- src/qemu/qemu_hotplug.c | 23 +++++- src/qemu/qemu_process.c | 38 +--------- src/security/security_apparmor.c | 12 +++- src/security/security_dac.c | 27 +++++++- src/security/security_selinux.c | 24 ++++++- src/util/vircommand.c | 38 ++++++++++ src/util/vircommand.h | 4 ++ src/util/virpci.c | 34 +++++++++ src/util/virpci.h | 2 + src/util/virutil.c | 146 +++++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 4 ++ 17 files changed, 382 insertions(+), 55 deletions(-) -- 1.7.11.7

3 24

[libvirt] [PATCH 0/7] VFIO support part 2
by Laine Stump 26 Apr '13

26 Apr '13

More patches to go on top of the 3 patches yesterday. These patches add a new API that I just learned was necessary - virNodeDeviceDetachFlags() (explanation in patches), implement it for xen and qemu, and use it in virsh. Laine Stump (7): pci: keep a stubDriver in each virPCIDevice qemu: bind/unbind stub driver according to config <driver name='x'/> hypervisor api: new virNodeDeviceDetachFlags hypervisor api: implement RPC calls for virNodeDeviceDetachFlags qemu: implement virNodeDeviceDetachFlags backend xen: implement virNodeDeviceDetachFlags backend virsh: use new virNodeDeviceDetachFlags include/libvirt/libvirt.h.in | 5 +++- src/driver.h | 6 ++++ src/libvirt.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 ++ src/libvirt_public.syms | 5 ++++ src/qemu/qemu_driver.c | 25 ++++++++++++++-- src/qemu/qemu_hostdev.c | 22 ++++++++++++-- src/remote/remote_driver.c | 34 +++++++++++++++++++++- src/remote/remote_protocol.x | 15 ++++++++-- src/remote_protocol-structs | 6 ++++ src/util/virpci.c | 19 ++++++++++++ src/util/virpci.h | 5 +++- src/xen/xen_driver.c | 25 ++++++++++++++-- tools/virsh-nodedev.c | 28 +++++++++++++----- 14 files changed, 246 insertions(+), 20 deletions(-) -- 1.7.11.7

3 15