diff mbox

Fix bsd-user build after d915b7bb

Message ID 1471877833-52343-1-git-send-email-emaste@freebsd.org (mailing list archive)
State New, archived
Headers show

Commit Message

Ed Maste Aug. 22, 2016, 2:57 p.m. UTC
Must include "qemu-version.h" for the QEMU_PKGVERSION definition.

Signed-off-by: Ed Maste <emaste@freebsd.org>
---
 bsd-user/main.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Peter Maydell Aug. 22, 2016, 4:20 p.m. UTC | #1
On 22 August 2016 at 15:57, Ed Maste <emaste@freebsd.org> wrote:
> Must include "qemu-version.h" for the QEMU_PKGVERSION definition.
>
> Signed-off-by: Ed Maste <emaste@freebsd.org>
> ---
>  bsd-user/main.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/bsd-user/main.c b/bsd-user/main.c
> index b4a0a00..0fb08e4 100644
> --- a/bsd-user/main.c
> +++ b/bsd-user/main.c
> @@ -17,6 +17,7 @@
>   *  along with this program; if not, see <http://www.gnu.org/licenses/>.
>   */
>  #include "qemu/osdep.h"
> +#include "qemu-version.h"
>  #include <machine/trap.h>
>
>  #include "qapi/error.h"

Awkward that this missed rc4 by an hour or two :-(

-- PMM
Ed Maste Aug. 22, 2016, 8:15 p.m. UTC | #2
On 22 August 2016 at 12:20, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> Awkward that this missed rc4 by an hour or two :-(

Indeed, and I'm sorry that's the case. It wasn't even in the context
of the upcoming release that I tried building and stumbled across this
- I'm just back after some time away.

This is a good reminder of the need for us (FreeBSD) to get a build
bot going though.
Peter Maydell Aug. 24, 2016, 4:20 p.m. UTC | #3
On 22 August 2016 at 21:15, Ed Maste <emaste@freebsd.org> wrote:
> On 22 August 2016 at 12:20, Peter Maydell <peter.maydell@linaro.org> wrote:
>>
>> Awkward that this missed rc4 by an hour or two :-(
>
> Indeed, and I'm sorry that's the case. It wasn't even in the context
> of the upcoming release that I tried building and stumbled across this
> - I'm just back after some time away.

Kind of my fault really for committing untested bsd-user code.
Anyway, I've applied this patch to master for rc5.

thanks
-- PMM
diff mbox

Patch

diff --git a/bsd-user/main.c b/bsd-user/main.c
index b4a0a00..0fb08e4 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -17,6 +17,7 @@ 
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
+#include "qemu-version.h"
 #include <machine/trap.h>
 
 #include "qapi/error.h"