OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

trivial-patches for 2014-01-16

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iJwEAAECAAYFAlLYFuEACgkQUlPFrXTwyDjuGAQAqa23FDOF4VLnNNAkL37Aje3V
 CyroMi1Dj3WcKcbD8mEZOgZV5B/W5h6+v11JJdTkCTdOuiXYM3O+y4l3jxGhxcS2
 yxzCOMP5NrM7D1WogeFogbjabTq1Lm83FLXCgPCWi2rDIhPLQ6RPaMNNPyDdHHih
 aSuZo8EfnJOUcephR0I=
 =HvPH
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-01-30 13:56:00 +00:00
commit 0706f7c85b
12 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -290,7 +290,7 @@ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr \
bepo cz bepo cz
ifdef INSTALL_BLOBS 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 \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
acpi-dsdt.aml q35-acpi-dsdt.aml \ acpi-dsdt.aml q35-acpi-dsdt.aml \
ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \

2
docs/qmp/qmp-events.txt
View File

@ -479,7 +479,7 @@ Data: None.
Example: Example:
{ "event": "WATCHDOG", { "event": "WAKEUP",
"timestamp": { "seconds": 1344522075, "microseconds": 745528 } } "timestamp": { "seconds": 1344522075, "microseconds": 745528 } }
WATCHDOG WATCHDOG

1
hw/ide/core.c
View File

@ -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 s->status = 0; /* ATAPI spec (v6) section 9.10 defines packet
* devices to return a clear status register * devices to return a clear status register
* with READY_STAT *not* set. */ * with READY_STAT *not* set. */
s->error = 0x01;
} else { } else {
s->status = READY_STAT | SEEK_STAT; s->status = READY_STAT | SEEK_STAT;
/* The bits of the error register are not as usual for this command! /* The bits of the error register are not as usual for this command!

7
hw/virtio/virtio-balloon.c
View File

@ -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.num_pages = cpu_to_le32(dev->num_pages);
config.actual = cpu_to_le32(dev->actual); 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, 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); VirtIOBalloon *dev = VIRTIO_BALLOON(vdev);
struct virtio_balloon_config config; struct virtio_balloon_config config;
uint32_t oldactual = dev->actual; 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); dev->actual = le32_to_cpu(config.actual);
if (dev->actual != oldactual) { if (dev->actual != oldactual) {
qemu_balloon_changed(ram_size - qemu_balloon_changed(ram_size -
@ -343,7 +343,8 @@ static void virtio_balloon_device_realize(DeviceState *dev, Error **errp)
VirtIOBalloon *s = VIRTIO_BALLOON(dev); VirtIOBalloon *s = VIRTIO_BALLOON(dev);
int ret; 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, ret = qemu_add_balloon_handler(virtio_balloon_to_target,
virtio_balloon_stat, s); virtio_balloon_stat, s);

2
include/exec/ram_addr.h
View File

@ -79,6 +79,7 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
xen_modified_memory(start, length); xen_modified_memory(start, length);
} }
#if !defined(_WIN32)
static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
ram_addr_t start, ram_addr_t start,
ram_addr_t pages) 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, static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start,
ram_addr_t length, ram_addr_t length,

6
include/qemu/timer.h
View File

@ -405,7 +405,7 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg);
* timer_init: * timer_init:
* @ts: the timer to be initialised * @ts: the timer to be initialised
* @timer_list: the timer list to attach the timer to * @timer_list: the timer list to attach the timer to
* @scale: the scale value for the tiemr * @scale: the scale value for the timer
* @cb: the callback to be called when the timer expires * @cb: the callback to be called when the timer expires
* @opaque: the opaque pointer to be passed to the callback * @opaque: the opaque pointer to be passed to the callback
* *
@ -422,7 +422,7 @@ void timer_init(QEMUTimer *ts,
/** /**
* timer_new_tl: * timer_new_tl:
* @timer_list: the timer list to attach the timer to * @timer_list: the timer list to attach the timer to
* @scale: the scale value for the tiemr * @scale: the scale value for the timer
* @cb: the callback to be called when the timer expires * @cb: the callback to be called when the timer expires
* @opaque: the opaque pointer to be passed to the callback * @opaque: the opaque pointer to be passed to the callback
* *
@ -447,7 +447,7 @@ static inline QEMUTimer *timer_new_tl(QEMUTimerList *timer_list,
/** /**
* timer_new: * timer_new:
* @type: the clock type to use * @type: the clock type to use
* @scale: the scale value for the tiemr * @scale: the scale value for the timer
* @cb: the callback to be called when the timer expires * @cb: the callback to be called when the timer expires
* @opaque: the opaque pointer to be passed to the callback * @opaque: the opaque pointer to be passed to the callback
* *

2
linux-user/s390x/syscall.h
View File

@ -22,4 +22,4 @@ struct target_pt_regs {
#define UNAME_MACHINE "s390x" #define UNAME_MACHINE "s390x"
#define TARGET_CLONE_BACKWARDS #define TARGET_CLONE_BACKWARDS2

4
linux-user/syscall.c
View File

@ -2340,7 +2340,7 @@ static abi_long do_socketcall(int num, abi_ulong vptr)
size_t len; size_t len;
abi_ulong flags; abi_ulong flags;
abi_ulong addr; abi_ulong addr;
socklen_t addrlen; abi_ulong addrlen;
if (get_user_ual(sockfd, vptr) if (get_user_ual(sockfd, vptr)
|| get_user_ual(msg, vptr + n) || get_user_ual(msg, vptr + n)
@ -2406,7 +2406,7 @@ static abi_long do_socketcall(int num, abi_ulong vptr)
abi_ulong level; abi_ulong level;
abi_ulong optname; abi_ulong optname;
abi_ulong optval; abi_ulong optval;
socklen_t optlen; abi_ulong optlen;
if (get_user_ual(sockfd, vptr) if (get_user_ual(sockfd, vptr)
|| get_user_ual(level, vptr + n) || get_user_ual(level, vptr + n)

0
pc-bios/kvmvapic.bin Executable file → Normal file
View File

0
pc-bios/multiboot.bin Executable file → Normal file
View File

0
pc-bios/sgabios.bin Executable file → Normal file
View File

2
vl.c
View File

@ -2925,7 +2925,7 @@ int main(int argc, char **argv, char **envp)
bdrv_init_with_whitelist(); bdrv_init_with_whitelist();
autostart= 1; autostart = 1;
/* first pass of option parsing */ /* first pass of option parsing */
optind = 1; optind = 1;