October 2018 - Devel - libvirt List Archives

[libvirt] [PATCH] virfile: Take symlink into account in virFileIsSharedFixFUSE
by Michal Privoznik 19 Oct '18

19 Oct '18

https://bugzilla.redhat.com/show_bug.cgi?id=1640465 Weirdly enough, there can be symlinks in the path we are trying to fix. If it is the case our clever algorithm that finds matches against mount table won't work. Canonicalize path at the beginning then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- cfg.mk | 2 +- src/util/virfile.c | 17 ++++++++++++++--- tests/virfilemock.c | 33 ++++++++++++++++++++++++++++++++- tests/virfiletest.c | 1 + 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/cfg.mk b/cfg.mk index 4790d0b7e7..d0183c02ff 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1229,7 +1229,7 @@ exclude_file_name_regexp--sc_prohibit_select = \ ^cfg\.mk$$ exclude_file_name_regexp--sc_prohibit_canonicalize_file_name = \ - ^cfg\.mk$$ + ^(cfg\.mk|tests/virfilemock\.c)$$ exclude_file_name_regexp--sc_prohibit_raw_allocation = \ ^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c)$$ diff --git a/src/util/virfile.c b/src/util/virfile.c index e09992e41a..4747a26ad3 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3473,9 +3473,19 @@ virFileIsSharedFixFUSE(const char *path, char mntbuf[1024]; char *mntDir = NULL; char *mntType = NULL; + char *canonPath = NULL; size_t maxMatching = 0; int ret = -1; + if (!(canonPath = virFileCanonicalizePath(path))) { + virReportSystemError(errno, + _("unable to canonicalize %s"), + path); + return -1; + } + + VIR_DEBUG("Path %s after canonicalization %s", path, canonPath); + if (!(f = setmntent(PROC_MOUNTS, "r"))) { virReportSystemError(errno, _("Unable to open %s"), @@ -3487,7 +3497,7 @@ virFileIsSharedFixFUSE(const char *path, const char *p; size_t len = strlen(mb.mnt_dir); - if (!(p = STRSKIP(path, mb.mnt_dir))) + if (!(p = STRSKIP(canonPath, mb.mnt_dir))) continue; if (*(p - 1) != '/' && *p != '/' && *p != '\0') @@ -3504,13 +3514,14 @@ virFileIsSharedFixFUSE(const char *path, } if (STREQ_NULLABLE(mntType, "fuse.glusterfs")) { - VIR_DEBUG("Found gluster FUSE mountpoint=%s for path=%s. " - "Fixing shared FS type", mntDir, path); + VIR_DEBUG("Found gluster FUSE mountpoint=%s for canonPath=%s. " + "Fixing shared FS type", mntDir, canonPath); *f_type = GFS2_MAGIC; } ret = 0; cleanup: + VIR_FREE(canonPath); VIR_FREE(mntType); VIR_FREE(mntDir); endmntent(f); diff --git a/tests/virfilemock.c b/tests/virfilemock.c index 822c757380..ae5c8d025a 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -28,11 +28,14 @@ #endif #include "virmock.h" +#include "virstring.h" +#include "viralloc.h" #define VIR_FROM_THIS VIR_FROM_NONE static FILE *(*real_setmntent)(const char *filename, const char *type); static int (*real_statfs)(const char *path, struct statfs *buf); +static char *(*real_canonicalize_file_name)(const char *path); static void @@ -43,6 +46,7 @@ init_syms(void) VIR_MOCK_REAL_INIT(setmntent); VIR_MOCK_REAL_INIT(statfs); + VIR_MOCK_REAL_INIT(canonicalize_file_name); } @@ -94,6 +98,7 @@ statfs_mock(const char *mtab, FILE *f; struct mntent mb; char mntbuf[1024]; + char *canonPath = NULL; int ret = -1; if (!(f = real_setmntent(mtab, "r"))) { @@ -101,10 +106,16 @@ statfs_mock(const char *mtab, return -1; } + /* We don't need to do this in callers because real statfs(2) + * does that for us. However, in mocked implementation we + * need to do this. */ + if (!(canonPath = canonicalize_file_name(path))) + return -1; + while (getmntent_r(f, &mb, mntbuf, sizeof(mntbuf))) { int ftype; - if (STRNEQ(mb.mnt_dir, path)) + if (STRNEQ(mb.mnt_dir, canonPath)) continue; if (STREQ(mb.mnt_type, "nfs") || @@ -136,6 +147,7 @@ statfs_mock(const char *mtab, } endmntent(f); + VIR_FREE(canonPath); return ret; } @@ -152,3 +164,22 @@ statfs(const char *path, struct statfs *buf) return real_statfs(path, buf); } + + +char * +canonicalize_file_name(const char *path) +{ + if (getenv("LIBVIRT_MTAB")) { + const char *p; + char *ret; + + if ((p = STRSKIP(path, "/some/symlink"))) + ignore_value(virAsprintfQuiet(&ret, "/gluster%s", p)); + else + ignore_value(VIR_STRDUP_QUIET(ret, path)); + + return ret; + } + + return real_canonicalize_file_name(path); +} diff --git a/tests/virfiletest.c b/tests/virfiletest.c index 1f2be74c8d..f7b263f2e9 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -456,6 +456,7 @@ mymain(void) DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/nfs/blah", false); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/sshfs/file", false); + DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true); return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS; } -- 2.18.1

