The following changes since commit cc8f8ba754bba17eea9791d67b572eb26e30b4ce:

  Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2018-05-08 15:25:17 +0100)

are available in the git repository at:


  git://github.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 3c128df2ec239f5c1abd0aa59254c433a779a347:

  rename included C files to foo.inc.c, remove osdep.h (2018-05-09 00:13:41 +0200)

----------------------------------------------------------------
* Don't silently truncate extremely long words in the command line
* bump min required glib library version to 2.42
* dtc configure fixes
* MemoryRegionCache second try
* Deprecated option removal
* add support for Hyper-V reenlightenment MSRs

----------------------------------------------------------------
Cédric Le Goater (1):
      cpus: tcg: fix never exiting loop on unplug

Daniel P. Berrangé (5):
      accel: use g_strsplit for parsing accelerator names
      opts: don't silently truncate long parameter keys
      opts: don't silently truncate long option values
      qemu-doc: provide details of supported build platforms
      glib: bump min required glib library version to 2.42

David Hildenbrand (1):
      pc-dimm: fix error messages if no slots were defined

Jan Kiszka (1):
      build: Silence dtc directory creation

Markus Armbruster (1):
      cpus: Fix event order on resume of stopped guest

Olaf Hering (1):
      configure: recognize more rpmbuild macros

Paolo Bonzini (8):
      qom: allow object_get_canonical_path_component without parent
      memdev: remove "id" property
      exec: move memory access declarations to a common header, inline *_phys functions
      exec: small changes to flatview_do_translate
      exec: extract address_space_translate_iommu, fix page_mask corner case
      exec: reintroduce MemoryRegion caching
      target/i386: sev: fix memory leaks
      rename included C files to foo.inc.c, remove osdep.h

Peter Xu (2):
      checkpatch.pl: add common glib defines to typelist
      qemu-thread: always keep the posix wrapper layer

Philippe Mathieu-Daudé (3):
      configure: Really use local libfdt if the system one is too old
      configure: Display if libfdt is from system or git
      shippable: Remove Debian 8 libfdt kludge

Roman Kagan (1):
      update-linux-headers: drop hyperv.h

Thomas Huth (5):
      qemu-options: Mark -virtioconsole as deprecated
      qemu-options: Remove remainders of the -tdf option
      qemu-options: Bail out on unsupported options instead of silently ignoring them
      qemu-options: Remove deprecated -no-kvm-pit-reinjection
      qemu-options: Remove deprecated -no-kvm-irqchip

Vitaly Kuznetsov (1):
      i386/kvm: add support for Hyper-V reenlightenment MSRs

 .shippable.yml                                     |   8 -
 Makefile                                           |   2 +-
 accel/accel.c                                      |  16 +-
 backends/hostmem.c                                 |  26 --
 configure                                          |  23 +-
 cpus.c                                             |  18 +-
 docs/devel/testing.rst                             |   4 +-
 exec.c                                             | 242 ++++++++++++----
 hw/i386/multiboot.c                                |  33 ++-
 hw/mem/pc-dimm.c                                   |   9 +-
 include/exec/cpu-all.h                             |  79 +++--
 include/exec/memory-internal.h                     |   3 +
 include/exec/memory.h                              | 209 +++++++-------
 include/exec/memory_ldst.inc.h                     |  71 +++++
 include/exec/memory_ldst_cached.inc.h              | 108 +++++++
 include/exec/memory_ldst_phys.inc.h                | 147 ++++++++++
 include/glib-compat.h                              | 319 ---------------------
 include/qemu-common.h                              |   2 +-
 include/qemu/option.h                              |   3 +-
 include/qom/object.h                               |   1 +
 include/sysemu/hostmem.h                           |   1 -
 memory.c                                           |   4 +-
 memory_ldst.inc.c                                  | 126 --------
 numa.c                                             |   2 +-
 os-posix.c                                         |   6 +-
 os-win32.c                                         |   4 +-
 qemu-doc.texi                                      |  83 +++++-
 qemu-options.hx                                    |  15 +-
 qom/object.c                                       |   5 +-
 qom/object_interfaces.c                            |   6 -
 rules.mak                                          |   2 +-
 scripts/checkpatch.pl                              |  28 ++
 scripts/update-linux-headers.sh                    |   6 -
 target/cris/translate.c                            |   2 +-
 .../cris/{translate_v10.c => translate_v10.inc.c}  |   0
 target/i386/cpu.c                                  |   4 +-
 target/i386/cpu.h                                  |   4 +
 target/i386/hyperv-proto.h                         |   9 +-
 target/i386/kvm.c                                  |  39 ++-
 target/i386/machine.c                              |  24 ++
 target/i386/sev.c                                  |  32 ++-
 target/mips/translate.c                            |   2 +-
 .../{translate_init.c => translate_init.inc.c}     |   0
 target/ppc/int_helper.c                            |   2 +-
 target/ppc/{mfrom_table.c => mfrom_table.inc.c}    |   0
 target/ppc/translate.c                             |   2 +-
 .../ppc/{translate_init.c => translate_init.inc.c} |   1 -
 tests/docker/dockerfiles/centos6.docker            |  30 --
 tests/docker/dockerfiles/min-glib.docker           |   8 -
 tests/test-qemu-opts.c                             |  18 --
 tests/test-qmp-event.c                             |   2 +-
 tests/tpm-emu.h                                    |   4 +-
 tests/vhost-user-test.c                            |   4 +-
 trace/simple.c                                     |   6 +-
 ui/vnc-enc-zrle.c                                  |  22 +-
 ui/{vnc-enc-zrle-template.c => vnc-enc-zrle.inc.c} |   0
 util/qemu-option.c                                 | 150 +++++-----
 util/qemu-thread-posix.c                           |  33 +--
 vl.c                                               |  24 +-
 59 files changed, 1040 insertions(+), 993 deletions(-)
 create mode 100644 include/exec/memory_ldst.inc.h
 create mode 100644 include/exec/memory_ldst_cached.inc.h
 create mode 100644 include/exec/memory_ldst_phys.inc.h
 rename target/cris/{translate_v10.c => translate_v10.inc.c} (100%)
 rename target/mips/{translate_init.c => translate_init.inc.c} (100%)
 rename target/ppc/{mfrom_table.c => mfrom_table.inc.c} (100%)
 rename target/ppc/{translate_init.c => translate_init.inc.c} (99%)
 delete mode 100644 tests/docker/dockerfiles/centos6.docker
 delete mode 100644 tests/docker/dockerfiles/min-glib.docker
 rename ui/{vnc-enc-zrle-template.c => vnc-enc-zrle.inc.c} (100%)
