The following changes since commit 109b25045b3651f9c5d02c3766c0b3ff63e6d193:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-06-29 12:30:29 +0100)

are available in the git repository at:


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

for you to fetch changes up to 633e23f138f04ce776feaef78042901af883eafe:

  serial: Open non-block (2018-06-29 17:31:08 +0200)

----------------------------------------------------------------
* IEC units series (Philippe)
* Hyper-V PV TLB flush (Vitaly)
* git archive detection (Daniel)
* host serial passthrough fix (David)

----------------------------------------------------------------
Daniel P. Berrangé (1):
      configure: add sanity check to catch builds from "git archive"

Dr. David Alan Gilbert (1):
      serial: Open non-block

Paolo Bonzini (1):
      hw/i386: Use the IEC binary prefix definitions

Philippe Mathieu-Daudé (43):
      include: Add IEC binary prefixes in "qemu/units.h"
      vdi: Use definitions from "qemu/units.h"
      x86/cpu: Use definitions from "qemu/units.h"
      checkpatch: Recognize IEC binary prefix definitions
      hw: Use IEC binary prefix definitions from "qemu/units.h"
      hw: Directly use "qemu/units.h" instead of "qemu/cutils.h"
      hw/ivshmem: Use the IEC binary prefix definitions
      hw/ipack: Use the IEC binary prefix definitions
      hw/scsi: Use the IEC binary prefix definitions
      hw/smbios: Use the IEC binary prefix definitions
      hw/xen: Use the IEC binary prefix definitions
      hw/tpm: Use the IEC binary prefix definitions
      hw/block: Use the IEC binary prefix definitions
      hw/display: Use the IEC binary prefix definitions
      hw/misc: Use the IEC binary prefix definitions
      hw/riscv: Use the IEC binary prefix definitions
      hw/m68k: Use the IEC binary prefix definitions
      hw/sparc: Use the IEC binary prefix definitions
      hw/s390x: Use the IEC binary prefix definitions
      hw/hppa: Use the IEC binary prefix definitions
      hw/xtensa: Use the IEC binary prefix definitions
      hw/alpha: Use the IEC binary prefix definitions
      hw/tricore: Use the IEC binary prefix definitions
      hw/microblaze: Use the IEC binary prefix definitions
      hw/nios2: Use the IEC binary prefix definitions
      hw/cris: Use the IEC binary prefix definitions
      hw/lm32: Use the IEC binary prefix definitions
      hw/sh4: Use the IEC binary prefix definitions
      hw/mips/r4k: Constify params_size
      hw/mips: Use the IEC binary prefix definitions
      hw/ppc: Use the IEC binary prefix definitions
      hw/net: Use the IEC binary prefix definitions
      hw/usb: Use the IEC binary prefix definitions
      hw/sd: Use the IEC binary prefix definitions
      hw/vfio: Use the IEC binary prefix definitions
      hw/virtio: Use the IEC binary prefix definitions
      hw/rdma: Use the IEC binary prefix definitions
      cutils: Do not include "qemu/units.h" directly
      monitor: Use the IEC binary prefix definitions
      vl: Use the IEC binary prefix definitions
      tests/crypto: Use the IEC binary prefix definitions
      linux-user: Use the IEC binary prefix definitions
      bsd-user: Use the IEC binary prefix definitions

