[Qemu-devel] [PULL trivial 0/5] trivial patches for 2013-07-19

[Qemu-devel] [PULL trivial 0/5] trivial patches for 2013-07-19

[Michael Tokarev]

This is another trivial-patches pull request.  This time
we have just 5 patches accumulated in two (!) weeks period.
Please consider apply.

/mjt

The following changes since commit 24943978cbe79634a9a8b02a20efb25b29b3ab49:

  boot-order-test: Add tests for Sun4u (2013-07-18 13:27:47 -0500)

are available in the git repository at:

  git://git.corpit.ru/qemu.git trivial-patches

for you to fetch changes up to be022d61f4938bb051e8af8e6cb470ec1602c488:

  doc: monitor multiplexing rewording (2013-07-19 12:52:03 +0400)

----------------------------------------------------------------
Cole Robinson (1):
      Fix command example in qemu.sasl

Ed Maste (1):
      block/m25p80: Update Micron entries

Michael Tokarev (2):
      slirp: remove mbuf(m_hdr,m_dat) indirection
      doc: monitor multiplexing rewording

Petar Jovanovic (1):
      linux-user: declare sys_futex to have 6 arguments

 hw/block/m25p80.c |   12 ++++++++----
 linux-user/main.c |    2 +-
 qemu-options.hx   |    4 ++--
 qemu.sasl         |    2 +-
 slirp/mbuf.h      |   51 ++++++++++++++++++---------------------------------
 slirp/tcp_subr.c  |   12 ++++++------
 6 files changed, 36 insertions(+), 47 deletions(-)

[Qemu-devel] [PULL trivial 1/5] linux-user: declare sys_futex to have 6 arguments

[Michael Tokarev]

From: Petar Jovanovic <petar.jovanovic@imgtec.com>

sys_futex has 6 arguments, and all of these need to be copied. Fix incorrect
declaration in the mips_syscall_args array.

This change fixes the cases where the 5th and 6th arguments have non-zero
value and have importance. An example is a Linux implementation of
pthread_cond_wait() function.

