March 2018 - Devel - libvirt List Archives

[libvirt] [Question]Libvirt doesn't care about qemu monitor event if fail to destroy qemu process
by Wuzongyong (Euler Dept) 06 Mar '18

06 Mar '18

Hi, We unregister qemu monitor after sending QEMU_PROCESS_EVENT_MONITOR_EOF to workerPool: static void qemuProcessHandleMonitorEOF(qemuMonitorPtr mon, virDomainObjPtr vm, void *opaque) { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv; struct qemuProcessEvent *processEvent; ... processEvent->eventType = QEMU_PROCESS_EVENT_MONITOR_EOF; processEvent->vm = vm; virObjectRef(vm); if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { ignore_value(virObjectUnref(vm)); VIR_FREE(processEvent); goto cleanup; } /* We don't want this EOF handler to be called over and over while the * thread is waiting for a job. */ qemuMonitorUnregister(mon); ... } Then we handle QEMU_PROCESS_EVENT_MONITOR_EOF in processMonitorEOFEvent function: static void processMonitorEOFEvent(virQEMUDriverPtr driver, virDomainObjPtr vm) { ... if (qemuProcessBeginStopJob(driver, vm, QEMU_JOB_DESTROY, true) < 0) return; ... } Here, libvirt will show that the vm state is running all the time if qemuProcessBeginStopJob return -1 even though qemu may terminate or be killed later. So, may be we should re-register the monitor when qemuProcessBeginStopJob failed? Thanks, Zongyong Wu

3 10

[libvirt] [PATCH] tests: force use of "NORMAL" TLS priority in test suite
by Daniel P. Berrangé 06 Mar '18

06 Mar '18

When generating certificates we rely on GNUTLS' built-in default setup for the ciphers used in the certs. We then currently run with the distro specific TLS priority setup which can be much stronger, to the extent that the certificates we generate are considered untrustworthy. We don't care about the quality of the ciphers we use in the test suite, so just force the priority to "NORMAL" which should ensure our certs are accepted by GNUTLS. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/virnettlscontexttest.c | 4 ++-- tests/virnettlssessiontest.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 089c10e964..86647f3014 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -72,7 +72,7 @@ static int testTLSContextInit(const void *opaque) data->crt, KEYFILE, NULL, - NULL, + "NORMAL", true, true); } else { @@ -80,7 +80,7 @@ static int testTLSContextInit(const void *opaque) NULL, data->crt, KEYFILE, - NULL, + "NORMAL", true, true); } diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 6d639e5b16..7e85607181 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -113,7 +113,7 @@ static int testTLSSessionInit(const void *opaque) data->servercrt, KEYFILE, data->wildcards, - NULL, + "NORMAL", false, true); @@ -121,7 +121,7 @@ static int testTLSSessionInit(const void *opaque) NULL, data->clientcrt, KEYFILE, - NULL, + "NORMAL", false, true); -- 2.14.3

1 1

[libvirt] [tck PATCH v2 0/4] set CTRL_IP_LEARNING and DHCPSERVER in filter during no-ip-spoofing test
by Laine Stump 06 Mar '18

06 Mar '18