Vitaly Kuznetsov (1):
      i386/kvm: add support for Hyper-V TLB flush

 block/vdi.c                              |  7 +++----
 bsd-user/main.c                          |  5 +++--
 chardev/char-serial.c                    |  3 ++-
 configure                                | 18 ++++++++++++++++++
 hw/alpha/typhoon.c                       | 17 ++++++++---------
 hw/arm/msf2-soc.c                        |  6 +++---
 hw/arm/msf2-som.c                        |  8 ++++----
 hw/block/m25p80.c                        |  5 +++--
 hw/block/nvme.c                          |  3 ++-
 hw/block/tc58128.c                       |  3 ++-
 hw/block/xen_disk.c                      |  3 ++-
 hw/core/loader-fit.c                     |  3 ++-
 hw/core/machine.c                        |  4 ++--
 hw/cris/axis_dev88.c                     |  3 ++-
 hw/display/bochs-display.c               |  9 +++++----
 hw/display/cirrus_vga.c                  | 10 +++++-----
 hw/display/g364fb.c                      |  4 ++--
 hw/display/qxl.c                         | 30 ++++++++++++++----------------
 hw/display/sm501.c                       | 16 ++++++++--------
 hw/display/vga-isa-mm.c                  |  5 +++--
 hw/display/vga.c                         |  5 +++--
 hw/display/virtio-gpu.c                  |  4 ++--
 hw/display/vmware_vga.c                  |  3 ++-
 hw/display/xenfb.c                       |  3 ++-
 hw/hppa/dino.c                           |  3 ++-
 hw/hppa/machine.c                        | 12 ++++++------
 hw/i386/acpi-build.c                     |  4 ++--
 hw/i386/pc.c                             | 23 ++++++++++++-----------
 hw/i386/pc_piix.c                        |  3 ++-
 hw/i386/pc_q35.c                         |  3 ++-
 hw/i386/pc_sysfw.c                       | 10 ++++------
 hw/i386/xen/xen-mapcache.c               |  3 ++-
 hw/ipack/tpci200.c                       |  5 +++--
 hw/lm32/lm32_boards.c                    | 13 +++++++------
 hw/lm32/milkymist.c                      | 10 +++++-----
 hw/m68k/mcf5208.c                        |  3 ++-
 hw/microblaze/petalogix_ml605_mmu.c      |  7 ++++---
 hw/microblaze/petalogix_s3adsp1800_mmu.c |  7 ++++---
 hw/mips/boston.c                         | 30 +++++++++++++++---------------
 hw/mips/mips_fulong2e.c                  |  7 ++++---
 hw/mips/mips_malta.c                     | 25 ++++++++++++++-----------
 hw/mips/mips_r4k.c                       | 15 ++++++++-------
 hw/misc/auxbus.c                         |  3 ++-
 hw/misc/edu.c                            |  3 ++-
 hw/misc/ivshmem.c                        |  3 ++-
 hw/misc/mips_itu.c                       |  3 ++-
 hw/net/e1000e.c                          |  7 ++++---
 hw/net/e1000x_common.c                   |  3 ++-
 hw/net/eepro100.c                        |  3 +--
 hw/net/ne2000.h                          |  5 +++--
 hw/nios2/boot.c                          |  6 +++---
 hw/nvram/spapr_nvram.c                   | 11 +++++++----
 hw/pci-host/prep.c                       |  3 ++-
 hw/pci-host/xilinx-pcie.c                |  5 +++--
 hw/ppc/e500.c                            | 13 +++++++------
 hw/ppc/e500plat.c                        |  3 ++-
 hw/ppc/mac.h                             |  3 ++-
 hw/ppc/mac_newworld.c                    |  1 -
 hw/ppc/mac_oldworld.c                    |  9 ++++-----
 hw/ppc/pnv.c                             |  6 +++---
 hw/ppc/ppc405_boards.c                   |  9 +++++----
 hw/ppc/ppc405_uc.c                       |  7 ++++---
 hw/ppc/ppc440_bamboo.c                   |  5 +++--
 hw/ppc/ppc440_uc.c                       | 28 ++++++++++++++--------------
 hw/ppc/ppc4xx_devs.c                     | 22 ++++++++++++----------
 hw/ppc/ppce500_spin.c                    |  3 ++-
 hw/ppc/prep.c                            |  6 +++---
 hw/ppc/rs6000_mc.c                       | 13 +++++++------
 hw/ppc/sam460ex.c                        | 18 +++++++++---------
 hw/ppc/spapr.c                           | 18 +++++++++---------
 hw/ppc/spapr_rtas.c                      |  4 ++--
 hw/ppc/virtex_ml507.c                    |  7 ++++---
 hw/rdma/vmw/pvrdma.h                     |  3 ++-
 hw/riscv/virt.c                          |  3 ++-
 hw/s390x/s390-skeys.c                    |  3 ++-
 hw/s390x/s390-stattrib.c                 |  3 ++-
 hw/s390x/sclp.c                          |  3 ++-
 hw/scsi/scsi-disk.c                      |  9 +++++----
 hw/sd/sd.c                               |  8 ++++----
 hw/sd/sdhci.c                            |  8 ++++----
 hw/sh4/r2d.c                             |  3 ++-
 hw/smbios/smbios.c                       | 15 ++++++---------
 hw/sparc/leon3.c                         | 10 ++++++----
 hw/sparc/sun4m.c                         | 10 +++++-----
 hw/sparc64/niagara.c                     |  3 ++-
 hw/sparc64/sun4u.c                       |  4 ++--
 hw/tricore/tricore_testboard.c           | 13 +++++++------
 hw/usb/ccid-card-passthru.c              |  9 +++++----
 hw/usb/combined-packet.c                 |  3 ++-
 hw/usb/dev-smartcard-reader.c            |  3 ++-
 hw/usb/redirect.c                        |  3 ++-
 hw/vfio/pci-quirks.c                     |  9 +++++----
 hw/vfio/pci.c                            |  3 ++-
 hw/xenpv/xen_domainbuild.c               | 13 +++++++------
 hw/xtensa/xtfpga.c                       |  9 +++++----
 include/hw/acpi/tpm.h                    |  3 ++-
 include/hw/display/xlnx_dp.h             |  5 +++--
 include/hw/intc/mips_gic.h               |  3 ++-
 include/hw/mips/bios.h                   |  3 ++-
 include/hw/net/allwinner_emac.h          |  5 +++--
 include/hw/ppc/spapr.h                   |  5 +++--
 include/hw/virtio/virtio-net.h           |  3 ++-
 include/qemu/cutils.h                    |  7 -------
 include/qemu/units.h                     | 20 ++++++++++++++++++++
 linux-user/main.c                        |  5 +++--
 monitor.c                                |  3 ++-
 scripts/checkpatch.pl                    |  1 +
 target/i386/cpu.c                        |  5 ++---
 target/i386/cpu.h                        |  1 +
 target/i386/hyperv-proto.h               |  1 +
 target/i386/kvm.c                        | 15 ++++++++++++++-
 target/ppc/mmu_helper.c                  |  8 ++++----
 target/xtensa/helper.c                   |  5 +++--
 tests/benchmark-crypto-cipher.c          |  6 +++---
 tests/benchmark-crypto-hash.c            |  5 +++--
 tests/benchmark-crypto-hmac.c            |  6 +++---
 tests/test-cutils.c                      | 19 ++++++++++---------
 tests/test-keyval.c                      |  6 +++---
 tests/test-qemu-opts.c                   |  7 +++----
 vl.c                                     |  5 +++--
 120 files changed, 504 insertions(+), 388 deletions(-)
 create mode 100644 include/qemu/units.h
