Commit e8c85894 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* IEC units series (Philippe)
* Hyper-V PV TLB flush (Vitaly)
* git archive detection (Daniel)
* host serial passthrough fix (David)
* NPT support for SVM emulation (Jan)
* x86 "info mem" and "info tlb" fix (Doug)

# gpg: Signature made Mon 02 Jul 2018 16:18:21 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (50 commits)
  tcg: simplify !CONFIG_TCG handling of tb_invalidate_*
  i386/monitor.c: make addresses canonical for "info mem" and "info tlb"
  target-i386: Add NPT support
  serial: Open non-block
  bsd-user: Use the IEC binary prefix definitions
  linux-user: Use the IEC binary prefix definitions
  tests/crypto: Use the IEC binary prefix definitions
  vl: Use the IEC binary prefix definitions
  monitor: Use the IEC binary prefix definitions
  cutils: Do not include "qemu/units.h" directly
  hw/rdma: Use the IEC binary prefix definitions
  hw/virtio: Use the IEC binary prefix definitions
  hw/vfio: Use the IEC binary prefix definitions
  hw/sd: Use the IEC binary prefix definitions
  hw/usb: Use the IEC binary prefix definitions
  hw/net: Use the IEC binary prefix definitions
  hw/i386: Use the IEC binary prefix definitions
  hw/ppc: Use the IEC binary prefix definitions
  hw/mips: Use the IEC binary prefix definitions
  hw/mips/r4k: Constify params_size
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ab08440a c40d4792

accel/stubs/tcg-stub.c

+0 −6
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include "tcg/tcg.h"

#include "exec/cpu-common.h"

#include "exec/exec-all.h"

#include "translate-all.h"



void tb_flush(CPUState *cpu)

{
@@ -25,8 +24,3 @@ void tb_flush(CPUState *cpu) 
void tlb_set_dirty(CPUState *cpu, target_ulong vaddr)

{

}
 


void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,

                                   int is_cpu_write_access)

{

}

block/vdi.c

+3 −4
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "qapi/error.h"

#include "qapi/qobject-input-visitor.h"

#include "qapi/qapi-visit-block-core.h"
@@ -83,9 +84,6 @@ 
/* Command line option for static images. */

#define BLOCK_OPT_STATIC "static"



#define KiB     1024

#define MiB     (KiB * KiB)



#define SECTOR_SIZE 512

#define DEFAULT_CLUSTER_SIZE (1 * MiB)
@@ -434,7 +432,8 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, 
        goto fail;

    } else if (header.block_size != DEFAULT_CLUSTER_SIZE) {

        error_setg(errp, "unsupported VDI image (block size %" PRIu32

                   " is not %u)", header.block_size, DEFAULT_CLUSTER_SIZE);

                         " is not %" PRIu64 ")",

                   header.block_size, DEFAULT_CLUSTER_SIZE);

        ret = -ENOTSUP;

        goto fail;

    } else if (header.disk_size >

bsd-user/main.c

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 *  along with this program; if not, see <http://www.gnu.org/licenses/>.

 */

#include "qemu/osdep.h"

#include "qemu/units.h"

#include "qemu-version.h"

#include <machine/trap.h>
@@ -795,9 +796,9 @@ int main(int argc, char **argv) 
            if (x86_stack_size <= 0)

                usage();

            if (*r == 'M')

                x86_stack_size *= 1024 * 1024;

                x86_stack_size *= MiB;

            else if (*r == 'k' || *r == 'K')

                x86_stack_size *= 1024;

                x86_stack_size *= KiB;

        } else if (!strcmp(r, "L")) {

            interp_prefix = argv[optind++];

        } else if (!strcmp(r, "p")) {

chardev/char-serial.c

+2 −1
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ static void qmp_chardev_open_serial(Chardev *chr, 
    ChardevHostdev *serial = backend->u.serial.data;

    int fd;



    fd = qmp_chardev_open_file_source(serial->device, O_RDWR, errp);

    fd = qmp_chardev_open_file_source(serial->device, O_RDWR | O_NONBLOCK,

                                      errp);

    if (fd < 0) {

        return;

    }

configure

+18 −0
Original line number Diff line number Diff line
@@ -300,6 +300,24 @@ then 
else

    git_update=no

    git_submodules=""



    if ! test -f "$source_path/ui/keycodemapdb/README"

    then

        echo

        echo "ERROR: missing file $source_path/ui/keycodemapdb/README"

        echo

        echo "This is not a GIT checkout but module content appears to"

        echo "be missing. Do not use 'git archive' or GitHub download links"

        echo "to acquire QEMU source archives. Non-GIT builds are only"

        echo "supported with source archives linked from:"

        echo

        echo "  https://www.qemu.org/download/"

        echo

        echo "Developers working with GIT can use scripts/archive-source.sh"

        echo "if they need to create valid source archives."

        echo

        exit 1

    fi

fi

git="git"