- Devel - libvirt List Archives

[libvirt] [PATCH] libvirt-admin.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/libvirt-admin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 03245b6..88eef54 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -344,7 +344,7 @@ virAdmConnectRef(virAdmConnectPtr conn) * @libVer: where to store the library version * * Provides version information. @libVer is the version of the library and will - * allways be set unless an error occurs in which case an error code and a + * always be set unless an error occurs in which case an error code and a * generic message will be returned. @libVer format is as follows: * major * 1,000,000 + minor * 1,000 + release. * -- 2.1.0

2 1

[libvirt] [PATCH] domain_conf.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ea246b0..28b81d2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25447,7 +25447,7 @@ virDomainDiskDefCheckDuplicateInfo(const virDomainDiskDef *a, } /* Duplicate WWN/serial isn't usually problematic for the OS and - * forbiding it would possibly inhibit using multipath configurations */ + * forbidding it would possibly inhibit using multipath configurations */ return 0; } -- 2.1.0

2 1

[libvirt] [PATCH] driver.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver.c b/src/driver.c index 1514a3b..67ac020 100644 --- a/src/driver.c +++ b/src/driver.c @@ -38,7 +38,7 @@ VIR_LOG_INIT("driver"); #ifdef WITH_DRIVER_MODULES -/* XXX re-implment this for other OS, or use libtools helper lib ? */ +/* XXX re-implement this for other OS, or use libtools helper lib ? */ # include <dlfcn.h> # define DEFAULT_DRIVER_DIR LIBDIR "/libvirt/connection-driver" -- 2.1.0

2 1