-- 
1.8.3.1

On 30 June 2018 at 07:09, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit 109b25045b3651f9c5d02c3766c0b3ff63e6d193:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-06-29 12:30:29 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 633e23f138f04ce776feaef78042901af883eafe:
>
>   serial: Open non-block (2018-06-29 17:31:08 +0200)
>
> ----------------------------------------------------------------
> * IEC units series (Philippe)
> * Hyper-V PV TLB flush (Vitaly)
> * git archive detection (Daniel)
> * host serial passthrough fix (David)
>

Compile failures I'm afraid:

/root/qemu/tests/test-qemu-opts.c:707:66: error: use of undeclared
identifier 'MiB'
    g_assert_cmphex(qemu_opt_get_size(opts, "size3", 0), ==, 2 * MiB);
                                                                 ^
/root/qemu/tests/test-qemu-opts.c:711:62: error: use of undeclared
identifier 'GiB'
    g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, GiB / 10);
                                                             ^
/root/qemu/tests/test-qemu-opts.c:712:74: error: use of undeclared
identifier 'TiB'
    g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 16777215U * TiB);
                                                                         ^
/home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c: In function
‘test_keyval_visit_size’:
/home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c:460:43:
error: ‘MiB’ undeclared (first use in this function)
/home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c:460:43:
note: each undeclared identifier is reported only once for each
function it appears in
/home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c:462:39:
error: ‘GiB’ undeclared (first use in this function)
/home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c:464:50:
error: ‘TiB’ undeclared (first use in this function)

thanks
-- PMM

Hmm, must have sent a stale branch.

Thanks,

Paolo

Il sab 30 giu 2018, 17:40 Peter Maydell <peter.maydell@linaro.org> ha
scritto:

> On 30 June 2018 at 07:09, Paolo Bonzini <pbonzini@redhat.com> wrote:
> > The following changes since commit
> 109b25045b3651f9c5d02c3766c0b3ff63e6d193:
> >
> >   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into
> staging (2018-06-29 12:30:29 +0100)
> >
> > are available in the git repository at:
> >
> >
> >   git://github.com/bonzini/qemu.git tags/for-upstream
> >
> > for you to fetch changes up to 633e23f138f04ce776feaef78042901af883eafe:
> >
> >   serial: Open non-block (2018-06-29 17:31:08 +0200)
> >
> > ----------------------------------------------------------------
> > * IEC units series (Philippe)
> > * Hyper-V PV TLB flush (Vitaly)
> > * git archive detection (Daniel)
> > * host serial passthrough fix (David)
> >
>
> Compile failures I'm afraid:
>
> /root/qemu/tests/test-qemu-opts.c:707:66: error: use of undeclared
> identifier 'MiB'
>     g_assert_cmphex(qemu_opt_get_size(opts, "size3", 0), ==, 2 * MiB);
>                                                                  ^
> /root/qemu/tests/test-qemu-opts.c:711:62: error: use of undeclared
> identifier 'GiB'
>     g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, GiB / 10);
>                                                              ^
> /root/qemu/tests/test-qemu-opts.c:712:74: error: use of undeclared
> identifier 'TiB'
>     g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 16777215U *
> TiB);
>                                                                          ^
> /home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c: In function
> ‘test_keyval_visit_size’:
> /home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c:460:43:
> error: ‘MiB’ undeclared (first use in this function)
> /home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c:460:43:
> note: each undeclared identifier is reported only once for each
> function it appears in
> /home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c:462:39:
> error: ‘GiB’ undeclared (first use in this function)
> /home/petmay01/linaro/qemu-for-merges/tests/test-keyval.c:464:50:
> error: ‘TiB’ undeclared (first use in this function)
>
> thanks
> -- PMM
>
>

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
This was in e9dd993d-875f-4173-f68e-e6b4e75e3aa1@amsat.org but I can't
find it on the list...

 tests/test-cutils.c    | 2 +-
 tests/test-qemu-opts.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-cutils.c b/tests/test-cutils.c
index a6e5fe4984..d85c3e0f6d 100644
--- a/tests/test-cutils.c
+++ b/tests/test-cutils.c
@@ -26,7 +26,7 @@
  */
 
 #include "qemu/osdep.h"
-
+#include "qemu/units.h"
 #include "qemu/cutils.h"
 #include "qemu/units.h"
 
diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index fd4d848f66..43869cb754 100644
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/cutils.h"
+#include "qemu/units.h"
 #include "qemu/option.h"
 #include "qemu/option_int.h"
 #include "qapi/error.h"
-- 
2.18.0

On 30/06/2018 18:50, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> This was in e9dd993d-875f-4173-f68e-e6b4e75e3aa1@amsat.org but I can't
> find it on the list...
> 
>  tests/test-cutils.c    | 2 +-
>  tests/test-qemu-opts.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/test-cutils.c b/tests/test-cutils.c
> index a6e5fe4984..d85c3e0f6d 100644
> --- a/tests/test-cutils.c
> +++ b/tests/test-cutils.c
> @@ -26,7 +26,7 @@
>   */
>  
>  #include "qemu/osdep.h"
> -
> +#include "qemu/units.h"
>  #include "qemu/cutils.h"
>  #include "qemu/units.h"
>  
> diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
> index fd4d848f66..43869cb754 100644
> --- a/tests/test-qemu-opts.c
> +++ b/tests/test-qemu-opts.c
> @@ -8,7 +8,7 @@
>   */
>  
>  #include "qemu/osdep.h"
> -#include "qemu/cutils.h"
> +#include "qemu/units.h"
>  #include "qemu/option.h"
>  #include "qemu/option_int.h"
>  #include "qapi/error.h"
> 

Squashed, thanks.

Paolo

On 30/06/2018 18:50, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> This was in e9dd993d-875f-4173-f68e-e6b4e75e3aa1@amsat.org but I can't
> find it on the list...
> 
>  tests/test-cutils.c    | 2 +-
>  tests/test-qemu-opts.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/test-cutils.c b/tests/test-cutils.c
> index a6e5fe4984..d85c3e0f6d 100644
> --- a/tests/test-cutils.c
> +++ b/tests/test-cutils.c
> @@ -26,7 +26,7 @@
>   */
>  
>  #include "qemu/osdep.h"
> -
> +#include "qemu/units.h"
>  #include "qemu/cutils.h"
>  #include "qemu/units.h"
>  
> diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
> index fd4d848f66..43869cb754 100644
> --- a/tests/test-qemu-opts.c
> +++ b/tests/test-qemu-opts.c
> @@ -8,7 +8,7 @@
>   */
>  
>  #include "qemu/osdep.h"
> -#include "qemu/cutils.h"
> +#include "qemu/units.h"
>  #include "qemu/option.h"
>  #include "qemu/option_int.h"
>  #include "qapi/error.h"
> 

Not enough, this is needed too in order to avoid integer overflows in constant expressions:

diff --git a/tests/test-keyval.c b/tests/test-keyval.c
index dce9f7a..09b0ae3 100644
--- a/tests/test-keyval.c
+++ b/tests/test-keyval.c
@@ -462,7 +462,7 @@ static void test_keyval_visit_size(void)
     visit_type_size(v, "sz4", &sz, &error_abort);
     g_assert_cmphex(sz, ==, GiB / 10);
     visit_type_size(v, "sz5", &sz, &error_abort);
-    g_assert_cmphex(sz, ==, 16777215 * TiB);
+    g_assert_cmphex(sz, ==, 16777215ULL * TiB);
     visit_check_struct(v, &error_abort);
     visit_end_struct(v, NULL);
     visit_free(v);
Stage this hunk [y,n,q,a,d,/,e,?]? y

diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index 43869cb..ef96e84 100644
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -709,7 +709,7 @@ static void test_opts_parse_size(void)
                            false, &error_abort);
     g_assert_cmpuint(opts_count(opts), ==, 2);
     g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, GiB / 10);
-    g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 16777215U * TiB);
+    g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 16777215ULL * TiB);
 
     /* Beyond limit with suffix */
     opts = qemu_opts_parse(&opts_list_02, "size1=16777216T",

Paolo