- Devel - libvirt List Archives

[libvirt] [PATCH v1] libxl: reverse defaults on HVM net device attach
by Joao Martins 15 Dec '16

15 Dec '16

libvirt libxl picks its own default with respect to the default NIC to use. libxlMakeNic is the one responsible for this and on boot it picks LIBXL_NIC_TYPE_VIF_IOEMU for HVM domains such that it accomodates both PV and emulated one. The good behaving guest at boot will then select the pv and unplug the emulated device. Now, on HVM when attaching an interface it will pick the same default that is LIBXL_NIC_TYPE_VIF_IOEMU which as a result will fail the attach (see xen commit 32e9d0f ("libxl: nic type defaults to vif in hotplug for hvm guest"). Xen doesn't yet support the hotplug of emulated devices, but we don't want to rule out that case either, which might get support in the future. Hence we simply reverse the defaults when we are attaching the interface which allows libvirt to prefer the PV nic first without adding "model='netfront'" following the same pattern as above commit. Also to avoid ruling out the emulated one we set to LIBXL_NIC_TYPE_IOEMU when setting a model type that is not 'netfront'. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Since RFC: - Joao: Add mention to HVM domains in the first paragraph of commit message. - Jim: Add comment about libxl_device_nic type inner workings - Jim: Prevent attach on PV when model != netfront - Joao: Remove now unused ioemu_nic variable - Joao: Append one small paragraph about why we mimic xl/libxl --- src/libxl/libxl_conf.c | 39 +++++++++++++++++++++++++++++++-------- src/libxl/libxl_conf.h | 3 ++- src/libxl/libxl_driver.c | 2 +- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index dcf8e7e..9515e2a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -881,9 +881,9 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) int libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, - libxl_device_nic *x_nic) + libxl_device_nic *x_nic, + bool attach) { - bool ioemu_nic = def->os.type == VIR_DOMAIN_OSTYPE_HVM; virDomainNetType actual_type = virDomainNetGetActualType(l_nic); virNetworkPtr network = NULL; virConnectPtr conn = NULL; @@ -907,16 +907,39 @@ libxlMakeNic(virDomainDefPtr def, virMacAddrGetRaw(&l_nic->mac, x_nic->mac); - if (ioemu_nic) - x_nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; - else - x_nic->nictype = LIBXL_NIC_TYPE_VIF; - + /* + * The nictype field of libxl_device_nic structure tells Xen which type of + * NIC device to create for the domain. LIBXL_NIC_TYPE_VIF specifies a + * PV NIC. LIBXL_NIC_TYPE_VIF_IOEMU specifies a PV and emulated NIC, + * allowing the domain to choose which NIC to use and unplug the unused + * one. LIBXL_NIC_TYPE_VIF_IOEMU is only valid for HVM domains. Further, + * if hotplugging the NIC, emulated NICs are currently not supported. + * Alternatively one could set LIBXL_NIC_TYPE_UNKNOWN and let libxl decide, + * but its behaviour might not be consistent across all libvirt supported + * versions. The other nictype values are well established already, hence + * we manually select our own default and mimic xl/libxl behaviour starting + * xen commit 32e9d0f ("libxl: nic type defaults to vif in hotplug for + * hvm guest"). + */ if (l_nic->model) { + if (def->os.type == VIR_DOMAIN_OSTYPE_XEN && + STRNEQ(l_nic->model, "netfront")) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only model 'netfront' is supported for " + "Xen PV domains")); + return -1; + } if (VIR_STRDUP(x_nic->model, l_nic->model) < 0) goto cleanup; if (STREQ(l_nic->model, "netfront")) x_nic->nictype = LIBXL_NIC_TYPE_VIF; + else + x_nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; + } else { + if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && !attach) + x_nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; + else + x_nic->nictype = LIBXL_NIC_TYPE_VIF; } if (VIR_STRDUP(x_nic->ifname, l_nic->ifname) < 0) @@ -1047,7 +1070,7 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) if (virDomainNetGetActualType(l_nics[i]) == VIR_DOMAIN_NET_TYPE_HOSTDEV) continue; - if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics])) + if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics], false)) goto error; /* * The devid (at least right now) will not get initialized by diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 0ea76b4..851f3af 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -178,7 +178,8 @@ libxlMakeDisk(virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); int libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, - libxl_device_nic *x_nic); + libxl_device_nic *x_nic, + bool attach); int libxlMakeVfb(virPortAllocatorPtr graphicsports, virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index b19b17e..7e5d9b6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3379,7 +3379,7 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, goto cleanup; } - if (libxlMakeNic(vm->def, net, &nic) < 0) + if (libxlMakeNic(vm->def, net, &nic, true) < 0) goto cleanup; if (libxl_device_nic_add(cfg->ctx, vm->def->id, &nic, 0)) { -- 2.1.4

2 2

[libvirt] [PATCH v2 00/10] admin: Introduce runtime logging APIs
by Erik Skultety 15 Dec '16

15 Dec '16

v1 here https://www.redhat.com/archives/libvir-list/2016-November/msg00009.html since v1: - incorporated notes raised during review - allowed passing of NULL via the public APIs * behaves the same way as an empty string, but lead to even more code reduction in 'daemonSetupLogging' for practically no extra code to enable such feature - added forgotten documentation - updated NEWS file Erik Skultety (10): virlog: Introduce virLog{Get,Set}DefaultOutput admin: Allow passing NULL to virLogSetFilters daemon: Hook up the virLog{Get,Set}DefaultOutput to the daemon's init routine admin: Introduce virAdmConnectGetLoggingOutputs admin: Introduce virAdmConnectGetLoggingFilters admin: Introduce virAdmConnectSetLoggingOutputs admin: Introduce virAdmConnectSetLoggingFilters virt-admin: Wire-up the logging APIs admin: Add an example demonstrating how to use the logging APIs admin: Update the news file to include the new logging features .gitignore | 1 + daemon/admin.c | 104 ++++++++++++++++++++++++++ daemon/libvirtd.c | 96 ++++-------------------- docs/news.html.in | 4 + examples/Makefile.am | 3 +- examples/admin/logging.c | 102 ++++++++++++++++++++++++++ include/libvirt/libvirt-admin.h | 16 ++++ src/admin/admin_protocol.x | 50 ++++++++++++- src/admin/admin_remote.c | 70 ++++++++++++++++++ src/admin_protocol-structs | 26 +++++++ src/libvirt-admin.c | 157 ++++++++++++++++++++++++++++++++++++++++ src/libvirt_admin_private.syms | 6 ++ src/libvirt_admin_public.syms | 8 ++ src/libvirt_private.syms | 2 + src/locking/lock_daemon.c | 90 ++++------------------- src/logging/log_daemon.c | 92 ++++------------------- src/util/virlog.c | 100 ++++++++++++++++++++++++- src/util/virlog.h | 4 +- tools/virt-admin.c | 120 ++++++++++++++++++++++++++++++ tools/virt-admin.pod | 90 +++++++++++++++++++++++ 20 files changed, 899 insertions(+), 242 deletions(-) create mode 100644 examples/admin/logging.c -- 2.5.5

2 29

[libvirt] [PATCH v2 00/21] Run qemu under its own namespace
by Michal Privoznik 15 Dec '16

15 Dec '16

v1 posted here: https://www.redhat.com/archives/libvir-list/2016-November/msg01208.html diff to v1: - I've dropped the patches for hugepages which are posted separately [1] - I've reworked some parts according to Dan's suggestions - Filled missing impl for virSCSIVHostDevice which was merged meanwhile Please note that patches 1-5, 7 were ACKed already. You can also find the patches on my github: https://github.com/zippy2/libvirt/tree/qemu_container_v3 (Yeah, _v2 branch is not good enough.) 1: https://www.redhat.com/archives/libvir-list/2016-November/msg01415.html Michal Privoznik (21): virprocess: Introduce virProcessSetupPrivateMountNS virfile: Introduce virFileSetupDev virfile: Introduce ACL helpers virusb: Introduce virUSBDeviceGetPath virscsi: Introduce virSCSIDeviceGetPath virscsivhost: Introduce virSCSIVHostDeviceGetPath qemu_cgroup: Expose defaultDeviceACL qemu: Spawn qemu under mount namespace qemu: Prepare disks when starting a domain qemu: Prepare hostdevs when starting a domain qemu: Prepare chardevs when starting a domain qemu: Prepare TPM when starting a domain qemu: Prepare inputs when starting a domain qemu: Prepare RNGs when starting a domain qemu: Enter the namespace on relabelling qemu: Manage /dev entry on disk hotplug qemu: Manage /dev entry on hostdev hotplug qemu: Manage /dev entry on chardev hotplug qemu: Manage /dev entry on RNG hotplug qemu: Let users opt-out from containerization qemu: Enable mount namespace config-post.h | 2 + configure.ac | 12 +- src/Makefile.am | 7 +- src/libvirt_private.syms | 10 + src/lxc/lxc_container.c | 20 +- src/lxc/lxc_controller.c | 32 +- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 8 + src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_cgroup.h | 1 + src/qemu/qemu_conf.c | 33 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 1244 +++++++++++++++++++++++++++++++++++- src/qemu/qemu_domain.h | 52 ++ src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_hotplug.c | 90 ++- src/qemu/qemu_process.c | 28 +- src/qemu/qemu_security.c | 198 ++++++ src/qemu/qemu_security.h | 55 ++ src/qemu/test_libvirtd_qemu.aug.in | 3 + src/util/virfile.c | 153 +++++ src/util/virfile.h | 17 + src/util/virprocess.c | 38 ++ src/util/virprocess.h | 2 + src/util/virscsi.c | 6 + src/util/virscsi.h | 1 + src/util/virscsivhost.c | 7 + src/util/virscsivhost.h | 1 + src/util/virusb.c | 5 + src/util/virusb.h | 1 + 30 files changed, 1951 insertions(+), 85 deletions(-) create mode 100644 src/qemu/qemu_security.c create mode 100644 src/qemu/qemu_security.h -- 2.11.0

2 48

[libvirt] [PATCH 0/2] qemu: fix few image/resource locking problems
by Peter Krempa 15 Dec '16

15 Dec '16

The problem from patch 2/2 made me to look at the locking infrastructure in libvirt. There are a few broken places. This fixes two mistakes but more patches will come. Peter Krempa (2): qemu: monitor: Don't resume lockspaces in resume event handler qemu: snapshot: Don't attempt to resume cpus if they were not paused src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_process.c | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) -- 2.11.0

2 3

[libvirt] [PATCH] virsh:remove the dead code
by sochin jiang 15 Dec '16

15 Dec '16

This patch remove the dead code I found. Signed-off-by: sochin jiang <sochin.jiang(a)huawei.com> --- tools/virsh-domain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3a6fa5c..6dae5cc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1005,7 +1005,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("No support for %s in command 'attach-interface'"), type); goto cleanup; - break; } if (target != NULL) @@ -7365,7 +7364,6 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("CPU described in %s is incompatible with host CPU\n"), from); goto cleanup; - break; case VIR_CPU_COMPARE_IDENTICAL: vshPrint(ctl, _("CPU described in %s is identical to host CPU\n"), -- 1.8.3.1

3 2

[libvirt] [PATCH 0/2] qemu_cgroup: allow access to /dev/dri/render*
by Ján Tomko 14 Dec '16

14 Dec '16

Technically a v2, but v1 is already pushed. This version is based on the <gl enable> in <spice> instead of accel3d="yes" in <video><model type="virtio". It also only allows access to the render* devices, instead of all of them. https://bugzilla.redhat.com/show_bug.cgi?id=1337290 Ján Tomko (2): Revert "qemu_cgroup: allow access to /dev/dri for virtio-vga" qemu_cgroup: allow access to /dev/dri/render* src/qemu/qemu_cgroup.c | 71 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 14 deletions(-) -- 2.7.3

6 17

[libvirt] [PATCH v4 0/4] gluster: cache glfs connection object per volume
by Prasanna Kumar Kalever 14 Dec '16

14 Dec '16

v4: Address review comments from Peter on v3 Patch 1: changes to fix test failures (qemuargv2xmltest, qemuxml2argvtest, qemuxml2xmltest and virstoragetest) Patch 2: fix hung in qemuxml2argvtest Patch 3 v3: Split this Patch to 2 parts as below Patch 3 v4: don't free metadata used for storage driver access Patch 4: * update variable naming as per standards * virStorageBackendGlusterPreopened* -> virStorageBackendGlusterCache* Thanks Peter! v3: Address comments by Daniel and Peter on v2 * Split the patch to 3 parts Patch 1: change the virStorageNetHostDef type Patch 2: optimize calls to virStorageFileInit and friends Patch 3: add the caching for glfs * Thanks to Daniel, this version make all the methods as thread safe * Thanks to Peter for pointing use of virObjectLockable, this had simplified rest of the parts a lot. v2: Address review comments from Peter on v1 * Rebased on latest master * Changes to commit msg * Introduce storage API's for Register and Unregister of volume * During qemu process Start/Stop and snapshot create * Check Transport and Port type * Atomic element add/del to list and ref counting Pending: Treating IP and FQDN belong to same host v1: Initial patch Prasanna Kumar Kalever (4): util: change the virStorageNetHostDef type storage: optimize calls to virStorageFileInit and friends virStorageFileDeinit: don't free metadata used for storage driver access gluster: cache glfs connection object per volume src/conf/domain_conf.c | 52 +++--- src/qemu/qemu_command.c | 68 ++++---- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 40 +++-- src/qemu/qemu_parse_command.c | 44 +++-- src/qemu/qemu_process.c | 47 ++++++ src/qemu/qemu_process.h | 4 + src/storage/storage_backend_fs.c | 2 + src/storage/storage_backend_gluster.c | 299 ++++++++++++++++++++++++++++++---- src/storage/storage_driver.c | 23 +-- src/util/virstoragefile.c | 85 +++++----- src/util/virstoragefile.h | 20 ++- tests/virstoragetest.c | 2 +- 14 files changed, 512 insertions(+), 181 deletions(-) -- 2.7.4

3 17

[libvirt] [PATCH v2 0/2] libxl QED support
by Cédric Bosdonnat 14 Dec '16

14 Dec '16

Hi all, Just added on patch before the QED one to add default: cases in xenParseXLDisk to avoid build failures when building on more uptodate xen. Cédric Bosdonnat (2): xenconfig: add default in xenParseXLDisk()'s switches libxl: add QED disk format support src/libxl/libxl_conf.c | 11 +++++++++++ src/xenconfig/xen_xl.c | 15 +++++++++++++++ 2 files changed, 26 insertions(+) -- 2.11.0

2 4

[libvirt] [PATCH] ZFS: Add vol-resize support
by Sergei A Mamonov 14 Dec '16

14 Dec '16

Add virStorageBackendZFSResizeVol method for storage_backend_zfs.c --- src/storage/storage_backend_zfs.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 3a43be4..8e57d72 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -454,6 +454,33 @@ virStorageBackendZFSDeletePool(virConnectPtr conn ATTRIBUTE_UNUSED, return ret; } +static int +virStorageBackendZFSResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags) +{ + int ret = -1; + virCommandPtr resize_cmd = NULL; + + virCheckFlags(VIR_STORAGE_VOL_RESIZE_SHRINK, -1); + + resize_cmd = virCommandNewArgList(ZFS, "set", NULL); + + virCommandAddArgFormat(resize_cmd, "volsize=%llu", capacity); + virCommandAddArgFormat(resize_cmd, "%s/%s", + pool->def->source.name, vol->name); + + if (virCommandRun(resize_cmd, NULL) < 0) + goto cleanup; + + ret = 0; + cleanup: + virCommandFree(resize_cmd); + return ret; +} + virStorageBackend virStorageBackendZFS = { .type = VIR_STORAGE_POOL_ZFS, @@ -465,4 +492,5 @@ virStorageBackend virStorageBackendZFS = { .deletePool = virStorageBackendZFSDeletePool, .uploadVol = virStorageBackendVolUploadLocal, .downloadVol = virStorageBackendVolDownloadLocal, + .resizeVol = virStorageBackendZFSResizeVol, }; -- 1.8.3.1

2 1

[libvirt] [PATCH v5 0/2] List only online cpus for vcpupin/emulatorpin when vcpu placement static
by Nitesh Konkar 14 Dec '16

14 Dec '16

Currently when the vcpu placement is static and cpuset is not specified, CPU Affinity shows 0.. CPUMAX. This patchset will result in display of only online CPU's under CPU Affinity on linux. Fixes the following Bug: virsh dumpxml Fedora <domain type='kvm' id='4'> <name>Fedora</name> <uuid>aecf3e5e-6f9a-42a3-9d6a-223a75569a66</uuid> <maxMemory slots='32' unit='KiB'>3145728</maxMemory> <memory unit='KiB'>524288</memory> <currentMemory unit='KiB'>524288</currentMemory> <vcpu placement='static' current='8'>160</vcpu> <resource> <partition>/machine</partition> </resource> ..................... ....................... ......................... <memballoon model='virtio'> <alias name='balloon0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </memballoon> </devices> <seclabel type='dynamic' model='dac' relabel='yes'> <label>+0:+0</label> <imagelabel>+0:+0</imagelabel> </seclabel> </domain> lscpu Architecture: x86_64 CPU op-mode(s): 32-bit, 64-bit Byte Order: Little Endian CPU(s): 8 On-line CPU(s) list: 0-2,4-7 Off-line CPU(s) list: 3 Thread(s) per core: 1 Core(s) per socket: 7 Socket(s): 1 .......... .......... NUMA node0 CPU(s): 0-2,4-7 NUMA node1 CPU(s): cat /sys/devices/system/cpu/online 0-2,4-7 Before Patch virsh vcpupin Fedora VCPU: CPU Affinity ---------------------------------- 0: 0-7 1: 0-7 ... ... 158: 0-7 159: 0-7 virsh emulatorpin Fedora emulator: CPU Affinity ---------------------------------- *: 0-7 After Patch virsh vcpupin Fedora VCPU: CPU Affinity ---------------------------------- 0: 0-2,4-7 1: 0-2,4-7 ... ... 158: 0-2,4-7 159: 0-2,4-7 virsh emulatorpin Fedora emulator: CPU Affinity ---------------------------------- *: 0-2,4-7 Nitesh Konkar (2): conf: List only online cpus for virsh vcpupin conf: List only online cpus for virsh emulatorpin src/conf/domain_conf.c | 6 ++++++ src/qemu/qemu_driver.c | 5 +++++ 2 files changed, 11 insertions(+) -- 2.1.0

3 5

[libvirt] [PATCH] Remove reference to enum that never existed
by Daniel P. Berrange 14 Dec '16

14 Dec '16

The virDomainSendProcessSignal method says the flags values come from virDomainProcessSignalFlag, but this enum has never existed. No flags are needed for this method. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed under trivial docs rule. src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index b287a39..dd9b800 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -6866,7 +6866,7 @@ virDomainSendKey(virDomainPtr domain, * @domain: pointer to domain object * @pid_value: a positive integer process ID, or negative integer process group ID * @signum: a signal from the virDomainProcessSignal enum - * @flags: one of the virDomainProcessSignalFlag values + * @flags: currently unused, pass 0 * * Send a signal to the designated process in the guest * -- 2.9.3

1 0

[libvirt] [PATCH] virjson: Remove const from virJSONValueObjectForeachKeyValue
by Jiri Denemark 14 Dec '16

14 Dec '16

Almost none of our virJSONValue*Get* functions accept const virJSONValue pointers and it wouldn't even make sense since we sometimes modify what we get. And because there is no reason for preventing callers of virJSONValueObjectForeachKeyValue from modifying the values they get in each iteration we can just stop doing it. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virjson.c | 2 +- src/util/virjson.h | 4 ++-- src/util/virqemu.c | 16 ++++++++-------- src/util/virqemu.h | 10 +++++----- src/util/virstoragefile.c | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index b42211c0d..3804e7e97 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1321,7 +1321,7 @@ virJSONValueObjectIsNull(virJSONValuePtr object, * during iteration and -1 on generic errors. */ int -virJSONValueObjectForeachKeyValue(const virJSONValue *object, +virJSONValueObjectForeachKeyValue(virJSONValuePtr object, virJSONValueObjectIteratorFunc cb, void *opaque) { diff --git a/src/util/virjson.h b/src/util/virjson.h index 5b4f17253..122de96c5 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -172,10 +172,10 @@ char *virJSONValueToString(virJSONValuePtr object, bool pretty); typedef int (*virJSONValueObjectIteratorFunc)(const char *key, - const virJSONValue *value, + virJSONValuePtr value, void *opaque); -int virJSONValueObjectForeachKeyValue(const virJSONValue *object, +int virJSONValueObjectForeachKeyValue(virJSONValuePtr object, virJSONValueObjectIteratorFunc cb, void *opaque); diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 7849d8b3e..2e9e65f9e 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -42,7 +42,7 @@ struct virQEMUCommandLineJSONIteratorData { static int virQEMUBuildCommandLineJSONRecurse(const char *key, - const virJSONValue *value, + virJSONValuePtr value, virBufferPtr buf, virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc, bool nested); @@ -51,7 +51,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, int virQEMUBuildCommandLineJSONArrayBitmap(const char *key, - const virJSONValue *array, + virJSONValuePtr array, virBufferPtr buf) { ssize_t pos = -1; @@ -81,10 +81,10 @@ virQEMUBuildCommandLineJSONArrayBitmap(const char *key, int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, - const virJSONValue *array, + virJSONValuePtr array, virBufferPtr buf) { - const virJSONValue *member; + virJSONValuePtr member; char *prefix = NULL; size_t i; int ret = 0; @@ -114,7 +114,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, /* internal iterator to handle nested object formatting */ static int virQEMUBuildCommandLineJSONIterate(const char *key, - const virJSONValue *value, + virJSONValuePtr value, void *opaque) { struct virQEMUCommandLineJSONIteratorData *data = opaque; @@ -140,7 +140,7 @@ virQEMUBuildCommandLineJSONIterate(const char *key, static int virQEMUBuildCommandLineJSONRecurse(const char *key, - const virJSONValue *value, + virJSONValuePtr value, virBufferPtr buf, virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc, bool nested) @@ -225,7 +225,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, * Returns 0 on success -1 on error. */ int -virQEMUBuildCommandLineJSON(const virJSONValue *value, +virQEMUBuildCommandLineJSON(virJSONValuePtr value, virBufferPtr buf, virQEMUBuildCommandLineJSONArrayFormatFunc array) { @@ -264,7 +264,7 @@ virQEMUBuildObjectCommandlineFromJSON(const char *type, char * -virQEMUBuildDriveCommandlineFromJSON(const virJSONValue *srcdef) +virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr srcdef) { virBuffer buf = VIR_BUFFER_INITIALIZER; char *ret = NULL; diff --git a/src/util/virqemu.h b/src/util/virqemu.h index f3c2b6956..539d62ab1 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -30,16 +30,16 @@ # include "virstorageencryption.h" typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)(const char *key, - const virJSONValue *array, + virJSONValuePtr array, virBufferPtr buf); int virQEMUBuildCommandLineJSONArrayBitmap(const char *key, - const virJSONValue *array, + virJSONValuePtr array, virBufferPtr buf); int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, - const virJSONValue *array, + virJSONValuePtr array, virBufferPtr buf); -int virQEMUBuildCommandLineJSON(const virJSONValue *value, +int virQEMUBuildCommandLineJSON(virJSONValuePtr value, virBufferPtr buf, virQEMUBuildCommandLineJSONArrayFormatFunc array); @@ -47,7 +47,7 @@ char *virQEMUBuildObjectCommandlineFromJSON(const char *type, const char *alias, virJSONValuePtr props); -char *virQEMUBuildDriveCommandlineFromJSON(const virJSONValue *src); +char *virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr src); void virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str); void virQEMUBuildLuksOpts(virBufferPtr buf, diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index f750e121a..9ec005d50 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2990,7 +2990,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = { static int virStorageSourceParseBackingJSONDeflattenWorker(const char *key, - const virJSONValue *value, + virJSONValuePtr value, void *opaque) { virJSONValuePtr retobj = opaque; -- 2.11.0

2 1

[libvirt] [PATCH] libxl: add QED disk format support
by Cédric Bosdonnat 14 Dec '16

14 Dec '16

If libxl has QED disk format support, then pass the feature over to the user. --- src/libxl/libxl_conf.c | 11 +++++++++++ src/xenconfig/xen_xl.c | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 288712f65..02945ae1a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -745,6 +745,12 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) x_disk->format = LIBXL_DISK_FORMAT_RAW; x_disk->backend = LIBXL_DISK_BACKEND_TAP; break; +#ifdef LIBXL_HAVE_QED + case VIR_STORAGE_FILE_QED: + x_disk->format = LIBXL_DISK_FORMAT_QED; + x_disk->backend = LIBXL_DISK_BACKEND_QDISK; + break; +#endif default: virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight does not support disk format %s " @@ -762,6 +768,11 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) case VIR_STORAGE_FILE_QCOW2: x_disk->format = LIBXL_DISK_FORMAT_QCOW2; break; +#ifdef LIBXL_HAVE_QED + case VIR_STORAGE_FILE_QED: + x_disk->format = LIBXL_DISK_FORMAT_QED; + break; +#endif case VIR_STORAGE_FILE_VHD: x_disk->format = LIBXL_DISK_FORMAT_VHD; break; diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index bcdd35527..98436982a 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -393,6 +393,12 @@ xenParseXLDisk(virConfPtr conf, virDomainDefPtr def) case LIBXL_DISK_FORMAT_EMPTY: break; + +#ifdef LIBXL_HAVE_QED + case LIBXL_DISK_FORMAT_QED: + disk->src->format = VIR_STORAGE_FILE_QED; + break; +#endif } switch (libxldisk->backend) { -- 2.11.0

1 0

[libvirt] [PATCH V3 0/2] Allow hot plugged host CPUs
by Viktor Mihajlovski 14 Dec '16

14 Dec '16

This is a rework of the original patch allowing to use all host CPUs if the cpuset controller is not configured by libvirt. The major enhancement is that we won't try to retrieve the online host CPU map on platforms where this is not supported and just fall back to the old behavior. V3: - Added new function (in seperate patch) to find out whether the host CPU online map can be retrieved gracefully V2: - Avoid memory leak Viktor Mihajlovski (2): util: Allow to query the presence of host CPU bitmaps qemu: Allow use of hot plugged host CPUs if no affinity set src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 33 ++++++++++++++++++++++++--------- src/util/virhostcpu.c | 10 ++++++++++ src/util/virhostcpu.h | 1 + 4 files changed, 36 insertions(+), 9 deletions(-) -- 1.9.1

3 7

[libvirt] [PATCH] Avoid variable named 'stat'
by Daniel P. Berrange 14 Dec '16

14 Dec '16

Using a variable named 'stat' clashes with the system function 'stat()' causing compiler warnings on some platforms cc1: warnings being treated as errors ../../src/qemu/qemu_monitor_text.c: In function 'parseMemoryStat': ../../src/qemu/qemu_monitor_text.c:604: error: declaration of 'stat' shadows a global declaration [-Wshadow] /usr/include/sys/stat.h:455: error: shadowed declaration is here [-Wshadow] Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix. src/qemu/qemu_monitor_text.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a2a5885..bc83218 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -601,7 +601,7 @@ int qemuMonitorTextGetVirtType(qemuMonitorPtr mon, static int parseMemoryStat(char **text, unsigned int tag, - const char *search, virDomainMemoryStatPtr stat) + const char *search, virDomainMemoryStatPtr mstat) { char *dummy; unsigned long long value; @@ -625,8 +625,8 @@ static int parseMemoryStat(char **text, unsigned int tag, case VIR_DOMAIN_MEMORY_STAT_AVAILABLE: value >>= 10; } - stat->tag = tag; - stat->val = value; + mstat->tag = tag; + mstat->val = value; return 1; } return 0; -- 2.9.3

1 0

[libvirt] [PATCH] docs: Use href_base in absolute links
by Martin Kletzander 14 Dec '16

14 Dec '16

That way all links work even if you click them in a subdirectory. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/page.xsl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/page.xsl b/docs/page.xsl index fcb51916ce25..1d662c670686 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -104,9 +104,9 @@ </div> <div id="jumplinks"> <ul> - <li><a href="downloads.html">Download</a></li> - <li><a href="contribute.html">Contribute</a></li> - <li><a href="docs.html">Learn</a></li> + <li><a href="{$href_base}downloads.html">Download</a></li> + <li><a href="{$href_base}contribute.html">Contribute</a></li> + <li><a href="{$href_base}docs.html">Learn</a></li> </ul> </div> <div id="search"> @@ -122,8 +122,8 @@ <div id="contact"> <h3>Contact</h3> <ul> - <li><a href="contact.html#email">email</a></li> - <li><a href="contact.html#irc">irc</a></li> + <li><a href="{$href_base}contact.html#email">email</a></li> + <li><a href="{$href_base}contact.html#irc">irc</a></li> </ul> </div> <div id="community"> @@ -136,7 +136,7 @@ </ul> </div> <div id="conduct"> - Participants in the libvirt project agree to abide by <a href="governance.html#codeofconduct">the project code of conduct</a> + Participants in the libvirt project agree to abide by <a href="{$href_base}governance.html#codeofconduct">the project code of conduct</a> </div> <br class="clear"/> </div> -- 2.11.0

2 1

[libvirt] [PATCH jenkins-ci] Add libvirt-go to build
by Daniel P. Berrange 14 Dec '16

14 Dec '16

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- jobs/go.yaml | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ projects/libvirt-go.yaml | 14 ++++++++++ 2 files changed, 85 insertions(+) create mode 100644 jobs/go.yaml create mode 100644 projects/libvirt-go.yaml diff --git a/jobs/go.yaml b/jobs/go.yaml new file mode 100644 index 0000000..ce6f79b --- /dev/null +++ b/jobs/go.yaml @@ -0,0 +1,71 @@ + +- job-template: + id: go-build-job + name: '{name}-{branch}-build' + project-type: matrix + description: '{title} Build' + autogen_args: '' + workspace: '{name}-{branch}' + block-downstream: true + block-upstream: true + properties: + - build-discarder: + days-to-keep: 30 + num-to-keep: 1000 + scm: + - git: + url: git://n64.pufty.ci.centos.org/{name}.git + branches: + - origin/{branch} + clean: + after: true + skip-tag: true + wipe-workspace: false + triggers: + - reverse: + jobs: '{obj:parent_jobs}' + - pollscm: + cron: "H/20 * * * *" + axes: + - axis: + name: systems + type: slave + values: '{obj:machines}' + builders: + - shell: | + go build -v + publishers: + - email: + recipients: '{obj:spam}' + notify-every-unstable-build: true + send-to-individuals: false + +- job-template: + id: go-check-job + name: '{name}-{branch}-check' + project-type: matrix + description: '{title} Check' + check_env: '' + workspace: '{name}-{branch}' + block-downstream: true + block-upstream: true + properties: + - build-discarder: + days-to-keep: 30 + num-to-keep: 1000 + triggers: + - reverse: + jobs: '{obj:parent_jobs}' + axes: + - axis: + name: systems + type: slave + values: '{obj:machines}' + builders: + - shell: | + go test -tags api + publishers: + - email: + recipients: '{obj:spam}' + notify-every-unstable-build: true + send-to-individuals: false diff --git a/projects/libvirt-go.yaml b/projects/libvirt-go.yaml new file mode 100644 index 0000000..8ad7a2e --- /dev/null +++ b/projects/libvirt-go.yaml @@ -0,0 +1,14 @@ + +- project: + name: libvirt-go + machines: + - libvirt-centos-7 + - libvirt-fedora-23 + - libvirt-fedora-24 + - libvirt-fedora-rawhide + title: Libvirt Go + jobs: + - go-build-job: + parent_jobs: 'libvirt-master-build' + - go-check-job: + parent_jobs: 'libvirt-go-master-build' -- 2.9.3

2 2

[libvirt] [PATCH] Deal with gnutls 3.5.6 regression
by Daniel P. Berrange 14 Dec '16

14 Dec '16

I was not originally planning to do anything for the gnutls 3.5.6 regression: https://www.redhat.com/archives/libvir-list/2016-November/msg00816.html but there's still no immediate sign of the new 3.5.7 release, so while I still don't want to workaround the bug in libvirt, we can at least blacklist that version of gnutls in the test suite, so 'make check' passes on affected systems while we're waiting for 3.5.7 to arrive. Daniel P. Berrange (1): tests: blacklist gnutls 3.5.6 for wildcard tests tests/virnettlssessiontest.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.9.3

3 6

[libvirt] [PATCH] qemu: Fix virQEMUCapsFindTarget on ppc64le
by Jiri Denemark 13 Dec '16

13 Dec '16

virQEMUCapsFindTarget is supposed to find an alternative QEMU binary if qemu-system-$GUEST_ARCH doesn't exist. The alternative is using host architecture when it is compatible with $GUEST_ARCH. But a special treatment has to be applied for ppc64le since the QEMU binary is always called qemu-system-ppc64. Broken by me in v2.2.0-171-gf2e71550d. https://bugzilla.redhat.com/show_bug.cgi?id=1403745 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 081afc566..f4ca84e98 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -482,13 +482,13 @@ static virArch virQEMUCapsFindTarget(virArch hostarch, virArch guestarch) { + if (virQEMUCapsGuestIsNative(hostarch, guestarch)) + guestarch = hostarch; + /* Both ppc64 and ppc64le guests can use the ppc64 target */ if (ARCH_IS_PPC64(guestarch)) guestarch = VIR_ARCH_PPC64; - if (virQEMUCapsGuestIsNative(hostarch, guestarch)) - guestarch = hostarch; - return guestarch; } -- 2.11.0

2 3

[libvirt] [PATCH 0/2] Fix copy-pasta errors in config loading for aux daemons
by Peter Krempa 13 Dec '16

13 Dec '16

Apparently the option is not configured very often since nobody figured it out until now. Peter Krempa (2): lock: Fix loading of config file for the lock daemon log: Fix loading of conf file for log daemon src/locking/lock_daemon_config.c | 2 +- src/logging/log_daemon_config.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.11.0

2 3

[libvirt] [PATCH for-2.9 00/17] target-i386: Implement query-cpu-model-expansion
by Eduardo Habkost 13 Dec '16

13 Dec '16

This series implements query-cpu-model-expansion on target-i386. QAPI / interface changes ------------------------ When implementing this, I have noticed that the "host" CPU model in i386 includes some migration-unsafe features that can't be translated to any migration-safe representation: "pmu", and "host-cache-info". To be able to handle the migration-unsafe features, I have extended the query-cpu-model-expansion definition to be clear about what happens to those features when the CPU model is expanded (in short: static expansion removes them, full expansion keeps them). I also added "static" and "migration-safe" fields to the return value of query-cpu-model-expansion, so callers can know if the the expanded representation is static and migration-safe. Test code --------- I have added a Python test script for the feature, that will try multiple combinations of the expansion operation, and see if the returned data keeps matches some constratins. The test script works with the s390x query-cpu-model-expansion command, except that: 1) I couldn't test it with KVM; 2) qtest.py error handling when QEMU refuses to run is unreliable (so the script needs runnability information to be availble in TCG mode, too, to skip not-runnable CPU models and avoid problems). Future versions of the test script could run a arch-specific CPUID-dump guest binary, and validate data seen by the guest directly. While we don't do that, the script validates all QOM properties on the CPU objects looking for unexpected changes. At least in the case of x86, the QOM properties will include lots of the CPUID data seen by the guest, giving us decent coverage. Patches from other series ------------------------- This series includes patches from other series, just to help on the implementation of the test code: * "qmp: Report QOM type name on query-cpu-definitions", that was already submitted for 2.9 * qemu.py, qtest.py, and tests/Makefile.include changes --- Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: libvir-list(a)redhat.com Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: "Jason J. Herne" <jjherne(a)linux.vnet.ibm.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Richard Henderson <rth(a)twiddle.net> Cc: Igor Mammedov <imammedo(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Eduardo Habkost (17): qmp: Report QOM type name on query-cpu-definitions qemu.py: Make logging optional qtest.py: Support QTEST_LOG environment variable qtest.py: make logging optional qtest.py: Make 'binary' parameter optional tests: Add rules to non-gtester qtest test cases target-i386: Reorganize and document CPUID initialization steps target-i386: Support "-cpu host" on TCG too target-i386: Move "host" properties to base class target-i386: Allow short strings to be used as vendor ID target-i386: Remove AMD feature flag aliases from Opteron models target-i386: Return migration-safe field on query-cpu-definitions cpu: Support comma escaping when parsing -cpu qapi: add static/migration-safe info to query-cpu-model-expansion target-i386: Define static "base" CPU model tests: query-cpu-model-test.py test code target-i386: Implement query-cpu-model-expansion QMP command qapi-schema.json | 30 ++- scripts/qemu.py | 25 ++- scripts/qtest.py | 15 +- target-i386/cpu-qom.h | 8 +- tests/Makefile.include | 40 +++- tests/query-cpu-model-test.py | 421 ++++++++++++++++++++++++++++++++++++ tests/test-x86-cpuid-compat.c | 19 ++ monitor.c | 4 +- qom/cpu.c | 32 ++- target-arm/helper.c | 1 + target-i386/cpu.c | 481 +++++++++++++++++++++++++++++++----------- target-ppc/translate_init.c | 1 + target-s390x/cpu_models.c | 5 + 13 files changed, 928 insertions(+), 154 deletions(-) create mode 100755 tests/query-cpu-model-test.py -- 2.7.4