We've recently discovered two separate bugs that caused libvirt's "DHCP Snooping" feature to not work: https://bugzilla.redhat.com/show_bug.cgi?id=1529338 - libvirt regression https://bugzilla.redhat.com/show_bug.cgi?id=1547237 - libpcap regression Since we didn't have any test suite covering that code, we had the embarrassment of learning of it from someone else's QE (RHV/oVirt QE at Red Hat). This series adds the necessary stuff to the test domain config of libvirt-tck's "no-ip-spoofing" test to exercise the DHCPSnoop thread. (There may be a much better way of dealing with a hash-inside-a-hash; I am an imbecile at perl, and arrived at this code by trial, error, and google searches). Laine Stump (4): nwfilter tests: auto-add test appliance ssh key to known_hosts on host new NetworkHelper function get_network_ip() set CTRL_IP_LEARNING and DHCPSERVER in filter during no-ip-spoofing test nwfilter tests: remove all hardcoded references to 192.168.122 network lib/Sys/Virt/TCK.pm | 11 ++++++++--- lib/Sys/Virt/TCK/DomainBuilder.pm | 8 +++++++- lib/Sys/Virt/TCK/NetworkHelpers.pm | 22 ++++++++++++++++++++++ scripts/nwfilter/210-no-mac-spoofing.t | 12 ++++++++---- scripts/nwfilter/220-no-ip-spoofing.t | 26 +++++++++++++++++++++----- scripts/nwfilter/230-no-mac-broadcast.t | 11 ++++++++--- scripts/nwfilter/240-no-arp-spoofing.t | 22 ++++++++++++++++------ 7 files changed, 90 insertions(+), 22 deletions(-) -- 2.14.3

2 12

[libvirt] [PATCH] qemu: Fix comparison assignment in qemuDomainUpdateDeviceLive
by Erik Skultety 06 Mar '18

06 Mar '18