2 1

[libvirt] [tck PATCH 0/3] a few minor TCK bugfixes
by Laine Stump 19 Oct '18

19 Oct '18

Laine Stump (3): reduce required libvirt version in rpm spec fix selinux/100-static-relabel-no test double timeout on nwfilter 060-concurrency test perl-Sys-Virt-TCK.spec.PL | 2 +- scripts/nwfilter/nwfilter_concurrent.sh | 2 +- scripts/selinux/100-static-relabel-no.t | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) -- 2.14.5

2 4

[libvirt] [PATCH] qemu: Avoid memleak on failure to format blockjobs
by Eric Blake 19 Oct '18

19 Oct '18

virXMLFormatElement() frees attrBuf on success, but not necessarily on failure. Most other callers of this function take the time to reset attrBuf afterwords, but qemuDomainObjPrivateXMLFOrmatBlockjobs() was relying on it succeeding, and could thus result in a memory leak. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_domain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dd67be5e2a..ad7a6fe136 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2232,11 +2232,15 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBufferPtr buf, { virBuffer attrBuf = VIR_BUFFER_INITIALIZER; bool bj = qemuDomainHasBlockjob(vm, false); + ret = -1; virBufferAsprintf(&attrBuf, " active='%s'", virTristateBoolTypeToString(virTristateBoolFromBool(bj))); - return virXMLFormatElement(buf, "blockjobs", &attrBuf, NULL); + ret = virXMLFormatElement(buf, "blockjobs", &attrBuf, NULL); + cleanup: + virBufferFreeAndReset(&attrBuf); + return ret; } -- 2.17.2

2 2

[libvirt] [PATCH v6 00/13] PCI passthrough support on s390
by Yi Min Zhao 19 Oct '18

