- Devel - libvirt List Archives

[libvirt] PATCH 1/2: Support <video> element in domain config
by Daniel P. Berrange 13 Jul '09

13 Jul '09

This patch implements the basic domain config support for a <video> element as per http://www.redhat.com/archives/libvir-list/2009-May/msg00424.html Since last time this - Centralized the logic for default video model & default RAM - Added a type=vbox for their custom graphics card Daniel From: Daniel P. Berrange <berrange(a)redhat.com> Date: Mon, 6 Jul 2009 14:54:44 +0100 Subject: [PATCH 1/3] Support <video> tag for defining VGA card properties * docs/schemas/domain.rng: Define <video> element schema * src/domain_conf.c, src/domain_conf.h, src/libvirt_private.syms: Add parsing and formatting for <video> element --- docs/schemas/domain.rng | 34 +++++++ src/domain_conf.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++ src/domain_conf.h | 29 ++++++ src/libvirt_private.syms | 5 + 4 files changed, 293 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 11cf04a..f857301 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -786,6 +786,39 @@ </element> </define>  + <define name="video"> + <element name="video"> + <optional> + <element name="model"> + <attribute name="type"> + <choice> + <value>vga</value> + <value>cirrus</value> + <value>vmvga</value> + <value>xen</value> + <value>vbox</value> + </choice> + </attribute> + <optional> + <attribute name="vram"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> + <attribute name="heads"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </element> + </optional> + </element> + </define> +  @@ -1032,6 +1065,7 @@ <ref name="sound"/> <ref name="hostdev"/> <ref name="graphic"/> + <ref name="video"/> <ref name="console"/> <ref name="parallel"/> <ref name="serial"/> diff --git a/src/domain_conf.c b/src/domain_conf.c index ffa2aef..cc8c3ef 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -82,6 +82,7 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "interface", "input", "sound", + "video", "hostdev") VIR_ENUM_IMPL(virDomainDisk, VIR_DOMAIN_DISK_TYPE_LAST, @@ -142,6 +143,13 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "pcspk", "ac97") +VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, + "vga", + "cirrus", + "vmvga", + "xen", + "vbox") + VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", "tablet") @@ -374,6 +382,14 @@ void virDomainSoundDefFree(virDomainSoundDefPtr def) VIR_FREE(def); } +void virDomainVideoDefFree(virDomainVideoDefPtr def) +{ + if (!def) + return; + + VIR_FREE(def); +} + void virDomainHostdevDefFree(virDomainHostdevDefPtr def) { if (!def) @@ -401,6 +417,9 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) case VIR_DOMAIN_DEVICE_SOUND: virDomainSoundDefFree(def->data.sound); break; + case VIR_DOMAIN_DEVICE_VIDEO: + virDomainVideoDefFree(def->data.video); + break; case VIR_DOMAIN_DEVICE_HOSTDEV: virDomainHostdevDefFree(def->data.hostdev); break; @@ -458,6 +477,10 @@ void virDomainDefFree(virDomainDefPtr def) virDomainSoundDefFree(def->sounds[i]); VIR_FREE(def->sounds); + for (i = 0 ; i < def->nvideos ; i++) + virDomainVideoDefFree(def->videos[i]); + VIR_FREE(def->videos); + for (i = 0 ; i < def->nhostdevs ; i++) virDomainHostdevDefFree(def->hostdevs[i]); VIR_FREE(def->hostdevs); @@ -1653,6 +1676,133 @@ error: goto cleanup; } + +int +virDomainVideoDefaultRAM(virDomainDefPtr def, + int type) +{ + switch (type) { + /* Wierd, QEMU defaults to 9 MB ??! */ + case VIR_DOMAIN_VIDEO_TYPE_VGA: + case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: + case VIR_DOMAIN_VIDEO_TYPE_VMVGA: + if (def->virtType == VIR_DOMAIN_VIRT_VBOX) + return 8 * 1024; + else + return 9 * 1024; + break; + + case VIR_DOMAIN_VIDEO_TYPE_XEN: + /* Original Xen PVFB hardcoded to 4 MB */ + return 4 * 1024; + + default: + return 0; + } +} + + +int +virDomainVideoDefaultType(virDomainDefPtr def) +{ + switch (def->virtType) { + case VIR_DOMAIN_VIRT_TEST: + case VIR_DOMAIN_VIRT_QEMU: + case VIR_DOMAIN_VIRT_KQEMU: + case VIR_DOMAIN_VIRT_KVM: + case VIR_DOMAIN_VIRT_XEN: + if (def->os.type && + (STREQ(def->os.type, "xen") || + STREQ(def->os.type, "linux"))) + return VIR_DOMAIN_VIDEO_TYPE_XEN; + else + return VIR_DOMAIN_VIDEO_TYPE_CIRRUS; + + case VIR_DOMAIN_VIRT_VBOX: + return VIR_DOMAIN_VIDEO_TYPE_VBOX; + + default: + return -1; + } +} + +static virDomainVideoDefPtr +virDomainVideoDefParseXML(virConnectPtr conn, + const xmlNodePtr node, + virDomainDefPtr dom, + int flags ATTRIBUTE_UNUSED) { + virDomainVideoDefPtr def; + xmlNodePtr cur; + char *type = NULL; + char *heads = NULL; + char *vram = NULL; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(conn); + return NULL; + } + + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if ((type == NULL) && (vram == NULL) && (heads == NULL) && + xmlStrEqual(cur->name, BAD_CAST "model")) { + type = virXMLPropString(cur, "type"); + vram = virXMLPropString(cur, "vram"); + heads = virXMLPropString(cur, "heads"); + } + } + cur = cur->next; + } + + if (type) { + if ((def->type = virDomainVideoTypeFromString(type)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unknown video model '%s'"), type); + goto error; + } + } else { + if ((def->type = virDomainVideoDefaultType(dom)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("missing video model and cannot determine default")); + goto error; + } + } + + if (vram) { + if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse video ram '%s'"), vram); + goto error; + } + } else { + def->vram = virDomainVideoDefaultRAM(dom, def->type); + } + + if (heads) { + if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse video heads '%s'"), heads); + goto error; + } + } else { + def->heads = 1; + } + + VIR_FREE(type); + VIR_FREE(vram); + VIR_FREE(heads); + + return def; + +error: + virDomainVideoDefFree(def); + VIR_FREE(type); + VIR_FREE(vram); + VIR_FREE(heads); + return NULL; +} + static int virDomainHostdevSubsysUsbDefParseXML(virConnectPtr conn, const xmlNodePtr node, @@ -2091,6 +2241,10 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virConnectPtr conn, dev->type = VIR_DOMAIN_DEVICE_SOUND; if (!(dev->data.sound = virDomainSoundDefParseXML(conn, node, flags))) goto error; + } else if (xmlStrEqual(node->name, BAD_CAST "video")) { + dev->type = VIR_DOMAIN_DEVICE_VIDEO; + if (!(dev->data.video = virDomainVideoDefParseXML(conn, node, def, flags))) + goto error; } else if (xmlStrEqual(node->name, BAD_CAST "hostdev")) { dev->type = VIR_DOMAIN_DEVICE_HOSTDEV; if (!(dev->data.hostdev = virDomainHostdevDefParseXML(conn, node, flags))) @@ -2649,6 +2803,47 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, } VIR_FREE(nodes); + /* analysis of the video devices */ + if ((n = virXPathNodeSet(conn, "./devices/video", ctxt, &nodes)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot extract video devices")); + goto error; + } + if (n && VIR_ALLOC_N(def->videos, n) < 0) + goto no_memory; + for (i = 0 ; i < n ; i++) { + virDomainVideoDefPtr video = virDomainVideoDefParseXML(conn, + nodes[i], + def, + flags); + if (!video) + goto error; + def->videos[def->nvideos++] = video; + } + VIR_FREE(nodes); + + /* For backwards compatability, if no <video> tag is set but there + * is a <graphics> tag, then we add a single video tag */ + if (def->ngraphics && !def->nvideos) { + virDomainVideoDefPtr video; + if (VIR_ALLOC(video) < 0) + goto no_memory; + video->type = virDomainVideoDefaultType(def); + if (video->type < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot determine default video type")); + VIR_FREE(video); + goto error; + } + video->vram = virDomainVideoDefaultRAM(def, video->type); + video->heads = 1; + if (VIR_ALLOC_N(def->videos, 1) < 0) { + virDomainVideoDefFree(video); + goto no_memory; + } + def->videos[def->nvideos++] = video; + } + /* analysis of the host devices */ if ((n = virXPathNodeSet(conn, "./devices/hostdev", ctxt, &nodes)) < 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, @@ -3486,6 +3681,32 @@ virDomainSoundDefFormat(virConnectPtr conn, } static int +virDomainVideoDefFormat(virConnectPtr conn, + virBufferPtr buf, + virDomainVideoDefPtr def) +{ + const char *model = virDomainVideoTypeToString(def->type); + + if (!model) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected video model %d"), def->type); + return -1; + } + + virBufferAddLit(buf, " <video>\n"); + virBufferVSprintf(buf, " <model type='%s'", + model); + if (def->vram) + virBufferVSprintf(buf, " vram='%u'", def->vram); + if (def->heads) + virBufferVSprintf(buf, " heads='%u'", def->heads); + virBufferAddLit(buf, "/>\n"); + virBufferAddLit(buf, " </video>\n"); + + return 0; +} + +static int virDomainInputDefFormat(virConnectPtr conn, virBufferPtr buf, virDomainInputDefPtr def) @@ -3860,6 +4081,10 @@ char *virDomainDefFormat(virConnectPtr conn, if (virDomainSoundDefFormat(conn, &buf, def->sounds[n]) < 0) goto cleanup; + for (n = 0 ; n < def->nvideos ; n++) + if (virDomainVideoDefFormat(conn, &buf, def->videos[n]) < 0) + goto cleanup; + for (n = 0 ; n < def->nhostdevs ; n++) if (virDomainHostdevDefFormat(conn, &buf, def->hostdevs[n]) < 0) goto cleanup; diff --git a/src/domain_conf.h b/src/domain_conf.h index 51310c1..51dd6d3 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -265,6 +265,26 @@ struct _virDomainSoundDef { int model; }; + +enum virDomainVideoType { + VIR_DOMAIN_VIDEO_TYPE_VGA, + VIR_DOMAIN_VIDEO_TYPE_CIRRUS, + VIR_DOMAIN_VIDEO_TYPE_VMVGA, + VIR_DOMAIN_VIDEO_TYPE_XEN, + VIR_DOMAIN_VIDEO_TYPE_VBOX, + + VIR_DOMAIN_VIDEO_TYPE_LAST +}; + + +typedef struct _virDomainVideoDef virDomainVideoDef; +typedef virDomainVideoDef *virDomainVideoDefPtr; +struct _virDomainVideoDef { + int type; + unsigned int vram; + unsigned int heads; +}; + /* 3 possible graphics console modes */ enum virDomainGraphicsType { VIR_DOMAIN_GRAPHICS_TYPE_SDL, @@ -361,6 +381,7 @@ enum virDomainDeviceType { VIR_DOMAIN_DEVICE_NET, VIR_DOMAIN_DEVICE_INPUT, VIR_DOMAIN_DEVICE_SOUND, + VIR_DOMAIN_DEVICE_VIDEO, VIR_DOMAIN_DEVICE_HOSTDEV, VIR_DOMAIN_DEVICE_LAST, @@ -376,6 +397,7 @@ struct _virDomainDeviceDef { virDomainNetDefPtr net; virDomainInputDefPtr input; virDomainSoundDefPtr sound; + virDomainVideoDefPtr video; virDomainHostdevDefPtr hostdev; } data; }; @@ -492,6 +514,9 @@ struct _virDomainDef { int nsounds; virDomainSoundDefPtr *sounds; + int nvideos; + virDomainVideoDefPtr *videos; + int nhostdevs; virDomainHostdevDefPtr *hostdevs; @@ -557,6 +582,7 @@ void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainNetDefFree(virDomainNetDefPtr def); void virDomainChrDefFree(virDomainChrDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); +void virDomainVideoDefFree(virDomainVideoDefPtr def); void virDomainHostdevDefFree(virDomainHostdevDefPtr def); void virDomainDeviceDefFree(virDomainDeviceDefPtr def); void virDomainDefFree(virDomainDefPtr vm); @@ -666,6 +692,8 @@ int virDiskNameToBusDeviceIndex(virDomainDiskDefPtr disk, int *devIdx); virDomainFSDefPtr virDomainGetRootFilesystem(virDomainDefPtr def); +int virDomainVideoDefaultType(virDomainDefPtr def); +int virDomainVideoDefaultRAM(virDomainDefPtr def, int type); void virDomainObjLock(virDomainObjPtr obj); void virDomainObjUnlock(virDomainObjPtr obj); @@ -683,6 +711,7 @@ VIR_ENUM_DECL(virDomainFS) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainChr) VIR_ENUM_DECL(virDomainSoundModel) +VIR_ENUM_DECL(virDomainVideo) VIR_ENUM_DECL(virDomainHostdevMode) VIR_ENUM_DECL(virDomainHostdevSubsys) VIR_ENUM_DECL(virDomainInput) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bd7910b..d43620f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -100,6 +100,11 @@ virDomainSaveStatus; virDomainSoundDefFree; virDomainSoundModelTypeFromString; virDomainSoundModelTypeToString; +virDomainVideoDefFree; +virDomainVideoTypeToString; +virDomainVideoTypeFromString; +virDomainVideoDefaultRAM; +virDomainVideoDefaultType; virDomainVirtTypeToString; virDomainFSDefFree; virDomainObjLock; -- 1.6.2.5 -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 3

[libvirt] [PATCH] Link to libvirt tickets on the Red Hat Bugzilla Server
by Garry Dolley 12 Jul '09

12 Jul '09

General tickets are under the 'Virtualization Tools' product category and Fedora specific tickets are under the 'Fedora' product category. The component is 'libvirt' in both cases. Signed-off-by: Garry Dolley <gdolley(a)ucla.edu> --- docs/bugs.html | 4 ++-- docs/bugs.html.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/bugs.html b/docs/bugs.html index b321505..55bcc2c 100644 --- a/docs/bugs.html +++ b/docs/bugs.html @@ -83,13 +83,13 @@ the <code>Virtualization Tools</code> product and the <code>libvirt</code> component. </p> - <ul><li><a href="">View libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20…">New libvirt ticket</a></li></ul> + <ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Virtua…">View libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20…">New libvirt ticket</a></li></ul> <h2>Linux Distribution specific bug reports</h2> <ul><li> If you are using official binaries from a <strong>Fedora distribution</strong>, enter tickets against the <code>Fedora</code> product and the <code>libvirt</code> component. - <ul><li><a href="">View Fedora libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&compon…">New Fedora libvirt ticket</a></li></ul></li><li> + <ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Fedora">View Fedora libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&compon…">New Fedora libvirt ticket</a></li></ul></li><li> If you are using official binaries from <strong>Red Hat Enterprise Linux distribution</strong>, tickets against the <code>Red Hat Enterprise Linux 5</code> product and the <code>libvirt</code> component. diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 0eb723a..df26c15 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -23,7 +23,7 @@ </p> <ul> - <li><a href="">View libvirt tickets</a></li> + <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Virtua…">View libvirt tickets</a></li> <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20…">New libvirt ticket</a></li> </ul> @@ -34,7 +34,7 @@ tickets against the <code>Fedora</code> product and the <code>libvirt</code> component. <ul> - <li><a href="">View Fedora libvirt tickets</a></li> + <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Fedora">View Fedora libvirt tickets</a></li> <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&compon…">New Fedora libvirt ticket</a></li> </ul> </li> -- 1.6.3.1 !DSPAM:4a5792d46141992511921!

2 1

[libvirt] [PATCH] Fix docs and code disagreements for character devices.
by Cole Robinson 12 Jul '09

12 Jul '09

The 'pipe' character type wasn't documented. TCP uses a <protocol> element, not <wire> We weren't doing strict validation for protocol and source mode values. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/formatdomain.html | 18 +++++++++++++++++- docs/formatdomain.html.in | 17 ++++++++++++++++- src/domain_conf.c | 23 ++++++++++++++++++----- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html b/docs/formatdomain.html index bb6da11..0b21c6b 100644 --- a/docs/formatdomain.html +++ b/docs/formatdomain.html @@ -181,6 +181,8 @@ </li><li> <a href="#elementsCharHost">Host device proxy</a> </li><li> + <a href="#elementsCharPipe">Named pipe</a> + </li><li> <a href="#elementsCharTCP">TCP client/server</a> </li><li> <a href="#elementsCharUDP">UDP network console</a> @@ -879,6 +881,20 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> <h5> + <a name="elementsCharPipe" id="elementsCharPipe">Named pipe</a> + </h5> + <p> + The character device writes output to a named pipe. See pipe(7) for + more info. + </p> + <pre> + ... + <serial type="pipe"> + <source path="/tmp/mypipe"/> + <target port="1"/> + </serial> + ...</pre> + <h5> <a name="elementsCharTCP" id="elementsCharTCP">TCP client/server</a> </h5> <p> @@ -889,7 +905,7 @@ qemu-kvm -net nic,model=? /dev/null ... <serial type="tcp"> <source mode="connect" host="0.0.0.0" service="2445"/> - <wiremode type="telnet"/> + <protocol type="telnet"/> <target port="1"/> </serial> ...</pre> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 48d689d..191b03e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -839,6 +839,21 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> + <h5><a name="elementsCharPipe">Named pipe</a></h5> + + <p> + The character device writes output to a named pipe. See pipe(7) for + more info. + </p> + + <pre> + ... + <serial type="pipe"> + <source path="/tmp/mypipe"/> + <target port="1"/> + </serial> + ...</pre> + <h5><a name="elementsCharTCP">TCP client/server</a></h5> <p> @@ -850,7 +865,7 @@ qemu-kvm -net nic,model=? /dev/null ... <serial type="tcp"> <source mode="connect" host="0.0.0.0" service="2445"/> - <wiremode type="telnet"/> + <protocol type="telnet"/> <target port="1"/> </serial> ...</pre> diff --git a/src/domain_conf.c b/src/domain_conf.c index cc8c3ef..a04a131 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -1169,6 +1169,7 @@ error: * <serial type="tcp"> * <source mode="bind" host="0.0.0.0" service="2445"/> * <target port="1"/> + * <protocol type='raw'/> * </serial> * * <serial type="udp"> @@ -1257,11 +1258,16 @@ virDomainChrDefParseXML(virConnectPtr conn, connectHost = virXMLPropString(cur, "host"); if (connectService == NULL) connectService = virXMLPropString(cur, "service"); - } else { + } else if (STREQ((const char *)mode, "bind")) { if (bindHost == NULL) bindHost = virXMLPropString(cur, "host"); if (bindService == NULL) bindService = virXMLPropString(cur, "service"); + } else { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Unknown source mode '%s'"), + mode); + goto error; } if (def->type == VIR_DOMAIN_CHR_TYPE_UDP) @@ -1340,11 +1346,18 @@ virDomainChrDefParseXML(virConnectPtr conn, bindService = NULL; def->data.tcp.listen = 1; } - if (protocol != NULL && - STREQ(protocol, "telnet")) - def->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET; - else + + if (protocol == NULL || + STREQ(protocol, "raw")) def->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW; + else if (STREQ(protocol, "telnet")) + def->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET; + else { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Unknown protocol '%s'"), protocol); + goto error; + } + break; case VIR_DOMAIN_CHR_TYPE_UDP: -- 1.6.0.6

3 3

[libvirt] [PATCH] qemu: Check driver is initialized up front, to avoid segfault.
by Cole Robinson 12 Jul '09

12 Jul '09

If the qemu_driver was not initialized (possibly due to an error on driver startup), we can segfault if attempting to connect to the URI. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu_driver.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 95ea882..a9b4850 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1779,6 +1779,12 @@ static virDrvOpenStatus qemudOpen(virConnectPtr conn, if (conn->uri->server != NULL) return VIR_DRV_OPEN_DECLINED; + if (qemu_driver == NULL) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu state driver is not active")); + return VIR_DRV_OPEN_ERROR; + } + if (qemu_driver->privileged) { if (STRNEQ (conn->uri->path, "/system") && STRNEQ (conn->uri->path, "/session")) { @@ -1795,14 +1801,6 @@ static virDrvOpenStatus qemudOpen(virConnectPtr conn, return VIR_DRV_OPEN_ERROR; } } - - /* URI was good, but driver isn't active */ - if (qemu_driver == NULL) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", - _("qemu state driver is not active")); - return VIR_DRV_OPEN_ERROR; - } - } conn->privateData = qemu_driver; -- 1.6.0.6

3 3

[libvirt] [PATCH] Link to libvirt tickets on the Red Hat Bugzilla Server
by gdolley＠arpnetworks.com 10 Jul '09

10 Jul '09

From: Garry Dolley <gdolley(a)ucla.edu> General tickets are under the 'Virtualization Tools' product category and Fedora specific tickets are under the 'Fedora' product category. The component is 'libvirt' in both cases. Signed-off-by: Garry Dolley <gdolley(a)ucla.edu> --- docs/bugs.html | 4 ++-- docs/bugs.html.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/bugs.html b/docs/bugs.html index b321505..55bcc2c 100644 --- a/docs/bugs.html +++ b/docs/bugs.html @@ -83,13 +83,13 @@ the <code>Virtualization Tools</code> product and the <code>libvirt</code> component. </p> - <ul><li><a href="">View libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20…">New libvirt ticket</a></li></ul> + <ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Virtua…">View libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20…">New libvirt ticket</a></li></ul> <h2>Linux Distribution specific bug reports</h2> <ul><li> If you are using official binaries from a <strong>Fedora distribution</strong>, enter tickets against the <code>Fedora</code> product and the <code>libvirt</code> component. - <ul><li><a href="">View Fedora libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&compon…">New Fedora libvirt ticket</a></li></ul></li><li> + <ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Fedora">View Fedora libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&compon…">New Fedora libvirt ticket</a></li></ul></li><li> If you are using official binaries from <strong>Red Hat Enterprise Linux distribution</strong>, tickets against the <code>Red Hat Enterprise Linux 5</code> product and the <code>libvirt</code> component. diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 0eb723a..df26c15 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -23,7 +23,7 @@ </p> <ul> - <li><a href="">View libvirt tickets</a></li> + <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Virtua…">View libvirt tickets</a></li> <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20…">New libvirt ticket</a></li> </ul> @@ -34,7 +34,7 @@ tickets against the <code>Fedora</code> product and the <code>libvirt</code> component. <ul> - <li><a href="">View Fedora libvirt tickets</a></li> + <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Fedora">View Fedora libvirt tickets</a></li> <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&compon…">New Fedora libvirt ticket</a></li> </ul> </li> -- 1.6.3.1

1 0

[libvirt] Is virConnectListDefinedDomains broken?
by Hongming Xiao 10 Jul '09

10 Jul '09

Hi, list, Recently, I upgraded my system to Xen 3.3.1 (from Xen 3.0.3). After this, I found that virConnectListDefinedDomains no longer works. The problem can be reproduced by executing "virsh list -all" - those defined but inactive domains are not be returned. Has libvirt API been tested against Xen 3.3.1? Can this problem be fixed by upgrading libvirt to version 0.6.5? What is the best approach to address this issue? Thanks in advance, Eddy OS: CentOS 5.3 Xen: kernel-xen.x86_64 2.6.18-128.1.14.el5 installed kmod-drbd83-xen.x86_64 8.3.0-3 installed xen.x86_64 3.3.1-0 installed xen-libs.x86_64 3.3.1-0 installed libvirt: libvirt.x86_64 0.4.4-3 installed libvirt-python.x86_64 0.4.4-3 installed python-virtinst.noarch 0.300.2-12.el5 installed virt-viewer.x86_64 0.0.2-2.el5 installed

2 1

[libvirt] sound does not work for me
by Gene Czarcinski 10 Jul '09

10 Jul '09

I must must be doing something wrong because all the messages, etc. I have found says that sound works for guests. I let the guest's virtual sound device default to ES1370. I have tried f11 32 bit, f11 64 bit, and win2k and sound just does not work for any of them. I tried this with F11 64 bit host (libvirt 0.6.2) and a different F11 64 bit host with preview packages installed (libvirt 0.6.5) ... sound works on each of the host system but does not work for an guests. With a F11 64 bit guest, the sound preference applet shows the output device os "null". Also, doing "lspci" shows NO sound device. OK, what is going on? Gene

