Accepting request 198640 from Virtualization
Improved .changes to mention one of the benefits of a recent change. No code changes. Please accept and forward to factory ASAP, as gnome-boxes requires it to function, and gnome-boxes has been a featured application for our last few releases. Thanks (forwarded request 198639 from RBrownCCB) OBS-URL: https://build.opensuse.org/request/show/198640 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qemu?expand=0&rev=82
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
commit
0eef3f399c
93
0038-gdbstub-Fix-gdb_register_coprocesso.patch
Normal file
93
0038-gdbstub-Fix-gdb_register_coprocesso.patch
Normal file
@ -0,0 +1,93 @@
|
||||
From 1fd884e9d531b5b5b3e021eb3277a8784714df2f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
|
||||
Date: Mon, 12 Aug 2013 18:09:47 +0200
|
||||
Subject: [PATCH] gdbstub: Fix gdb_register_coprocessor() register counting
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Commit a0e372f0c49ac01faeaeb73a6e8f50e8ac615f34 reorganized the register
|
||||
counting for GDB. While it seems correct not to let the total number of
|
||||
registers skyrocket in an SMP scenario through a static variable, the
|
||||
distinction between total register count and 'g' packet register count
|
||||
(last_reg vs. num_g_regs) got lost among the way.
|
||||
|
||||
Fix this by introducing CPUState::gdb_num_g_regs and using that in
|
||||
gdb_handle_packet().
|
||||
|
||||
Reported-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
|
||||
Cc: qemu-stable@nongnu.org (stable-1.6)
|
||||
Tested-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
|
||||
Tested-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Tested-by: Peter Maydell <peter.maydell@linaro.org>
|
||||
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
---
|
||||
gdbstub.c | 6 ++++--
|
||||
include/qom/cpu.h | 2 ++
|
||||
qom/cpu.c | 2 +-
|
||||
3 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gdbstub.c b/gdbstub.c
|
||||
index 1af25a6..9d067d6 100644
|
||||
--- a/gdbstub.c
|
||||
+++ b/gdbstub.c
|
||||
@@ -621,6 +621,8 @@ void gdb_register_coprocessor(CPUState *cpu,
|
||||
if (g_pos != s->base_reg) {
|
||||
fprintf(stderr, "Error: Bad gdb register numbering for '%s'\n"
|
||||
"Expected %d got %d\n", xml, g_pos, s->base_reg);
|
||||
+ } else {
|
||||
+ cpu->gdb_num_g_regs = cpu->gdb_num_regs;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -902,7 +904,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
|
||||
case 'g':
|
||||
cpu_synchronize_state(s->g_cpu);
|
||||
len = 0;
|
||||
- for (addr = 0; addr < s->g_cpu->gdb_num_regs; addr++) {
|
||||
+ for (addr = 0; addr < s->g_cpu->gdb_num_g_regs; addr++) {
|
||||
reg_size = gdb_read_register(s->g_cpu, mem_buf + len, addr);
|
||||
len += reg_size;
|
||||
}
|
||||
@@ -914,7 +916,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
|
||||
registers = mem_buf;
|
||||
len = strlen(p) / 2;
|
||||
hextomem((uint8_t *)registers, p, len);
|
||||
- for (addr = 0; addr < s->g_cpu->gdb_num_regs && len > 0; addr++) {
|
||||
+ for (addr = 0; addr < s->g_cpu->gdb_num_g_regs && len > 0; addr++) {
|
||||
reg_size = gdb_write_register(s->g_cpu, registers, addr);
|
||||
len -= reg_size;
|
||||
registers += reg_size;
|
||||
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
|
||||
index 0d6e95c..3e49936 100644
|
||||
--- a/include/qom/cpu.h
|
||||
+++ b/include/qom/cpu.h
|
||||
@@ -152,6 +152,7 @@ struct kvm_run;
|
||||
* @current_tb: Currently executing TB.
|
||||
* @gdb_regs: Additional GDB registers.
|
||||
* @gdb_num_regs: Number of total registers accessible to GDB.
|
||||
+ * @gdb_num_g_regs: Number of registers in GDB 'g' packets.
|
||||
* @next_cpu: Next CPU sharing TB cache.
|
||||
* @kvm_fd: vCPU file descriptor for KVM.
|
||||
*
|
||||
@@ -188,6 +189,7 @@ struct CPUState {
|
||||
struct TranslationBlock *current_tb;
|
||||
struct GDBRegisterState *gdb_regs;
|
||||
int gdb_num_regs;
|
||||
+ int gdb_num_g_regs;
|
||||
CPUState *next_cpu;
|
||||
|
||||
int kvm_fd;
|
||||
diff --git a/qom/cpu.c b/qom/cpu.c
|
||||
index aa95108..e71e57b 100644
|
||||
--- a/qom/cpu.c
|
||||
+++ b/qom/cpu.c
|
||||
@@ -240,7 +240,7 @@ static void cpu_common_initfn(Object *obj)
|
||||
CPUState *cpu = CPU(obj);
|
||||
CPUClass *cc = CPU_GET_CLASS(obj);
|
||||
|
||||
- cpu->gdb_num_regs = cc->gdb_num_core_regs;
|
||||
+ cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs;
|
||||
}
|
||||
|
||||
static int64_t cpu_common_get_arch_id(CPUState *cpu)
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 17 12:12:57 UTC 2013 - afaerber@suse.de
|
||||
|
||||
- Fix gdbstub for arm/m68k/ppc guests (from pending upstream pull)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 16 23:36:12 UTC 2013 - afaerber@suse.de
|
||||
|
||||
|
||||
@ -62,6 +62,7 @@ Patch0034: 0034-console-add-question-mark-escape-op.patch
|
||||
Patch0035: 0035-Make-char-muxer-more-robust-wrt-sma.patch
|
||||
Patch0036: 0036-linux-user-lseek-explicitly-cast-no.patch
|
||||
Patch0037: 0037-virtfs-proxy-helper-Provide-__u64-f.patch
|
||||
Patch0038: 0038-gdbstub-Fix-gdb_register_coprocesso.patch
|
||||
# Please do not add patches manually here, run update_git.sh.
|
||||
# this is to make lint happy
|
||||
Source300: rpmlintrc
|
||||
@ -151,6 +152,7 @@ run cross-architecture builds.
|
||||
%patch0035 -p1
|
||||
%patch0036 -p1
|
||||
%patch0037 -p1
|
||||
%patch0038 -p1
|
||||
|
||||
%build
|
||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||
|
||||
17
qemu.changes
17
qemu.changes
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 26 06:40:22 UTC 2013 - rob.verduijn@gmail.com
|
||||
|
||||
- Enabled usb-redirection
|
||||
* Fixes starting VMs in gnome-boxes (bnc#839703)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 17 13:43:13 UTC 2013 - afaerber@suse.de
|
||||
|
||||
- Enable Xen support to allow testing our QEMU in place of Xen's
|
||||
This prepares for consolidating QEMU packaging further.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 17 12:12:57 UTC 2013 - afaerber@suse.de
|
||||
|
||||
- Fix gdbstub for arm/m68k/ppc guests (from pending upstream pull)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 16 23:36:12 UTC 2013 - afaerber@suse.de
|
||||
|
||||
|
||||
14
qemu.spec
14
qemu.spec
@ -62,6 +62,7 @@ Patch0034: 0034-console-add-question-mark-escape-op.patch
|
||||
Patch0035: 0035-Make-char-muxer-more-robust-wrt-sma.patch
|
||||
Patch0036: 0036-linux-user-lseek-explicitly-cast-no.patch
|
||||
Patch0037: 0037-virtfs-proxy-helper-Provide-__u64-f.patch
|
||||
Patch0038: 0038-gdbstub-Fix-gdb_register_coprocesso.patch
|
||||
# Please do not add patches manually here, run update_git.sh.
|
||||
# this is to make lint happy
|
||||
Source300: rpmlintrc
|
||||
@ -106,9 +107,15 @@ BuildRequires: makeinfo
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: python
|
||||
%if 0%{?sles_version} != 11
|
||||
BuildRequires: usbredir-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: vte2-devel
|
||||
%endif
|
||||
%ifarch %ix86 x86_64
|
||||
BuildRequires: xen-devel
|
||||
%endif
|
||||
BuildRequires: zlib-devel
|
||||
%if 0%{?suse_version} >= 1140
|
||||
%ifarch %ix86 x86_64
|
||||
@ -211,6 +218,7 @@ This sub-package contains the guest agent.
|
||||
%patch0035 -p1
|
||||
%patch0036 -p1
|
||||
%patch0037 -p1
|
||||
%patch0038 -p1
|
||||
|
||||
%build
|
||||
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
|
||||
@ -240,6 +248,9 @@ This sub-package contains the guest agent.
|
||||
%endif
|
||||
%else
|
||||
--disable-spice \
|
||||
%endif
|
||||
%if 0%{?sles_version} != 11
|
||||
--enable-usb-redir \
|
||||
%endif
|
||||
--enable-vde \
|
||||
--enable-virtfs \
|
||||
@ -248,6 +259,9 @@ This sub-package contains the guest agent.
|
||||
--enable-vnc-sasl \
|
||||
--enable-vnc-tls \
|
||||
--enable-vnc-ws \
|
||||
%ifarch %ix86 x86_64
|
||||
--enable-xen \
|
||||
%endif
|
||||
|
||||
make %{?_smp_mflags} V=1
|
||||
|
||||
|
||||
12
qemu.spec.in
12
qemu.spec.in
@ -70,9 +70,15 @@ BuildRequires: makeinfo
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: python
|
||||
%if 0%{?sles_version} != 11
|
||||
BuildRequires: usbredir-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: vte2-devel
|
||||
%endif
|
||||
%ifarch %ix86 x86_64
|
||||
BuildRequires: xen-devel
|
||||
%endif
|
||||
BuildRequires: zlib-devel
|
||||
%if 0%{?suse_version} >= 1140
|
||||
%ifarch %ix86 x86_64
|
||||
@ -168,6 +174,9 @@ PATCH_EXEC
|
||||
%endif
|
||||
%else
|
||||
--disable-spice \
|
||||
%endif
|
||||
%if 0%{?sles_version} != 11
|
||||
--enable-usb-redir \
|
||||
%endif
|
||||
--enable-vde \
|
||||
--enable-virtfs \
|
||||
@ -176,6 +185,9 @@ PATCH_EXEC
|
||||
--enable-vnc-sasl \
|
||||
--enable-vnc-tls \
|
||||
--enable-vnc-ws \
|
||||
%ifarch %ix86 x86_64
|
||||
--enable-xen \
|
||||
%endif
|
||||
|
||||
make %{?_smp_mflags} V=1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user