aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-12-05 08:44:33 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-05 08:44:33 -0600
commitcac1e30af72c4cf289750193426ebd5d2b6bd1d5 (patch)
treeeb37cda0433cc28f3455bcd2a525707963517dde /hw
parent01e7a53aed945adafc3ee54e2159227839daf0b4 (diff)
parent07f35073c6d6d1b2f42a6b3671b8af2f271986b9 (diff)
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'hw')
-rw-r--r--hw/dp8393x.c2
-rw-r--r--hw/qxl-render.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/dp8393x.c b/hw/dp8393x.c
index 54f5864b43..017d0742ae 100644
--- a/hw/dp8393x.c
+++ b/hw/dp8393x.c
@@ -516,7 +516,7 @@ static void write_register(dp8393xState *s, int reg, uint16_t val)
switch (reg) {
/* Command register */
case SONIC_CR:
- do_command(s, val);;
+ do_command(s, val);
break;
/* Prevent write to read-only registers */
case SONIC_CAP2:
diff --git a/hw/qxl-render.c b/hw/qxl-render.c
index 2c51ba9806..133d09324c 100644
--- a/hw/qxl-render.c
+++ b/hw/qxl-render.c
@@ -157,7 +157,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)
{
QEMUCursor *c;
uint8_t *image, *mask;
- int size;
+ size_t size;
c = cursor_alloc(cursor->header.width, cursor->header.height);
c->hot_x = cursor->header.hot_spot_x;