mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-23 18:12:00 -06:00
qdev: Rename qdev_get_prop_ptr() to object_field_prop_ptr()
The function will be moved to common QOM code, as it is not specific to TYPE_DEVICE anymore. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Acked-by: Paul Durrant <paul@xen.org> Message-Id: <20201211220529.2290218-31-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost
parent
8f2aff643c
commit
1e198715e1
8 changed files with 67 additions and 67 deletions
|
|
@ -62,7 +62,7 @@ static void get_drive(Object *obj, Visitor *v, const char *name, void *opaque,
|
|||
Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
void **ptr = qdev_get_prop_ptr(obj, prop);
|
||||
void **ptr = object_field_prop_ptr(obj, prop);
|
||||
const char *value;
|
||||
char *p;
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ static void set_drive_helper(Object *obj, Visitor *v, const char *name,
|
|||
{
|
||||
DeviceState *dev = DEVICE(obj);
|
||||
Property *prop = opaque;
|
||||
void **ptr = qdev_get_prop_ptr(obj, prop);
|
||||
void **ptr = object_field_prop_ptr(obj, prop);
|
||||
char *str;
|
||||
BlockBackend *blk;
|
||||
bool blk_created = false;
|
||||
|
|
@ -181,7 +181,7 @@ static void release_drive(Object *obj, const char *name, void *opaque)
|
|||
{
|
||||
DeviceState *dev = DEVICE(obj);
|
||||
Property *prop = opaque;
|
||||
BlockBackend **ptr = qdev_get_prop_ptr(obj, prop);
|
||||
BlockBackend **ptr = object_field_prop_ptr(obj, prop);
|
||||
|
||||
if (*ptr) {
|
||||
AioContext *ctx = blk_get_aio_context(*ptr);
|
||||
|
|
@ -214,7 +214,7 @@ const PropertyInfo qdev_prop_drive_iothread = {
|
|||
static void get_chr(Object *obj, Visitor *v, const char *name, void *opaque,
|
||||
Error **errp)
|
||||
{
|
||||
CharBackend *be = qdev_get_prop_ptr(obj, opaque);
|
||||
CharBackend *be = object_field_prop_ptr(obj, opaque);
|
||||
char *p;
|
||||
|
||||
p = g_strdup(be->chr && be->chr->label ? be->chr->label : "");
|
||||
|
|
@ -226,7 +226,7 @@ static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque,
|
|||
Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
CharBackend *be = qdev_get_prop_ptr(obj, prop);
|
||||
CharBackend *be = object_field_prop_ptr(obj, prop);
|
||||
Chardev *s;
|
||||
char *str;
|
||||
|
||||
|
|
@ -262,7 +262,7 @@ static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque,
|
|||
static void release_chr(Object *obj, const char *name, void *opaque)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
CharBackend *be = qdev_get_prop_ptr(obj, prop);
|
||||
CharBackend *be = object_field_prop_ptr(obj, prop);
|
||||
|
||||
qemu_chr_fe_deinit(be, false);
|
||||
}
|
||||
|
|
@ -286,7 +286,7 @@ static void get_mac(Object *obj, Visitor *v, const char *name, void *opaque,
|
|||
Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
MACAddr *mac = qdev_get_prop_ptr(obj, prop);
|
||||
MACAddr *mac = object_field_prop_ptr(obj, prop);
|
||||
char buffer[2 * 6 + 5 + 1];
|
||||
char *p = buffer;
|
||||
|
||||
|
|
@ -301,7 +301,7 @@ static void set_mac(Object *obj, Visitor *v, const char *name, void *opaque,
|
|||
Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
MACAddr *mac = qdev_get_prop_ptr(obj, prop);
|
||||
MACAddr *mac = object_field_prop_ptr(obj, prop);
|
||||
int i, pos;
|
||||
char *str;
|
||||
const char *p;
|
||||
|
|
@ -363,7 +363,7 @@ static void get_netdev(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
NICPeers *peers_ptr = qdev_get_prop_ptr(obj, prop);
|
||||
NICPeers *peers_ptr = object_field_prop_ptr(obj, prop);
|
||||
char *p = g_strdup(peers_ptr->ncs[0] ? peers_ptr->ncs[0]->name : "");
|
||||
|
||||
visit_type_str(v, name, &p, errp);
|
||||
|
|
@ -374,7 +374,7 @@ static void set_netdev(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
NICPeers *peers_ptr = qdev_get_prop_ptr(obj, prop);
|
||||
NICPeers *peers_ptr = object_field_prop_ptr(obj, prop);
|
||||
NetClientState **ncs = peers_ptr->ncs;
|
||||
NetClientState *peers[MAX_QUEUE_NUM];
|
||||
int queues, err = 0, i = 0;
|
||||
|
|
@ -436,7 +436,7 @@ static void get_audiodev(Object *obj, Visitor *v, const char* name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
QEMUSoundCard *card = qdev_get_prop_ptr(obj, prop);
|
||||
QEMUSoundCard *card = object_field_prop_ptr(obj, prop);
|
||||
char *p = g_strdup(audio_get_id(card));
|
||||
|
||||
visit_type_str(v, name, &p, errp);
|
||||
|
|
@ -447,7 +447,7 @@ static void set_audiodev(Object *obj, Visitor *v, const char* name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
QEMUSoundCard *card = qdev_get_prop_ptr(obj, prop);
|
||||
QEMUSoundCard *card = object_field_prop_ptr(obj, prop);
|
||||
AudioState *state;
|
||||
int err = 0;
|
||||
char *str;
|
||||
|
|
@ -549,7 +549,7 @@ static void set_blocksize(Object *obj, Visitor *v, const char *name,
|
|||
{
|
||||
DeviceState *dev = DEVICE(obj);
|
||||
Property *prop = opaque;
|
||||
uint32_t *ptr = qdev_get_prop_ptr(obj, prop);
|
||||
uint32_t *ptr = object_field_prop_ptr(obj, prop);
|
||||
uint64_t value;
|
||||
Error *local_err = NULL;
|
||||
|
||||
|
|
@ -637,7 +637,7 @@ static void get_reserved_region(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
ReservedRegion *rr = qdev_get_prop_ptr(obj, prop);
|
||||
ReservedRegion *rr = object_field_prop_ptr(obj, prop);
|
||||
char buffer[64];
|
||||
char *p = buffer;
|
||||
int rc;
|
||||
|
|
@ -653,7 +653,7 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
ReservedRegion *rr = qdev_get_prop_ptr(obj, prop);
|
||||
ReservedRegion *rr = object_field_prop_ptr(obj, prop);
|
||||
Error *local_err = NULL;
|
||||
const char *endptr;
|
||||
char *str;
|
||||
|
|
@ -715,7 +715,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
int32_t value, *ptr = qdev_get_prop_ptr(obj, prop);
|
||||
int32_t value, *ptr = object_field_prop_ptr(obj, prop);
|
||||
unsigned int slot, fn, n;
|
||||
char *str;
|
||||
|
||||
|
|
@ -753,7 +753,7 @@ invalid:
|
|||
static int print_pci_devfn(Object *obj, Property *prop, char *dest,
|
||||
size_t len)
|
||||
{
|
||||
int32_t *ptr = qdev_get_prop_ptr(obj, prop);
|
||||
int32_t *ptr = object_field_prop_ptr(obj, prop);
|
||||
|
||||
if (*ptr == -1) {
|
||||
return snprintf(dest, len, "<unset>");
|
||||
|
|
@ -777,7 +777,7 @@ static void get_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
PCIHostDeviceAddress *addr = qdev_get_prop_ptr(obj, prop);
|
||||
PCIHostDeviceAddress *addr = object_field_prop_ptr(obj, prop);
|
||||
char buffer[] = "ffff:ff:ff.f";
|
||||
char *p = buffer;
|
||||
int rc = 0;
|
||||
|
|
@ -803,7 +803,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
PCIHostDeviceAddress *addr = qdev_get_prop_ptr(obj, prop);
|
||||
PCIHostDeviceAddress *addr = object_field_prop_ptr(obj, prop);
|
||||
char *str, *p;
|
||||
char *e;
|
||||
unsigned long val;
|
||||
|
|
@ -893,7 +893,7 @@ static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
PCIExpLinkSpeed *p = qdev_get_prop_ptr(obj, prop);
|
||||
PCIExpLinkSpeed *p = object_field_prop_ptr(obj, prop);
|
||||
int speed;
|
||||
|
||||
switch (*p) {
|
||||
|
|
@ -921,7 +921,7 @@ static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
PCIExpLinkSpeed *p = qdev_get_prop_ptr(obj, prop);
|
||||
PCIExpLinkSpeed *p = object_field_prop_ptr(obj, prop);
|
||||
int speed;
|
||||
|
||||
if (!visit_type_enum(v, name, &speed, prop->info->enum_table,
|
||||
|
|
@ -963,7 +963,7 @@ static void get_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
PCIExpLinkWidth *p = qdev_get_prop_ptr(obj, prop);
|
||||
PCIExpLinkWidth *p = object_field_prop_ptr(obj, prop);
|
||||
int width;
|
||||
|
||||
switch (*p) {
|
||||
|
|
@ -1000,7 +1000,7 @@ static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
|
|||
void *opaque, Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
PCIExpLinkWidth *p = qdev_get_prop_ptr(obj, prop);
|
||||
PCIExpLinkWidth *p = object_field_prop_ptr(obj, prop);
|
||||
int width;
|
||||
|
||||
if (!visit_type_enum(v, name, &width, prop->info->enum_table,
|
||||
|
|
@ -1051,7 +1051,7 @@ static void get_uuid(Object *obj, Visitor *v, const char *name, void *opaque,
|
|||
Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
QemuUUID *uuid = qdev_get_prop_ptr(obj, prop);
|
||||
QemuUUID *uuid = object_field_prop_ptr(obj, prop);
|
||||
char buffer[UUID_FMT_LEN + 1];
|
||||
char *p = buffer;
|
||||
|
||||
|
|
@ -1066,7 +1066,7 @@ static void set_uuid(Object *obj, Visitor *v, const char *name, void *opaque,
|
|||
Error **errp)
|
||||
{
|
||||
Property *prop = opaque;
|
||||
QemuUUID *uuid = qdev_get_prop_ptr(obj, prop);
|
||||
QemuUUID *uuid = object_field_prop_ptr(obj, prop);
|
||||
char *str;
|
||||
|
||||
if (!visit_type_str(v, name, &str, errp)) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue