- Devel - libvirt List Archives

Re: [libvirt] [Qemu-devel] [PATCH v4 4/5] qmp: full introspection support for QMP
by Amos Kong 29 Jan '14

29 Jan '14

CC Libvirt-list Original discussion: http://marc.info/?l=qemu-devel&m=139048842504757&w=2 [Qemu-devel] [PATCH v4 0/5] QMP full introspection On Fri, Jan 24, 2014 at 06:48:31PM +0800, Fam Zheng wrote: > On Thu, 01/23 22:46, Amos Kong wrote: > > This patch introduces a new monitor command to query QMP schema > > information, the return data is a range of schema structs, which > > contains the useful metadata to help management to check supported > > features, QMP commands detail, etc. > > > > We use qapi-introspect.py to parse all json definition in > > qapi-schema.json, and generate a range of dictionaries with metadata. > > The query command will visit the dictionaries and fill the data > > to allocated struct tree. Then QMP infrastructure will convert > > the tree to json string and return to QMP client. > > > > TODO: > > Wenchao Xia is working to convert QMP events to qapi-schema.json, > > then event can also be queried by this interface. > > > > I will introduce another command 'query-qga-schema' to query QGA > > schema information, it's easy to add this support based on this > > patch. > > > > Signed-off-by: Amos Kong <akong(a)redhat.com> > > --- > > qapi-schema.json | 11 +++ > > qmp-commands.hx | 42 +++++++++++ > > qmp.c | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 268 insertions(+) > > > > diff --git a/qapi-schema.json b/qapi-schema.json > > index c63f0ca..6033383 100644 > > --- a/qapi-schema.json > > +++ b/qapi-schema.json > > @@ -4411,3 +4411,14 @@ > > 'reference-type': 'String', > > 'type': 'DataObjectType', > > 'unionobj': 'DataObjectUnion' } } > > + > > +## > > +# @query-qmp-schema > > +# > > +# Query QMP schema information > > +# > > +# @returns: list of @DataObject > > +# > > +# Since: 1.8 > > +## > > +{ 'command': 'query-qmp-schema', 'returns': ['DataObject'] } > > diff --git a/qmp-commands.hx b/qmp-commands.hx > > index 02cc815..b83762d 100644 > > --- a/qmp-commands.hx > > +++ b/qmp-commands.hx > > @@ -3291,6 +3291,48 @@ Example: > > } > > > > EQMP > > + { > > + .name = "query-qmp-schema", > > + .args_type = "", > > + .mhandler.cmd_new = qmp_marshal_input_query_qmp_schema, > > + }, > > + > > + > > +SQMP > > +query-qmp-schema > > +---------------- > > + > > +query qmp schema information > > + > > +Return a json-object with the following information: > > + > > +- "name": qmp schema name (json-string) > > +- "type": qmp schema type, it can be 'comand', 'type', 'enum', 'union' > > +- "returns": return data of qmp command (json-object, optional) > > + > > +Example: > > + > > +-> { "execute": "query-qmp-schema" } > > +-> { "return": [ > > + { > > + "name": "query-name", > > + "type": "command", > > + "returns": { > > + "name": "NameInfo", > > + "type": "type", > > + "data": [ > > + { > > + "name": "name", > > + "optional": true, > > + "recursive": false, > > + "type": "str" > > + } > > + ] > > + } > > + } > > + } > > + > > +EQMP > > > > { > > .name = "blockdev-add", > > diff --git a/qmp.c b/qmp.c > > index 0f46171..a64ae6d 100644 > > --- a/qmp.c > > +++ b/qmp.c > > @@ -27,6 +27,8 @@ > > #include "qapi/qmp/qobject.h" > > #include "qapi/qmp-input-visitor.h" > > #include "hw/boards.h" > > +#include "qapi/qmp/qjson.h" > > +#include "qapi-introspect.h" > > > > NameInfo *qmp_query_name(Error **errp) > > { > > @@ -488,6 +490,219 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) > > return arch_query_cpu_definitions(errp); > > } > > > > +static strList *qobject_to_strlist(QObject *data) > > +{ > > + strList *list = NULL; > > + strList **plist = &list; > > + QList *qlist; > > + const QListEntry *lent; > > + > > + qlist = qobject_to_qlist(data); > > + for (lent = qlist_first(qlist); lent; lent = qlist_next(lent)) { > > + strList *entry = g_malloc0(sizeof(strList)); > > + entry->value = g_strdup(qobject_get_str(lent->value)); > > + *plist = entry; > > + plist = &entry->next; > > + } > > + > > + return list; > > +} > > + > > +static DataObject *qobject_to_dataobj(QObject *data); > > + > > +static DataObjectMember *qobject_to_dataobjmem(QObject *data) > > +{ > > + > > + DataObjectMember *member = g_malloc0(sizeof(DataObjectMember)); > > + > > + member->type = g_malloc0(sizeof(DataObjectMemberType)); > > + if (data->type->code == QTYPE_QDICT) { > > + member->type->kind = DATA_OBJECT_MEMBER_TYPE_KIND_EXTEND; > > + member->type->extend = qobject_to_dataobj(data); > > + } else { > > + member->type->kind = DATA_OBJECT_MEMBER_TYPE_KIND_REFERENCE; > > + member->type->reference = g_strdup(qobject_get_str(data)); > > + } > > + > > + return member; > > +} > > + > > +static DataObjectMemberList *qobject_to_dict_memlist(QObject *data) > > +{ > > + DataObjectMemberList *list = NULL; > > + DataObjectMemberList **plist = &list; > > + QDict *qdict = qobject_to_qdict(data); > > + const QDictEntry *dent; > > + > > + for (dent = qdict_first(qdict); dent; dent = qdict_next(qdict, dent)) { > > + DataObjectMemberList *entry = g_malloc0(sizeof(DataObjectMemberList)); > > + entry->value = qobject_to_dataobjmem(dent->value); > > + > > + entry->value->has_optional = true; > > + entry->value->has_name = true; > > + if (dent->key[0] == '*') { > > + entry->value->optional = true; > > + entry->value->name = g_strdup(dent->key + 1); > > + } else { > > + entry->value->name = g_strdup(dent->key); > > + } > > + *plist = entry; > > + plist = &entry->next; > > + } > > + > > + return list; > > +} > > + > > +static DataObjectMemberList *qobject_to_list_memlist(QObject *data) > > +{ > > + const QListEntry *lent; > > + DataObjectMemberList *list = NULL; > > + DataObjectMemberList **plist = &list; > > + QList *qlist = qobject_to_qlist(data); > > + > > + for (lent = qlist_first(qlist); lent; lent = qlist_next(lent)) { > > + DataObjectMemberList *entry = g_malloc0(sizeof(DataObjectMemberList)); > > + entry->value = qobject_to_dataobjmem(lent->value); > > + entry->value->has_optional = true; > > + entry->value->has_name = true; > > + *plist = entry; > > + plist = &entry->next; > > + } > > + > > + return list; > > +} > > + > > +static DataObjectMemberList *qobject_to_memlist(QObject *data) > > This whole converting is cumbersome. You already did all the traversing through > the type jungle in python when generating this, it's not necessary to do the > similar thing again here. We can parse raw schemas and generate json string table, we can't directly return the string / qobject to monitor, C code has to convert the json to qobject, we have to revisit the qobject and convert them to DataObject/DataObjectMember/DataObject... structs. > Alternatively, I think we have a good reason to extend QMP framework as > necessary here, as we are doing "QMP introspection", which is a part of the > framework: > > * Define final output into qmp_schema_table[], no need to box it like: > > "{'_obj_member': 'False', '_obj_type': 'enum', '_obj_name': > 'ErrorClass', '_obj_data': {'data': ... > > just put it content of "qmp-introspection.output.txt" as a long string in > the header, > like you would generate in qobject_to_memlist: > > const char *qmp_schema_table = > "{ 'name': 'ErrorClass', 'type': 'enumeration', 'data': [...]}," > "{ 'name': '...', ...}," The keys are used for metadata might be 'recursive', 'optional', etc. It might exists problem in namespace, let's use '_obj_' or '_' prefix for the metadata keys. I used a nested dictionary to describe a DataObject, because we can store the metadata and definition to different level, it's helpful in parse the output by Libvirt. example: "{ 'type': 'NameInfo', 'data': {'*name': 'str', '*job': 'str'} }" It's good to store _type, _name, data to same level, but the metadata of items of data's value dictionary can't be appended to same level. "{ '_name': 'NameInfo', '_type': 'type', 'data': { 'name': 'str', '_name_optional': 'True', 'job': 'str', '_job_optional': 'True' } }" A better solution, but I don't know if it will cause trouble for Libvirt to parse the output. "{'_type': 'type', '_name': 'NameInfo', 'data': { 'job': {'_value': 'str', '_recursive': 'True'}, 'name': {'_value': 'str', '_recursive': 'True'} }, '_recursive': 'False' }" When we describe a DataObject (dict/list/str, one schema, extened schema, schema member, etc), so I we generally use a nested dictionary to describe a DataObject, it will split the metadata with original data two different dictionary level, it's convenient for parse of Libvirt. Here I just use a dict member as an example, actually it's more complex to parse all kinds of data objects. > ... > ; > > * Add a new type of qmp command, that returns a QString as a json literal. > query-qmp-schema is defined as this type. (This wouldn't be much code, but > may be abused in the future, I'm afraid. However we can review, limit its > use to introspection only) > > * And return qmp_schema_table from query-qmp-shema, which will be copied to > the wire. > > Feel free to disagree, it's not a perfect solution. But I really think we need > to avoid duplicating "enum", "base", "type", "union", "discriminator", ... In the past, we didn't consider to extend and add metadata by Python, so Libvirt wasn't happy to just get a raw schema(not extended, no metadata). But now, we already successfully to transfer this work to Python, and we can adjust to make management to be happy for the metadata and format. The problem is that Libvirt should parse the output twice, the json items are also json object string. Eric, Is it acceptabled? Example: * as suggested by Fam to put the metadta with schema data in same dict level * process some special cases by nested dictionary (eg: '*tls': 'bool' ==> 'tls': {'_value': 'bool', '_optional': 'True'} ) * return a strList to Libvirt, the content of string is json object, that contains the metadata. { "return": [ "{'_type': 'enum', '_name': 'ErrorClass', 'data': ['GenericError', 'CommandNotFound', 'DeviceEncrypted', 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap'], '_recursive': 'False'}", "{'_type': 'command', '_name': 'add_client', 'data': {'tls': {'_value': 'bool', '_optional': 'True'}, 'skipauth': {'_value': 'bool', '_optional': 'True'}, 'protocol': 'str', 'fdname': 'str'}, '_recursive': 'False'}", "{'_type': 'type', '_name': 'NameInfo', 'data': {'job': {'_value': 'str', '_optional': 'True'}, 'name': {'_value': 'str', '_optional': 'True'}}, '_recursive': 'False'}", "{'returns': {'_type': 'type', '_recursive': 'False', 'data': {'job': {'_value': 'str', '_optional': 'True'}, 'name': {'_value': 'str', '_optional': 'True'}}, '_name': 'NameInfo'}, '_name': 'query-name', '_type': 'command', '_recursive': 'False'}", "......", "......", "......" ] } > Fam -- Amos.

