search for: 49,6

Hi, This series fix two bad commit ids referenced in commit messages, by first reverting the two commits and then re-applying them with correct commit ids referenced. No big problem, but for clarity. Hu Tao (4): Revert "Update gobject/Makefile.inc and POTFILES" Revert "Update gobject/Makefile.inc and POTFILES" Update gobject/Makefile.inc and POTFILES Update

...cleanup for OsinfoList, duplicating the cleanup everywhere needed. --- v2v/libosinfo-c.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/v2v/libosinfo-c.c b/v2v/libosinfo-c.c index 322e7d3d..75c2fae4 100644 --- a/v2v/libosinfo-c.c +++ b/v2v/libosinfo-c.c @@ -49,17 +49,6 @@ #if !IS_LIBOSINFO_VERSION(1, 8, 0) G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoFilter, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(OsinfoLoader, g_object_unref) -/* - * Because of a bug in OsinfoList in libosinfo 1.7.0 (fixed in 1.8.0), - * and a glib auto-cleanup addition for Module class...

--- mllib/common_utils.ml | 29 +++++++++++++++++++++++++++++ mllib/common_utils.mli | 8 ++++++++ 2 files changed, 37 insertions(+) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 64bf3d3..34e1285 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -49,6 +49,35 @@ module String = struct and len = length str in len >= sufflen && sub str (len - sufflen) sufflen = suffix + (* Note OCaml stdlib has an "is_space" function. *) + let isspace c = + c = ' ' + (* || c = '\f' *) || c = ...

...put can't cause an unexpected misparse of [ is to use either '[ "x$NBDKIT_VALGRIND" = "x1" ]' or '[ 1 = "$NBDKIT_VALGRIND" ]'. Not sure if that is worth worrying about, since the tests require bash. > +++ b/tests/test-lang-plugins.c > @@ -49,6 +49,7 @@ main (int argc, char *argv[]) > { > guestfs_h *g; > int r; > + const char *s; > char *data; > > /* These languages currently fail completely when run under > @@ -56,7 +57,8 @@ main (int argc, char *argv[]) > */ > #pragma GCC diag...

My stab v3 at fixing this: https://bugzilla.redhat.com/show_bug.cgi?id=1789279 It took me quite some time to go through the whole rfc 4122 just to realize we do not need to do anything with the versions. v3: - Do the check in precheck - Fix for Lazy evaluation of regexp UUID v2: - https://www.redhat.com/archives/libguestfs/2020-January/msg00221.html - Use EEXIST instead of EINVAL - Put the

..., 44(a0) cfc1 t0,$31 - swc1 $f20,48(a0) - swc1 $f21,52(a0) - swc1 $f22,56(a0) - swc1 $f23,60(a0) - swc1 $f24,64(a0) - swc1 $f25,68(a0) - swc1 $f26,72(a0) - swc1 $f27,76(a0) - swc1 $f28,80(a0) - swc1 $f29,84(a0) - swc1 $f30,88(a0) - swc1 $f31,92(a0) sw t0,96(a0) move v0,zero jr ra @@ -61,18 +49,6 @@ LEAF(longjmp) lw s8, 40(a0) lw ra, 44(a0) lw t0, 96(a0) - lwc1 $f20,48(a0) - lwc1 $f21,52(a0) - lwc1 $f22,56(a0) - lwc1 $f23,60(a0) - lwc1 $f24,64(a0) - lwc1 $f25,68(a0) - lwc1 $f26,72(a0) - lwc1 $f27,76(a0) - lwc1 $f28,80(a0) - lwc1 $f29,84(a0) - lwc1 $f30,88(a0) - lwc1 $f31,92(a0) ct...

Patches that were posted last week - with review comments addressed.

