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

v6.0.0-rc5 release 

-----BEGIN PGP SIGNATURE-----
 
 iQJNBAABCAA3FiEE4aXFk81BneKOgxXPPCUl7RQ2DN4FAmCG20YZHHBldGVyLm1h
 eWRlbGxAbGluYXJvLm9yZwAKCRA8JSXtFDYM3jjJEACPIMSapDI2DOs4n+ysgYtg
 PBXcZajRMTl+nBsGpMLia6zpBb8E7nXTO+rl2JX0HmsfMuAhN2NrnEKchAUCkvB4
 X2fTRx6IO+frBDsXSz/c3FsNYcvjP8aeso3dBEU1Cqq45wKnSPqIKwUzn5Fi2AUh
 6bDuQq2c6z30C3hddqUD1NLiHaK609gWDdai4qBtPvp8Z5XpjxW0dDcRrQnmS90Z
 sat1sDNWMPIyxBbLCazOSt5nFoy5VDrs1YjZ5LKdMQVJLs/FGPxZy5ARL0Hezx9i
 ZSwRSgLbcpkvjKo/vg7AKNKhFl2i0A01E+Gl/WZxJCjJrOIgLIeSX+VhdHjeOMxO
 F9Kqda1V90prP5m1GbTuxxPJNloutL44CS1mEvXkvBhmVvSMu/McSHydA/uIfSPi
 1fXxSXmYb4Zbl7Y5Nzr/L8C7axSS4aRejzWK+DqCke9EtNbFq42DfeDHEiXic1tK
 3vzThIW/CC8gZEhVZRhHSxe4t5UyRMVOkJ4u69+fpQi0lisf4SUP1I3YgNiv/p9N
 BkhnUr/THHeZdK//jm8Mv2y/f+k0XQPrODFAUhNHWVFs3tVn4ojmO1PfPADd7kia
 OKVKK8ESye5/1GPhkeqORCTT043+Igl9o7HZ1o7cNZwZNnLyCPXpNj6AErBaxn9J
 /s41RecgMmClXNOA3yMMUQ==
 =eEiS
 -----END PGP SIGNATURE-----

Merge tag 'v6.0.0-rc5' into merge/qemu-v6.0.0

v6.0.0-rc5 release
This commit is contained in:
Matt Borgerson 2021-04-27 16:05:58 -07:00
parent 8acac97625 0cef06d187
commit 30042e8091
7 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
5.2.94
5.2.95

3
hw/block/nvme.c
View File

@ -6235,7 +6235,8 @@ static void nvme_exit(PCIDevice *pci_dev)
if (n->pmr.dev) {
host_memory_backend_set_mapped(n->pmr.dev, false);
}
msix_uninit_exclusive_bar(pci_dev);
msix_uninit(pci_dev, &n->bar0, &n->bar0);
memory_region_del_subregion(&n->bar0, &n->iomem);
}
static Property nvme_props[] = {

5
include/net/net.h
View File

@ -241,4 +241,9 @@ uint32_t net_crc32_le(const uint8_t *p, int len);
.offset = vmstate_offset_macaddr(_state, _field), \
}
static inline bool net_peer_needs_padding(NetClientState *nc)
{
return nc->peer && !nc->peer->do_not_pad;
}
#endif

2
net/slirp.c
View File

@ -119,7 +119,7 @@ static ssize_t net_slirp_send_packet(const void *pkt, size_t pkt_len,
uint8_t min_pkt[ETH_ZLEN];
size_t min_pktsz = sizeof(min_pkt);
if (!s->nc.peer->do_not_pad) {
if (net_peer_needs_padding(&s->nc)) {
if (eth_pad_short_frame(min_pkt, &min_pktsz, pkt, pkt_len)) {
pkt = min_pkt;
pkt_len = min_pktsz;

2
net/tap-win32.c
View File

@ -696,7 +696,7 @@ static void tap_win32_send(void *opaque)
if (size > 0) {
orig_buf = buf;
if (!s->nc.peer->do_not_pad) {
if (net_peer_needs_padding(&s->nc)) {
if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) {
buf = min_pkt;
size = min_pktsz;

2
net/tap.c
View File

@ -203,7 +203,7 @@ static void tap_send(void *opaque)
size -= s->host_vnet_hdr_len;
}
if (!s->nc.peer->do_not_pad) {
if (net_peer_needs_padding(&s->nc)) {
if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) {
buf = min_pkt;
size = min_pktsz;

2
target/s390x/mem_helper.c
View File

@ -145,7 +145,7 @@ static int s390_probe_access(CPUArchState *env, target_ulong addr, int size,
#if defined(CONFIG_USER_ONLY)
flags = page_get_flags(addr);
if (!(flags & (access_type == MMU_DATA_LOAD ? PAGE_READ : PAGE_WRITE))) {
if (!(flags & (access_type == MMU_DATA_LOAD ? PAGE_READ : PAGE_WRITE_ORG))) {
env->__excp_addr = addr;
flags = (flags & PAGE_VALID) ? PGM_PROTECTION : PGM_ADDRESSING;
if (nonfault) {