2 2

[libvirt] fix two "make syntax-check" failures
by Jim Meyering 10 Jul '09

10 Jul '09

Mark McLoughlin pointed out this failure: ChangeLog-old: if (foo) free (foo) ChangeLog-old: if (foo != NULL) free (foo) maint.mk: found useless "if" before "free" above make: *** [sc_avoid_if_before_free] Error 1 Here's the other: --- po/POTFILES.in +++ po/POTFILES.in @@ -1,3 +1,4 @@ +cfg.mk qemud/qemud.c qemud/remote.c src/bridge.c maint.mk: you have changed the set of files with translatable diagnostics; apply the above patch I had fixed the latter in gnulib (now that main.mk comes from there), but had forgotten to tell libvirt to use the latest version of gnulib, in order to get that fix. To do that, I ran "git syncsub" (where syncsub is an alias: syncsub = submodule foreach git pull origin master) then git commit -a. Here are the two patches I'm about to push: >From bcf2aed1a91e66fee823e9063050c14bfc4ca29d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 9 Jul 2009 20:00:37 +0200 Subject: [PATCH 1/2] avoid a "make syntax-check" failure * .x-sc_avoid_if_before_free: Ignore *all* ChangeLog files, now, including ChangeLog-old. --- .x-sc_avoid_if_before_free | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/.x-sc_avoid_if_before_free b/.x-sc_avoid_if_before_free index 5093ef6..7e6ce62 100644 --- a/.x-sc_avoid_if_before_free +++ b/.x-sc_avoid_if_before_free @@ -1,5 +1 @@ -^gnulib/lib/getaddrinfo\.c$ -^gnulib/lib/printf-parse\.c$ -^gnulib/lib/vasnprintf\.c$ -^build-aux/useless-if-before-free$ -^ChangeLog$ +^ChangeLog -- 1.6.3.3.524.g8586b >From 72978b978991f106dc0e36b10a942d9040a1df00 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 9 Jul 2009 20:02:31 +0200 Subject: [PATCH 2/2] build: update from gnulib, for latest maint.mk * gnulib: Update submodule to latest. This fixes the make syntax-check failure whereby sc_po_check would complain about cfg.mk. --- .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 1203e8d..b653eda 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 1203e8d1f62dec3d2436dffadd5c20793cf84366 +Subproject commit b653eda3ac4864de205419d9f41eec267cb89eeb -- 1.6.3.3.524.g8586b