...> 5 files changed, 5 insertions(+), 15 deletions(-) > > > > diff --git a/tools/include/linux/types.h b/tools/include/linux/types.h > > index 051fdeaf2670..f1896b70a8e5 100644 > > --- a/tools/include/linux/types.h > > +++ b/tools/include/linux/types.h > > @@ -49,7 +49,6 @@ typedef __s8 s8; > > #endif > > > > #define __force > > -#define __user Why is this needed? > > #define __must_check > > #define __cold > > > > diff --git a/tools/virtio/linux/compiler.h b/tools/virtio/linux/compiler.h > >...

...t.com> >--- > v2v/output_rhv_upload.ml | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > >diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml >index 14153db36897..6482460f8de8 100644 >--- a/v2v/output_rhv_upload.ml >+++ b/v2v/output_rhv_upload.ml >@@ -49,6 +49,16 @@ after their uploads (if you do, you must supply one for each disk): > -oo rhv-disk-uuid=UUID Disk UUID > ") > >+let is_nonnil_uuid uuid = >+ let nil_uuid = "00000000-0000-0000-0000-000000000000" in >+ let rex_uuid = lazy ( >+ let hex =...

...inspect.size 2172 With this change: --- mechanize/inspect.rb~ 2007-07-12 10:55:20.375000000 -0700 +++ mechanize/inspect.rb 2007-07-12 11:42:58.203125000 -0700 @@ -40,6 +40,7 @@ } } end + alias :inspect :pretty_inspect end class Link @@ -49,6 +50,7 @@ q.breakable; q.pp href } end + alias :inspect :pretty_inspect end class Form lib $ I get these much better results: (rdb:1) p page.links[0].inspect.size 138 (rdb:1) p page.body.size 3441 (rdb:1) p page.inspect.size 2172 Is this patch re...

...filters/stats/stats.c | 34 +++++++++++++++++++--------------- > 1 file changed, 19 insertions(+), 15 deletions(-) > > diff --git a/filters/stats/stats.c b/filters/stats/stats.c > index 98282e2..45bedae 100644 > --- a/filters/stats/stats.c > +++ b/filters/stats/stats.c > @@ -49,6 +49,10 @@ > #include "cleanup.h" > #include "tvdiff.h" > > +#define MiB 1048576.0 > +#define GiB 1073741824.0 > +#define USEC 1000000.0 > + > static char *filename; > static bool append; > static FILE *fp; > @@ -64,34 +68,34 @@ static ui...

