- Devel - libvirt List Archives

[libvirt] building error
by Wen Congyang 06 Jul '11

06 Jul '11

When I build libvirt, I meet the following error: make[3]: Entering directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.2/daemon' CC libvirtd-libvirtd.o CC libvirtd-remote.o remote.c: In function 'remoteDispatchAuthPolkit': remote.c:2043: error: invalid initializer make[3]: *** [libvirtd-remote.o] Error 1 This patch can fix the problem. But I do not know whether it is right. >From b03a5c08b751440460bf4cb02fea061b77fb3ef5 Mon Sep 17 00:00:00 2001 From: Wen Congyang <wency(a)cn.fujitsu.com> Date: Wed, 29 Jun 2011 19:04:19 +0800 Subject: [PATCH 1/2] daemon: Fix building error with polkit1 --- daemon/remote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9e6cf77..042894b 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2041,7 +2041,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, goto authdeny; } PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_POLKIT, ident); + virNetServerClientGetFD(client), REMOTE_AUTH_POLKIT, (char *)ident); VIR_INFO("Policy allowed action %s from pid %d, uid %d", action, callerPid, callerUid); ret->complete = 1; -- 1.7.1

4 13

[libvirt] libvirt 0.9.3, missing header
by Jason Helfman 06 Jul '11

06 Jul '11

When building the latest code in a clean building environment, with sasl disabled, I get this error: gmake[3]: Entering directory `/work/a/ports/devel/libvirt/work/libvirt-0.9.3/daemon' CC libvirtd-libvirtd.o In file included from libvirtd.h:41, from libvirtd.c:41: ../src/rpc/virnetsaslcontext.h:24:24: error: sasl/sasl.h: No such file or directory In file included from libvirtd.h:41, from libvirtd.c:41: ../src/rpc/virnetsaslcontext.h:54: warning: type defaults to 'int' in declaration of 'sasl_callback_t' ../src/rpc/virnetsaslcontext.h:54: error: expected ';', ',' or ')' before '*' token ../src/rpc/virnetsaslcontext.h:78: error: expected declaration specifiers or '...' before 'sasl_interact_t' ../src/rpc/virnetsaslcontext.h:86: error: expected declaration specifiers or '...' before 'sasl_interact_t' gmake[3]: *** [libvirtd-libvirtd.o] Error 1 gmake[3]: Leaving directory `/work/a/ports/devel/libvirt/work/libvirt-0.9.3/daemon' gmake[2]: *** [all] Error 2 gmake[2]: Leaving directory `/work/a/ports/devel/libvirt/work/libvirt-0.9.3/daemon' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/work/a/ports/devel/libvirt/work/libvirt-0.9.3' gmake: *** [all] Error 2 *** Error code 1 Any ideas? Thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

2 2

[libvirt] Strange failure of commandtest when doing F15 build
by Laine Stump 06 Jul '11

06 Jul '11

Today I added some patches to the f15 branch of Fedora libvirt, ran "fedpkg local" to be sure it was all in order, then did a "fedpkg commit -p" and "fedpkg build". When I came back awhile later, I found that it had failed. Looking in the logs, I could see that the failure was due to tests/commandtest. Since the failure says almost nothing (and there was nothing even remotely related in any of the changes), I decided to try and build 1) the older libvirt and 2) with debugging turned on in the tests. I had no idea how to do this, but nirik in #fedora-devel helped me out, and I did the following: 1) reverted the libvirt.spec file locally (so that I'm working with source that previously built) 2) added the following lines just prior to "make check" in the specfile: export VIR_TEST_VERBOSE=1 export LIBVIRT_LOG_OUTPUTS=3:stderr export LIBVIRT_LOG_FILTERS="1:command" export VIR_TEST_DEBUG=2 3) added something identifiable to the version string in libvirt.spec: Release: 4.test%{?dist}%{?extra_release} 4) fedpkg srpm 5) koji build --scratch dist-f15 libvirt-0.8.8-4.test.fc15.src.rpm This build also failed. The results are here: http://koji.fedoraproject.org/koji/taskinfo?taskID=3182099 (search for "... FAIL") So it appears that some other package on the build machine has been updated, and it's causing most of the tests in commandtest to fail. Unfortunately, even when debugging is turned on the tests don't say anything about why they failed. Any ideas?

2 1

[libvirt] [PATCH] Reduce code duplication in virFileMakePath(Helper)
by Matthias Bolte 06 Jul '11

06 Jul '11

Move stat and mkdir to virFileMakePathHelper. Also use the stat result to detect whether the existing path is a directory and set errno accordingly if it's not. --- src/util/util.c | 44 ++++++++++++++------------------------------ 1 files changed, 14 insertions(+), 30 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 4710fc5..d944123 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1013,11 +1013,17 @@ int virDirCreate(const char *path ATTRIBUTE_UNUSED, static int virFileMakePathHelper(char *path) { struct stat st; - char *p = NULL; + char *p; - if (stat(path, &st) >= 0) - return 0; - else if (errno != ENOENT) + if (stat(path, &st) >= 0) { + if (S_ISDIR(st.st_mode)) + return 0; + + errno = ENOTDIR; + return -1; + } + + if (errno != ENOENT) return -1; if ((p = strrchr(path, '/')) == NULL) { @@ -1049,39 +1055,17 @@ static int virFileMakePathHelper(char *path) int virFileMakePath(const char *path) { int ret = -1; - struct stat st; - char *parent = NULL; - char *p; - - if (stat(path, &st) >= 0) - return 0; - else if (errno != ENOENT) - goto cleanup; + char *tmp; - if ((parent = strdup(path)) == NULL) { + if ((tmp = strdup(path)) == NULL) { errno = ENOMEM; goto cleanup; } - if ((p = strrchr(parent, '/')) == NULL) { - errno = EINVAL; - goto cleanup; - } - - if (p != parent) { - *p = '\0'; - - if (virFileMakePathHelper(parent) < 0) - goto cleanup; - } - - if (mkdir(path, 0777) < 0 && errno != EEXIST) - goto cleanup; - - ret = 0; + ret = virFileMakePathHelper(tmp); cleanup: - VIR_FREE(parent); + VIR_FREE(tmp); return ret; } -- 1.7.4.1

2 3

[libvirt] [PATCH] util: close the ioctl socket at the end of if(Get|Set)MacAddress
by Laine Stump 06 Jul '11

06 Jul '11

Otherwise this will leak an fd each time one of these functions is called. --- src/util/interface.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/util/interface.c b/src/util/interface.c index f486124..178a4dd 100644 --- a/src/util/interface.c +++ b/src/util/interface.c @@ -413,6 +413,7 @@ ifaceGetMacAddress(const char *ifname, { struct ifreq ifr; int fd; + int rc = 0; if (!ifname) return EINVAL; @@ -422,15 +423,21 @@ ifaceGetMacAddress(const char *ifname, return errno; memset(&ifr, 0, sizeof(struct ifreq)); - if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) - return EINVAL; + if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) { + rc = EINVAL; + goto err_exit; + } - if (ioctl(fd, SIOCGIFHWADDR, (char *)&ifr) != 0) - return errno; + if (ioctl(fd, SIOCGIFHWADDR, (char *)&ifr) != 0) { + rc = errno; + goto err_exit; + } memcpy(macaddr, ifr.ifr_ifru.ifru_hwaddr.sa_data, VIR_MAC_BUFLEN); - return 0; +err_exit: + VIR_FORCE_CLOSE(fd); + return rc; } #else @@ -461,6 +468,7 @@ ifaceSetMacAddress(const char *ifname, { struct ifreq ifr; int fd; + int rc = 0; if (!ifname) return EINVAL; @@ -470,16 +478,24 @@ ifaceSetMacAddress(const char *ifname, return errno; memset(&ifr, 0, sizeof(struct ifreq)); - if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) - return EINVAL; + if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) { + rc = EINVAL; + goto err_exit; + } /* To fill ifr.ifr_hdaddr.sa_family field */ - if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0) - return errno; + if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0) { + rc = errno; + goto err_exit; + } memcpy(ifr.ifr_hwaddr.sa_data, macaddr, VIR_MAC_BUFLEN); - return ioctl(fd, SIOCSIFHWADDR, &ifr) == 0 ? 0 : errno; + rc = ioctl(fd, SIOCSIFHWADDR, &ifr) == 0 ? 0 : errno; + +err_exit: + VIR_FORCE_CLOSE(fd); + return rc; } #else -- 1.7.3.4

2 5

[libvirt] [PATCH] apparmor: Finish incomplete renaming of relabel to norelabel
by Matthias Bolte 06 Jul '11

06 Jul '11

