- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/2] Add machine type pc-1.0-qemu-kvm for live migrate compatibility with qemu-kvm
by Alex Bligh 08 Aug '14

08 Aug '14

This patch series adds inbound migrate capability from qemu-kvm version 1.0. The main ideas are those set out in Cole Robinson's patch here: http://pkgs.fedoraproject.org/cgit/qemu.git/tree/0001-Fix-migration-from-qe… however, rather than patching statically (and breaking inbound migration on existing machine types), I have added a new machine type (pc-1.0-qemu-kvm) without affecting any other machine types. The existing pc-1.0 machine type is renamed to pc-1.0-qemu-git, with pc-1.0 becoming an alias for one or another, as selected by a configure option (defaulting to pc-1.0-qemu-git, IE no change). This requires 'hot patching' the VMStateDescription in a couple of places, which in turn is less than obvious as there may be (indeed are for i8259) derived classes. Whilst pretty nausea-inducing, this approach has the benefit of being entirely self-contained. I developed this on qemu 2.0 but have forward ported it (trivially) to master. My testing has been on a VM live-migrated-to-file from Ubuntu Precise qemu-kvm 1.0. I have given this a moderate degree of testing but it could do with more. Note that certain hardware devices (including QXL) will not migrate properly due to a fundamental difference in their internal state between versions. Also note that (as expected) migratino from qemu-2.x to qemu-1.0 will not work, even if the machine types are the same. Alex Bligh (2): Add machine type pc-1.0-qemu-kvm for live migrate compatibility with qemu-kvm Add configure option --enable-pc-1-0-qemu-kvm configure | 12 ++++++++++++ hw/acpi/piix4.c | 49 ++++++++++++++++++++++++++++++++++++++++++++-- hw/i386/pc_piix.c | 39 +++++++++++++++++++++++++++++++++++- hw/timer/i8254_common.c | 41 ++++++++++++++++++++++++++++++++++++++ include/hw/acpi/piix4.h | 1 + include/hw/timer/i8254.h | 2 ++ 6 files changed, 141 insertions(+), 3 deletions(-) -- 1.7.9.5

4 19

[libvirt] [libvirt-glib] [PATCH v2 1/4] GVirDomainSnapshot: Add _get_is_current
by Timm Bäder 08 Aug '14

08 Aug '14

