June 2009 - Devel - libvirt List Archives

Re: [libvirt] virsh hangs
by Garry Dolley 24 Jun '09

24 Jun '09

On Tue, Jun 23, 2009 at 04:08:25PM -0300, Itamar Reis Peixoto wrote: > why you don't try Fedora 11 > > it's have newer versions of libvirt and KVM > > and if you have problem's you can report a bug or talk with developers using IRC Why don't I use Fedora? Let's not go there... ;) -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

1 0

[libvirt] [RFC][PATCH] lxc: drop CAP_SYS_BOOT capability to prevent rebooting from inside containers
by Ryota Ozaki 23 Jun '09

23 Jun '09

Hi, Current lxc driver unexpectedly allows users inside containers to reboot host physical machine. This patch prevents this by dropping CAP_SYS_BOOT capability in the bounding set of the init processes in every containers. Note that the patch intends to make it easy to add further capabilities to drop if needed, although I'm not sure which capabilities should be dropped. (We might need to drop CAP_SETFCAP as well to be strict...) Thanks, ozaki-r Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> >From 0e7a7622bc6411bbe76c05c63c6e6e61d379d97b Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Fri, 8 May 2009 04:29:24 +0900 Subject: [PATCH] lxc: drop CAP_SYS_BOOT capability to prevent rebooting from inside containers Current lxc driver unexpectedly allows users inside containers to reboot host physical machine. This patch prevents this by dropping CAP_SYS_BOOT capability in the bounding set of the init processes in every containers. --- src/lxc_container.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/lxc_container.c b/src/lxc_container.c index 3946b84..37ab216 100644 --- a/src/lxc_container.c +++ b/src/lxc_container.c @@ -32,6 +32,8 @@ #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/wait.h> +#include <sys/prctl.h> +#include <sys/capability.h> #include <unistd.h> #include <mntent.h> @@ -639,6 +641,30 @@ static int lxcContainerSetupMounts(virDomainDefPtr vmDef, return lxcContainerSetupExtraMounts(vmDef); } + +static int lxcContainerDropCapabilities( virDomainDefPtr vmDef ) +{ + int i; + const struct { + int id; + const char *name; + } caps[] = { +#define ID_STRING(name) name, #name + { ID_STRING(CAP_SYS_BOOT) }, + }; + + for (i = 0 ; i < ARRAY_CARDINALITY(caps) ; i++) { + if (prctl(PR_CAPBSET_DROP, caps[i].id, 0, 0, 0)) { + lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("failed to drop %s"), caps[i].name); + return -1; + } + } + + return 0; +} + + /** * lxcChild: * @argv: Pointer to container arguments @@ -705,6 +731,10 @@ static int lxcContainerChild( void *data ) if (lxcContainerEnableInterfaces(argv->nveths, argv->veths) < 0) return -1; + /* drop a set of root capabilities */ + if (lxcContainerDropCapabilities(vmDef) < 0) + return -1; + /* this function will only return if an error occured */ return lxcContainerExecInit(vmDef); } -- 1.6.0.6

6 15

[libvirt] [PATCH] Avoid unecessary SELinux setfilecon
by Daniel Veillard 23 Jun '09

23 Jun '09

As pointed by Tim Waugh in https://bugzilla.redhat.com/show_bug.cgi?id=507555 there are times where setting an SELinux file context is not possible, so if the context is already set appropriately the operation should be skipped Patch from Tim looks fine by me though I'm not versed in SELinux Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] Do a correct format mapping of partitions
by Henrik Persson E 23 Jun '09

23 Jun '09

This patch reads the partition type and sets the correct target format of the storage volume when based on physical disk. --- libvirt-0.6.4.org/src/parthelper.c 2008-09-02 11:24:21.000000000 +0200 +++ libvirt-0.6.4/src/parthelper.c 2009-06-22 16:29:49.108681000 +0200 @@ -67,6 +67,7 @@ while (part) { const char *type; const char *content; + int partType = 0; if (part->type & PED_PARTITION_LOGICAL) { type = "logical"; if (part->type & PED_PARTITION_FREESPACE) @@ -92,26 +93,35 @@ content = "data"; } + /* Get partition type */ + if(ped_partition_is_active(part)) { + if(ped_partition_is_flag_available(part, PED_PARTITION_TYPE)) { + partType = ped_partition_get_flag(part,PED_PARTITION_TYPE); + } + } + /* We do +1 on geom.end, because we want end of the last sector * in bytes, not the last sector number */ if (part->num != -1) { - printf("%s%d%c%s%c%s%c%llu%c%llu%c%llu%c", + printf("%s%d%c%s%c%s%c%llu%c%llu%c%llu%c%d%c", part->geom.dev->path, part->num, '\0', type, '\0', content, '\0', part->geom.start * 512llu, '\0', (part->geom.end + 1 ) * 512llu, '\0', - part->geom.length * 512llu, '\0'); + part->geom.length * 512llu, '\0', + partType, '\0'); } else { - printf("%s%c%s%c%s%c%llu%c%llu%c%llu%c", + printf("%s%c%s%c%s%c%llu%c%llu%c%llu%c%d%c", "-", '\0', type, '\0', content, '\0', part->geom.start * 512llu, '\0', (part->geom.end + 1 ) * 512llu, '\0', - part->geom.length * 512llu, '\0'); + part->geom.length * 512llu, '\0', + partType, '\0'); } part = ped_disk_next_partition(disk, part); } --- libvirt-0.6.4.org/src/storage_backend_disk.c 2009-04-02 11:50:10.000000000 +0200 +++ libvirt-0.6.4/src/storage_backend_disk.c 2009-06-22 18:25:14.095095000 +0200 @@ -36,6 +36,35 @@ #define PARTHELPER BINDIR "/libvirt_parthelper" +/* Map partition types to internal enum */ +static int +virStorageBackendDiskMapPartitionType(const char* partType) +{ + switch(atoi(partType)) { + case 0x05: + case 0x0f: + return VIR_STORAGE_VOL_DISK_EXTENDED; + case 0x06: + case 0x0e: + return VIR_STORAGE_VOL_DISK_FAT16; + case 0x0b: + case 0x0c: + return VIR_STORAGE_VOL_DISK_FAT32; + case 0x82: + return VIR_STORAGE_VOL_DISK_LINUX_SWAP; + case 0x83: + return VIR_STORAGE_VOL_DISK_LINUX; + case 0x8e: + return VIR_STORAGE_VOL_DISK_LINUX_LVM; + case 0xfd: + return VIR_STORAGE_VOL_DISK_LINUX_RAID; + default: + return VIR_STORAGE_VOL_DISK_NONE; + + } +} + + static int virStorageBackendDiskMakeDataVol(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -128,6 +157,9 @@ if (virStorageBackendUpdateVolInfo(conn, vol, 1) < 0) return -1; + /* virStorageBackendUpdateVolInfo sets format incorrect for partitions */ + vol->target.format = virStorageBackendDiskMapPartitionType(groups[6]); + vol->type = VIR_STORAGE_VOL_BLOCK; /* The above gets allocation wrong for @@ -250,7 +282,7 @@ return virStorageBackendRunProgNul(conn, pool, prog, - 6, + 7, virStorageBackendDiskMakeVol, vol); }

2 1

[libvirt] virsh -no-kvm problem on debian install
by ChaosMedia > WebDev 23 Jun '09

23 Jun '09