19 Oct '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, a new element of PCI address is introduced. It has two optional attributes, @uid and @fid. For example: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'> <zpci uid='0x0003' fid='0x00000027'/> </address> </hostdev> If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. zPCI address as an extension of the PCI address are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of zPCI uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: b1a0f691ce4652fc71aca6776f085355040322da spec: Build ceph and gluster support everywhere Change Log ========== v5->v6: 1. Modify zPCI XML definition. 2. Optimize the logic of zPCI address assignment and reservation. 3. Add extension flag into PCI address structure. 4. Update commit messages. v4->v5: 1. Update the version number. 2. Fixup code style error. 3. Separate qemu code into single patch. 4. Rebase the patches to the new code of master branch. v3->v4: 1. Update docs. 2. Format code style. 3. Optimize zPCI support check. 4. Move the check of zPCI defined in xml but unsupported by Qemu to qemuDomainDeviceDefValidate(). 5. Change zpci address member of PCI address struct from pointer to instance. 6. Modify zpci address definition principle. Currently the user must either define both of uid and fid or not. v2->v3: 1. Revise code style. 2. Update test cases. 3. Introduce qemuDomainCollectPCIAddressExtension() to collect PCI extension addresses. 4. Introduce virDeviceInfoPCIAddressExtensionPresent() to check if zPCI address exists. 5. Optimize zPCI address check logic. 6. Optimize passed parameters of zPCI addr alloc/release/reserve functions. 7. Report enum range error in qemuDomainDeviceSupportZPCI(). 8. Update commit messages. v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (13): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid qemu: Add zPCI address definition check conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes cfg.mk | 1 + docs/formatdomain.html.in | 9 +- docs/news.xml | 11 + docs/schemas/basictypes.rng | 27 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 90 +++++ src/conf/device_conf.h | 7 + src/conf/domain_addr.c | 332 ++++++++++++++++++ src/conf/domain_addr.h | 30 ++ src/conf/domain_conf.c | 14 +- src/libvirt_private.syms | 7 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 102 ++++++ src/qemu/qemu_command.h | 2 + src/qemu/qemu_domain.c | 39 ++ src/qemu/qemu_domain_address.c | 204 ++++++++++- src/qemu/qemu_hotplug.c | 162 ++++++++- src/util/virpci.c | 7 + src/util/virpci.h | 14 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../disk-virtio-s390-zpci.args | 26 ++ .../disk-virtio-s390-zpci.xml | 19 + .../hostdev-vfio-zpci-autogenerate.args | 25 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 + .../hostdev-vfio-zpci-boundaries.args | 29 ++ .../hostdev-vfio-zpci-boundaries.xml | 30 ++ .../hostdev-vfio-zpci-multidomain-many.args | 39 ++ .../hostdev-vfio-zpci-multidomain-many.xml | 79 +++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 25 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 21 ++ tests/qemuxml2argvtest.c | 20 ++ .../disk-virtio-s390-zpci.xml | 31 ++ .../hostdev-vfio-zpci-autogenerate.xml | 34 ++ .../hostdev-vfio-zpci-boundaries.xml | 48 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 97 +++++ .../qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 32 ++ tests/qemuxml2xmltest.c | 17 + 44 files changed, 1648 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

5 53

[libvirt] [PATCH] libvirtd: fix potential deadlock when starting vm
by Bingsong Si 19 Oct '18

19 Oct '18

On CentOS 6, udev_monitor_receive_device will block until the socket becomes readable, udevEventHandleThread will hold the lock all the time and udevEventHandleCallback hard to get the lock, will block the event poll. To fix this, set dataReady to false after receive an udev event. Signed-off-by: Bingsong Si <owen.si(a)ucloud.cn> --- src/node_device/node_device_udev.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 22897591de..ce1101d7cc 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1616,6 +1616,7 @@ udevEventHandleThread(void *opaque ATTRIBUTE_UNUSED) errno = 0; device = udev_monitor_receive_device(priv->udev_monitor); + priv->dataReady = false; virObjectUnlock(priv); if (!device) { @@ -1637,10 +1638,6 @@ udevEventHandleThread(void *opaque ATTRIBUTE_UNUSED) return; } - virObjectLock(priv); - priv->dataReady = false; - virObjectUnlock(priv); - continue; } -- 2.18.0

4 9

[libvirt] [PATCH] qemu: remove unreferenced variable
by Bjoern Walk 18 Oct '18

18 Oct '18

The QEMU config in @cfg is not actually referenced in qemuProcessInit, let's remove it. Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- src/qemu/qemu_process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e9c76188..3955eda1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5267,7 +5267,6 @@ qemuProcessInit(virQEMUDriverPtr driver, bool migration, unsigned int flags) { - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virCapsPtr caps = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; int stopFlags; @@ -5347,7 +5346,6 @@ qemuProcessInit(virQEMUDriverPtr driver, cleanup: virCPUDefFree(origCPU); - virObjectUnref(cfg); virObjectUnref(caps); return ret; -- 2.17.0

2 1

[libvirt] [PATCH] nwfilter: fix learning address thread shutdown
by Nikolay Shirokovskiy 18 Oct '18

18 Oct '18