Add a way to determine if the given GVirDomainSnapshot is the current snapshot of its GVirDomain. --- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 33 +++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain-snapshot.h | 4 +++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 38 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index 7bb89f1..c53e877 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -235,3 +235,36 @@ gboolean gvir_domain_snapshot_delete (GVirDomainSnapshot *snapshot, } return TRUE; } + + +/** + * gvir_domain_snapshot_get_is_current: + * @snapshot: The domain snapshot + * @flags: Currently unused, pass 0 + * @is_current: (out): %TRUE if the given snapshot is the current snapshot + * of its domain, %FALSE otherwise. + * @error: (allow-none): Place-holder for error or %NULL + * + * Returns: %TRUE on success, %FALSE otherwise. + */ +gboolean gvir_domain_snapshot_get_is_current(GVirDomainSnapshot *snapshot, + guint flags, + gboolean *is_current, + GError **error) { + gint status; + + g_return_val_if_fail(GVIR_IS_DOMAIN_SNAPSHOT(snapshot), FALSE); + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); + + status = virDomainSnapshotIsCurrent(snapshot->priv->handle, flags); + if (status == -1) { + gvir_set_error(error, GVIR_DOMAIN_SNAPSHOT_ERROR, 0, + "Could not determine if `%s' is the current snapshot", + gvir_domain_snapshot_get_name(snapshot)); + return FALSE; + } + + *is_current = status; + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.h b/libvirt-gobject/libvirt-gobject-domain-snapshot.h index b3ebe7f..0a0bb96 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.h +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.h @@ -85,6 +85,10 @@ gboolean gvir_domain_snapshot_delete (GVirDomainSnapshot *snapshot, guint flags, GError **error); +gboolean gvir_domain_snapshot_get_is_current(GVirDomainSnapshot *snapshot, + guint flags, + gboolean *is_current, + GError **error); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_SNAPSHOT_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index b0c55b5..c740f88 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -242,6 +242,7 @@ LIBVIRT_GOBJECT_0.1.9 { gvir_domain_get_snapshots; gvir_domain_snapshot_delete; gvir_domain_snapshot_delete_flags_get_type; + gvir_domain_snapshot_get_is_current; gvir_domain_snapshot_list_flags_get_type; gvir_storage_pool_state_get_type; gvir_storage_vol_resize_flags_get_type; -- 2.0.4

3 8

[libvirt] new libvirt-python release for pypi needed (1.2.7)
by Thomas Bechtold 08 Aug '14

08 Aug '14

Hi, I'm using libvirt 1.2.7 and when I try to install libvirt-python via pypi, I get an error [1]. Please release a new version (1.2.7) on pypi. TIA, Tom [1] http://paste.openstack.org/show/91904/

1 0

[libvirt] [PATCHv3] conf: Add USB sound card support and implement it for qemu
by Peter Krempa 08 Aug '14

08 Aug '14

--- Notes: Version 3: - rebased after recent additions Version 2: - added docs docs/formatdomain.html.in | 5 +++-- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 ++++++++++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 9 ++++++--- 13 files changed, 33 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e5b1adb..409a76e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4981,9 +4981,10 @@ qemu-kvm -net nic,model=? /dev/null The <code>sound</code> element has one mandatory attribute, <code>model</code>, which specifies what real sound device is emulated. Valid values are specific to the underlying hypervisor, though typical - choices are 'es1370', 'sb16', 'ac97', and 'ich6' + choices are 'es1370', 'sb16', 'ac97', 'ich6' and 'usb'. (<span class="since"> - 'ac97' only since 0.6.0, 'ich6' only since 0.8.8</span>) + 'ac97' only since 0.6.0, 'ich6' only since 0.8.8, + 'usb' only since 1.2.7</span>) </dd> </dl> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c25c74b..e4c6218 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -458,7 +458,8 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "pcspk", "ac97", "ich6", - "ich9") + "ich9", + "usb") VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST, "virtio", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bffc0a5..ff7d640 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1177,6 +1177,7 @@ typedef enum { VIR_DOMAIN_SOUND_MODEL_AC97, VIR_DOMAIN_SOUND_MODEL_ICH6, VIR_DOMAIN_SOUND_MODEL_ICH9, + VIR_DOMAIN_SOUND_MODEL_USB, VIR_DOMAIN_SOUND_MODEL_LAST } virDomainSoundModel; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f69c4d0..360cc67 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -264,6 +264,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "memory-backend-ram", /* 170 */ "numa", "memory-backend-file", + "usb-audio", ); @@ -1483,6 +1484,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "usb-kbd", QEMU_CAPS_DEVICE_USB_KBD }, { "memory-backend-ram", QEMU_CAPS_OBJECT_MEMORY_RAM }, { "memory-backend-file", QEMU_CAPS_OBJECT_MEMORY_FILE }, + { "usb-audio", QEMU_CAPS_OBJECT_USB_AUDIO }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e80a377..6342f81 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -212,6 +212,7 @@ typedef enum { QEMU_CAPS_OBJECT_MEMORY_RAM = 170, /* -object memory-backend-ram */ QEMU_CAPS_NUMA = 171, /* newer -numa handling with disjoint cpu ranges */ QEMU_CAPS_OBJECT_MEMORY_FILE = 172, /* -object memory-backend-file */ + QEMU_CAPS_OBJECT_USB_AUDIO = 173, /* usb-audio device support */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4e074e5..eb3f392 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2090,9 +2090,10 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, for (i = 0; i < def->nsounds; i++) { if (def->sounds[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) continue; - /* Skip ISA sound card, and PCSPK */ + /* Skip ISA sound card, PCSPK and usb-audio */ if (def->sounds[i]->model == VIR_DOMAIN_SOUND_MODEL_SB16 || - def->sounds[i]->model == VIR_DOMAIN_SOUND_MODEL_PCSPK) + def->sounds[i]->model == VIR_DOMAIN_SOUND_MODEL_PCSPK || + def->sounds[i]->model == VIR_DOMAIN_SOUND_MODEL_USB) continue; if (virDomainPCIAddressReserveNextSlot(addrs, &def->sounds[i]->info, @@ -4687,6 +4688,15 @@ qemuBuildSoundDevStr(virDomainDefPtr def, case VIR_DOMAIN_SOUND_MODEL_ICH6: model = "intel-hda"; break; + case VIR_DOMAIN_SOUND_MODEL_USB: + model = "usb-audio"; + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_USB_AUDIO)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("usb-audio controller is not supported " + "by this QEMU binary")); + goto error; + } + break; case VIR_DOMAIN_SOUND_MODEL_ICH9: model = "ich9-intel-hda"; if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA)) { diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index ebbfb82..c8a379a 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -115,4 +115,5 @@ <flag name='enable-fips'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index ab631a2..4b7651e 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -128,4 +128,5 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index e710b60..d146bf9 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -129,4 +129,5 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 36758c8..5fa30aa 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -137,4 +137,5 @@ <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index ca2c236..f364bbf 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -144,4 +144,5 @@ <flag name='usb-kbd'/> <flag name='host-pci-multidomain'/> <flag name='msg-timestamp'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 4b9f693..10ce1b5 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -143,4 +143,5 @@ <flag name='host-pci-multidomain'/> <flag name='msg-timestamp'/> <flag name='numa'/> + <flag name='usb-audio'/> </qemuCaps> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 105a563..366e36d 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -842,7 +842,8 @@ mymain(void) QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, QEMU_CAPS_VNC_SHARE_POLICY, QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_USB_STORAGE); + QEMU_CAPS_DEVICE_USB_STORAGE, + QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("qemu-1.2.0", 1002000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -951,7 +952,8 @@ mymain(void) QEMU_CAPS_VNC_SHARE_POLICY, QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_USB_STORAGE_REMOVABLE); + QEMU_CAPS_USB_STORAGE_REMOVABLE, + QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("qemu-kvm-1.2.0", 1002000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -1065,7 +1067,8 @@ mymain(void) QEMU_CAPS_VNC_SHARE_POLICY, QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_USB_STORAGE_REMOVABLE); + QEMU_CAPS_USB_STORAGE_REMOVABLE, + QEMU_CAPS_OBJECT_USB_AUDIO); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.0.2