Signed-off-by: Petar Jovanovic <petar.jovanovic@imgtec.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 linux-user/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/main.c b/linux-user/main.c
index 7f15d3d..99c3b3f 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2028,7 +2028,7 @@ static const uint8_t mips_syscall_args[] = {
 	MIPS_SYS(sys_fremovexattr, 2)	/* 4235 */
 	MIPS_SYS(sys_tkill	, 2)
 	MIPS_SYS(sys_sendfile64	, 5)
-	MIPS_SYS(sys_futex	, 2)
+	MIPS_SYS(sys_futex	, 6)
 	MIPS_SYS(sys_sched_setaffinity, 3)
 	MIPS_SYS(sys_sched_getaffinity, 3)	/* 4240 */
 	MIPS_SYS(sys_io_setup	, 2)
-- 
1.7.10.4

[Qemu-devel] [PULL trivial 2/5] slirp: remove mbuf(m_hdr, m_dat) indirection

[Michael Tokarev]

---
 slirp/mbuf.h     |   51 ++++++++++++++++++---------------------------------
 slirp/tcp_subr.c |   12 ++++++------
 2 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/slirp/mbuf.h b/slirp/mbuf.h
index 3f3ab09..b144f1c 100644
--- a/slirp/mbuf.h
+++ b/slirp/mbuf.h
@@ -49,22 +49,6 @@
  * free the m_ext.  This is inefficient memory-wise, but who cares.
  */
 
-/* XXX should union some of these! */
-/* header at beginning of each mbuf: */
-struct m_hdr {
-	struct	mbuf *mh_next;		/* Linked list of mbufs */
-	struct	mbuf *mh_prev;
-	struct	mbuf *mh_nextpkt;	/* Next packet in queue/record */
-	struct	mbuf *mh_prevpkt; /* Flags aren't used in the output queue */
-	int	mh_flags;	  /* Misc flags */
-
-	int	mh_size;		/* Size of data */
-	struct	socket *mh_so;
-
-	caddr_t	mh_data;		/* Location of data */
-	int	mh_len;			/* Amount of data in this mbuf */
-};
-
 /*
  * How much room is in the mbuf, from m_data to the end of the mbuf
  */
@@ -80,29 +64,30 @@ struct m_hdr {
 #define M_TRAILINGSPACE M_FREEROOM
 
 struct mbuf {
-	struct	m_hdr m_hdr;
+	/* XXX should union some of these! */
+	/* header at beginning of each mbuf: */
+	struct	mbuf *m_next;		/* Linked list of mbufs */
+	struct	mbuf *m_prev;
+	struct	mbuf *m_nextpkt;	/* Next packet in queue/record */
+	struct	mbuf *m_prevpkt;	/* Flags aren't used in the output queue */
+	int	m_flags;		/* Misc flags */
+
+	int	m_size;			/* Size of data */
+	struct	socket *m_so;
+
+	caddr_t	m_data;			/* Location of data */
+	int	m_len;			/* Amount of data in this mbuf */
+
 	Slirp *slirp;
 	bool	arp_requested;
 	uint64_t expiration_date;
 	/* start of dynamic buffer area, must be last element */
-	union M_dat {
-		char	m_dat_[1]; /* ANSI don't like 0 sized arrays */
-		char	*m_ext_;
-	} M_dat;
+	union {
+		char	m_dat[1]; /* ANSI don't like 0 sized arrays */
+		char	*m_ext;
+	};
 };
 
-#define m_next		m_hdr.mh_next
-#define m_prev		m_hdr.mh_prev
-#define m_nextpkt	m_hdr.mh_nextpkt
-#define m_prevpkt	m_hdr.mh_prevpkt
-#define m_flags		m_hdr.mh_flags
-#define	m_len		m_hdr.mh_len
-#define	m_data		m_hdr.mh_data
-#define m_size		m_hdr.mh_size
-#define m_dat		M_dat.m_dat_
-#define m_ext		M_dat.m_ext_
-#define m_so		m_hdr.mh_so
-
 #define ifq_prev m_prev
 #define ifq_next m_next
 #define ifs_prev m_prevpkt
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index e98ce1a..043f28f 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -647,7 +647,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
 			n4 =  (laddr & 0xff);
 
 			m->m_len = bptr - m->m_data; /* Adjust length */
-                        m->m_len += snprintf(bptr, m->m_hdr.mh_size - m->m_len,
+                        m->m_len += snprintf(bptr, m->m_size - m->m_len,
                                              "ORT %d,%d,%d,%d,%d,%d\r\n%s",
                                              n1, n2, n3, n4, n5, n6, x==7?buff:"");
 			return 1;
@@ -680,7 +680,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
 			n4 =  (laddr & 0xff);
 
 			m->m_len = bptr - m->m_data; /* Adjust length */
-			m->m_len += snprintf(bptr, m->m_hdr.mh_size - m->m_len,
+			m->m_len += snprintf(bptr, m->m_size - m->m_len,
                                              "27 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n%s",
                                              n1, n2, n3, n4, n5, n6, x==7?buff:"");
 
@@ -706,7 +706,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
 		if (m->m_data[m->m_len-1] == '\0' && lport != 0 &&
 		    (so = tcp_listen(slirp, INADDR_ANY, 0, so->so_laddr.s_addr,
 		                     htons(lport), SS_FACCEPTONCE)) != NULL)
-                    m->m_len = snprintf(m->m_data, m->m_hdr.mh_size, "%d",
+                    m->m_len = snprintf(m->m_data, m->m_size, "%d",
                                         ntohs(so->so_fport)) + 1;
 		return 1;
 
@@ -726,7 +726,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
 				return 1;
 			}
 			m->m_len = bptr - m->m_data; /* Adjust length */
-                        m->m_len += snprintf(bptr, m->m_hdr.mh_size,
+                        m->m_len += snprintf(bptr, m->m_size,
                                              "DCC CHAT chat %lu %u%c\n",
                                              (unsigned long)ntohl(so->so_faddr.s_addr),
                                              ntohs(so->so_fport), 1);
@@ -737,7 +737,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
 				return 1;
 			}
 			m->m_len = bptr - m->m_data; /* Adjust length */
-                        m->m_len += snprintf(bptr, m->m_hdr.mh_size,
+                        m->m_len += snprintf(bptr, m->m_size,
                                              "DCC SEND %s %lu %u %u%c\n", buff,
                                              (unsigned long)ntohl(so->so_faddr.s_addr),
                                              ntohs(so->so_fport), n1, 1);
@@ -748,7 +748,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
 				return 1;
 			}
 			m->m_len = bptr - m->m_data; /* Adjust length */
-                        m->m_len += snprintf(bptr, m->m_hdr.mh_size,
+                        m->m_len += snprintf(bptr, m->m_size,
                                              "DCC MOVE %s %lu %u %u%c\n", buff,
                                              (unsigned long)ntohl(so->so_faddr.s_addr),
                                              ntohs(so->so_fport), n1, 1);
-- 
1.7.10.4

[Qemu-devel] [PULL trivial 3/5] Fix command example in qemu.sasl

[Michael Tokarev]

From: Cole Robinson <crobinso@redhat.com>

sasldblistusers2 doesn't have a '-a' option

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 qemu.sasl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu.sasl b/qemu.sasl
index cf19cf8..9dc8323 100644
--- a/qemu.sasl
+++ b/qemu.sasl
@@ -26,7 +26,7 @@ keytab: /etc/qemu/krb5.tab
 
 # If using digest-md5 for username/passwds, then this is the file
 # containing the passwds. Use 'saslpasswd2 -a qemu [username]'
-# to add entries, and 'sasldblistusers2 -a qemu' to browse it
+# to add entries, and 'sasldblistusers2 -f [sasldb_path]' to browse it
 sasldb_path: /etc/qemu/passwd.db
 
 
-- 
1.7.10.4

[Qemu-devel] [PULL trivial 4/5] block/m25p80: Update Micron entries

[Michael Tokarev]

From: Ed Maste <emaste@freebsd.org>

- Split 32Mb and 256Mb parts into a11 and a13 variants.
- Add the 4K sector flag to the 128Mb parts.  (These entries were taken from
  the Linux kernel list, which is missing the flag.)
- Fill out the table of sizes with entries for 64Mb parts.

Prodded by Peter Crosthwaite.

Signed-off-by: Ed Maste <emaste@freebsd.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/block/m25p80.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index a927a6b..8c3b7f0 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -123,10 +123,14 @@ static const FlashPartInfo known_devices[] = {
     { INFO("mx25l25655e", 0xc22619,      0,  64 << 10, 512, 0) },
 
     /* Micron */
-    { INFO("n25q032a",    0x20bb16,      0,  64 << 10,  64, ER_4K) },
-    { INFO("n25q128a11",  0x20bb18,      0,  64 << 10, 256, 0) },
-    { INFO("n25q128a13",  0x20ba18,      0,  64 << 10, 256, 0) },
-    { INFO("n25q256a",    0x20ba19,      0,  64 << 10, 512, ER_4K) },
+    { INFO("n25q032a11",  0x20bb16,      0,  64 << 10,  64, ER_4K) },
+    { INFO("n25q032a13",  0x20ba16,      0,  64 << 10,  64, ER_4K) },
+    { INFO("n25q064a11",  0x20bb17,      0,  64 << 10, 128, ER_4K) },
+    { INFO("n25q064a13",  0x20ba17,      0,  64 << 10, 128, ER_4K) },
+    { INFO("n25q128a11",  0x20bb18,      0,  64 << 10, 256, ER_4K) },
+    { INFO("n25q128a13",  0x20ba18,      0,  64 << 10, 256, ER_4K) },
+    { INFO("n25q256a11",  0x20bb19,      0,  64 << 10, 512, ER_4K) },
+    { INFO("n25q256a13",  0x20ba19,      0,  64 << 10, 512, ER_4K) },
 
     /* Spansion -- single (large) sector size only, at least
      * for the chips listed here (without boot sectors).
-- 
1.7.10.4

[Qemu-devel] [PULL trivial 5/5] doc: monitor multiplexing rewording

[Michael Tokarev]

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 qemu-options.hx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 4e98b4f..2dbfd42 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2493,8 +2493,8 @@ listening on port 4444 would be:
 @table @code
 @item -serial mon:telnet::4444,server,nowait
 @end table
-When monitor is multiplexed to stdio this way, Ctrl+C will not terminate
-QEMU anymore but will be passed to the guest instead.
+When the monitor is multiplexed to stdio in this way, Ctrl+C will not terminate
+QEMU any more but will be passed to the guest instead.
 
 @item braille
 Braille device.  This will use BrlAPI to display the braille output on a real
-- 
1.7.10.4

Re: [Qemu-devel] [Qemu-trivial] [PULL trivial 0/5] trivial patches for 2013-07-19

[Ed Maste]

On 19 July 2013 05:11, Michael Tokarev <mjt@tls.msk.ru> wrote:
> This is another trivial-patches pull request.  This time
> we have just 5 patches accumulated in two (!) weeks period.
> Please consider apply.
...
> Michael Tokarev (2):
>       slirp: remove mbuf(m_hdr,m_dat) indirection

Any idea when this might get pulled?  The FreeBSD build is broken
until this slirp fix makes it in.

Re: [Qemu-devel] [PULL trivial 2/5] slirp: remove mbuf(m_hdr, m_dat) indirection

[Andreas Färber]

Am 19.07.2013 11:11, schrieb Michael Tokarev:
> ---

NACK, this commit in the pull request is lacking Signed-off-bys!

The original patch (attachment in reply to "slirp: reorder include to
fix FreeBSD build failure") had a misspelled "Signed-off-By" from mjt.
Michael, can you please re-add that and submit a v2 pull?

Ed, maybe you want to turn your "I'm happy" into an Acked-by or
Tested-by while at it? ;)

Regards,
Andreas

>  slirp/mbuf.h     |   51 ++++++++++++++++++---------------------------------
>  slirp/tcp_subr.c |   12 ++++++------
>  2 files changed, 24 insertions(+), 39 deletions(-)
> 
> diff --git a/slirp/mbuf.h b/slirp/mbuf.h
> index 3f3ab09..b144f1c 100644
> --- a/slirp/mbuf.h
> +++ b/slirp/mbuf.h
> @@ -49,22 +49,6 @@
>   * free the m_ext.  This is inefficient memory-wise, but who cares.
>   */
>  
> -/* XXX should union some of these! */
> -/* header at beginning of each mbuf: */
> -struct m_hdr {
> -	struct	mbuf *mh_next;		/* Linked list of mbufs */
> -	struct	mbuf *mh_prev;
> -	struct	mbuf *mh_nextpkt;	/* Next packet in queue/record */
> -	struct	mbuf *mh_prevpkt; /* Flags aren't used in the output queue */
> -	int	mh_flags;	  /* Misc flags */
> -
> -	int	mh_size;		/* Size of data */
> -	struct	socket *mh_so;
> -
> -	caddr_t	mh_data;		/* Location of data */
> -	int	mh_len;			/* Amount of data in this mbuf */
> -};
> -
>  /*
>   * How much room is in the mbuf, from m_data to the end of the mbuf
>   */
> @@ -80,29 +64,30 @@ struct m_hdr {
>  #define M_TRAILINGSPACE M_FREEROOM
>  
>  struct mbuf {
> -	struct	m_hdr m_hdr;
> +	/* XXX should union some of these! */
> +	/* header at beginning of each mbuf: */
> +	struct	mbuf *m_next;		/* Linked list of mbufs */
> +	struct	mbuf *m_prev;
> +	struct	mbuf *m_nextpkt;	/* Next packet in queue/record */
> +	struct	mbuf *m_prevpkt;	/* Flags aren't used in the output queue */
> +	int	m_flags;		/* Misc flags */
> +
> +	int	m_size;			/* Size of data */
> +	struct	socket *m_so;
> +
> +	caddr_t	m_data;			/* Location of data */
> +	int	m_len;			/* Amount of data in this mbuf */
> +
>  	Slirp *slirp;
>  	bool	arp_requested;
>  	uint64_t expiration_date;
>  	/* start of dynamic buffer area, must be last element */
> -	union M_dat {
> -		char	m_dat_[1]; /* ANSI don't like 0 sized arrays */
> -		char	*m_ext_;
> -	} M_dat;
> +	union {
> +		char	m_dat[1]; /* ANSI don't like 0 sized arrays */
> +		char	*m_ext;
> +	};
>  };
>  
> -#define m_next		m_hdr.mh_next
> -#define m_prev		m_hdr.mh_prev
> -#define m_nextpkt	m_hdr.mh_nextpkt
> -#define m_prevpkt	m_hdr.mh_prevpkt
> -#define m_flags		m_hdr.mh_flags
> -#define	m_len		m_hdr.mh_len
> -#define	m_data		m_hdr.mh_data
> -#define m_size		m_hdr.mh_size
> -#define m_dat		M_dat.m_dat_
> -#define m_ext		M_dat.m_ext_
> -#define m_so		m_hdr.mh_so
> -
>  #define ifq_prev m_prev
>  #define ifq_next m_next
>  #define ifs_prev m_prevpkt
> diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
> index e98ce1a..043f28f 100644
> --- a/slirp/tcp_subr.c
> +++ b/slirp/tcp_subr.c
> @@ -647,7 +647,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
>  			n4 =  (laddr & 0xff);
>  
>  			m->m_len = bptr - m->m_data; /* Adjust length */
> -                        m->m_len += snprintf(bptr, m->m_hdr.mh_size - m->m_len,
> +                        m->m_len += snprintf(bptr, m->m_size - m->m_len,
>                                               "ORT %d,%d,%d,%d,%d,%d\r\n%s",
>                                               n1, n2, n3, n4, n5, n6, x==7?buff:"");
>  			return 1;
> @@ -680,7 +680,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
>  			n4 =  (laddr & 0xff);
>  
>  			m->m_len = bptr - m->m_data; /* Adjust length */
> -			m->m_len += snprintf(bptr, m->m_hdr.mh_size - m->m_len,
> +			m->m_len += snprintf(bptr, m->m_size - m->m_len,
>                                               "27 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n%s",
>                                               n1, n2, n3, n4, n5, n6, x==7?buff:"");
>  
> @@ -706,7 +706,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
>  		if (m->m_data[m->m_len-1] == '\0' && lport != 0 &&
>  		    (so = tcp_listen(slirp, INADDR_ANY, 0, so->so_laddr.s_addr,
>  		                     htons(lport), SS_FACCEPTONCE)) != NULL)
> -                    m->m_len = snprintf(m->m_data, m->m_hdr.mh_size, "%d",
> +                    m->m_len = snprintf(m->m_data, m->m_size, "%d",
>                                          ntohs(so->so_fport)) + 1;
>  		return 1;
>  
> @@ -726,7 +726,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
>  				return 1;
>  			}
>  			m->m_len = bptr - m->m_data; /* Adjust length */
> -                        m->m_len += snprintf(bptr, m->m_hdr.mh_size,
> +                        m->m_len += snprintf(bptr, m->m_size,
>                                               "DCC CHAT chat %lu %u%c\n",
>                                               (unsigned long)ntohl(so->so_faddr.s_addr),
>                                               ntohs(so->so_fport), 1);
> @@ -737,7 +737,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
>  				return 1;
>  			}
>  			m->m_len = bptr - m->m_data; /* Adjust length */
> -                        m->m_len += snprintf(bptr, m->m_hdr.mh_size,
> +                        m->m_len += snprintf(bptr, m->m_size,
>                                               "DCC SEND %s %lu %u %u%c\n", buff,
>                                               (unsigned long)ntohl(so->so_faddr.s_addr),
>                                               ntohs(so->so_fport), n1, 1);
> @@ -748,7 +748,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
>  				return 1;
>  			}
>  			m->m_len = bptr - m->m_data; /* Adjust length */
> -                        m->m_len += snprintf(bptr, m->m_hdr.mh_size,
> +                        m->m_len += snprintf(bptr, m->m_size,
>                                               "DCC MOVE %s %lu %u %u%c\n", buff,
>                                               (unsigned long)ntohl(so->so_faddr.s_addr),
>                                               ntohs(so->so_fport), n1, 1);
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL trivial 2/5] slirp: remove mbuf(m_hdr, m_dat) indirection

[Michael Tokarev]

24.07.2013 16:44, Andreas Färber wrote:
> Am 19.07.2013 11:11, schrieb Michael Tokarev:
>> ---
> 
> NACK, this commit in the pull request is lacking Signed-off-bys!
> 
> The original patch (attachment in reply to "slirp: reorder include to
> fix FreeBSD build failure") had a misspelled "Signed-off-By" from mjt.
> Michael, can you please re-add that and submit a v2 pull?

It has been applied some days ago, so it is too late to add a s-o-b
now.  Which is indeed missing, not intentionally.

Oh well.

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PULL trivial 2/5] slirp: remove mbuf(m_hdr, m_dat) indirection

[Ed Maste]

On 19 July 2013 05:11, Michael Tokarev <mjt@tls.msk.ru> wrote:
> ---
>  slirp/mbuf.h     |   51 ++++++++++++++++++---------------------------------
>  slirp/tcp_subr.c |   12 ++++++------
>  2 files changed, 24 insertions(+), 39 deletions(-)

Tested-by: Ed Maste <emaste@freebsd.org>

Re: [Qemu-devel] [Qemu-trivial] [PULL trivial 0/5] trivial patches for 2013-07-19

[Andreas Färber]

Am 24.07.2013 14:24, schrieb Ed Maste:
> On 19 July 2013 05:11, Michael Tokarev <mjt@tls.msk.ru> wrote:
>> This is another trivial-patches pull request.  This time
>> we have just 5 patches accumulated in two (!) weeks period.
>> Please consider apply.
> ...
>> Michael Tokarev (2):
>>       slirp: remove mbuf(m_hdr,m_dat) indirection
> 
> Any idea when this might get pulled?  The FreeBSD build is broken
> until this slirp fix makes it in.

What problem are you seeing? The pull is already merged apparently.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [Qemu-trivial] [PULL trivial 0/5] trivial patches for 2013-07-19

[Anthony Liguori]

Ed Maste <emaste@freebsd.org> writes:

> On 19 July 2013 05:11, Michael Tokarev <mjt@tls.msk.ru> wrote:
>> This is another trivial-patches pull request.  This time
>> we have just 5 patches accumulated in two (!) weeks period.
>> Please consider apply.
> ...
>> Michael Tokarev (2):
>>       slirp: remove mbuf(m_hdr,m_dat) indirection
>
> Any idea when this might get pulled?  The FreeBSD build is broken
> until this slirp fix makes it in.

Two days ago.

Regards,

Anthony Liguori

Re: [Qemu-devel] [Qemu-trivial] [PULL trivial 0/5] trivial patches for 2013-07-19

[Ed Maste]

On 24 July 2013 09:32, Anthony Liguori <aliguori@us.ibm.com> wrote:
> Ed Maste <emaste@freebsd.org> writes:
>
>> On 19 July 2013 05:11, Michael Tokarev <mjt@tls.msk.ru> wrote:
>>> This is another trivial-patches pull request.  This time
>>> we have just 5 patches accumulated in two (!) weeks period.
>>> Please consider apply.
>> ...
>>> Michael Tokarev (2):
>>>       slirp: remove mbuf(m_hdr,m_dat) indirection
>>
>> Any idea when this might get pulled?  The FreeBSD build is broken
>> until this slirp fix makes it in.
>
> Two days ago.

Ahh, sorry - I was somehow pulling from a local mirror that got stuck.