Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
hw
/
net
/
rocker
/
rocker_desc.c
diff --git
a/qemu/hw/net/rocker/rocker_desc.c
b/qemu/hw/net/rocker/rocker_desc.c
index
9d896fe
..
ac02797
100644
(file)
--- a/
qemu/hw/net/rocker/rocker_desc.c
+++ b/
qemu/hw/net/rocker/rocker_desc.c
@@
-14,6
+14,7
@@
* GNU General Public License for more details.
*/
* GNU General Public License for more details.
*/
+#include "qemu/osdep.h"
#include "net/net.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
@@
-136,15
+137,13
@@
bool desc_ring_set_size(DescRing *ring, uint32_t size)
}
for (i = 0; i < ring->size; i++) {
}
for (i = 0; i < ring->size; i++) {
- if (ring->info[i].buf) {
- g_free(ring->info[i].buf);
- }
+ g_free(ring->info[i].buf);
}
ring->size = size;
ring->head = ring->tail = 0;
}
ring->size = size;
ring->head = ring->tail = 0;
- ring->info = g_re
alloc(ring->info, size * sizeof(DescInfo)
);
+ ring->info = g_re
new(DescInfo, ring->info, size
);
if (!ring->info) {
return false;
}
if (!ring->info) {
return false;
}
@@
-347,7
+346,7
@@
DescRing *desc_ring_alloc(Rocker *r, int index)
{
DescRing *ring;
{
DescRing *ring;
- ring = g_
malloc0(sizeof(DescRing)
);
+ ring = g_
new0(DescRing, 1
);
if (!ring) {
return NULL;
}
if (!ring) {
return NULL;
}
@@
-360,9
+359,7
@@
DescRing *desc_ring_alloc(Rocker *r, int index)
void desc_ring_free(DescRing *ring)
{
void desc_ring_free(DescRing *ring)
{
- if (ring->info) {
- g_free(ring->info);
- }
+ g_free(ring->info);
g_free(ring);
}
g_free(ring);
}