Bug fixes
-----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAl+rp+wUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroO1lAf/ejTWVYZaBNyyQNAMvG9/oNfyGc1i QXE8TXcJN1MQPBxcthbbRgFVufbXMvHFcV0j4Df2VUSYLXrbTKL/PPVrM+EjMYDD 400n0XPwcrugsvViZ6N6S1sA/NqSmljWjDSBsS2h+qOq+l7Bw1mal9n+nWWtvLSX 3mcOe3M2+8ZWfHPMUkCQ5LOnKTt9TqO/pjA0gii7WR2YZqmCPDKeDoRoC9KHfYDY ZU0kYgFyh7VZf4ZoPaIjEFbnKsWw+uJJNSA4IyzrJ+7flXf1SR2kcD8swuqdcxks GvNK+LNzAllqQgm4KDmKFmC2Iqq4RNu+5MKUgLvpp/gU8UZCq9k9toqB0g== =toxr -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging Bug fixes # gpg: Signature made Wed 11 Nov 2020 08:59:24 GMT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: pvpanic: Advertise the PVPANIC_CRASHLOADED event support physmem: improve ram size error messages Makefile: No echoing for 'make help V=1' replay: remove some dead code fix make clean/distclean meson: Clarify the confusing vhost-user vs. vhost-kernel output Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
46d407f84a
8
Makefile
8
Makefile
@ -212,8 +212,8 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS))
|
||||
######################################################################
|
||||
|
||||
clean: recurse-clean
|
||||
-@test -f build.ninja && $(quiet-@)$(NINJA) $(NINJAFLAGS) -t clean || :
|
||||
-@test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || :
|
||||
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || :
|
||||
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || :
|
||||
# avoid old build problems by removing potentially incorrect old files
|
||||
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
|
||||
find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \
|
||||
@ -231,7 +231,7 @@ qemu-%.tar.bz2:
|
||||
$(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)"
|
||||
|
||||
distclean: clean
|
||||
-@test -f build.ninja && $(quiet-@)$(NINJA) $(NINJAFLAGS) -t clean -g || :
|
||||
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || :
|
||||
rm -f config-host.mak config-host.h*
|
||||
rm -f tests/tcg/config-*.mak
|
||||
rm -f config-all-disas.mak config.status
|
||||
@ -270,7 +270,7 @@ include $(SRC_PATH)/tests/docker/Makefile.include
|
||||
include $(SRC_PATH)/tests/vm/Makefile.include
|
||||
|
||||
print-help-run = printf " %-30s - %s\\n" "$1" "$2"
|
||||
print-help = $(quiet-@)$(call print-help-run,$1,$2)
|
||||
print-help = @$(call print-help-run,$1,$2)
|
||||
|
||||
.PHONY: help
|
||||
help:
|
||||
|
||||
@ -35,6 +35,7 @@ GlobalProperty hw_compat_5_1[] = {
|
||||
{ "virtio-blk-device", "num-queues", "1"},
|
||||
{ "virtio-scsi-device", "num_queues", "1"},
|
||||
{ "nvme", "use-intel-id", "on"},
|
||||
{ "pvpanic", "events", "1"}, /* PVPANIC_PANICKED */
|
||||
};
|
||||
const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1);
|
||||
|
||||
|
||||
@ -61,12 +61,14 @@ struct PVPanicState {
|
||||
|
||||
MemoryRegion io;
|
||||
uint16_t ioport;
|
||||
uint8_t events;
|
||||
};
|
||||
|
||||
/* return supported events on read */
|
||||
static uint64_t pvpanic_ioport_read(void *opaque, hwaddr addr, unsigned size)
|
||||
{
|
||||
return PVPANIC_PANICKED;
|
||||
PVPanicState *pvp = opaque;
|
||||
return pvp->events;
|
||||
}
|
||||
|
||||
static void pvpanic_ioport_write(void *opaque, hwaddr addr, uint64_t val,
|
||||
@ -112,6 +114,7 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
|
||||
|
||||
static Property pvpanic_isa_properties[] = {
|
||||
DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505),
|
||||
DEFINE_PROP_UINT8("events", PVPanicState, events, PVPANIC_PANICKED | PVPANIC_CRASHLOADED),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
|
||||
@ -2098,11 +2098,12 @@ summary_info += {'madvise': config_host.has_key('CONFIG_MADVISE')}
|
||||
summary_info += {'posix_madvise': config_host.has_key('CONFIG_POSIX_MADVISE')}
|
||||
summary_info += {'posix_memalign': config_host.has_key('CONFIG_POSIX_MEMALIGN')}
|
||||
summary_info += {'libcap-ng support': config_host.has_key('CONFIG_LIBCAP_NG')}
|
||||
summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNEL')}
|
||||
summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')}
|
||||
summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
|
||||
summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')}
|
||||
summary_info += {'vhost-vsock support': config_host.has_key('CONFIG_VHOST_VSOCK')}
|
||||
summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_KERNEL')}
|
||||
summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')}
|
||||
summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
|
||||
summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
|
||||
summary_info += {'Trace backends': config_host['TRACE_BACKENDS']}
|
||||
|
||||
@ -278,7 +278,6 @@ static void replay_continue_stop(void *opaque)
|
||||
replay_continue_end();
|
||||
}
|
||||
replay_last_snapshot = replay_get_current_icount();
|
||||
return;
|
||||
} else {
|
||||
/* Seek to the very first step */
|
||||
replay_seek(0, replay_stop_vm_debug, &err);
|
||||
@ -286,9 +285,7 @@ static void replay_continue_stop(void *opaque)
|
||||
error_free(err);
|
||||
replay_continue_end();
|
||||
}
|
||||
return;
|
||||
}
|
||||
replay_continue_end();
|
||||
}
|
||||
|
||||
bool replay_reverse_continue(void)
|
||||
|
||||
@ -1756,15 +1756,15 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
|
||||
|
||||
if (!(block->flags & RAM_RESIZEABLE)) {
|
||||
error_setg_errno(errp, EINVAL,
|
||||
"Length mismatch: %s: 0x" RAM_ADDR_FMT
|
||||
" in != 0x" RAM_ADDR_FMT, block->idstr,
|
||||
"Size mismatch: %s: 0x" RAM_ADDR_FMT
|
||||
" != 0x" RAM_ADDR_FMT, block->idstr,
|
||||
newsize, block->used_length);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (block->max_length < newsize) {
|
||||
error_setg_errno(errp, EINVAL,
|
||||
"Length too large: %s: 0x" RAM_ADDR_FMT
|
||||
"Size too large: %s: 0x" RAM_ADDR_FMT
|
||||
" > 0x" RAM_ADDR_FMT, block->idstr,
|
||||
newsize, block->max_length);
|
||||
return -EINVAL;
|
||||
|
||||
@ -20,7 +20,7 @@ static void test_panic(void)
|
||||
qts = qtest_init("-device pvpanic");
|
||||
|
||||
val = qtest_inb(qts, 0x505);
|
||||
g_assert_cmpuint(val, ==, 1);
|
||||
g_assert_cmpuint(val, ==, 3);
|
||||
|
||||
qtest_outb(qts, 0x505, 0x1);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user