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

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



The last round of patches for soft freeze.  Includes ivshmem bugfixes,
megasas 2108 emulation, and other small patches here and there.

# gpg: Signature made Fri 31 Oct 2014 17:17:54 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (35 commits)
  virtio-scsi: fix dataplane
  ivshmem: use error_report
  ivshmem: Fix fd leak on error
  ivshmem: Fix potential OOB r/w access
  ivshmem: validate incoming_posn value from server
  ivshmem: Check ivshmem_read() size argument
  i386: fix breakpoints handling in icount mode
  kvm_stat: Add powerpc support
  kvm_stat: Abstract ioctl numbers
  kvm_stat: Rework platform detection
  kvm_stat: Fix the non-x86 exit reasons
  kvm_stat: Only consider online cpus
  virtio-scsi: Fix num_queue input validation
  scsi: devirtualize unrealize of SCSI devices
  virtio-scsi: Fix memory leak when realize failed
  iscsi: Refuse to open as writable if the LUN is write protected
  kvmvapic: patch_instruction fix
  vl.c: Fix Coverity complaining for vmstate_dump_file
  Add skip_dump flag to ignore memory region during dump
  -machine vmport=off: Allow disabling of VMWare ioport emulation
  ...

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

block/iscsi.c

+42 −0
Original line number Diff line number Diff line
@@ -1219,6 +1219,40 @@ static void iscsi_attach_aio_context(BlockDriverState *bs, 
              qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + NOP_INTERVAL);

}



static bool iscsi_is_write_protected(IscsiLun *iscsilun)

{

    struct scsi_task *task;

    struct scsi_mode_sense *ms = NULL;

    bool wrprotected = false;



    task = iscsi_modesense6_sync(iscsilun->iscsi, iscsilun->lun,

                                 1, SCSI_MODESENSE_PC_CURRENT,

                                 0x3F, 0, 255);

    if (task == NULL) {

        error_report("iSCSI: Failed to send MODE_SENSE(6) command: %s",

                     iscsi_get_error(iscsilun->iscsi));

        goto out;

    }



    if (task->status != SCSI_STATUS_GOOD) {

        error_report("iSCSI: Failed MODE_SENSE(6), LUN assumed writable");

        goto out;

    }

    ms = scsi_datain_unmarshall(task);

    if (!ms) {

        error_report("iSCSI: Failed to unmarshall MODE_SENSE(6) data: %s",

                     iscsi_get_error(iscsilun->iscsi));

        goto out;

    }

    wrprotected = ms->device_specific_parameter & 0x80;



out:

    if (task) {

        scsi_free_scsi_task(task);

    }

    return wrprotected;

}



/*

 * We support iscsi url's on the form

 * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun>
@@ -1339,6 +1373,14 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 
    scsi_free_scsi_task(task);

    task = NULL;



    /* Check the write protect flag of the LUN if we want to write */

    if (iscsilun->type == TYPE_DISK && (flags & BDRV_O_RDWR) &&

        iscsi_is_write_protected(iscsilun)) {

        error_setg(errp, "Cannot open a write protected LUN as read-write");

        ret = -EACCES;

        goto out;

    }



    iscsi_readcapacity_sync(iscsilun, &local_err);

    if (local_err != NULL) {

        error_propagate(errp, local_err);

hw/i386/kvmvapic.c

+0 −1
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) 
    }



    if (!kvm_enabled()) {

        cpu_restore_state(cs, cs->mem_io_pc);

        cpu_get_tb_cpu_state(env, &current_pc, &current_cs_base,

                             &current_flags);

    }

hw/i386/pc.c

+19 −0
Original line number Diff line number Diff line
@@ -1688,6 +1688,20 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, 
    pcms->max_ram_below_4g = value;

}



static bool pc_machine_get_vmport(Object *obj, Error **errp)

{

    PCMachineState *pcms = PC_MACHINE(obj);



    return pcms->vmport;

}



static void pc_machine_set_vmport(Object *obj, bool value, Error **errp)

{

    PCMachineState *pcms = PC_MACHINE(obj);



    pcms->vmport = value;

}



static void pc_machine_initfn(Object *obj)

{

    PCMachineState *pcms = PC_MACHINE(obj);
@@ -1700,6 +1714,11 @@ static void pc_machine_initfn(Object *obj) 
                        pc_machine_get_max_ram_below_4g,

                        pc_machine_set_max_ram_below_4g,

                        NULL, NULL, NULL);

    pcms->vmport = !xen_enabled();

    object_property_add_bool(obj, PC_MACHINE_VMPORT,

                             pc_machine_get_vmport,

                             pc_machine_set_vmport,

                             NULL);

}



static void pc_machine_class_init(ObjectClass *oc, void *data)

hw/i386/pc_piix.c

+2 −2
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ static void pc_init1(MachineState *machine, 
    pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);



    /* init basic PC hardware */

    pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled(),

        0x4);

    pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy,

                         !pc_machine->vmport, 0x4);



    pc_nic_init(isa_bus, pci_bus);

hw/i386/pc_q35.c

+2 −1
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ static void pc_q35_init(MachineState *machine) 
    pc_register_ferr_irq(gsi[13]);



    /* init basic PC hardware */

    pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false, 0xff0104);

    pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy,

                         !pc_machine->vmport, 0xff0104);



    /* connect pm stuff to lpc */

    ich9_lpc_pm_init(lpc);