Commit 693eac388f1759d was incomplete here. --- Pushing this under the build-breaker rule. src/security/security_apparmor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 76c6e3d..6dfe8c9 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -461,7 +461,7 @@ static int AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr, virDomainObjPtr vm, const char *stdin_path) { - if (!vm->def->seclabel.relabel) + if (vm->def->seclabel.norelabel) return 0; /* Reload the profile if stdin_path is specified. Note that -- 1.7.4.1

1 0

[libvirt] [PATCH v2] qemu: Add support for SGA
by Michal Privoznik 06 Jul '11

06 Jul '11

This patch creates new attribute 'sga' for <serial> element. Serial Graphics Adapter allows users to see BIOS messages from the very first moment domain boots up. Therefore, users can choose boot medium, set PXE, etc. However, to be able to use this, one need SGABIOS, which is accessible here: http://code.google.com/p/sgabios/ --- diff to v1: -move from <video> to <serial> as Dan suggested: https://www.redhat.com/archives/libvir-list/2011-July/msg00134.html docs/formatdomain.html.in | 10 ++++-- docs/schemas/domain.rng | 20 +++++++++--- src/conf/domain_conf.c | 34 ++++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++ .../qemuxml2argv-serial-pty-chardev.args | 3 +- .../qemuxml2argv-serial-pty-chardev.xml | 2 +- tests/qemuxml2argvtest.c | 3 +- 10 files changed, 78 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fe8d74c..1e9eee5 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2040,7 +2040,7 @@ qemu-kvm -net nic,model=? /dev/null <source path='/dev/pts/2'/> <target port='0'/> </parallel> - <serial type='pty'> + <serial type='pty' sga='on'> <source path='/dev/pts/3'/> <target port='0'/> </serial> @@ -2105,7 +2105,7 @@ qemu-kvm -net nic,model=? /dev/null <pre> ... <devices> - <serial type='pty'> + <serial type='pty' sga='on'> <source path='/dev/pts/3'/> <target port='0'/> </serial> @@ -2115,7 +2115,11 @@ qemu-kvm -net nic,model=? /dev/null <code>target</code> can have a <code>port</code> attribute, which specifies the port number. Ports are numbered starting from 0. There are - usually 0, 1 or 2 serial ports. + usually 0, 1 or 2 serial ports. The <code>sga</code> attribute enables + or disables Serial Graphics Adapter. Accepted values are <code>on</code> + and <code>off</code>. To be able to use this feature, you need to install + <a href="http://code.google.com/p/sgabios/">SGABios</a>. SGA + Since 0.9.4 <h6><a name="elementCharConsole">Console</a></h6> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fb1497b..e9539d5 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1618,11 +1618,21 @@ --> <define name="qemucdev"> <ref name="qemucdevSrcType"/> - <optional> - <attribute name="tty"> - <ref name="absFilePath"/> - </attribute> - </optional> + <interleave> + <optional> + <attribute name="tty"> + <ref name="absFilePath"/> + </attribute> + </optional> + <optional> + <attribute name="sga"> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> + </interleave> <interleave> <ref name="qemucdevSrcDef"/> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 109a947..cb7fe23 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -258,6 +258,11 @@ VIR_ENUM_IMPL(virDomainChrSpicevmc, VIR_DOMAIN_CHR_SPICEVMC_LAST, "vdagent", "smartcard") +VIR_ENUM_IMPL(virDomainChrSGA, VIR_DOMAIN_CHR_SGA_LAST, + "default", + "on", + "off") + VIR_ENUM_IMPL(virDomainSmartcard, VIR_DOMAIN_SMARTCARD_TYPE_LAST, "host", "host-certificates", @@ -3488,6 +3493,10 @@ virDomainChrDefNew(void) { * <target port="1"/> * </serial> * + * <serial type="pty" sga="on"> + * <target port="0"/> + * </serial> + * * <serial type="dev"> * <source path="/dev/ttyS0"/> * <target port="1"/> @@ -3522,6 +3531,7 @@ virDomainChrDefParseXML(virCapsPtr caps, int flags) { xmlNodePtr cur; char *type = NULL; + char *sga = NULL; const char *nodeName; virDomainChrDefPtr def; int remaining; @@ -3530,6 +3540,7 @@ virDomainChrDefParseXML(virCapsPtr caps, return NULL; type = virXMLPropString(node, "type"); + sga = virXMLPropString(node, "sga"); if (type == NULL) { def->source.type = VIR_DOMAIN_CHR_TYPE_PTY; } else if ((def->source.type = virDomainChrTypeFromString(type)) < 0) { @@ -3539,6 +3550,13 @@ virDomainChrDefParseXML(virCapsPtr caps, goto error; } + if (sga && (def->source.sga=virDomainChrSGATypeFromString(sga)) <= 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown value for sga: %s"), + sga); + goto error; + } + nodeName = (const char *) node->name; if ((def->deviceType = virDomainChrDeviceTypeFromString(nodeName)) < 0) { virDomainReportError(VIR_ERR_XML_ERROR, @@ -3580,6 +3598,7 @@ virDomainChrDefParseXML(virCapsPtr caps, cleanup: VIR_FREE(type); + VIR_FREE(sga); return def; @@ -8739,9 +8758,11 @@ static int virDomainChrSourceDefFormat(virBufferPtr buf, virDomainChrSourceDefPtr def, bool tty_compat, + int deviceType, int flags) { const char *type = virDomainChrTypeToString(def->type); + const char *sga = virDomainChrSGATypeToString(def->sga); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -8755,6 +8776,14 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virBufferEscapeString(buf, " tty='%s'", def->data.file.path); } + if (deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && def->sga) { + if (!sga) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected sga value %d"), def->sga); + return -1; + } + virBufferAsprintf(buf, " sga='%s'", sga); + } virBufferAddLit(buf, ">\n"); switch (def->type) { @@ -8857,7 +8886,8 @@ virDomainChrDefFormat(virBufferPtr buf, def->source.type == VIR_DOMAIN_CHR_TYPE_PTY && !(flags & VIR_DOMAIN_XML_INACTIVE) && def->source.data.file.path); - if (virDomainChrSourceDefFormat(buf, &def->source, tty_compat, flags) < 0) + if (virDomainChrSourceDefFormat(buf, &def->source, tty_compat, + def->deviceType, flags) < 0) return -1; /* Format <target> block */ @@ -8962,7 +8992,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: if (virDomainChrSourceDefFormat(buf, &def->data.passthru, false, - flags) < 0) + -1, flags) < 0) return -1; break; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 258289a..ab0632c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -457,11 +457,20 @@ enum virDomainChrSpicevmcName { VIR_DOMAIN_CHR_SPICEVMC_LAST, }; +enum virDomainChrSGA { + VIR_DOMAIN_CHR_SGA_DEFAULT = 0, + VIR_DOMAIN_CHR_SGA_ON, + VIR_DOMAIN_CHR_SGA_OFF, + + VIR_DOMAIN_CHR_SGA_LAST +}; + /* The host side information for a character device. */ typedef struct _virDomainChrSourceDef virDomainChrSourceDef; typedef virDomainChrSourceDef *virDomainChrSourceDefPtr; struct _virDomainChrSourceDef { int type; /* virDomainChrType */ + int sga; /* Serial Graphics Adapter */ union { /* no <source> for null, vc, stdio */ struct { @@ -1570,6 +1579,7 @@ VIR_ENUM_DECL(virDomainSmartcard) VIR_ENUM_DECL(virDomainChr) VIR_ENUM_DECL(virDomainChrTcpProtocol) VIR_ENUM_DECL(virDomainChrSpicevmc) +VIR_ENUM_DECL(virDomainChrSGA) VIR_ENUM_DECL(virDomainSoundModel) VIR_ENUM_DECL(virDomainMemballoonModel) VIR_ENUM_DECL(virDomainSmbiosMode) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ad62a07..2dfe375 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -122,6 +122,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-multifunction", /* 60 */ "virtio-blk-pci.ioeventfd", + "sga", ); struct qemu_feature_flags { @@ -1210,6 +1211,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_DEVICE_QXL_VGA); if (strstr(str, "virtio-blk-pci.ioeventfd")) qemuCapsSet(flags, QEMU_CAPS_VIRTIO_IOEVENTFD); + if (strstr(str, "name \"sga\"")) + qemuCapsSet(flags, QEMU_CAPS_SGA); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0b9c8be..d251262 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -97,6 +97,7 @@ enum qemuCapsFlags { QEMU_CAPS_DEVICE_QXL_VGA = 59, /* Is the primary and vga campatible qxl device named qxl-vga? */ QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* IOeventFD feature: virtio-{net|blk}-pci.ioeventfd=on/off */ + QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6e4480e..29936a6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3884,6 +3884,11 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-device"); virCommandAddArgFormat(cmd, "isa-serial,chardev=char%s,id=%s", serial->info.alias, serial->info.alias); + + if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + serial->source.sga == VIR_DOMAIN_CHR_SGA_ON && + qemuCapsGet(qemuCaps, QEMU_CAPS_SGA)) + virCommandAddArgList(cmd, "-device", "sga", NULL); } else { virCommandAddArg(cmd, "-serial"); if (!(devstr = qemuBuildChrArgStr(&serial->source, NULL))) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args index 4a6202e..369379f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args @@ -2,5 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev socket,\ id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\ id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \ -pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb \ +pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 \ +-device sga -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml index 57d1b74..31eb7d1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml @@ -20,7 +20,7 @@ <address type='drive' controller='0' bus='0' unit='0'/> </disk> <controller type='ide' index='0'/> - <serial type='pty'> + <serial type='pty' sga='on'> <target port='0'/> </serial> <console type='pty'> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ec1f4b5..b4562d1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -425,7 +425,8 @@ mymain(void) DO_TEST("serial-vc-chardev", false, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-pty-chardev", false, - QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SGA); DO_TEST("serial-dev-chardev", false, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("serial-file-chardev", false, -- 1.7.5.rc3

3 2

[libvirt] [PATCH] Fix return value semantic of virFileMakePath
by Matthias Bolte 06 Jul '11

06 Jul '11

Some callers expected virFileMakePath to set errno, some expected it to return an errno value. Unify this to return 0 on success and -1 on error. Set errno to report detailed error information. Also Make virFileMakePath report an error when stat fails with an errno different from ENOENT. --- src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 5 +-- src/conf/nwfilter_conf.c | 11 +++----- src/conf/storage_conf.c | 6 +--- src/libxl/libxl_driver.c | 14 ++++----- src/lxc/lxc_container.c | 18 ++++++------ src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 10 +++---- src/network/bridge_driver.c | 25 ++++++++--------- src/qemu/qemu_driver.c | 28 ++++++++----------- src/qemu/qemu_process.c | 2 +- src/storage/storage_backend_fs.c | 4 +- src/storage/storage_driver.c | 6 +--- src/uml/uml_driver.c | 10 +++---- src/util/dnsmasq.c | 5 +-- src/util/util.c | 56 ++++++++++++++++++++++++------------- 16 files changed, 100 insertions(+), 104 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 109a947..64c5636 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9986,7 +9986,7 @@ int virDomainSaveXML(const char *configDir, if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) goto cleanup; - if (virFileMakePath(configDir)) { + if (virFileMakePath(configDir) < 0) { virReportSystemError(errno, _("cannot create config directory '%s'"), configDir); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 45ddee2..ae479bf 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1114,13 +1114,12 @@ int virNetworkSaveXML(const char *configDir, char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; - int err; if ((configFile = virNetworkConfigFile(configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { - virReportSystemError(err, + if (virFileMakePath(configDir) < 0) { + virReportSystemError(errno, _("cannot create config directory '%s'"), configDir); goto cleanup; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 127d4be..036c61a 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2184,13 +2184,12 @@ int virNWFilterSaveXML(const char *configDir, char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; - int err; if ((configFile = virNWFilterConfigFile(configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { - virReportSystemError(err, + if (virFileMakePath(configDir) < 0) { + virReportSystemError(errno, _("cannot create config directory '%s'"), configDir); goto cleanup; @@ -2574,10 +2573,8 @@ virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, ssize_t towrite; if (!nwfilter->configFile) { - int err; - - if ((err = virFileMakePath(driver->configDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->configDir) < 0) { + virReportSystemError(errno, _("cannot create config directory %s"), driver->configDir); return -1; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index ca86f19..f6f8be1 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1512,10 +1512,8 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, ssize_t towrite; if (!pool->configFile) { - int err; - - if ((err = virFileMakePath(driver->configDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->configDir) < 0) { + virReportSystemError(errno, _("cannot create config directory %s"), driver->configDir); return -1; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7fd257d..ade69d8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -914,25 +914,25 @@ libxlStartup(int privileged) { "%s", LIBXL_SAVE_DIR) == -1) goto out_of_memory; - if (virFileMakePath(libxl_driver->logDir) != 0) { + if (virFileMakePath(libxl_driver->logDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create log dir '%s': %s"), libxl_driver->logDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->stateDir) != 0) { + if (virFileMakePath(libxl_driver->stateDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), libxl_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->libDir) != 0) { + if (virFileMakePath(libxl_driver->libDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), libxl_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->saveDir) != 0) { + if (virFileMakePath(libxl_driver->saveDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), libxl_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); @@ -3389,10 +3389,8 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart) goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("cannot create autostart directory %s"), driver->autostartDir); goto cleanup; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 7924858..ef8469c 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -308,7 +308,7 @@ static int lxcContainerChildMountSort(const void *a, const void *b) static int lxcContainerPivotRoot(virDomainFSDefPtr root) { - int rc, ret; + int ret; char *oldroot = NULL, *newroot = NULL; ret = -1; @@ -325,8 +325,8 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - if ((rc = virFileMakePath(oldroot)) != 0) { - virReportSystemError(rc, + if (virFileMakePath(oldroot) < 0) { + virReportSystemError(errno, _("Failed to create %s"), oldroot); goto err; @@ -347,8 +347,8 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - if ((rc = virFileMakePath(newroot)) != 0) { - virReportSystemError(rc, + if (virFileMakePath(newroot) < 0) { + virReportSystemError(errno, _("Failed to create %s"), newroot); goto err; @@ -415,7 +415,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } for (i = 0 ; i < ARRAY_CARDINALITY(mnts) ; i++) { - if (virFileMakePath(mnts[i].dst) != 0) { + if (virFileMakePath(mnts[i].dst) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), mnts[i].src); @@ -429,8 +429,8 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } } - if ((rc = virFileMakePath("/dev/pts") != 0)) { - virReportSystemError(rc, "%s", + if (virFileMakePath("/dev/pts") < 0) { + virReportSystemError(errno, "%s", _("Cannot create /dev/pts")); goto cleanup; } @@ -531,7 +531,7 @@ static int lxcContainerMountNewFS(virDomainDefPtr vmDef) return -1; } - if (virFileMakePath(vmDef->fss[i]->dst) != 0) { + if (virFileMakePath(vmDef->fss[i]->dst) < 0) { virReportSystemError(errno, _("Failed to create %s"), vmDef->fss[i]->dst); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 7d60090..31c7d4f 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -690,7 +690,7 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } - if (virFileMakePath(devpts) != 0) { + if (virFileMakePath(devpts) < 0) { virReportSystemError(errno, _("Failed to make path %s"), devpts); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7220a9b..ffcfe4d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1502,8 +1502,8 @@ static int lxcVmStart(virConnectPtr conn, return -1; } - if ((r = virFileMakePath(driver->logDir)) != 0) { - virReportSystemError(r, + if (virFileMakePath(driver->logDir) < 0) { + virReportSystemError(errno, _("Cannot create log directory '%s'"), driver->logDir); return -1; @@ -2539,10 +2539,8 @@ static int lxcDomainSetAutostart(virDomainPtr dom, goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("Cannot create autostart directory %s"), driver->autostartDir); goto cleanup; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 660dd65..170bf98 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -692,17 +692,16 @@ networkStartDhcpDaemon(virNetworkObjPtr network) virCommandPtr cmd = NULL; char *pidfile = NULL; int ret = -1; - int err; dnsmasqContext *dctx = NULL; - if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(NETWORK_PID_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), NETWORK_PID_DIR); goto cleanup; } - if ((err = virFileMakePath(NETWORK_STATE_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(NETWORK_STATE_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), NETWORK_STATE_DIR); goto cleanup; @@ -713,8 +712,8 @@ networkStartDhcpDaemon(virNetworkObjPtr network) goto cleanup; } - if ((err = virFileMakePath(DNSMASQ_STATE_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(DNSMASQ_STATE_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), DNSMASQ_STATE_DIR); goto cleanup; @@ -777,14 +776,14 @@ networkStartRadvd(virNetworkObjPtr network) goto cleanup; } - if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(NETWORK_PID_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), NETWORK_PID_DIR); goto cleanup; } - if ((err = virFileMakePath(RADVD_STATE_DIR)) != 0) { - virReportSystemError(err, + if (virFileMakePath(RADVD_STATE_DIR) < 0) { + virReportSystemError(errno, _("cannot create directory %s"), RADVD_STATE_DIR); goto cleanup; @@ -2500,7 +2499,7 @@ static int networkSetAutostart(virNetworkPtr net, struct network_driver *driver = net->conn->networkPrivateData; virNetworkObjPtr network; char *configFile = NULL, *autostartLink = NULL; - int ret = -1; + int ret = -1, err; networkDriverLock(driver); network = virNetworkFindByUUID(&driver->networks, net->uuid); @@ -2526,7 +2525,7 @@ static int networkSetAutostart(virNetworkPtr net, goto cleanup; if (autostart) { - if (virFileMakePath(driver->networkAutostartDir)) { + if (virFileMakePath(driver->networkAutostartDir) < 0) { virReportSystemError(errno, _("cannot create autostart directory '%s'"), driver->networkAutostartDir); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aab3ab9..0f645fa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -469,37 +469,37 @@ qemudStartup(int privileged) { goto out_of_memory; } - if (virFileMakePath(qemu_driver->stateDir) != 0) { + if (virFileMakePath(qemu_driver->stateDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->libDir) != 0) { + if (virFileMakePath(qemu_driver->libDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->cacheDir) != 0) { + if (virFileMakePath(qemu_driver->cacheDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create cache dir '%s': %s"), qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->saveDir) != 0) { + if (virFileMakePath(qemu_driver->saveDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), qemu_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->snapshotDir) != 0) { + if (virFileMakePath(qemu_driver->snapshotDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), qemu_driver->snapshotDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->autoDumpPath) != 0) { + if (virFileMakePath(qemu_driver->autoDumpPath) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create dump dir '%s': %s"), qemu_driver->autoDumpPath, virStrerror(errno, ebuf, sizeof ebuf)); @@ -586,8 +586,8 @@ qemudStartup(int privileged) { if (virAsprintf(&mempath, "%s/libvirt/qemu", qemu_driver->hugetlbfs_mount) < 0) goto out_of_memory; - if ((rc = virFileMakePath(mempath)) != 0) { - virReportSystemError(rc, + if (virFileMakePath(mempath) < 0) { + virReportSystemError(errno, _("unable to create hugepage path %s"), mempath); VIR_FREE(mempath); goto error; @@ -5017,10 +5017,8 @@ static int qemudDomainSetAutostart(virDomainPtr dom, goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("cannot create autostart directory %s"), driver->autostartDir); goto cleanup; @@ -7483,7 +7481,6 @@ static int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, int ret = -1; char *snapDir = NULL; char *snapFile = NULL; - int err; char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(vm->def->uuid, uuidstr); @@ -7497,9 +7494,8 @@ static int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, virReportOOMError(); goto cleanup; } - err = virFileMakePath(snapDir); - if (err != 0) { - virReportSystemError(err, _("cannot create snapshot directory '%s'"), + if (virFileMakePath(snapDir) < 0) { + virReportSystemError(errno, _("cannot create snapshot directory '%s'"), snapDir); goto cleanup; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f2c439b..c9145cb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2448,7 +2448,7 @@ int qemuProcessStart(virConnectPtr conn, } } - if (virFileMakePath(driver->logDir) != 0) { + if (virFileMakePath(driver->logDir) < 0) { virReportSystemError(errno, _("cannot create log directory %s"), driver->logDir); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index f2912f0..d87401f 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -559,8 +559,8 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED, /* assure all directories in the path prior to the final dir * exist, with default uid/gid/mode. */ *p = '\0'; - if ((err = virFileMakePath(parent)) != 0) { - virReportSystemError(err, _("cannot create path '%s'"), + if (virFileMakePath(parent) < 0) { + virReportSystemError(errno, _("cannot create path '%s'"), parent); goto error; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index f9652f8..a990118 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1019,10 +1019,8 @@ storagePoolSetAutostart(virStoragePoolPtr obj, if (pool->autostart != autostart) { if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("cannot create autostart directory %s"), driver->autostartDir); goto cleanup; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index a71ea21..f0f053b 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -420,7 +420,7 @@ umlStartup(int privileged) goto error; } - if (virFileMakePath(uml_driver->monitorDir) != 0) { + if (virFileMakePath(uml_driver->monitorDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create monitor directory %s: %s"), uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); @@ -839,7 +839,7 @@ static int umlStartVMDaemon(virConnectPtr conn, return -1; } - if (virFileMakePath(driver->logDir) != 0) { + if (virFileMakePath(driver->logDir) < 0) { virReportSystemError(errno, _("cannot create log directory %s"), driver->logDir); @@ -2004,10 +2004,8 @@ static int umlDomainSetAutostart(virDomainPtr dom, goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->autostartDir))) { - virReportSystemError(err, + if (virFileMakePath(driver->autostartDir) < 0) { + virReportSystemError(errno, _("cannot create autostart directory %s"), driver->autostartDir); goto cleanup; diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index aadca10..55db96b 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -523,11 +523,10 @@ dnsmasqAddHost(dnsmasqContext *ctx, int dnsmasqSave(const dnsmasqContext *ctx) { - int err; int ret = 0; - if ((err = virFileMakePath(ctx->config_dir))) { - virReportSystemError(err, _("cannot create config directory '%s'"), + if (virFileMakePath(ctx->config_dir) < 0) { + virReportSystemError(errno, _("cannot create config directory '%s'"), ctx->config_dir); return -1; } diff --git a/src/util/util.c b/src/util/util.c index 13973c3..482ca6b 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1010,66 +1010,80 @@ int virDirCreate(const char *path ATTRIBUTE_UNUSED, } #endif /* WIN32 */ -static int virFileMakePathHelper(char *path) { +static int virFileMakePathHelper(char *path) +{ struct stat st; char *p = NULL; - int err; if (stat(path, &st) >= 0) return 0; + else if (errno != ENOENT) + return -1; - if ((p = strrchr(path, '/')) == NULL) - return EINVAL; + if ((p = strrchr(path, '/')) == NULL) { + errno = EINVAL; + return -1; + } if (p != path) { *p = '\0'; - err = virFileMakePathHelper(path); + + if (virFileMakePathHelper(path) < 0) + return -1; + *p = '/'; - if (err != 0) - return err; } - if (mkdir(path, 0777) < 0 && errno != EEXIST) { - return errno; - } + if (mkdir(path, 0777) < 0 && errno != EEXIST) + return -1; + return 0; } +/** + * Creates the given path with mode 0777 if it's not already existing + * completely. + * + * Returns 0 on success, or -1 if an error occurred (in which case, errno + * is set appropriately). + */ int virFileMakePath(const char *path) { + int ret = -1; struct stat st; char *parent = NULL; char *p; - int err = 0; if (stat(path, &st) >= 0) + return 0; + else if (errno != ENOENT) goto cleanup; if ((parent = strdup(path)) == NULL) { - err = ENOMEM; + errno = ENOMEM; goto cleanup; } if ((p = strrchr(parent, '/')) == NULL) { - err = EINVAL; + errno = EINVAL; goto cleanup; } if (p != parent) { *p = '\0'; - if ((err = virFileMakePathHelper(parent)) != 0) { + + if (virFileMakePathHelper(parent) < 0) goto cleanup; - } } - if (mkdir(path, 0777) < 0 && errno != EEXIST) { - err = errno; + if (mkdir(path, 0777) < 0 && errno != EEXIST) goto cleanup; - } + + ret = 0; cleanup: VIR_FREE(parent); - return err; + return ret; } /* Build up a fully qualified path for a config file to be @@ -1182,8 +1196,10 @@ int virFileWritePid(const char *dir, goto cleanup; } - if ((rc = virFileMakePath(dir))) + if (virFileMakePath(dir) < 0) { + rc = errno; goto cleanup; + } if (!(pidfile = virFilePid(dir, name))) { rc = ENOMEM; -- 1.7.4.1

2 2

[libvirt] [PATCH] nodedev: Let check_fc_host_linux report errors to the caller
by Matthias Bolte 06 Jul '11

06 Jul '11

--- src/node_device/node_device_linux_sysfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 4f4acc7..34e4501 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -156,7 +156,7 @@ out: VIR_FREE(d->scsi_host.wwpn); } VIR_FREE(sysfs_path); - return 0; + return retval; } -- 1.7.4.1

2 2

[libvirt] [PATCH] Fix compilation error when SASL support is disabled
by Jean-Baptiste Rouault 06 Jul '11

06 Jul '11

This patch adds #if HAVE_SASL where needed in libvirtd.h --- daemon/libvirtd.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index 6c604fc..8e1843c 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -38,7 +38,9 @@ # include "logging.h" # include "threads.h" # include "network.h" -# include "virnetsaslcontext.h" +# if HAVE_SASL +# include "virnetsaslcontext.h" +# endif # include "virnetserverprogram.h" # if WITH_DTRACE @@ -70,7 +72,9 @@ struct daemonClientPrivate { int domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LAST]; +# if HAVE_SASL virNetSASLSessionPtr sasl; +# endif /* This is only valid if a remote open call has been made on this * connection, otherwise it will be NULL. Also if remote close is @@ -81,7 +85,9 @@ struct daemonClientPrivate { daemonClientStreamPtr streams; }; +# if HAVE_SASL extern virNetSASLContextPtr saslCtxt; +# endif extern virNetServerProgramPtr remoteProgram; extern virNetServerProgramPtr qemuProgram; -- 1.7.5.4

3 3

[libvirt] [PATCH 0/4] Virsh: Extend command arguments completion
by Michal Privoznik 06 Jul '11

06 Jul '11

This patchset extends arguments completion for virsh commands. Currently only for domain related (start, destroy, etc.) and 'help'. But if community is satisfied with this little part I'll write follow up patches for other commands as well. This means that for command start not only pre-defined options will be generated (autodestroy, console, paused) but names of inactive domains too. However, this requires virsh to be already connected to daemon. Completers for commands can be easily defined as they follow readline logic. Basically, completer returns on each call one string (=possible argument/option) and it's called repeatedly until NULL is returned. To generate only corresponding values for given prefix, there is @text variable in function prototype. There is also @state variable that is set to zero on the 1st call and to non-zero on any subsequent calls, so completer can set it internal structures. Michal Privoznik (4): virsh: make conn global virsh: Extend virsh commands definition with completer virsh: Create completer for commands related to domains virsh: Create completer for help command tools/virsh.c | 1108 ++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 660 insertions(+), 448 deletions(-) -- 1.7.5.rc3

2 8

[libvirt] [PATCH] Fix usage of virFileMakePath, it doesn't set errno but returns it
by Matthias Bolte 05 Jul '11

05 Jul '11

Also be explicity about the != 0 check in the few places that weren't. --- src/conf/domain_conf.c | 6 +++--- src/conf/network_conf.c | 2 +- src/conf/nwfilter_conf.c | 4 ++-- src/conf/storage_conf.c | 2 +- src/libxl/libxl_driver.c | 20 ++++++++++---------- src/lxc/lxc_container.c | 16 ++++++++-------- src/lxc/lxc_controller.c | 6 +++--- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 6 +++--- src/qemu/qemu_driver.c | 28 ++++++++++++++-------------- src/qemu/qemu_process.c | 6 +++--- src/storage/storage_driver.c | 2 +- src/uml/uml_driver.c | 13 +++++++------ src/util/dnsmasq.c | 2 +- src/util/util.c | 2 +- 15 files changed, 59 insertions(+), 58 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 109a947..2467fcf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9980,14 +9980,14 @@ int virDomainSaveXML(const char *configDir, const char *xml) { char *configFile = NULL; - int fd = -1, ret = -1; + int fd = -1, ret = -1, err; size_t towrite; if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) goto cleanup; - if (virFileMakePath(configDir)) { - virReportSystemError(errno, + if ((err = virFileMakePath(configDir)) != 0) { + virReportSystemError(err, _("cannot create config directory '%s'"), configDir); goto cleanup; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 45ddee2..b0dbd43 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1119,7 +1119,7 @@ int virNetworkSaveXML(const char *configDir, if ((configFile = virNetworkConfigFile(configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { + if ((err = virFileMakePath(configDir)) != 0) { virReportSystemError(err, _("cannot create config directory '%s'"), configDir); diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 127d4be..bd03f67 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2189,7 +2189,7 @@ int virNWFilterSaveXML(const char *configDir, if ((configFile = virNWFilterConfigFile(configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { + if ((err = virFileMakePath(configDir)) != 0) { virReportSystemError(err, _("cannot create config directory '%s'"), configDir); @@ -2576,7 +2576,7 @@ virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, if (!nwfilter->configFile) { int err; - if ((err = virFileMakePath(driver->configDir))) { + if ((err = virFileMakePath(driver->configDir)) != 0) { virReportSystemError(err, _("cannot create config directory %s"), driver->configDir); diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index ca86f19..8ccfc8c 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1514,7 +1514,7 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, if (!pool->configFile) { int err; - if ((err = virFileMakePath(driver->configDir))) { + if ((err = virFileMakePath(driver->configDir)) != 0) { virReportSystemError(err, _("cannot create config directory %s"), driver->configDir); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7fd257d..0a5ea07 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -854,7 +854,7 @@ libxlStartup(int privileged) { const libxl_version_info *ver_info; char *log_file = NULL; virCommandPtr cmd; - int status, ret = 0; + int status, ret = 0, err; /* Disable libxl driver if non-root */ if (!privileged) { @@ -914,28 +914,28 @@ libxlStartup(int privileged) { "%s", LIBXL_SAVE_DIR) == -1) goto out_of_memory; - if (virFileMakePath(libxl_driver->logDir) != 0) { + if ((err = virFileMakePath(libxl_driver->logDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create log dir '%s': %s"), - libxl_driver->logDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->logDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->stateDir) != 0) { + if ((err = virFileMakePath(libxl_driver->stateDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), - libxl_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->stateDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->libDir) != 0) { + if ((err = virFileMakePath(libxl_driver->libDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), - libxl_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->libDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->saveDir) != 0) { + if ((err = virFileMakePath(libxl_driver->saveDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), - libxl_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->saveDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } @@ -3391,7 +3391,7 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart) if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 7924858..b4138c4 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -406,7 +406,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) { "none", "/selinux", "selinuxfs" }, #endif }; - int i, rc = -1; + int i, rc = -1, err; char *devpts; if (virAsprintf(&devpts, "/.oldroot%s/dev/pts", root->src) < 0) { @@ -415,8 +415,8 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } for (i = 0 ; i < ARRAY_CARDINALITY(mnts) ; i++) { - if (virFileMakePath(mnts[i].dst) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(mnts[i].dst)) != 0) { + virReportSystemError(err, _("Failed to mkdir %s"), mnts[i].src); goto cleanup; @@ -429,8 +429,8 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } } - if ((rc = virFileMakePath("/dev/pts") != 0)) { - virReportSystemError(rc, "%s", + if ((err = virFileMakePath("/dev/pts") != 0)) { + virReportSystemError(err, "%s", _("Cannot create /dev/pts")); goto cleanup; } @@ -515,7 +515,7 @@ static int lxcContainerPopulateDevices(void) static int lxcContainerMountNewFS(virDomainDefPtr vmDef) { - int i; + int i, err; /* Pull in rest of container's mounts */ for (i = 0 ; i < vmDef->nfss ; i++) { @@ -531,8 +531,8 @@ static int lxcContainerMountNewFS(virDomainDefPtr vmDef) return -1; } - if (virFileMakePath(vmDef->fss[i]->dst) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(vmDef->fss[i]->dst)) != 0) { + virReportSystemError(err, _("Failed to create %s"), vmDef->fss[i]->dst); VIR_FREE(src); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 7d60090..db3ef21 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -615,7 +615,7 @@ lxcControllerRun(virDomainDefPtr def, int appPty, int handshakefd) { - int rc = -1; + int rc = -1, err; int control[2] = { -1, -1}; int containerhandshake[2] = { -1, -1 }; int containerPty = -1; @@ -690,8 +690,8 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } - if (virFileMakePath(devpts) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(devpts)) != 0) { + virReportSystemError(err, _("Failed to make path %s"), devpts); goto cleanup; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7220a9b..2222365 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2541,7 +2541,7 @@ static int lxcDomainSetAutostart(virDomainPtr dom, if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("Cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 660dd65..517f03d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2500,7 +2500,7 @@ static int networkSetAutostart(virNetworkPtr net, struct network_driver *driver = net->conn->networkPrivateData; virNetworkObjPtr network; char *configFile = NULL, *autostartLink = NULL; - int ret = -1; + int ret = -1, err; networkDriverLock(driver); network = virNetworkFindByUUID(&driver->networks, net->uuid); @@ -2526,8 +2526,8 @@ static int networkSetAutostart(virNetworkPtr net, goto cleanup; if (autostart) { - if (virFileMakePath(driver->networkAutostartDir)) { - virReportSystemError(errno, + if ((err = virFileMakePath(driver->networkAutostartDir)) != 0) { + virReportSystemError(err, _("cannot create autostart directory '%s'"), driver->networkAutostartDir); goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aab3ab9..835e3e1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -372,7 +372,7 @@ static int qemudStartup(int privileged) { char *base = NULL; char *driverConf = NULL; - int rc; + int rc, err; virConnectPtr conn = NULL; if (VIR_ALLOC(qemu_driver) < 0) @@ -469,40 +469,40 @@ qemudStartup(int privileged) { goto out_of_memory; } - if (virFileMakePath(qemu_driver->stateDir) != 0) { + if ((err = virFileMakePath(qemu_driver->stateDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), - qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->stateDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->libDir) != 0) { + if ((err = virFileMakePath(qemu_driver->libDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), - qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->libDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->cacheDir) != 0) { + if ((err = virFileMakePath(qemu_driver->cacheDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create cache dir '%s': %s"), - qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->cacheDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->saveDir) != 0) { + if ((err = virFileMakePath(qemu_driver->saveDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), - qemu_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->saveDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->snapshotDir) != 0) { + if ((err = virFileMakePath(qemu_driver->snapshotDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), - qemu_driver->snapshotDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->snapshotDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->autoDumpPath) != 0) { + if ((err = virFileMakePath(qemu_driver->autoDumpPath)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create dump dir '%s': %s"), - qemu_driver->autoDumpPath, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->autoDumpPath, virStrerror(err, ebuf, sizeof ebuf)); goto error; } @@ -5019,7 +5019,7 @@ static int qemudDomainSetAutostart(virDomainPtr dom, if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f2c439b..d52b0ad 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2336,7 +2336,7 @@ int qemuProcessStart(virConnectPtr conn, const char *stdin_path, enum virVMOperationType vmop) { - int ret; + int ret, err; off_t pos = -1; char ebuf[1024]; char *pidfile = NULL; @@ -2448,8 +2448,8 @@ int qemuProcessStart(virConnectPtr conn, } } - if (virFileMakePath(driver->logDir) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(driver->logDir)) != 0) { + virReportSystemError(err, _("cannot create log directory %s"), driver->logDir); goto cleanup; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index f9652f8..7b95340 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1021,7 +1021,7 @@ storagePoolSetAutostart(virStoragePoolPtr obj, if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index a71ea21..fbd8bca 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -350,6 +350,7 @@ umlStartup(int privileged) uid_t uid = geteuid(); char *base = NULL; char *userdir = NULL; + int err; if (VIR_ALLOC(uml_driver) < 0) return -1; @@ -420,10 +421,10 @@ umlStartup(int privileged) goto error; } - if (virFileMakePath(uml_driver->monitorDir) != 0) { + if ((err = virFileMakePath(uml_driver->monitorDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create monitor directory %s: %s"), - uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); + uml_driver->monitorDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } @@ -811,7 +812,7 @@ static int umlCleanupTapDevices(virConnectPtr conn ATTRIBUTE_UNUSED, static int umlStartVMDaemon(virConnectPtr conn, struct uml_driver *driver, virDomainObjPtr vm) { - int ret; + int ret, err; char *logfile; int logfd = -1; umlDomainObjPrivatePtr priv = vm->privateData; @@ -839,8 +840,8 @@ static int umlStartVMDaemon(virConnectPtr conn, return -1; } - if (virFileMakePath(driver->logDir) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(driver->logDir)) != 0) { + virReportSystemError(err, _("cannot create log directory %s"), driver->logDir); return -1; @@ -2006,7 +2007,7 @@ static int umlDomainSetAutostart(virDomainPtr dom, if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index aadca10..27b1dcb 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -526,7 +526,7 @@ dnsmasqSave(const dnsmasqContext *ctx) int err; int ret = 0; - if ((err = virFileMakePath(ctx->config_dir))) { + if ((err = virFileMakePath(ctx->config_dir)) != 0) { virReportSystemError(err, _("cannot create config directory '%s'"), ctx->config_dir); return -1; diff --git a/src/util/util.c b/src/util/util.c index 13973c3..e0c625f 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1182,7 +1182,7 @@ int virFileWritePid(const char *dir, goto cleanup; } - if ((rc = virFileMakePath(dir))) + if ((rc = virFileMakePath(dir)) != 0) goto cleanup; if (!(pidfile = virFilePid(dir, name))) { -- 1.7.4.1

2 2

[libvirt] [PATCH] fix the failure of nodedev-reattach caused by the variables from nodedev-attach
by Guannan Ren 05 Jul '11

05 Jul '11

the "virsh nodedev-reattch" command could return successfully, but the pci device is still bound to pci-stub driver. The reason is noddev-reattach trys to use the variables set by nodedev-dettach commands. Becuase these variables is not persistent, this is not we expected. the patch try to fix it. --- src/util/pci.c | 74 +++++++++++++++++++------------------------------------ 1 files changed, 26 insertions(+), 48 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 46a3a83..d345c3e 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -67,9 +67,6 @@ struct _pciDevice { unsigned managed : 1; /* used by reattach function */ - unsigned unbind_from_stub : 1; - unsigned remove_slot : 1; - unsigned reprobe : 1; }; struct _pciDeviceList { @@ -882,14 +879,23 @@ pciUnbindDeviceFromStub(pciDevice *dev, const char *driver) if (pciDriverDir(&drvdir, driver) < 0) goto cleanup; - if (!dev->unbind_from_stub) - goto remove_slot; - - /* If the device is bound to stub, unbind it. - */ if (pciDeviceFile(&path, dev->name, "driver") < 0) goto cleanup; + /* If the device is bound to a driver instead of pci-stub, do nothing. + */ + if (virFileExists(path) && ! virFileLinkPointsTo(path, drvdir)){ + result = 0; + goto cleanup; + } + + /* If the device is not bound to any driver, reprobe it. + */ + if (!virFileExists(path)) + goto reprobe; + + /* If the device is bound to stub, unbind it. + */ if (virFileExists(drvdir) && virFileLinkPointsTo(path, drvdir)) { if (pciDriverFile(&path, driver, "unbind") < 0) { goto cleanup; @@ -902,11 +908,6 @@ pciUnbindDeviceFromStub(pciDevice *dev, const char *driver) goto cleanup; } } - dev->unbind_from_stub = 0; - -remove_slot: - if (!dev->remove_slot) - goto reprobe; /* Xen's pciback.ko wants you to use remove_slot on the specific device */ if (pciDriverFile(&path, driver, "remove_slot") < 0) { @@ -919,14 +920,8 @@ remove_slot: dev->name, driver); goto cleanup; } - dev->remove_slot = 0; reprobe: - if (!dev->reprobe) { - result = 0; - goto cleanup; - } - /* Trigger a re-probe of the device is not in the stub's dynamic * ID table. If the stub is available, but 'remove_id' isn't * available, then re-probing would just cause the device to be @@ -935,6 +930,12 @@ reprobe: if (pciDriverFile(&path, driver, "remove_id") < 0) { goto cleanup; } + + /* If the device is still in stub's dynamic ID table,remove it, + * otherwise, ignore the error. + */ + if (virFileExists(path) && virFileWriteStr(path, dev->name, 0) < 0){ + } if (!virFileExists(drvdir) || virFileExists(path)) { if (virFileWriteStr(PCI_SYSFS "drivers_probe", dev->name, 0) < 0) { @@ -948,11 +949,6 @@ reprobe: result = 0; cleanup: - /* do not do it again */ - dev->unbind_from_stub = 0; - dev->remove_slot = 0; - dev->reprobe = 0; - VIR_FREE(drvdir); VIR_FREE(path); @@ -966,7 +962,6 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) int result = -1; char *drvdir = NULL; char *path = NULL; - int reprobe = 0; /* check whether the device is already bound to a driver */ if (pciDriverDir(&drvdir, driver) < 0 || @@ -980,7 +975,6 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) result = 0; goto cleanup; } - reprobe = 1; } /* Add the PCI device ID to the stub's dynamic ID table; @@ -1011,8 +1005,7 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) } if (virFileLinkPointsTo(path, drvdir)) { - dev->unbind_from_stub = 1; - dev->remove_slot = 1; + result = 0; goto remove_id; } @@ -1022,7 +1015,7 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) * your root filesystem. */ if (pciDeviceFile(&path, dev->name, "driver/unbind") < 0) { - goto cleanup; + goto remove_id; } if (virFileExists(path)) { @@ -1030,9 +1023,8 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) virReportSystemError(errno, _("Failed to unbind PCI device '%s'"), dev->name); - goto cleanup; + goto remove_id; } - dev->reprobe = reprobe; } /* If the device isn't already bound to pci-stub, try binding it now. @@ -1054,7 +1046,6 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) dev->name, driver); goto remove_id; } - dev->remove_slot = 1; if (pciDriverFile(&path, driver, "bind") < 0) { goto remove_id; @@ -1066,20 +1057,15 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) dev->name, driver); goto remove_id; } - dev->unbind_from_stub = 1; } + result = 0; remove_id: /* If 'remove_id' exists, remove the device id from pci-stub's dynamic * ID table so that 'drivers_probe' works below. */ if (pciDriverFile(&path, driver, "remove_id") < 0) { - /* We do not remove PCI ID from pci-stub, and we cannot reprobe it */ - if (dev->reprobe) { - VIR_WARN("Could not remove PCI ID '%s' from %s, and the device " - "cannot be probed again.", dev->id, driver); - } - dev->reprobe = 0; + result = -1; goto cleanup; } @@ -1087,18 +1073,10 @@ remove_id: virReportSystemError(errno, _("Failed to remove PCI ID '%s' from %s"), dev->id, driver); - - /* remove PCI ID from pci-stub failed, and we cannot reprobe it */ - if (dev->reprobe) { - VIR_WARN("Failed to remove PCI ID '%s' from %s, and the device " - "cannot be probed again.", dev->id, driver); - } - dev->reprobe = 0; + result = -1; goto cleanup; } - result = 0; - cleanup: VIR_FREE(drvdir); VIR_FREE(path); -- 1.7.1

5 8

[libvirt] offline migration / vm cloning with libvirt/virsh
by Sethuraman Subbiah 05 Jul '11

05 Jul '11

Hi , I am trying to perform offline migration (i.e) Create an incremental image using the qcow format, transfer the vm memory state to a state fie.Use the image and statefile together as a template. Now create a new vm using the template. I can successfully do it using the following commands : Save phase : stop migrate "exec:gzip -c > STATEFILE.gz" qemu-img qemu-img create -b BASE_img -f qcow2 INCRE_img Restore phase : qemu-kvm -m 1024 -hda INCRE_img -incoming "exec: gzip -c -d STATEFILE.gz" And it works fine. But I am not able to find the vm with virt-manager or other libvirt based tools. If I use : virsh save <dom_id> STATEFILE I can restore using "virsh restore STATEFILE" but I want to associate this with the incremental image that I created, but I dont know how. I think it saves the existing vm's xml file along with the STATEFILE, thus I am not able to change the disk image to the incremental image. Thus , 1. Either I should find a way to make vms created using qemu-kvm appear in libvirt-based tools. OR 2. Find a way to associate the virsh save STATEFILE with a incremental image. Any help or hint with respect to these will be very helpful. I am try to do cloning with minimal cost. This takes only 25 seconds ( to create STATEFILE) and creating incremental image is instantatenous . But I want to use the vm monitoring code based on libvirt. And it makes life difficult. Thanks for your help. - Regards, Sethuraman Subbiah Graduate Student - NC state University M.S in Computer Science

2 1

[libvirt] [PATCH] build: fix virBufferVasprintf on mingw
by Eric Blake 05 Jul '11

05 Jul '11

Gnulib documents that mingw [v]snprintf is broken (it returns -1 on out-of-space, instead of the count of what would have been printed); but while we were using the snprintf wrapper, we had not yet been using the vsnprintf wrapper. * bootstrap.conf (gnulib_modules): Add vsnprintf. Reported by Matthias Bolte. --- bootstrap.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 581d60b..302cce8 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -97,6 +97,7 @@ usleep vasprintf verify vc-list-files +vsnprintf waitpid warnings ' -- 1.7.4.4

2 8

[libvirt] [PATCH] Fix default value of security label 'relabel' attribute
by Daniel P. Berrange 05 Jul '11

05 Jul '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> When no <seclabel> is present in the XML, the virDomainSeclabelDef struct is left as all zeros. Unfortunately, this means it gets setup as type=dynamic, with relabel=no, which is an illegal combination. Change the 'bool relabel' attribute in virDomainSeclabelDef to the inverse 'bool norelabel' so that the default initialization is sensible * src/conf/domain_conf.c, src/conf/domain_conf.h, src/security/security_apparmor.c, src/security/security_selinux.c: Replace 'relabel' with 'norelabel' --- src/conf/domain_conf.c | 18 +++++++++--------- src/conf/domain_conf.h | 2 +- src/security/security_apparmor.c | 8 ++++---- src/security/security_selinux.c | 20 ++++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 109a947..b74ab4d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5076,25 +5076,25 @@ virSecurityLabelDefParseXML(const virDomainDefPtr def, VIR_SECURITY_LABEL_BUFLEN-1, ctxt); if (p != NULL) { if (STREQ(p, "yes")) { - def->seclabel.relabel = true; + def->seclabel.norelabel = false; } else if (STREQ(p, "no")) { - def->seclabel.relabel = false; + def->seclabel.norelabel = true; } else { virDomainReportError(VIR_ERR_XML_ERROR, _("invalid security relabel value %s"), p); goto error; } if (def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && - !def->seclabel.relabel) { + def->seclabel.norelabel) { virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("dynamic label type must use resource relabeling")); goto error; } } else { if (def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC) - def->seclabel.relabel = false; + def->seclabel.norelabel = true; else - def->seclabel.relabel = true; + def->seclabel.norelabel = false; } /* Only parse label, if using static labels, or @@ -5114,7 +5114,7 @@ virSecurityLabelDefParseXML(const virDomainDefPtr def, } /* Only parse imagelabel, if requested live XML with relabeling */ - if (def->seclabel.relabel && + if (!def->seclabel.norelabel && !(flags & VIR_DOMAIN_XML_INACTIVE)) { p = virXPathStringLimit("string(./seclabel/imagelabel[1])", VIR_SECURITY_LABEL_BUFLEN-1, ctxt); @@ -9890,15 +9890,15 @@ char *virDomainDefFormat(virDomainDefPtr def, (flags & VIR_DOMAIN_XML_INACTIVE)) { virBufferAsprintf(&buf, " <seclabel type='%s' model='%s' relabel='%s'/>\n", sectype, def->seclabel.model, - def->seclabel.relabel ? "yes" : "no"); + def->seclabel.norelabel ? "no" : "yes"); } else { virBufferAsprintf(&buf, " <seclabel type='%s' model='%s' relabel='%s'>\n", sectype, def->seclabel.model, - def->seclabel.relabel ? "yes" : "no"); + def->seclabel.norelabel ? "no" : "yes"); if (def->seclabel.label) virBufferEscapeString(&buf, " <label>%s</label>\n", def->seclabel.label); - if (def->seclabel.relabel && def->seclabel.imagelabel) + if (!def->seclabel.norelabel && def->seclabel.imagelabel) virBufferEscapeString(&buf, " <imagelabel>%s</imagelabel>\n", def->seclabel.imagelabel); if (def->seclabel.baselabel && diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 258289a..44d5bcd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -960,7 +960,7 @@ struct _virSecurityLabelDef { char *imagelabel; /* security image label string */ char *baselabel; /* base name of label string */ int type; /* virDomainSeclabelType */ - bool relabel; + bool norelabel; }; enum virDomainTimerNameType { diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 98995a8..76c6e3d 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -265,7 +265,7 @@ reload_profile(virSecurityManagerPtr mgr, int rc = -1; char *profile_name = NULL; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if ((profile_name = get_profile_name(vm)) == NULL) @@ -610,7 +610,7 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, int rc = -1; char *profile_name; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (!disk->src || disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) @@ -682,7 +682,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, struct SDPDOP *ptr; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -741,7 +741,7 @@ AppArmorRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; return reload_profile(mgr, vm, NULL, false); diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 44e770e..50e1978 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -537,7 +537,7 @@ SELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; /* Don't restore labels on readoly/shared disks, because @@ -621,7 +621,7 @@ SELinuxSetSecurityImageLabel(virSecurityManagerPtr mgr, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; bool allowDiskFormatProbing = virSecurityManagerGetAllowDiskFormatProbing(mgr); - if (!secdef->relabel) + if (secdef->norelabel) return 0; return virDomainDiskDefForeachPath(disk, @@ -661,7 +661,7 @@ SELinuxSetSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -730,7 +730,7 @@ SELinuxRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -784,7 +784,7 @@ SELinuxSetSecurityChardevLabel(virDomainObjPtr vm, char *in = NULL, *out = NULL; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; switch (dev->type) { @@ -830,7 +830,7 @@ SELinuxRestoreSecurityChardevLabel(virDomainObjPtr vm, char *in = NULL, *out = NULL; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; switch (dev->type) { @@ -918,7 +918,7 @@ SELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, VIR_DEBUG("Restoring security label on %s", vm->def->name); - if (!secdef->relabel) + if (secdef->norelabel) return 0; for (i = 0 ; i < vm->def->nhostdevs ; i++) { @@ -989,7 +989,7 @@ SELinuxSetSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; return SELinuxSetFilecon(savefile, secdef->imagelabel); @@ -1003,7 +1003,7 @@ SELinuxRestoreSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; return SELinuxRestoreSecurityFileLabel(savefile); @@ -1218,7 +1218,7 @@ SELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; int i; - if (!secdef->relabel) + if (secdef->norelabel) return 0; for (i = 0 ; i < vm->def->ndisks ; i++) { -- 1.7.6

2 1

[libvirt] networkxml2argvtest fails to compile
by Ruben Kerkhof 05 Jul '11

05 Jul '11

Hi all, Building libvirt 0.9.3 from source with --without-network, make check fails with: CC networkxml2xmltest.o CCLD networkxml2xmltest CC networkxml2argvtest.o make[2]: *** No rule to make target `../src/libvirt_driver_network.la', needed by `networkxml2argvtest'. Stop. make[2]: Leaving directory `/home/ruben/src/libvirt/libvirt-0.9.3/tests' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/home/ruben/src/libvirt/libvirt-0.9.3/tests' make: *** [check-recursive] Error 1 Kind regards, Ruben

3 4

[libvirt] [PATCH] qemu: Fix virFileMakePath error handling in snapshot creation
by Matthias Bolte 05 Jul '11

05 Jul '11

virFileMakePath returns an errno value on error, that will never be negative. So a virFileMakePath error whould have been ignored here. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 363a361..aab3ab9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7498,7 +7498,7 @@ static int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, goto cleanup; } err = virFileMakePath(snapDir); - if (err < 0) { + if (err != 0) { virReportSystemError(err, _("cannot create snapshot directory '%s'"), snapDir); goto cleanup; -- 1.7.4.1

2 2

[libvirt] problems with <seclabel> when restarting libvirtd
by Laine Stump 05 Jul '11

05 Jul '11

I had libvirtd build from 0.9.2+something running on my test machine. There was a single guest running on it. I grabbed the latest libvirt from git (0.9.3+??), built an rpm, and installed it. My guest reconnected with no problems, but I was unable to start new guests due to an selinux problem with the labeling of the image file. Interestingly, I found that I could shutdown and restart the one guest that had been running at the time of the upgrade. *Until* I restarted libvirtd again while the guest was stopped. After this point, I could no longer start that guest either. I then set selinux to permissive mode and was able to start my original guest. Then I restarted libvirtd and found that, although the qemu-kvm process was still running, libvirtd couldn't reconnect to the guest. When I looked at the logs, I saw this: error: virSecurityLabelDefParseXML:5073 : unsupported configuration: dynamic label type must use resource relabeling In the domain state file, I see this: | <seclabel type='dynamic' model='selinux' relabel='no'> | <label>system_u:system_r:svirt_t:s-:c419,c955</label> | </seclabel> The data in the state file was written by the same version of libvirtd that wrote it. So why did it write something it knows it doesn't support?

2 1

[libvirt] Duplicate symbol error with 0.9.3 on OSX
by Justin Clift 05 Jul '11

05 Jul '11

Hi all, Just went to update the OSX libvirt build for 0.9.3, but it's giving a duplicate symbol error: ld: duplicate symbol _virNetworkDNSHostsDef in ./.libs/libvirt_driver_test.a(libvirt_driver_test_la-test_driver.o) and ./.libs/libvirt_conf.a(libvirt_conf_la-network_conf.o) "virNetworkDNSHostsDef" is definitely in src/conf/network_conf.*, but not seeing it anywhere in src/test/test_driver.*. Anyone have suggestions on what to look at? Regards and best wishes, Justin Clift -- Aeolus Community Manager http://www.aeolusproject.org

2 4

[libvirt] [PATCH] Quieten build & ensure API build scripts exit with non-zero status
by Daniel P. Berrange 04 Jul '11

04 Jul '11

The current API build scripts will continue and exit with a zero status even if they find problems. This has been the cause of many build problems, or hidden build errors, in the past. Change the scripts so they always exit with a non-zero status for any problems they do not understand. Also turn off all debug output by default so they respect $(AM_V_GEN) * docs/Makefile.am: Use $(AM_V_GEN) for API/HTML scripts * docs/apibuild.py, python/generator.py: Exit with non-zero status if problems are found. Also be silent, not outputting any debug messages. * src/Makefile.am: Use $(AM_V_GEN) for ESX generator * python/Makefile.am: Tweak rule --- docs/Makefile.am | 11 ++---- docs/apibuild.py | 95 ++++++++++++++++++++++++++++++-------------------- python/Makefile.am | 6 ++-- python/generator.py | 16 +++++--- src/Makefile.am | 2 +- 5 files changed, 75 insertions(+), 55 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 050ebe1..e7d356e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -153,21 +153,18 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in - -@if [ -x $(XSLTPROC) ] ; then \ - echo "Rebuilding the HTML pages from the XML API" ; \ + $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/ \ - $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi - -@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ + $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi ; \ + if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ > /dev/null ; then \ - echo "Validating the resulting XHTML pages" ; \ SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \ else echo "missing XHTML1 DTD" ; fi ; fi $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) - -@echo Rebuilding devhelp files - -@if [ -x $(XSLTPROC) ] ; then \ + $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/devhelp/ \ $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi diff --git a/docs/apibuild.py b/docs/apibuild.py index f31a853..cb273dc 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -11,6 +11,8 @@ import os, sys import string import glob +quiet=1 +warnings=0 debug=0 debugsym=None @@ -95,7 +97,7 @@ class identifier: self.conditionals = None else: self.conditionals = conditionals[:] - if self.name == debugsym: + if self.name == debugsym and not quiet: print "=> define %s : %s" % (debugsym, (module, type, info, extra, conditionals)) @@ -155,7 +157,7 @@ class identifier: def update(self, header, module, type = None, info = None, extra=None, conditionals=None): - if self.name == debugsym: + if self.name == debugsym and not quiet: print "=> update %s : %s" % (debugsym, (module, type, info, extra, conditionals)) if header != None and self.header == None: @@ -203,7 +205,7 @@ class index: if d != None and name != None and type != None: self.references[name] = d - if name == debugsym: + if name == debugsym and not quiet: print "New ref: %s" % (d) return d @@ -244,9 +246,9 @@ class index: elif type == "macro": self.macros[name] = d else: - print "Unable to register type ", type + self.warning("Unable to register type ", type) - if name == debugsym: + if name == debugsym and not quiet: print "New symbol: %s" % (d) return d @@ -260,8 +262,8 @@ class index: if self.macros.has_key(id): del self.macros[id] if self.functions.has_key(id): - print "function %s from %s redeclared in %s" % ( - id, self.functions[id].header, idx.functions[id].header) + self.warning("function %s from %s redeclared in %s" % ( + id, self.functions[id].header, idx.functions[id].header)) else: self.functions[id] = idx.functions[id] self.identifiers[id] = idx.functions[id] @@ -273,15 +275,15 @@ class index: if self.macros.has_key(id): del self.macros[id] if self.variables.has_key(id): - print "variable %s from %s redeclared in %s" % ( - id, self.variables[id].header, idx.variables[id].header) + self.warning("variable %s from %s redeclared in %s" % ( + id, self.variables[id].header, idx.variables[id].header)) else: self.variables[id] = idx.variables[id] self.identifiers[id] = idx.variables[id] for id in idx.structs.keys(): if self.structs.has_key(id): - print "struct %s from %s redeclared in %s" % ( - id, self.structs[id].header, idx.structs[id].header) + self.warning("struct %s from %s redeclared in %s" % ( + id, self.structs[id].header, idx.structs[id].header)) else: self.structs[id] = idx.structs[id] self.identifiers[id] = idx.structs[id] @@ -294,8 +296,8 @@ class index: self.identifiers[id] = idx.unions[id] for id in idx.typedefs.keys(): if self.typedefs.has_key(id): - print "typedef %s from %s redeclared in %s" % ( - id, self.typedefs[id].header, idx.typedefs[id].header) + self.warning("typedef %s from %s redeclared in %s" % ( + id, self.typedefs[id].header, idx.typedefs[id].header)) else: self.typedefs[id] = idx.typedefs[id] self.identifiers[id] = idx.typedefs[id] @@ -311,15 +313,15 @@ class index: if self.enums.has_key(id): continue if self.macros.has_key(id): - print "macro %s from %s redeclared in %s" % ( - id, self.macros[id].header, idx.macros[id].header) + self.warning("macro %s from %s redeclared in %s" % ( + id, self.macros[id].header, idx.macros[id].header)) else: self.macros[id] = idx.macros[id] self.identifiers[id] = idx.macros[id] for id in idx.enums.keys(): if self.enums.has_key(id): - print "enum %s from %s redeclared in %s" % ( - id, self.enums[id].header, idx.enums[id].header) + self.warning("enum %s from %s redeclared in %s" % ( + id, self.enums[id].header, idx.enums[id].header)) else: self.enums[id] = idx.enums[id] self.identifiers[id] = idx.enums[id] @@ -330,10 +332,10 @@ class index: # check that function condition agrees with header if idx.functions[id].conditionals != \ self.functions[id].conditionals: - print "Header condition differs from Function for %s:" \ - % id - print " H: %s" % self.functions[id].conditionals - print " C: %s" % idx.functions[id].conditionals + self.warning("Header condition differs from Function for %s:" \ + % id) + self.warning(" H: %s" % self.functions[id].conditionals) + self.warning(" C: %s" % idx.functions[id].conditionals) up = idx.functions[id] self.functions[id].update(None, up.module, up.type, up.info, up.extra) # else: @@ -356,12 +358,13 @@ class index: def analyze(self): - self.analyze_dict("functions", self.functions) - self.analyze_dict("variables", self.variables) - self.analyze_dict("structs", self.structs) - self.analyze_dict("unions", self.unions) - self.analyze_dict("typedefs", self.typedefs) - self.analyze_dict("macros", self.macros) + if not quiet: + self.analyze_dict("functions", self.functions) + self.analyze_dict("variables", self.variables) + self.analyze_dict("structs", self.structs) + self.analyze_dict("unions", self.unions) + self.analyze_dict("typedefs", self.typedefs) + self.analyze_dict("macros", self.macros) class CLexer: """A lexer for the C language, tokenize the input by reading and @@ -621,6 +624,8 @@ class CParser: info, extra, self.conditionals) def warning(self, msg): + global warnings + warnings = warnings + 1 if self.no_error: return print msg @@ -1802,7 +1807,8 @@ class CParser: return token def parse(self): - self.warning("Parsing %s" % (self.filename)) + if not quiet: + print "Parsing %s" % (self.filename) token = self.token() while token != None: if token[0] == 'name': @@ -1869,7 +1875,8 @@ class docBuilder: pass def analyze(self): - print "Project %s : %d headers, %d modules" % (self.name, len(self.headers.keys()), len(self.modules.keys())) + if not quiet: + print "Project %s : %d headers, %d modules" % (self.name, len(self.headers.keys()), len(self.modules.keys())) self.idx.analyze() def scanHeaders(self): @@ -1995,7 +2002,7 @@ class docBuilder: else: output.write(" <field name='%s' type='%s' info='%s'/>\n" % (field[1] , field[0], desc)) except: - print "Failed to serialize struct %s" % (name) + self.warning("Failed to serialize struct %s" % (name)) output.write(" </struct>\n") else: output.write("/>\n"); @@ -2023,7 +2030,7 @@ class docBuilder: def serialize_function(self, output, name): id = self.idx.functions[name] - if name == debugsym: + if name == debugsym and not quiet: print "=>", id output.write(" <%s name='%s' file='%s' module='%s'>\n" % (id.type, @@ -2059,7 +2066,7 @@ class docBuilder: output.write(" <arg name='%s' type='%s' info='%s'/>\n" % (param[1], param[0], escape(param[2]))) self.indexString(name, param[2]) except: - print "Failed to save function %s info: " % name, `id.info` + self.warning("Failed to save function %s info: " % name, `id.info`) output.write(" </%s>\n" % (id.type)) def serialize_exports(self, output, file): @@ -2074,7 +2081,7 @@ class docBuilder: escape(dict.info[data]), string.lower(data))) except: - print "Header %s lacks a %s description" % (module, data) + self.warning("Header %s lacks a %s description" % (module, data)) if dict.info.has_key('Description'): desc = dict.info['Description'] if string.find(desc, "DEPRECATED") != -1: @@ -2287,7 +2294,8 @@ class docBuilder: def serialize(self): filename = "%s/%s-api.xml" % (self.path, self.name) - print "Saving XML description %s" % (filename) + if not quiet: + print "Saving XML description %s" % (filename) output = open(filename, "w") output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n') output.write("<api name='%s'>\n" % self.name) @@ -2323,7 +2331,8 @@ class docBuilder: output.close() filename = "%s/%s-refs.xml" % (self.path, self.name) - print "Saving XML Cross References %s" % (filename) + if not quiet: + print "Saving XML Cross References %s" % (filename) output = open(filename, "w") output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n') output.write("<apirefs name='%s'>\n" % self.name) @@ -2336,7 +2345,8 @@ def rebuild(): builder = None srcdir = os.environ["srcdir"] if glob.glob(srcdir + "/../src/libvirt.c") != [] : - print "Rebuilding API description for libvirt" + if not quiet: + print "Rebuilding API description for libvirt" dirs = [srcdir + "/../src", srcdir + "/../src/util", srcdir + "/../include/libvirt"] @@ -2344,12 +2354,13 @@ def rebuild(): dirs.append("../include/libvirt") builder = docBuilder("libvirt", srcdir, dirs, []) elif glob.glob("src/libvirt.c") != [] : - print "Rebuilding API description for libvirt" + if not quiet: + print "Rebuilding API description for libvirt" builder = docBuilder("libvirt", srcdir, ["src", "src/util", "include/libvirt"], []) else: - print "rebuild() failed, unable to guess the module" + self.warning("rebuild() failed, unable to guess the module") return None builder.scan() builder.analyze() @@ -2368,5 +2379,13 @@ if __name__ == "__main__": if len(sys.argv) > 1: debug = 1 parse(sys.argv[1]) + if warnings > 0: + sys.exit(2) + else: + sys.exit(0) else: rebuild() + if warnings > 0: + sys.exit(2) + else: + sys.exit(0) diff --git a/python/Makefile.am b/python/Makefile.am index 0edb3e4..a4c9a6b 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -53,11 +53,11 @@ GENERATED= libvirt-export.c \ libvirt.h \ libvirt.py -generated.stamp: $(srcdir)/$(GENERATE) $(API_DESC) - $(PYTHON) $(srcdir)/$(GENERATE) $(PYTHON) +$(GENERATE).stamp: $(srcdir)/$(GENERATE) $(API_DESC) + $(AM_V_GEN)$(PYTHON) $(srcdir)/$(GENERATE) $(PYTHON) && \ touch $@ -$(GENERATED): generated.stamp +$(GENERATED): $(GENERATE).stamp $(libvirtmod_la_OBJECTS): $(GENERATED) diff --git a/python/generator.py b/python/generator.py index c27ff73..d3a3616 100755 --- a/python/generator.py +++ b/python/generator.py @@ -11,6 +11,8 @@ import sys import string import re +quiet=1 + if __name__ == "__main__": # launched as a script srcPref = os.path.dirname(sys.argv[0]) @@ -617,7 +619,8 @@ def buildStubs(): sys.exit(1) n = len(functions.keys()) - print "Found %d functions in libvirt-api.xml" % (n) + if not quiet: + print "Found %d functions in libvirt-api.xml" % (n) py_types['pythonObject'] = ('O', "pythonObject", "pythonObject", "pythonObject") try: @@ -629,8 +632,8 @@ def buildStubs(): except IOError, msg: print file, ":", msg - - print "Found %d functions in libvirt-override-api.xml" % ( + if not quiet: + print "Found %d functions in libvirt-override-api.xml" % ( len(functions.keys()) - n) nb_wrap = 0 failed = 0 @@ -662,20 +665,21 @@ def buildStubs(): export.close() wrapper.close() - print "Generated %d wrapper functions" % nb_wrap + if not quiet: + print "Generated %d wrapper functions" % nb_wrap if unknown_types: print "Missing type converters: " for type in unknown_types.keys(): print "%s:%d " % (type, len(unknown_types[type])), - print - for f in functions_failed: print "ERROR: failed %s" % f if failed > 0: return -1 + if len(unknown_types) > 0: + return -1 return 0 ####################################################################### diff --git a/src/Makefile.am b/src/Makefile.am index cd8a7e9..844ec9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -786,7 +786,7 @@ endif BUILT_SOURCES += $(ESX_DRIVER_GENERATED) $(ESX_DRIVER_GENERATED): $(srcdir)/esx/esx_vi_generator.input $(srcdir)/esx/esx_vi_generator.py - -srcdir=$(srcdir) $(srcdir)/esx/esx_vi_generator.py + $(AM_V_GEN)srcdir=$(srcdir) $(srcdir)/esx/esx_vi_generator.py if WITH_ESX if WITH_DRIVER_MODULES -- 1.7.4.4

2 1

[libvirt] [PATCH] qemu: Add support for SGA video
by Michal Privoznik 04 Jul '11

04 Jul '11

This patch extends possible values for <video> element. Serial Graphics Adapter allows users to see BIOS messages from the very first moment domain boots up. Therefore, users can choose boot medium, set PXE, etc. However, to be able to use this, one need SGABIOS, which is accessible here: http://code.google.com/p/sgabios/ --- docs/formatdomain.html.in | 5 +++-- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 43 ++++++++++++++++++++++++------------------- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 28 ++++++++++++++++++++++------ 5 files changed, 51 insertions(+), 27 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3a64983..2d89b37 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2005,8 +2005,9 @@ qemu-kvm -net nic,model=? /dev/null <dd> The <code>model</code> element has a mandatory <code>type</code> attribute which takes the value "vga", "cirrus", "vmvga", "xen", - "vbox", or "qxl" (since 0.8.6) - depending on the hypervisor features available. + "vbox", "qxl" (since 0.8.6), or "sga" + (Since 0.9.4) depending on the hypervisor + features available. You can also provide the amount of video memory in kilobytes using <code>vram</code> and the number of screen with <code>heads</code>. </dd> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 891662d..74bc111 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1502,6 +1502,7 @@ <value>xen</value> <value>vbox</value> <value>qxl</value> + <value>sga</value> </choice> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f9bf51e..9848359 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -299,7 +299,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "vmvga", "xen", "vbox", - "qxl") + "qxl", + "sga") VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", @@ -4713,28 +4714,32 @@ virDomainVideoDefParseXML(const xmlNodePtr node, } } - if (vram) { - if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse video ram '%s'"), vram); - goto error; + /* SGA video device does not support heads, vram + * or PCI address. It is not PCI device anyway */ + if (def->type != VIR_DOMAIN_VIDEO_TYPE_SGA) { + if (vram) { + if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse video ram '%s'"), vram); + goto error; + } + } else { + def->vram = virDomainVideoDefaultRAM(dom, def->type); } - } else { - def->vram = virDomainVideoDefaultRAM(dom, def->type); - } - if (heads) { - if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { - virDomainReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse video heads '%s'"), heads); - goto error; + if (heads) { + if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse video heads '%s'"), heads); + goto error; + } + } else { + def->heads = 1; } - } else { - def->heads = 1; - } - if (virDomainDeviceInfoParseXML(node, &def->info, flags) < 0) - goto error; + if (virDomainDeviceInfoParseXML(node, &def->info, flags) < 0) + goto error; + } VIR_FREE(type); VIR_FREE(vram); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e81977c..7f60754 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -605,6 +605,7 @@ enum virDomainVideoType { VIR_DOMAIN_VIDEO_TYPE_XEN, VIR_DOMAIN_VIDEO_TYPE_VBOX, VIR_DOMAIN_VIDEO_TYPE_QXL, + VIR_DOMAIN_VIDEO_TYPE_SGA, VIR_DOMAIN_VIDEO_TYPE_LAST }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6e4480e..7685d7e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -80,7 +80,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "vmware", "", /* no arg needed for xen */ "", /* don't support vbox */ - "qxl"); + "qxl", + "sga"); static void uname_normalize (struct utsname *ut) @@ -1213,7 +1214,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) /* Further non-primary video cards */ for (i = 1; i < def->nvideos ; i++) { - if (def->videos[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + if (def->videos[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || + def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_SGA) continue; if (qemuDomainPCIAddressSetNextAddr(addrs, &def->videos[i]->info) < 0) goto error; @@ -2083,8 +2085,9 @@ qemuBuildVideoDevStr(virDomainVideoDefPtr video, virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); } - if (qemuBuildDeviceAddressStr(&buf, &video->info, qemuCaps) < 0) - goto error; + if (video->type != VIR_DOMAIN_VIDEO_TYPE_SGA) + if (qemuBuildDeviceAddressStr(&buf, &video->info, qemuCaps) < 0) + goto error; if (virBufferError(&buf)) { virReportOOMError(); @@ -4254,6 +4257,11 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_VGA)) { if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_XEN) { /* nothing - vga has no effect on Xen pvfb */ + } else if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_SGA) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) + virCommandAddArgList(cmd, "-device", "sga", NULL); + else + virCommandAddArg(cmd, "-nographic"); } else { if ((def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL) && !qemuCapsGet(qemuCaps, QEMU_CAPS_VGA_QXL)) { @@ -4309,6 +4317,13 @@ qemuBuildCommandLine(virConnectPtr conn, /* No special args - this is the default */ break; + case VIR_DOMAIN_VIDEO_TYPE_SGA: + if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) + virCommandAddArgList(cmd, "-device", "sga", NULL); + else + virCommandAddArg(cmd, "-nographic"); + break; + default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("video type %s is not supported with this QEMU"), @@ -4321,10 +4336,11 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { for (i = 1 ; i < def->nvideos ; i++) { char *str; - if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL) { + if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL && + def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_SGA) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("video type %s is only valid as primary video card"), - virDomainVideoTypeToString(def->videos[0]->type)); + virDomainVideoTypeToString(def->videos[i]->type)); goto error; } -- 1.7.5.rc3

2 1

[libvirt] VMWare "independent disk" processing needed
by computernews＠rambler.ru 04 Jul '11

04 Jul '11

Hello, On VMware ESX server it is possible for the virtual machine to add the "independent disk" - the kind of virtual disk that (among other features) is not being covered by the snapshot logic. As I am working on some kind of backup solution I need to be able to backup the precise state of the guest virtual machine running on say VMware ESX server. I am able to perform a backup of a guest machine description with libvirts's amazing API which covers most of my needs except the aforementioned "independent disk" virtual disk type. The problem shows up at the restore type when I need to create the new virtual machine having an .xml file created by "virsh dumpxml" command. In fact I use API but "virsh does the same". This .xml file covers most of guest machine's aspects but it doesn't reflect the "independent" nature of such disks. So the virtual machine is going to be restored incorrectly when includes "independent disks". From the source codes of "libvirt" ("/libvirt/src/vmx/vmx.*") I see that this is ment to be covered but yet is not implemented. Appropriate nodes must be stored in .xml file during the backup and returned back to .vmx file during the restore. So here are my questions: Is someone on it at the moment ? If yes - can I help somehow ? If no - whom shell I approach in order to be mentored/directed if I decide to participate, implement this and contribute the patch back to the source code ? Thanks for an answer in advance. Best regards Oleh Paliy

1 0

[libvirt] PPPoE-Server problem
by B Veera-B37207 04 Jul '11

04 Jul '11

HI, I am using Libvirt with LXC as hypervisor. When I am starting pppoe-server , unable to create ppp0 interface in Virtual machine, it is unable to serve ips to clients. Let me know is there any plug-in for this (Or) What is the solution. Regards, Veera.

1 0

[libvirt] [PATCH 1/4] libvirtd: avoid memory leak on OOM
by Eric Blake 04 Jul '11

04 Jul '11

Detected by Coverity; only strikes on OOM so not serious. * daemon/libvirtd.c (daemonPidFilePath): Plug leak. --- daemon/libvirtd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 60ee705..06d2077 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -310,8 +310,10 @@ daemonPidFilePath(bool privileged, if (!(userdir = virGetUserDirectory(geteuid()))) goto error; - if (virAsprintf(pidfile, "%s/.libvirt/libvirtd.pid", userdir) < 0) + if (virAsprintf(pidfile, "%s/.libvirt/libvirtd.pid", userdir) < 0) { + VIR_FREE(userdir); goto no_memory; + } VIR_FREE(userdir); } -- 1.7.4.4

4 11