2012-12-05 20:49:11 +04:00
|
|
|
/*
|
2016-06-15 21:54:52 +03:00
|
|
|
* qdev property parsing
|
2012-12-05 20:49:11 +04:00
|
|
|
* (parts specific for qemu-system-*)
|
|
|
|
*
|
|
|
|
* This file is based on code from hw/qdev-properties.c from
|
|
|
|
* commit 074a86fccd185616469dfcdc0e157f438aebba18,
|
|
|
|
* Copyright (c) Gerd Hoffmann <kraxel@redhat.com> and other contributors.
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
|
|
* See the COPYING file in the top-level directory.
|
|
|
|
*/
|
|
|
|
|
2016-01-26 21:17:29 +03:00
|
|
|
#include "qemu/osdep.h"
|
2012-12-23 03:39:34 +04:00
|
|
|
#include "net/net.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/qdev.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"
|
2012-12-23 03:39:34 +04:00
|
|
|
#include "qapi/qmp/qerror.h"
|
2014-10-07 15:59:18 +04:00
|
|
|
#include "sysemu/block-backend.h"
|
2012-12-23 03:39:34 +04:00
|
|
|
#include "sysemu/blockdev.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/block/block.h"
|
2012-12-05 20:49:11 +04:00
|
|
|
#include "net/hub.h"
|
2012-12-23 03:39:34 +04:00
|
|
|
#include "qapi/visitor.h"
|
2017-01-26 17:26:44 +03:00
|
|
|
#include "chardev/char-fe.h"
|
2014-03-03 14:30:07 +04:00
|
|
|
#include "sysemu/iothread.h"
|
2012-12-05 20:49:11 +04:00
|
|
|
|
|
|
|
static void get_pointer(Object *obj, Visitor *v, Property *prop,
|
2014-03-03 14:30:06 +04:00
|
|
|
char *(*print)(void *ptr),
|
2012-12-05 20:49:11 +04:00
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
DeviceState *dev = DEVICE(obj);
|
|
|
|
void **ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
|
char *p;
|
|
|
|
|
2014-03-03 14:30:06 +04:00
|
|
|
p = *ptr ? print(*ptr) : g_strdup("");
|
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_str(v, name, &p, errp);
|
2014-03-03 14:30:06 +04:00
|
|
|
g_free(p);
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void set_pointer(Object *obj, Visitor *v, Property *prop,
|
2015-06-26 16:22:36 +03:00
|
|
|
void (*parse)(DeviceState *dev, const char *str,
|
|
|
|
void **ptr, const char *propname,
|
|
|
|
Error **errp),
|
2012-12-05 20:49:11 +04:00
|
|
|
const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
DeviceState *dev = DEVICE(obj);
|
|
|
|
Error *local_err = NULL;
|
|
|
|
void **ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
|
char *str;
|
|
|
|
|
2013-01-09 06:58:10 +04:00
|
|
|
if (dev->realized) {
|
2013-03-25 17:40:44 +04:00
|
|
|
qdev_prop_set_after_realize(dev, name, errp);
|
2012-12-05 20:49:11 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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_str(v, name, &str, &local_err);
|
2012-12-05 20:49:11 +04:00
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!*str) {
|
|
|
|
g_free(str);
|
|
|
|
*ptr = NULL;
|
|
|
|
return;
|
|
|
|
}
|
2015-06-26 16:22:36 +03:00
|
|
|
parse(dev, str, ptr, prop->name, errp);
|
2012-12-05 20:49:11 +04:00
|
|
|
g_free(str);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* --- drive --- */
|
|
|
|
|
2015-06-26 16:22:36 +03:00
|
|
|
static void parse_drive(DeviceState *dev, const char *str, void **ptr,
|
|
|
|
const char *propname, Error **errp)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
2014-10-07 15:59:18 +04:00
|
|
|
BlockBackend *blk;
|
2016-06-21 21:46:05 +03:00
|
|
|
bool blk_created = false;
|
2017-01-13 21:02:32 +03:00
|
|
|
int ret;
|
2012-12-05 20:49:11 +04:00
|
|
|
|
2014-10-07 15:59:18 +04:00
|
|
|
blk = blk_by_name(str);
|
2016-06-21 21:46:05 +03:00
|
|
|
if (!blk) {
|
|
|
|
BlockDriverState *bs = bdrv_lookup_bs(NULL, str, NULL);
|
|
|
|
if (bs) {
|
2017-01-20 19:07:26 +03:00
|
|
|
blk = blk_new(0, BLK_PERM_ALL);
|
2016-06-21 21:46:05 +03:00
|
|
|
blk_created = true;
|
2017-01-13 21:02:32 +03:00
|
|
|
|
|
|
|
ret = blk_insert_bs(blk, bs, errp);
|
|
|
|
if (ret < 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
2016-06-21 21:46:05 +03:00
|
|
|
}
|
|
|
|
}
|
2014-10-07 15:59:18 +04:00
|
|
|
if (!blk) {
|
2015-06-26 16:22:36 +03:00
|
|
|
error_setg(errp, "Property '%s.%s' can't find value '%s'",
|
|
|
|
object_get_typename(OBJECT(dev)), propname, str);
|
2016-06-21 21:46:05 +03:00
|
|
|
goto fail;
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
2014-10-07 15:59:18 +04:00
|
|
|
if (blk_attach_dev(blk, dev) < 0) {
|
qdev-properties-system: Improve error message for drive assignment conflict
If the user forgot if=none on their drive specification they're likely
to get an error message because the drive is assigned once automatically
by QEMU and once by the manual id=/drive= user command line specification.
Improve the error message produced in this case to explicitly guide the
user towards if=none.
We rephrase the "drive conflict but not for an if=something" error as
well to keep the wording in line.
The two cases that change are:
(1) Drive specified as to be auto-connected and also manually connected
(and the board does handle this if= type):
qemu-system-x86_64 -nodefaults -display none \
-drive if=scsi,file=tmp.qcow2,id=foo -device ide-hd,drive=foo
Previously:
qemu-system-x86_64: -device ide-hd,drive=foo: Property 'ide-hd.drive'
can't take value 'foo', it's in use
Now:
qemu-system-x86_64: -device ide-hd,drive=foo: Drive 'foo' is already in
use because it has been automatically connected to another device (did
you need 'if=none' in the drive options?)
(2) Drive specified to be manually connected in two different ways:
qemu-system-x86_64 -nodefaults -display none \
-drive if=none,file=tmp.qcow2,id=foo -device ide-hd,drive=foo \
-device ide-hd,drive=foo
Previously:
qemu-system-x86_64: -device ide-hd,drive=foo: Property 'ide-hd.drive'
can't take value 'foo', it's in use
Now:
qemu-system-x86_64: -device ide-hd,drive=foo: Drive 'foo' is already in
use by another device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435068107-12594-3-git-send-email-peter.maydell@linaro.org
2015-06-26 16:22:36 +03:00
|
|
|
DriveInfo *dinfo = blk_legacy_dinfo(blk);
|
|
|
|
|
block/qdev: Fix NULL access when using BB twice
BlockBackend has only a single pointer to its guest device, so it makes
sure that only a single guest device is attached to it. device-add
returns an error if you try to attach a second device to a BB. In order
to make the error message nicer, -device that manually connects to a
if=none block device get a different message than -drive that implicitly
creates a guest device. The if=... option is stored in DriveInfo.
However, since blockdev-add exists, not every BlockBackend has a
DriveInfo any more. Check that it exists before we dereference it.
QMP reproducer resulting in a segfault:
{"execute":"blockdev-add","arguments":{"options":{"id":"disk","driver":"file","filename":"/tmp/test.img"}}}
{"execute":"device_add","arguments":{"driver":"virtio-blk-pci","drive":"disk"}}
{"execute":"device_add","arguments":{"driver":"virtio-blk-pci","drive":"disk"}}
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
2016-06-23 10:30:01 +03:00
|
|
|
if (dinfo && dinfo->type != IF_NONE) {
|
qdev-properties-system: Improve error message for drive assignment conflict
If the user forgot if=none on their drive specification they're likely
to get an error message because the drive is assigned once automatically
by QEMU and once by the manual id=/drive= user command line specification.
Improve the error message produced in this case to explicitly guide the
user towards if=none.
We rephrase the "drive conflict but not for an if=something" error as
well to keep the wording in line.
The two cases that change are:
(1) Drive specified as to be auto-connected and also manually connected
(and the board does handle this if= type):
qemu-system-x86_64 -nodefaults -display none \
-drive if=scsi,file=tmp.qcow2,id=foo -device ide-hd,drive=foo
Previously:
qemu-system-x86_64: -device ide-hd,drive=foo: Property 'ide-hd.drive'
can't take value 'foo', it's in use
Now:
qemu-system-x86_64: -device ide-hd,drive=foo: Drive 'foo' is already in
use because it has been automatically connected to another device (did
you need 'if=none' in the drive options?)
(2) Drive specified to be manually connected in two different ways:
qemu-system-x86_64 -nodefaults -display none \
-drive if=none,file=tmp.qcow2,id=foo -device ide-hd,drive=foo \
-device ide-hd,drive=foo
Previously:
qemu-system-x86_64: -device ide-hd,drive=foo: Property 'ide-hd.drive'
can't take value 'foo', it's in use
Now:
qemu-system-x86_64: -device ide-hd,drive=foo: Drive 'foo' is already in
use by another device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435068107-12594-3-git-send-email-peter.maydell@linaro.org
2015-06-26 16:22:36 +03:00
|
|
|
error_setg(errp, "Drive '%s' is already in use because "
|
|
|
|
"it has been automatically connected to another "
|
|
|
|
"device (did you need 'if=none' in the drive options?)",
|
|
|
|
str);
|
|
|
|
} else {
|
|
|
|
error_setg(errp, "Drive '%s' is already in use by another device",
|
|
|
|
str);
|
|
|
|
}
|
2016-06-21 21:46:05 +03:00
|
|
|
goto fail;
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
2016-06-21 21:46:05 +03:00
|
|
|
|
2014-10-07 15:59:18 +04:00
|
|
|
*ptr = blk;
|
2016-06-21 21:46:05 +03:00
|
|
|
|
|
|
|
fail:
|
|
|
|
if (blk_created) {
|
|
|
|
/* If we need to keep a reference, blk_attach_dev() took it */
|
|
|
|
blk_unref(blk);
|
|
|
|
}
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void release_drive(Object *obj, const char *name, void *opaque)
|
|
|
|
{
|
|
|
|
DeviceState *dev = DEVICE(obj);
|
|
|
|
Property *prop = opaque;
|
2014-10-07 15:59:18 +04:00
|
|
|
BlockBackend **ptr = qdev_get_prop_ptr(dev, prop);
|
2012-12-05 20:49:11 +04:00
|
|
|
|
|
|
|
if (*ptr) {
|
2017-03-28 19:12:46 +03:00
|
|
|
AioContext *ctx = blk_get_aio_context(*ptr);
|
|
|
|
|
|
|
|
aio_context_acquire(ctx);
|
2012-12-05 20:49:11 +04:00
|
|
|
blockdev_auto_del(*ptr);
|
2016-06-21 21:46:05 +03:00
|
|
|
blk_detach_dev(*ptr, dev);
|
2017-03-28 19:12:46 +03:00
|
|
|
aio_context_release(ctx);
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-03 14:30:06 +04:00
|
|
|
static char *print_drive(void *ptr)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
2016-08-04 15:09:07 +03:00
|
|
|
const char *name;
|
|
|
|
|
|
|
|
name = blk_name(ptr);
|
|
|
|
if (!*name) {
|
|
|
|
BlockDriverState *bs = blk_bs(ptr);
|
|
|
|
if (bs) {
|
|
|
|
name = bdrv_get_node_name(bs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return g_strdup(name);
|
2012-12-05 20:49: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 get_drive(Object *obj, Visitor *v, const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
|
|
|
get_pointer(obj, v, opaque, print_drive, name, errp);
|
|
|
|
}
|
|
|
|
|
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 set_drive(Object *obj, Visitor *v, const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
|
|
|
set_pointer(obj, v, opaque, parse_drive, name, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
PropertyInfo qdev_prop_drive = {
|
2014-02-08 14:01:56 +04:00
|
|
|
.name = "str",
|
2016-06-21 21:46:05 +03:00
|
|
|
.description = "Node name or ID of a block device to use as a backend",
|
2012-12-05 20:49:11 +04:00
|
|
|
.get = get_drive,
|
|
|
|
.set = set_drive,
|
|
|
|
.release = release_drive,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* --- character device --- */
|
|
|
|
|
2016-10-22 12:52:51 +03:00
|
|
|
static void get_chr(Object *obj, Visitor *v, const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
2016-10-22 12:52:51 +03:00
|
|
|
DeviceState *dev = DEVICE(obj);
|
|
|
|
CharBackend *be = qdev_get_prop_ptr(dev, opaque);
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
p = g_strdup(be->chr && be->chr->label ? be->chr->label : "");
|
|
|
|
visit_type_str(v, name, &p, errp);
|
|
|
|
g_free(p);
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
2016-10-22 12:52:51 +03:00
|
|
|
static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
|
|
|
DeviceState *dev = DEVICE(obj);
|
2016-10-22 12:52:51 +03:00
|
|
|
Error *local_err = NULL;
|
2012-12-05 20:49:11 +04:00
|
|
|
Property *prop = opaque;
|
2016-10-22 12:52:51 +03:00
|
|
|
CharBackend *be = qdev_get_prop_ptr(dev, prop);
|
2016-12-07 16:20:22 +03:00
|
|
|
Chardev *s;
|
2016-10-22 12:52:51 +03:00
|
|
|
char *str;
|
2012-12-05 20:49:11 +04:00
|
|
|
|
2016-10-22 12:52:51 +03:00
|
|
|
if (dev->realized) {
|
|
|
|
qdev_prop_set_after_realize(dev, name, errp);
|
|
|
|
return;
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
2016-10-22 12:52:51 +03:00
|
|
|
visit_type_str(v, name, &str, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
2012-12-05 20:49:11 +04:00
|
|
|
|
2016-10-22 12:52:51 +03:00
|
|
|
if (!*str) {
|
|
|
|
g_free(str);
|
|
|
|
be->chr = NULL;
|
|
|
|
return;
|
|
|
|
}
|
2012-12-05 20:49:11 +04:00
|
|
|
|
2016-10-22 12:52:51 +03:00
|
|
|
s = qemu_chr_find(str);
|
|
|
|
if (s == NULL) {
|
|
|
|
error_setg(errp, "Property '%s.%s' can't find value '%s'",
|
|
|
|
object_get_typename(obj), prop->name, str);
|
2016-11-07 12:59:22 +03:00
|
|
|
} else if (!qemu_chr_fe_init(be, s, errp)) {
|
2016-10-22 12:52:58 +03:00
|
|
|
error_prepend(errp, "Property '%s.%s' can't take value '%s': ",
|
|
|
|
object_get_typename(obj), prop->name, str);
|
2016-10-22 12:52:51 +03:00
|
|
|
}
|
2016-11-07 12:59:22 +03:00
|
|
|
g_free(str);
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
2016-10-22 12:52:51 +03:00
|
|
|
static void release_chr(Object *obj, const char *name, void *opaque)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
2016-10-22 12:52:51 +03:00
|
|
|
DeviceState *dev = DEVICE(obj);
|
|
|
|
Property *prop = opaque;
|
|
|
|
CharBackend *be = qdev_get_prop_ptr(dev, prop);
|
|
|
|
|
2017-01-26 23:49:13 +03:00
|
|
|
qemu_chr_fe_deinit(be, false);
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
PropertyInfo qdev_prop_chr = {
|
2014-02-08 14:01:56 +04:00
|
|
|
.name = "str",
|
2014-10-07 10:33:20 +04:00
|
|
|
.description = "ID of a chardev to use as a backend",
|
2012-12-05 20:49:11 +04:00
|
|
|
.get = get_chr,
|
|
|
|
.set = set_chr,
|
|
|
|
.release = release_chr,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* --- netdev device --- */
|
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 get_netdev(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
2014-10-13 09:16:37 +04:00
|
|
|
{
|
|
|
|
DeviceState *dev = DEVICE(obj);
|
|
|
|
Property *prop = opaque;
|
|
|
|
NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
|
char *p = g_strdup(peers_ptr->ncs[0] ? peers_ptr->ncs[0]->name : "");
|
|
|
|
|
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_str(v, name, &p, errp);
|
2014-10-13 09:16:37 +04:00
|
|
|
g_free(p);
|
|
|
|
}
|
2012-12-05 20:49: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 set_netdev(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
2014-10-13 09:16:37 +04:00
|
|
|
DeviceState *dev = DEVICE(obj);
|
|
|
|
Property *prop = opaque;
|
|
|
|
NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
|
2013-01-30 15:12:28 +04:00
|
|
|
NetClientState **ncs = peers_ptr->ncs;
|
|
|
|
NetClientState *peers[MAX_QUEUE_NUM];
|
2014-10-13 09:16:37 +04:00
|
|
|
Error *local_err = NULL;
|
|
|
|
int queues, err = 0, i = 0;
|
|
|
|
char *str;
|
|
|
|
|
|
|
|
if (dev->realized) {
|
|
|
|
qdev_prop_set_after_realize(dev, name, errp);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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_str(v, name, &str, &local_err);
|
2014-10-13 09:16:37 +04:00
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
2012-12-05 20:49:11 +04:00
|
|
|
|
2013-01-30 15:12:28 +04:00
|
|
|
queues = qemu_find_net_clients_except(str, peers,
|
qapi: Change Netdev into a flat union
This is a mostly-mechanical conversion that creates a new flat
union 'Netdev' QAPI type that covers all the branches of the
former 'NetClientOptions' simple union, where the branches are
now listed in a new 'NetClientDriver' enum rather than generated
from the simple union. The existence of a flat union has no
change to the command line syntax accepted for new code, and
will make it possible for a future patch to switch the QMP
command to parse a boxed union for no change to valid QMP; but
it does have some ripple effect on the C code when dealing with
the new types.
While making the conversion, note that the 'NetLegacy' type
remains unchanged: it applies only to legacy command line options,
and will not be ported to QMP, so it should remain a wrapper
around a simple union; to avoid confusion, the type named
'NetClientOptions' is now gone, and we introduce 'NetLegacyOptions'
in its place. Then, in the C code, we convert from NetLegacy to
Netdev as soon as possible, so that the bulk of the net stack
only has to deal with one QAPI type, not two. Note that since
the old legacy code always rejected 'hubport', we can just omit
that branch from the new 'NetLegacyOptions' simple union.
Based on an idea originally by Zoltán Kővágó <DirtY.iCE.hu@gmail.com>:
Message-Id: <01a527fbf1a5de880091f98cf011616a78adeeee.1441627176.git.DirtY.iCE.hu@gmail.com>
although the sed script in that patch no longer applies due to
other changes in the tree since then, and I also did some manual
cleanups (such as fixing whitespace to keep checkpatch happy).
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1468468228-27827-13-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Fixup from Eric squashed in]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-07-14 06:50:23 +03:00
|
|
|
NET_CLIENT_DRIVER_NIC,
|
2013-01-30 15:12:28 +04:00
|
|
|
MAX_QUEUE_NUM);
|
|
|
|
if (queues == 0) {
|
2014-10-13 09:16:37 +04:00
|
|
|
err = -ENOENT;
|
|
|
|
goto out;
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
2013-01-30 15:12:28 +04:00
|
|
|
|
|
|
|
if (queues > MAX_QUEUE_NUM) {
|
2014-10-13 09:16:37 +04:00
|
|
|
error_setg(errp, "queues of backend '%s'(%d) exceeds QEMU limitation(%d)",
|
|
|
|
str, queues, MAX_QUEUE_NUM);
|
|
|
|
goto out;
|
2013-01-30 15:12:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < queues; i++) {
|
|
|
|
if (peers[i] == NULL) {
|
2014-10-13 09:16:37 +04:00
|
|
|
err = -ENOENT;
|
|
|
|
goto out;
|
2013-01-30 15:12:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (peers[i]->peer) {
|
2014-10-13 09:16:37 +04:00
|
|
|
err = -EEXIST;
|
|
|
|
goto out;
|
2013-01-30 15:12:28 +04:00
|
|
|
}
|
|
|
|
|
2013-11-08 06:13:09 +04:00
|
|
|
if (ncs[i]) {
|
2014-10-13 09:16:37 +04:00
|
|
|
err = -EINVAL;
|
|
|
|
goto out;
|
2013-11-08 06:13:09 +04:00
|
|
|
}
|
|
|
|
|
2013-01-30 15:12:28 +04:00
|
|
|
ncs[i] = peers[i];
|
|
|
|
ncs[i]->queue_index = i;
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
2013-01-30 15:12:28 +04:00
|
|
|
|
2014-05-26 14:04:08 +04:00
|
|
|
peers_ptr->queues = queues;
|
2013-01-30 15:12:28 +04:00
|
|
|
|
2014-10-13 09:16:37 +04:00
|
|
|
out:
|
|
|
|
error_set_from_qdev_prop_error(errp, err, dev, prop, str);
|
|
|
|
g_free(str);
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
PropertyInfo qdev_prop_netdev = {
|
2014-02-08 14:01:56 +04:00
|
|
|
.name = "str",
|
2014-10-07 10:33:20 +04:00
|
|
|
.description = "ID of a netdev to use as a backend",
|
2012-12-05 20:49:11 +04:00
|
|
|
.get = get_netdev,
|
|
|
|
.set = set_netdev,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* --- vlan --- */
|
|
|
|
|
|
|
|
static int print_vlan(DeviceState *dev, Property *prop, char *dest, size_t len)
|
|
|
|
{
|
|
|
|
NetClientState **ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
|
|
|
|
|
if (*ptr) {
|
|
|
|
int id;
|
|
|
|
if (!net_hub_id_for_client(*ptr, &id)) {
|
|
|
|
return snprintf(dest, len, "%d", id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return snprintf(dest, len, "<null>");
|
|
|
|
}
|
|
|
|
|
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 get_vlan(Object *obj, Visitor *v, const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
|
|
|
DeviceState *dev = DEVICE(obj);
|
|
|
|
Property *prop = opaque;
|
|
|
|
NetClientState **ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
|
int32_t id = -1;
|
|
|
|
|
|
|
|
if (*ptr) {
|
|
|
|
int hub_id;
|
|
|
|
if (!net_hub_id_for_client(*ptr, &hub_id)) {
|
|
|
|
id = hub_id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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, &id, errp);
|
2012-12-05 20:49: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 set_vlan(Object *obj, Visitor *v, const char *name, void *opaque,
|
|
|
|
Error **errp)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
|
|
|
DeviceState *dev = DEVICE(obj);
|
|
|
|
Property *prop = opaque;
|
2013-01-30 15:12:28 +04:00
|
|
|
NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
|
NetClientState **ptr = &peers_ptr->ncs[0];
|
2012-12-05 20:49:11 +04:00
|
|
|
Error *local_err = NULL;
|
|
|
|
int32_t id;
|
|
|
|
NetClientState *hubport;
|
|
|
|
|
2013-01-09 06:58:10 +04:00
|
|
|
if (dev->realized) {
|
2013-03-25 17:40:44 +04:00
|
|
|
qdev_prop_set_after_realize(dev, name, errp);
|
2012-12-05 20:49:11 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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, &id, &local_err);
|
2012-12-05 20:49:11 +04:00
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (id == -1) {
|
|
|
|
*ptr = NULL;
|
|
|
|
return;
|
|
|
|
}
|
2013-11-08 06:13:09 +04:00
|
|
|
if (*ptr) {
|
|
|
|
error_set_from_qdev_prop_error(errp, -EINVAL, dev, prop, name);
|
|
|
|
return;
|
|
|
|
}
|
2012-12-05 20:49:11 +04:00
|
|
|
|
|
|
|
hubport = net_hub_port_find(id);
|
|
|
|
if (!hubport) {
|
2015-03-17 13:54:50 +03:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
|
|
|
name, prop->info->name);
|
2012-12-05 20:49:11 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
*ptr = hubport;
|
|
|
|
}
|
|
|
|
|
|
|
|
PropertyInfo qdev_prop_vlan = {
|
2014-02-08 14:01:56 +04:00
|
|
|
.name = "int32",
|
2014-10-07 10:33:20 +04:00
|
|
|
.description = "Integer VLAN id to connect to",
|
2012-12-05 20:49:11 +04:00
|
|
|
.print = print_vlan,
|
|
|
|
.get = get_vlan,
|
|
|
|
.set = set_vlan,
|
|
|
|
};
|
|
|
|
|
2015-03-09 21:17:26 +03:00
|
|
|
void qdev_prop_set_drive(DeviceState *dev, const char *name,
|
|
|
|
BlockBackend *value, Error **errp)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
2016-06-21 21:46:05 +03:00
|
|
|
const char *ref = "";
|
|
|
|
|
|
|
|
if (value) {
|
|
|
|
ref = blk_name(value);
|
|
|
|
if (!*ref) {
|
2017-03-10 23:05:50 +03:00
|
|
|
const BlockDriverState *bs = blk_bs(value);
|
2016-06-21 21:46:05 +03:00
|
|
|
if (bs) {
|
|
|
|
ref = bdrv_get_node_name(bs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
object_property_set_str(OBJECT(dev), ref, name, errp);
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void qdev_prop_set_chr(DeviceState *dev, const char *name,
|
2016-12-07 16:20:22 +03:00
|
|
|
Chardev *value)
|
2012-12-05 20:49:11 +04:00
|
|
|
{
|
|
|
|
assert(!value || value->label);
|
|
|
|
object_property_set_str(OBJECT(dev),
|
2014-01-02 06:48:08 +04:00
|
|
|
value ? value->label : "", name, &error_abort);
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void qdev_prop_set_netdev(DeviceState *dev, const char *name,
|
|
|
|
NetClientState *value)
|
|
|
|
{
|
|
|
|
assert(!value || value->name);
|
|
|
|
object_property_set_str(OBJECT(dev),
|
2014-01-02 06:48:08 +04:00
|
|
|
value ? value->name : "", name, &error_abort);
|
2012-12-05 20:49:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd)
|
|
|
|
{
|
|
|
|
qdev_prop_set_macaddr(dev, "mac", nd->macaddr.a);
|
|
|
|
if (nd->netdev) {
|
|
|
|
qdev_prop_set_netdev(dev, "netdev", nd->netdev);
|
|
|
|
}
|
|
|
|
if (nd->nvectors != DEV_NVECTORS_UNSPECIFIED &&
|
|
|
|
object_property_find(OBJECT(dev), "vectors", NULL)) {
|
|
|
|
qdev_prop_set_uint32(dev, "vectors", nd->nvectors);
|
|
|
|
}
|
|
|
|
nd->instantiated = 1;
|
|
|
|
}
|