4 9

[libvirt] libvirt 1.2.1 vs. Xen 4.1.4
by Guido Günther 29 Jan '14

29 Jan '14

Hi, a user of Debian's libvirt backport to wheezy using Xen reported libvirt 1.2.1 failing for him like: info : libvirt version: 1.2.1 error : virIdentityGetSystem:173 : Unable to lookup SELinux process context: Invalid argument error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xenHypervisorDoV2Sys:1011 : Unable to issue hypervisor ioctl 3166208: Permission denied error : xend_req:302 : internal error: failed to parse Xend response return code error : xend_req:302 : internal error: failed to parse Xend response return code error : virNetSocketReadWire:1454 : End of file while reading data: Input/output error It seems there weren't any significant changes in this code area recently so I wonder what might be triggering this? Since I currently don't have a xen test setup it'd be happy about any pointer. We don't have libxl enabled. https://bugzilla.redhat.com/show_bug.cgi?id=1055165 has a similar error message. Cheers, -- Guido

3 3

[libvirt] [PATCH RFC 1/2] support compression when --memory-only option is specified
by Qiao Nuohan 29 Jan '14

29 Jan '14

--memory-only option is introduced without compression supported. Therefore, this is a freature regression of virsh dump. This patch is used to add "--compress" and "[--compression-format] <string>" to the command "virsh dump --memory-only" and send dump-guest-memory command to qemu with dump format specified to one of elf, kdump-zlib, kdump-lzo and kdump-snappy. Signed-off-by: Qiao Nuohan <qiaonuohan(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 18 +++++++++++++----- src/libvirt.c | 15 +++++++++++++++ src/qemu/qemu_driver.c | 21 +++++++++++++++++---- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 4 +++- src/qemu/qemu_monitor_json.h | 3 ++- tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 29 +++++++++++++++++++++++++++++ 9 files changed, 85 insertions(+), 16 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a448411..cb8989e 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1165,11 +1165,19 @@ typedef virDomainMemoryStatStruct *virDomainMemoryStatPtr; /* Domain core dump flags. */ typedef enum { - VIR_DUMP_CRASH = (1 << 0), /* crash after dump */ - VIR_DUMP_LIVE = (1 << 1), /* live dump */ - VIR_DUMP_BYPASS_CACHE = (1 << 2), /* avoid file system cache pollution */ - VIR_DUMP_RESET = (1 << 3), /* reset domain after dump finishes */ - VIR_DUMP_MEMORY_ONLY = (1 << 4), /* use dump-guest-memory */ + VIR_DUMP_CRASH = (1 << 0), /* crash after dump */ + VIR_DUMP_LIVE = (1 << 1), /* live dump */ + VIR_DUMP_BYPASS_CACHE = (1 << 2), /* avoid file system cache pollution */ + VIR_DUMP_RESET = (1 << 3), /* reset domain after dump finishes */ + VIR_DUMP_MEMORY_ONLY = (1 << 4), /* use dump-guest-memory */ + VIR_DUMP_COMPRESS = (1 << 5), /* dump guest memory in + kdump-compressed format */ + VIR_DUMP_COMPRESS_ZLIB = (1 << 6), /* kdump-compressed format, with + zlib-compressed */ + VIR_DUMP_COMPRESS_LZO = (1 << 7), /* kdump-compressed format, with + lzo-compressed */ + VIR_DUMP_COMPRESS_SNAPPY = (1 << 8), /* kdump-compressed format, with + snappy-compressed */ } virDomainCoreDumpFlags; /* Domain migration flags. */ diff --git a/src/libvirt.c b/src/libvirt.c index 666526e..318296e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2969,6 +2969,21 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) goto error; } + if ((flags & VIR_DUMP_COMPRESS) && !(flags & VIR_DUMP_MEMORY_ONLY)) { + virReportInvalidArg(flags, "%s", + _("compress flag cannot be set without memory-only " + "flag")); + goto error; + } + + if ((flags & (VIR_DUMP_COMPRESS_ZLIB | VIR_DUMP_COMPRESS_LZO | + VIR_DUMP_COMPRESS_SNAPPY)) && !(flags & VIR_DUMP_COMPRESS)) { + virReportInvalidArg(flags, "%s", + _("compression-format cannot be set without " + "compress flag")); + goto error; + } + if (conn->driver->domainCoreDump) { int ret; char *absolute_to; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index df4f5b5..c4e1aef 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3380,7 +3380,8 @@ cleanup: } static int qemuDumpToFd(virQEMUDriverPtr driver, virDomainObjPtr vm, - int fd, enum qemuDomainAsyncJob asyncJob) + int fd, enum qemuDomainAsyncJob asyncJob, + const char* dump_format) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret = -1; @@ -3400,7 +3401,7 @@ static int qemuDumpToFd(virQEMUDriverPtr driver, virDomainObjPtr vm, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; - ret = qemuMonitorDumpToFd(priv->mon, fd); + ret = qemuMonitorDumpToFd(priv->mon, fd, dump_format); qemuDomainObjExitMonitor(driver, vm); return ret; @@ -3418,6 +3419,7 @@ doCoreDump(virQEMUDriverPtr driver, virFileWrapperFdPtr wrapperFd = NULL; int directFlag = 0; unsigned int flags = VIR_FILE_WRAPPER_NON_BLOCKING; + const char *dump_format; /* Create an empty file with appropriate ownership. */ if (dump_flags & VIR_DUMP_BYPASS_CACHE) { @@ -3441,7 +3443,16 @@ doCoreDump(virQEMUDriverPtr driver, goto cleanup; if (dump_flags & VIR_DUMP_MEMORY_ONLY) { - ret = qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP); + if (dump_flags & VIR_DUMP_COMPRESS_ZLIB) + dump_format = "kdump-zlib"; + else if (dump_flags & VIR_DUMP_COMPRESS_LZO) + dump_format = "kdump-lzo"; + else if (dump_flags & VIR_DUMP_COMPRESS_SNAPPY) + dump_format = "kdump-snappy"; + else + dump_format = "elf"; + ret = qemuDumpToFd(driver, vm, fd, QEMU_ASYNC_JOB_DUMP, + dump_format); } else { ret = qemuMigrationToFile(driver, vm, fd, 0, path, qemuCompressProgramName(compress), false, @@ -3517,7 +3528,9 @@ static int qemuDomainCoreDump(virDomainPtr dom, virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | VIR_DUMP_BYPASS_CACHE | VIR_DUMP_RESET | - VIR_DUMP_MEMORY_ONLY, -1); + VIR_DUMP_MEMORY_ONLY | VIR_DUMP_COMPRESS | + VIR_DUMP_COMPRESS_ZLIB | VIR_DUMP_COMPRESS_LZO | + VIR_DUMP_COMPRESS_SNAPPY, -1); if (!(vm = qemuDomObjFromDomain(dom))) return -1; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index a968901..c2c4a1e 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2338,10 +2338,10 @@ int qemuMonitorMigrateCancel(qemuMonitorPtr mon) } int -qemuMonitorDumpToFd(qemuMonitorPtr mon, int fd) +qemuMonitorDumpToFd(qemuMonitorPtr mon, int fd, const char *dump_format) { int ret; - VIR_DEBUG("mon=%p fd=%d", mon, fd); + VIR_DEBUG("mon=%p fd=%d dump_format=%s", mon, fd, dump_format); if (!mon) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -2361,7 +2361,7 @@ qemuMonitorDumpToFd(qemuMonitorPtr mon, int fd) if (qemuMonitorSendFileHandle(mon, "dump", fd) < 0) return -1; - ret = qemuMonitorJSONDump(mon, "fd:dump"); + ret = qemuMonitorJSONDump(mon, "fd:dump", dump_format); if (ret < 0) { if (qemuMonitorCloseFileHandle(mon, "dump") < 0) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index eabf000..f2e5763 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -495,7 +495,8 @@ int qemuMonitorMigrateToUnix(qemuMonitorPtr mon, int qemuMonitorMigrateCancel(qemuMonitorPtr mon); int qemuMonitorDumpToFd(qemuMonitorPtr mon, - int fd); + int fd, + const char *dump_format); int qemuMonitorGraphicsRelocate(qemuMonitorPtr mon, int type, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index ec3b958..a16ef44 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2636,7 +2636,8 @@ int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon) int qemuMonitorJSONDump(qemuMonitorPtr mon, - const char *protocol) + const char *protocol, + const char *dump_format) { int ret; virJSONValuePtr cmd = NULL; @@ -2645,6 +2646,7 @@ qemuMonitorJSONDump(qemuMonitorPtr mon, cmd = qemuMonitorJSONMakeCommand("dump-guest-memory", "b:paging", false, "s:protocol", protocol, + "s:format", dump_format, NULL); if (!cmd) return -1; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index a93c51e..7691356 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -148,7 +148,8 @@ int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon, int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon); int qemuMonitorJSONDump(qemuMonitorPtr mon, - const char *protocol); + const char *protocol, + const char *dump_format); int qemuMonitorJSONGraphicsRelocate(qemuMonitorPtr mon, int type, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 2152e4a..256655a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1154,7 +1154,7 @@ GEN_TEST_FUNC(qemuMonitorJSONSetMigrationDowntime, 1) GEN_TEST_FUNC(qemuMonitorJSONMigrate, QEMU_MONITOR_MIGRATE_BACKGROUND | QEMU_MONITOR_MIGRATE_NON_SHARED_DISK | QEMU_MONITOR_MIGRATE_NON_SHARED_INC, "tcp:localhost:12345") -GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol") +GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol", "dummy_dump_format") GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE, "localhost", 12345, 12346, NULL) GEN_TEST_FUNC(qemuMonitorJSONAddNetdev, "some_dummy_netdevstr") diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b4ca4c3..652c7ec 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4519,6 +4519,14 @@ static const vshCmdOptDef opts_dump[] = { .type = VSH_OT_BOOL, .help = N_("dump domain's memory only") }, + {.name = "compress", + .type = VSH_OT_BOOL, + .help = N_("dump domain's memory in kdump-compressed format") + }, + {.name = "compression-format", + .type = VSH_OT_DATA, + .help = N_("specify the compression format of kdump-compressed format") + }, {.name = NULL} }; @@ -4533,6 +4541,7 @@ doDump(void *opaque) sigset_t sigmask, oldsigmask; const char *name = NULL; const char *to = NULL; + const char *compression_format = NULL; unsigned int flags = 0; sigemptyset(&sigmask); @@ -4556,6 +4565,26 @@ doDump(void *opaque) flags |= VIR_DUMP_RESET; if (vshCommandOptBool(cmd, "memory-only")) flags |= VIR_DUMP_MEMORY_ONLY; + if (vshCommandOptBool(cmd, "compress")) + flags |= VIR_DUMP_COMPRESS; + + if (vshCommandOptString(cmd, "compression-format", &compression_format)) { + if (STREQ(compression_format, "zlib")) + flags |= VIR_DUMP_COMPRESS_ZLIB; + else if (STREQ(compression_format, "lzo")) + flags |= VIR_DUMP_COMPRESS_LZO; + else if (STREQ(compression_format, "snappy")) + flags |= VIR_DUMP_COMPRESS_SNAPPY; + else { + vshError(ctl, _("compression format %s is not supported, " + "expecting 'zlib', 'lzo' or 'snappy'."), + compression_format); + goto out; + } + } else { + if (flags & VIR_DUMP_COMPRESS) + flags |= VIR_DUMP_COMPRESS_ZLIB; + } if (virDomainCoreDump(dom, to, flags) < 0) { vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); -- 1.8.3.1

1 0

[libvirt] [PATCH RFC 0/2] support compression with dumping guest memory
by Qiao Nuohan 29 Jan '14

29 Jan '14

--memory-only option is introduced without compression supported. Therefore, this is a freature regression of virsh dump. This patchset is used to add compression support in libvirt side and please refer the following address to see the qemu side, the lastest version of qemu side v7(ready for comment now). http://lists.gnu.org/archive/html/qemu-devel/2014-01/msg03669.html qiaonuohan (2): support compression when --memory-only option is specified support configuring the format of dumping memory in qemu.conf include/libvirt/libvirt.h.in | 18 +++++++++---- src/libvirt.c | 15 +++++++++++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 +++++ src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 52 +++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 6 ++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 4 ++- src/qemu/qemu_monitor_json.h | 3 ++- src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 29 +++++++++++++++++++++ 14 files changed, 127 insertions(+), 16 deletions(-) -- 1.8.3.1

1 0

Re: [libvirt] [PATCH 1/2] apparmor: Allow access to filesystem mounts
by Felix Geyer 28 Jan '14

28 Jan '14

On 28.01.2014 15:04, Jamie Strandboge wrote: > On 01/26/2014 03:47 PM, Felix Geyer wrote: >> Make virt-aa-helper create rules to allow VMs access to filesystem >> mounts from the host. > > Note that virt-aa-helper access to various parts of the filesystem is generally > ok. However, can you be more specific about the problem you're trying to solve? > Eg, is there a bug number? virt-aa-helper doesn't create the appropriate rules to allow qemu access to shared filesystem mounts: http://libvirt.org/formatdomain.html#elementsFilesystems This made it necessary to manually modify the libivrt-<UUID> profile. There is a report about this on the Ubuntu bugtracker: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/943680 Regards, Felix > >> --- >> src/security/virt-aa-helper.c | 26 ++++++++++++++++++++------ >> 1 file changed, 20 insertions(+), 6 deletions(-) >> >> diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c >> index b9282b4..e1f7848 100644 >> --- a/src/security/virt-aa-helper.c >> +++ b/src/security/virt-aa-helper.c >> @@ -578,9 +578,6 @@ valid_path(const char *path, const bool readonly) >> return -1; >> >> switch (sb.st_mode & S_IFMT) { >> - case S_IFDIR: >> - return 1; >> - break; >> case S_IFSOCK: >> return 1; >> break; >> @@ -747,7 +744,7 @@ get_definition(vahControl * ctl, const char *xmlStr) >> } >> >> static int >> -vah_add_file(virBufferPtr buf, const char *path, const char *perms) >> +vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursive) >> { >> char *tmp = NULL; >> int rc = -1; >> @@ -788,10 +785,14 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms) >> goto cleanup; >> } >> >> - virBufferAsprintf(buf, " \"%s\" %s,\n", tmp, perms); >> + virBufferAsprintf(buf, " \"%s%s\" %s,\n", tmp, recursive ? "/**" : "", perms); >> if (readonly) { >> virBufferAddLit(buf, " # don't audit writes to readonly files\n"); >> - virBufferAsprintf(buf, " deny \"%s\" w,\n", tmp); >> + virBufferAsprintf(buf, " deny \"%s%s\" w,\n", tmp, recursive ? "/**" : ""); >> + } >> + if (recursive) { >> + // allow reading (but not creating) the dir >> + virBufferAsprintf(buf, " \"%s/\" r,\n", tmp); >> } >> >> cleanup: >> @@ -801,6 +802,12 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms) >> } >> >> static int >> +vah_add_file(virBufferPtr buf, const char *path, const char *perms) >> +{ >> + return vah_add_path(buf, path, perms, false); >> +} >> + >> +static int >> vah_add_file_chardev(virBufferPtr buf, >> const char *path, >> const char *perms, >> @@ -1049,6 +1056,13 @@ get_files(vahControl * ctl) >> } /* switch */ >> } >> >> + for (i = 0; i < ctl->def->nfss; i++) { >> + virDomainFSDefPtr fs = ctl->def->fss[i]; >> + >> + if (vah_add_path(&buf, fs->src, fs->readonly ? "r" : "rw", true) != 0) >> + goto cleanup; >> + } >> + >> if (ctl->newfile) >> if (vah_add_file(&buf, ctl->newfile, "rw") != 0) >> goto cleanup; >>

2 1

[libvirt] [PATCH 0/4] Fix virConnectBaselineCPU with expand-features flag
by Jiri Denemark 28 Jan '14

28 Jan '14

Jiri Denemark (4): tests: Better support for VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES cpu: Fix VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES cpu: Try to use source CPU model in virConnectBaselineCPU tests: Add more tests for virConnectBaselineCPU src/cpu/cpu_x86.c | 101 +++++++++++++++++--------- tests/cputest.c | 27 ++++++- tests/cputestdata/x86-baseline-3-expanded.xml | 35 +++++++++ tests/cputestdata/x86-baseline-3-result.xml | 34 +-------- tests/cputestdata/x86-baseline-4-expanded.xml | 46 ++++++++++++ tests/cputestdata/x86-baseline-4-result.xml | 14 ++++ tests/cputestdata/x86-baseline-4.xml | 18 +++++ tests/cputestdata/x86-baseline-5-expanded.xml | 47 ++++++++++++ tests/cputestdata/x86-baseline-5-result.xml | 10 +++ tests/cputestdata/x86-baseline-5.xml | 35 +++++++++ 10 files changed, 296 insertions(+), 71 deletions(-) create mode 100644 tests/cputestdata/x86-baseline-3-expanded.xml create mode 100644 tests/cputestdata/x86-baseline-4-expanded.xml create mode 100644 tests/cputestdata/x86-baseline-4-result.xml create mode 100644 tests/cputestdata/x86-baseline-4.xml create mode 100644 tests/cputestdata/x86-baseline-5-expanded.xml create mode 100644 tests/cputestdata/x86-baseline-5-result.xml create mode 100644 tests/cputestdata/x86-baseline-5.xml -- 1.8.5.3

3 11

[libvirt] [PATCH v2 0/3] Enhance virnetdevbandwidthtest
by Michal Privoznik 28 Jan '14

28 Jan '14

Round two. Michal Privoznik (3): virfile: Introduce virFileAppendStr virCommand: Introduce virCommandSetDryRun virnetdevbandwidthtest: Introduce testVirNetDevBandwidthSet src/libvirt_private.syms | 2 + src/util/vircommand.c | 58 ++++++++++++++++++++++++- src/util/vircommand.h | 2 + src/util/virfile.c | 57 ++++++++++++++++++++---- src/util/virfile.h | 3 ++ tests/virnetdevbandwidthtest.c | 98 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 210 insertions(+), 10 deletions(-) -- 1.8.5.2

3 5

[libvirt] [libvirt-designer][PATCH] virtxml: Adapt to latest libvirt-glib
by Michal Privoznik 28 Jan '14

28 Jan '14

With libvirt-glib update, I've noticed a deprecation warning: libvirt-designer-domain.c: In function 'gvir_designer_domain_add_disk_full': libvirt-designer-domain.c:1610:9: error: 'gvir_config_domain_disk_set_driver_type' is deprecated (declared at /usr/include/libvirt-gconfig-1.0/libvirt-gconfig/libvirt-gconfig-domain-disk.h:145): Use 'gvir_config_domain_disk_set_driver_format' instead [-Werror=deprecated-declarations] gvir_config_domain_disk_set_driver_type(disk, format); ^ cc1: all warnings being treated as errors Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- configure.ac | 4 +++ libvirt-designer/libvirt-designer-domain.c | 41 ++++++++++++++++++++++++++-- libvirt-designer/libvirt-designer-internal.h | 18 ++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index bad199b..f74e3f1 100644 --- a/configure.ac +++ b/configure.ac @@ -75,6 +75,10 @@ AC_PROG_CC AM_PROG_CC_C_O AC_CHECK_FUNCS([strchr]) AC_CHECK_FUNCS([strrchr]) +AC_CHECK_FUNCS([strcmp]) +AC_CHECK_FUNCS([strcasecmp]) +AC_CHECK_FUNCS([strncmp]) +AC_CHECK_FUNCS([strncasecmp]) AC_CHECK_FUNCS([uname]) AC_PROG_CXX AC_TYPE_SIZE_T diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index 848dfea..8a11894 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -1606,8 +1606,45 @@ gvir_designer_domain_add_disk_full(GVirDesignerDomain *design, gvir_config_domain_disk_set_type(disk, type); gvir_config_domain_disk_set_source(disk, path); gvir_config_domain_disk_set_driver_name(disk, driver_name); - if (format) - gvir_config_domain_disk_set_driver_type(disk, format); + if (format) { + GVirConfigDomainDiskFormat fmt; + + if (STRCASEEQ(format, "raw")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_RAW; + else if (STRCASEEQ(format, "dir")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_DIR; + else if (STRCASEEQ(format, "bochs")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_BOCHS; + else if (STRCASEEQ(format, "cloop")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_CLOOP; + else if (STRCASEEQ(format, "cow")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_COW; + else if (STRCASEEQ(format, "dmg")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_DMG; + else if (STRCASEEQ(format, "iso")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_ISO; + else if (STRCASEEQ(format, "qcow")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_QCOW; + else if (STRCASEEQ(format, "qcow2")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_QCOW2; + else if (STRCASEEQ(format, "qed")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_QED; + else if (STRCASEEQ(format, "vmdk")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_VMDK; + else if (STRCASEEQ(format, "vpc")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_VPC; + else if (STRCASEEQ(format, "fat")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_FAT; + else if (STRCASEEQ(format, "vhd")) + fmt = GVIR_CONFIG_DOMAIN_DISK_FORMAT_VHD; + else { + g_set_error(error, GVIR_DESIGNER_DOMAIN_ERROR, 0, + "unknown disk format %s", format); + goto error; + } + + gvir_config_domain_disk_set_driver_format(disk, fmt); + } controller = gvir_designer_domain_get_preferred_disk_controller(design, NULL); if (controller == NULL) diff --git a/libvirt-designer/libvirt-designer-internal.h b/libvirt-designer/libvirt-designer-internal.h index e95edfc..05dcf1d 100644 --- a/libvirt-designer/libvirt-designer-internal.h +++ b/libvirt-designer/libvirt-designer-internal.h @@ -24,4 +24,22 @@ #ifndef __LIBVIRT_DESIGNER_INTERNAL_H__ #define __LIBVIRT_DESIGNER_INTERNAL_H__ +# include <strings.h> + +# define STREQ(a,b) (strcmp(a,b) == 0) +# define STRCASEEQ(a,b) (strcasecmp(a,b) == 0) +# define STRNEQ(a,b) (strcmp(a,b) != 0) +# define STRCASENEQ(a,b) (strcasecmp(a,b) != 0) +# define STREQLEN(a,b,n) (strncmp(a,b,n) == 0) +# define STRCASEEQLEN(a,b,n) (strncasecmp(a,b,n) == 0) +# define STRNEQLEN(a,b,n) (strncmp(a,b,n) != 0) +# define STRCASENEQLEN(a,b,n) (strncasecmp(a,b,n) != 0) +# define STRPREFIX(a,b) (strncmp(a,b,strlen(b)) == 0) +# define STRSKIP(a,b) (STRPREFIX(a,b) ? (a) + strlen(b) : NULL) + +# define STREQ_NULLABLE(a, b) \ + ((a) ? (b) && STREQ((a) ? (a) : "", (b) ? (b) : "") : !(b)) +# define STRNEQ_NULLABLE(a, b) \ + ((a) ? !(b) || STRNEQ((a) ? (a) : "", (b) ? (b) : "") : !!(b)) + #endif /* __LIBVIRT_DESIGNER_INTERNAL_H__ */ -- 1.8.5.2

2 1

[libvirt] [PATCH v2 0/2] BSD: implement nodeGetCPUStats
by Roman Bogorodskiy 28 Jan '14

28 Jan '14

Updated patch which includes virsh update to not output unsupported CPU stat fields. For example, Linux output: user: 1.0% system: 1.0% idle: 98.0% iowait: 0.0% usage: 2.0% Includes iowait, doesn't have intr. FreeBSD output: user: 0,8% system: 0,9% idle: 97,5% intr: 0,8% usage: 2,5% Includes intr, doesn't have iowait. Roman Bogorodskiy (2): BSD: implement nodeGetCPUStats virsh: report only filled values in 'nodecpustats' include/libvirt/libvirt.h.in | 8 +++ src/nodeinfo.c | 104 +++++++++++++++++++++++++++++++++++++++ tools/virsh-host.c | 113 +++++++++++++++++++++++++++---------------- 3 files changed, 184 insertions(+), 41 deletions(-) -- 1.8.4.3

2 5

[libvirt] [PATCH 0/2] Try to get rid of most monitor timeout errors
by Martin Kletzander 28 Jan '14

28 Jan '14

This is basically v3 of the patch Pavel Fux sent [1] with the addition of changing the default as discussed in the same thread [2]. Martin [1] https://www.redhat.com/archives/libvir-list/2014-January/msg00060.html [2] https://www.redhat.com/archives/libvir-list/2014-January/msg00367.html Martin Kletzander (1): qemu: Change the default unix monitor timeout Pavel Fux (1): qemu: Add support for changing timeout value to open unix monitor socket src/qemu/libvirtd_qemu.aug | 3 +++ src/qemu/qemu.conf | 12 ++++++++++++ src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_monitor.c | 20 +++++++++++++++++--- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 37 insertions(+), 3 deletions(-) -- 1.8.5.2

4 17

[libvirt] [RFC PATCHv2 0/2] Implement tiered driver loading
by Adam Walters 28 Jan '14

28 Jan '14

This patchset implements a tiered driver loading system. I split the hypervisor drivers out into their own tier, which is loaded after the other drivers. This has the net effect of ensuring that things like secrets, networks, etc., are initialized and auto-started before any hypervisors, such as QEMU, LXC, etc. This resolves the race condition currently present when starting libvirtd while domains are running, which happens when restarting libvirtd after having started at least one domain. This patch will work without my config driver patchset, which is about to be submitted, as well. Without the config driver patchset, however, RBD storage pools using CephX authentication can not be auto-started due to a circular dependency between the QEMU and storage drivers. This may also affect other storage backends, but I currently only have the capacity to test with RBD and file backed storage pools. The reason this interferes with RBD storage pools is that currently, the storage driver has a hard-coded connection to QEMU in order to look up secrets. After this patchset, the QEMU driver will not be loaded until after the storage driver has completed its initialization and auto-start routines, which causes issues looking up secrets. Any pool type that does not use or need data from outside of the base storage pool definition should continue to auto-start along with no longer being affected by the current race condition. I have verified that file-based storage pools definitely auto-start fine after this patchset, and no longer have any issue with the current race condition. For anyone who is not familiar with the race condition I mention above, the basic description is that upon restarting libvirtd, any running QEMU domains using storage volumes are killed randomly due to their associated storage pool not yet being online. This is due to storage pool auto-start not having completed prior to QEMU initialization. In my prior testing, I found that this race condition affected at least one domain approximately 40% of the time. I sent this information to the mailing list back on 06DEC2013, if anyone is interested in going back and re-reading my description. I would appreciate any comments and suggestions about this patchset. It works for me on 4 machines running three different distros of Linux (Archlinux, Gentoo, and CentOS), so I would imagine that it should work most anywhere. Adam Walters (2): driver: Implement new state driver field libvirt: Implement tiered driver loading src/check-driverimpls.pl | 1 + src/driver.h | 7 +++++ src/interface/interface_backend_netcf.c | 1 + src/libvirt.c | 45 ++++++++++++++++++++------------- src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/network/bridge_driver.c | 1 + src/node_device/node_device_hal.c | 1 + src/node_device/node_device_udev.c | 1 + src/nwfilter/nwfilter_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 1 + src/secret/secret_driver.c | 1 + src/storage/storage_driver.c | 1 + src/uml/uml_driver.c | 1 + src/xen/xen_driver.c | 1 + 16 files changed, 48 insertions(+), 18 deletions(-) -- 1.8.5.2

2 4

[libvirt] fix/re-do query-command-line-options
by Amos Kong 28 Jan '14

28 Jan '14

Hi QEMU/Libvirt list, When I worked on query-command-line-options, I first used some marcos [1] to generate two config & option tables. This will cover all the options, but it returns a string, it's difficult for libvirt to parse and use it. Finally I got a suggestion to read info from new interface (QemuOpts), We add opts info to vm_config_groups[], query-command-line-options will visit the array. It doesn't conver all the options, but the latest options are covered, so this implementation is acceptable. Problem: * QemuOpts was designed just for options with parameter, some new option without parameters is lost in query output (eg: -enable-fips) * block drive uses three QemuOpts, it's legacy issue. * QemuOpts of some options aren't updated, it might be difficult to updated when we add some new parameters * other We discussed to reimplement this command, but it seems DEF maroc is the only point to cover all the options, all the options are described in qemu-options.hx I'm considering to reuse the DEF marocs to generate a table, try to return the crude info if QemuOpts doesn't cover it. Or maintain a split array (like vm_config_groups[]), it only contains the option without parameter (option name & help info). If you touched some problem of the query-command-line-options, welcome to reply it, I will try to satisfy your requests. Thanks, Amos [1] http://www.redhat.com/archives/libvir-list/2013-January/msg01656.html |#elif defined(QEMU_OPTIONS_GENERATE_CONFIG) | |#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ | opt_help, | |#define DEFHEADING(text) |#define ARCHHEADING(text, arch_mask) | |#elif defined(QEMU_OPTIONS_GENERATE_NAME) | |#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ | option, | |#define DEFHEADING(text) |#define ARCHHEADING(text, arch_mask) char const *optionstr[] = { #define QEMU_OPTIONS_GENERATE_NAME #include "qemu-options-wrapper.h" }; char const *configstr[] = { #define QEMU_OPTIONS_GENERATE_CONFIG #include "qemu-options-wrapper.h" }; -- Amos.

4 10

[libvirt] [PATCHv3 0/4] Add a test for linuxNodeGetCPUStats
by Ján Tomko 28 Jan '14

28 Jan '14

v1: https://www.redhat.com/archives/libvir-list/2014-January/msg00951.html v2: https://www.redhat.com/archives/libvir-list/2014-January/msg00992.html use ticks instead of nsecs in test data v3: use nodeinfopriv.h instead of disgusting extern declarations touch up the impossible error message Ján Tomko (4): Move test-local declarations to nodeinfopriv.h Add test for linuxNodeGetCPUStats Simplify linuxNodeGetCPUStats Reword error message for oversized cpu time fields src/Makefile.am | 2 +- src/libvirt_linux.syms | 1 + src/nodeinfo.c | 87 ++++++---------- src/nodeinfopriv.h | 38 +++++++ tests/nodeinfodata/linux-cpustat-24cpu.out | 150 ++++++++++++++++++++++++++++ tests/nodeinfodata/linux-cpustat-24cpu.stat | 25 +++++ tests/nodeinfotest.c | 130 +++++++++++++++++++++++- 7 files changed, 373 insertions(+), 60 deletions(-) create mode 100644 src/nodeinfopriv.h create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.out create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.stat -- 1.8.3.2

3 13

Re: [libvirt] [PATCH 0/2] support compression with dumping guest memory
by Qiao Nuohan 28 Jan '14

28 Jan '14

Hello, Do you have some comments on this? On 01/21/2014 05:43 PM, qiaonuohan wrote: > --memory-only option is introduced without compression supported. Therefore, > this is a freature regression of virsh dump. This patchset is used to add > compression support in libvirt side and please refer the following address to > see the qemu side, the lastest version of qemu side v7(ready for comment now). > > http://lists.gnu.org/archive/html/qemu-devel/2014-01/msg02139.html > > qiaonuohan (2): > support compression when --memory-only option is specified > support configuring the format of dumping memory in qemu.conf > > include/libvirt/libvirt.h.in | 18 +++++++++---- > src/libvirt.c | 15 +++++++++++ > src/qemu/libvirtd_qemu.aug | 1 + > src/qemu/qemu.conf | 6 +++++ > src/qemu/qemu_conf.c | 2 ++ > src/qemu/qemu_conf.h | 1 + > src/qemu/qemu_driver.c | 52 +++++++++++++++++++++++++++++++++++--- > src/qemu/qemu_monitor.c | 6 ++--- > src/qemu/qemu_monitor.h | 3 ++- > src/qemu/qemu_monitor_json.c | 4 ++- > src/qemu/qemu_monitor_json.h | 3 ++- > src/qemu/test_libvirtd_qemu.aug.in | 1 + > tests/qemumonitorjsontest.c | 2 +- > tools/virsh-domain.c | 29 +++++++++++++++++++++ > 14 files changed, 127 insertions(+), 16 deletions(-) > -- Regards Qiao Nuohan

3 2

[libvirt] [PATCH glib v2] Fix event loop implementation on win32
by Daniel P. Berrange 28 Jan '14

28 Jan '14

Libvirt uses gnulib for making winsock look like POSIX sockets. This means that in the libvirt event handle callbacks the application will be given a file descriptor rather than a winsock HANDLE object. The g_io_channel_unix_new method will detect that it is an FD and delegate to the g_io_channel_win32_new_fd method. Unfortunately the glib Win32 event loop impl is not very good at dealing with FD objects, simulating poll() by doing a read() on the FD :-( The API docs for g_io_channel_win32_new_fd say "All reads from the file descriptor should be done by this internal GLib thread. Your code should call only g_io_channel_read()." This isn't going to fly for libvirt, since it has zero knowledge of glib at all, so is just doing normal read(). Fortunately we can work around this problem by turning the FD we get from libvirt back into a HANDLE using the _get_osfhandle() method. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-glib/libvirt-glib-event.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 87019b5..1e1ffec 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -31,6 +31,10 @@ #include "libvirt-glib/libvirt-glib.h" +#ifdef G_OS_WIN32 +#include <io.h> +#endif + /** * SECTION:libvirt-glib-event * @short_description: Integrate libvirt with the GMain event framework @@ -164,7 +168,11 @@ gvir_event_handle_add(int fd, data->events = events; data->cb = cb; data->opaque = opaque; +#ifdef G_OS_WIN32 + data->channel = g_io_channel_win32_new_socket(_get_osfhandle(fd)); +#else data->channel = g_io_channel_unix_new(fd); +#endif data->ff = ff; g_debug("Add handle %p %d %d %d %p\n", data, data->watch, data->fd, events, data->opaque); -- 1.8.4.2

2 1

[libvirt] [Question] About ivshmemory device and slot number confliction.
by Wangyufei (James) 28 Jan '14

28 Jan '14

Hello, I want to use ivshmemory device which is supported by qemu, but libvirt does not support it. So I use qemu:commandline to make ivshmemory device in qemu command pass-through. But then hot-plug a virtio-net device failed. The reason is that a qemu:commandline pci device's slot number is assigned by qemu not libvirt. And hot-plug device's slot is assigned by libvirt. So it failed beacause of slot confliction. I have two questions to ask: 1. Why libvirt does not support ivshmemory device? If libvirt intends to support it, when? 2. Can libvirt handle with qemu:commandline pci device's slot number? Just like pci:commandline to assign a slot number. what's your opinion? Best Regards, -WangYufei

3 2

[libvirt] [PATCH 0/5] Fix deadlock in nwfilter code
by Daniel P. Berrange 28 Jan '14

28 Jan '14

Since we introduced fine grained locking into the QEMU driver so that VM start can run in parallel, we appear to have caused a race with the nwfilter code. In particular since we no longer hold the global QEMU driver lock for the duration of VM startup we have a lock ordering flaw. This results in deadlock when nwfilter operations happen in parallel with VM startup. This also affects the LXC driver. This patch series attempts to address the problem https://bugzilla.redhat.com/show_bug.cgi?id=929412 the removal of the windows thread impl isn't strictly required, I just didn't want to waste time creating a read/write lock impl for Windows threads. Daniel P. Berrange (5): Add a read/write lock implementation Remove windows thread implementation in favour of pthreads Push nwfilter update locking up to top level Add a mutex to serialize updates to firewall Turn nwfilter conf update mutex into a read/write lock configure.ac | 15 +- src/Makefile.am | 4 - src/conf/nwfilter_conf.c | 23 +- src/conf/nwfilter_conf.h | 3 +- src/libvirt_private.syms | 8 +- src/lxc/lxc_driver.c | 6 + src/nwfilter/nwfilter_driver.c | 12 +- src/nwfilter/nwfilter_gentech_driver.c | 21 +- src/nwfilter/nwfilter_gentech_driver.h | 2 +- src/qemu/qemu_driver.c | 6 + src/uml/uml_driver.c | 4 + src/util/virthread.c | 291 +++++++++++++++++++++++- src/util/virthread.h | 51 ++++- src/util/virthreadpthread.c | 278 ----------------------- src/util/virthreadpthread.h | 49 ---- src/util/virthreadwin32.c | 396 --------------------------------- src/util/virthreadwin32.h | 53 ----- 17 files changed, 395 insertions(+), 827 deletions(-) delete mode 100644 src/util/virthreadpthread.c delete mode 100644 src/util/virthreadpthread.h delete mode 100644 src/util/virthreadwin32.c delete mode 100644 src/util/virthreadwin32.h -- 1.8.4.2

4 20

[libvirt] how nwfilter parse variable in xml file
by yue 28 Jan '14

28 Jan '14

hi,all we can define variable in nwfilter xml file, and assign value in domain xml . i add a new attribute , if the value is constant, it works . if it is variable, it will product wrong iptables rules. i want to know how libvirt process variable? where is the difference between processing constant and variable? when it is variable, if validator function is needed? thanks

1 0

[libvirt] [PATCH 0/3] Enhance virnetdevbandwidthtest
by Michal Privoznik 27 Jan '14

27 Jan '14

As discussed with Eric, we may need slightly different approach. Michal Privoznik (3): virfile: Introduce virFileAppendStr virCommand: Introduce virCommandSetDryRun virnetdevbandwidthtest: Introduce testVirNetDevBandwidthSet src/libvirt_private.syms | 2 + src/util/vircommand.c | 59 ++++++++++++++++++++++++- src/util/vircommand.h | 2 + src/util/virfile.c | 48 +++++++++++++++++---- src/util/virfile.h | 2 + tests/virnetdevbandwidthtest.c | 98 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 201 insertions(+), 10 deletions(-) -- 1.8.5.2

2 6

[libvirt] [PATCH RESEND V2 1/1] Add hw random number generator (/dev/hwrng) to cgroup ACL
by Pradipta Kr. Banerjee 27 Jan '14

27 Jan '14

From: "Pradipta Kr. Banerjee" <bpradip(a)in.ibm.com> Creating a qemu VM with /dev/hwrng as backend RNG device throws the following error - "Could not open '/dev/hwrng': Permission denied" This patch fixes the issue Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- v2: Added acl code as part of per-VM cgroup setup src/qemu/qemu_cgroup.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f0cacd0..8e2076e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -533,6 +533,18 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, goto cleanup; } + if (vm->def->rng && + (vm->def->rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM)) { + VIR_DEBUG("Setting Cgroup ACL for RNG device"); + rv = virCgroupAllowDevicePath(priv->cgroup, vm->def->rng->source.file, + VIR_CGROUP_DEVICE_RW); + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", + vm->def->rng->source.file, "rw", rv == 0); + if (rv < 0 && + !virLastErrorIsSystemErrno(ENOENT)) + goto cleanup; + } + ret = 0; cleanup: virObjectUnref(cfg); -- 1.8.3.1

3 2

[libvirt] [PATCH v3] qemu: Use virtio network device for aarch64/virt
by Oleg Strikov 27 Jan '14

27 Jan '14

This patch changes network device type used by default from rtl8139 to virtio when architecture type is aarch64 and machine type is virt. Qemu doesn't support any other machine types for aarch64 right now and we can't make any other aarch64-specific tuning in this function yet. Signed-off-by: Oleg Strikov <oleg.strikov(a)canonical.com> --- src/qemu/qemu_domain.c | 3 ++- .../qemuxml2argv-aarch64-virt-default-nic.args | 6 ++++++ .../qemuxml2argv-aarch64-virt-default-nic.xml | 22 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c947e2e..a0e9a33 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -795,11 +795,12 @@ qemuDomainDefaultNetModel(const virDomainDef *def) { if (def->os.arch == VIR_ARCH_S390 || def->os.arch == VIR_ARCH_S390X) return "virtio"; - if (def->os.arch == VIR_ARCH_ARMV7L) { + if (def->os.arch == VIR_ARCH_ARMV7L || + def->os.arch == VIR_ARCH_AARCH64) { if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; if (STREQ(def->os.machine, "virt")) return "virtio"; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args new file mode 100644 index 0000000..d4d403b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 -S -M virt -m 1024 -smp 1 -nographic \ +-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-boot c -kernel /aarch64.kernel -initrd /aarch64.initrd -append console=ttyAMA0 \ +-usb -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml new file mode 100644 index 0000000..868de94 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml @@ -0,0 +1,22 @@ +<domain type="qemu"> + <name>aarch64-virt-default-nic</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <features> + <acpi/> + </features> + <os> + <type arch="aarch64" machine="virt">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <cmdline>console=ttyAMA0</cmdline> + </os> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a25264e..1a18ee2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1316,10 +1316,13 @@ mymain(void) DO_TEST("aarch64-virt-virtio", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("aarch64-virt-default-nic", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_DEVICE_VIRTIO_MMIO); DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT); DO_TEST("kvm-pit-device", QEMU_CAPS_NO_KVM_PIT, QEMU_CAPS_KVM_PIT_TICK_POLICY); -- 1.7.9.5

1 0

[libvirt] [PATCH] BSD: implement virProcess{Get,Set}Affinity
by Roman Bogorodskiy 27 Jan '14

27 Jan '14

I guess commit message provides enough information, but I want to share some testing info. So, with qemu driver I get: virsh # vcpuinfo qemu VCPU: 0 CPU: 0 State: running CPU Affinity: yyyy virsh # Check the corresponding process using cpuset(1) tool from base system: > sudo cpuset -g -p 1308 pid 1308 mask: 0, 1, 2, 3 > virsh # vcpupin qemu --vcpu 0 --live 2,3 virsh # vcpuinfo qemu VCPU: 0 CPU: 0 State: running CPU Affinity: --yy virsh # Now cpuset(1) says: > sudo cpuset -g -p 1308 pid 1308 mask: 2, 3 > Now, do: > sudo cpuset -l 0-3 -p 1308 And check back again: virsh # vcpuinfo qemu VCPU: 0 CPU: 0 State: running CPU Affinity: yyyy virsh # Roman Bogorodskiy (1): BSD: implement virProcess{Get,Set}Affinity src/util/virprocess.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) -- 1.8.4.3

2 2

[libvirt] [PATCH v2] qemu: Use virtio network device for aarch64/virt
by Oleg Strikov 27 Jan '14

27 Jan '14

This patch changes network device type used by default from rtl8139 to virtio when architecture type is aarch64 and machine type is virt. Qemu doesn't support any other machine types for aarch64 right now and we can't make any other aarch64-specific tuning in this function yet. Signed-off-by: Oleg Strikov <oleg.strikov(a)canonical.com> --- src/qemu/qemu_domain.c | 3 ++- .../qemuxml2argv-aarch64-virt-default-nic.args | 6 ++++++ .../qemuxml2argv-aarch64-virt-default-nic.xml | 22 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c947e2e..a0e9a33 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -795,11 +795,12 @@ qemuDomainDefaultNetModel(const virDomainDef *def) { if (def->os.arch == VIR_ARCH_S390 || def->os.arch == VIR_ARCH_S390X) return "virtio"; - if (def->os.arch == VIR_ARCH_ARMV7L) { + if (def->os.arch == VIR_ARCH_ARMV7L || + def->os.arch == VIR_ARCH_AARCH64) { if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; if (STREQ(def->os.machine, "virt")) return "virtio"; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args new file mode 100644 index 0000000..d4d403b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 -S -M virt -m 1024 -smp 1 -nographic \ +-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-boot c -kernel /aarch64.kernel -initrd /aarch64.initrd -append console=ttyAMA0 \ +-usb -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml new file mode 100644 index 0000000..868de94 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.xml @@ -0,0 +1,22 @@ +<domain type="qemu"> + <name>aarch64-virt-default-nic</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>1</vcpu> + <features> + <acpi/> + </features> + <os> + <type arch="aarch64" machine="virt">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <cmdline>console=ttyAMA0</cmdline> + </os> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a25264e..1a18ee2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1316,10 +1316,13 @@ mymain(void) DO_TEST("aarch64-virt-virtio", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("aarch64-virt-default-nic", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_DEVICE_VIRTIO_MMIO); DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT); DO_TEST("kvm-pit-device", QEMU_CAPS_NO_KVM_PIT, QEMU_CAPS_KVM_PIT_TICK_POLICY); -- 1.7.9.5

1 0

Re: [libvirt] [PATCH] Sheepdog: Auto Adding volume and correct refresh volume problem. Resent file
by joel SIMOES 27 Jan '14

27 Jan '14

From: Joel SIMOES <joel.simoes(a)laposte.net> --- src/storage/storage_backend_sheepdog.c | 92 ++++++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index a6981ce..75304b1 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -86,7 +86,8 @@ virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, pool->available = pool->capacity - pool->allocation; return 0; - } while ((p = next)); + } + while ((p = next)); return -1; } @@ -109,6 +110,70 @@ virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, virCommandAddArgFormat(cmd, "%d", port); } +static int +virStorageBackendSheepdogRefreshAllVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool) +{ + int ret; + char *output = NULL; + + virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", "-r", NULL); + virStorageBackendSheepdogAddHostArg(cmd, pool); + virCommandSetOutputBuffer(cmd, &output); + ret = virCommandRun(cmd, NULL); + char** lines; + char** cells; + + if (ret < 0) + goto cleanup; + + ret = -1; + lines = virStringSplit(output, "\n", 0); + size_t i; + for (i = 0; *(lines + i); i++) { + char *line = *(lines + i); + cells = virStringSplit(line, " ", 0); + size_t j; + for (j = 0; *(cells + j); j++) { + + char *cell = *(cells + j); + if (j == 1) { + virStorageVolDefPtr vol = NULL; + if (VIR_ALLOC(vol) < 0) + goto cleanup; + + if (VIR_STRDUP(vol->name, cell) < 0) + goto cleanup; + + vol->type = VIR_STORAGE_VOL_BLOCK; + + if (VIR_EXPAND_N(pool->volumes.objs, pool->volumes.count, 1) < 0) + goto cleanup; + pool->volumes.objs[pool->volumes.count - 1] = vol; + + if (virStorageBackendSheepdogRefreshVol(conn, pool, vol) < 0) + goto cleanup; + + vol = NULL; + } + + VIR_FREE(*(cells + j)); + } + + VIR_FREE(cells); + VIR_FREE(*(lines + i)); + } + + + VIR_FREE(lines); + ret = 0; + +cleanup: + virCommandFree(cmd); + VIR_FREE(lines); + VIR_FREE(cells); + return ret; +} static int virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -122,15 +187,18 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); - if (ret == 0) - ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); + if (ret < 0) + goto cleanup; + ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); + if (ret < 0) + goto cleanup; + ret = virStorageBackendSheepdogRefreshAllVol(conn, pool); +cleanup: virCommandFree(cmd); - VIR_FREE(output); return ret; } - static int virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -143,12 +211,14 @@ virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "delete", vol->name, NULL); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; +cleanup: virCommandFree(cmd); return ret; } - static int virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -174,7 +244,6 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; } - static int virStorageBackendSheepdogBuildVol(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -195,12 +264,12 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn, goto cleanup; ret = 0; + cleanup: virCommandFree(cmd); return ret; } - int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, char *output) @@ -257,7 +326,8 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, return -1; return 0; - } while ((p = next)); + } + while ((p = next)); return -1; } @@ -295,7 +365,6 @@ cleanup: return ret; } - static int virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -310,7 +379,10 @@ virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; +cleanup: virCommandFree(cmd); return ret; -- 1.8.3.2

2 1

[libvirt] [PATCH glib] Fix event loop implementation on win32
by Daniel P. Berrange 27 Jan '14

27 Jan '14

Libvirt uses gnulib for making winsock look like POSIX sockets. This means that in the libvirt event handle callbacks the application will be given a file descriptor rather than a winsock HANDLE object. The g_io_channel_unix_new method will detect that it is an FD and delegate to the g_io_channel_win32_new_fd method. Unfortunately the glib Win32 event loop impl is not very good at dealing with FD objects, simulating poll() by doing a read() on the FD :-( The API docs for g_io_channel_win32_new_fd say "All reads from the file descriptor should be done by this internal GLib thread. Your code should call only g_io_channel_read()." This isn't going to fly for libvirt, since it has zero knowledge of glib at all, so is just doing normal read(). Fortunately we can work around this problem by turning the FD we get from libvirt back into a HANDLE using the _get_osfhandle() method. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-glib/libvirt-glib-event.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 87019b5..826db2d 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -31,6 +31,10 @@ #include "libvirt-glib/libvirt-glib.h" +#ifdef G_OS_WIN32 +#include <io.h> +#endif + /** * SECTION:libvirt-glib-event * @short_description: Integrate libvirt with the GMain event framework @@ -164,7 +168,7 @@ gvir_event_handle_add(int fd, data->events = events; data->cb = cb; data->opaque = opaque; - data->channel = g_io_channel_unix_new(fd); + data->channel = g_io_channel_unix_new(_get_osfhandle(fd)); data->ff = ff; g_debug("Add handle %p %d %d %d %p\n", data, data->watch, data->fd, events, data->opaque); -- 1.8.4.2

2 2