Fix this common typo and assign a value rather than implicitly type-casted comparison result. Introduced by commit b6a264e855. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under the trivial rule. src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 96454c17c..9e715e7a0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7919,7 +7919,7 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, break; case VIR_DOMAIN_DEVICE_GRAPHICS: - if ((idx = qemuDomainFindGraphicsIndex(vm->def, dev->data.graphics) >= 0)) { + if ((idx = qemuDomainFindGraphicsIndex(vm->def, dev->data.graphics)) >= 0) { oldDev.data.graphics = vm->def->graphics[idx]; if (virDomainDefCompatibleDevice(vm->def, dev, &oldDev) < 0) return -1; -- 2.13.6

2 1

[libvirt] [RFC PATCH v3 0/9] Add optional pSeries features
by Andrea Bolognani 06 Mar '18

06 Mar '18

Applies cleanly on top of 6722a32444db6335f2104e67d873199c76e5701e. Some of the patches are fairly big because of all the capabilities data being added and the subsequent test suite churn: I'm sending a redacted version to the list, the rest of the code can be grabbed from https://github.com/andreabolognani/libvirt/tree/pseries-caps RFC because the relevant QMP command has not been merged into QEMU yet. And there's still no documentation. Changes from [RFC v2]: * use qom-list-properties to probe availability; * test all features with a single XML file. Changes from [RFC v1]: * don't nest features inside a <pseries/> element; * implement all optional features. [RFC v2] https://www.redhat.com/archives/libvir-list/2018-February/msg00310.html [RFC v1] https://www.redhat.com/archives/libvir-list/2018-January/msg00779.html Andrea Bolognani (9): tests: Add capabilities data for QEMU 2.12 qemu: Add capability for qom-list-properties qemu: Prefer qom-list-properties to device-list-properties qemu: Add capabilities for optional pSeries features tests: Rename pseries-features-hpt test qemu: Implement the HTM pSeries feature qemu: Implement the SBBC pSeries feature qemu: Implement the CFPC pSeries feature qemu: Implement the IBS pSeries feature docs/schemas/domaincommon.rng | 30 + src/conf/domain_conf.c | 74 + src/conf/domain_conf.h | 15 + src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 30 +- src/qemu/qemu_capabilities.h | 7 + src/qemu/qemu_command.c | 165 + src/qemu/qemu_domain.c | 28 + src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 13 +- src/qemu/qemu_monitor_json.h | 3 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0-gicv2.aarch64.replies | 24 +- .../caps_2.10.0-gicv2.aarch64.xml | 2 +- .../caps_2.10.0-gicv3.aarch64.replies | 24 +- .../caps_2.10.0-gicv3.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 26 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 30 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- ...4.replies => caps_2.12.0-gicv2.aarch64.replies} | 3257 ++++++---- ...2.aarch64.xml => caps_2.12.0-gicv2.aarch64.xml} | 24 +- ...4.replies => caps_2.12.0-gicv3.aarch64.replies} | 3261 ++++++---- ...3.aarch64.xml => caps_2.12.0-gicv3.aarch64.xml} | 24 +- ...0.0.ppc64.replies => caps_2.12.0.ppc64.replies} | 6211 +++++++++++--------- ...caps_2.10.0.ppc64.xml => caps_2.12.0.ppc64.xml} | 991 ++-- ...0.x86_64.replies => caps_2.12.0.x86_64.replies} | 5393 ++++++++++------- ...ps_2.10.0.x86_64.xml => caps_2.12.0.x86_64.xml} | 455 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0-gicv2.aarch64.replies | 24 +- .../caps_2.6.0-gicv2.aarch64.xml | 2 +- .../caps_2.6.0-gicv3.aarch64.replies | 24 +- .../caps_2.6.0-gicv3.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 22 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 26 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 26 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 30 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemucapabilitiestest.c | 4 + .../pseries-features-invalid-machine.xml | 4 + ...ies-features-hpt.args => pseries-features.args} | 3 +- ...eries-features-hpt.xml => pseries-features.xml} | 4 + tests/qemuxml2argvtest.c | 8 +- tests/qemuxml2xmloutdata/pseries-features-hpt.xml | 1 - tests/qemuxml2xmloutdata/pseries-features.xml | 1 + tests/qemuxml2xmltest.c | 6 +- 78 files changed, 12668 insertions(+), 7972 deletions(-) copy tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.replies => caps_2.12.0-gicv2.aarch64.replies} (93%) copy tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.xml => caps_2.12.0-gicv2.aarch64.xml} (95%) copy tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.replies => caps_2.12.0-gicv3.aarch64.replies} (93%) copy tests/qemucapabilitiesdata/{caps_2.10.0-gicv3.aarch64.xml => caps_2.12.0-gicv3.aarch64.xml} (95%) copy tests/qemucapabilitiesdata/{caps_2.10.0.ppc64.replies => caps_2.12.0.ppc64.replies} (87%) copy tests/qemucapabilitiesdata/{caps_2.10.0.ppc64.xml => caps_2.12.0.ppc64.xml} (54%) copy tests/qemucapabilitiesdata/{caps_2.10.0.x86_64.replies => caps_2.12.0.x86_64.replies} (90%) copy tests/qemucapabilitiesdata/{caps_2.10.0.x86_64.xml => caps_2.12.0.x86_64.xml} (83%) rename tests/qemuxml2argvdata/{pseries-features-hpt.args => pseries-features.args} (78%) rename tests/qemuxml2argvdata/{pseries-features-hpt.xml => pseries-features.xml} (88%) delete mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features.xml -- 2.14.3

2 12

[libvirt] fseeko broken by Fedora rawhide glibc / git master (ie future 2.28)
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

Fedora rawhide has just upgraded to the latest glibc git master snapshot, of what will become the 2.28 release, and this has exposed bugs in gnulib's fseeko.c implementation (and probably more macros) besides. The issue starts are line 50: http://git.savannah.gnu.org/cgit/gnulib.git/tree/lib/fseeko.c#n50 #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ Historically the _IO_ftrylockfile symbol has been defined unconditionally in glibc, by /usr/include/libio.h, which is pulled in unconditionally from /usr/include/stdio.h The libio.h header was deprecated in 2.27 release and is removed in git master for future 2.28. Thus the _IO_ftrylockfile symbol has gone away. https://sourceware.org/ml/libc-announce/2018/msg00000.html "The nonstandard header files <libio.h> and <_G_config.h> are deprecated and will be removed in a future release. Software that is still using either header should be updated to use standard <stdio.h> interfaces instead. libio.h was originally the header for a set of supported GNU extensions, but they have not been maintained as such in many years, they are now standing in the way of improvements to stdio, and we don't think there are any remaining external users. _G_config.h was never intended for public use, but predates the bits convention." We then fail the __GNU_LIBRARY__ test too, because modern glibc defines that to a value of '6', not '1'. For added fun __GNU_LIBRARY__ is considered deprecated too, with recommendation to use other symbols like __GLIBC__ and __GLIBC_MINOR__ /* This macro indicates that the installed library is the GNU C Library. For historic reasons the value now is 6 and this will stay from now on. The use of this variable is deprecated. Use __GLIBC__ and __GLIBC_MINOR__ now (see below) when you want to test for a specific GNU C library version and use the values in <gnu/lib-names.h> to get the sonames of the shared libraries. * #define __GNU_LIBRARY__ 6 I hit failure on fseeko.c, but many other files in gnulib test on _IO_ftrylockfile so I presume they are all broken. I'm curious why we're trying to replace fseeko impl at all, since I would expect the modern glibc impl to be suitable to use as-is. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 4

[libvirt] [PATCH] cfg.mak: ignore trailing whitespace in gnulib local patches
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

The diff files in gnulib/local may well contain trailing whitespace. They are simply diff's of gnulib code which should not be modified to follow libvirt style rules. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix cfg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index 22de11ce43..bc8088d7c0 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1224,7 +1224,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \ ^(examples/|tools/virsh-edit\.c$$) exclude_file_name_regexp--sc_trailing_blank = \ - /qemuhelpdata/|/sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo$$ + /qemuhelpdata/|/sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|^gnulib/local/.*/.*diff$$ exclude_file_name_regexp--sc_unmarked_diagnostics = \ ^(docs/apibuild.py|tests/virt-aa-helper-test|docs/js/.*\.js)$$ -- 2.14.3

1 0

[libvirt] [PATCH] gnulib: temporary hacks to deal with glibc libio.h removal
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

GLibc deprecated libio.h in 2.27 and has removed it in current code that will become 2.28. The latter is now in Fedora rawhide and this change breaks gnulib which mistakenly still relies on these ancient symbols. Add a local hack for gnulib until a proper fix is available upstream. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix gnulib/local/lib/fflush.c.diff | 33 +++++++++++++++++++++++++++++++++ gnulib/local/lib/fpurge.c.diff | 13 +++++++++++++ gnulib/local/lib/freading.c.diff | 13 +++++++++++++ gnulib/local/lib/fseeko.c.diff | 22 ++++++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 gnulib/local/lib/fflush.c.diff create mode 100644 gnulib/local/lib/fpurge.c.diff create mode 100644 gnulib/local/lib/freading.c.diff create mode 100644 gnulib/local/lib/fseeko.c.diff diff --git a/gnulib/local/lib/fflush.c.diff b/gnulib/local/lib/fflush.c.diff new file mode 100644 index 0000000000..fa0e2431bd --- /dev/null +++ b/gnulib/local/lib/fflush.c.diff @@ -0,0 +1,33 @@ +diff --git a/lib/fflush.c b/lib/fflush.c +index 983ade0ff..5f617305a 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -32,8 +32,8 @@ + + #undef fflush + +- +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#define _IO_IN_BACKUP 0x100 ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + diff --git a/gnulib/local/lib/fpurge.c.diff b/gnulib/local/lib/fpurge.c.diff new file mode 100644 index 0000000000..1fd87d8bfa --- /dev/null +++ b/gnulib/local/lib/fpurge.c.diff @@ -0,0 +1,13 @@ +diff --git a/lib/fpurge.c b/lib/fpurge.c +index b1d417c7a..75cf34ca2 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ diff --git a/gnulib/local/lib/freading.c.diff b/gnulib/local/lib/freading.c.diff new file mode 100644 index 0000000000..c51e34dd6a --- /dev/null +++ b/gnulib/local/lib/freading.c.diff @@ -0,0 +1,13 @@ +diff --git a/lib/freading.c b/lib/freading.c +index 73c28acdd..b1c397016 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); diff --git a/gnulib/local/lib/fseeko.c.diff b/gnulib/local/lib/fseeko.c.diff new file mode 100644 index 0000000000..b2c061fc97 --- /dev/null +++ b/gnulib/local/lib/fseeko.c.diff @@ -0,0 +1,22 @@ +diff --git a/lib/fseeko.c b/lib/fseeko.c +index 0101ab55f..542241bb2 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- 2.14.3

1 0

[libvirt] [PATCH] gnulib: update to latest upstream changeset
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial rule .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 7e7c5c7952..0404c9ae28 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 7e7c5c7952b7de1e33c8eba891cc425d5d8d7803 +Subproject commit 0404c9ae2845cbf93d71b295b67d6c8bd39382d8 -- 2.14.3

1 0

[libvirt] [PATCH 00/17] Split up the src/Makefile.am even more
by Daniel P. Berrangé 05 Mar '18

05 Mar '18

This is a continuation of my previous work to split src/Makefile.am This series does all the other non-virt drivers and utility code directories. This is about as far as I'm intending to take it for now. This is for post-freeze obviously :) Daniel P. Berrangé (17): make: split interface driver build rules into interface/Makefile.inc.am make: split network driver build rules into network/Makefile.inc.am make: split nwfilter driver build rules into nwfilter/Makefile.inc.am make: split nodedev driver build rules into node_device/Makefile.inc.am make: split secret driver build rules into secret/Makefile.inc.am make: split storage driver build rules into storage/Makefile.inc.am make: split remote driver & daemon build rules into remote/Makefile.inc.am make: split XML conf build rules into conf/Makefile.inc.am make: split CPU build rules into cpu/Makefile.inc.am make: split security driver build rules into security/Makefile.inc.am make: split access driver build rules into access/Makefile.inc.am make: split logging daemon build rules into logging/Makefile.inc.am make: split lock daemon build rules into locking/Makefile.inc.am make: split admin driver build rules into admin/Makefile.inc.am make: split RPC build rules into rpc/Makefile.inc.am make: split util build rules into util/Makefile.inc.am make: split vmx driver build rules into vmx/Makefile.inc.am src/Makefile.am | 1993 +-------------------------------------- src/access/Makefile.inc.am | 148 +++ src/admin/Makefile.inc.am | 50 + src/conf/Makefile.inc.am | 163 ++++ src/cpu/Makefile.inc.am | 24 + src/interface/Makefile.inc.am | 42 + src/locking/Makefile.inc.am | 321 +++++++ src/logging/Makefile.inc.am | 155 +++ src/network/Makefile.inc.am | 106 +++ src/node_device/Makefile.inc.am | 65 ++ src/nwfilter/Makefile.inc.am | 42 + src/remote/Makefile.inc.am | 342 +++++++ src/rpc/Makefile.inc.am | 147 +++ src/secret/Makefile.inc.am | 38 + src/security/Makefile.inc.am | 80 ++ src/storage/Makefile.inc.am | 323 +++++++ src/util/Makefile.inc.am | 325 +++++++ src/vmx/Makefile.inc.am | 22 + 18 files changed, 2435 insertions(+), 1951 deletions(-) create mode 100644 src/access/Makefile.inc.am create mode 100644 src/admin/Makefile.inc.am create mode 100644 src/conf/Makefile.inc.am create mode 100644 src/cpu/Makefile.inc.am create mode 100644 src/interface/Makefile.inc.am create mode 100644 src/locking/Makefile.inc.am create mode 100644 src/logging/Makefile.inc.am create mode 100644 src/network/Makefile.inc.am create mode 100644 src/node_device/Makefile.inc.am create mode 100644 src/nwfilter/Makefile.inc.am create mode 100644 src/remote/Makefile.inc.am create mode 100644 src/rpc/Makefile.inc.am create mode 100644 src/secret/Makefile.inc.am create mode 100644 src/security/Makefile.inc.am create mode 100644 src/storage/Makefile.inc.am create mode 100644 src/util/Makefile.inc.am create mode 100644 src/vmx/Makefile.inc.am -- 2.14.3

2 18