diff options
| -rw-r--r-- | crypto/block-luks.c | 4 | ||||
| -rw-r--r-- | include/authz/base.h | 4 | ||||
| -rw-r--r-- | include/authz/list.h | 4 | ||||
| -rw-r--r-- | include/authz/listfile.h | 4 | ||||
| -rw-r--r-- | include/authz/pamacct.h | 4 | ||||
| -rw-r--r-- | include/authz/simple.h | 4 | ||||
| -rw-r--r-- | io/channel-websock.c | 8 |
7 files changed, 19 insertions, 13 deletions
diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 6bac79c3ab..5a69b3ce74 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -146,7 +146,7 @@ struct QCryptoBlockLUKSKeySlot { uint32_t key_offset; /* number of anti-forensic stripes */ uint32_t stripes; -} QEMU_PACKED; +}; QEMU_BUILD_BUG_ON(sizeof(struct QCryptoBlockLUKSKeySlot) != 48); @@ -191,7 +191,7 @@ struct QCryptoBlockLUKSHeader { /* key slots */ QCryptoBlockLUKSKeySlot key_slots[QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS]; -} QEMU_PACKED; +}; QEMU_BUILD_BUG_ON(sizeof(struct QCryptoBlockLUKSHeader) != 592); diff --git a/include/authz/base.h b/include/authz/base.h index 77dcd54c4c..55ac9581ad 100644 --- a/include/authz/base.h +++ b/include/authz/base.h @@ -35,8 +35,8 @@ OBJECT_GET_CLASS(QAuthZClass, (obj), \ TYPE_QAUTHZ) #define QAUTHZ(obj) \ - INTERFACE_CHECK(QAuthZ, (obj), \ - TYPE_QAUTHZ) + OBJECT_CHECK(QAuthZ, (obj), \ + TYPE_QAUTHZ) typedef struct QAuthZ QAuthZ; typedef struct QAuthZClass QAuthZClass; diff --git a/include/authz/list.h b/include/authz/list.h index a7225a747c..138ae7047c 100644 --- a/include/authz/list.h +++ b/include/authz/list.h @@ -33,8 +33,8 @@ OBJECT_GET_CLASS(QAuthZListClass, (obj), \ TYPE_QAUTHZ_LIST) #define QAUTHZ_LIST(obj) \ - INTERFACE_CHECK(QAuthZList, (obj), \ - TYPE_QAUTHZ_LIST) + OBJECT_CHECK(QAuthZList, (obj), \ + TYPE_QAUTHZ_LIST) typedef struct QAuthZList QAuthZList; typedef struct QAuthZListClass QAuthZListClass; diff --git a/include/authz/listfile.h b/include/authz/listfile.h index bcc8d80743..ebbd5a4288 100644 --- a/include/authz/listfile.h +++ b/include/authz/listfile.h @@ -34,8 +34,8 @@ OBJECT_GET_CLASS(QAuthZListFileClass, (obj), \ TYPE_QAUTHZ_LIST_FILE) #define QAUTHZ_LIST_FILE(obj) \ - INTERFACE_CHECK(QAuthZListFile, (obj), \ - TYPE_QAUTHZ_LIST_FILE) + OBJECT_CHECK(QAuthZListFile, (obj), \ + TYPE_QAUTHZ_LIST_FILE) typedef struct QAuthZListFile QAuthZListFile; typedef struct QAuthZListFileClass QAuthZListFileClass; diff --git a/include/authz/pamacct.h b/include/authz/pamacct.h index 6e3046e528..cad5b11d47 100644 --- a/include/authz/pamacct.h +++ b/include/authz/pamacct.h @@ -33,8 +33,8 @@ OBJECT_GET_CLASS(QAuthZPAMClass, (obj), \ TYPE_QAUTHZ_PAM) #define QAUTHZ_PAM(obj) \ - INTERFACE_CHECK(QAuthZPAM, (obj), \ - TYPE_QAUTHZ_PAM) + OBJECT_CHECK(QAuthZPAM, (obj), \ + TYPE_QAUTHZ_PAM) typedef struct QAuthZPAM QAuthZPAM; typedef struct QAuthZPAMClass QAuthZPAMClass; diff --git a/include/authz/simple.h b/include/authz/simple.h index ef13958269..30b932dfeb 100644 --- a/include/authz/simple.h +++ b/include/authz/simple.h @@ -32,8 +32,8 @@ OBJECT_GET_CLASS(QAuthZSimpleClass, (obj), \ TYPE_QAUTHZ_SIMPLE) #define QAUTHZ_SIMPLE(obj) \ - INTERFACE_CHECK(QAuthZSimple, (obj), \ - TYPE_QAUTHZ_SIMPLE) + OBJECT_CHECK(QAuthZSimple, (obj), \ + TYPE_QAUTHZ_SIMPLE) typedef struct QAuthZSimple QAuthZSimple; typedef struct QAuthZSimpleClass QAuthZSimpleClass; diff --git a/io/channel-websock.c b/io/channel-websock.c index dc43dc6bb9..77d30f0e4a 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -1225,12 +1225,18 @@ qio_channel_websock_source_check(GSource *source) QIOChannelWebsockSource *wsource = (QIOChannelWebsockSource *)source; GIOCondition cond = 0; - if (wsource->wioc->rawinput.offset || wsource->wioc->io_eof) { + if (wsource->wioc->rawinput.offset) { cond |= G_IO_IN; } if (wsource->wioc->encoutput.offset < QIO_CHANNEL_WEBSOCK_MAX_BUFFER) { cond |= G_IO_OUT; } + if (wsource->wioc->io_eof) { + cond |= G_IO_HUP; + } + if (wsource->wioc->io_err) { + cond |= G_IO_ERR; + } return cond & wsource->condition; } |