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

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



virtio,pc,acpi fixes, cleanups

Fixes all over the place.

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

# gpg: Signature made Thu 10 Sep 2015 10:16:18 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  hw/pci: fix pci_update_mappings() trace events
  pc: memhotplug: keep reserved-memory-end broken on 2.4 and earlier machines
  pc: memhotplug: fix incorrectly set reserved-memory-end
  acpi: Remove unused definition.
  virtio: avoid leading underscores for helpers
  pc: Remove redundant arguments from xen_hvm_init()
  pci: Fix pci_device_iommu_address_space() bus propagation

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fc04a730 0f288f85

hw/block/virtio-blk.c

+4 −3
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features, 
    virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);

    virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);

    virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);

    if (__virtio_has_feature(features, VIRTIO_F_VERSION_1)) {

    if (virtio_has_feature(features, VIRTIO_F_VERSION_1)) {

        if (s->conf.scsi) {

            error_setg(errp, "Please set scsi=off for virtio-blk devices in order to use virtio 1.0");

            return 0;
@@ -782,10 +782,11 @@ static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status) 
     *

     * s->blk would erroneously be placed in writethrough mode.

     */

    if (!virtio_has_feature(vdev, VIRTIO_BLK_F_CONFIG_WCE)) {

    if (!virtio_vdev_has_feature(vdev, VIRTIO_BLK_F_CONFIG_WCE)) {

        aio_context_acquire(blk_get_aio_context(s->blk));

        blk_set_enable_write_cache(s->blk,

                                   virtio_has_feature(vdev, VIRTIO_BLK_F_WCE));

                                   virtio_vdev_has_feature(vdev,

                                                           VIRTIO_BLK_F_WCE));

        aio_context_release(blk_get_aio_context(s->blk));

    }

}

hw/char/virtio-serial-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static VirtIOSerialPort *find_port_by_name(char *name) 
static bool use_multiport(VirtIOSerial *vser)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(vser);

    return virtio_has_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT);

    return virtio_vdev_has_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT);

}



static size_t write_to_port(VirtIOSerialPort *port,

hw/i386/pc.c

+7 −1
Original line number Diff line number Diff line
@@ -1412,7 +1412,13 @@ FWCfgState *pc_memory_init(PCMachineState *pcms, 


    if (guest_info->has_reserved_memory && pcms->hotplug_memory.base) {

        uint64_t *val = g_malloc(sizeof(*val));

        *val = cpu_to_le64(ROUND_UP(pcms->hotplug_memory.base, 0x1ULL << 30));

        PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);

        uint64_t res_mem_end = pcms->hotplug_memory.base;



        if (!pcmc->broken_reserved_end) {

            res_mem_end += memory_region_size(&pcms->hotplug_memory.mr);

        }

        *val = cpu_to_le64(ROUND_UP(res_mem_end, 0x1ULL << 30));

        fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val));

    }

hw/i386/pc_piix.c

+3 −3
Original line number Diff line number Diff line
@@ -134,9 +134,7 @@ static void pc_init1(MachineState *machine) 
        pcms->below_4g_mem_size = machine->ram_size;

    }



    if (xen_enabled() && xen_hvm_init(&pcms->below_4g_mem_size,

                                      &pcms->above_4g_mem_size,

                                      &ram_memory) != 0) {

    if (xen_enabled() && xen_hvm_init(pcms, &ram_memory) != 0) {

        fprintf(stderr, "xen hardware virtual machine initialisation failed\n");

        exit(1);

    }
@@ -451,7 +449,9 @@ static void pc_i440fx_machine_options(MachineClass *m) 


static void pc_i440fx_2_4_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_machine_options(m);

    pcmc->broken_reserved_end = true;

    m->default_machine_opts = "firmware=bios-256k.bin";

    m->default_display = "std";

    m->alias = "pc";

hw/i386/pc_q35.c

+3 −3
Original line number Diff line number Diff line
@@ -125,9 +125,7 @@ static void pc_q35_init(MachineState *machine) 
        pcms->below_4g_mem_size = machine->ram_size;

    }



    if (xen_enabled() && xen_hvm_init(&pcms->below_4g_mem_size,

                                      &pcms->above_4g_mem_size,

                                      &ram_memory) != 0) {

    if (xen_enabled() && xen_hvm_init(pcms, &ram_memory) != 0) {

        fprintf(stderr, "xen hardware virtual machine initialisation failed\n");

        exit(1);

    }
@@ -370,7 +368,9 @@ static void pc_q35_machine_options(MachineClass *m) 


static void pc_q35_2_4_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_q35_machine_options(m);

    pcmc->broken_reserved_end = true;

    m->default_machine_opts = "firmware=bios-256k.bin";

    m->default_display = "std";

    m->no_floppy = 1;