If learning thread is configured to learn on all ethernet frames (which is hardcoded) then chances are big that there is packet on every iteration of inspecting frames loop. As result we will hang on shutdown because we don't check threadsTerminate if there is packet. Let's just check termination conditions on every iteration. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/nwfilter/nwfilter_learnipaddr.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 008c24b..e6cb996 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -483,6 +483,12 @@ learnIPAddressThread(void *arg) while (req->status == 0 && vmaddr == 0) { int n = poll(fds, ARRAY_CARDINALITY(fds), PKT_TIMEOUT_MS); + if (threadsTerminate || req->terminate) { + req->status = ECANCELED; + showError = false; + break; + } + if (n < 0) { if (errno == EAGAIN || errno == EINTR) continue; @@ -492,15 +498,8 @@ learnIPAddressThread(void *arg) break; } - if (n == 0) { - if (threadsTerminate || req->terminate) { - VIR_DEBUG("Terminate request seen, cancelling pcap"); - req->status = ECANCELED; - showError = false; - break; - } + if (n == 0) continue; - } if (fds[0].revents & (POLLHUP | POLLERR)) { VIR_DEBUG("Error from FD probably dev deleted"); @@ -512,13 +511,6 @@ learnIPAddressThread(void *arg) packet = pcap_next(handle, &header); if (!packet) { - /* Already handled with poll, but lets be sure */ - if (threadsTerminate || req->terminate) { - req->status = ECANCELED; - showError = false; - break; - } - /* Again, already handled above, but lets be sure */ if (virNetDevValidateConfig(req->binding->portdevname, NULL, req->ifindex) <= 0) { virResetLastError(); -- 1.8.3.1

2 4

[libvirt] [PATCH] snapshot: Don't hose list on deletion failure
by Eric Blake 18 Oct '18

18 Oct '18

If qemuDomainSnapshotDiscard() fails for any reason (rare, but possible with an ill-timed ENOMEM or if qemuDomainSnapshotForEachQcow2() has problems talking to the qemu guest monitor), then an attempt to retry the snapshot deletion API will crash because we didn't undo the effects of virDomainSnapshotDropParent() temporarily rearranging the internal list structures, and the second attempt to drop parents will dereference NULL. Fix it by instead only rearranging the internal list on success. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Found by accident, since I copied this code to my checkpoint code and hit the segfault there. This one has been latent for years, but is not a security bug since there is no escalation if you already have sufficient privilege to delete snapshots. src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3f143e91c1..9a3f2a090d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16699,8 +16699,9 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, snap->first_child = NULL; ret = 0; } else { - virDomainSnapshotDropParent(snap); ret = qemuDomainSnapshotDiscard(driver, vm, snap, true, metadata_only); + if (ret == 0) + virDomainSnapshotDropParent(snap); } endjob: -- 2.17.2

1 1

[libvirt] [PATCH] network: add prefix to dhcp range of dnsmasq conf file for IPv4 too
by Laine Stump 18 Oct '18

18 Oct '18

dnsmasq documentation says that the *IPv4* prefix/network address/broadcast address sent to dhcp clients will be automatically determined by dnsmasq by looking at the interface it's listening on, so the original libvirt code that added dhcp support to virtual networks did not add a prefix to the dnsmasq commandline (or later, the dnsmasq conf file). For *IPv6* however, dnsmasq cannot automatically determine the prefix, so it must be explicitly provided in the conf file (as a part of the dhcp-range option). Years after the initial IPv4 support, when IPv6 dhcp support was added, libvirt added the prefix to dhcp-range, but only for IPv6 (following the "if it ain't broke, don't fix it" doctrine). Recently a user reported (privately, because they suspected a possible security implication, which turned out to be unfounded) a bug on a host where one of the interfaces was a superset of the libvirt network where dhcp is needed (e.g., the host's ethernet is 10.0.0.20/8, and the libvirt network is 10.10.0.1/24). For some reason dnsmasq was supplying the netmask/broadcast address for the /8 network to clients requesting an address on the /24 interface. This seems like a bug in dnsmasq, but even if/when it gets fixed there, it looks like there is no harm in just adding the prefix to all dhcp-range options regardless of IPv4 vs IPv6, so that's what this patch does. Signed-off-by: Laine Stump <laine(a)laine.org> --- src/network/bridge_driver.c | 7 ++----- tests/networkxml2confdata/dhcp6-nat-network.conf | 2 +- tests/networkxml2confdata/isolated-network.conf | 2 +- tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf | 2 +- tests/networkxml2confdata/nat-network-dns-srv-record.conf | 2 +- tests/networkxml2confdata/nat-network-dns-txt-record.conf | 2 +- tests/networkxml2confdata/nat-network-name-with-quotes.conf | 2 +- tests/networkxml2confdata/nat-network.conf | 2 +- tests/networkxml2confdata/netboot-network.conf | 2 +- tests/networkxml2confdata/netboot-proxy-network.conf | 2 +- tests/networkxml2confdata/ptr-domains-auto.conf | 2 +- 11 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4bbc4f5a6d..7f5ff79fdc 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1416,11 +1416,8 @@ networkDnsmasqConfContents(virNetworkObjPtr obj, !(eaddr = virSocketAddrFormat(&ipdef->ranges[r].end))) goto cleanup; - virBufferAsprintf(&configbuf, "dhcp-range=%s,%s", - saddr, eaddr); - if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) - virBufferAsprintf(&configbuf, ",%d", prefix); - virBufferAddLit(&configbuf, "\n"); + virBufferAsprintf(&configbuf, "dhcp-range=%s,%s,%d\n", + saddr, eaddr, prefix); VIR_FREE(saddr); VIR_FREE(eaddr); diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network.conf index d1058df3b6..e1e110fe23 100644 --- a/tests/networkxml2confdata/dhcp6-nat-network.conf +++ b/tests/networkxml2confdata/dhcp6-nat-network.conf @@ -8,7 +8,7 @@ strict-order except-interface=lo bind-dynamic interface=virbr0 -dhcp-range=192.168.122.2,192.168.122.254 +dhcp-range=192.168.122.2,192.168.122.254,24 dhcp-no-override dhcp-authoritative dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64 diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network.conf index ce4a59f6c1..d182f42f0a 100644 --- a/tests/networkxml2confdata/isolated-network.conf +++ b/tests/networkxml2confdata/isolated-network.conf @@ -10,7 +10,7 @@ bind-interfaces listen-address=192.168.152.1 dhcp-option=3 no-resolv -dhcp-range=192.168.152.2,192.168.152.254 +dhcp-range=192.168.152.2,192.168.152.254,24 dhcp-no-override dhcp-authoritative dhcp-lease-max=253 diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf index f35ea1d5d4..678e4a4bfd 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf @@ -13,7 +13,7 @@ listen-address=fc00:db8:ac10:fe01::1 listen-address=fc00:db8:ac10:fd01::1 listen-address=10.24.10.1 srv-host=_name._tcp -dhcp-range=192.168.122.2,192.168.122.254 +dhcp-range=192.168.122.2,192.168.122.254,24 dhcp-no-override dhcp-authoritative dhcp-lease-max=253 diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record.conf index af1ed70758..4f21eb18b3 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf @@ -15,7 +15,7 @@ srv-host=_name4._tcp.test4.com,test4.example.com,4444 srv-host=_name5._udp,test5.example.com,1,55,555 srv-host=_name6._tcp.test6.com,test6.example.com,6666,0,666 srv-host=_name7._tcp.test7.com,test7.example.com,1,0,777 -dhcp-range=192.168.122.2,192.168.122.254 +dhcp-range=192.168.122.2,192.168.122.254,24 dhcp-no-override dhcp-authoritative dhcp-lease-max=253 diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record.conf index 7f560fbb5c..12e13c999e 100644 --- a/tests/networkxml2confdata/nat-network-dns-txt-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-txt-record.conf @@ -9,7 +9,7 @@ except-interface=lo bind-dynamic interface=virbr0 txt-record=example,example value -dhcp-range=192.168.122.2,192.168.122.254 +dhcp-range=192.168.122.2,192.168.122.254,24 dhcp-no-override dhcp-authoritative dhcp-lease-max=253 diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.conf b/tests/networkxml2confdata/nat-network-name-with-quotes.conf index 36e11d17b9..63475ef511 100644 --- a/tests/networkxml2confdata/nat-network-name-with-quotes.conf +++ b/tests/networkxml2confdata/nat-network-name-with-quotes.conf @@ -13,7 +13,7 @@ listen-address=fc00:db8:ac10:fe01::1 listen-address=fc00:db8:ac10:fd01::1 listen-address=10.24.10.1 srv-host=_name._tcp -dhcp-range=192.168.122.2,192.168.122.254 +dhcp-range=192.168.122.2,192.168.122.254,24 dhcp-no-override dhcp-authoritative dhcp-lease-max=253 diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network.conf index a3c8b102d3..015d51c952 100644 --- a/tests/networkxml2confdata/nat-network.conf +++ b/tests/networkxml2confdata/nat-network.conf @@ -8,7 +8,7 @@ strict-order except-interface=lo bind-dynamic interface=virbr0 -dhcp-range=192.168.122.2,192.168.122.254 +dhcp-range=192.168.122.2,192.168.122.254,24 dhcp-no-override dhcp-authoritative dhcp-lease-max=253 diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network.conf index b554a5456c..987164c24c 100644 --- a/tests/networkxml2confdata/netboot-network.conf +++ b/tests/networkxml2confdata/netboot-network.conf @@ -10,7 +10,7 @@ expand-hosts except-interface=lo bind-interfaces listen-address=192.168.122.1 -dhcp-range=192.168.122.2,192.168.122.254 +dhcp-range=192.168.122.2,192.168.122.254,24 dhcp-no-override dhcp-authoritative enable-tftp diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network.conf index afb4033f7e..ad7e55fd09 100644 --- a/tests/networkxml2confdata/netboot-proxy-network.conf +++ b/tests/networkxml2confdata/netboot-proxy-network.conf @@ -10,7 +10,7 @@ expand-hosts except-interface=lo bind-interfaces listen-address=192.168.122.1 -dhcp-range=192.168.122.2,192.168.122.254 +dhcp-range=192.168.122.2,192.168.122.254,24 dhcp-no-override dhcp-authoritative dhcp-boot=pxeboot.img,,10.20.30.40 diff --git a/tests/networkxml2confdata/ptr-domains-auto.conf b/tests/networkxml2confdata/ptr-domains-auto.conf index 7f1a393dd5..3be679ac4d 100644 --- a/tests/networkxml2confdata/ptr-domains-auto.conf +++ b/tests/networkxml2confdata/ptr-domains-auto.conf @@ -10,7 +10,7 @@ local=/1.0.e.f.0.1.c.a.8.b.d.0.1.0.0.2.ip6.arpa/ except-interface=lo bind-dynamic interface=virbr0 -dhcp-range=192.168.122.2,192.168.122.254 +dhcp-range=192.168.122.2,192.168.122.254,24 dhcp-no-override dhcp-authoritative dhcp-lease-max=253 -- 2.14.5

1 1

[libvirt] [PATCH] qemu: Fix IOThread pids lost after qemuProcessReconnect
by Jie Wang 18 Oct '18

18 Oct '18

>From fca1732c0e1f691fb25c614349d5486bbc73a109 Mon Sep 17 00:00:00 2001 From: Jie Wang <wangjie88(a)huawei.com> Date: Wed, 17 Oct 2018 22:55:51 +0800 Subject: [PATCH] qemu: Fix IOThread pids lost after qemuProcessReconnect IOThread pids info will lost after libvirtd restart, then if we call pinIOThread, sched_setaffinity will be called with pid 0, not IOThread pid. So pinIOThread cannot work normally. Signed-off-by: Jie Wang <wangjie88.huawei.com> --- src/qemu/qemu_process.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 40d35cbe6b..5bf55721d2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7650,6 +7650,9 @@ qemuProcessReconnect(void *opaque) qemuDomainVcpuPersistOrder(obj->def); + if (qemuProcessDetectIOThreadPIDs(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) + goto error; + if (qemuSecurityReserveLabel(driver->securityManager, obj->def, obj->pid) < 0) goto error; -- 2.16.2.windows.1

1 0