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

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging 



Trivial patches 20190919

# gpg: Signature made Thu 19 Sep 2019 14:50:55 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  configure: Add xkbcommon configure options
  kvm: Fix typo in header of kvm_device_access()
  Fix cacheline detection on FreeBSD/powerpc.
  build: Don't ignore qapi-visit-core.c
  target/m68k/fpu_helper.c: rename the access arguments
  Replace '-machine accel=xyz' with '-accel xyz'
  cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h"
  vfio: fix a typo

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

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
/qapi/qapi-types-*.[ch]

/qapi/qapi-types.[ch]

/qapi/qapi-visit-*.[ch]

!/qapi/qapi-visit-core.c

/qapi/qapi-visit.[ch]

/qapi/qapi-doc.texi

/qemu-doc.html

block/qapi.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qemu/cutils.h"

#include "block/qapi.h"

#include "block/block_int.h"

#include "block/throttle-groups.h"

configure

+5 −0
Original line number Diff line number Diff line
@@ -1521,6 +1521,10 @@ for opt do 
  ;;

  --disable-libpmem) libpmem=no

  ;;

  --enable-xkbcommon) xkbcommon=yes

  ;;

  --disable-xkbcommon) xkbcommon=no

  ;;

  *)

      echo "ERROR: unknown option $opt"

      echo "Try '$0 --help' for more information"
@@ -1804,6 +1808,7 @@ disabled with --disable-FEATURE, default is enabled if available: 
  capstone        capstone disassembler support

  debug-mutex     mutex debugging support

  libpmem         libpmem support

  xkbcommon       xkbcommon support



NOTE: The object files are built at the place where configure is launched

EOF

hw/vfio/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#define TYPE_VFIO_PCI "vfio-pci"

#define PCI_VFIO(obj)    OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI)



#define TYPE_VIFO_PCI_NOHOTPLUG "vfio-pci-nohotplug"

#define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"



static void vfio_disable_interrupts(VFIOPCIDevice *vdev);

static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled);
@@ -3199,7 +3199,7 @@ static void vfio_pci_nohotplug_dev_class_init(ObjectClass *klass, void *data) 
}



static const TypeInfo vfio_pci_nohotplug_dev_info = {

    .name = TYPE_VIFO_PCI_NOHOTPLUG,

    .name = TYPE_VFIO_PCI_NOHOTPLUG,

    .parent = TYPE_VFIO_PCI,

    .instance_size = sizeof(VFIOPCIDevice),

    .class_init = vfio_pci_nohotplug_dev_class_init,

include/qemu-common.h

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size); 
int parse_debug_env(const char *name, int max, int initial);



const char *qemu_ether_ntoa(const MACAddr *mac);

char *size_to_str(uint64_t val);

void page_size_init(void);



/* returns non-zero if dump is in progress, otherwise zero is