hw/timer: QOM'ify pxa2xx_timer

[qemu.git] / qemu-char.c

diff --git a/qemu-char.c b/qemu-char.c
index 1605b30c332205a91f4832f911f9564b0aa3d786..ad11b75e3df0eecfc5e2e3ebb86bb99d2486f78b 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */

+#include "qemu/osdep.h"

 #include "qemu-common.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"


@@ -37,11 +38,6 @@
 #include "io/channel-file.h"
 #include "io/channel-tls.h"
 
 #include "io/channel-file.h"
 #include "io/channel-tls.h"
 

-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/time.h>

 #include <zlib.h>
 
 #ifndef _WIN32
 #include <zlib.h>
 
 #ifndef _WIN32


@@ -58,7 +54,6 @@
 #include <netdb.h>
 #include <sys/select.h>
 #ifdef CONFIG_BSD
 #include <netdb.h>
 #include <sys/select.h>
 #ifdef CONFIG_BSD

-#include <sys/stat.h>

 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <dev/ppbus/ppi.h>
 #include <dev/ppbus/ppbconf.h>
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <dev/ppbus/ppi.h>
 #include <dev/ppbus/ppbconf.h>


@@ -72,7 +67,6 @@
 #include <linux/parport.h>
 #endif
 #ifdef __sun__
 #include <linux/parport.h>
 #endif
 #ifdef __sun__

-#include <sys/stat.h>

 #include <sys/ethernet.h>
 #include <sys/sockio.h>
 #include <netinet/arp.h>
 #include <sys/ethernet.h>
 #include <sys/sockio.h>
 #include <netinet/arp.h>


@@ -902,13 +896,13 @@ static int io_channel_send_full(QIOChannel *ioc,
             ioc, &iov, 1,
             fds, nfds, NULL);
         if (ret == QIO_CHANNEL_ERR_BLOCK) {
             ioc, &iov, 1,
             fds, nfds, NULL);
         if (ret == QIO_CHANNEL_ERR_BLOCK) {

-            errno = EAGAIN;
-            return -1;
-        } else if (ret < 0) {

             if (offset) {
                 return offset;
             }
 
             if (offset) {
                 return offset;
             }
 

+            errno = EAGAIN;
+            return -1;
+        } else if (ret < 0) {

             errno = EINVAL;
             return -1;
         }
             errno = EINVAL;
             return -1;
         }


@@ -1800,12 +1794,12 @@ static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
 }
 
 static CharDriverState *qemu_chr_open_pp_fd(int fd,
 }
 
 static CharDriverState *qemu_chr_open_pp_fd(int fd,

-                                            ChardevBackend *backend,
+                                            ChardevCommon *backend,

                                             Error **errp)
 {
     CharDriverState *chr;
 
                                             Error **errp)
 {
     CharDriverState *chr;
 

-    chr = qemu_chr_alloc(common, errp);
+    chr = qemu_chr_alloc(backend, errp);

     if (!chr) {
         return NULL;
     }
     if (!chr) {
         return NULL;
     }


@@ -2862,6 +2856,10 @@ static void tcp_chr_update_read_handler(CharDriverState *chr)
 {
     TCPCharDriver *s = chr->opaque;
 
 {
     TCPCharDriver *s = chr->opaque;
 

+    if (!s->connected) {
+        return;
+    }
+

     remove_fd_in_watch(chr);
     if (s->ioc) {
         chr->fd_in_tag = io_add_watch_poll(s->ioc,
     remove_fd_in_watch(chr);
     if (s->ioc) {
         chr->fd_in_tag = io_add_watch_poll(s->ioc,


@@ -4386,7 +4384,7 @@ static CharDriverState *qmp_chardev_open_udp(const char *id,
     QIOChannelSocket *sioc = qio_channel_socket_new();
 
     if (qio_channel_socket_dgram_sync(sioc,
     QIOChannelSocket *sioc = qio_channel_socket_new();
 
     if (qio_channel_socket_dgram_sync(sioc,

-                                      udp->remote, udp->local,
+                                      udp->local, udp->remote,

                                       errp) < 0) {
         object_unref(OBJECT(sioc));
         return NULL;
                                       errp) < 0) {
         object_unref(OBJECT(sioc));
         return NULL;