mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-26 21:10:42 +00:00
* Misc build system bugfixes
* Fix CGA 2-color graphics -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmLj1BYUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroO1nQgAoKoT4oiRrHGRPRav5FVHedeVoLgn QXqdiB90xB4uoxeCqqEWWdQ/yuGkCrhrBYqlJynM7BLj0ujqsxw5MHsmcN4MKwVH 9hQQDegpzRcN8yY9/t4vBqxS66Z6Pj8zVTq58FkyTsE5yusayoT2gXINb/Y6iEnm sff46kgnXmx0+QiEVkzfuQk4Q4orih554GquOiUUrT0QfVgkTmZr3EIjU0x6urU9 9Pnr20GB4iK4IdqcDT1y/7viHhRLwzONO/6+7dmod82cxWVwIR3WZlonqOsWBS/F Vw6iVWquC7vMm7eS9mh2bZZSkXkczcdegKVE5O4WgpdqXmad4sJtWBgT5g== =q27Q -----END PGP SIGNATURE----- Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging * Misc build system bugfixes * Fix CGA 2-color graphics # -----BEGIN PGP SIGNATURE----- # # iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmLj1BYUHHBib256aW5p # QHJlZGhhdC5jb20ACgkQv/vSX3jHroO1nQgAoKoT4oiRrHGRPRav5FVHedeVoLgn # QXqdiB90xB4uoxeCqqEWWdQ/yuGkCrhrBYqlJynM7BLj0ujqsxw5MHsmcN4MKwVH # 9hQQDegpzRcN8yY9/t4vBqxS66Z6Pj8zVTq58FkyTsE5yusayoT2gXINb/Y6iEnm # sff46kgnXmx0+QiEVkzfuQk4Q4orih554GquOiUUrT0QfVgkTmZr3EIjU0x6urU9 # 9Pnr20GB4iK4IdqcDT1y/7viHhRLwzONO/6+7dmod82cxWVwIR3WZlonqOsWBS/F # Vw6iVWquC7vMm7eS9mh2bZZSkXkczcdegKVE5O4WgpdqXmad4sJtWBgT5g== # =q27Q # -----END PGP SIGNATURE----- # gpg: Signature made Fri 29 Jul 2022 05:35:34 AM PDT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [undefined] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [undefined] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # 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 * tag 'for-upstream' of https://gitlab.com/bonzini/qemu: configure: pass correct cflags to container-based cross compilers kvm: don't use perror() without useful errno configure: Fix ppc container_cross_cc substitution stubs: update replay-tools to match replay.h types vga: fix incorrect line height in 640x200x2 mode ui: dbus-display requires CONFIG_GBM Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
commit
9fac07bea8
@ -2265,7 +2265,7 @@ static void kvm_irqchip_create(KVMState *s)
|
||||
ret = kvm_arch_irqchip_create(s);
|
||||
if (ret == 0) {
|
||||
if (s->kernel_irqchip_split == ON_OFF_AUTO_ON) {
|
||||
perror("Split IRQ chip mode not supported.");
|
||||
error_report("Split IRQ chip mode not supported.");
|
||||
exit(1);
|
||||
} else {
|
||||
ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP);
|
||||
|
||||
3
configure
vendored
3
configure
vendored
@ -2028,7 +2028,7 @@ probe_target_compiler() {
|
||||
;;
|
||||
ppc64|ppc64le)
|
||||
container_image=debian-powerpc-test-cross
|
||||
container_cross_prefix=powerpc${1#ppc}-linux-gnu-
|
||||
container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu-
|
||||
container_cross_cc=${container_cross_prefix}gcc-10
|
||||
;;
|
||||
riscv64)
|
||||
@ -2173,7 +2173,6 @@ probe_target_compiler() {
|
||||
build_static=
|
||||
target_cc=
|
||||
target_ccas=
|
||||
target_cflags=
|
||||
target_ar=
|
||||
target_as=
|
||||
target_ld=
|
||||
|
||||
@ -1514,9 +1514,10 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
||||
force_shadow = true;
|
||||
}
|
||||
|
||||
/* bits 5-6: 0 = 16-color mode, 1 = 4-color mode, 2 = 256-color mode. */
|
||||
shift_control = (s->gr[VGA_GFX_MODE] >> 5) & 3;
|
||||
double_scan = (s->cr[VGA_CRTC_MAX_SCAN] >> 7);
|
||||
if (shift_control != 1) {
|
||||
if (s->cr[VGA_CRTC_MODE] & 1) {
|
||||
multi_scan = (((s->cr[VGA_CRTC_MAX_SCAN] & 0x1f) + 1) << double_scan)
|
||||
- 1;
|
||||
} else {
|
||||
|
||||
@ -1677,8 +1677,8 @@ dbus_display = get_option('dbus_display') \
|
||||
error_message: '-display dbus requires --enable-modules') \
|
||||
.require(gdbus_codegen.found(),
|
||||
error_message: '-display dbus requires gdbus-codegen') \
|
||||
.require(opengl.found(),
|
||||
error_message: '-display dbus requires epoxy/egl') \
|
||||
.require(opengl.found() and gbm.found(),
|
||||
error_message: '-display dbus requires epoxy/egl and gbm') \
|
||||
.allowed()
|
||||
|
||||
have_virtfs = get_option('virtfs') \
|
||||
|
||||
@ -7,13 +7,14 @@ bool replay_events_enabled(void)
|
||||
return false;
|
||||
}
|
||||
|
||||
int64_t replay_save_clock(unsigned int kind, int64_t clock, int64_t raw_icount)
|
||||
int64_t replay_save_clock(ReplayClockKind kind,
|
||||
int64_t clock, int64_t raw_icount)
|
||||
{
|
||||
abort();
|
||||
return 0;
|
||||
}
|
||||
|
||||
int64_t replay_read_clock(unsigned int kind, int64_t raw_icount)
|
||||
int64_t replay_read_clock(ReplayClockKind kind, int64_t raw_icount)
|
||||
{
|
||||
abort();
|
||||
return 0;
|
||||
@ -48,11 +49,11 @@ void replay_mutex_unlock(void)
|
||||
{
|
||||
}
|
||||
|
||||
void replay_register_char_driver(Chardev *chr)
|
||||
void replay_register_char_driver(struct Chardev *chr)
|
||||
{
|
||||
}
|
||||
|
||||
void replay_chr_be_write(Chardev *s, uint8_t *buf, int len)
|
||||
void replay_chr_be_write(struct Chardev *s, uint8_t *buf, int len)
|
||||
{
|
||||
abort();
|
||||
}
|
||||
|
||||
@ -959,7 +959,7 @@ void kvm_arch_init_irq_routing(KVMState *s)
|
||||
int kvm_arch_irqchip_create(KVMState *s)
|
||||
{
|
||||
if (kvm_kernel_irqchip_split()) {
|
||||
perror("-machine kernel_irqchip=split is not supported on ARM.");
|
||||
error_report("-machine kernel_irqchip=split is not supported on ARM.");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
||||
@ -81,7 +81,7 @@ if dbus_display
|
||||
'--interface-prefix', 'org.qemu.',
|
||||
'--c-namespace', 'QemuDBus',
|
||||
'--generate-c-code', '@BASENAME@'])
|
||||
dbus_ss.add(when: [gio, pixman, opengl],
|
||||
dbus_ss.add(when: [gio, pixman, opengl, gbm],
|
||||
if_true: [files(
|
||||
'dbus-chardev.c',
|
||||
'dbus-clipboard.c',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user