2 2

[libvirt] [BUG] Two different connections to the same host through different transport
by Емил Гелев 08 Aug '14

08 Aug '14

Hi. I am using libvirt for some time and I have found the following problem. When I try opening two connections with the same credentials to the same host but using different transport(TCP and TLS) I get the following error when trying to free the TLS one: "*** Error in `./test': double free or corruption (!prev): 0x00000000014a7a60 *** Aborted (core dumped)" Example code: #include <stdio.h> #include <stdlib.h> #include <string.h> #include <libvirt/libvirt.h> struct CredentialsPack { const char* username; const char* password; }; struct CredentialsPack* newCredentialsPack(const char* username, const char* password) { struct CredentialsPack* ptr = malloc(sizeof(struct CredentialsPack)); ptr->username = username; ptr->password = password; return ptr; } static int authCredTypes[] = { VIR_CRED_AUTHNAME, VIR_CRED_PASSPHRASE, }; static int authCb(virConnectCredentialPtr cred, unsigned int ncred, void* cbdata) { struct CredentialsPack* inputCreds = (struct CredentialsPack*) cbdata; int i; for (i = 0; i < ncred; ++i) { if (cred[i].type == VIR_CRED_AUTHNAME) { cred[i].result = strdup(inputCreds->username); if (cred[i].result == NULL) { return -1; } cred[i].resultlen = strlen(cred[i].result); } else if (cred[i].type == VIR_CRED_PASSPHRASE) { cred[i].result = strdup(inputCreds->password); if (cred[i].result == NULL) { return -1; } cred[i].resultlen = strlen(cred[i].result); } } return 0; } int main(){ struct CredentialsPack* credentials = newCredentialsPack("user", "pass"); virConnectAuth auth; auth.credtype = authCredTypes; auth.ncredtype = sizeof(authCredTypes) / sizeof(int); auth.cb = authCb; auth.cbdata = credentials; virConnectPtr conn; conn = virConnectOpenAuth("qemu+tcp://host1/system", &auth, 0); struct CredentialsPack* credentials2 = newCredentialsPack("user", "pass"); virConnectAuth auth2; auth2.credtype = authCredTypes; auth2.ncredtype = sizeof(authCredTypes) / sizeof(int); auth2.cb = authCb; auth2.cbdata = credentials2; virConnectPtr conn2; conn2 = virConnectOpenAuth("qemu://host1/system", &auth2, 0); // virConnectClose(conn); // this does not change the behaviour virConnectClose(conn2); // here the error occurs } If I try to close "conn" then everything works until I try to close "conn2". I can even invoke virConnectListAllDomains using "conn2" and use the domain pointers when "conn" is closed. The problem is when I try to close "conn2". The platform running this code is Ubuntu 14.04. The version of libvirt is 1.2.2 (default configuration). The certificate of the CA which signed the server certificate is under /etc/pki/CA/cacert.pem The target machine is RHEL 6.5. The version of libvirt is 0.10.2. It is configured this way: listen_tls = 1 listen_tcp = 1 auth_tcp = sasl auth_tls = sasl tls_no_verify_certificate = 1 Everything else is set to default. The certificate of the CA which signed the server certificate is under /etc/pki/CA/cacert.pem The user "user" is added to the DB( using $ saslpasswd2 -a libvirt user). I can successfully execute the following on the command line using the "user"/"pass" credentials: virsh -c qemu://host1/system list virsh -c qemu+tcp://host1/system list I hope this will be useful. Thank you.

1 0

[libvirt] virsh migrate: sometimes command line cannot exit until manually press "ENTER" key
by Chun Yan Liu 08 Aug '14

08 Aug '14

Hi, List, Do you meet the same problem? Host is kvm, doing: (e.g.) #virsh migrate sles11 qemu+ssh://147.2.207.55/system --live --unsafe password: Sometimes, VM is already running on the target host and disappears from source host, but the command line still hangs there, if pressing "ENTER", it will exit. I debugged the code, but found the result is weird. The code hangs at tools/virsh-domain.c -> cmdMigrate ->vshWatchJob->poll(): poll() is trying to select pipe_fd, which is used to receive message from doMigrate thread. In debugging, found that doMigrate finishes and at the end it does call safewrite() to write the retval ('0' or '1') to pipe_fd, and the write is completed. But cmdMigrate poll() cannot get the event. Then after pressing "ENTER" key, poll() can get the event and select pipe_fd, then command line can exit. Any ideas about the possible reason? Thanks, Chunyan

2 2

