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

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-03-27' into staging 



trivial patches for 2014-03-27

# gpg: Signature made Thu 27 Mar 2014 15:23:53 GMT using RSA key ID 74F0C838
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: E190 8639 3B10 B51B AC2C  8B73 5253 C5AD 74F0 C838

* remotes/mjt/tags/trivial-patches-2014-03-27: (23 commits)
  linux-user: remove duplicate statement
  hw/timer/grlib_gptimer: remove unnecessary assignment
  hw/pci-host/apb.c: Avoid shifting left into sign bit
  hw/intc/xilinx_intc: Avoid shifting left into sign bit
  hw/intc/slavio_intctl: Avoid shifting left into sign bit
  tests/libqos/pci-pc: Avoid shifting left into sign bit
  hw/ppc: Avoid shifting left into sign bit
  hw/intc/openpic: Avoid shifting left into sign bit
  hw/usb/hcd-ohci.c: Avoid shifting left into sign bit
  target-mips: Avoid shifting left into sign bit
  hw/i386/acpi_build.c: Avoid shifting left into sign bit
  hw/pci/pci_host.c: Avoid shifting left into sign bit
  hw/intc/apic.c: Use uint32_t for mask word in foreach_apic
  target-i386: Avoid shifting left into sign bit
  CODING_STYLE: Section about mixed declarations
  doc: update default PowerPC framebuffer settings
  doc: update sun4m documentation
  fix return check for KVM_GET_DIRTY_LOG ioctl
  target-i386: Add missing 'static' and 'const' attributes
  util: Add 'static' attribute to function implementation
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6ff45f01 3768d505

CODING_STYLE

+7 −0
Original line number Diff line number Diff line
@@ -84,3 +84,10 @@ and clarity it comes on a line by itself: 
Rationale: a consistent (except for functions...) bracing style reduces

ambiguity and avoids needless churn when lines are added or removed.

Furthermore, it is the QEMU coding style.



5. Declarations



Mixed declarations (interleaving statements and declarations within blocks)

are not allowed; declarations should be at the beginning of blocks.  In other

words, the code should not generate warnings if using GCC's

-Wdeclaration-after-statement option.

hw/i386/acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) 


            build_append_byte(notify, 0x7B); /* AndOp */

            build_append_byte(notify, 0x68); /* Arg0Op */

            build_append_int(notify, 0x1 << i);

            build_append_int(notify, 0x1U << i);

            build_append_byte(notify, 0x00); /* NullName */

            build_append_byte(notify, 0x86); /* NotifyOp */

            build_append_nameseg(notify, "S%.02X_", PCI_DEVFN(i, 0));

hw/ide/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static const VMStateDescription vmstate_bmdma_current = { 
    }

};



const VMStateDescription vmstate_bmdma_status = {

static const VMStateDescription vmstate_bmdma_status = {

    .name ="ide bmdma/status",

    .version_id = 1,

    .minimum_version_id = 1,

hw/intc/apic.c

+3 −3
Original line number Diff line number Diff line
@@ -201,12 +201,12 @@ static void apic_external_nmi(APICCommonState *s) 


#define foreach_apic(apic, deliver_bitmask, code) \

{\

    int __i, __j, __mask;\

    int __i, __j;\

    for(__i = 0; __i < MAX_APIC_WORDS; __i++) {\

        __mask = deliver_bitmask[__i];\

        uint32_t __mask = deliver_bitmask[__i];\

        if (__mask) {\

            for(__j = 0; __j < 32; __j++) {\

                if (__mask & (1 << __j)) {\

                if (__mask & (1U << __j)) {\

                    apic = local_apics[__i * 32 + __j];\

                    if (apic) {\

                        code;\

hw/intc/openpic.c

+7 −7
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static FslMpicInfo fsl_mpic_42 = { 
#define TCCR_TOG          0x80000000 /* toggles when decrement to zero */



#define IDR_EP_SHIFT      31

#define IDR_EP_MASK       (1 << IDR_EP_SHIFT)

#define IDR_EP_MASK       (1U << IDR_EP_SHIFT)

#define IDR_CI0_SHIFT     30

#define IDR_CI1_SHIFT     29

#define IDR_P1_SHIFT      1
@@ -220,17 +220,17 @@ typedef struct IRQSource { 
} IRQSource;



#define IVPR_MASK_SHIFT       31

#define IVPR_MASK_MASK        (1 << IVPR_MASK_SHIFT)

#define IVPR_MASK_MASK        (1U << IVPR_MASK_SHIFT)

#define IVPR_ACTIVITY_SHIFT   30

#define IVPR_ACTIVITY_MASK    (1 << IVPR_ACTIVITY_SHIFT)

#define IVPR_ACTIVITY_MASK    (1U << IVPR_ACTIVITY_SHIFT)

#define IVPR_MODE_SHIFT       29

#define IVPR_MODE_MASK        (1 << IVPR_MODE_SHIFT)

#define IVPR_MODE_MASK        (1U << IVPR_MODE_SHIFT)

#define IVPR_POLARITY_SHIFT   23

#define IVPR_POLARITY_MASK    (1 << IVPR_POLARITY_SHIFT)

#define IVPR_POLARITY_MASK    (1U << IVPR_POLARITY_SHIFT)

#define IVPR_SENSE_SHIFT      22

#define IVPR_SENSE_MASK       (1 << IVPR_SENSE_SHIFT)

#define IVPR_SENSE_MASK       (1U << IVPR_SENSE_SHIFT)



#define IVPR_PRIORITY_MASK     (0xF << 16)

#define IVPR_PRIORITY_MASK     (0xFU << 16)

#define IVPR_PRIORITY(_ivprr_) ((int)(((_ivprr_) & IVPR_PRIORITY_MASK) >> 16))

#define IVPR_VECTOR(opp, _ivprr_) ((_ivprr_) & (opp)->vector_mask)