Commit 95de6f4b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-12-20' into staging 



Miscellaneous patches for 2018-12-20

# gpg: Signature made Thu 20 Dec 2018 09:36:27 GMT
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2018-12-20:
  build: Remake config-host.mak when VERSION changes
  Clean up includes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b72566a4 3a6b016d

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ CONFIG_ALL=y 
-include config-all-devices.mak

-include config-all-disas.mak



config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios

config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION

	@echo $@ is out-of-date, running configure

	@# TODO: The next lines include code which supports a smooth

	@# transition from old configurations without config.status.

contrib/elf2dmp/pdb.h

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#ifndef PDB_H

#define PDB_H



#include <stdint.h>

#include <stdlib.h>



typedef struct GUID {

    unsigned int Data1;

contrib/elf2dmp/pe.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#ifndef PE_H

#define PE_H



#include <stdint.h>



typedef struct IMAGE_DOS_HEADER {

    uint16_t  e_magic;      /* 0x00: MZ Header signature */

contrib/elf2dmp/qemu_elf.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#ifndef QEMU_ELF_H

#define QEMU_ELF_H



#include <stdint.h>

#include <elf.h>



typedef struct QEMUCPUSegment {

contrib/vhost-user-blk/vhost-user-blk.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include "contrib/libvhost-user/libvhost-user-glib.h"

#include "contrib/libvhost-user/libvhost-user.h"



#include <glib.h>



struct virtio_blk_inhdr {

    unsigned char status;