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
/
bootdevice.c
diff --git
a/qemu/bootdevice.c
b/qemu/bootdevice.c
index
3cdc0d7
..
2e83ff0
100644
(file)
--- a/
qemu/bootdevice.c
+++ b/
qemu/bootdevice.c
@@
-22,6
+22,8
@@
* THE SOFTWARE.
*/
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "sysemu/sysemu.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
@@
-270,21
+272,21
@@
typedef struct {
DeviceState *dev;
} BootIndexProperty;
DeviceState *dev;
} BootIndexProperty;
-static void device_get_bootindex(Object *obj, Visitor *v,
void *opaqu
e,
-
const char *nam
e, Error **errp)
+static void device_get_bootindex(Object *obj, Visitor *v,
const char *nam
e,
+
void *opaqu
e, Error **errp)
{
BootIndexProperty *prop = opaque;
{
BootIndexProperty *prop = opaque;
- visit_type_int32(v,
prop->bootindex, name
, errp);
+ visit_type_int32(v,
name, prop->bootindex
, errp);
}
}
-static void device_set_bootindex(Object *obj, Visitor *v,
void *opaqu
e,
-
const char *nam
e, Error **errp)
+static void device_set_bootindex(Object *obj, Visitor *v,
const char *nam
e,
+
void *opaqu
e, Error **errp)
{
BootIndexProperty *prop = opaque;
int32_t boot_index;
Error *local_err = NULL;
{
BootIndexProperty *prop = opaque;
int32_t boot_index;
Error *local_err = NULL;
- visit_type_int32(v,
&boot_index, name
, &local_err);
+ visit_type_int32(v,
name, &boot_index
, &local_err);
if (local_err) {
goto out;
}
if (local_err) {
goto out;
}