Message ID | 1412668838-8656-18-git-send-email-arei.gonglei@huawei.com |
---|---|
State | New |
Headers | show |
Il 07/10/2014 10:00, arei.gonglei@huawei.com ha scritto: > From: Gonglei <arei.gonglei@huawei.com> > > Remove bootindex form qdev property to qom, things will > continue to work just fine, and we can use qom features > which are not supported by qdev property. > > Signed-off-by: Gonglei <arei.gonglei@huawei.com> > Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> > --- > include/net/net.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/include/net/net.h b/include/net/net.h > index ed594f9..008d610 100644 > --- a/include/net/net.h > +++ b/include/net/net.h > @@ -36,8 +36,7 @@ typedef struct NICConf { > #define DEFINE_NIC_PROPERTIES(_state, _conf) \ > DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \ > DEFINE_PROP_VLAN("vlan", _state, _conf.peers), \ > - DEFINE_PROP_NETDEV("netdev", _state, _conf.peers), \ > - DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1) > + DEFINE_PROP_NETDEV("netdev", _state, _conf.peers) > > > /* Net clients */ > This is a bit of a pity, and it's caused by the different nature of QOM properties (instance-based) vs. qdev properties (class-based). I can live with that. Paolo
> Subject: Re: [Qemu-devel] [PATCH v11 17/34] net: remove bootindex property > from qdev to qom > > Il 07/10/2014 10:00, arei.gonglei@huawei.com ha scritto: > > From: Gonglei <arei.gonglei@huawei.com> > > > > Remove bootindex form qdev property to qom, things will > > continue to work just fine, and we can use qom features > > which are not supported by qdev property. > > > > Signed-off-by: Gonglei <arei.gonglei@huawei.com> > > Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> > > --- > > include/net/net.h | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/include/net/net.h b/include/net/net.h > > index ed594f9..008d610 100644 > > --- a/include/net/net.h > > +++ b/include/net/net.h > > @@ -36,8 +36,7 @@ typedef struct NICConf { > > #define DEFINE_NIC_PROPERTIES(_state, _conf) > \ > > DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), > \ > > DEFINE_PROP_VLAN("vlan", _state, _conf.peers), > \ > > - DEFINE_PROP_NETDEV("netdev", _state, _conf.peers), > \ > > - DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1) > > + DEFINE_PROP_NETDEV("netdev", _state, _conf.peers) > > > > > > /* Net clients */ > > > > This is a bit of a pity, and it's caused by the different nature of QOM > properties (instance-based) vs. qdev properties (class-based). > > I can live with that. > > Paolo Hmm... Thanks :) Best regards, -Gonglei
diff --git a/include/net/net.h b/include/net/net.h index ed594f9..008d610 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -36,8 +36,7 @@ typedef struct NICConf { #define DEFINE_NIC_PROPERTIES(_state, _conf) \ DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \ DEFINE_PROP_VLAN("vlan", _state, _conf.peers), \ - DEFINE_PROP_NETDEV("netdev", _state, _conf.peers), \ - DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1) + DEFINE_PROP_NETDEV("netdev", _state, _conf.peers) /* Net clients */