3 12

[libvirt] [PATCH] docs: Update formatstorage to match code for pool path
by John Ferlan 13 Dec '16

13 Dec '16

Seems commit id '0257d06b' forgot to include formatstorage when updating the docs to describe allowing zfs as a pool type and to furthermore note that the pool's target path element will be generated rather than read. Similarly commit id 'efab27afb' neglected to indicate that the target path for a logical pool will now be generated by libvirt. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial docs/formatstorage.html.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index f1be511..47c8b0c 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -380,8 +380,8 @@ <code>pool</code> element for some types of pools (pool types <code>dir</code>, <code>fs</code>, <code>netfs</code>, <code>logical</code>, <code>disk</code>, <code>iscsi</code>, - <code>scsi</code>, <code>mpath</code>). This tag is used to - describe the mapping of + <code>scsi</code>, <code>mpath</code>, <code>zfs</code>). + This tag is used to describe the mapping of the storage pool into the host filesystem. It can contain the following child elements: </p> @@ -411,6 +411,8 @@ guaranteed stable across reboots, since they are allocated on demand. It is preferable to use a stable location such as one of the <code>/dev/disk/by-{path|id|uuid|label}</code> locations. + For <code>logical</code> and <code>zfs</code> pool types, a + provided value is ignored and a default path generated. For a Multipath pool (type <code>mpath</code>), the provided value is ignored and the default value of "/dev/mapper" is used. <span class="since">Since 0.4.1</span> -- 2.7.4

