Commit c692931c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/berrange/tags/authz-next-pull-request' into staging 



Fix object interface check macro usage

# gpg: Signature made Thu 21 Mar 2019 11:53:15 GMT
# gpg:                using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/authz-next-pull-request:
  authz: Use OBJECT_CHECK() on objects

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9b198f93 063603d4

include/authz/base.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
     OBJECT_GET_CLASS(QAuthZClass, (obj), \

                      TYPE_QAUTHZ)

#define QAUTHZ(obj) \

     INTERFACE_CHECK(QAuthZ, (obj), \

     OBJECT_CHECK(QAuthZ, (obj), \

                  TYPE_QAUTHZ)



typedef struct QAuthZ QAuthZ;

include/authz/list.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
    OBJECT_GET_CLASS(QAuthZListClass, (obj),    \

                      TYPE_QAUTHZ_LIST)

#define QAUTHZ_LIST(obj) \

    INTERFACE_CHECK(QAuthZList, (obj),          \

    OBJECT_CHECK(QAuthZList, (obj), \

                 TYPE_QAUTHZ_LIST)



typedef struct QAuthZList QAuthZList;

include/authz/listfile.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
    OBJECT_GET_CLASS(QAuthZListFileClass, (obj),    \

                      TYPE_QAUTHZ_LIST_FILE)

#define QAUTHZ_LIST_FILE(obj) \

    INTERFACE_CHECK(QAuthZListFile, (obj),          \

    OBJECT_CHECK(QAuthZListFile, (obj), \

                 TYPE_QAUTHZ_LIST_FILE)



typedef struct QAuthZListFile QAuthZListFile;

include/authz/pamacct.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
     OBJECT_GET_CLASS(QAuthZPAMClass, (obj), \

                      TYPE_QAUTHZ_PAM)

#define QAUTHZ_PAM(obj) \

     INTERFACE_CHECK(QAuthZPAM, (obj), \

     OBJECT_CHECK(QAuthZPAM, (obj), \

                  TYPE_QAUTHZ_PAM)



typedef struct QAuthZPAM QAuthZPAM;

include/authz/simple.h

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
    OBJECT_GET_CLASS(QAuthZSimpleClass, (obj),    \

                      TYPE_QAUTHZ_SIMPLE)

#define QAUTHZ_SIMPLE(obj) \

    INTERFACE_CHECK(QAuthZSimple, (obj),          \

    OBJECT_CHECK(QAuthZSimple, (obj), \

                 TYPE_QAUTHZ_SIMPLE)



typedef struct QAuthZSimple QAuthZSimple;