4 10

[libvirt] libvirt repositories mirrored on gitorious
by Daniel P. Berrange 10 Jul '09

10 Jul '09

FYI, I have created a libvirt project on gitorious which has a mirror of the master branch of the libvirt.git repository. This mirror is *readonly* and updated automatically every 15 minutes. The purpose of this mirror is to allow people to easily publish their personal libvirt working repos to the world. The master upstream repository for libvirt does not change, it will remain on http://libvirt.org/git The main project under which libvirt repos will be hosted is at this URL: http://gitorious.org/libvirt You'll see the master libvirt.git repository there, and if you look at the right hand side, you'll see myself & Mark have both got clones for our staging repos, and topic branches within those clones for various patchsets we're working on If you want to publish your own patches simply signup for gitorious, go to the libvirt repository http://gitorious.org/libvirt/libvirt and select the 'Clone this repository on gitorious' link. A short while later you'll have your own personal clone where you can publish work you are doing on libvirt. Use of this is by no means compulsory, and doesn't change how you should submit patches to libvirt. They should still all be emailed to this list for review. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] [PATCH] Use virDomainChrTypeFromString() instead of open coding
by Mark McLoughlin 10 Jul '09

10 Jul '09

* src/domain_conf.c: replace open coded chr type parsing with virDomainChrTypeFromString(), retaining the existing semantics where unknown types are silently mapped to the "null" type and "pty" is used if none is specified --- src/domain_conf.c | 29 ++++------------------------- 1 files changed, 4 insertions(+), 25 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 0407207..4056a86 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -1204,32 +1204,11 @@ virDomainChrDefParseXML(virConnectPtr conn, return NULL; } - def->type = VIR_DOMAIN_CHR_TYPE_PTY; type = virXMLPropString(node, "type"); - if (type != NULL) { - if (STREQ(type, "null")) - def->type = VIR_DOMAIN_CHR_TYPE_NULL; - else if (STREQ(type, "vc")) - def->type = VIR_DOMAIN_CHR_TYPE_VC; - else if (STREQ(type, "pty")) - def->type = VIR_DOMAIN_CHR_TYPE_PTY; - else if (STREQ(type, "dev")) - def->type = VIR_DOMAIN_CHR_TYPE_DEV; - else if (STREQ(type, "file")) - def->type = VIR_DOMAIN_CHR_TYPE_FILE; - else if (STREQ(type, "pipe")) - def->type = VIR_DOMAIN_CHR_TYPE_PIPE; - else if (STREQ(type, "stdio")) - def->type = VIR_DOMAIN_CHR_TYPE_STDIO; - else if (STREQ(type, "udp")) - def->type = VIR_DOMAIN_CHR_TYPE_UDP; - else if (STREQ(type, "tcp")) - def->type = VIR_DOMAIN_CHR_TYPE_TCP; - else if (STREQ(type, "unix")) - def->type = VIR_DOMAIN_CHR_TYPE_UNIX; - else - def->type = VIR_DOMAIN_CHR_TYPE_NULL; - } + if (type == NULL) + def->type = VIR_DOMAIN_CHR_TYPE_PTY; + else if ((def->type = virDomainChrTypeFromString(type)) < 0) + def->type = VIR_DOMAIN_CHR_TYPE_NULL; cur = node->children; while (cur != NULL) { -- 1.6.2.5

2 1