Hi, i've installed lastest kvm-86 and libvirt-0.6.4 tarballs on my debian stable and have a problem using virsh No matter what i do in the guest domain config or with /usr/bin/ symlinks, libvirt keeps using the -no-kvm option when starting guests when my cpu has kvm-amd support, modules are loaded and /dev/kvm exists, and starting the guests thru command line works fine, and faster. debian seems to install the following binary /usr/bin/qemu-system-x86_64, i had to add "/usr/bin/qemu" to get virsh to work, otherwise it will say it can't connect to qemu:///system here's some command output : #virsh -c qemu:///system capabilities <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> <migration_features> <live/> <uri_transports> <uri_transport>tcp</uri_transport> </uri_transports> </migration_features> </host> <guest> <os_type>hvm</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> </arch> <features> <pae/> <nonpae/> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> </arch> <features> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> </capabilities> and tried adding "/usr/bin/qemu-kvm" symlink <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> <migration_features> <live/> <uri_transports> <uri_transport>tcp</uri_transport> </uri_transports> </migration_features> </host> <guest> <os_type>hvm</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> </domain> </arch> <features> <pae/> <nonpae/> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> </domain> </arch> <features> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> </capabilities> So far i had no luck getting virsh to use kvm, it always adds the -no-kvm option, i'm not sure how to specify the domain type in the guest config, using the <emulator>/usr/bin/qemu-kvm</emulator> won't help. i've found that thread discussing the binaries and options but don't know if that patch was already added or if i have to patch my tarball.. http://www.redhat.com/archives/libvir-list/2009-March/msg00281.html please let me know if there's some way to let libvirt know that kvm exists on a debian install, using /usr/bin/qemu-system-x86_64 thx, Marc

2 2

[libvirt] [RFC] Reporting host interface status/statistics via netcf/libvirt, and listing active vs. inactive interfaces
by Laine Stump 23 Jun '09

23 Jun '09

I've already been working on incorporating physical host interface configuration into libvirt by way of using libnetcf on the backend. It's becoming apparent that, in addition to modifying and reporting the current configuration of interfaces, libvirt users also want to query current status of each interface (up/down, possibly other flags, packet/byte/error counts, current IP address, etc). There are two possible ways of doing this: 1) maintain libnetcf's focus on just interface configuration, and add code directly into libvirt to grab this information via appropriate ioctls or 2) add the functionality to libnetcf, and have libvirt call the new libnetcf API. (2) seems to make the most sense, because likely other libnetcf consumers will want this capability too. I'm thinking of a single API, something like: int netcf_if_status(netcf_if *, netcf_if_stats *); (or maybe int netcf_if_info(netcf_if *, netcf_if_info *)) I haven't really put much thought into the details of what should be in netcf_if_stats yet (beyond what I listed above), but wanted to get this idea out there so people can start sounding off (if I'm going down the wrong road, I'd rather be put on the right path before I get too far along!) This function could be exposed in the libvirt API as something like: int virInterfaceStatus|Info(virInterffacePtr iface, virInterfaceStats|Info *info); Any comments/ideas on this? (One possible complication I can see is interfaces with multiple associated IPs. On some platforms, each interface can have only a single IPv4 and a single IPv6 address (more IPs == more interfaces), but on others there can be multiples.) A (kind of) separate issue: In libvirt we want to be able to list active (up) and inactive (down) interfaces separately. For consistency, libvirt's way of exposing that will be to mimic what is done with virConnectListNetworks() (active) vs. virConnectListDefinedNetworks() (inactive). But netcf could do it with an extra argument to ncf_list_interfaces(). If the latter, should the default behavior be to list all interfaces, with flags set to eliminate up or down interfaces? 0 (list all) NETCF_NOLIST_UP NETCF_NOLIST_DOWN Or should the values be something like this: 0 (list all) NETCF_LIST_UP_ONLY NETCF_LIST_DOWN_ONLY (UP_ONLY + DOWN_ONLY would be equivalent to 0. As long as nobody came up with a good reason for "0". So should we do one of those, or should we mimic libirt's virNetwork API in libnetcf too?

5 55

[libvirt] [PATCH] Refactor storage XML parsing to be consistent with domain/network conf.
by Cole Robinson 23 Jun '09

23 Jun '09

The storage driver arranges its parsing routines in a way that make them difficult to use in the test driver for non-default file parsing. This refactoring moves things to be consistent with the way domain_conf and network_conf do things. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/libvirt_private.syms | 8 ++- src/storage_conf.c | 163 ++++++++++++++++++++++++++++++++-------------- src/storage_conf.h | 26 ++++++-- src/storage_driver.c | 8 +- src/test.c | 25 ++----- 5 files changed, 150 insertions(+), 80 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f63fa05..309d7f9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -267,7 +267,9 @@ virSecurityDriverGetModel; # storage_conf.h virStoragePoolDefFormat; virStoragePoolDefFree; -virStoragePoolDefParse; +virStoragePoolDefParseString; +virStoragePoolDefParseFile; +virStoragePoolDefParseNode; virStoragePoolLoadAllConfigs; virStoragePoolObjAssignDef; virStoragePoolObjClearVols; @@ -284,7 +286,9 @@ virStorageVolDefFindByName; virStorageVolDefFindByPath; virStorageVolDefFormat; virStorageVolDefFree; -virStorageVolDefParse; +virStorageVolDefParseFile; +virStorageVolDefParseString; +virStorageVolDefParseNode; virStoragePoolFormatDiskTypeToString; virStoragePoolFormatFileSystemTypeToString; virStoragePoolFormatFileSystemNetTypeToString; diff --git a/src/storage_conf.c b/src/storage_conf.c index 5f724dc..7d495ec 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -452,14 +452,12 @@ error: return ret; } - static virStoragePoolDefPtr -virStoragePoolDefParseDoc(virConnectPtr conn, - xmlXPathContextPtr ctxt, - xmlNodePtr root) { +virStoragePoolDefParseXML(virConnectPtr conn, + xmlXPathContextPtr ctxt) { virStoragePoolOptionsPtr options; virStoragePoolDefPtr ret; - xmlChar *type = NULL; + char *type = NULL; char *uuid = NULL; char *authType = NULL; @@ -468,13 +466,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, return NULL; } - if (STRNEQ((const char *)root->name, "pool")) { - virStorageReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("unknown root element for storage pool")); - goto cleanup; - } - - type = xmlGetProp(root, BAD_CAST "type"); + type = virXPathString(conn, "string(./@type)", ctxt); if ((ret->type = virStoragePoolTypeFromString((const char *)type)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, _("unknown storage pool type %s"), (const char*)type); @@ -656,6 +648,32 @@ catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) } virStoragePoolDefPtr +virStoragePoolDefParseNode(virConnectPtr conn, + xmlDocPtr xml, + xmlNodePtr root) { + xmlXPathContextPtr ctxt = NULL; + virStoragePoolDefPtr def = NULL; + + if (STRNEQ((const char *)root->name, "pool")) { + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("unknown root element for storage pool")); + goto cleanup; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virReportOOMError(conn); + goto cleanup; + } + + ctxt->node = root; + def = virStoragePoolDefParseXML(conn, ctxt); +cleanup: + xmlXPathFreeContext(ctxt); + return def; +} + +static virStoragePoolDefPtr virStoragePoolDefParse(virConnectPtr conn, const char *xmlStr, const char *filename) { @@ -663,7 +681,6 @@ virStoragePoolDefParse(virConnectPtr conn, xmlParserCtxtPtr pctxt; xmlDocPtr xml = NULL; xmlNodePtr node = NULL; - xmlXPathContextPtr ctxt = NULL; /* Set up a parser context so we can catch the details of XML errors. */ pctxt = xmlNewParserCtxt (); @@ -673,10 +690,17 @@ virStoragePoolDefParse(virConnectPtr conn, pctxt->_private = conn; if (conn) virResetError (&conn->err); - xml = xmlCtxtReadDoc (pctxt, BAD_CAST xmlStr, - filename ? filename : "storage.xml", NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOWARNING); + if (filename) { + xml = xmlCtxtReadFile (pctxt, filename, NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + } else { + xml = xmlCtxtReadDoc (pctxt, BAD_CAST xmlStr, + "storage.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + } + if (!xml) { if (conn && conn->err.code == VIR_ERR_NONE) virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -684,12 +708,6 @@ virStoragePoolDefParse(virConnectPtr conn, goto cleanup; } - ctxt = xmlXPathNewContext(xml); - if (ctxt == NULL) { - virReportOOMError(conn); - goto cleanup; - } - node = xmlDocGetRootElement(xml); if (node == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -697,21 +715,33 @@ virStoragePoolDefParse(virConnectPtr conn, goto cleanup; } - ret = virStoragePoolDefParseDoc(conn, ctxt, node); + ret = virStoragePoolDefParseNode(conn, xml, node); xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); return ret; cleanup: xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); return NULL; } +virStoragePoolDefPtr +virStoragePoolDefParseString(virConnectPtr conn, + const char *xmlStr) +{ + return virStoragePoolDefParse(conn, xmlStr, NULL); +} + +virStoragePoolDefPtr +virStoragePoolDefParseFile(virConnectPtr conn, + const char *filename) +{ + return virStoragePoolDefParse(conn, NULL, filename); +} + static int virStoragePoolSourceFormat(virConnectPtr conn, virBufferPtr buf, @@ -916,10 +946,9 @@ virStorageSize(virConnectPtr conn, } static virStorageVolDefPtr -virStorageVolDefParseDoc(virConnectPtr conn, +virStorageVolDefParseXML(virConnectPtr conn, virStoragePoolDefPtr pool, - xmlXPathContextPtr ctxt, - xmlNodePtr root) { + xmlXPathContextPtr ctxt) { virStorageVolDefPtr ret; virStorageVolOptionsPtr options; char *allocation = NULL; @@ -935,12 +964,6 @@ virStorageVolDefParseDoc(virConnectPtr conn, return NULL; } - if (STRNEQ((const char *)root->name, "volume")) { - virStorageReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("unknown root element")); - goto cleanup; - } - ret->name = virXPathString(conn, "string(/volume/name)", ctxt); if (ret->name == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -1028,8 +1051,34 @@ virStorageVolDefParseDoc(virConnectPtr conn, return NULL; } - virStorageVolDefPtr +virStorageVolDefParseNode(virConnectPtr conn, + virStoragePoolDefPtr pool, + xmlDocPtr xml, + xmlNodePtr root) { + xmlXPathContextPtr ctxt = NULL; + virStorageVolDefPtr def = NULL; + + if (STRNEQ((const char *)root->name, "volume")) { + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("unknown root element for storage vol")); + goto cleanup; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virReportOOMError(conn); + goto cleanup; + } + + ctxt->node = root; + def = virStorageVolDefParseXML(conn, pool, ctxt); +cleanup: + xmlXPathFreeContext(ctxt); + return def; +} + +static virStorageVolDefPtr virStorageVolDefParse(virConnectPtr conn, virStoragePoolDefPtr pool, const char *xmlStr, @@ -1038,7 +1087,6 @@ virStorageVolDefParse(virConnectPtr conn, xmlParserCtxtPtr pctxt; xmlDocPtr xml = NULL; xmlNodePtr node = NULL; - xmlXPathContextPtr ctxt = NULL; /* Set up a parser context so we can catch the details of XML errors. */ pctxt = xmlNewParserCtxt (); @@ -1048,10 +1096,18 @@ virStorageVolDefParse(virConnectPtr conn, pctxt->_private = conn; if (conn) virResetError (&conn->err); - xml = xmlCtxtReadDoc (pctxt, BAD_CAST xmlStr, - filename ? filename : "storage.xml", NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOWARNING); + + if (filename) { + xml = xmlCtxtReadFile (pctxt, filename, NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + } else { + xml = xmlCtxtReadDoc (pctxt, BAD_CAST xmlStr, + "storage.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + } + if (!xml) { if (conn && conn->err.code == VIR_ERR_NONE) virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -1059,12 +1115,6 @@ virStorageVolDefParse(virConnectPtr conn, goto cleanup; } - ctxt = xmlXPathNewContext(xml); - if (ctxt == NULL) { - virReportOOMError(conn); - goto cleanup; - } - node = xmlDocGetRootElement(xml); if (node == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -1072,21 +1122,34 @@ virStorageVolDefParse(virConnectPtr conn, goto cleanup; } - ret = virStorageVolDefParseDoc(conn, pool, ctxt, node); + ret = virStorageVolDefParseNode(conn, pool, xml, node); xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); return ret; cleanup: xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); return NULL; } +virStorageVolDefPtr +virStorageVolDefParseString(virConnectPtr conn, + virStoragePoolDefPtr pool, + const char *xmlStr) +{ + return virStorageVolDefParse(conn, pool, xmlStr, NULL); +} + +virStorageVolDefPtr +virStorageVolDefParseFile(virConnectPtr conn, + virStoragePoolDefPtr pool, + const char *filename) +{ + return virStorageVolDefParse(conn, pool, NULL, filename); +} static int virStorageVolTargetDefFormat(virConnectPtr conn, diff --git a/src/storage_conf.h b/src/storage_conf.h index 8a4fed2..a2a164e 100644 --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -28,6 +28,8 @@ #include "util.h" #include "threads.h" +#include <libxml/tree.h> + /* Shared structs */ @@ -306,16 +308,26 @@ virStorageVolDefPtr virStorageVolDefFindByName(virStoragePoolObjPtr pool, void virStoragePoolObjClearVols(virStoragePoolObjPtr pool); -virStoragePoolDefPtr virStoragePoolDefParse(virConnectPtr conn, - const char *xml, - const char *filename); +virStoragePoolDefPtr virStoragePoolDefParseString(virConnectPtr conn, + const char *xml); +virStoragePoolDefPtr virStoragePoolDefParseFile(virConnectPtr conn, + const char *filename); +virStoragePoolDefPtr virStoragePoolDefParseNode(virConnectPtr conn, + xmlDocPtr xml, + xmlNodePtr root); char *virStoragePoolDefFormat(virConnectPtr conn, virStoragePoolDefPtr def); -virStorageVolDefPtr virStorageVolDefParse(virConnectPtr conn, - virStoragePoolDefPtr pool, - const char *xml, - const char *filename); +virStorageVolDefPtr virStorageVolDefParseString(virConnectPtr conn, + virStoragePoolDefPtr pool, + const char *xml); +virStorageVolDefPtr virStorageVolDefParseFile(virConnectPtr conn, + virStoragePoolDefPtr pool, + const char *filename); +virStorageVolDefPtr virStorageVolDefParseNode(virConnectPtr conn, + virStoragePoolDefPtr pool, + xmlDocPtr xml, + xmlNodePtr root); char *virStorageVolDefFormat(virConnectPtr conn, virStoragePoolDefPtr pool, virStorageVolDefPtr def); diff --git a/src/storage_driver.c b/src/storage_driver.c index 5a248a3..5fe22c6 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -466,7 +466,7 @@ storagePoolCreate(virConnectPtr conn, virStorageBackendPtr backend; storageDriverLock(driver); - if (!(def = virStoragePoolDefParse(conn, xml, NULL))) + if (!(def = virStoragePoolDefParseString(conn, xml))) goto cleanup; pool = virStoragePoolObjFindByUUID(&driver->pools, def->uuid); @@ -518,7 +518,7 @@ storagePoolDefine(virConnectPtr conn, virStorageBackendPtr backend; storageDriverLock(driver); - if (!(def = virStoragePoolDefParse(conn, xml, NULL))) + if (!(def = virStoragePoolDefParseString(conn, xml))) goto cleanup; if ((backend = virStorageBackendForType(def->type)) == NULL) @@ -1220,7 +1220,7 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if ((backend = virStorageBackendForType(pool->def->type)) == NULL) goto cleanup; - voldef = virStorageVolDefParse(obj->conn, pool->def, xmldesc, NULL); + voldef = virStorageVolDefParseString(obj->conn, pool->def, xmldesc); if (voldef == NULL) goto cleanup; @@ -1362,7 +1362,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } - newvol = virStorageVolDefParse(obj->conn, pool->def, xmldesc, NULL); + newvol = virStorageVolDefParseString(obj->conn, pool->def, xmldesc); if (newvol == NULL) goto cleanup; diff --git a/src/test.c b/src/test.c index 2a672a3..6874d63 100644 --- a/src/test.c +++ b/src/test.c @@ -286,7 +286,7 @@ static int testOpenDefault(virConnectPtr conn) { netobj->persistent = 1; virNetworkObjUnlock(netobj); - if (!(pooldef = virStoragePoolDefParse(conn, defaultPoolXML, NULL))) + if (!(pooldef = virStoragePoolDefParseString(conn, defaultPoolXML))) goto error; if (!(poolobj = virStoragePoolObjAssignDef(conn, &privconn->pools, @@ -564,22 +564,13 @@ static int testOpenFromFile(virConnectPtr conn, goto error; } - def = virStoragePoolDefParse(conn, NULL, absFile); + def = virStoragePoolDefParseFile(conn, absFile); VIR_FREE(absFile); if (!def) goto error; } else { - xmlBufferPtr buf; - xmlSaveCtxtPtr sctxt; - - buf = xmlBufferCreate(); - sctxt = xmlSaveToBuffer(buf, NULL, 0); - xmlSaveTree(sctxt, pools[i]); - xmlSaveClose(sctxt); - if ((def = virStoragePoolDefParse(conn, - (const char *) buf->content, - NULL)) == NULL) { - xmlBufferFree(buf); + if ((def = virStoragePoolDefParseNode(conn, xml, + pools[i])) == NULL) { goto error; } } @@ -2514,7 +2505,7 @@ testStoragePoolCreate(virConnectPtr conn, virStoragePoolPtr ret = NULL; testDriverLock(privconn); - if (!(def = virStoragePoolDefParse(conn, xml, NULL))) + if (!(def = virStoragePoolDefParseString(conn, xml))) goto cleanup; pool = virStoragePoolObjFindByUUID(&privconn->pools, def->uuid); @@ -2557,7 +2548,7 @@ testStoragePoolDefine(virConnectPtr conn, virStoragePoolPtr ret = NULL; testDriverLock(privconn); - if (!(def = virStoragePoolDefParse(conn, xml, NULL))) + if (!(def = virStoragePoolDefParseString(conn, xml))) goto cleanup; def->capacity = defaultPoolCap; @@ -3082,7 +3073,7 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool, goto cleanup; } - privvol = virStorageVolDefParse(pool->conn, privpool->def, xmldesc, NULL); + privvol = virStorageVolDefParseString(pool->conn, privpool->def, xmldesc); if (privvol == NULL) goto cleanup; @@ -3163,7 +3154,7 @@ testStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } - privvol = virStorageVolDefParse(pool->conn, privpool->def, xmldesc, NULL); + privvol = virStorageVolDefParseString(pool->conn, privpool->def, xmldesc); if (privvol == NULL) goto cleanup; -- 1.6.3.2

2 3

[libvirt] [PATCH] Fix raw storage volume creation for allocation < capacity.
by Cole Robinson 23 Jun '09

23 Jun '09

CreateXMLFrom changes accidentally caused all raw volume creation to be fully allocated (as though allocation == capacity). Fix this. Also force CreateXMLFrom to maintain the previous behavior: sparseness should still be maintained since we search for holes when copying, and the clone behavior hasn't been tested with anything but the broken behavior. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/storage_backend_fs.c | 2 +- src/storage_driver.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index 0e93e54..c3d66b5 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -1047,7 +1047,7 @@ static int createRaw(virConnectPtr conn, goto cleanup; } - remain = vol->capacity; + remain = vol->allocation; if (inputfd != -1) { int amtread = -1; diff --git a/src/storage_driver.c b/src/storage_driver.c index 71e64a4..57a93c1 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -1377,6 +1377,11 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, if (newvol->capacity < origvol->capacity) newvol->capacity = origvol->capacity; + /* Make sure allocation is at least as large as the destination cap, + * to make absolutely sure we copy all possible contents */ + if (newvol->allocation < origvol->capacity; + newvol->allocation = origvol->capacity; + if (!backend->buildVolFrom) { virStorageReportError(obj->conn, VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support volume creation from an existing volume")); -- 1.6.0.6

3 4

[libvirt] Storage volume issues when creating an LVM or RAID partition
by Henrik Persson E 22 Jun '09

22 Jun '09

Hi everyone, I have currently some patches coming up for storage pools and volumes based on physical disks. However I have an issue that I would like to hear your opinion about. When it comes to storage pools and volumes based on physical disks, the name given does not really have any real meaning, the underlying disk/partition will at the end decide the name of the pool/volume (as soon as a refresh on the pool is made, the user defined names will be gone). This is quite confusion but at the end it still works. But there are cases where it does not work. To be able to create a partition type such as LVM or raid, parted (which is used as the disk management backend) does not support setting this partition type when creating the partition but instead by setting a flag on the partition after it has been created. As it is not possible to decide at which position in the partition table the new partition should be created, parted will just choose the next available number. To be able to set this flag on the partition, we need to know which partition we just created, and suddenly the name of the volume is important, but only if it has followed the rules that parted applied when finding the next available slot. If the name of the volume is incorrect we will end up with a volume created with incorrect type since we can't do 2 operation towards parted in a transaction manner (e.g. Volume name is sdb2 but the newly created partition is sdb1). I see two possible solutions on this problem: 1. We add volume name constraints in this case that makes sure that when a volume is created by a user (by checking the pool and scan all ready existing volumes in that pool), it has to create a name that is correct according to parted's rules. In that case we can use the volume name to find the partition just created and we can set the flag on the partition in a safe way 2. we extend the libvirt_parthelper and uses the libparted instead to create a partition, which then can be made in a more transaction like manner. However, in this case we have to more or less add all the support that parted has for creating a partition which is quite extensive. I put my vote on solution 1 but I like to know your opinion and also if any one knows that the initial plans were. /Henrik

1 0

[libvirt] Extend virConfParser to allow parsing VMware VMX config files
by Matthias Bolte 22 Jun '09

22 Jun '09

Hi, As part of the VMware ESX driver I need to parse VMware VMX config files. This files have basically the same syntax as Xen config files, but the key part of the key=value format is allowed to contain ':' and '.'. The attached patch adds a flag to the virConfParser to enabled a VMX mode for the parser to allow ':' and '.' in the key, as suggested by Daniel P. Berrange on IRC. Regards Matthias

3 5

[libvirt] [PATCH] Cleanup when Storage Pool Create fails.
by Henrik Persson E 22 Jun '09

22 Jun '09

When libvirt fails to create a storage pool (e.g. a disk pool does not have a partition table), the failed storage pool is not cleaned up correctly and is not possible to re-create the pool again. This attached patch addresses this problem. /Henrik

3 2

[libvirt] netbsd5.0
by Fabien Georget 22 Jun '09

22 Jun '09

Hi I want to run netbsd 5.0 with kvm in virt-manager. It works with default option but any network devices is recognized by the netbsd kernel. To enable network with qemu-kvm, we had to disable the acpi and add other options like -tdf, -localtime ... This is an an example who works : http://ghantoos.org/2009/05/12/my-first-shot-of-netbsd/ (An explanation I found is that the new scheduler in netbsd 5.0 cause some problems with virtualization based on VT) Currently, I have not found the way to do it with libvirt (and I don't think it is possible with virt-manager). It be very helpeful if these features can be add to libvirt. Thanks Fabien Georget

2 2

[libvirt] problems with remote authentication with policykit
by Jim Paris 22 Jun '09

22 Jun '09

Hi, I have libvirt 0.6.4 running kvm instances on a headless server. I'm using virt-manager 0.7.0 to manage them. In the past, I would SSH in and run virt-manager as root. Since running GTK apps as root is no good, I've switched to policykit authentication. By default, the libvirt policy only allows management if the user is in the active host session, which isn't the case with my SSH logins. Therefore I've added an override in /etc/PolicyKit/PolicyKit.conf: <match action="org.libvirt.unix.manage"> <return result="auth_admin_keep_session"/> </match> Now things generally work fine when SSHed in: - as root, virsh gives ro and rw access with no password - as jim, virsh gives ro access with no password, but requests a password for rw - as jim, virsh asks for a password for rw access But when accessing remotely, I get no useful error, and a hang: $ virsh -c qemu+ssh://jim@server/system libvir: Remote error : authentication failed <process hangs here> $ virsh --readonly -c qemu+ssh://jim@server/system libvir: Remote error : authentication failed <process hangs here> Furthermore, on the server, this leaves "nc" processes running, and eventually there are enough that libvirtd stops accepting new connections. I was also getting strange errors including: polkit-grant-helper: given auth type (8 -> yes) is bogus but now I can't reproduce that for the life of me, I have no idea what changed. Is policykit authentication supposed to work over qemu+ssh? I was hoping it would at least not break the --readonly case. -jim

3 11

[libvirt] netbsd5.0
by Fabien Georget 22 Jun '09

22 Jun '09

Hi I want to run netbsd 5.0 with kvm in virt-manager. It works with default option but any network devices is recognized by the netbsd kernel. To enable network with qemu-kvm, we had to disable the acpi and add other options like -tdf, -localtime ... This is an an example who works : http://ghantoos.org/2009/05/12/my-first-shot-of-netbsd/ (An explanation I found is that the new scheduler in netbsd 5.0 cause some problems with virtualization based on VT) Currently, I have not found the way to do it with libvirt (and I don't think it is possible with virt-manager). It be very helpeful if these features can be add to libvirt. Thanks Fabien Georget

1 0

[libvirt] [PATCH] Activate virtual networks initialized in custom test driver.
by Cole Robinson 20 Jun '09

20 Jun '09

If specifying a custom test driver, virtual networks were not 'activated' on driver init. This differs from the behavior of domains and storage pools, so fix it. Also improve a couple error messages in that area. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/test.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test.c b/src/test.c index 1661144..6f07462 100644 --- a/src/test.c +++ b/src/test.c @@ -462,7 +462,8 @@ static int testOpenFromFile(virConnectPtr conn, if (!(xml = xmlReadFd(fd, file, NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { - testError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("host")); + testError(NULL, VIR_ERR_INTERNAL_ERROR, + _("Invalid XML in file '%s'"), file); goto error; } close(fd); @@ -470,7 +471,8 @@ static int testOpenFromFile(virConnectPtr conn, root = xmlDocGetRootElement(xml); if ((root == NULL) || (!xmlStrEqual(root->name, BAD_CAST "node"))) { - testError(NULL, VIR_ERR_XML_ERROR, "%s", _("node")); + testError(NULL, VIR_ERR_XML_ERROR, "%s", + _("Root element is not 'node'")); goto error; } @@ -622,6 +624,7 @@ static int testOpenFromFile(virConnectPtr conn, goto error; } net->persistent = 1; + net->active = 1; virNetworkObjUnlock(net); } VIR_FREE(networks); -- 1.6.3.2

2 1

[libvirt] [PATCH] Fix storage handling for custom test driver.
by Cole Robinson 20 Jun '09

20 Jun '09

If using a custom test driver, storage pool file parsing was broken, and storage volume parsing was never implemented. Fix these issues, and add some examples in docs/ Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/testnode.xml | 3 ++ docs/testpool.xml | 15 +++++++++ docs/testvol.xml | 6 +++ src/test.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 0 deletions(-) create mode 100644 docs/testpool.xml create mode 100644 docs/testvol.xml diff --git a/docs/testnode.xml b/docs/testnode.xml index be7121d..1ad7a10 100644 --- a/docs/testnode.xml +++ b/docs/testnode.xml @@ -11,6 +11,9 @@ <domain file="testdomfc4.xml"/> <network file="testnetpriv.xml"/> <network file="testnetdef.xml"/> + <pool file="testpool.xml"> + <volume file="testvol.xml"/> + </pool> <cpu> <mhz>6000</mhz> diff --git a/docs/testpool.xml b/docs/testpool.xml new file mode 100644 index 0000000..c1a8dff --- /dev/null +++ b/docs/testpool.xml @@ -0,0 +1,15 @@ +<pool type='dir'> + <name>default-pool</name> + <uuid>35bb2ad9-388a-cdfe-461a-b8907f6e53fe</uuid> + <capacity>107374182400</capacity> + <allocation>0</allocation> + <available>107374182400</available> + <target> + <path>/default-pool</path> + <permissions> + <mode>0700</mode> + <owner>10736</owner> + <group>10736</group> + </permissions> + </target> +</pool> diff --git a/docs/testvol.xml b/docs/testvol.xml new file mode 100644 index 0000000..00198f8 --- /dev/null +++ b/docs/testvol.xml @@ -0,0 +1,6 @@ +<volume> + <name>default-vol</name> + <capacity>1000000</capacity> + <allocation>50000</allocation> + <target/> +</volume> diff --git a/src/test.c b/src/test.c index 6874d63..1661144 100644 --- a/src/test.c +++ b/src/test.c @@ -341,6 +341,87 @@ static char *testBuildFilename(const char *relativeTo, } } +static int testOpenVolumesForPool(virConnectPtr conn, + xmlDocPtr xml, + xmlXPathContextPtr ctxt, + const char *file, + virStoragePoolObjPtr pool, + int poolidx) { + char *vol_xpath; + int i, ret, func_ret = -1; + xmlNodePtr *vols = NULL; + virStorageVolDefPtr def; + + /* Find storage volumes */ + if (virAsprintf(&vol_xpath, "/node/pool[%d]/volume", poolidx) < 0) { + virReportOOMError(NULL); + goto error; + } + + ret = virXPathNodeSet(conn, vol_xpath, ctxt, &vols); + VIR_FREE(vol_xpath); + if (ret < 0) { + testError(NULL, VIR_ERR_XML_ERROR, + _("node vol list for pool '%s'"), pool->def->name); + goto error; + } + + for (i = 0 ; i < ret ; i++) { + char *relFile = virXMLPropString(vols[i], "file"); + if (relFile != NULL) { + char *absFile = testBuildFilename(file, relFile); + VIR_FREE(relFile); + if (!absFile) { + testError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("resolving volume filename")); + goto error; + } + + def = virStorageVolDefParseFile(conn, pool->def, absFile); + VIR_FREE(absFile); + if (!def) + goto error; + } else { + if ((def = virStorageVolDefParseNode(conn, pool->def, xml, + vols[i])) == NULL) { + goto error; + } + } + + if (VIR_REALLOC_N(pool->volumes.objs, + pool->volumes.count+1) < 0) { + virReportOOMError(conn); + goto error; + } + + if (virAsprintf(&def->target.path, "%s/%s", + pool->def->target.path, + def->name) == -1) { + virReportOOMError(conn); + goto error; + } + + def->key = strdup(def->target.path); + if (def->key == NULL) { + virReportOOMError(conn); + goto error; + } + + pool->def->allocation += def->allocation; + pool->def->available = (pool->def->capacity - + pool->def->allocation); + + pool->volumes.objs[pool->volumes.count++] = def; + def = NULL; + } + + func_ret = 0; +error: + virStorageVolDefFree(def); + VIR_FREE(vols); + return func_ret; +} + static int testOpenFromFile(virConnectPtr conn, const char *file) { int fd = -1, i, ret; @@ -586,6 +667,13 @@ static int testOpenFromFile(virConnectPtr conn, goto error; } pool->active = 1; + + /* Find storage volumes */ + if (testOpenVolumesForPool(conn, xml, ctxt, file, pool, i+1) < 0) { + virStoragePoolObjUnlock(pool); + goto error; + } + virStoragePoolObjUnlock(pool); } VIR_FREE(pools); -- 1.6.3.2

2 1

[libvirt] [PATCH] Fix segfault if storage pool has no type attribute (possibly others)
by Cole Robinson 20 Jun '09

20 Jun '09

virEnumFromString doesn't check for a NULL string, and will segfault if passed one. Lots of calling code protects against this, but at least /pool/@type parsing does not. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/util.c b/src/util.c index d8ab37f..8b746f5 100644 --- a/src/util.c +++ b/src/util.c @@ -1622,6 +1622,9 @@ int virEnumFromString(const char *const*types, const char *type) { unsigned int i; + if (!type) + return -1; + for (i = 0 ; i < ntypes ; i++) if (STREQ(types[i], type)) return i; -- 1.6.3.2

3 2

[libvirt] [PATCH 0/1] Fix NPIV on older kernels
by David Allan 20 Jun '09

20 Jun '09

Ok, I redid the patch into a minimal change that fixes NPIV on older kernels. I'll resubmit the rest of it when I decide how I want to deal with the problem of things moving around in /sys. Dave

3 3

[libvirt] [PATCH] Add virsh commands for virInterface* functions - Take 2
by Laine Stump 20 Jun '09

20 Jun '09

This is a resubmission of the virsh commands to expose virInterface* functionality. I've made the following changes from the original: 1) command names changed from if-* to iface-* 2) "if-create" is now "iface-start" 3) iface-edit implementation is manually included directly in virsh.c rather than being generated with a makefile rule. 4) iface-list now has options --inactive and --all, similar to net-list. (4) depends on new functions contained in the patch I submitted yesterday. All of this builds and appears to be correct, but is non-functional until either the netcf backend or test driver backend is committed. The netcf backend is waiting on something in netcf to provide the functionality required for virConnectListDefinedInterfaces(), and the test driver is waiting on XML parsing/formatting functions (and needs a small amount of rework to support inactive interfaces). --- src/virsh.c | 536 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 536 insertions(+), 0 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index f5248d9..6ab6182 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -228,6 +228,7 @@ static int vshCommandOptBool(const vshCmd *cmd, const char *name); #define VSH_BYID (1 << 1) #define VSH_BYUUID (1 << 2) #define VSH_BYNAME (1 << 3) +#define VSH_BYMAC (1 << 4) static virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, char **name, int flag); @@ -244,6 +245,14 @@ static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, vshCommandOptNetworkBy(_ctl, _cmd, _name, \ VSH_BYUUID|VSH_BYNAME) +static virInterfacePtr vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag); + +/* default is lookup by Name and MAC */ +#define vshCommandOptInterface(_ctl, _cmd, _name) \ + vshCommandOptInterfaceBy(_ctl, _cmd, _name, \ + VSH_BYMAC|VSH_BYNAME) + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag); @@ -275,6 +284,10 @@ static const char *vshDomainVcpuStateToString(int state); static int vshConnectionUsability(vshControl *ctl, virConnectPtr conn, int showerror); +static char *editWriteToTempFile (vshControl *ctl, const char *doc); +static int editFile (vshControl *ctl, const char *filename); +static char *editReadBackFile (vshControl *ctl, const char *filename); + static void *_vshMalloc(vshControl *ctl, size_t sz, const char *filename, int line); #define vshMalloc(_ctl, _sz) _vshMalloc(_ctl, _sz, __FILE__, __LINE__) @@ -2690,6 +2703,106 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) /* + * "iface-edit" command + */ +static const vshCmdInfo info_interface_edit[] = { + {"help", gettext_noop("edit XML configuration for a physical host interface")}, + {"desc", gettext_noop("Edit the XML configuration for a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_edit[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceEdit (vshControl *ctl, const vshCmd *cmd) +{ + int ret = FALSE; + virInterfacePtr iface = NULL; + char *tmp = NULL; + char *doc = NULL; + char *doc_edited = NULL; + char *doc_reread = NULL; + int flags = 0; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + goto cleanup; + + iface = vshCommandOptInterface (ctl, cmd, NULL); + if (iface == NULL) + goto cleanup; + + /* Get the XML configuration of the interface. */ + doc = virInterfaceGetXMLDesc (iface, flags); + if (!doc) + goto cleanup; + + /* Create and open the temporary file. */ + tmp = editWriteToTempFile (ctl, doc); + if (!tmp) goto cleanup; + + /* Start the editor. */ + if (editFile (ctl, tmp) == -1) goto cleanup; + + /* Read back the edited file. */ + doc_edited = editReadBackFile (ctl, tmp); + if (!doc_edited) goto cleanup; + + unlink (tmp); + tmp = NULL; + + /* Compare original XML with edited. Has it changed at all? */ + if (STREQ (doc, doc_edited)) { + vshPrint (ctl, _("Interface %s XML configuration not changed.\n"), + virInterfaceGetName (iface)); + ret = TRUE; + goto cleanup; + } + + /* Now re-read the interface XML. Did someone else change it while + * it was being edited? This also catches problems such as us + * losing a connection or the interface going away. + */ + doc_reread = virInterfaceGetXMLDesc (iface, flags); + if (!doc_reread) + goto cleanup; + + if (STRNEQ (doc, doc_reread)) { + vshError (ctl, FALSE, + "%s", _("ERROR: the XML configuration was changed by another user")); + goto cleanup; + } + + /* Everything checks out, so redefine the interface. */ + virInterfaceFree (iface); + iface = virInterfaceDefineXML (ctl->conn, doc_edited, 0); + if (!iface) + goto cleanup; + + vshPrint (ctl, _("Interface %s XML configuration edited.\n"), + virInterfaceGetName(iface)); + + ret = TRUE; + +cleanup: + if (iface) + virInterfaceFree (iface); + + free (doc); + free (doc_edited); + free (doc_reread); + + if (tmp) { + unlink (tmp); + free (tmp); + } + + return ret; +} + +/* * "net-list" command */ static const vshCmdInfo info_network_list[] = { @@ -2955,6 +3068,378 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) } +/**************************************************************************/ +/* + * "iface-list" command + */ +static const vshCmdInfo info_interface_list[] = { + {"help", gettext_noop("list physical host interfaces")}, + {"desc", gettext_noop("Returns list of physical host interfaces.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_list[] = { + {"inactive", VSH_OT_BOOL, 0, gettext_noop("list inactive interfaces")}, + {"all", VSH_OT_BOOL, 0, gettext_noop("list inactive & active interfaces")}, + {NULL, 0, 0, NULL} +}; +static int +cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + int inactive = vshCommandOptBool(cmd, "inactive"); + int all = vshCommandOptBool(cmd, "all"); + int active = !inactive || all ? 1 : 0; + int maxactive = 0, maxinactive = 0, i; + char **activeNames = NULL, **inactiveNames = NULL; + inactive |= all; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (active) { + maxactive = virConnectNumOfInterfaces(ctl->conn); + if (maxactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active interfaces")); + return FALSE; + } + if (maxactive) { + activeNames = vshMalloc(ctl, sizeof(char *) * maxactive); + + if ((maxactive = virConnectListInterfaces(ctl->conn, activeNames, + maxactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active interfaces")); + free(activeNames); + return FALSE; + } + + qsort(&activeNames[0], maxactive, sizeof(char *), namesorter); + } + } + if (inactive) { + maxinactive = virConnectNumOfDefinedInterfaces(ctl->conn); + if (maxinactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive interfaces")); + free(activeNames); + return FALSE; + } + if (maxinactive) { + inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); + + if ((maxinactive = virConnectListDefinedInterfaces(ctl->conn, inactiveNames, maxinactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive interfaces")); + free(activeNames); + free(inactiveNames); + return FALSE; + } + + qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); + } + } + vshPrintExtra(ctl, "%-20s %-10s %s\n", _("Name"), _("State"), _("MAC Address")); + vshPrintExtra(ctl, "--------------------------------------------\n"); + + for (i = 0; i < maxactive; i++) { + virInterfacePtr iface = virInterfaceLookupByName(ctl->conn, activeNames[i]); + const char *autostartStr; + int autostart = 0; + + /* this kind of work with interfaces is not atomic */ + if (!iface) { + free(activeNames[i]); + continue; + } + + vshPrint(ctl, "%-20s %-10s %s\n", + virInterfaceGetName(iface), + _("active"), + virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + free(activeNames[i]); + } + for (i = 0; i < maxinactive; i++) { + virInterfacePtr iface = virInterfaceLookupByName(ctl->conn, inactiveNames[i]); + const char *autostartStr; + int autostart = 0; + + /* this kind of work with interfaces is not atomic */ + if (!iface) { + free(inactiveNames[i]); + continue; + } + + vshPrint(ctl, "%-20s %-10s %s\n", + virInterfaceGetName(iface), + _("inactive"), + virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + free(inactiveNames[i]); + } + free(activeNames); + free(inactiveNames); + return TRUE; + +} + +/* + * "iface-name" command + */ +static const vshCmdInfo info_interface_name[] = { + {"help", gettext_noop("convert an interface MAC address to interface name")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_name[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface mac")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceName(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYMAC))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetName(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "iface-mac" command + */ +static const vshCmdInfo info_interface_mac[] = { + {"help", gettext_noop("convert an interface name to interface MAC address")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_mac[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceMAC(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYNAME))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "iface-dumpxml" command + */ +static const vshCmdInfo info_interface_dumpxml[] = { + {"help", gettext_noop("interface information in XML")}, + {"desc", gettext_noop("Output the physical host interface information as an XML dump to stdout.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_dumpxml[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *dump; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, NULL))) + return FALSE; + + dump = virInterfaceGetXMLDesc(iface, 0); + if (dump != NULL) { + printf("%s", dump); + free(dump); + } else { + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "iface-define" command + */ +static const vshCmdInfo info_interface_define[] = { + {"help", gettext_noop("define (but don't start) a physical host interface from an XML file")}, + {"desc", gettext_noop("Define a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_define[] = { + {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML interface description")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr interface; + char *from; + int found; + int ret = TRUE; + char *buffer; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + from = vshCommandOptString(cmd, "file", &found); + if (!found) + return FALSE; + + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; + + interface = virInterfaceDefineXML(ctl->conn, buffer, 0); + free (buffer); + + if (interface != NULL) { + vshPrint(ctl, _("Interface %s defined from %s\n"), + virInterfaceGetName(interface), from); + } else { + vshError(ctl, FALSE, _("Failed to define interface from %s"), from); + ret = FALSE; + } + return ret; +} + +/* + * "iface-undefine" command + */ +static const vshCmdInfo info_interface_undefine[] = { + {"help", gettext_noop("undefine a physical host interface (remove it from configuration)")}, + {"desc", gettext_noop("undefine an interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_undefine[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceUndefine(iface) == 0) { + vshPrint(ctl, _("Interface %s undefined\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to undefine interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "iface-start" command + */ +static const vshCmdInfo info_interface_start[] = { + {"help", gettext_noop("start a physical host interface (enable it / \"if-up\")")}, + {"desc", gettext_noop("start a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_start[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceCreate(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s started\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to start interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "iface-destroy" command + */ +static const vshCmdInfo info_interface_destroy[] = { + {"help", gettext_noop("destroy a physical host interface (disable it / \"if-down\")")}, + {"desc", gettext_noop("destroy a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_destroy[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceDestroy(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s destroyed\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to destroy interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/**************************************************************************/ /* * "pool-autostart" command */ @@ -6247,6 +6732,17 @@ static const vshCmdDef commands[] = { {"net-start", cmdNetworkStart, opts_network_start, info_network_start}, {"net-undefine", cmdNetworkUndefine, opts_network_undefine, info_network_undefine}, {"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid}, + + {"iface-list", cmdInterfaceList, opts_interface_list, info_interface_list}, + {"iface-name", cmdInterfaceName, opts_interface_name, info_interface_name}, + {"iface-mac", cmdInterfaceMAC, opts_interface_mac, info_interface_mac}, + {"iface-dumpxml", cmdInterfaceDumpXML, opts_interface_dumpxml, info_interface_dumpxml}, + {"iface-define", cmdInterfaceDefine, opts_interface_define, info_interface_define}, + {"iface-undefine", cmdInterfaceUndefine, opts_interface_undefine, info_interface_undefine}, + {"iface-edit", cmdInterfaceEdit, opts_interface_edit, info_interface_edit}, + {"iface-start", cmdInterfaceStart, opts_interface_start, info_interface_start}, + {"iface-destroy", cmdInterfaceDestroy, opts_interface_destroy, info_interface_destroy}, + {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, {"nodedev-list", cmdNodeListDevices, opts_node_list_devices, info_node_list_devices}, @@ -6698,6 +7194,46 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, return network; } +static virInterfacePtr +vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag) +{ + virInterfacePtr iface = NULL; + char *n; + const char *optname = "interface"; + if (!cmd_has_option (ctl, cmd, optname)) + return NULL; + + if (!(n = vshCommandOptString(cmd, optname, NULL))) { + vshError(ctl, FALSE, "%s", _("undefined interface identifier")); + return NULL; + } + + vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + cmd->def->name, optname, n); + + if (name) + *name = n; + + /* try it by MAC */ + if ((iface == NULL) && (flag & VSH_BYMAC)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface MAC\n", + cmd->def->name, optname); + iface = virInterfaceLookupByMACString(ctl->conn, n); + } + /* try it by NAME */ + if ((iface == NULL) && (flag & VSH_BYNAME)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface NAME\n", + cmd->def->name, optname); + iface = virInterfaceLookupByName(ctl->conn, n); + } + + if (!iface) + vshError(ctl, FALSE, _("failed to get interface '%s'"), n); + + return iface; +} + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag) -- 1.6.0.6

3 2

[libvirt] [PATCH] Fix logging in libvirt_lxc controller
by Amy Griffis 19 Jun '09

19 Jun '09

The lxc controller can't see libvirtd's log level setting so it needs to re-query it from the environment. The parsing code has a few users now, so I added a new function to the internal API, virLogParseDefaultPriority() along the lines of the other parse functions. Signed-off-by: Amy Griffis <amy.griffis(a)hp.com> diff --git a/qemud/qemud.c b/qemud/qemud.c index a58a767..bd17ccb 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2465,16 +2465,8 @@ qemudSetLogging(virConfPtr conf, const char *filename) { */ GET_CONF_INT (conf, filename, log_level); debugEnv = getenv("LIBVIRT_DEBUG"); - if (debugEnv && *debugEnv && *debugEnv != '0') { - if (STREQ(debugEnv, "2") || STREQ(debugEnv, "info")) - log_level = VIR_LOG_INFO; - else if (STREQ(debugEnv, "3") || STREQ(debugEnv, "warning")) - log_level = VIR_LOG_WARN; - else if (STREQ(debugEnv, "4") || STREQ(debugEnv, "error")) - log_level = VIR_LOG_ERROR; - else - log_level = VIR_LOG_DEBUG; - } + if (debugEnv && *debugEnv && *debugEnv != '0') + log_level = virLogParseDefaultPriority(debugEnv); if ((verbose) && (log_level >= VIR_LOG_WARN)) log_level = VIR_LOG_INFO; virLogSetDefaultPriority(log_level); diff --git a/src/libvirt.c b/src/libvirt.c index bf49018..a3f36da 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -258,6 +258,7 @@ virInitialize(void) { #ifdef ENABLE_DEBUG char *debugEnv; + int logPrio; #endif if (initialized) return(0); @@ -272,14 +273,8 @@ virInitialize(void) #ifdef ENABLE_DEBUG debugEnv = getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv && *debugEnv != '0') { - if (STREQ(debugEnv, "2") || STREQ(debugEnv, "info")) - virLogSetDefaultPriority(VIR_LOG_INFO); - else if (STREQ(debugEnv, "3") || STREQ(debugEnv, "warning")) - virLogSetDefaultPriority(VIR_LOG_WARN); - else if (STREQ(debugEnv, "4") || STREQ(debugEnv, "error")) - virLogSetDefaultPriority(VIR_LOG_ERROR); - else - virLogSetDefaultPriority(VIR_LOG_DEBUG); + logPrio = virLogParseDefaultPriority(debugEnv); + virLogSetDefaultPriority(logPrio); } debugEnv = getenv("LIBVIRT_LOG_FILTERS"); if (debugEnv) diff --git a/src/libvirt_debug.syms b/src/libvirt_debug.syms index 1742a0b..539d879 100644 --- a/src/libvirt_debug.syms +++ b/src/libvirt_debug.syms @@ -12,6 +12,7 @@ virLogMessage; virLogSetDefaultPriority; virLogDefineFilter; virLogDefineOutput; +virLogParseDefaultPriority; virLogParseFilters; virLogParseOutputs; virLogStartup; diff --git a/src/logging.c b/src/logging.c index 83e07cc..c72d52e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -793,5 +793,30 @@ int virLogParseFilters(const char *filters) { } return(ret); } + +/** + * virLogParseDefaultPriority: + * @priority: string defining the desired logging behavior + * + * It can take a string or number corresponding to the following log + * levels: + * 1: DEBUG + * 2: INFO + * 3: WARNING + * 4: ERROR + * + * DEBUG is returned if @priority doesn't match any of the other values. + */ +int virLogParseDefaultPriority(const char *priority) { + + if (STREQ(priority, "2") || STREQ(priority, "info")) + return VIR_LOG_INFO; + else if (STREQ(priority, "3") || STREQ(priority, "warning")) + return VIR_LOG_WARN; + else if (STREQ(priority, "4") || STREQ(priority, "error")) + return VIR_LOG_ERROR; + else + return VIR_LOG_DEBUG; +} #endif /* ENABLE_DEBUG */ diff --git a/src/logging.h b/src/logging.h index 7ea8935..72b3119 100644 --- a/src/logging.h +++ b/src/logging.h @@ -110,6 +110,7 @@ typedef void (*virLogCloseFunc) (void *data); #ifdef ENABLE_DEBUG +extern int virLogParseDefaultPriority(const char *priority); extern int virLogSetDefaultPriority(int priority); extern int virLogDefineFilter(const char *match, int priority, int flags); extern int virLogDefineOutput(virLogOutputFunc f, virLogCloseFunc c, @@ -130,6 +131,7 @@ extern void virLogMessage(const char *category, int priority, #else /* ENABLE_DEBUG */ +#define virLogParseDefaultPriority(p) #define virLogSetDefaultPriority(p) #define virLogDefineFilter(m, p, f) #define virLogDefineOutput(func, c, d, p, f) diff --git a/src/lxc_controller.c b/src/lxc_controller.c index 356ecb8..9355d39 100644 --- a/src/lxc_controller.c +++ b/src/lxc_controller.c @@ -594,6 +594,8 @@ int main(int argc, char *argv[]) int monitor = -1; int appPty = -1; int bg = 0; + char *debugEnv; + int logPrio; virCapsPtr caps = NULL; virDomainDefPtr def = NULL; char *configFile = NULL; @@ -735,6 +737,13 @@ int main(int argc, char *argv[]) } } + /* New programs need to re-query and set the libvirt log level. */ + debugEnv = getenv("LIBVIRT_DEBUG"); + if (debugEnv && *debugEnv && *debugEnv != '0') { + logPrio = virLogParseDefaultPriority(debugEnv); + virLogSetDefaultPriority(logPrio); + } + /* Accept initial client which is the libvirtd daemon */ if ((client = accept(monitor, NULL, 0)) < 0) { virReportSystemError(NULL, errno, "%s",

4 7

[libvirt] [PATCH 0/1] Make NPIV support work with older kernels
by David Allan 19 Jun '09

19 Jun '09

Here is a patch that makes NPIV support work with older kernels that have vport_create and delete in /sys/class/scsi_host/hostN instead of /sys/class/fc_host/hostN It doesn't look to me like there is a single place to find those files that works with both old and new kernels, so the new code checks both places at runtime. Dave

4 4

[libvirt] KVM root mac address
by Paul Reeves 19 Jun '09

19 Jun '09

A quick question - What is the correct root for dynamically generated KVM mac addresses? The docs (man virt-install) say 54:52:00 and I've seen Ubuntu docs on-line that say 52:54:00. Has someone got these mixed up? Thanks Paul -- Paul Reeves

4 4

[libvirt] domain.info() sometimes returns state zero for running machines
by Andreas Sommer 19 Jun '09

19 Jun '09

I'm using Xen-3.2-1 on Debian 5.0.1-lenny and retrieve information about running domains using domain.info()[0] The domain object is retrieved via connection.lookupByUUIDString(...) and stored as a variable called "domain". Usually the running domains have the state 1 (VIR_DOMAIN_RUNNING) or 2 (VIR_DOMAIN_BLOCKED), but sometimes it happens that 0 (VIR_DOMAIN_NOSTATE) is returned. Why does that happen? I don't think it is an error because then it would've raised an exception... Regards Andreas

2 4

[libvirt] [PATCH] test driver: Fix domain ID after redefining a running VM
by Cole Robinson 19 Jun '09

19 Jun '09

The ID of the existing VM was being unconditionally set to -1, which was upsetting virt-manager. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/test.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test.c b/src/test.c index 7dc0840..2a672a3 100644 --- a/src/test.c +++ b/src/test.c @@ -1623,16 +1623,16 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn, def)) == NULL) { goto cleanup; } + def = NULL; dom->persistent = 1; - dom->def->id = -1; + event = virDomainEventNewFromObj(dom, VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED_ADDED); - ret = virGetDomain(conn, def->name, def->uuid); - def = NULL; + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); if (ret) - ret->id = -1; + ret->id = dom->def->id; cleanup: virDomainDefFree(def); -- 1.6.0.6

3 2

[libvirt] [PATCH] Fix memory reporting for inactive domains in the qemu driver.
by Cole Robinson 19 Jun '09

19 Jun '09

Currently, 'info' will always report that mem = max mem. Make sure we actually return the correct mem value. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu_driver.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index d3eb3ad..4e3e531 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2553,16 +2553,22 @@ static int qemudDomainGetInfo(virDomainPtr dom, } } - err = qemudDomainGetMemoryBalloon(dom->conn, vm, &balloon); - if (err < 0) - goto cleanup; - info->maxMem = vm->def->maxmem; - if (err == 0) - /* Balloon not supported, so maxmem is always the allocation */ - info->memory = vm->def->maxmem; - else - info->memory = balloon; + + if (virDomainIsActive(vm)) { + err = qemudDomainGetMemoryBalloon(dom->conn, vm, &balloon); + if (err < 0) + goto cleanup; + + if (err == 0) + /* Balloon not supported, so maxmem is always the allocation */ + info->memory = vm->def->maxmem; + else + info->memory = balloon; + } else { + info->memory = vm->def->memory; + } + info->nrVirtCpu = vm->def->vcpus; ret = 0; -- 1.6.0.6

3 2