[libvirt] [PATCH] domain_conf.c:fix the comment.
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ebddf5f..7daf2fd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14091,9 +14091,9 @@ void virDomainNetRemoveHostdev(virDomainDefPtr def, virDomainNetDefPtr net) { - /* hostdev net devices are normally also be in the hostdevs - * array, but might have already been removed by the time we - * get here. + /* hostdev net devices are normally in the hostdevs + * array, but might have already been removed by the + * time we get here. */ virDomainHostdevDefPtr hostdev = virDomainNetGetActualHostdev(net); size_t i; -- 2.1.0

2 1

[libvirt] [PATCH] domain_conf.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a70be31..ebddf5f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13936,7 +13936,7 @@ void virDomainDiskInsertPreAlloced(virDomainDefPtr def, virDomainDiskDefPtr disk) { int idx; - /* Tenatively plan to insert disk at the end. */ + /* Tentatively plan to insert disk at the end. */ int insertAt = -1; /* Then work backwards looking for disks on -- 2.1.0

2 1

[libvirt] [PATCH v4 0/2] qemu/gluster: add option for tuning debug logging level
by Prasanna Kumar Kalever 21 Sep '16

21 Sep '16

v4: Address comments by peter on v3 Mostly betterments in naming variables and grouping patterns in Caps by 5 Thanks to Peter v3: Add patch 2/2 which address capability checks Changed 'glusterfs_debug_level' to 'gluster_debug_level' agreeing to Peter Made changes in libvirtd_qemu.aug Thanks to Peter & Daniel v2: Modify test cases and syntax check changes as suggested by Peter in v1. Rename qemu_gfapi_debuglevel to glusterfs_debug_level as per Daniel comments. Fix to make debug_level changes effects on URI along with JSON. TODO: * changes in libvirtd_qemu.aug Which I don't understand for now * comment on debug_level variable in storage source Not sure what is the right place * Capablities check v1: Initial post *** BLURB HERE *** Prasanna Kumar Kalever (2): qemu/gluster: add option for tuning debug logging level qemu_capabilities: Introduce gluster specific debug capability src/qemu/libvirtd_qemu.aug | 3 +++ src/qemu/qemu.conf | 20 ++++++++++++++++++++ src/qemu/qemu_capabilities.c | 5 +++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 21 ++++++++++++++++++--- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/util/virstoragefile.h | 2 ++ .../qemuargv2xml-disk-drive-network-gluster.args | 7 ++++--- .../qemuxml2argv-disk-drive-network-gluster.args | 12 ++++++------ tests/qemuxml2argvtest.c | 3 ++- 11 files changed, 65 insertions(+), 13 deletions(-) -- 2.7.4

3 6

[libvirt] [libvirt-php][PATCH] libvirt_domain_get_screenshot_api: More memleak fixes and checks
by Michal Privoznik 21 Sep '16

21 Sep '16

Firstly, we are not checking whether virStreamNew succeeds or not. Secondly, we are not freeing the stream in all exit paths. Then we are copying the same pattern which frees allocated memory over and over again. Oh, and also we should abort stream if we are exiting abnormally. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under "I'm a lonely libvirt-php maintainer" rule. src/libvirt-php.c | 64 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 3aed882..df2f32a 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -4758,49 +4758,38 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) RETURN_FALSE; #endif - GET_DOMAIN_FROM_ARGS("r|l",&zdomain, &screen); + GET_DOMAIN_FROM_ARGS("r|l", &zdomain, &screen); + + if (!(st = virStreamNew(domain->conn->conn, 0))) { + set_error("Cannot create new stream" TSRMLS_CC); + goto error; + } - st = virStreamNew(domain->conn->conn, 0); mime = virDomainScreenshot(domain->domain, st, screen, 0); if (!mime) { set_error_if_unset("Cannot get domain screenshot" TSRMLS_CC); - RETURN_FALSE; + goto error; } -#ifndef EXTWIN - if (mkstemp(file) == 0) { - free(mime); - RETURN_FALSE; - } -#endif - - if ((fd = open(file, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0) { - if (errno != EEXIST || - (fd = open(file, O_WRONLY|O_TRUNC, 0666)) < 0) { - virStreamFree(st); - set_error_if_unset("Cannot get create file to save domain screenshot" TSRMLS_CC); - free(mime); - RETURN_FALSE; - } + if (!(fd = mkstemp(file))) { + virStreamAbort(st); + set_error_if_unset("Cannot get create file to save domain screenshot" TSRMLS_CC); + goto error; } if (virStreamRecvAll(st, streamSink, &fd) < 0) { - virStreamFree(st); set_error_if_unset("Cannot receive screenshot data" TSRMLS_CC); - free(mime); - RETURN_FALSE; + virStreamAbort(st); + goto error; } - close(fd); - if (virStreamFinish(st) < 0) { - virStreamFree(st); set_error_if_unset("Cannot close stream for domain" TSRMLS_CC); - free(mime); - RETURN_FALSE; + goto error; } virStreamFree(st); + st = NULL; array_init(return_value); if (bin) { @@ -4811,19 +4800,34 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) snprintf(fileNew, sizeof(fileNew), "%s.png", file); snprintf(tmp, sizeof(tmp), "%s %s %s > /dev/null 2> /dev/null", bin, file, fileNew); exitStatus = system(tmp); - unlink(file); if (WEXITSTATUS(exitStatus) != 0) - RETURN_FALSE; + goto error; + unlink(file); + close(fd); + fd = -1; VIRT_ADD_ASSOC_STRING(return_value, "file", fileNew); VIRT_ADD_ASSOC_STRING(return_value, "mime", "image/png"); - } - else { + } else { + unlink(file); + close(fd); + fd = -1; VIRT_ADD_ASSOC_STRING(return_value, "file", file); VIRT_ADD_ASSOC_STRING(return_value, "mime", mime); } free(mime); + return; + + error: + free(mime); + if (fd != -1) { + unlink(file); + close(fd); + } + if (st) + virStreamFree(st); + RETURN_FALSE; } /* -- 2.8.4

1 0

[libvirt] [PATCH 0/4] qemu: fix vcpupin/emulatorpin with --config on VMs with automatic NUMA pinning
by Peter Krempa 21 Sep '16

21 Sep '16

The automatic nodeset would creep into the persistent definition for live VMs with automatic pinning which is incorrect. https://bugzilla.redhat.com/show_bug.cgi?id=1365779 Peter Krempa (4): conf: Introduce virDomainObjGetOneDefState qemu: domain: Add macro to simplify access to vm private data qemu: driver: Don't return automatic NUMA vCPU pinning data for persistentDef qemu: driver: Don't return automatic NUMA emulator pinning data for persistentDef src/conf/domain_conf.c | 40 ++++++++++++++++++++++++++++++++++++---- src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.h | 3 +++ src/qemu/qemu_driver.c | 23 +++++++++++++---------- 5 files changed, 56 insertions(+), 14 deletions(-) -- 2.10.0

3 9

[libvirt] [PATCH v4 0/5] Remove caching of address sets
by Tomasz Flendrich 21 Sep '16

21 Sep '16

Link to the previous version: https://www.redhat.com/archives/libvir-list/2016-August/msg00721.html Changes in v4: * instead of failing, qemuDomainValidateDevicePCISlotsChipsets now simply displays a warning when a new address is being assigned during pci address set recalculation Tomasz Flendrich (5): Move validating chipset PCI slots to qemuDomainPCIAddressSetCreate Warn when assigning new pci addresses during recalculation Reduce number of parameters to qemuDomainPCIAddressSetCreate qemu_hotplug: generate pci address set on demand qemu: remove pciaddrs caching src/qemu/qemu_domain.c | 1 - src/qemu/qemu_domain.h | 1 - src/qemu/qemu_domain_address.c | 215 +++++++++++++++++++++++------------------ src/qemu/qemu_domain_address.h | 6 ++ src/qemu/qemu_hotplug.c | 50 ++++++++-- 5 files changed, 168 insertions(+), 105 deletions(-) -- 1.9.1

2 6

[libvirt] [PATCH 0/2] Rework qemuhotplugtest
by Tomasz Flendrich 21 Sep '16

21 Sep '16

This series requires another one: https://www.redhat.com/archives/libvir-list/2016-July/msg01205.html Tomasz Flendrich (2): qemuhotplugtest: handle xml files more precisely qemuhotplugtest: change indentation tests/qemuhotplugtest.c | 254 +++++++++++---------- .../qemuhotplug-ccw-virtio-1-reverse.xml | 7 - ...ach.xml => qemuhotplug-qemu-agent-nosource.xml} | 1 - .../qemuhotplug-qemu-agent.xml | 1 + .../qemuhotplug-base+qemu-agent-detach.xml | 58 ----- .../qemuhotplug-base+qemu-agent.xml | 58 ----- ...plug-base-ccw-live+ccw-virtio+ccw-virtio-2.xml} | 0 ... => qemuhotplug-base-ccw-live+ccw-virtio-2.xml} | 0 ...ive-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 73 ------ ...live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 73 ------ ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 73 ------ .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 63 ----- ....xml => qemuhotplug-base-config+qemu-agent.xml} | 0 .../qemuhotplug-base-live+qemu-agent-detach.xml | 58 ----- ...-base-with-scsi-controller-live+disk-scsi-2.xml | 51 ----- 15 files changed, 140 insertions(+), 630 deletions(-) delete mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ccw-virtio-1-reverse.xml rename tests/qemuhotplugtestdevices/{qemuhotplug-qemu-agent-detach.xml => qemuhotplug-qemu-agent-nosource.xml} (66%) delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml rename tests/qemuhotplugtestdomains/{qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml => qemuhotplug-base-ccw-live+ccw-virtio+ccw-virtio-2.xml} (100%) rename tests/qemuhotplugtestdomains/{qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml => qemuhotplug-base-ccw-live+ccw-virtio-2.xml} (100%) delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml rename tests/qemuhotplugtestdomains/{qemuhotplug-base-config+qemu-agent+config.xml => qemuhotplug-base-config+qemu-agent.xml} (100%) delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml -- 2.7.4 (Apple Git-66)

2 3

[libvirt] [PATCH v3 0/6] Test persistent device attachment
by Tomasz Flendrich 21 Sep '16

21 Sep '16

Changes in v3: * fewer patches, because part of v2 was ACK'd * two old commits, 08/10 and 09/10, are now one commit * qemuDomainUpdateDeviceFlags is now also split, creating a new function qemuDomainUpdateDeviceLiveAndConfig(). This function is now used in qemuhotplugtest.c. * qemuDomainAttachDeviceLiveAndConfig, qemuDomainDetachDeviceLiveAndConfig and qemuDomainUpdateDeviceLiveAndConfig are now in a new file: qemu_driverpriv.h * variable "target" is renamed to "impact" and its type is changed * testQemuHotplugCheckResult() now takes "impact" as a parameter to determine whether to test the ->def or ->newDef * def->id is no longer set when handling a persistent domain * split DO_TEST_ATTACH (and other macros) to DO_TEST_ATTACH_LIVE and DO_TEST_ATTACH_CONFIG instead of taking a parameter * fixed indentation * "<source mode='bind'/>" is removed from one xml * a three year old testcase for updating a disk device was modified a little bit to make it finally execute and test something Link to v2: https://www.redhat.com/archives/libvir-list/2016-July/msg00595.html Tomasz Flendrich (6): Split qemuDomainUpdateDeviceFlags in two Make qemu attach/detach functions public Make qemuhotplugtest work with persistent domains qemuhotplug: Use a more generic function to update devices qemuhotplugtest: add testcase to update a disk device qemuhotplugtest: add a persistent attachment testcase src/qemu/qemu_driver.c | 117 +++--- src/qemu/qemu_driverpriv.h | 47 +++ tests/qemuhotplugtest.c | 433 ++++++++++++--------- .../qemuhotplug-disk-cdrom-nochange.xml | 2 +- .../qemuhotplug-qemu-agent.xml | 1 - .../qemuhotplug-base-config+qemu-agent+config.xml | 44 +++ .../qemuhotplug-base-config.xml | 40 ++ .../qemuhotplug-disk-cdrom.xml | 2 +- 8 files changed, 454 insertions(+), 232 deletions(-) create mode 100644 src/qemu/qemu_driverpriv.h create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-config+qemu-agent+config.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-config.xml -- 1.9.1

2 8

[libvirt] [PATCH] migration: Document we don't copy storage during offline migration
by Michal Privoznik 21 Sep '16

21 Sep '16

https://bugzilla.redhat.com/show_bug.cgi?id=1322717 During offline migration, no storage is copied. Nor disks, nor NVRAM file, nor anything. We use qemu for that and because domain is not running there's nobody to copy that for us. We should document this to avoid confusing users. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/migration.html.in | 5 +++-- src/libvirt-domain.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index 8efdd7f..2768955 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -148,8 +148,9 @@ <code>virsh dumpxml</code> on source host followed by <code>virsh define</code> on destination host, as offline migration will run the pre-migration hook to update the domain XML on - destination host. Currently, copying non-shared storage is not - supported during offline migration. + destination host. Currently, copying non-shared storage or other file + based storages (e.g. UEFI variable storage) is not supported during + offline migration. </p> <h2><a name="uris">Migration URIs</a></h2> diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index fa82e49..9ba9f49 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3574,6 +3574,10 @@ virDomainMigrateUnmanaged(virDomainPtr domain, * not support this feature and will return an error if bandwidth * is not 0. * + * Users should note that implementation of VIR_MIGRATE_OFFLINE + * flag in some drivers does not copy storage or any other file + * based storage (e.g. UEFI variable storage). + * * Enabling the VIR_MIGRATE_POSTCOPY flag tells libvirt to enable post-copy * migration. Use virDomainMigrateStartPostCopy to switch migration into * the post-copy mode. See virDomainMigrateStartPostCopy for more details @@ -3791,6 +3795,10 @@ virDomainMigrate(virDomainPtr domain, * not support this feature and will return an error if bandwidth * is not 0. * + * Users should note that implementation of VIR_MIGRATE_OFFLINE + * flag in some drivers does not copy storage or any other file + * based storage (e.g. UEFI variable storage). + * * Enabling the VIR_MIGRATE_POSTCOPY flag tells libvirt to enable post-copy * migration. Use virDomainMigrateStartPostCopy to switch migration into * the post-copy mode. See virDomainMigrateStartPostCopy for more details @@ -3980,6 +3988,10 @@ virDomainMigrate2(virDomainPtr domain, * can use either VIR_MIGRATE_NON_SHARED_DISK or * VIR_MIGRATE_NON_SHARED_INC as they are mutually exclusive. * + * Users should note that implementation of VIR_MIGRATE_OFFLINE + * flag in some drivers does not copy storage or any other file + * based storage (e.g. UEFI variable storage). + * * Enabling the VIR_MIGRATE_POSTCOPY flag tells libvirt to enable post-copy * migration. Use virDomainMigrateStartPostCopy to switch migration into * the post-copy mode. See virDomainMigrateStartPostCopy for more details -- 2.8.4

2 1

[libvirt] [PATCH] qemu: Ignore graphics cookie if port == 0
by Jiri Denemark 21 Sep '16

21 Sep '16

Old libvirt represents <graphics type='spice'> <listen type='none'/> </graphics> as <graphics type='spice' autoport='no'/> In this mode, QEMU doesn't listen for SPICE connection anywhere and clients have to use virDomainOpenGraphics* APIs to attach to the domain. That is, the client has to run on the same host where the domains runs and it's impossible to tell the client to reconnect to the destination QEMU during migration (unless there is some kind of proxy on the host). While current libvirt correctly ignores such graphics devices when creating graphics migration cookie, old libvirt just sends <graphics type='spice' port='0' listen='0.0.0.0' tlsPort='-1'/> in the cookie. After seeing this cookie, we happily would call client_migrate_info QMP command and wait for SPICE_MIGRATE_COMPLETED event, which is quite pointless since the doesn't know where to connecti anyway. We should just ignore such cookies. https://bugzilla.redhat.com/show_bug.cgi?id=1376083 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e734816..8a220d9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2903,6 +2903,15 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, goto cleanup; } + /* Older libvirt sends port == 0 for listen type='none' graphics. It's + * safe to ignore such requests since relocation to unknown port does + * not make sense in general. + */ + if (port <= 0 && tlsPort <= 0) { + ret = 0; + goto cleanup; + } + if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, -- 2.10.0

2 2

[libvirt] [PATCH] qemuDomainOpenGraphics: Start job early
by Jiri Denemark 21 Sep '16

21 Sep '16

Checking if a domain's definition or if it is active before we got a job is pointless since the domain might have changed in the meantime. Luckily libvirtd didn't crash when the API tried to talk to an inactive domain: debug : qemuDomainObjBeginJobInternal:2914 : Started job: modify (async=none vm=0x7f8f340140c0 name=ble) debug : qemuDomainObjEnterMonitorInternal:3137 : Entering monitor (mon=(nil) vm=0x7f8f340140c0 name=ble) warning : virObjectLock:319 : Object (nil) ((unknown)) is not a virObjectLockable instance debug : qemuMonitorOpenGraphics:3505 : protocol=spice fd=27 fdname=graphicsfd skipauth=1 error : qemuMonitorOpenGraphics:3508 : invalid argument: monitor must not be NULL debug : qemuDomainObjExitMonitorInternal:3160 : Exited monitor (mon=(nil) vm=0x7f8f340140c0 name=ble) debug : qemuDomainObjEndJob:3068 : Stopping job: modify (async=none vm=0x7f8f340140c0 name=ble) Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e29180d..4c45fc3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17118,10 +17118,13 @@ qemuDomainOpenGraphics(virDomainPtr dom, if (virDomainOpenGraphicsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } priv = vm->privateData; @@ -17129,7 +17132,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, if (idx >= vm->def->ngraphics) { virReportError(VIR_ERR_INTERNAL_ERROR, _("No graphics backend with index %d"), idx); - goto cleanup; + goto endjob; } switch (vm->def->graphics[idx]->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -17142,20 +17145,20 @@ qemuDomainOpenGraphics(virDomainPtr dom, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Can only open VNC or SPICE graphics backends, not %s"), virDomainGraphicsTypeToString(vm->def->graphics[idx]->type)); - goto cleanup; + goto endjob; } if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, fd) < 0) - goto cleanup; + goto endjob; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorOpenGraphics(priv->mon, protocol, fd, "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) != 0); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; + + endjob: qemuDomainObjEndJob(driver, vm); cleanup: -- 2.10.0

2 2

[libvirt] [PATCH] stream.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- daemon/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/stream.c b/daemon/stream.c index bd0b5d2..533ecf7 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -444,7 +444,7 @@ int daemonAddClientStream(virNetServerClientPtr client, * * Removes a stream from the list of active streams for the client * - * Returns 0 if the stream was removd, -1 if it doesn't exist + * Returns 0 if the stream was removed, -1 if it doesn't exist */ int daemonRemoveClientStream(virNetServerClientPtr client, -- 2.1.0

2 1

[libvirt] [PATCH] config-post.h:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- config-post.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-post.h b/config-post.h index dd69197..6eb63db 100644 --- a/config-post.h +++ b/config-post.h @@ -20,7 +20,7 @@ * Since virt-login-shell will be setuid, we must do everything * we can to avoid linking to other libraries. Many of them do * unsafe things in functions marked __atttribute__((constructor)). - * The only way avoid to avoid such deps is to re-compile the + * The only way to avoid such deps is to re-compile the * functions with the code in question disabled, and for that we * must override the main config.h rules. Hence this file :-( */ -- 2.1.0

2 1

[libvirt] [PATCH 0/5] enforce and simplify qga interactions
by Nikolay Shirokovskiy 21 Sep '16

21 Sep '16

First 2 patches fix bugs of libvirt - qga communication. They deal with the channel pecularities described in http://wiki.qemu.org/Features/QAPI/GuestAgent. First patch address https://bugzilla.redhat.com/show_bug.cgi?id=1090551 bug. Next 3 patches hide details of channel pecularities from client, so there is no more need to reissue commands for the reasons other then simple timeout. Nikolay Shirokovskiy (5): qemu: agent: ignore delayed reply when unsynced qemu: agent: ignore garbage while waiting for sync reply qemu: agent: skip outdated sync replies qemu: agent: reissue sync on garbage sync reply qemu: agent: give better error messages whe agent monitor is down src/qemu/qemu_agent.c | 91 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 37 deletions(-) -- 1.8.3.1

2 8

[libvirt] [PATCH v1 0/4] libxl: channels support
by Joao Martins 20 Sep '16

20 Sep '16

Hey, Channels have been on xen toolstack since Xen 4.5 and this small series adds support for it, including xenconfig conversion and appropriate tests. After this series it's possible to do this: (assuming correct configuration of qemu agent in the guest) $ cat domain.xml | grep -a1 channel | head -n 5 | tail -n 4 <channel type='unix'> <source mode='bind' path='/tmp/channel'/> <target type='xen' name='org.qemu.guest_agent.0'/> </channel> $ virsh create domain.xml $ echo '{"execute":"guest-network-get-interfaces"}' | socat stdio,ignoreeof unix-connect:/tmp/channel {"execute":"guest-network-get-interfaces"} {"return": [{"name": "lo", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "127.0.0.1", "prefix": 8}, {"ip-address-type": "ipv6", "ip-address": "::1", "prefix": 128}], "hardware-address": "00:00:00:00:00:00"}, {"name": "eth0", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "10.100.0.6", "prefix": 24}, {"ip-address-type": "ipv6", "ip-address": "fe80::216:3eff:fe40:88eb", "prefix": 64}], "hardware-address": "00:16:3e:40:88:eb"}, {"name": "sit0"}]} There is just one thing unclear: is source "path" meant to be auto-generated if it's not specified in the channel config? Additionally what does "state" signify for virtio case: is it that the guest agent is connected, or that the virtio serial is connected? Looking at the qemu driver on processSerialChangedEvent it sounds to me like it's about the serial state. I also have one other series that lets us share the qemu agent across both qemu and libxl drivers, with qemu-agent-command implemented. But it's still in an early stage. Any comments or feedback is appreciated :) Thanks, Joao Joao Martins (4): conf: add xen type for channels libxl: channels support xenconfig: channels conversion support xlconfigtest: add test for channel conversion docs/schemas/domaincommon.rng | 11 ++ src/conf/domain_conf.c | 18 +++- src/conf/domain_conf.h | 1 + src/libxl/libxl_conf.c | 81 ++++++++++++++ src/libxl/libxl_domain.c | 38 +++++++ src/qemu/qemu_command.c | 1 + src/xenconfig/xen_xl.c | 176 +++++++++++++++++++++++++++++++ tests/xlconfigdata/test-channel-pty.cfg | 13 +++ tests/xlconfigdata/test-channel-pty.xml | 33 ++++++ tests/xlconfigdata/test-channel-unix.cfg | 13 +++ tests/xlconfigdata/test-channel-unix.xml | 34 ++++++ tests/xlconfigtest.c | 4 + 12 files changed, 419 insertions(+), 4 deletions(-) create mode 100644 tests/xlconfigdata/test-channel-pty.cfg create mode 100644 tests/xlconfigdata/test-channel-pty.xml create mode 100644 tests/xlconfigdata/test-channel-unix.cfg create mode 100644 tests/xlconfigdata/test-channel-unix.xml -- 2.1.4

3 19

[libvirt] [PATCH v3 0/5] Add runnability info to query-cpu-definitions
by Eduardo Habkost 20 Sep '16

20 Sep '16

This series extends query-cpu-definitions to include an extra field: "unavailable-features". The new field can be used to find out reasons that prevent the CPU model from running in the current host. This will return information based on the current machine and accelerator only. In the future we may extend these mechanisms to allow querying other machines and other accelerators without restarting QEMU, but it will require some reorganization of QEMU's main code. Changes v2 -> v3: * Small documentation reword * Suggested-by: Markus Armbruster <armbru(a)redhat.com> * Create a x86_cpu_feature_name() function, to isolate the code that returns the property name Changes v1 -> v2: * Fixed documentation to say "(since 2.7)" * Removed @runnable field, improved documentation Example command output: { "return": [ { "unavailable-features": [], "static": false, "name": "host" }, { "unavailable-features": [], "static": false, "name": "qemu64" }, { "unavailable-features": [], "static": false, "name": "qemu32" }, { "unavailable-features": ["npt", "sse4a", "3dnow", "3dnowext", "fxsr-opt", "mmxext"], "static": false, "name": "phenom" }, { "unavailable-features": [], "static": false, "name": "pentium3" }, { "unavailable-features": [], "static": false, "name": "pentium2" }, { "unavailable-features": [], "static": false, "name": "pentium" }, { "unavailable-features": [], "static": false, "name": "n270" }, { "unavailable-features": [], "static": false, "name": "kvm64" }, { "unavailable-features": [], "static": false, "name": "kvm32" }, { "unavailable-features": [], "static": false, "name": "coreduo" }, { "unavailable-features": [], "static": false, "name": "core2duo" }, { "unavailable-features": ["3dnow", "3dnowext", "mmxext"], "static": false, "name": "athlon" }, { "unavailable-features": [], "static": false, "name": "Westmere" }, { "unavailable-features": ["xgetbv1", "xsavec", "3dnowprefetch", "smap", "adx", "rdseed", "mpx", "rtm", "hle"], "static": false, "name": "Skylake-Client" }, { "unavailable-features": [], "static": false, "name": "SandyBridge" }, { "unavailable-features": [], "static": false, "name": "Penryn" }, { "unavailable-features": ["tbm", "fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"], "static": false, "name": "Opteron_G5" }, { "unavailable-features": ["fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"], "static": false, "name": "Opteron_G4" }, { "unavailable-features": ["misalignsse", "sse4a"], "static": false, "name": "Opteron_G3" }, { "unavailable-features": [], "static": false, "name": "Opteron_G2" }, { "unavailable-features": [], "static": false, "name": "Opteron_G1" }, { "unavailable-features": [], "static": false, "name": "Nehalem" }, { "unavailable-features": [], "static": false, "name": "IvyBridge" }, { "unavailable-features": ["rtm", "hle"], "static": false, "name": "Haswell" }, { "unavailable-features": [], "static": false, "name": "Haswell-noTSX" }, { "unavailable-features": [], "static": false, "name": "Conroe" }, { "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed", "rtm", "hle"], "static": false, "name": "Broadwell" }, { "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed"], "static": false, "name": "Broadwell-noTSX" }, { "unavailable-features": [], "static": false, "name": "486" } ]} Cc: David Hildenbrand <dahi(a)linux.vnet.ibm.com> Cc: Michael Mueller <mimu(a)linux.vnet.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: libvir-list(a)redhat.com Eduardo Habkost (5): target-i386: List CPU models using subclass list target-i386: Move warning code outside x86_cpu_filter_features() target-i386: Define CPUID filtering functions before x86_cpu_list() qmp: Add runnability information to query-cpu-definitions target-i386: Return runnability information on query-cpu-definitions qapi-schema.json | 23 ++++- target-i386/cpu-qom.h | 4 + target-i386/cpu.c | 236 ++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 199 insertions(+), 64 deletions(-) -- 2.7.4

3 8

[libvirt] [PATCH v2] qemu-migration: Disallow migration of read only disk
by Corey S. McQuay 20 Sep '16

20 Sep '16

Currently Libvirt allows attempts to migrate read only disks. Qemu cannot handle this as read only disks cannot be written to on the destination system. The end result is a cryptic error message and a failed migration. This patch causes migration to fail earlier and provides a meaningful error message stating that migrating read only disks is not supported. Signed-off-by: Corey S. McQuay <csmcquay(a)linux.vnet.ibm.com> Reviewed-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e451ef6..011f349 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2157,6 +2157,13 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, if (!qemuMigrateDisk(disk, nmigrate_disks, migrate_disks)) continue; + if (disk->src->readonly) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Cannot migrate read-only disk %s"), + disk->dst); + goto cleanup; + } + if (!(diskAlias = qemuAliasFromDisk(disk)) || (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", hoststr, port, diskAlias) < 0)) -- 2.7.4

3 4

[libvirt] [RFC PATCH] Use disable-modern=on for disk device='lun'
by Ján Tomko 20 Sep '16

20 Sep '16

https://bugzilla.redhat.com/show_bug.cgi?id=1365823 For virtio-blk, scsi=on has been deprecated in virtio-1, so <disk type='block' device='lun'> no longer works with with a virtio-blk-pci device with machine types newer than 2.7: https://bugzilla.redhat.com/show_bug.cgi?id=1245453 http://git.qemu.org/?p=qemu.git;a=commitdiff;h=9a4c0e22 Add disable-modern=on on the QEMU command line to prolong the suffering for a while longer. --- The alternative would be using the QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY capability to report an error, instead of waiting until QEMU fails with an error, since it's the first commit when the following error should be reachable via libvirt-generated command line: http://git.qemu.org/?p=qemu.git;a=commitdiff;h=efb8206c src/qemu/qemu_command.c | 12 +++++ .../qemuxml2argv-virtio-lun-legacy.args | 30 +++++++++++++ .../qemuxml2argv-virtio-lun-legacy.xml | 52 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 97 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-lun-legacy.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-lun-legacy.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 051a0bc..03dc20e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2075,6 +2075,18 @@ qemuBuildDriveDevStr(const virDomainDef *def, virBufferAddLit(&opt, "virtio-blk-pci"); if (disk->iothread) virBufferAsprintf(&opt, ",iothread=iothread%u", disk->iothread); + + /* + * SCSI command passthrough was deprecated in virtio 1.0, + * see https://bugzilla.redhat.com/show_bug.cgi?id=1365823 + */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI) && + disk->device == VIR_DOMAIN_DISK_DEVICE_LUN && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY)) { + VIR_WARN("lun type devices are deprecated for virtio-blk-pci devices, " + "consider using disks on a virtio-scsi controller"); + virBufferAddLit(&opt, ",disable-modern=on"); + } } qemuBuildIoEventFdStr(&opt, disk->ioeventfd, qemuCaps); if (disk->event_idx && diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun-legacy.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun-legacy.args new file mode 100644 index 0000000..d1ff31c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun-legacy.args @@ -0,0 +1,30 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name test \ +-S \ +-M pc-0.13 \ +-m 1024 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ +-no-acpi \ +-boot dc \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ +-usb \ +-drive file=/dev/sdfake,format=qcow2,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,disable-modern=on,scsi=on,bus=pci.0,addr=0x4,\ +drive=drive-virtio-disk0,id=virtio-disk0 \ +-drive file=/dev/sdfake2,format=qcow2,if=none,id=drive-virtio-disk1 \ +-device virtio-blk-pci,disable-modern=on,scsi=on,bus=pci.0,addr=0x5,\ +drive=drive-virtio-disk1,id=virtio-disk1 \ +-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun-legacy.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun-legacy.xml new file mode 100644 index 0000000..63dbfda --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun-legacy.xml @@ -0,0 +1,52 @@ +<domain type='qemu'> + <name>test</name> + <uuid>bba65c0e-c049-934f-b6aa-4e2c0582acdf</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-0.13'>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='lun' rawio='yes'> + <driver name='qemu' type='qcow2'/> + <source dev='/dev/sdfake'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='block' device='lun'> + <driver name='qemu' type='qcow2'/> + <source dev='/dev/sdfake2'/> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </controller> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='user'> + <mac address='52:54:00:e5:48:58'/> + <model type='virtio'/> + <driver name='vhost' event_idx='off'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e854077..afe3073 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -931,6 +931,9 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("virtio-lun", QEMU_CAPS_VIRTIO_BLK_SCSI); + DO_TEST("virtio-lun-legacy", + QEMU_CAPS_VIRTIO_BLK_SCSI, + QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY); DO_TEST("disk-scsi-lun-passthrough", QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); -- 2.7.3

3 2

[libvirt] [PATCH] virtlogd: Don't stop or restart along with libvirtd
by Andrea Bolognani 20 Sep '16

20 Sep '16

Commit 839a060 tied the lifecycle of virtlogd more closely to that of libvirtd. Unfortunately, while starting virtlogd when libvirtd is started is definitely a good idea, restarting virtlogd or shutting it down at any time outside of system poweroff is not. Revert part of that commit by removing the PartOf= lines, meaning that only startup requests will be propagated from libvirtd to virtlogd. Resolves: https://bugzilla.redhat.com/1372576 --- src/logging/virtlogd.service.in | 1 - src/logging/virtlogd.socket.in | 1 - 2 files changed, 2 deletions(-) diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in index 8287994..09e0740 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -2,7 +2,6 @@ Description=Virtual machine log manager Requires=virtlogd.socket Before=libvirtd.service -PartOf=libvirtd.service Documentation=man:virtlogd(8) Documentation=http://libvirt.org diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in index efb6504..22b9360 100644 --- a/src/logging/virtlogd.socket.in +++ b/src/logging/virtlogd.socket.in @@ -1,7 +1,6 @@ [Unit] Description=Virtual machine log manager socket Before=libvirtd.service -PartOf=libvirtd.service [Socket] ListenStream=@localstatedir@/run/libvirt/virtlogd-sock -- 2.7.4

2 2

[libvirt] [PATCH v3 0/8] Introduce aliases for virt-admin's srv-* commands
by Erik Skultety 20 Sep '16

20 Sep '16

the original version: https://www.redhat.com/archives/libvir-list/2016-September/msg00312.html v2: https://www.redhat.com/archives/libvir-list/2016-September/msg00380.html Since this series (compared to v2) does a tiny bit of refactor (tweaking might be a better word in this case) as well, I was also looking into refactoring the parser in vsh.c....again...And again I gave up on doing that (this time a lot faster though) because that would mean to rewrite a lot of code mainly to enable usage of our virString* methods. I also found an ANSI C GNU-styled command line parser library [1] which might even cope with our command and option aliases (I didn't look into that much though, so take it with a grain of salt). However, though looking good, it would most likely hit the wall once it encountered our "multi-command" feature in the interactive shell mode :( [1] http://argtable.sourceforge.net/ since v1: - tweaked the virsh-self-test so that it also checks the aliased commands instead of skipping them (since there was a good reason for that before the changes this series introduces) - patches (now) 7-8 remained untouched since v2: - Michal was indeed right about having a proper check for missing aliases which would eventually result in a reasonable internal error - so the check was put into vshCmddefCheckInternals, but that function should not be called from within vshCmddefOptParse because it's not just about checking the .opts but the overall command structure and at the time of parsing the arguments we should already know whether the command structure is valid or not - since vshCmddefOptParse has been split once again, merge it with vshCmddefOptFill and drop the latter Erik Skultety (8): vsh: Fix NULL dereference leading to SIGSEGV if a command is missing '.info' vsh: vshCmddefHelp: Drop the unnecessary 'else' branch vsh: vshCmddefHelp: Retrieve command info after we know the command is non-NULL vsh: Extract vshCmddefCheckInternals from vshCmddefOptParse vsh: discard vshCmddefOptFill and move its body to vshCmddefOptParse virt-admin: Tweak command parsing logic so that aliases point to new commands virt-admin: Add some command aliases to provide syntax sugar over ugly commands virt-admin: Replace the (now) aliases with new command names in the man page tools/virsh-nodedev.c | 6 +- tools/virsh.pod | 2 - tools/virt-admin.c | 24 +++++ tools/virt-admin.pod | 30 +++--- tools/vsh.c | 280 ++++++++++++++++++++++++++------------------------ tools/vsh.h | 4 +- 6 files changed, 191 insertions(+), 155 deletions(-) -- 2.5.5

2 22

[libvirt] [PATCH v3 0/2] qemu/gluster: add option for tuning debug logging level
by Prasanna Kumar Kalever 20 Sep '16

20 Sep '16

v3: Add patch 2/2 which address capability checks Changed 'glusterfs_debug_level' to 'gluster_debug_level' agreeing to Peter Made changes in libvirtd_qemu.aug Thanks to Peter & Daniel v2: Modify test cases and syntax check changes as suggested by Peter in v1. Rename qemu_gfapi_debuglevel to glusterfs_debug_level as per Daniel comments. Fix to make debug_level changes effects on URI along with JSON. TODO: * changes in libvirtd_qemu.aug Which I don't understand for now * comment on debug_level variable in storage source Not sure what is the right place * Capablities check v1: Initial post Prasanna Kumar Kalever (2): qemu/gluster: add option for tuning debug logging level qemu_capabilities: Introduce gluster specific debug capability src/qemu/libvirtd_qemu.aug | 3 +++ src/qemu/qemu.conf | 20 ++++++++++++++++++++ src/qemu/qemu_capabilities.c | 6 ++++++ src/qemu/qemu_capabilities.h | 3 +++ src/qemu/qemu_command.c | 21 ++++++++++++++++++--- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/util/virstoragefile.h | 2 ++ .../qemuargv2xml-disk-drive-network-gluster.args | 7 ++++--- .../qemuxml2argv-disk-drive-network-gluster.args | 12 ++++++------ tests/qemuxml2argvtest.c | 3 ++- 11 files changed, 68 insertions(+), 13 deletions(-) -- 2.7.4

3 5

[libvirt] [PATCH] Add missing 'extern' for VIR_EXPORT_VAR macro
by Daniel P. Berrange 20 Sep '16

20 Sep '16

The recent update to gnulib commit 9d7a37ecb2ab516c19164a57b8aeb32016a99d2c Author: Eric Blake <eblake(a)redhat.com> Date: Thu Sep 15 15:12:52 2016 -0500 build: update to latest gnulib Pulled in a change that adds -fno-common to the default compiler flags commit bf8e658ffadb95d444f56d222d04c9af955af765 Author: Jim Meyering <meyering(a)fb.com> Date: Fri Sep 2 09:16:16 2016 -0700 manywarnings: add -fno-common This caused libvirt Mingw build to break with the compiler reporting 100's of definitions of virConnectAuthPtrDefault ./.libs/libvirt_util.a(libvirt_util_la-virarch.o):virarch.c:(.bss+0x0): multiple definition of `virConnectAuthPtrDefault' ./.libs/libvirt_util.a(libvirt_util_la-viralloc.o):viralloc.c:(.bss+0x0): first defined here ./.libs/libvirt_util.a(libvirt_util_la-viratomic.o):viratomic.c:(.bss+0x0): multiple definition of `virConnectAuthPtrDefault' ./.libs/libvirt_util.a(libvirt_util_la-viralloc.o):/home/berrange/src/virt/libvirt/src/util/viralloc.c:87: first defined here ./.libs/libvirt_util.a(libvirt_util_la-viraudit.o):viraudit.c:(.bss+0x0): multiple definition of `virConnectAuthPtrDefault' ./.libs/libvirt_util.a(libvirt_util_la-viralloc.o):/home/berrange/src/virt/libvirt/src/util/viralloc.c:87: first defined here ./.libs/libvirt_util.a(libvirt_util_la-virauth.o):virauth.c:(.bss+0x0): multiple definition of `virConnectAuthPtrDefault' ./.libs/libvirt_util.a(libvirt_util_la-viralloc.o):/home/berrange/src/virt/libvirt/src/util/viralloc.c:87: first defined here ./.libs/libvirt_util.a(libvirt_util_la-virauthconfig.o):virauthconfig.c:(.bss+0x0): multiple definition of `virConnectAuthPtrDefault' ...snip... The cause is our VIR_EXPORT_VAR macro which has some magic on win to add dllexport/dllimport to the variable declaration. Unfortunately the dllexport branch missed off the 'extern' keyword, so the header file was in fact declaring an instance of the variable in every source file. Previously the linker would merge all these definitions into one, but that no longer happens due to -fno-common Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushing as a CI build fix include/libvirt/libvirt-common.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-common.h.in b/include/libvirt/libvirt-common.h.in index 79bfe90..0e8ada4 100644 --- a/include/libvirt/libvirt-common.h.in +++ b/include/libvirt/libvirt-common.h.in @@ -49,7 +49,7 @@ extern "C" { # define VIR_EXPORT_VAR extern # else # ifdef IN_LIBVIRT -# define VIR_EXPORT_VAR __declspec(dllexport) +# define VIR_EXPORT_VAR __declspec(dllexport) extern # else # define VIR_EXPORT_VAR __declspec(dllimport) extern # endif -- 2.7.4

1 0