...s ------------------ - other Spacewalk / RHN IDs (?) - - Puppet registration - Windows sysprep (see: https://github.com/clalancette/oz/blob/e74ce83283d468fd987583d6837b441608e5f8f0/oz/Windows.py ) - (librarian suggests ...) diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index 4f49ad3..2afd406 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -49,6 +49,7 @@ SOURCES = \ sysprep_operation_net_hwaddr.ml \ sysprep_operation_package_manager_cache.ml \ sysprep_operation_pam_data.ml \ + sysprep_operation_puppet_data_log.ml \ sysprep_operation_random_seed.ml \ s...

...--- mlcustomize/inject_virtio_win.mli | 10 ++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/mlcustomize/inject_virtio_win.ml b/mlcustomize/inject_virtio_win.ml index 1f4a5c4..eca0ad7 100644 --- a/mlcustomize/inject_virtio_win.ml +++ b/mlcustomize/inject_virtio_win.ml @@ -49,6 +49,9 @@ type t = { of libosinfo. Although this behaviour is documented, IMHO it has always been a bad idea. We should change this in future to allow the user to select where they want to get drivers from. XXX *) + + mutable block_driver_priority : string list + (** List...

...09 +0000 +++ b/xen/arch/x86/physdev.c Thu Jan 08 18:58:36 2009 +0900 @@ -34,9 +34,6 @@ static int physdev_map_pirq(struct physd struct msi_info _msi; void *map_data = NULL; - if ( !IS_PRIV(current->domain) ) - return -EPERM; - if ( !map ) return -EINVAL; @@ -49,6 +46,14 @@ static int physdev_map_pirq(struct physd { ret = -ESRCH; goto free_domain; + } + else + { + if ( !IS_PRIV_FOR(current->domain, d) ) + { + ret = -EPERM; + goto free_domain; + } } /* Verify or get ve...

...--- mlcustomize/inject_virtio_win.mli | 10 ++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/mlcustomize/inject_virtio_win.ml b/mlcustomize/inject_virtio_win.ml index 4e977b3..2a7c742 100644 --- a/mlcustomize/inject_virtio_win.ml +++ b/mlcustomize/inject_virtio_win.ml @@ -49,6 +49,9 @@ type t = { of libosinfo. Although this behaviour is documented, IMHO it has always been a bad idea. We should change this in future to allow the user to select where they want to get drivers from. XXX *) + + mutable block_driver_priority : string list + (** List...

...b/appliance/Makefile.am index e23778e..f26c4d4 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -36,6 +36,7 @@ EXTRA_DIST = \ guestfs_shadow.aug \ hostfiles.in \ init \ + issue \ libguestfs-make-fixed-appliance.in \ libguestfs-make-fixed-appliance.pod \ make.sh.in \ @@ -49,6 +50,7 @@ superminfs_DATA = \ supermin.d/base.tar.gz \ supermin.d/daemon.tar.gz \ supermin.d/excludefiles \ + supermin.d/extras.tar.gz \ supermin.d/hostfiles \ supermin.d/init.tar.gz \ supermin.d/packages \ @@ -107,6 +109,15 @@ supermin.d/excludefiles: excludefiles.in Makefile cmp -s...

...ine GUESTFS_WARN_DEPRECATED=1 to warn about deprecated API functions. */ #define GUESTFS_DEPRECATED_NO_REPLACEMENT #define GUESTFS_DEPRECATED_REPLACED_BY(s) diff --git a/lib/launch-direct.c b/lib/launch-direct.c index ee2dcb8..57d1ad6 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -49,6 +49,8 @@ #include "guestfs_protocol.h" #include "qemuopts.h" +int blocksize = 0; + /* Per-handle data. */ struct backend_direct_data { pid_t pid; /* Qemu PID. */ @@ -315,6 +317,8 @@ add_drive (guestfs_h *g, struct backend_direct_data *data, sta...

...ery_sig, DRM_RENDER_ALLOW), }; -static const struct vm_operations_struct vm_ops = { - .fault = etnaviv_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; - static const struct file_operations fops = { .owner = THIS_MODULE, .open = drm_open, @@ -490,16 +484,9 @@ static struct drm_driver etnaviv_drm_driver = { .driver_features = DRIVER_GEM | DRIVER_RENDER, .open = etnaviv_open, .postclose = etnaviv_postclose, - .gem_free_object_unlocked = etnaviv_gem_free_object, - .gem_vm_ops = &vm_ops, .prime_ha...

My stab v2 at fixing this: https://bugzilla.redhat.com/show_bug.cgi?id=1789279 It took me quite some time to go through the whole rfc 4122 just to realize we do not need to do anything with the versions. v2: - Use EEXIST instead of EINVAL - Put the colliding UUID into the error - Do not evaluate the PCRE needlessly multiple times v1:

...Signed-off-by: Gene Cumm <gene.cumm at gmail.com> --- Not the most elegant thing in the world but it's been working for me. diff --git a/com32/include/sys/stat.h b/com32/include/sys/stat.h index ffc4105..2a06a68 100644 --- a/com32/include/sys/stat.h +++ b/com32/include/sys/stat.h @@ -49,4 +49,6 @@ struct stat { /* Only fstat() supported */ int fstat(int, struct stat *); +int stat(const char *, struct stat *); + #endif /* _SYS_STAT_H */ diff --git a/com32/lib/Makefile b/com32/lib/Makefile index 0cc4061..21379b4 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -32,7 +...