[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] virtio-balloon: don't hardcode config size val
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 05/11] virtio-balloon: don't hardcode config size value |
Date: |
Thu, 16 Jan 2014 21:35:13 +0400 |
From: Luiz Capitulino <address@hidden>
Use sizeof(struct virtio_balloon_config) instead.
Signed-off-by: Luiz capitulino <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/virtio/virtio-balloon.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index d9754db..a470a0b 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -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);
--
1.7.10.4
- [Qemu-devel] [PULL 07/11] linux-user: fixed s390x clone() argument order, (continued)
- [Qemu-devel] [PULL 07/11] linux-user: fixed s390x clone() argument order, Michael Tokarev, 2014/01/16
- [Qemu-devel] [PULL 03/11] Add bios-256k.bin to BLOBS on Makefile, Michael Tokarev, 2014/01/16
- [Qemu-devel] [PULL 10/11] pc-bios: Remove execute flag from BIOS files, Michael Tokarev, 2014/01/16
- [Qemu-devel] [PULL 04/11] exec: Exclude non portable function for MinGW, Michael Tokarev, 2014/01/16
- [Qemu-devel] [PULL 08/11] linux-user: fixed getsockopt() optlen, Michael Tokarev, 2014/01/16
- [Qemu-devel] [PULL 11/11] vl: Add a blank space between the variable and '=', Michael Tokarev, 2014/01/16
- [Qemu-devel] [PULL 09/11] linux-user: fixed recvfrom() addrlen, Michael Tokarev, 2014/01/16
- [Qemu-devel] [PULL 01/11] docs: Fix typo in QMP WAKEUP example, Michael Tokarev, 2014/01/16
- [Qemu-devel] [PULL 05/11] virtio-balloon: don't hardcode config size value,
Michael Tokarev <=
- [Qemu-devel] [PULL 06/11] ide: cmd_exec_dev_diagnostic() always set error register to 0x01, Michael Tokarev, 2014/01/16
- Re: [Qemu-devel] [Qemu-trivial] [PULL 00/11] Trivial patches for 2014-01-16, Michael Tokarev, 2014/01/25
- Re: [Qemu-devel] [PULL 00/11] Trivial patches for 2014-01-16, Peter Maydell, 2014/01/30