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

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



typo fixes, TYPE_XXX usage cleanup, comments update,
virtio-mmio trace functions cleanup

# gpg: Signature made Wed 22 May 2019 17:06:56 BST
# gpg:                using RSA key F30C38BD3F2FBE3C
# 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:
  pci: msix: move 'MSIX_CAP_LENGTH' to header file
  vfio: platform: fix a typo
  hw: vfio: drop TYPE_FOO MACRO in VMStateDescription
  vfio: pci: make "vfio-pci-nohotplug" as MACRO
  configure: Fix spelling of sdl-image in --help
  migration: Fix typo in migrate_add_blocker() error message
  roms: List and describe the Makefile 'clean' rule
  roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description
  hw/virtio/virtio-mmio: Convert DPRINTF to trace and log

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 94b63b60 2d9574bd

configure

+1 −1
Original line number Diff line number Diff line
@@ -1745,7 +1745,7 @@ disabled with --disable-FEATURE, default is enabled if available: 
  gcrypt          libgcrypt cryptography support

  auth-pam        PAM access control

  sdl             SDL UI

  sdl_image       SDL Image support for icons

  sdl-image       SDL Image support for icons

  gtk             gtk UI

  vte             vte support for the gtk UI

  curses          curses UI

hw/pci/msix.c

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include "qapi/error.h"

#include "trace.h"



#define MSIX_CAP_LENGTH 12



/* MSI enable bit and maskall bit are in byte 1 in FLAGS register */

#define MSIX_CONTROL_OFFSET (PCI_MSIX_FLAGS + 1)

#define MSIX_ENABLE_MASK (PCI_MSIX_FLAGS_ENABLE >> 8)

hw/vfio/amd-xgbe.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static void amd_xgbe_realize(DeviceState *dev, Error **errp) 
}



static const VMStateDescription vfio_platform_amd_xgbe_vmstate = {

    .name = TYPE_VFIO_AMD_XGBE,

    .name = "vfio-amd-xgbe",

    .unmigratable = 1,

};

hw/vfio/ap.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static void vfio_ap_reset(DeviceState *dev) 
}



static const VMStateDescription vfio_ap_vmstate = {

    .name = VFIO_AP_DEVICE_TYPE,

    .name = "vfio-ap",

    .unmigratable = 1,

};

hw/vfio/calxeda-xgmac.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static void calxeda_xgmac_realize(DeviceState *dev, Error **errp) 
}



static const VMStateDescription vfio_platform_calxeda_xgmac_vmstate = {

    .name = TYPE_VFIO_CALXEDA_XGMAC,

    .name = "vfio-calxeda-xgmac",

    .unmigratable = 1,

};