- Devel - libvirt List Archives

[libvirt] [PATCH] openvz: Add simple test for openvzReadNetworkConf
by Matthias Bolte 01 Jun '11

01 Jun '11

Convert openvzLocateConfFile to a replaceable callback to allow testing the config file parsing without rewriting the whole OpenVZ config parsing to a more testable structure. Also ignore the openvzutilstest binary. --- src/openvz/openvz_conf.c | 28 +++++++++++---- src/openvz/openvz_conf.h | 6 +++ tests/.gitignore | 1 + tests/openvzutilstest.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ tests/openvzutilstest.conf | 1 + 5 files changed, 106 insertions(+), 8 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 6e32242..bba4e6f 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -60,6 +60,9 @@ static char *openvzLocateConfDir(void); static int openvzGetVPSUUID(int vpsid, char *uuidstr, size_t len); static int openvzLocateConfFile(int vpsid, char **conffile, const char *ext); static int openvzAssignUUIDs(void); +static int openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext); + +openvzLocateConfFileFunc openvzLocateConfFileCallback = openvzLocateConfFileDefault; int strtoI(const char *str) @@ -171,7 +174,7 @@ no_memory: } -static int +int openvzReadNetworkConf(virDomainDefPtr def, int veid) { int ret; @@ -473,6 +476,8 @@ int openvzLoadDomains(struct openvz_driver *driver) { if (VIR_ALLOC(dom->def) < 0) goto no_memory; + dom->def->virtType = VIR_DOMAIN_VIRT_OPENVZ; + if (STREQ(status, "stopped")) { virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_UNKNOWN); @@ -793,12 +798,9 @@ cleanup: return ret; } -/* Locate config file of container -* return -1 - error -* 0 - OK -*/ + static int -openvzLocateConfFile(int vpsid, char **conffile, const char *ext) +openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext) { char * confdir; int ret = 0; @@ -817,8 +819,18 @@ openvzLocateConfFile(int vpsid, char **conffile, const char *ext) return ret; } -static char -*openvzLocateConfDir(void) +/* Locate config file of container + * return -1 - error + * 0 - OK + */ +static int +openvzLocateConfFile(int vpsid, char **conffile, const char *ext) +{ + return openvzLocateConfFileCallback(vpsid, conffile, ext); +} + +static char * +openvzLocateConfDir(void) { const char *conf_dir_list[] = {"/etc/vz/conf", "/usr/local/etc/conf", NULL}; int i=0; diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index d5a57a6..182ebae 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -53,6 +53,11 @@ struct openvz_driver { int version; }; +typedef int (*openvzLocateConfFileFunc)(int vpsid, char **conffile, const char *ext); + +/* this allows the testsuite to replace the conf file locator function */ +extern openvzLocateConfFileFunc openvzLocateConfFileCallback; + int openvz_readline(int fd, char *ptr, int maxlen); int openvzExtractVersion(struct openvz_driver *driver); int openvzReadVPSConfigParam(int vpsid, const char *param, char **value); @@ -66,5 +71,6 @@ int strtoI(const char *str); int openvzSetDefinedUUID(int vpsid, unsigned char *uuid); unsigned int openvzGetNodeCPUs(void); int openvzGetVEID(const char *name); +int openvzReadNetworkConf(virDomainDefPtr def, int veid); #endif /* OPENVZ_CONF_H */ diff --git a/tests/.gitignore b/tests/.gitignore index e3906f0..749b5b9 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -16,6 +16,7 @@ object-locking object-locking-files.txt object-locking.cmi object-locking.cmx +openvzutilstest qemuargv2xmltest qemuhelptest qemuxml2argvtest diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index fe6a2ea..567131a 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -12,6 +12,13 @@ # include "util.h" # include "openvz/openvz_conf.h" +static int +testLocateConfFile(int vpsid ATTRIBUTE_UNUSED, char **conffile, + const char *ext ATTRIBUTE_UNUSED) +{ + return virAsprintf(conffile, "%s/openvzutilstest.conf", abs_srcdir); +} + struct testConfigParam { const char *param; const char *value; @@ -62,10 +69,80 @@ cleanup: } static int +testReadNetworkConf(const void *data ATTRIBUTE_UNUSED) +{ + int result = -1; + virDomainDefPtr def = NULL; + char *actual = NULL; + virErrorPtr err = NULL; + const char *expected = + "<domain type='openvz'>\n" + " <uuid>00000000-0000-0000-0000-000000000000</uuid>\n" + " <memory>0</memory>\n" + " <currentMemory>0</currentMemory>\n" + " <vcpu>0</vcpu>\n" + " <os>\n" + " <type>exe</type>\n" + " <init>/sbin/init</init>\n" + " </os>\n" + " <clock offset='utc'/>\n" + " <on_poweroff>destroy</on_poweroff>\n" + " <on_reboot>destroy</on_reboot>\n" + " <on_crash>destroy</on_crash>\n" + " <devices>\n" + " <interface type='ethernet'>\n" + " <mac address='00:00:00:00:00:00'/>\n" + " <ip address='194.44.18.88'/>\n" + " </interface>\n" + " <interface type='bridge'>\n" + " <mac address='00:18:51:c1:05:ee'/>\n" + " <target dev='veth105.10'/>\n" + " </interface>\n" + " </devices>\n" + "</domain>\n"; + + if (VIR_ALLOC(def) < 0 || + !(def->os.type = strdup("exe")) || + !(def->os.init = strdup("/sbin/init"))) + goto cleanup; + + def->virtType = VIR_DOMAIN_VIRT_OPENVZ; + + if (openvzReadNetworkConf(def, 1) < 0) { + err = virGetLastError(); + fprintf(stderr, "ERROR: %s\n", err != NULL ? err->message : "<unknown>"); + goto cleanup; + } + + actual = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE); + + if (actual == NULL) { + err = virGetLastError(); + fprintf(stderr, "ERROR: %s\n", err != NULL ? err->message : "<unknown>"); + goto cleanup; + } + + if (STRNEQ(expected, actual)) { + virtTestDifference(stderr, expected, actual); + goto cleanup; + } + + result = 0; + +cleanup: + VIR_FREE(actual); + virDomainDefFree(def); + + return result; +} + +static int mymain(void) { int result = 0; + openvzLocateConfFileCallback = testLocateConfFile; + # define DO_TEST(_name) \ do { \ if (virtTestRun("OpenVZ "#_name, 1, test##_name, \ @@ -75,6 +152,7 @@ mymain(void) } while (0) DO_TEST(ReadConfigParam); + DO_TEST(ReadNetworkConf); return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/openvzutilstest.conf b/tests/openvzutilstest.conf index a1b93b7..c5d048c 100644 --- a/tests/openvzutilstest.conf +++ b/tests/openvzutilstest.conf @@ -39,3 +39,4 @@ QUOTATIME="" DISK_QUOTA=no OSTEMPLATE="rhel-5-lystor" IP_ADDRESS="194.44.18.88" +NETIF="ifname=eth10,mac=00:18:51:C1:05:EE,host_ifname=veth105.10,host_mac=00:18:51:8F:D9:F3 -- 1.7.0.4

2 2

[libvirt] [PATCH] openvz: Set virtType to openvz in openvzLoadDomains
by Matthias Bolte 01 Jun '11

01 Jun '11

Otherwise virsh dumpxml will report <domain type='qemu'> instead of the expected <domain type='openvz'>. --- I pushed this one as Eric already ACK'ed it as part of another patch [1] where I accientially included it and Jean-Baptiste confirmed that the problem exists [2]. [1] https://www.redhat.com/archives/libvir-list/2011-May/msg01886.html [2] https://www.redhat.com/archives/libvir-list/2011-May/msg01887.html src/openvz/openvz_conf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 7c76e6b..9ce92dc 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -473,6 +473,8 @@ int openvzLoadDomains(struct openvz_driver *driver) { if (VIR_ALLOC(dom->def) < 0) goto no_memory; + dom->def->virtType = VIR_DOMAIN_VIRT_OPENVZ; + if (STREQ(status, "stopped")) { virDomainObjSetState(dom, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_UNKNOWN); -- 1.7.0.4

1 0

[libvirt] virsh version problem with remote connection
by Matthias Bolte 01 Jun '11

01 Jun '11

virsh version does basically this hvType = virConnectGetType(...) virGetVersion(..., hvType, ...) [...] Assuming a remote connection virConnectGetType calls the remote driver that returns the type of the underlying driver on the server side, for example QEMU. Then virGetVersion compares hvType to a set of strings that depend on configure options and returns LIBVIR_VERSION_NUMBER in most cases. Now this fails in case libvirt on the client side is just compiled with the remote driver enabled and the server side has the actual driver such as the QEMU driver. It just happens to work when the actual driver is compiled in on client and server side. But that's not the case here. freebsd# ./tools/virsh -c qemu+tcp://192.168.178.22/system version Compiled against library: libvir 0.9.2 error: failed to get the library version error: this function is not supported by the connection driver: virGetVersion This is not FreeBSD specific, happens on Windows as well due to the similar drivers configuration. The problem is that virConnectGetType returns QEMU, but virGetVersion on the client side only accepts Remote as hvType due to all other drivers being disabled on the client side. I'm not sure how to fix this properly, does anyone have some idea? Matthias

2 1

[libvirt] [PATCH] util: Fix incorrect error in PCI functions.
by Osier Yang 01 Jun '11

01 Jun '11

Substitute VIR_ERR_NO_SUPPORT with VIR_ERR_INTERNAL_ERROR. Error like following is not what user want to see. error : pciDeviceIsAssignable:1487 : this function is not supported by the connection driver: Device 0000:07:10.0 is behind a switch lacking ACS and cannot be assigned --- src/util/pci.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 9cc7b20..8baa3d8 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -614,7 +614,7 @@ pciTrySecondaryBusReset(pciDevice *dev, * are not in use by the host or other guests. */ if ((conflict = pciBusContainsActiveDevices(dev, inactiveDevs))) { - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Active %s devices on bus with %s, not doing bus reset"), conflict->name, dev->name); return -1; @@ -624,7 +624,7 @@ pciTrySecondaryBusReset(pciDevice *dev, if (pciGetParentDevice(dev, &parent) < 0) return -1; if (!parent) { - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to find parent device for %s"), dev->name); return -1; @@ -637,7 +637,7 @@ pciTrySecondaryBusReset(pciDevice *dev, * are multiple devices/functions */ if (pciRead(dev, 0, config_space, PCI_CONF_LEN) < 0) { - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to read PCI config space for %s"), dev->name); goto out; @@ -657,7 +657,7 @@ pciTrySecondaryBusReset(pciDevice *dev, usleep(200 * 1000); /* sleep 200ms */ if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0) { - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to restore PCI config space for %s"), dev->name); goto out; @@ -683,7 +683,7 @@ pciTryPowerManagementReset(pciDevice *dev) /* Save and restore the device's config space. */ if (pciRead(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) { - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to read PCI config space for %s"), dev->name); return -1; @@ -703,7 +703,7 @@ pciTryPowerManagementReset(pciDevice *dev) usleep(10 * 1000); /* sleep 10ms */ if (pciWrite(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) { - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to restore PCI config space for %s"), dev->name); return -1; @@ -770,7 +770,7 @@ pciResetDevice(pciDevice *dev, if (ret < 0) { virErrorPtr err = virGetLastError(); - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to reset PCI device %s: %s"), dev->name, err ? err->message : _("no FLR, PM reset or bus reset available")); @@ -1324,7 +1324,7 @@ pciGetDevice(unsigned domain, product = pciReadDeviceID(dev, "device"); if (!vendor || !product) { - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to read product/vendor ID for %s"), dev->name); VIR_FREE(product); @@ -1588,7 +1588,7 @@ pciDeviceIsBehindSwitchLackingACS(pciDevice *dev) if (dev->bus == 0) return 0; else { - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to find parent device for %s"), dev->name); return -1; @@ -1643,7 +1643,7 @@ int pciDeviceIsAssignable(pciDevice *dev, VIR_DEBUG("%s %s: strict ACS check disabled; device assignment allowed", dev->id, dev->name); } else { - pciReportError(VIR_ERR_NO_SUPPORT, + pciReportError(VIR_ERR_INTERNAL_ERROR, _("Device %s is behind a switch lacking ACS and " "cannot be assigned"), dev->name); -- 1.7.4

2 2

[libvirt] [PATCH] build: consistently use CFLAGS
by Eric Blake 01 Jun '11

01 Jun '11

According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled in automake 1.9.6) should only include -I, -D, and -U directives; more generic directives like -Wall belong in CFLAGS since they affect more phases of the build process. Therefore, we should be sticking CFLAGS additions into a CFLAGS container, not a CPPFLAGS container. * src/Makefile.am (INCLUDES): Move CFLAGS items... (AM_CFLAGS): ...to their proper location. * python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise. * tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise. --- python/Makefile.am | 5 +++-- src/Makefile.am | 15 +++++++-------- tests/Makefile.am | 8 +++++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 432ad70..0edb3e4 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -3,12 +3,13 @@ SUBDIRS= . tests INCLUDES = \ - $(WARN_CFLAGS) \ - $(PYTHON_INCLUDES) \ + $(PYTHON_INCLUDES) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_builddir)/$(subdir) +AM_CFLAGS = $(WARN_CFLAGS) + DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION) DOCS = ${srcdir}/TODO diff --git a/src/Makefile.am b/src/Makefile.am index 02d53ee..292fa30 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,20 +3,19 @@ # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them -INCLUDES = \ - -I$(top_srcdir)/gnulib/lib \ +INCLUDES = -I$(top_srcdir)/gnulib/lib \ -I../gnulib/lib \ -I../include \ -I@top_srcdir@/src/util \ -I@top_srcdir@/include \ - $(DRIVER_MODULE_CFLAGS) \ + -DIN_LIBVIRT + +AM_CFLAGS = $(DRIVER_MODULE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) \ - -DIN_LIBVIRT \ - $(WIN32_EXTRA_CFLAGS) - -AM_CFLAGS = $(COVERAGE_CFLAGS) + $(LOCK_CHECKING_CFLAGS) \ + $(WIN32_EXTRA_CFLAGS) \ + $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) EXTRA_DIST = $(conf_DATA) diff --git a/tests/Makefile.am b/tests/Makefile.am index 7ae50a2..2b21d82 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,14 +8,16 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/util \ - -I$(top_srcdir)/src/conf \ + -I$(top_srcdir)/src/conf + +AM_CFLAGS = \ $(LIBXML_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(SASL_CFLAGS) \ $(SELINUX_CFLAGS) \ $(APPARMOR_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(WARN_CFLAGS) + $(COVERAGE_CFLAGS) \ + $(WARN_CFLAGS) if WITH_DRIVER_MODULES INCLUDES += \ -- 1.7.4.4

1 0

[libvirt] [PATCH] graphics: add support for action_if_connected in qemu
by Michal Privoznik 01 Jun '11

01 Jun '11

This option accepts 3 values: -keep, to keep current client connected (Spice+VNC) -disconnect, to disconnect client (Spice) -fail, to fail setting password if there is a client connected (Spice) --- docs/schemas/domain.rng | 16 ++++++++++++++++ src/conf/domain_conf.c | 44 +++++++++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 11 +++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_hotplug.c | 11 ++++++++--- 5 files changed, 78 insertions(+), 6 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index c270815..f0efe60 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1227,6 +1227,13 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>keep</value> + </choice> + </attribute> + </optional> </group> <group> <attribute name="type"> @@ -1270,6 +1277,15 @@ <data type="dateTime"/> </attribute> </optional> + <optional> + <attribute name="connected"> + <choice> + <value>fail</value> + <value>disconnect</value> + <value>keep</value> + </choice> + </attribute> + </optional> <interleave> <zeroOrMore> <element name="channel"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fbef61e..571fcf4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -313,6 +313,13 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "desktop", "spice") +VIR_ENUM_IMPL(virDomainGraphicsAuthConnected, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST, + "default", + "fail", + "disconnect", + "keep") + VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName, VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST, "main", @@ -3803,9 +3810,12 @@ error: static int -virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr def) +virDomainGraphicsAuthDefParseXML(xmlNodePtr node, + virDomainGraphicsAuthDefPtr def, + int type) { char *validTo = NULL; + char *connected = virXMLPropString(node, "connected"); def->passwd = virXMLPropString(node, "passwd"); @@ -3846,6 +3856,28 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, virDomainGraphicsAuthDefPtr de def->expires = 1; } + if (connected) { + int action = virDomainGraphicsAuthConnectedTypeFromString(connected); + if (action < 0) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown connected value %s"), + connected); + VIR_FREE(connected); + return -1; + } + VIR_FREE(connected); + + /* VNC supports connected='keep' only */ + if (type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + action != VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("VNC supports connected='keep' only")); + return -1; + } + + def->connected = action; + } + return 0; } @@ -3915,7 +3947,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.vnc.listenAddr[0]) VIR_FREE(def->data.vnc.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth, + def->type) < 0) goto error; } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { char *fullscreen = virXMLPropString(node, "fullscreen"); @@ -4051,7 +4084,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { !def->data.spice.listenAddr[0]) VIR_FREE(def->data.spice.listenAddr); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth, + def->type) < 0) goto error; cur = node->children; @@ -7995,6 +8029,10 @@ virDomainGraphicsAuthDefFormatAttr(virBufferPtr buf, strftime(strbuf, sizeof(strbuf), "%Y-%m-%dT%H:%M:%S", tm); virBufferAsprintf(buf, " passwdValidTo='%s'", strbuf); } + + if (def->connected) + virBufferEscapeString(buf, " connected='%s'", + virDomainGraphicsAuthConnectedTypeToString(def->connected)); } static int diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8c94d4d..d090b9a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -631,12 +631,22 @@ enum virDomainGraphicsType { VIR_DOMAIN_GRAPHICS_TYPE_LAST, }; +enum virDomainGraphicsAuthConnectedType { + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DEFAULT = 0, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_FAIL, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DISCONNECT, + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP, + + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_LAST +}; + typedef struct _virDomainGraphicsAuthDef virDomainGraphicsAuthDef; typedef virDomainGraphicsAuthDef *virDomainGraphicsAuthDefPtr; struct _virDomainGraphicsAuthDef { char *passwd; unsigned int expires: 1; /* Whether there is an expiry time set */ time_t validTo; /* seconds since epoch */ + int connected; /* action if connected */ }; enum virDomainGraphicsSpiceChannelName { @@ -1514,6 +1524,7 @@ VIR_ENUM_DECL(virDomainHostdevSubsys) VIR_ENUM_DECL(virDomainInput) VIR_ENUM_DECL(virDomainInputBus) VIR_ENUM_DECL(virDomainGraphics) +VIR_ENUM_DECL(virDomainGraphicsAuthConnected) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelName) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelMode) VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 321df2a..bb331a3 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -263,6 +263,8 @@ virDomainFindByID; virDomainFindByName; virDomainFindByUUID; virDomainGetRootFilesystem; +virDomainGraphicsAuthConnectedTypeFromString; +virDomainGraphicsAuthConnectedTypeToString; virDomainGraphicsDefFree; virDomainGraphicsSpiceChannelModeTypeFromString; virDomainGraphicsSpiceChannelModeTypeToString; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3cf7d35..c0c4a15 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1017,10 +1017,12 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, return -1; } - /* If a password lifetime was, or is set, then we must always run, - * even if new password matches old password */ + /* If a password lifetime was, or is set, or action if connected has + * changed, then we must always run, even if new password matches + * old password */ if (olddev->data.vnc.auth.expires || dev->data.vnc.auth.expires || + olddev->data.vnc.auth.connected != dev->data.vnc.auth.connected || STRNEQ_NULLABLE(olddev->data.vnc.auth.passwd, dev->data.vnc.auth.passwd)) { VIR_DEBUG("Updating password on VNC server %p %p", dev->data.vnc.auth.passwd, driver->vncPassword); ret = qemuDomainChangeGraphicsPasswords(driver, vm, VIR_DOMAIN_GRAPHICS_TYPE_VNC, @@ -1032,6 +1034,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.vnc.auth.passwd = NULL; olddev->data.vnc.auth.validTo = dev->data.vnc.auth.validTo; olddev->data.vnc.auth.expires = dev->data.vnc.auth.expires; + olddev->data.vnc.auth.connected = dev->data.vnc.auth.connected; } else { ret = 0; } @@ -1060,6 +1063,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, * even if new password matches old password */ if (olddev->data.spice.auth.expires || dev->data.spice.auth.expires || + olddev->data.spice.auth.connected != dev->data.spice.auth.connected || STRNEQ_NULLABLE(olddev->data.spice.auth.passwd, dev->data.spice.auth.passwd)) { VIR_DEBUG("Updating password on SPICE server %p %p", dev->data.spice.auth.passwd, driver->spicePassword); ret = qemuDomainChangeGraphicsPasswords(driver, vm, VIR_DOMAIN_GRAPHICS_TYPE_SPICE, @@ -1071,6 +1075,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, dev->data.spice.auth.passwd = NULL; olddev->data.spice.auth.validTo = dev->data.spice.auth.validTo; olddev->data.spice.auth.expires = dev->data.spice.auth.expires; + olddev->data.spice.auth.connected = dev->data.spice.auth.connected; } else { VIR_DEBUG("Not updating since password didn't change"); ret = 0; @@ -1755,7 +1760,7 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, ret = qemuMonitorSetPassword(priv->mon, type, auth->passwd ? auth->passwd : defaultPasswd, - NULL); + auth->connected ? virDomainGraphicsAuthConnectedTypeToString(auth->connected) : NULL); if (ret == -2) { if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { -- 1.7.5.rc3

3 3

[libvirt] [PATCH] maint: use consistent file name for threading notes
by Eric Blake 31 May '11

31 May '11

* daemon/THREADING.txt: Rename... * daemon/THREADS.txt: ...to match qemu thread notes. * daemon/Makefile.am (EXTRA_DIST): Reflect rename. --- First suggested here: https://www.redhat.com/archives/libvir-list/2011-May/msg01730.html daemon/Makefile.am | 2 +- daemon/{THREADING.txt => THREADS.txt} | 0 2 files changed, 1 insertions(+), 1 deletions(-) rename daemon/{THREADING.txt => THREADS.txt} (100%) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 92d154f..c1b4a9f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -44,7 +44,7 @@ EXTRA_DIST = \ libvirtd.lxc.logrotate.in \ libvirtd.uml.logrotate.in \ test_libvirtd.aug \ - THREADING.txt \ + THREADS.txt \ libvirtd.pod.in \ libvirtd.8.in \ libvirtd.stp \ diff --git a/daemon/THREADING.txt b/daemon/THREADS.txt similarity index 100% rename from daemon/THREADING.txt rename to daemon/THREADS.txt -- 1.7.4.4

2 2

[libvirt] [PATCHv2 0/8] add virGetSchedulerParamterFlags
by Eric Blake 31 May '11

31 May '11

V2 of this original series: https://www.redhat.com/archives/libvir-list/2011-May/msg01142.html Changes in this version: rebase to latest avoid regression in virTypedParameter consolidation write new API in terms of virTypedParameter instead of virSchedParameter Eric Blake (8): libvirt.h: avoid regression, and document preferred name maint: prefer newer API names internally remote: consolidate typed parameter handling sched: introduce virDomainGetSchedulerParametersFlags qemu: introduce qemuGetSchedulerParametersFlags remote: introduce remoteGetSchedulerParametersFlags virsh: improve schedinfo querying ability sched: provide new API shims for remaining drivers daemon/remote.c | 563 +++++++++++++++++------------------------- include/libvirt/libvirt.h.in | 275 +++++++++++---------- python/generator.py | 1 + python/libvirt-override.c | 28 +- src/driver.h | 22 ++- src/esx/esx_driver.c | 60 +++-- src/libvirt.c | 96 ++++++- src/libvirt_public.syms | 1 + src/libxl/libxl_driver.c | 42 +++- src/lxc/lxc_driver.c | 60 ++++-- src/qemu/qemu_driver.c | 115 +++++++--- src/remote/remote_driver.c | 525 ++++++++++++++++----------------------- src/remote/remote_protocol.x | 87 +++----- src/remote_protocol-structs | 63 ++--- src/test/test_driver.c | 41 +++- src/xen/xen_driver.c | 36 +++- src/xen/xen_hypervisor.c | 14 +- src/xen/xen_hypervisor.h | 6 +- src/xen/xend_internal.c | 12 +- tools/virsh.c | 102 +++++--- 20 files changed, 1102 insertions(+), 1047 deletions(-) -- 1.7.4.4

2 13

Re: [libvirt] ssh from host to guest on default network
by Neil Wilson 31 May '11

31 May '11

> Message: 1 > Date: Mon, 30 May 2011 20:28:42 -0700 > From: Kay Williams <Kay(a)thewilliams.net> > To: "libvir-list(a)redhat.com" <libvir-list(a)redhat.com> > Subject: [libvirt] ssh from host to guest on default network > Message-ID: > <3527434A537F2F42A53BAA31DC03BB6A4A52040D70(a)SERVER1.family.local> > Content-Type: text/plain; charset="us-ascii" > > Hello, > > The trouble I am having is with ssh'ing from the host to guest machine. Probably more for the user list than this one. However... I've used 'avahi' successfully to get resolution in the clients. It implements the 'Bonjour' no configuration system. Obviously the client image has to have the avahi daemons installed and correctly configured. Once you have that working in the client and the correct settings in your resolver on the host, then you can ssh into 'xyz.local' and it resolves nicely. Rgs Neil

2 1

[libvirt] [PATCH] openvz: Restore original EOF handling in openvzGetProcessInfo
by Matthias Bolte 31 May '11

31 May '11

This function is also affected by getline conversion. But this didn't result in a regression in general, because the difference whould only affect the behavior of the function when the line in /proc/vz/vestat for the given vpsid wasn't found. Under normal conditions this should not happen. --- src/openvz/openvz_driver.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index ae951a2..e24b5d8 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1507,6 +1507,7 @@ static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid) unsigned long long usertime, systime, nicetime; int readvps = vpsid + 1; /* ensure readvps is initially different */ ssize_t ret; + int err = 0; /* read statistic from /proc/vz/vestat. sample: @@ -1522,8 +1523,10 @@ Version: 2.2 /*search line with VEID=vpsid*/ while (1) { ret = getline(&line, &line_size, fp); - if (ret <= 0) + if (ret < 0) { + err = !feof(fp); break; + } if (sscanf (line, "%d %llu %llu %llu", &readvps, &usertime, &nicetime, &systime) == 4 @@ -1538,7 +1541,7 @@ Version: 2.2 VIR_FREE(line); VIR_FORCE_FCLOSE(fp); - if (ret < 0) + if (err) return -1; if (readvps != vpsid) /*not found*/ -- 1.7.0.4

2 2