1 0

[libvirt] [PATCH python] HACKING: fix grammar
by Cole Robinson 13 Dec '16

13 Dec '16

From: Prabodh Agarwal <prabodh1194(a)users.noreply.github.com> --- Pushed as trivial. This was submitted on github, and since it's trivial I just pushed it, but I pointed the user at the hacking guidelines for future submissions https://github.com/libvirt/libvirt-python/pull/1#issuecomment-266807394 HACKING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HACKING b/HACKING index 7a6e150..6eeb9e6 100644 --- a/HACKING +++ b/HACKING @@ -3,7 +3,7 @@ Most of the libvirt python binding code is automatically generated using the script generator.py, and the API description that the -libvirt library installs the location shown by pkg-config, with +libvirt library installs at the location shown by pkg-config, with this command: $ pkg-config --variable libvirt_api libvirt -- 2.9.3

1 0

[libvirt] [PATCH RFC] libxl: reverse defaults on HVM net device attach
by Joao Martins 13 Dec '16

13 Dec '16

libvirt libxl picks its own default with respect to the default NIC to use. libxlMakeNic is the one responsible for this and on boot it picks LIBXL_NIC_TYPE_VIF_IOEMU such that it accomodates both PV and emulated one. The good behaving guest at boot will then select the pv and unplug the emulated device. Now, on HVM when attaching an interface it will pick the same default that is LIBXL_NIC_TYPE_VIF_IOEMU which as a result will fail the attach (see xen commit 32e9d0f ("libxl: nic type defaults to vif in hotplug for hvm guest"). Xen doesn't yet support the hotplug of emulated devices, but we don't want to rule out that case either, which might get support in the future. Hence we simply reverse the defaults when we are attaching the interface which allows libvirt to prefer the PV nic first without adding "model='netfront'" following the same pattern as above commit. Also to avoid ruling out the emulated one we set to LIBXL_NIC_TYPE_IOEMU when setting a model type that is not 'netfront'. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- This allows Openstack to attach network interfaces, which currently is broken on libxl if it doesn't set model 'netfront'. I am not sure whether this is the best way (hence RFC) or if users should really be setting the model='netfront' when attaching devices. But sounds to me that it would be better to have by default the supported, and if users want emulated attach to specify a nic model. Thoughts? --- src/libxl/libxl_conf.c | 9 ++++++--- src/libxl/libxl_conf.h | 3 ++- src/libxl/libxl_driver.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index dcf8e7e..50aa958 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -881,9 +881,10 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) int libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, - libxl_device_nic *x_nic) + libxl_device_nic *x_nic, + bool attach) { - bool ioemu_nic = def->os.type == VIR_DOMAIN_OSTYPE_HVM; + bool ioemu_nic = def->os.type == VIR_DOMAIN_OSTYPE_HVM && !attach; virDomainNetType actual_type = virDomainNetGetActualType(l_nic); virNetworkPtr network = NULL; virConnectPtr conn = NULL; @@ -917,6 +918,8 @@ libxlMakeNic(virDomainDefPtr def, goto cleanup; if (STREQ(l_nic->model, "netfront")) x_nic->nictype = LIBXL_NIC_TYPE_VIF; + else + x_nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; } if (VIR_STRDUP(x_nic->ifname, l_nic->ifname) < 0) @@ -1047,7 +1050,7 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) if (virDomainNetGetActualType(l_nics[i]) == VIR_DOMAIN_NET_TYPE_HOSTDEV) continue; - if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics])) + if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics], false)) goto error; /* * The devid (at least right now) will not get initialized by diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 0ea76b4..851f3af 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -178,7 +178,8 @@ libxlMakeDisk(virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); int libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, - libxl_device_nic *x_nic); + libxl_device_nic *x_nic, + bool attach); int libxlMakeVfb(virPortAllocatorPtr graphicsports, virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index b19b17e..7e5d9b6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3379,7 +3379,7 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, goto cleanup; } - if (libxlMakeNic(vm->def, net, &nic) < 0) + if (libxlMakeNic(vm->def, net, &nic, true) < 0) goto cleanup; if (libxl_device_nic_add(cfg->ctx, vm->def->id, &nic, 0)) { -- 2.1.4

2 4

[libvirt] [PATCH 0/3] network: Add support for local PTR domains
by Jiri Denemark 13 Dec '16

13 Dec '16

I run a system dnsmasq to be able to forward specific DNS requests to specific servers. And I have it configured for both forward and reverse lookups. Another dnsmasq is started for a virtual network with domain "virt". The system dnsmasq knows it needs to forward any requests for the "virt" domain and corresponding PTR domain to the dnsmasq started by libvirt. The problem is dnsmasq forwards queries for unknown names to the upstream name server (which is the system instance in my case). One can get nice endless loops of DNS requests pretty easily. Forward loops can be avoided by specifying localOnly='yes', but there was no way to avoid reverse lookup loops. And this is what I'm trying to address in the following patches. Jiri Denemark (3): conf: Make virNetworkIPDefParseXML a little bit saner util: Introduce virSocketAddrPTRDomain network: Add support for local PTR domains docs/formatnetwork.html.in | 37 ++++++-- src/conf/network_conf.c | 108 +++++++++++++++++++----- src/conf/network_conf.h | 4 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 47 +++++++++++ src/util/virsocketaddr.c | 85 +++++++++++++++++++ src/util/virsocketaddr.h | 9 ++ tests/networkxml2confdata/ptr-domains-auto.conf | 20 +++++ tests/networkxml2confdata/ptr-domains-auto.xml | 21 +++++ tests/networkxml2confdata/ptr-domains.conf | 24 ++++++ tests/networkxml2confdata/ptr-domains.xml | 24 ++++++ tests/networkxml2conftest.c | 2 + 12 files changed, 353 insertions(+), 29 deletions(-) create mode 100644 tests/networkxml2confdata/ptr-domains-auto.conf create mode 100644 tests/networkxml2confdata/ptr-domains-auto.xml create mode 100644 tests/networkxml2confdata/ptr-domains.conf create mode 100644 tests/networkxml2confdata/ptr-domains.xml -- 2.11.0

1 4