Commit 2cfe5d7b authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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



virtio, vhost, pc: fixes

Minor fixes since 2.8.0-rc2.

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

# gpg: Signature made Wed 30 Nov 2016 02:25:12 AM GMT
# gpg:                using RSA key 0x281F0DB8D28D5469
# 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

* mst/tags/for_upstream:
  virtio-crypto: fix uninitialized variables
  loader: fix undefined behavior in rom_order_compare()
  loader: fix handling of custom address spaces when adding ROM blobs
  intel_iommu: fix incorrect device invalidate
  spec/vhost-user: fix the VHOST_USER prefix

Message-id: 1480564455-23933-1-git-send-email-mst@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 1cd56fd2 9730280d

docs/specs/vhost-user.txt

+10 −10
Original line number Diff line number Diff line
@@ -123,22 +123,22 @@ The communication consists of master sending message requests and slave sending 
message replies. Most of the requests don't require replies. Here is a list of

the ones that do:



 * VHOST_GET_FEATURES

 * VHOST_GET_PROTOCOL_FEATURES

 * VHOST_GET_VRING_BASE

 * VHOST_SET_LOG_BASE (if VHOST_USER_PROTOCOL_F_LOG_SHMFD)

 * VHOST_USER_GET_FEATURES

 * VHOST_USER_GET_PROTOCOL_FEATURES

 * VHOST_USER_GET_VRING_BASE

 * VHOST_USER_SET_LOG_BASE (if VHOST_USER_PROTOCOL_F_LOG_SHMFD)



[ Also see the section on REPLY_ACK protocol extension. ]



There are several messages that the master sends with file descriptors passed

in the ancillary data:



 * VHOST_SET_MEM_TABLE

 * VHOST_SET_LOG_BASE (if VHOST_USER_PROTOCOL_F_LOG_SHMFD)

 * VHOST_SET_LOG_FD

 * VHOST_SET_VRING_KICK

 * VHOST_SET_VRING_CALL

 * VHOST_SET_VRING_ERR

 * VHOST_USER_SET_MEM_TABLE

 * VHOST_USER_SET_LOG_BASE (if VHOST_USER_PROTOCOL_F_LOG_SHMFD)

 * VHOST_USER_SET_LOG_FD

 * VHOST_USER_SET_VRING_KICK

 * VHOST_USER_SET_VRING_CALL

 * VHOST_USER_SET_VRING_ERR



If Master is unable to send the full message or receives a wrong reply it will

close the connection. An optional reconnection mechanism can be implemented.

hw/arm/virt-acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static MemoryRegion *acpi_add_rom_blob(AcpiBuildState *build_state, 
                                       uint64_t max_size)

{

    return rom_add_blob(name, blob->data, acpi_data_len(blob), max_size, -1,

                        name, virt_acpi_build_update, build_state);

                        name, virt_acpi_build_update, build_state, NULL);

}



static const VMStateDescription vmstate_virt_acpi_build = {

hw/core/loader.c

+4 −2
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ static QTAILQ_HEAD(, Rom) roms = QTAILQ_HEAD_INITIALIZER(roms); 


static inline bool rom_order_compare(Rom *rom, Rom *item)

{

    return (rom->as > item->as) ||

    return ((uintptr_t)(void *)rom->as > (uintptr_t)(void *)item->as) ||

           (rom->as == item->as && rom->addr >= item->addr);

}
@@ -978,7 +978,8 @@ err: 


MemoryRegion *rom_add_blob(const char *name, const void *blob, size_t len,

                   size_t max_len, hwaddr addr, const char *fw_file_name,

                   FWCfgReadCallback fw_callback, void *callback_opaque)

                   FWCfgReadCallback fw_callback, void *callback_opaque,

                   AddressSpace *as)

{

    MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());

    Rom *rom;
@@ -986,6 +987,7 @@ MemoryRegion *rom_add_blob(const char *name, const void *blob, size_t len, 


    rom           = g_malloc0(sizeof(*rom));

    rom->name     = g_strdup(name);

    rom->as       = as;

    rom->addr     = addr;

    rom->romsize  = max_len ? max_len : len;

    rom->datasize = len;

hw/i386/acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -2936,7 +2936,7 @@ static MemoryRegion *acpi_add_rom_blob(AcpiBuildState *build_state, 
                                       uint64_t max_size)

{

    return rom_add_blob(name, blob->data, acpi_data_len(blob), max_size, -1,

                        name, acpi_build_update, build_state);

                        name, acpi_build_update, build_state, NULL);

}



static const VMStateDescription vmstate_acpi_build = {

hw/i386/intel_iommu.c

+1 −0
Original line number Diff line number Diff line
@@ -988,6 +988,7 @@ static void vtd_context_device_invalidate(IntelIOMMUState *s, 
        mask = 7;   /* Mask bit 2:0 in the SID field */

        break;

    }

    mask = ~mask;

    VTD_DPRINTF(INV, "device-selective invalidation source 0x%"PRIx16

                    " mask %"PRIu16, source_id, mask);

    vtd_bus = vtd_find_as_from_bus_num(s, VTD_SID_TO_BUS(source_id));