-- 
1.8.3.1

On 8 May 2018 at 23:14, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit cc8f8ba754bba17eea9791d67b572eb26e30b4ce:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2018-05-08 15:25:17 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 3c128df2ec239f5c1abd0aa59254c433a779a347:
>
>   rename included C files to foo.inc.c, remove osdep.h (2018-05-09 00:13:41 +0200)
>
> ----------------------------------------------------------------
> * Don't silently truncate extremely long words in the command line
> * bump min required glib library version to 2.42
> * dtc configure fixes
> * MemoryRegionCache second try
> * Deprecated option removal
> * add support for Hyper-V reenlightenment MSRs
>
> ----------------------------------------------------------------

Some of my build setups barf on the new glib version requirement:

 * my aarch64 build host (a gcc compile farm machine which is running
   Ubuntu 14.04.5 LTS and has glib 2.40.2)
 * my windows cross compile setups (which have glib 2.34.3)

The latter could probably be fixed, but it will be a pain because
gtk.org don't distribute prebuilt glib &c zipfiles usable for cross
compile any more. For the former, that LTS is apparently still
in support for another year.

thanks
-- PMM

On 11/05/2018 14:19, Peter Maydell wrote:
> Some of my build setups barf on the new glib version requirement:
> 
>  * my aarch64 build host (a gcc compile farm machine which is running
>    Ubuntu 14.04.5 LTS and has glib 2.40.2)
>  * my windows cross compile setups (which have glib 2.34.3)
> 
> The latter could probably be fixed, but it will be a pain because
> gtk.org don't distribute prebuilt glib &c zipfiles usable for cross
> compile any more. For the former, that LTS is apparently still
> in support for another year.

Fair enough.  I suppose that for now we can still uniformly bump up to
2.34, which is enough to remove all compatibility shims except for a couple.

I'll resend the pull request without that part.

Thanks,

Paolo

On 11 May 2018 at 13:33, Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 11/05/2018 14:19, Peter Maydell wrote:
>> Some of my build setups barf on the new glib version requirement:
>>
>>  * my aarch64 build host (a gcc compile farm machine which is running
>>    Ubuntu 14.04.5 LTS and has glib 2.40.2)
>>  * my windows cross compile setups (which have glib 2.34.3)
>>
>> The latter could probably be fixed, but it will be a pain because
>> gtk.org don't distribute prebuilt glib &c zipfiles usable for cross
>> compile any more. For the former, that LTS is apparently still
>> in support for another year.
>
> Fair enough.  I suppose that for now we can still uniformly bump up to
> 2.34, which is enough to remove all compatibility shims except for a couple.
>
> I'll resend the pull request without that part.

Thanks. If somebody has a recipe for doing mingw32/w64 cross builds
on Ubuntu hosts with a newer glib then I can look at updating
that bit of my build setup...

-- PMM

