ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous patches for 2018-12-20 

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJcG2KbAAoJEDhwtADrkYZTGIIP/2rT7hrUb+EJCPbbPxk/b+Vz
 lZWXb85u3TXhpZ1z4dhYg6bff/yGuvTNScNAS+nWklLG7yB1mKp9AryYYX9GWBTJ
 C3l+Xd5w9QFMkb2rpwMzj9V+ElTa2/qeoJ94Tew5+bOQDCmoJxPEar5Oh/FlAx3d
 xyqFtDUK5g609Viv192zmNfb6fBOCumb2uk1zh+PltGZJFtq4rbb8S7bpYIMPNFN
 G0SM3c+Bu362p5cH+Nuxa5yV2jJcrnU4gXlqzViYt76cAW4I5/CtF16o4Nd/VdVx
 UGephaoT2PlpDDIrpKj6q9CLWrugjGsJFzGaIAm27a1ZvRsa8CLWZi6eZm/CxM+x
 hEqOAsor8U/QAA7xV+2Xv/VGkEUx9kbWftpT8sMpJtj2o/2DLRV5dhwdExxr3KH5
 o/W6VunQ84qmbyT7eLelFxCxIg2a41Fvxk0BH3k1rEnAxVueOn1fky2eZKqNpuPo
 XBhA7IfeloVR14CI1sTQQqia3V/idRCy3amkl9vJWEru5Jo/eRP9PvyTu7OzV5r7
 CYijWlpBs63u4I4T+0Wrq07E5aDcwHY0IC7TGY1HcEw0XXn5TfznQ7CN755Cqshe
 ox2xNUtPuOHCl1zGTnYfXI4TAL/qyJTrhK/l/Rk7LljFRTUN66QUx357Y4/Wr7Hg
 GVBkAetWTv5kqb3/5iKb
 =TUYr
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-12-20 18:54:46 +00:00
parent b72566a4ff 3a6b016d64
commit 95de6f4b92
19 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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.

2
contrib/elf2dmp/pdb.h
View File

@ -8,8 +8,6 @@
#ifndef PDB_H
#define PDB_H
#include <stdint.h>
#include <stdlib.h>
typedef struct GUID {
unsigned int Data1;

1
contrib/elf2dmp/pe.h
View File

@ -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 */

1
contrib/elf2dmp/qemu_elf.h
View File

@ -8,7 +8,6 @@
#ifndef QEMU_ELF_H
#define QEMU_ELF_H
#include <stdint.h>
#include <elf.h>
typedef struct QEMUCPUSegment {

1
contrib/vhost-user-blk/vhost-user-blk.c
View File

@ -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;

1
contrib/vhost-user-scsi/vhost-user-scsi.c
View File

@ -16,7 +16,6 @@
#include "contrib/libvhost-user/libvhost-user-glib.h"
#include "standard-headers/linux/virtio_scsi.h"
#include <glib.h>
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"

1
hw/rdma/rdma_utils.c
View File

@ -13,6 +13,7 @@
*
*/
#include "qemu/osdep.h"
#include "rdma_utils.h"
#ifdef PVRDMA_DEBUG

1
hw/rdma/rdma_utils.h
View File

@ -17,7 +17,6 @@
#ifndef RDMA_UTILS_H
#define RDMA_UTILS_H
#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"

1
hw/rdma/vmw/pvrdma_dev_ring.h
View File

@ -16,7 +16,6 @@
#ifndef PVRDMA_DEV_RING_H
#define PVRDMA_DEV_RING_H
#include "qemu/typedefs.h"
#define MAX_RING_NAME_SZ 32

2
hw/vfio/ap.c
View File

@ -10,9 +10,9 @@
* directory.
*/
#include "qemu/osdep.h"
#include <linux/vfio.h>
#include <sys/ioctl.h>
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/sysbus.h"
#include "hw/vfio/vfio.h"

1
include/qemu/vfio-helpers.h
View File

@ -12,7 +12,6 @@
#ifndef QEMU_VFIO_HELPERS_H
#define QEMU_VFIO_HELPERS_H
#include "qemu/typedefs.h"
typedef struct QEMUVFIOState QEMUVFIOState;

1
include/sysemu/whpx.h
View File

@ -13,7 +13,6 @@
#ifndef QEMU_WHPX_H
#define QEMU_WHPX_H
#include "config-host.h"
#include "qemu-common.h"
int whpx_init_vcpu(CPUState *cpu);

3
target/i386/sev.c
View File

@ -11,12 +11,13 @@
*
*/
#include "qemu/osdep.h"
#include <linux/kvm.h>
#include <linux/psp-sev.h>
#include <sys/ioctl.h>
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qom/object_interfaces.h"
#include "qemu/base64.h"

1
target/i386/whp-dispatch.h
View File

@ -1,5 +1,4 @@
#include "windows.h"
#include <stdbool.h>
#include <WinHvPlatform.h>
#include <WinHvEmulation.h>

1
target/riscv/fpu_helper.c
View File

@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
#include <stdlib.h>
#include "cpu.h"
#include "qemu/host-utils.h"
#include "exec/exec-all.h"

1
tests/fp/platform.h
View File

@ -29,7 +29,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config-host.h"
#ifndef HOST_WORDS_BIGENDIAN
#define LITTLEENDIAN 1

1
tests/tpm-util.h
View File

@ -13,7 +13,6 @@
#ifndef TESTS_TPM_UTIL_H
#define TESTS_TPM_UTIL_H
#include "qemu/osdep.h"
#include "io/channel-socket.h"
typedef void (tx_func)(QTestState *s,

2
tests/vhost-user-bridge.c
View File

@ -29,8 +29,8 @@
#define _FILE_OFFSET_BITS 64
#include "qemu/atomic.h"
#include "qemu/osdep.h"
#include "qemu/atomic.h"
#include "qemu/iov.h"
#include "standard-headers/linux/virtio_net.h"
#include "contrib/libvhost-user/libvhost-user.h"

1
util/qemu-thread-common.h
View File

@ -13,7 +13,6 @@
#ifndef QEMU_THREAD_COMMON_H
#define QEMU_THREAD_COMMON_H
#include "qemu/typedefs.h"
#include "qemu/thread.h"
#include "trace.h"