mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: move qemu_spice_fill_device_address to ui/util.c

Browse Source 
Other backends can use it.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-02-15 15:10:36 +04:00
parent 5e79d516e8
commit f6ef71bded
7 changed files with 92 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/display/qxl.c
View File

@ -2171,12 +2171,17 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp)
}
#if SPICE_SERVER_VERSION >= 0x000e02 /* release 0.14.2 */
Error *err = NULL;
char device_address[256] = "";
if (qemu_spice_fill_device_address(qxl->vga.con, device_address, 256)) {
if (qemu_console_fill_device_address(qxl->vga.con,
device_address, sizeof(device_address),
&err)) {
spice_qxl_set_device_info(&qxl->ssd.qxl,
device_address,
0,
qxl->max_outputs);
} else {
error_report_err(err);
}
#endif

6
include/ui/console.h
View File

@ -495,4 +495,10 @@ int index_from_key(const char *key, size_t key_length);
int udmabuf_fd(void);
#endif
/* util.c */
bool qemu_console_fill_device_address(QemuConsole *con,
char *device_address,
size_t size,
Error **errp);
#endif

4
include/ui/spice-display.h
View File

@ -184,8 +184,4 @@ void qemu_spice_display_start(void);
void qemu_spice_display_stop(void);
int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd);
bool qemu_spice_fill_device_address(QemuConsole *con,
char *device_address,
size_t size);
#endif

1
ui/meson.build
View File

@ -12,6 +12,7 @@ softmmu_ss.add(files(
'kbd-state.c',
'keymaps.c',
'qemu-pixman.c',
'util.c',
))
softmmu_ss.add([spice_headers, files('spice-module.c')])
softmmu_ss.add(when: spice_protocol, if_true: files('vdagent.c'))

50
ui/spice-core.c
View File

@ -884,56 +884,6 @@ bool qemu_spice_have_display_interface(QemuConsole *con)
return false;
}
/*
* Recursively (in reverse order) appends addresses of PCI devices as it moves
* up in the PCI hierarchy.
*
* @returns true on success, false when the buffer wasn't large enough
*/
static bool append_pci_address(char *buf, size_t buf_size, const PCIDevice *pci)
{
PCIBus *bus = pci_get_bus(pci);
/*
* equivalent to if (!pci_bus_is_root(bus)), but the function is not built
* with PCI_CONFIG=n, avoid using an #ifdef by checking directly
*/
if (bus->parent_dev != NULL) {
append_pci_address(buf, buf_size, bus->parent_dev);
}
size_t len = strlen(buf);
ssize_t written = snprintf(buf + len, buf_size - len, "/%02x.%x",
PCI_SLOT(pci->devfn), PCI_FUNC(pci->devfn));
return written > 0 && written < buf_size - len;
}
bool qemu_spice_fill_device_address(QemuConsole *con,
char *device_address,
size_t size)
{
DeviceState *dev = DEVICE(object_property_get_link(OBJECT(con),
"device",
&error_abort));
PCIDevice *pci = (PCIDevice *) object_dynamic_cast(OBJECT(dev),
TYPE_PCI_DEVICE);
if (pci == NULL) {
warn_report("Setting device address of a display device to SPICE: "
"Not a PCI device.");
return false;
}
strncpy(device_address, "pci/0000", size);
if (!append_pci_address(device_address, size, pci)) {
warn_report("Setting device address of a display device to SPICE: "
"Too many PCI devices in the chain.");
return false;
}
return true;
}
int qemu_spice_add_display_interface(QXLInstance *qxlin, QemuConsole *con)
{
if (g_slist_find(spice_consoles, con)) {

5
ui/spice-display.c
View File

@ -1148,12 +1148,15 @@ static void qemu_spice_display_init_one(QemuConsole *con)
qemu_spice_add_display_interface(&ssd->qxl, con);
#if SPICE_SERVER_VERSION >= 0x000e02 /* release 0.14.2 */
Error *err = NULL;
char device_address[256] = "";
if (qemu_spice_fill_device_address(con, device_address, 256)) {
if (qemu_console_fill_device_address(con, device_address, 256, &err)) {
spice_qxl_set_device_info(&ssd->qxl,
device_address,
qemu_console_get_head(con),
1);
} else {
error_report_err(err);
}
#endif

75
ui/util.c Normal file
View File

@ -0,0 +1,75 @@
/*
* Copyright (C) 2021 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 or
* (at your option) version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "qapi/error.h"
#include "ui/console.h"
/*
* Recursively (in reverse order) appends addresses of PCI devices as it moves
* up in the PCI hierarchy.
*
* @returns true on success, false when the buffer wasn't large enough
*/
static bool append_pci_address(char *buf, size_t buf_size, const PCIDevice *pci)
{
PCIBus *bus = pci_get_bus(pci);
/*
* equivalent to if (!pci_bus_is_root(bus)), but the function is not built
* with PCI_CONFIG=n, avoid using an #ifdef by checking directly
*/
if (bus->parent_dev != NULL) {
append_pci_address(buf, buf_size, bus->parent_dev);
}
size_t len = strlen(buf);
ssize_t written = snprintf(buf + len, buf_size - len, "/%02x.%x",
PCI_SLOT(pci->devfn), PCI_FUNC(pci->devfn));
return written > 0 && written < buf_size - len;
}
bool qemu_console_fill_device_address(QemuConsole *con,
char *device_address,
size_t size,
Error **errp)
{
ERRP_GUARD();
DeviceState *dev = DEVICE(object_property_get_link(OBJECT(con),
"device",
&error_abort));
PCIDevice *pci = (PCIDevice *) object_dynamic_cast(OBJECT(dev),
TYPE_PCI_DEVICE);
if (pci == NULL) {
error_setg(errp, "Setting device address of a display device: "
"Not a PCI device.");
return false;
}
strncpy(device_address, "pci/0000", size);
if (!append_pci_address(device_address, size, pci)) {
error_setg(errp, "Setting device address of a display device: "
"Too many PCI devices in the chain.");
return false;
}
return true;
}