Commit 084a398b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



Pull request

# gpg: Signature made Fri 13 Dec 2019 14:32:11 GMT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  iothread: document -object iothread on man page
  virtio-blk: advertise F_WCE (F_FLUSH) if F_CONFIG_WCE is advertised

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4148d142 86d2a49b

hw/arm/virt.c

+1 −0
Original line number Diff line number Diff line
@@ -2149,6 +2149,7 @@ type_init(machvirt_machine_init); 


static void virt_machine_4_2_options(MachineClass *mc)

{

    compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len);

}

DEFINE_VIRT_MACHINE_AS_LATEST(4, 2)

hw/block/virtio-blk.c

+5 −1
Original line number Diff line number Diff line
@@ -991,7 +991,9 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features, 
        virtio_add_feature(&features, VIRTIO_BLK_F_SCSI);

    }



    if (blk_enable_write_cache(s->blk)) {

    if (blk_enable_write_cache(s->blk) ||

        (s->conf.x_enable_wce_if_config_wce &&

         virtio_has_feature(features, VIRTIO_BLK_F_CONFIG_WCE))) {

        virtio_add_feature(&features, VIRTIO_BLK_F_WCE);

    }

    if (blk_is_read_only(s->blk)) {
@@ -1270,6 +1272,8 @@ static Property virtio_blk_properties[] = { 
                       conf.max_discard_sectors, BDRV_REQUEST_MAX_SECTORS),

    DEFINE_PROP_UINT32("max-write-zeroes-sectors", VirtIOBlock,

                       conf.max_write_zeroes_sectors, BDRV_REQUEST_MAX_SECTORS),

    DEFINE_PROP_BOOL("x-enable-wce-if-config-wce", VirtIOBlock,

                     conf.x_enable_wce_if_config_wce, true),

    DEFINE_PROP_END_OF_LIST(),

};

hw/core/machine.c

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 
#include "hw/pci/pci.h"

#include "hw/mem/nvdimm.h"



GlobalProperty hw_compat_4_2[] = {

    { "virtio-blk-device", "x-enable-wce-if-config-wce", "off" },

};

const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);



GlobalProperty hw_compat_4_1[] = {

    { "virtio-pci", "x-pcie-flr-init", "off" },

};

hw/i386/pc_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ static void pc_i440fx_4_2_machine_options(MachineClass *m) 
    m->alias = "pc";

    m->is_default = 1;

    pcmc->default_cpu_version = 1;

    compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len);

}



DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL,

hw/i386/pc_q35.c

+1 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ static void pc_q35_4_2_machine_options(MachineClass *m) 
    pc_q35_machine_options(m);

    m->alias = "q35";

    pcmc->default_cpu_version = 1;

    compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len);

}



DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL,