[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/12] virtio-net: remove function calls from assert
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 03/12] virtio-net: remove function calls from assert |
Date: |
Tue, 4 Mar 2014 15:03:09 +0200 |
From: Joel Stanley <address@hidden>
peer_{de,at}tach were called from inside assert().
We don't support building without NDEBUG but it's not tidy.
Rearrange to attach peer outside assert calls.
Signed-off-by: Joel Stanley <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/net/virtio-net.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 3626608..535948d 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -401,12 +401,15 @@ static int peer_detach(VirtIONet *n, int index)
static void virtio_net_set_queues(VirtIONet *n)
{
int i;
+ int r;
for (i = 0; i < n->max_queues; i++) {
if (i < n->curr_queues) {
- assert(!peer_attach(n, i));
+ r = peer_attach(n, i);
+ assert(!r);
} else {
- assert(!peer_detach(n, i));
+ r = peer_detach(n, i);
+ assert(!r);
}
}
}
--
MST
- [Qemu-devel] [PULL 00/12] acpi,pc,pci,virtio,memory bug fixes, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 01/12] acpi-build: append description for non-hotplug, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 02/12] acpi-test-data: update expected files, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 04/12] memory_region_present: return false if address is not found in child MemoryRegion, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 03/12] virtio-net: remove function calls from assert,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 07/12] Add 'debug-threads' suboption to --name, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 08/12] Add a 'name' parameter to qemu_thread_create, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 09/12] MAINTAINERS: drop an out of date address, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 05/12] PCIE: fix regression with coldplugged multifunction device, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 10/12] acpi-build: partially revert dac1e93093f9306c114f410785c99aa5261539b4, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 11/12] acpi-test: retain both asl and aml files on failure, Michael S. Tsirkin, 2014/03/04
- [Qemu-devel] [PULL 06/12] Rework --name to use QemuOpts, Michael S. Tsirkin, 2014/03/04
- Re: [Qemu-devel] [PULL 00/12] acpi,pc,pci,virtio,memory bug fixes, Peter Maydell, 2014/03/04