On Fri, May 11, 2018 at 01:19:51PM +0100, Peter Maydell wrote:
> On 8 May 2018 at 23:14, Paolo Bonzini <pbonzini@redhat.com> wrote:
> > The following changes since commit cc8f8ba754bba17eea9791d67b572eb26e30b4ce:
> >
> >   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2018-05-08 15:25:17 +0100)
> >
> > are available in the git repository at:
> >
> >
> >   git://github.com/bonzini/qemu.git tags/for-upstream
> >
> > for you to fetch changes up to 3c128df2ec239f5c1abd0aa59254c433a779a347:
> >
> >   rename included C files to foo.inc.c, remove osdep.h (2018-05-09 00:13:41 +0200)
> >
> > ----------------------------------------------------------------
> > * Don't silently truncate extremely long words in the command line
> > * bump min required glib library version to 2.42
> > * dtc configure fixes
> > * MemoryRegionCache second try
> > * Deprecated option removal
> > * add support for Hyper-V reenlightenment MSRs
> >
> > ----------------------------------------------------------------
> 
> Some of my build setups barf on the new glib version requirement:
> 
>  * my aarch64 build host (a gcc compile farm machine which is running
>    Ubuntu 14.04.5 LTS and has glib 2.40.2)

That is expected - per the policy we only aim to support the most recent,
and most recent but one for 2 years overlap. Since LTS releases are two
years apart, this basically means always just 2 most recent LTS releases
for Ubuntu. Since we Ubuntu 18.04 LTS came out last month, we don't
need to continue 14.04 LTS

>  * my windows cross compile setups (which have glib 2.34.3)

Presumably you're using a Debian host for that ?

The debian-win64-cross.docker job seems to pull in packages from

  deb http://pkg.mxe.cc/repos/apt/debian jessie main

And mxe claims to have glib 2.54

Alternativel Fedora has new mingw packags too

> The latter could probably be fixed, but it will be a pain because
> gtk.org don't distribute prebuilt glib &c zipfiles usable for cross
> compile any more. For the former, that LTS is apparently still
> in support for another year.

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 :|

On 11 May 2018 at 13:42, Daniel P. Berrangé <berrange@redhat.com> wrote:
> On Fri, May 11, 2018 at 01:19:51PM +0100, Peter Maydell wrote:
>> Some of my build setups barf on the new glib version requirement:
>>
>>  * my aarch64 build host (a gcc compile farm machine which is running
>>    Ubuntu 14.04.5 LTS and has glib 2.40.2)
>
> That is expected - per the policy we only aim to support the most recent,
> and most recent but one for 2 years overlap. Since LTS releases are two
> years apart, this basically means always just 2 most recent LTS releases
> for Ubuntu. Since we Ubuntu 18.04 LTS came out last month, we don't
> need to continue 14.04 LTS

...well, I could ask the GCC compile farm admins what their
upgrade plans are, but I don't particularly see the need
to impose load on a volunteer set of admins when the distro
they're running is still supported for another year. And I
don't want to drop aarch64 from my build test set.

>>  * my windows cross compile setups (which have glib 2.34.3)
>
> Presumably you're using a Debian host for that ?

Ubuntu.

> The debian-win64-cross.docker job seems to pull in packages from
>
>   deb http://pkg.mxe.cc/repos/apt/debian jessie main
>
> And mxe claims to have glib 2.54

Thanks, I will have a look at this. (They seem to have tarballs
as well as debian packages.)

-- PMM

On Fri, May 11, 2018 at 01:50:28PM +0100, Peter Maydell wrote:
> On 11 May 2018 at 13:42, Daniel P. Berrangé <berrange@redhat.com> wrote:
> > On Fri, May 11, 2018 at 01:19:51PM +0100, Peter Maydell wrote:
> >> Some of my build setups barf on the new glib version requirement:
> >>
> >>  * my aarch64 build host (a gcc compile farm machine which is running
> >>    Ubuntu 14.04.5 LTS and has glib 2.40.2)
> >
> > That is expected - per the policy we only aim to support the most recent,
> > and most recent but one for 2 years overlap. Since LTS releases are two
> > years apart, this basically means always just 2 most recent LTS releases
> > for Ubuntu. Since we Ubuntu 18.04 LTS came out last month, we don't
> > need to continue 14.04 LTS
> 
> ...well, I could ask the GCC compile farm admins what their
> upgrade plans are, but I don't particularly see the need
> to impose load on a volunteer set of admins when the distro
> they're running is still supported for another year. And I
> don't want to drop aarch64 from my build test set.

Ah ok, I didn't realize you weren't in control of the OS version.
2.40.2 is not too old, so we can accomodate that without significant
problems.

> >>  * my windows cross compile setups (which have glib 2.34.3)
> >
> > Presumably you're using a Debian host for that ?
> 
> Ubuntu.
> 
> > The debian-win64-cross.docker job seems to pull in packages from
> >
> >   deb http://pkg.mxe.cc/repos/apt/debian jessie main
> >
> > And mxe claims to have glib 2.54
> 
> Thanks, I will have a look at this. (They seem to have tarballs
> as well as debian packages.)

Ok, let me know if that works out, and if so, I'll repost min glib
patches setting it to 2.40.2 to allow for the aarch64 build host.

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 :|