2014-10-07 12:00:05 +04:00
|
|
|
/*
|
|
|
|
* QEMU Boot Device Implement
|
|
|
|
*
|
2015-03-26 15:57:43 +03:00
|
|
|
* Copyright (c) 2014 HUAWEI TECHNOLOGIES CO., LTD.
|
2014-10-07 12:00:05 +04:00
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2016-01-29 20:50:05 +03:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2014-10-07 12:00:05 +04:00
|
|
|
#include "sysemu/sysemu.h"
|
2014-10-07 12:00:11 +04:00
|
|
|
#include "qapi/visitor.h"
|
2014-10-07 12:00:38 +04:00
|
|
|
#include "qemu/error-report.h"
|
2017-06-26 08:22:57 +03:00
|
|
|
#include "sysemu/reset.h"
|
2015-12-04 13:10:27 +03:00
|
|
|
#include "hw/qdev-core.h"
|
2018-08-10 15:40:27 +03:00
|
|
|
#include "hw/boards.h"
|
2014-10-07 12:00:05 +04:00
|
|
|
|
|
|
|
typedef struct FWBootEntry FWBootEntry;
|
|
|
|
|
|
|
|
struct FWBootEntry {
|
|
|
|
QTAILQ_ENTRY(FWBootEntry) link;
|
|
|
|
int32_t bootindex;
|
|
|
|
DeviceState *dev;
|
|
|
|
char *suffix;
|
|
|
|
};
|
|
|
|
|
|
|
|
static QTAILQ_HEAD(, FWBootEntry) fw_boot_order =
|
|
|
|
QTAILQ_HEAD_INITIALIZER(fw_boot_order);
|
2014-12-03 19:49:46 +03:00
|
|
|
static QEMUBootSetHandler *boot_set_handler;
|
|
|
|
static void *boot_set_opaque;
|
|
|
|
|
|
|
|
void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque)
|
|
|
|
{
|
|
|
|
boot_set_handler = func;
|
|
|
|
boot_set_opaque = opaque;
|
|
|
|
}
|
|
|
|
|
2014-12-03 21:20:58 +03:00
|
|
|
void qemu_boot_set(const char *boot_order, Error **errp)
|
2014-12-03 19:49:46 +03:00
|
|
|
{
|
2014-12-03 21:25:46 +03:00
|
|
|
Error *local_err = NULL;
|
|
|
|
|
2014-12-03 19:49:46 +03:00
|
|
|
if (!boot_set_handler) {
|
2014-12-03 21:20:58 +03:00
|
|
|
error_setg(errp, "no function defined to set boot device list for"
|
|
|
|
" this architecture");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-12-03 21:25:46 +03:00
|
|
|
validate_bootdevices(boot_order, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-12-03 22:04:02 +03:00
|
|
|
boot_set_handler(boot_set_opaque, boot_order, errp);
|
2014-12-03 19:49:46 +03:00
|
|
|
}
|
|
|
|
|
2014-12-03 20:11:39 +03:00
|
|
|
void validate_bootdevices(const char *devices, Error **errp)
|
2014-12-03 19:49:46 +03:00
|
|
|
{
|
|
|
|
/* We just do some generic consistency checks */
|
|
|
|
const char *p;
|
|
|
|
int bitmap = 0;
|
|
|
|
|
|
|
|
for (p = devices; *p != '\0'; p++) {
|
|
|
|
/* Allowed boot devices are:
|
|
|
|
* a-b: floppy disk drives
|
|
|
|
* c-f: IDE disk drives
|
|
|
|
* g-m: machine implementation dependent drives
|
|
|
|
* n-p: network devices
|
|
|
|
* It's up to each machine implementation to check if the given boot
|
|
|
|
* devices match the actual hardware implementation and firmware
|
|
|
|
* features.
|
|
|
|
*/
|
|
|
|
if (*p < 'a' || *p > 'p') {
|
2014-12-03 20:11:39 +03:00
|
|
|
error_setg(errp, "Invalid boot device '%c'", *p);
|
|
|
|
return;
|
2014-12-03 19:49:46 +03:00
|
|
|
}
|
|
|
|
if (bitmap & (1 << (*p - 'a'))) {
|
2014-12-03 20:11:39 +03:00
|
|
|
error_setg(errp, "Boot device '%c' was given twice", *p);
|
|
|
|
return;
|
2014-12-03 19:49:46 +03:00
|
|
|
}
|
|
|
|
bitmap |= 1 << (*p - 'a');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void restore_boot_order(void *opaque)
|
|
|
|
{
|
|
|
|
char *normal_boot_order = opaque;
|
|
|
|
static int first = 1;
|
|
|
|
|
|
|
|
/* Restore boot order and remove ourselves after the first boot */
|
|
|
|
if (first) {
|
|
|
|
first = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-01-29 16:13:47 +03:00
|
|
|
if (boot_set_handler) {
|
|
|
|
qemu_boot_set(normal_boot_order, &error_abort);
|
|
|
|
}
|
2014-12-03 19:49:46 +03:00
|
|
|
|
|
|
|
qemu_unregister_reset(restore_boot_order, normal_boot_order);
|
|
|
|
g_free(normal_boot_order);
|
|
|
|
}
|
2014-10-07 12:00:05 +04:00
|
|
|
|
2014-10-07 12:00:06 +04:00
|
|
|
void check_boot_index(int32_t bootindex, Error **errp)
|
|
|
|
{
|
|
|
|
FWBootEntry *i;
|
|
|
|
|
|
|
|
if (bootindex >= 0) {
|
|
|
|
QTAILQ_FOREACH(i, &fw_boot_order, link) {
|
|
|
|
if (i->bootindex == bootindex) {
|
|
|
|
error_setg(errp, "The bootindex %d has already been used",
|
|
|
|
bootindex);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-07 12:00:07 +04:00
|
|
|
void del_boot_device_path(DeviceState *dev, const char *suffix)
|
|
|
|
{
|
|
|
|
FWBootEntry *i;
|
|
|
|
|
|
|
|
if (dev == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
QTAILQ_FOREACH(i, &fw_boot_order, link) {
|
|
|
|
if ((!suffix || !g_strcmp0(i->suffix, suffix)) &&
|
|
|
|
i->dev == dev) {
|
|
|
|
QTAILQ_REMOVE(&fw_boot_order, i, link);
|
|
|
|
g_free(i->suffix);
|
|
|
|
g_free(i);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-07 12:00:05 +04:00
|
|
|
void add_boot_device_path(int32_t bootindex, DeviceState *dev,
|
|
|
|
const char *suffix)
|
|
|
|
{
|
|
|
|
FWBootEntry *node, *i;
|
|
|
|
|
|
|
|
if (bootindex < 0) {
|
2014-10-07 12:00:10 +04:00
|
|
|
del_boot_device_path(dev, suffix);
|
2014-10-07 12:00:05 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(dev != NULL || suffix != NULL);
|
|
|
|
|
2014-10-07 12:00:09 +04:00
|
|
|
del_boot_device_path(dev, suffix);
|
|
|
|
|
2014-10-07 12:00:05 +04:00
|
|
|
node = g_malloc0(sizeof(FWBootEntry));
|
|
|
|
node->bootindex = bootindex;
|
|
|
|
node->suffix = g_strdup(suffix);
|
|
|
|
node->dev = dev;
|
|
|
|
|
|
|
|
QTAILQ_FOREACH(i, &fw_boot_order, link) {
|
|
|
|
if (i->bootindex == bootindex) {
|
2014-10-07 12:00:38 +04:00
|
|
|
error_report("Two devices with same boot index %d", bootindex);
|
2014-10-07 12:00:05 +04:00
|
|
|
exit(1);
|
|
|
|
} else if (i->bootindex < bootindex) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
QTAILQ_INSERT_BEFORE(i, node, link);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
QTAILQ_INSERT_TAIL(&fw_boot_order, node, link);
|
|
|
|
}
|
|
|
|
|
|
|
|
DeviceState *get_boot_device(uint32_t position)
|
|
|
|
{
|
|
|
|
uint32_t counter = 0;
|
|
|
|
FWBootEntry *i = NULL;
|
|
|
|
DeviceState *res = NULL;
|
|
|
|
|
|
|
|
if (!QTAILQ_EMPTY(&fw_boot_order)) {
|
|
|
|
QTAILQ_FOREACH(i, &fw_boot_order, link) {
|
|
|
|
if (counter == position) {
|
|
|
|
res = i->dev;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
counter++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This function returns null terminated string that consist of new line
|
|
|
|
* separated device paths.
|
|
|
|
*
|
|
|
|
* memory pointed by "size" is assigned total length of the array in bytes
|
|
|
|
*
|
|
|
|
*/
|
2018-08-10 15:40:27 +03:00
|
|
|
char *get_boot_devices_list(size_t *size)
|
2014-10-07 12:00:05 +04:00
|
|
|
{
|
|
|
|
FWBootEntry *i;
|
|
|
|
size_t total = 0;
|
|
|
|
char *list = NULL;
|
2018-08-10 15:40:27 +03:00
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
|
|
|
|
bool ignore_suffixes = mc->ignore_boot_device_suffixes;
|
2014-10-07 12:00:05 +04:00
|
|
|
|
|
|
|
QTAILQ_FOREACH(i, &fw_boot_order, link) {
|
2015-01-29 10:08:51 +03:00
|
|
|
char *devpath = NULL, *suffix = NULL;
|
|
|
|
char *bootpath;
|
|
|
|
char *d;
|
2014-10-07 12:00:05 +04:00
|
|
|
size_t len;
|
|
|
|
|
|
|
|
if (i->dev) {
|
|
|
|
devpath = qdev_get_fw_dev_path(i->dev);
|
|
|
|
assert(devpath);
|
|
|
|
}
|
|
|
|
|
2015-01-29 10:08:51 +03:00
|
|
|
if (!ignore_suffixes) {
|
2015-02-27 04:49:44 +03:00
|
|
|
if (i->dev) {
|
|
|
|
d = qdev_get_own_fw_dev_path_from_handler(i->dev->parent_bus,
|
|
|
|
i->dev);
|
|
|
|
if (d) {
|
|
|
|
assert(!i->suffix);
|
|
|
|
suffix = d;
|
|
|
|
} else {
|
|
|
|
suffix = g_strdup(i->suffix);
|
|
|
|
}
|
2015-01-29 10:08:51 +03:00
|
|
|
} else {
|
|
|
|
suffix = g_strdup(i->suffix);
|
|
|
|
}
|
2014-10-07 12:00:05 +04:00
|
|
|
}
|
|
|
|
|
2015-01-29 10:08:51 +03:00
|
|
|
bootpath = g_strdup_printf("%s%s",
|
|
|
|
devpath ? devpath : "",
|
|
|
|
suffix ? suffix : "");
|
|
|
|
g_free(devpath);
|
|
|
|
g_free(suffix);
|
|
|
|
|
2014-10-07 12:00:05 +04:00
|
|
|
if (total) {
|
|
|
|
list[total-1] = '\n';
|
|
|
|
}
|
|
|
|
len = strlen(bootpath) + 1;
|
|
|
|
list = g_realloc(list, total + len);
|
|
|
|
memcpy(&list[total], bootpath, len);
|
|
|
|
total += len;
|
|
|
|
g_free(bootpath);
|
|
|
|
}
|
|
|
|
|
|
|
|
*size = total;
|
|
|
|
|
|
|
|
if (boot_strict && *size > 0) {
|
|
|
|
list[total-1] = '\n';
|
|
|
|
list = g_realloc(list, total + 5);
|
|
|
|
memcpy(&list[total], "HALT", 5);
|
|
|
|
*size = total + 5;
|
|
|
|
}
|
|
|
|
return list;
|
|
|
|
}
|
2014-10-07 12:00:11 +04:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
int32_t *bootindex;
|
|
|
|
const char *suffix;
|
|
|
|
DeviceState *dev;
|
|
|
|
} BootIndexProperty;
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 16:48:55 +03:00
|
|
|
static void device_get_bootindex(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
2014-10-07 12:00:11 +04:00
|
|
|
{
|
|
|
|
BootIndexProperty *prop = opaque;
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 16:48:54 +03:00
|
|
|
visit_type_int32(v, name, prop->bootindex, errp);
|
2014-10-07 12:00:11 +04:00
|
|
|
}
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 16:48:55 +03:00
|
|
|
static void device_set_bootindex(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
2014-10-07 12:00:11 +04:00
|
|
|
{
|
|
|
|
BootIndexProperty *prop = opaque;
|
|
|
|
int32_t boot_index;
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 16:48:54 +03:00
|
|
|
visit_type_int32(v, name, &boot_index, &local_err);
|
2014-10-07 12:00:11 +04:00
|
|
|
if (local_err) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* check whether bootindex is present in fw_boot_order list */
|
|
|
|
check_boot_index(boot_index, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* change bootindex to a new one */
|
|
|
|
*prop->bootindex = boot_index;
|
|
|
|
|
2014-10-07 12:00:36 +04:00
|
|
|
add_boot_device_path(*prop->bootindex, prop->dev, prop->suffix);
|
|
|
|
|
2014-10-07 12:00:11 +04:00
|
|
|
out:
|
2016-06-14 00:57:56 +03:00
|
|
|
error_propagate(errp, local_err);
|
2014-10-07 12:00:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void property_release_bootindex(Object *obj, const char *name,
|
|
|
|
void *opaque)
|
|
|
|
|
|
|
|
{
|
|
|
|
BootIndexProperty *prop = opaque;
|
2014-10-07 12:00:37 +04:00
|
|
|
|
|
|
|
del_boot_device_path(prop->dev, prop->suffix);
|
2014-10-07 12:00:11 +04:00
|
|
|
g_free(prop);
|
|
|
|
}
|
|
|
|
|
|
|
|
void device_add_bootindex_property(Object *obj, int32_t *bootindex,
|
|
|
|
const char *name, const char *suffix,
|
|
|
|
DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
Error *local_err = NULL;
|
|
|
|
BootIndexProperty *prop = g_malloc0(sizeof(*prop));
|
|
|
|
|
|
|
|
prop->bootindex = bootindex;
|
|
|
|
prop->suffix = suffix;
|
|
|
|
prop->dev = dev;
|
|
|
|
|
|
|
|
object_property_add(obj, name, "int32",
|
|
|
|
device_get_bootindex,
|
|
|
|
device_set_bootindex,
|
|
|
|
property_release_bootindex,
|
|
|
|
prop, &local_err);
|
|
|
|
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
g_free(prop);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* initialize devices' bootindex property to -1 */
|
|
|
|
object_property_set_int(obj, -1, name, NULL);
|
|
|
|
}
|