Commit 7d1730b7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging 



trivial patches for 2017-02-28

# gpg: Signature made Tue 28 Feb 2017 06:43:55 GMT
# gpg:                using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* remotes/mjt/tags/trivial-patches-fetch:
  syscall: fixed mincore(2) not failing with ENOMEM
  hw/acpi/tco.c: fix tco timer stop
  lm32: milkymist-tmu2: fix a third integer overflow
  qemu-options.hx: add missing id=chr0 chardev argument in vhost-user example
  Update copyright year
  tests/prom-env: Enable the test for the sun4u machine, too
  cadence_gem: Remove unused parameter debug message
  register: fix incorrect read mask
  ide: remove undefined behavior in ide-test
  CODING_STYLE: Mention preferred comment form
  hw/core/register: Mark the device with cannot_instantiate_with_device_add_yet
  hw/core/or-irq: Mark the device with cannot_instantiate_with_device_add_yet
  softfloat: Use correct type in float64_to_uint64_round_to_zero()
  target/s390x: Fix typo

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1bbe5dc6 f5507e04

CODING_STYLE

+7 −0
Original line number Diff line number Diff line
@@ -116,3 +116,10 @@ if (a == 1) { 
Rationale: Yoda conditions (as in 'if (1 == a)') are awkward to read.

Besides, good compilers already warn users when '==' is mis-typed as '=',

even when the constant is on the right.



7. Comment style



We use traditional C-style /* */ comments and avoid // comments.



Rationale: The // form is valid in C99, so this is purely a matter of

consistency of style. The checkpatch script will warn you about this.

fpu/softfloat.c

+1 −1
Original line number Diff line number Diff line
@@ -7492,7 +7492,7 @@ uint64_t float64_to_uint64_round_to_zero(float64 a, float_status *status) 
{

    signed char current_rounding_mode = status->float_rounding_mode;

    set_float_rounding_mode(float_round_to_zero, status);

    int64_t v = float64_to_uint64(a, status);

    uint64_t v = float64_to_uint64(a, status);

    set_float_rounding_mode(current_rounding_mode, status);

    return v;

}

hw/acpi/tco.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static inline void tco_timer_reload(TCOIORegs *tr) 
static inline void tco_timer_stop(TCOIORegs *tr)

{

    tr->expire_time = -1;

    timer_del(tr->tco_timer);

}



static void tco_timer_expired(void *opaque)

hw/core/or-irq.c

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ static void or_irq_class_init(ObjectClass *klass, void *data) 
    dc->props = or_irq_properties;

    dc->realize = or_irq_realize;

    dc->vmsd = &vmstate_or_irq;



    /* Reason: Needs to be wired up to work, e.g. see stm32f205_soc.c */

    dc->cannot_instantiate_with_device_add_yet = true;

}



static const TypeInfo or_irq_type_info = {

hw/core/register.c

+24 −6
Original line number Diff line number Diff line
@@ -59,6 +59,15 @@ static inline uint64_t register_read_val(RegisterInfo *reg) 
    return 0; /* unreachable */

}



static inline uint64_t register_enabled_mask(int data_size, unsigned size)

{

    if (data_size < size) {

        size = data_size;

    }



    return MAKE_64BIT_MASK(0, size * 8);

}



void register_write(RegisterInfo *reg, uint64_t val, uint64_t we,

                    const char *prefix, bool debug)

{
@@ -192,11 +201,7 @@ void register_write_memory(void *opaque, hwaddr addr, 
    }



    /* Generate appropriate write enable mask */

    if (reg->data_size < size) {

        we = MAKE_64BIT_MASK(0, reg->data_size * 8);

    } else {

        we = MAKE_64BIT_MASK(0, size * 8);

    }

    we = register_enabled_mask(reg->data_size, size);



    register_write(reg, value, we, reg_array->prefix,

                   reg_array->debug);
@@ -208,6 +213,7 @@ uint64_t register_read_memory(void *opaque, hwaddr addr, 
    RegisterInfoArray *reg_array = opaque;

    RegisterInfo *reg = NULL;

    uint64_t read_val;

    uint64_t re;

    int i;



    for (i = 0; i < reg_array->num_elements; i++) {
@@ -223,7 +229,10 @@ uint64_t register_read_memory(void *opaque, hwaddr addr, 
        return 0;

    }



    read_val = register_read(reg, size * 8, reg_array->prefix,

    /* Generate appropriate read enable mask */

    re = register_enabled_mask(reg->data_size, size);



    read_val = register_read(reg, re, reg_array->prefix,

                             reg_array->debug);



    return extract64(read_val, 0, size * 8);
@@ -274,9 +283,18 @@ void register_finalize_block(RegisterInfoArray *r_array) 
    g_free(r_array);

}



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

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    /* Reason: needs to be wired up to work */

    dc->cannot_instantiate_with_device_add_yet = true;

}



static const TypeInfo register_info = {

    .name  = TYPE_REGISTER,

    .parent = TYPE_DEVICE,

    .class_init = register_class_init,

};



static void register_register_types(void)