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

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



acpi, vhost, misc: fixes, features

vDPA support, fix to vhost blk RO bit handling, some include path
cleanups, NFIT ACPI table.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Fri 01 Jun 2018 17:25:19 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream: (31 commits)
  vhost-blk: turn on pre-defined RO feature bit
  ACPI testing: test NFIT platform capabilities
  nvdimm, acpi: support NFIT platform capabilities
  tests/.gitignore: add entry for generated file
  arch_init: sort architectures
  ui: use local path for local headers
  qga: use local path for local headers
  colo: use local path for local headers
  migration: use local path for local headers
  usb: use local path for local headers
  sd: fix up include
  vhost-scsi: drop an unused include
  ppc: use local path for local headers
  rocker: drop an unused include
  e1000e: use local path for local headers
  ioapic: fix up includes
  ide: use local path for local headers
  display: use local path for local headers
  trace: use local path for local headers
  migration: drop an unused include
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents afd76ffb 25b1d45a

arch_init.c

+8 −8
Original line number Diff line number Diff line
@@ -52,14 +52,14 @@ int graphic_depth = 32; 
#define QEMU_ARCH QEMU_ARCH_ARM

#elif defined(TARGET_CRIS)

#define QEMU_ARCH QEMU_ARCH_CRIS

#elif defined(TARGET_I386)

#define QEMU_ARCH QEMU_ARCH_I386

#elif defined(TARGET_HPPA)

#define QEMU_ARCH QEMU_ARCH_HPPA

#elif defined(TARGET_M68K)

#define QEMU_ARCH QEMU_ARCH_M68K

#elif defined(TARGET_I386)

#define QEMU_ARCH QEMU_ARCH_I386

#elif defined(TARGET_LM32)

#define QEMU_ARCH QEMU_ARCH_LM32

#elif defined(TARGET_M68K)

#define QEMU_ARCH QEMU_ARCH_M68K

#elif defined(TARGET_MICROBLAZE)

#define QEMU_ARCH QEMU_ARCH_MICROBLAZE

#elif defined(TARGET_MIPS)
@@ -80,12 +80,12 @@ int graphic_depth = 32; 
#define QEMU_ARCH QEMU_ARCH_SH4

#elif defined(TARGET_SPARC)

#define QEMU_ARCH QEMU_ARCH_SPARC

#elif defined(TARGET_XTENSA)

#define QEMU_ARCH QEMU_ARCH_XTENSA

#elif defined(TARGET_UNICORE32)

#define QEMU_ARCH QEMU_ARCH_UNICORE32

#elif defined(TARGET_TRICORE)

#define QEMU_ARCH QEMU_ARCH_TRICORE

#elif defined(TARGET_UNICORE32)

#define QEMU_ARCH QEMU_ARCH_UNICORE32

#elif defined(TARGET_XTENSA)

#define QEMU_ARCH QEMU_ARCH_XTENSA

#endif



const uint32_t arch_type = QEMU_ARCH;

backends/cryptodev-vhost-user.c

+19 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "qapi/error.h"

#include "qapi/qmp/qerror.h"

#include "qemu/error-report.h"

#include "hw/virtio/vhost-user.h"

#include "standard-headers/linux/virtio_crypto.h"

#include "sysemu/cryptodev-vhost.h"

#include "chardev/char-fe.h"
@@ -46,6 +47,7 @@ 
typedef struct CryptoDevBackendVhostUser {

    CryptoDevBackend parent_obj;



    VhostUserState *vhost_user;

    CharBackend chr;

    char *chr_name;

    bool opened;
@@ -102,7 +104,7 @@ cryptodev_vhost_user_start(int queues, 
            continue;

        }



        options.opaque = &s->chr;

        options.opaque = s->vhost_user;

        options.backend_type = VHOST_BACKEND_TYPE_USER;

        options.cc = b->conf.peers.ccs[i];

        s->vhost_crypto[i] = cryptodev_vhost_init(&options);
@@ -185,6 +187,7 @@ static void cryptodev_vhost_user_init( 
    size_t i;

    Error *local_err = NULL;

    Chardev *chr;

    VhostUserState *user;

    CryptoDevBackendClient *cc;

    CryptoDevBackendVhostUser *s =

                      CRYPTODEV_BACKEND_VHOST_USER(backend);
@@ -215,6 +218,15 @@ static void cryptodev_vhost_user_init( 
        }

    }



    user = vhost_user_init();

    if (!user) {

        error_setg(errp, "Failed to init vhost_user");

        return;

    }



    user->chr = &s->chr;

    s->vhost_user = user;



    qemu_chr_fe_set_handlers(&s->chr, NULL, NULL,

                     cryptodev_vhost_user_event, NULL, s, NULL, true);
@@ -299,6 +311,12 @@ static void cryptodev_vhost_user_cleanup( 
            backend->conf.peers.ccs[i] = NULL;

        }

    }



    if (s->vhost_user) {

        vhost_user_cleanup(s->vhost_user);

        g_free(s->vhost_user);

        s->vhost_user = NULL;

    }

}



static void cryptodev_vhost_user_set_chardev(Object *obj,

block/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "qapi/qobject-input-visitor.h"

#include "qapi/error.h"

#include "qemu/option.h"

#include "block/crypto.h"

#include "crypto.h"



typedef struct BlockCrypto BlockCrypto;

block/nbd.c

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



#include "qemu/osdep.h"

#include "block/nbd-client.h"

#include "nbd-client.h"

#include "qapi/error.h"

#include "qemu/uri.h"

#include "block/block_int.h"

block/qcow.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "qapi/qapi-visit-block-core.h"

#include "crypto/block.h"

#include "migration/blocker.h"

#include "block/crypto.h"

#include "crypto.h"



/**************************************************************/

/* QEMU COW block driver with compression and encryption support */