[libvirt] [PATCH 0/2] active commit fixes
by Eric Blake 08 Aug '14

08 Aug '14

In response to the valgrind trace I posted to the list last night. Valgrind is awesome :) I had a very hard time reproducing the race when run under gdb or at normal speeds, but valgrind was slow enough that I was hitting it more frequently, as well as getting information about the bug and where to go to fix it. Eric Blake (2): blockjob: avoid memory leak during block pivot blockjob: fix use-after-free in blockcopy src/qemu/qemu_driver.c | 40 +++++++++++++++++++++++++--------------- src/util/virstoragefile.c | 1 + 2 files changed, 26 insertions(+), 15 deletions(-) -- 1.9.3

2 7

Re: [libvirt] [PATCH] audit: Fix some comments
by Wang Rui 08 Aug '14

08 Aug '14

On 2014/8/7 17:07, Ján Tomko wrote: > On 08/07/2014 10:12 AM, Wang Rui wrote: >> Fix a comment in virDomainAuditNetDevice. >> Fix a typo in comment of qemuPhysIfaceConnect which is >> the caller of virDomainAuditNetDevice. >> >> Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> >> --- >> src/conf/domain_audit.c | 4 ++-- >> src/qemu/qemu_command.c | 2 +- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> > > ACK and pushed. Thanks. I have a question about comment style. I see there are two comment styles in our libvirt code. One is /* XXXX * XXXX */ The other is /* XXXX * XXXX */ Are both of them fine ? Or which one is recommended ? (I'm not sure about my comments when coding.)

2 1

[libvirt] [PATCH v3 0/3] Add iSCSI hostdev pass-through device
by John Ferlan 07 Aug '14

07 Aug '14

Patches 1 & 2 are related to: Update to http://www.redhat.com/archives/libvir-list/2014-July/msg01098.html Patch 1/3 is already ACK'd, but felt it was easier to push together. Patch 2/3 change since last: - Fix typos as called in review of 8/8 - Adjust the rng file to - Change the order of things to be <source>, then <auth> to follow how <disk> (and storage pools) do things. That resulted in code motion in domain_conf.c and adjustment to the *-iscsi-auth.xml files Patch 3 is related to http://www.redhat.com/archives/libvir-list/2014-July/msg01268.html John Ferlan (3): domain_conf: Common routine to handle network storage host xml def hostdev: Add iSCSI hostdev XML qemu: Remove extraneous space in function prototypes docs/formatdomain.html.in | 144 ++++++---- docs/schemas/domaincommon.rng | 48 +++- src/conf/domain_conf.c | 289 +++++++++++++++------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.h | 136 +++++----- src/qemu/qemu_conf.h | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 14 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 46 ++++ .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 14 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi.xml | 40 +++ ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 16 ++ ...qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 46 ++++ .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 16 ++ .../qemuxml2argv-hostdev-scsi-virtio-iscsi.xml | 40 +++ tests/qemuxml2argvtest.c | 16 ++ tests/qemuxml2xmltest.c | 5 + 16 files changed, 672 insertions(+), 202 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.xml -- 1.9.3

2 8

[libvirt] File permissions on VNC unix sockets
by Landon Gilbert-Bland 07 Aug '14

07 Aug '14

I am using kvm libvirt/qemu, and am trying to get VNC working with unix sockets. I'm using the following in my XML: <graphics type='vnc' socket='/tmp/kvmtest'/> This works, it creates the unix socket and I can use it for VNC. But it creates the socket with 755 permissions, and owned by libvirt-qemu:kvm. Ideally, I would like it to be 770 root:libvirtd, but could also work with 775 libvirt-qemu:kvm. Basically, I would like the group to be read/write/execute, so that anyone in this group can use virt-manager (or whatever) to get into the vm with vnc. I haven't found a way to change this in the settins. It doesn't seem to be honoring the unix socket settings in /etc/libvirt/libvirdd.conf (it looks like those are only for libvirt-sock and libvirt-sock-ro), and I haven't been able to find any documentation about changing these permissions in the XML. I can manually chmod/chown the socket after it is created (manually or with a cron), but that is far from an ideal solution. I don't suppose anyone has run across a configuration option for this that I have missed? I have only tested this in ubuntu 14.01 and debian sid, for what it's worth. Thanks, --landon

1 1

[libvirt] Error
by ahmad jan 07 Aug '14

07 Aug '14

I am using Libvirt-1.0.0 on ubuntu 14.02 LTS and found the following error "checking linux/if_bridge.h usability... no checking linux/if_bridge.h presence... yes configure: WARNING: linux/if_bridge.h: present but cannot be compiled configure: WARNING: linux/if_bridge.h: check for missing prerequisite headers? configure: WARNING: linux/if_bridge.h: see the Autoconf documentation configure: WARNING: linux/if_bridge.h: section "Present But Cannot Be Compiled" configure: WARNING: linux/if_bridge.h: proceeding with the compiler's result configure: WARNING: ## ------------------------------------- ## configure: WARNING: ## Report this to libvir-list <at> redhat.com ## configure: WARNING: ## ------------------------------------- ## checking for linux/if_bridge.h... no configure: error: You must install kernel-headers in order to compile libvirt with QEMU or LXC support" Please Guide, how do I recover it thanks

3 2

[libvirt] Help Required
by ahmad jan 07 Aug '14

07 Aug '14

Respected Sir i am using libvirt-1.2.6 API and facing the following error please guide libvirtd: /usr/local/lib/libvirt.so.0: version `LIBVIRT_PRIVATE_1.2.6' not found (required by libvirtd) best regrads

2 1

[libvirt] [PATCH] virsh: clean up attach-interface paragraph in man page
by Laine Stump 07 Aug '14

07 Aug '14

This makes the paragaph about attach-interface more descriptive and correct, adding in a few bits of information that were previously missing, e.g. --script is only allowed for bridge interfaces of Xen domains, target name is regenerated if it starts with vnet, mac address will be autogenerated if not specified. (I did this in response to an email asking why a script couldn't be specified for a bridge interface of a qemu domain, and why an interface of type='ethernet' couldn't be created with attach-interface) --- tools/virsh.pod | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 849ae31..abb8743 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2202,19 +2202,29 @@ Likewise, I<--shareable> is an alias for I<--mode shareable>. [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] [I<--config>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] -Attach a new network interface to the domain. I<type> can be either I<network> -to indicate a physical network device or I<bridge> to indicate a bridge to a -device. I<source> indicates the source device. I<target> allows to indicate -the target device in the guest. Names starting with 'vnet' are considered as -auto-generated an hence blanked out. I<mac> allows to specify the MAC address -of the network interface. I<script> allows to specify a path to a script -handling a bridge instead of the default one. I<model> allows to specify the -model type. I<inbound> and I<outbound> control the bandwidth of the interface. -I<peak> and I<burst> are optional, so "average,peak", "average,,burst" and -"average" are also legal. Values for I<average> and I<peak> are -expressed in kilobytes per second, while I<burst> is expressed in kilobytes -in a single burst at -I<peak> speed as described in the Network XML -documentation at L<http://libvirt.org/formatnetwork.html#elementQoS>. +Attach a new network interface to the domain. I<type> can be either +I<network> to indicate connection via a libvirt virtual network or +I<bridge> to indicate connection via a bridge device on the host. +I<source> indicates the source of the connection (either the name of a +network, or of a bridge device). I<target> is used to specify the +tap/macvtap device to be used to connect the domain to the +source. Names starting with 'vnet' are considered as auto-generated +and are blanked out/regenerated each time the interface is attached. +I<mac> specifies the MAC address of the network interface; if a MAC +address is not given, a new address will be automatically generated +(and stored in the persistent configuration if "--config" is given on +the commandline). I<script> is used to specify a path to a custom +script to be called while attaching to a bridge - this will be called +instead of the default script not in addition to it; --script is valid +only for interfaces of type I<bridge> and only for Xen domains. +I<model> specifies the network device model to be presented to the +domain. I<inbound> and I<outbound> control the bandwidth of the +interface. I<peak> and I<burst> are optional, so "average,peak", +"average,,burst" and "average" are also legal. Values for I<average> +and I<peak> are expressed in kilobytes per second, while I<burst> is +expressed in kilobytes in a single burst at -I<peak> speed as +described in the Network XML documentation at +L<http://libvirt.org/formatnetwork.html#elementQoS>. If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. -- 1.9.3

2 1

[libvirt] Can't run vbox's network driver and storage driver.
by Taowei Luo 07 Aug '14

07 Aug '14

Hi, I just can't find a way running the network driver and storage driver provided by vbox. When I use vbox:///session as an url to run vbox driver and call network (or storage) API, the vbox's driver didn't execute. Instead, it would run drivers in src/network and src/storage. The problem only comes with the network driver and storage driver. Which means the vbox's domain driver works well with libvirt. I know that actually libvirt communicate with vbox driver though the remote driver, but I don't know how to make remote driver call vbox's network driver(or storage driver). BTW, I need vbox's driver because I have to do some test on it. Thanks, Taowei

1 0

[libvirt] [PATCH] daemon: Fix indentation in libvirtd.c
by Wang Rui 07 Aug '14

07 Aug '14

Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- daemon/libvirtd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 4c926b3..946081a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -803,11 +803,11 @@ static void daemonReloadHandler(virNetServerPtr srv ATTRIBUTE_UNUSED, siginfo_t *sig ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { - VIR_INFO("Reloading configuration on SIGHUP"); - virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", - VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL); - if (virStateReload() < 0) - VIR_WARN("Error while reloading drivers"); + VIR_INFO("Reloading configuration on SIGHUP"); + virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", + VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL); + if (virStateReload() < 0) + VIR_WARN("Error while reloading drivers"); } static int daemonSetupSignals(virNetServerPtr srv) -- 1.7.12.4

2 1

[libvirt] [PATCH] audit: Fix some comments
by Wang Rui 07 Aug '14

07 Aug '14

Fix a comment in virDomainAuditNetDevice. Fix a typo in comment of qemuPhysIfaceConnect which is the caller of virDomainAuditNetDevice. Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- src/conf/domain_audit.c | 4 ++-- src/qemu/qemu_command.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 93625fc..fcf9df7 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -318,8 +318,8 @@ virDomainAuditNet(virDomainObjPtr vm, /** * virDomainAuditNetDevice: - * @vm: domain opening a network-related device - * @def: details of network device that fd will be tied to + * @vmDef: the definition of the VM + * @netDef: details of network device that fd will be tied to * @device: device being opened (such as /dev/vhost-net, * /dev/net/tun, /dev/tanN). Note that merely opening a device * does not mean that virDomain owns it; a followup virDomainAuditNet diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a5ff10a..033a5a8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -160,7 +160,7 @@ VIR_ENUM_IMPL(qemuNumaPolicy, VIR_DOMAIN_NUMATUNE_MEM_LAST, * qemuPhysIfaceConnect: * @def: the definition of the VM (needed by 802.1Qbh and audit) * @driver: pointer to the driver instance - * @net: pointer to he VM's interface description with direct device type + * @net: pointer to the VM's interface description with direct device type * @qemuCaps: flags for qemu * @vmop: VM operation type * -- 1.7.12.4

1 0

[libvirt] Lifecycle events during reboot for KVM and Xen
by Thomas Bechtold 07 Aug '14

07 Aug '14

Hi, during debugging a problem[1] of Openstack Nova I recognized the following: Doing a reboot (from inside of the VM with "reboot" command) on a kvm VM doesn't send any lifecycle events (events debugged with [2]). Doing the same thing with a xen VM leads to 2 events: First a VIR_DOMAIN_EVENT_STOPPED and then a VIR_DOMAIN_EVENT_STARTED event. The problem here is that for the xen case it doesn't seem to be possible to recognize that a reboot is ongoing. For that reason the OpenStack Nova component just forces the domain to stop after receiving the VIR_DOMAIN_EVENT_STOPPED event. Is it expected that the 2 drivers send different events for the same action or a bug in qemu/xen/libvirt? Cheers, Tom [1] https://bugs.launchpad.net/nova/+bug/1293480 [2] https://gist.github.com/toabctl/53f26989ad7634a3168b

1 0

[libvirt] [PATCH V3 00/24] xen_xm parsing code refactor
by David Kiarie 07 Aug '14

07 Aug '14

Kiarie Kahurani (24): src/xenxs:Refactor code parsing memory config src/xenxs:Refactor code parsing virtual time config src/xenxs:Refactor code parsing event actions src/xenxs:Refactor code parsing PCI config src/xenxs:Refactor code parsing CPU features src/xenxs:Refactor code parsing xm disk config src/xenxs:Refactor code parsing Vfb config src/xenxs:Refactor code parsing Char devices config src/xenxs:Refactor code parsing Vif config src/xenxs:Refactor code parsing emulated hardware config src/xenxs:Refactor code parsing general config src/xenxs:Refactor code parsing OS config src/xenxs:Export code for reuse src/xenxs:Refactor code formating general VM config src/xenxs:Refactor code formating memory config src/xenxs:Refactor code formating virtual time config src/xenxs:Refactor code formating event actions config src/xenxs:Refactor code formating Char devices config src/xenxs:Refactor code formating xm disk config src/xenxs:Refactor code formating CPU features config src/xenxs:Refactor code formating OS config src/xenxs:Refactor code formating Vfb config src/xenxs:Refactor code formating emulated devices config src/xenxs:Export code src/xenxs/xen_xm.c | 2217 +++++++++++--------- src/xenxs/xen_xm.h | 4 + tests/xmconfigdata/test-escape-paths.cfg | 12 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-localtime.cfg | 10 +- tests/xmconfigdata/test-fullvirt-net-ioemu.cfg | 10 +- tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 10 +- tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 10 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 10 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 10 +- .../test-fullvirt-serial-dev-2-ports.cfg | 10 +- .../test-fullvirt-serial-dev-2nd-port.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-file.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-null.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 10 +- .../test-fullvirt-serial-tcp-telnet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 10 +- tests/xmconfigdata/test-fullvirt-sound.cfg | 12 +- tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 10 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-utc.cfg | 10 +- tests/xmconfigdata/test-no-source-cdrom.cfg | 10 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.cfg | 2 +- .../test-paravirt-new-pvfb-vncdisplay.cfg | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 2 +- tests/xmconfigdata/test-paravirt-vcpu.cfg | 2 +- tests/xmconfigdata/test-pci-devs.cfg | 10 +- 35 files changed, 1416 insertions(+), 1083 deletions(-) V3 of series refactoring xen_xm.c code for reuse in the xen-xl parser. Changes since V2 -Formating fixes -reused Vif formating and parsing code -- 1.8.4.5

2 29

[libvirt] valgrind report on active commit
by Eric Blake 06 Aug '14

06 Aug '14

I'm still investigating, but posting this trace now in case someone else spots the bug. I created a chain three deep (base.img <- mid.img <- top.img), then ran blockcopy --finish, blockcommit --active --shallow --pivot, and another blockcommit --active --shallow --pivot. The last attempt to pivot exposed the bad memory use: ==25612== Invalid read of size 4 ==25612== at 0x50E7C90: virStorageSourceGetActualType (virstoragefile.c:1948) ==25612== by 0x209C0B18: qemuDomainDetermineDiskChain (qemu_domain.c:2473) ==25612== by 0x209D7F6A: qemuProcessHandleBlockJob (qemu_process.c:1087) ==25612== by 0x209F40C9: qemuMonitorEmitBlockJob (qemu_monitor.c:1357) ==25612== by 0x20A06B7F: qemuMonitorJSONHandleBlockJobImpl (qemu_monitor_json.c:922) ==25612== by 0x20A06D18: qemuMonitorJSONHandleBlockJobCompleted (qemu_monitor_json.c:969) ==25612== by 0x20A048CD: qemuMonitorJSONIOProcessEvent (qemu_monitor_json.c:166) ==25612== by 0x20A04A73: qemuMonitorJSONIOProcessLine (qemu_monitor_json.c:195) ==25612== by 0x20A04CDB: qemuMonitorJSONIOProcess (qemu_monitor_json.c:237) ==25612== by 0x209F1047: qemuMonitorIOProcess (qemu_monitor.c:402) ==25612== by 0x209F1AB1: qemuMonitorIO (qemu_monitor.c:651) ==25612== by 0x50A73C0: virEventPollDispatchHandles (vireventpoll.c:510) ==25612== Address 0xe4b5610 is 0 bytes inside a block of size 200 free'd ==25612== at 0x4A07577: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==25612== by 0x50839E9: virFree (viralloc.c:582) ==25612== by 0x50E7E51: virStorageSourceFree (virstoragefile.c:2015) ==25612== by 0x209D7EFF: qemuProcessHandleBlockJob (qemu_process.c:1073) ==25612== by 0x209F40C9: qemuMonitorEmitBlockJob (qemu_monitor.c:1357) ==25612== by 0x20A06B7F: qemuMonitorJSONHandleBlockJobImpl (qemu_monitor_json.c:922) ==25612== by 0x20A06D18: qemuMonitorJSONHandleBlockJobCompleted (qemu_monitor_json.c:969) ==25612== by 0x20A048CD: qemuMonitorJSONIOProcessEvent (qemu_monitor_json.c:166) ==25612== by 0x20A04A73: qemuMonitorJSONIOProcessLine (qemu_monitor_json.c:195) ==25612== by 0x20A04CDB: qemuMonitorJSONIOProcess (qemu_monitor_json.c:237) ==25612== by 0x209F1047: qemuMonitorIOProcess (qemu_monitor.c:402) ==25612== by 0x209F1AB1: qemuMonitorIO (qemu_monitor.c:651) -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 1

[libvirt] [PATCH v5 0/4] fix blockcopy across libvirtd restart, turn on active blockcommit
by Eric Blake 06 Aug '14

06 Aug '14

v4 was here: https://www.redhat.com/archives/libvir-list/2014-June/msg01095.html Since then: I _finally_ implemented persistent domain updates to match live changes, by reimplementing how <mirror> is tracked in XML to be more robust to libvirtd restarts. In particular, it fixes a bug in v4 that Adam Litke pointed out where a pivot commit would emit a ready event for 'active commit' but then a completed event for plain 'commit'. Patches 1 and 2 are completely local to blockcopy, and fix a long-standing bug where it is not robust to libvirtd restarts (similar to the bug fixed in 60e4944). They are pre-requisite to turning on active commit. Patches 3 and 4 are borderline on whether it is a new feature or a bug fix. But consider that commit 47549d5 turned on qemu feature probing with the intent of getting this in 1.2.7, and we already missed getting active commit into 1.2.6. As it is, patch 4 is very similar to the already-acked counterpart of v4. Therefore, even though I missed rc1, I'm arguing that this whole series should be included in rc2 in time for 1.2.7. Not done yet, but that I'd also like to have in the release if I can swing it: the new virConnectGetDomainCapabilities API needs to expose features on whether active commit will work. Also, I'd like to fix libvirtd restarts to inspect all existing <mirror> tags and see if the job completed while libvirtd was offline (that is, when we miss an event, we should still start up in the correct state when reconnecting to qemu). Eric Blake (4): blockcopy: add more XML for state tracking blockjob: properly track blockcopy xml changes on disk blockcommit: track job type in xml blockcommit: turn on active commit docs/formatdomain.html.in | 23 ++- docs/schemas/domaincommon.rng | 19 ++- src/conf/domain_conf.c | 56 ++++++- src/conf/domain_conf.h | 14 +- src/qemu/qemu_driver.c | 167 ++++++++++++++------- src/qemu/qemu_process.c | 92 ++++++++++-- .../qemuxml2argv-disk-active-commit.xml | 37 +++++ .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 8 +- .../qemuxml2xmlout-disk-mirror-old.xml | 4 +- tests/qemuxml2xmltest.c | 1 + 10 files changed, 336 insertions(+), 85 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml -- 1.9.3

2 14

[libvirt] Error
by ahmad jan 06 Aug '14

06 Aug '14

I want to configure Libvirt-1.2.7 on ubuntu and found the following Error "Could not find linxml2 anywhere" guide please

3 2

[libvirt] libvirt external disk-only snapshot will pause the VM?
by Yuanzhen Gu 06 Aug '14

06 Aug '14

Hello folks, If I give command to take external disk-only live snapshot, such as # virsh snapshot-create-as vm1 snapshot_vm1 --disk-only will the guest OS be paused or suspend while the snapshot being taken? Thanks very much! Best, Yuanzhen

2 8

[libvirt] [PATCH] Node Devices: Fix nodedev-list for fc_host & vports.
by Prerna Saxena 06 Aug '14

06 Aug '14

In a system with Fiber Channel Host Adapters, a query to list all Fibre Channel HBAs OR Vports currently returns empty list: $ virsh nodedev-list --cap fc_host $ Libvirt correctly discovers properties for all HBAs. However, the reporting fails because of incorrect flag comparison while filtering these types. This is fixed by removing references to 'VIR_CONNECT_LIST_NODE_DEVICES_CAP_*' for comparison and replacing those with 'VIR_NODE_DEV_CAP_*' Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- src/conf/node_device_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 96524a6..025d08c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1732,12 +1732,12 @@ virNodeDeviceCapMatch(virNodeDeviceObjPtr devobj, return true; if (cap->type == VIR_NODE_DEV_CAP_SCSI_HOST) { - if (type == VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST && + if (type == VIR_NODE_DEV_CAP_FC_HOST && (cap->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST)) return true; - if (type == VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPORTS && + if (type == VIR_NODE_DEV_CAP_VPORTS && (cap->data.scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS)) return true; -- 1.9.3 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 2

[libvirt] [PATCH] snapshot: conf: Enforce absolute paths on disk and memory images
by Peter Krempa 06 Aug '14

06 Aug '14

RNG schema as well as the qemu driver requires absolute paths for memory and disk snapshot image files but the XML parser was not enforcing it. Add checks to avoid problems in qemu where the configuration it creates is invalid. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1126329 --- src/conf/snapshot_conf.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 240ca90..c53a66b 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -177,6 +177,16 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, } } + /* validate that the passed path is absolute */ + if (virStorageSourceIsLocalStorage(def->src) && + def->src->path && + def->src->path[0] != '/') { + virReportError(VIR_ERR_XML_ERROR, + _("disk snapshot image path '%s' must be absolute"), + def->src->path); + goto cleanup; + } + if (!def->snapshot && (def->src->path || def->src->format)) def->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; @@ -327,6 +337,14 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, def->file = memoryFile; memoryFile = NULL; + /* verify that memory path is absolute */ + if (def->file && def->file[0] != '/') { + virReportError(VIR_ERR_XML_ERROR, + _("memory snapshot file path (%s) must be absolute"), + def->file); + goto cleanup; + } + if ((n = virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) goto cleanup; if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_DISKS) { -- 2.0.2

2 2

[libvirt] [PATCH] qemu: Make virFileFindHugeTLBFS fault tolerant
by Michal Privoznik 06 Aug '14

06 Aug '14

Since commit be0782e1 we are parsing /proc/meminfo to find out the default huge page size. However, if the host we are running at does not support any huge pages (e.g. CONFIG_HUGETLB_PAGE is turned off), we will not successfully parse the meminfo file and hence the whole qemu driver init process fails. Moreover, the default huge page size is needed if and only if there's at least one hugetlbfs mount point. So the fix consists of moving the virFileGetDefaultHugepageSize function call after the first hugetlbfs mount point is found. With this fix, we fail to start with one or more hugetlbfs mounts and malformed meminfo file, but that's expected (how can one mount hugetlbfs without kernel supporting huge pages?). Workaround in that case is to umount all the hugetlbfs mounts. Reported-by: Jim Fehlig <jfehlig(a)suse.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virfile.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 9863fd0..f9efc65 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2990,10 +2990,7 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, char mntbuf[1024]; virHugeTLBFSPtr fs = NULL; size_t nfs = 0; - unsigned long long default_hugepagesz; - - if (virFileGetDefaultHugepageSize(&default_hugepagesz) < 0) - goto cleanup; + unsigned long long default_hugepagesz = 0; if (!(f = setmntent(PROC_MOUNTS, "r"))) { virReportSystemError(errno, @@ -3019,6 +3016,10 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, if (virFileGetHugepageSize(tmp->mnt_dir, &tmp->size) < 0) goto cleanup; + if (!default_hugepagesz && + virFileGetDefaultHugepageSize(&default_hugepagesz) < 0) + goto cleanup; + tmp->deflt = tmp->size == default_hugepagesz; } -- 1.8.5.5

3 2