Commit 0706f7c8 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'mjt/tags/trivial-patches-2014-01-16' into staging 



trivial-patches for 2014-01-16

# gpg: Signature made Thu 16 Jan 2014 17:29:05 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

Message-id: 1389893719-16336-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 18d13fa2 2c02d1ad

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr \ 
bepo    cz



ifdef INSTALL_BLOBS

BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \

BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \

vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \

acpi-dsdt.aml q35-acpi-dsdt.aml \

ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \

docs/qmp/qmp-events.txt

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ Data: None. 


Example:



{ "event": "WATCHDOG",

{ "event": "WAKEUP",

     "timestamp": { "seconds": 1344522075, "microseconds": 745528 } }



WATCHDOG

hw/ide/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1321,6 +1321,7 @@ static bool cmd_exec_dev_diagnostic(IDEState *s, uint8_t cmd) 
        s->status = 0; /* ATAPI spec (v6) section 9.10 defines packet

                        * devices to return a clear status register

                        * with READY_STAT *not* set. */

        s->error = 0x01;

    } else {

        s->status = READY_STAT | SEEK_STAT;

        /* The bits of the error register are not as usual for this command!

hw/virtio/virtio-balloon.c

+4 −3
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static void virtio_balloon_get_config(VirtIODevice *vdev, uint8_t *config_data) 
    config.num_pages = cpu_to_le32(dev->num_pages);

    config.actual = cpu_to_le32(dev->actual);



    memcpy(config_data, &config, 8);

    memcpy(config_data, &config, sizeof(struct virtio_balloon_config));

}



static void virtio_balloon_set_config(VirtIODevice *vdev,
@@ -272,7 +272,7 @@ static void virtio_balloon_set_config(VirtIODevice *vdev, 
    VirtIOBalloon *dev = VIRTIO_BALLOON(vdev);

    struct virtio_balloon_config config;

    uint32_t oldactual = dev->actual;

    memcpy(&config, config_data, 8);

    memcpy(&config, config_data, sizeof(struct virtio_balloon_config));

    dev->actual = le32_to_cpu(config.actual);

    if (dev->actual != oldactual) {

        qemu_balloon_changed(ram_size -
@@ -343,7 +343,8 @@ static void virtio_balloon_device_realize(DeviceState *dev, Error **errp) 
    VirtIOBalloon *s = VIRTIO_BALLOON(dev);

    int ret;



    virtio_init(vdev, "virtio-balloon", VIRTIO_ID_BALLOON, 8);

    virtio_init(vdev, "virtio-balloon", VIRTIO_ID_BALLOON,

                sizeof(struct virtio_balloon_config));



    ret = qemu_add_balloon_handler(virtio_balloon_to_target,

                                   virtio_balloon_stat, s);

include/exec/ram_addr.h

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, 
    xen_modified_memory(start, length);

}



#if !defined(_WIN32)

static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,

                                                          ram_addr_t start,

                                                          ram_addr_t pages)
@@ -127,6 +128,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, 
        }

    }

}

#endif /* not _WIN32 */



static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start,

                                                         ram_addr_t length,