diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-09 13:09:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-09 13:09:57 -0500 |
| commit | da5391edd18a1d75d4ca13f2dffe70e02f851110 (patch) | |
| tree | 31ff5cc31b10a4a48f854d8e06090c49f92a6720 /hw | |
| parent | 5689dc6557cecfd4318dea5490ecac4967081aed (diff) | |
| parent | 5a61cb60d6ee8d49c553d7959363df26b55f4873 (diff) | |
| download | qemu-da5391edd18a1d75d4ca13f2dffe70e02f851110.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/9pfs/virtio-9p-debug.c | 2 | ||||
| -rw-r--r-- | hw/virtio-blk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/9pfs/virtio-9p-debug.c b/hw/9pfs/virtio-9p-debug.c index 4636ad51f0..96925f04a4 100644 --- a/hw/9pfs/virtio-9p-debug.c +++ b/hw/9pfs/virtio-9p-debug.c @@ -295,7 +295,7 @@ static void pprint_data(V9fsPDU *pdu, int rx, size_t *offsetp, const char *name) if (rx) { count = pdu->elem.in_num; - } else + } else { count = pdu->elem.out_num; } diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 4df23f4228..d5d4757f62 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -11,7 +11,7 @@ * */ -#include <qemu-common.h> +#include "qemu-common.h" #include "qemu-error.h" #include "trace.h" #include "blockdev.h" |